From 957482bc9b23949923f7ac4a3dbb8b8b54892603 Mon Sep 17 00:00:00 2001
From: Sebastian Bartus-Kunz <sbartus-kunz@nitton.de>
Date: Fri, 10 Jun 2016 15:06:41 +0200
Subject: [PATCH 001/308] Added change password request.

---
 restapi/index.php | 48 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/restapi/index.php b/restapi/index.php
index a2b17da90..f98ebe8ef 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -929,6 +929,53 @@ function createAccount() { /* {{{ */
     return;
 } /* }}} */
 
+/**
+ * Updates the password of an existing Account, the password must be PUT as a md5 string
+ *
+ * @param      <type>  $id     The user name or numerical identifier
+ */
+function changeAccountPassword($id) { /* {{{ */
+    global $app, $dms, $userobj;
+
+    checkIfAdmin();
+
+    if ($app->request()->put('password') == null)
+    {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'You must PUT a new password', 'data'=>''));
+        return; 
+    }
+
+    $newPassword = $app->request()->put('password');
+
+    if(is_numeric($id))
+        $account = $dms->getUser($id);
+    else {
+        $account = $dms->getUserByLogin($id);
+    }
+
+    /**
+     * User not found
+     */
+    if (!$account) {
+    	$app->response()->status(404);
+    	return;
+    }
+
+    $operation = $account->setPwd($newPassword);
+
+    if (!$operation){
+		$app->response()->header('Content-Type', 'application/json');
+	    echo json_encode(array('success'=>false, 'message'=>'', 'data'=>'Could not change password.'));
+	    return;
+    }
+
+    $app->response()->header('Content-Type', 'application/json');
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
+
+    return;
+} /* }}} */
+
 function getAccountById($id) { /* {{{ */
     global $app, $dms, $userobj;
     checkIfAdmin();
@@ -1351,6 +1398,7 @@ $app->get('/account/locked', 'getLockedDocuments');
 $app->post('/accounts', 'createAccount');
 $app->get('/accounts/:id', 'getAccountById');
 $app->put('/accounts/:id/disable', 'setDisabledAccount');
+$app->get('/accounts/:id/password', 'changeAccountPassword');
 $app->post('/groups', 'createGroup');
 $app->get('/groups/:id', 'getGroup');
 $app->put('/groups/:id/addUser', 'addUserToGroup');

From f3490fc6ced1af8d2c96b76c806d47c77553e4f1 Mon Sep 17 00:00:00 2001
From: Sebastian Bartus-Kunz <sbartus-kunz@nitton.de>
Date: Fri, 10 Jun 2016 15:08:33 +0200
Subject: [PATCH 002/308] Small fix.

---
 restapi/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/restapi/index.php b/restapi/index.php
index f98ebe8ef..99b9460b2 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -1398,7 +1398,7 @@ $app->get('/account/locked', 'getLockedDocuments');
 $app->post('/accounts', 'createAccount');
 $app->get('/accounts/:id', 'getAccountById');
 $app->put('/accounts/:id/disable', 'setDisabledAccount');
-$app->get('/accounts/:id/password', 'changeAccountPassword');
+$app->put('/accounts/:id/password', 'changeAccountPassword');
 $app->post('/groups', 'createGroup');
 $app->get('/groups/:id', 'getGroup');
 $app->put('/groups/:id/addUser', 'addUserToGroup');

From 2c1374bea52a17bf376de09d9176ae0948aff0c8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 27 Sep 2017 06:20:48 +0200
Subject: [PATCH 003/308] take out echo

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

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index deeae9e6a..b94f43ca9 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3799,7 +3799,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 d5f79f5f7c6bebd46be81406ed24c7b7d7521531 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 27 Sep 2017 18:36:59 +0200
Subject: [PATCH 004/308] various small improvements back ported from 6.0.x

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 99 +++++++++++++++----------
 1 file changed, 59 insertions(+), 40 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index ceec06ed5..a2c9f73da 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -58,6 +58,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
  *
@@ -150,6 +185,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;
@@ -165,6 +210,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		$this->_sequence = $sequence;
 		$this->_categories = array();
 		$this->_notifyList = array();
+		$this->_latestContent = null;
+		$this->_content = null;
 	} /* }}} */
 
 	/**
@@ -712,7 +759,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();
@@ -1265,8 +1312,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);
 		$docResultSet = new SeedDMS_Core_AddContentResultSet($content);
 		$docResultSet->setDMS($this->_dms);
@@ -1438,8 +1485,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;
@@ -1501,7 +1548,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	} /* }}} */
 
 	function getLatestContent() { /* {{{ */
-		if (!isset($this->_latestContent)) {
+		if (!$this->_latestContent) {
 			$db = $this->_dms->getDB();
 			$queryStr = "SELECT * FROM `tblDocumentContent` WHERE `document` = ".$this->_id." ORDER BY `version` DESC LIMIT 1";
 			$resArr = $db->getResultArray($queryStr);
@@ -2991,7 +3038,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return true;
 	} /* }}} */
 
-	function addIndReviewer($user, $requestUser, $listadmin=false) { /* {{{ */
+	function addIndReviewer($user, $requestUser) { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
 		$userID = $user->getID();
@@ -3000,21 +3047,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);
@@ -3226,7 +3258,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();
@@ -3235,19 +3267,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);
@@ -3473,7 +3492,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;
@@ -3504,7 +3523,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;
@@ -3536,7 +3555,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;
@@ -3567,7 +3586,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;

From 3912cbb5770bc8dc3e54de444e6772cb9926e2f6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 27 Sep 2017 18:37:37 +0200
Subject: [PATCH 005/308] list all rejected documents

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

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 6f9e672e1..4f8e3511f 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -407,6 +407,84 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 				else printMLText("no_docs_to_look_at");
 				
 				$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_REJECTED.") ".
+					"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_rejected"));
+				$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_REJECTED ){
+								$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\" width=\"".$previewwidth."\" 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>";	
+					
+				}
+				else printMLText("no_docs_to_look_at");
+				
+				$this->contentContainerEnd();
 			} elseif($workflowmode == 'advanced') {
 				// Get document list for the current user.
 				$workflowStatus = $user->getWorkflowStatus();

From 031887de0a9977cb065c32483d02e9618ee601de Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Sep 2017 07:21:08 +0200
Subject: [PATCH 006/308] add var noReadForStatus and method getLoggedInUser()

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

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index b982728b0..03b713229 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -147,6 +147,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
@@ -354,6 +361,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';
@@ -542,6 +550,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 f1f439af8c23590f9178e8bf105949b6ef6e3df2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Sep 2017 07:23:15 +0200
Subject: [PATCH 007/308] add support for access restrictions on document
 content

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

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index a2c9f73da..d9c397f8c 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -1495,7 +1495,10 @@ 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. 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
 	 */
@@ -1510,8 +1513,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']));
+			$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']);
+				if($user) {
+					if($content->getAccessMode($user) >= M_READ)
+						array_push($this->_content, $content);
+				} else {
+					array_push($this->_content, $content);
+				}
+			}
 		}
 
 		return $this->_content;
@@ -1520,8 +1531,13 @@ 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. 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 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;
@@ -1544,10 +1560,19 @@ 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']);
+		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'])) {
+			$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() { /* {{{ */
+	function __getLatestContent() { /* {{{ */
 		if (!$this->_latestContent) {
 			$db = $this->_dms->getDB();
 			$queryStr = "SELECT * FROM `tblDocumentContent` WHERE `document` = ".$this->_id." ORDER BY `version` DESC LIMIT 1";
@@ -1564,6 +1589,49 @@ 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
 	 *
@@ -2750,36 +2818,117 @@ 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/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
+	 * 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. 
+	 * 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
 	 */
 	function getAccessMode($u) { /* {{{ */
-		if(!$this->_workflow)
-			$this->getWorkflow();
+		$dms = $this->_document->_dms;
 
-		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(!$u)
 			return M_NONE;
+
+		/* If read access isn't further restricted by status, than grant read access */
+		if(!$dms->noReadForStatus)
+			return M_READ;
+		$noReadForStatus = $dms->noReadForStatus;
+
+		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'], $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($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
+		 * process, e.g. is a reviewer, approver or an active person in the workflow.
+		 */
+		$s = $this->getStatus();
+		switch($s['status']) {
+		case S_DRAFT_REV:
+			$status = $this->getReviewStatus();
+			foreach ($status as $r) {
+				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) {
+				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:
+			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_REJECTED:
+			break;
+		case S_OBSOLETE:
+			break;
+		case S_EXPIRED:
+			break;
 		}
 
-		return M_READ;
+		return M_NONE;
 	} /* }}} */
 
 	/**
@@ -3932,7 +4081,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 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 008/308] 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 dde468ca9e6d1a9d030125ff83fdde0353d27a38 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Sep 2017 20:48:29 +0200
Subject: [PATCH 009/308] make strict check for selected options in a select
 menu

without strict checking an option with value=0 will be treated as if
no option was selected.
---
 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 1fac139f5..7eba8eff8 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -777,7 +777,7 @@ if(!is_writeable($settings->_configFilePath)) {
 									echo "<select class=\"chzn-select\" name=\"extensions[".$extname."][".$confkey."][]\"".(!empty($conf['multiple']) ? "  multiple" : "").(!empty($conf['size']) ? "  size=\"".$conf['size']."\"" : "").">";
 									foreach($conf['options'] as $key=>$opt) {
 										echo "<option value=\"".$key."\"";
-										if(in_array($key, $selections))
+										if(in_array($key, $selections, true))
 											echo " selected";
 										echo ">".htmlspecialchars($opt)."</option>";
 									}

From 0b8b92076a3ed52fb340a5ecd69e9ab7b5e5402e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Oct 2017 07:37:21 +0200
Subject: [PATCH 010/308] remove linked files of a version if the version is
 deleted

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

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index d9c397f8c..ee228405c 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -1745,6 +1745,19 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 		}
 
+		// remove document files attached to version
+		$res = $this->getDocumentFiles($version->_version);
+		if (is_bool($res) && !$res) {
+			$db->rollbackTransaction();
+			return false;
+		}
+
+		foreach ($res as $documentfile)
+			if(!$this->removeDocumentFile($documentfile->getId())) {
+				$db->rollbackTransaction();
+				return false;
+			}
+
 		$db->commitTransaction();
 		return true;
 	} /* }}} */

From 89eeb98d828047f024277a2acdef51cc82c268c0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Oct 2017 17:58:13 +0200
Subject: [PATCH 011/308] add new method getDocumentsExpired()

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

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 03b713229..26a196243 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -596,6 +596,70 @@ class SeedDMS_Core_DMS {
 		return $user->getDocumentsLocked();
 	} /* }}} */
 
+	/**
+	 * Returns all documents which already expired or will expire in the future
+	 *
+	 * @param string $date date in format YYYY-MM-DD or an integer with the number
+	 *   of days. A negative value will cover the days in the past.
+	 * @return array list of documents
+	 */
+	function getDocumentsExpired($date, $user=null) { /* {{{ */
+		$db = $this->getDB();
+
+		if(is_int($date)) {
+			$ts = mktime(0, 0, 0) + $date * 86400;
+		} elseif(is_string($date)) {
+			$tmp = explode('-', $date, 3);
+			if(count($tmp) != 3)
+				return false;
+			$ts = mktime(0, 0, 0, $tmp[1], $tmp[2], $tmp[0]);
+		} else
+			return false;
+
+		$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 */
+			$updatestatus = true;
+		} else { /* Check for docs which will expire in the future */
+			$startts = $tsnow;
+			$endts = $ts+86400; /* Use end of day */
+			$updatestatus = false;
+		}
+
+		/* Get all documents which have an expiration date. It doesn't check for
+		 * the latest status which should be S_EXPIRED, but doesn't have to, because
+		 * status may have not been updated after the expiration date has been reached.
+		 **/
+		$queryStr = "SELECT `tblDocuments`.`id`, `tblDocumentStatusLog`.`status`  FROM `tblDocuments` ".
+			"LEFT JOIN `ttcontentid` ON `ttcontentid`.`document` = `tblDocuments`.`id` ".
+			"LEFT JOIN `tblDocumentContent` ON `tblDocuments`.`id` = `tblDocumentContent`.`document` AND `tblDocumentContent`.`version` = `ttcontentid`.`maxVersion` ".
+			"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`";
+		$queryStr .= 
+			" WHERE `tblDocuments`.`expires` > ".$startts." AND `tblDocuments`.`expires` < ".$endts;
+		if($user)
+			$queryStr .=
+				" AND `tblDocuments`.`owner` = '".$user->getID()."' ";
+		$queryStr .= 
+			" ORDER BY `expires` DESC";
+
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && !$resArr)
+			return false;
+
+		$documents = array();
+		$ts = mktime(0, 0, 0) + 86400;
+		foreach ($resArr as $row) {
+			$document = $this->getDocument($row["id"]);
+			if($updatestatus)
+				$document->verifyLastestContentExpriry();
+			$documents[] = $document;
+		}
+		return $documents;
+	} /* }}} */
+
 	/**
 	 * Returns a document by its name
 	 *

From 5bf132b17059f52ca1e2c213113d9390c704826c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Oct 2017 17:58:46 +0200
Subject: [PATCH 012/308] add virtual access mode for links and attachments

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

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index ee228405c..3359ab1a8 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -902,6 +902,12 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 * The function takes inherited access rights into account.
 	 * For a list of possible access rights see @file inc.AccessUtils.php
 	 *
+	 * Having access on a document does not necessarily mean the document
+	 * content is accessible too. Accessing the content is checked by
+	 * {@link SeedDMS_Core_DocumentContent::getAccessMode()} which calls
+	 * a callback function defined by the application. If the callback
+	 * function is not set, access on the content is always granted.
+	 *
 	 * @param $user object instance of class SeedDMS_Core_User
 	 * @return integer access mode
 	 */
@@ -1812,7 +1818,11 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		$resArr = $resArr[0];
 		$document = $this->_dms->getDocument($resArr["document"]);
 		$target = $this->_dms->getDocument($resArr["target"]);
-		return new SeedDMS_Core_DocumentLink($resArr["id"], $document, $target, $resArr["userID"], $resArr["public"]);
+		$link = new SeedDMS_Core_DocumentLink($resArr["id"], $document, $target, $resArr["userID"], $resArr["public"]);
+		$user = $this->_dms->getLoggedInUser();
+		if($link->getAccessMode($user, $document, $target) >= M_READ)
+			return $file;
+		return null;
 	} /* }}} */
 
 	/**
@@ -1847,9 +1857,12 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 				return false;
 			$this->_documentLinks = array();
 
+			$user = $this->_dms->getLoggedInUser();
 			foreach ($resArr as $row) {
 				$target = $this->_dms->getDocument($row["target"]);
-				array_push($this->_documentLinks, new SeedDMS_Core_DocumentLink($row["id"], $this, $target, $row["userID"], $row["public"]));
+				$link = new SeedDMS_Core_DocumentLink($row["id"], $this, $target, $row["userID"], $row["public"]);
+				if($link->getAccessMode($user, $this, $target) >= M_READ)
+					array_push($this->_documentLinks, $link);
 			}
 		}
 		return $this->_documentLinks;
@@ -1893,7 +1906,9 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			$links = array();
 			foreach ($resArr as $row) {
 				$document = $this->_dms->getDocument($row["document"]);
-				array_push($links, new SeedDMS_Core_DocumentLink($row["id"], $document, $this, $row["userID"], $row["public"]));
+				$link = new SeedDMS_Core_DocumentLink($row["id"], $document, $this, $row["userID"], $row["public"]);
+				if($link->getAccessMode($user, $document, $this) >= M_READ)
+					array_push($links, $link);
 			}
 
 		return $links;
@@ -1923,6 +1938,12 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		return true;
 	} /* }}} */
 
+	/**
+	 * Get attached file by its id
+	 *
+	 * @return object instance of SeedDMS_Core_DocumentFile, null if file is not
+	 * accessible, false in case of an sql error
+	 */
 	function getDocumentFile($ID) { /* {{{ */
 		$db = $this->_dms->getDB();
 
@@ -1933,9 +1954,18 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		if ((is_bool($resArr) && !$resArr) || count($resArr)==0) return false;
 
 		$resArr = $resArr[0];
-		return 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"]);
+		$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"]);
+		$user = $this->_dms->getLoggedInUser();
+		if($file->getAccessMode($user) >= M_READ)
+			return $file;
+		return null;
 	} /* }}} */
 
+	/**
+	 * Get list of files attached to document
+	 *
+	 * @return array list of files, false in case of an sql error
+	 */
 	function getDocumentFiles($version=0) { /* {{{ */
 		if (!isset($this->_documentFiles)) {
 			$db = $this->_dms->getDB();
@@ -1954,8 +1984,11 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 			$this->_documentFiles = array();
 
+			$user = $this->_dms->getLoggedInUser();
 			foreach ($resArr as $row) {
-				array_push($this->_documentFiles, 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 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"]);
+				if($file->getAccessMode($user) >= M_READ)
+					array_push($this->_documentFiles, $file);
 			}
 		}
 		return $this->_documentFiles;
@@ -2852,6 +2885,17 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	function getAccessMode($u) { /* {{{ */
 		$dms = $this->_document->_dms;
 
+		/* Check if 'onCheckAccessDocumentContent' callback is set */
+		if(isset($this->_dms->callbacks['onCheckAccessDocumentContent'])) {
+			foreach($this->_dms->callbacks['onCheckAccessDocumentContent'] as $callback) {
+				if(($ret = call_user_func($callback[0], $callback[1], $this, $u)) > 0) {
+					return $ret;
+				}
+			}
+		}
+
+		return M_READ;
+
 		if(!$u)
 			return M_NONE;
 
@@ -2860,9 +2904,6 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return M_READ;
 		$noReadForStatus = $dms->noReadForStatus;
 
-		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'], $noReadForStatus))
 			return M_READ;
@@ -4556,6 +4597,32 @@ class SeedDMS_Core_DocumentLink { /* {{{ */
 
 	function isPublic() { return $this->_public; }
 
+	/**
+	 * Returns the access mode similar to a document
+	 *
+	 * There is no real access mode for document links, so this is just
+	 * another way to add more access restrictions than the default restrictions.
+	 * It is only called for public document links, not accessed by the owner
+	 * or the administrator.
+	 *
+	 * @param object $u user
+	 * @return integer either M_NONE or M_READ
+	 */
+	function getAccessMode($u, $source, $target) { /* {{{ */
+		$dms = $this->_document->_dms;
+
+		/* Check if 'onCheckAccessDocumentLink' callback is set */
+		if(isset($this->_dms->callbacks['onCheckAccessDocumentLink'])) {
+			foreach($this->_dms->callbacks['onCheckAccessDocumentLink'] as $callback) {
+				if(($ret = call_user_func($callback[0], $callback[1], $this, $u, $source, $target)) > 0) {
+					return $ret;
+				}
+			}
+		}
+
+		return M_READ;
+	} /* }}} */
+
 } /* }}} */
 
 /**
@@ -4679,6 +4746,32 @@ class SeedDMS_Core_DocumentFile { /* {{{ */
 
 	function isPublic() { return $this->_public; }
 
+	/**
+	 * Returns the access mode similar to a document
+	 *
+	 * There is no real access mode for document files, so this is just
+	 * another way to add more access restrictions than the default restrictions.
+	 * It is only called for public document files, not accessed by the owner
+	 * or the administrator.
+	 *
+	 * @param object $u user
+	 * @return integer either M_NONE or M_READ
+	 */
+	function getAccessMode($u) { /* {{{ */
+		$dms = $this->_document->_dms;
+
+		/* Check if 'onCheckAccessDocumentLink' callback is set */
+		if(isset($this->_dms->callbacks['onCheckAccessDocumentFile'])) {
+			foreach($this->_dms->callbacks['onCheckAccessDocumentFile'] as $callback) {
+				if(($ret = call_user_func($callback[0], $callback[1], $this, $u)) > 0) {
+					return $ret;
+				}
+			}
+		}
+
+		return M_READ;
+	} /* }}} */
+
 } /* }}} */
 
 //

From 0a3d32785fab8dd9e8adacab81d9e9eaab634e5b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Oct 2017 17:59:46 +0200
Subject: [PATCH 013/308] new view for listing expired documents

---
 out/out.ExpiredDocuments.php               |  51 +++++++++++
 views/bootstrap/class.ExpiredDocuments.php | 100 +++++++++++++++++++++
 2 files changed, 151 insertions(+)
 create mode 100644 out/out.ExpiredDocuments.php
 create mode 100644 views/bootstrap/class.ExpiredDocuments.php

diff --git a/out/out.ExpiredDocuments.php b/out/out.ExpiredDocuments.php
new file mode 100644
index 000000000..4e38a85aa
--- /dev/null
+++ b/out/out.ExpiredDocuments.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) 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.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("expired_documents"),getMLText("access_denied"));
+}
+
+$orderby='n';
+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($_GET);
+	exit;
+}
+
+?>
diff --git a/views/bootstrap/class.ExpiredDocuments.php b/views/bootstrap/class.ExpiredDocuments.php
new file mode 100644
index 000000000..bf8e8993e
--- /dev/null
+++ b/views/bootstrap/class.ExpiredDocuments.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Implementation of ExpiredDocuments 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 ExpiredDocuments 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_ExpiredDocuments extends SeedDMS_Bootstrap_Style {
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$orderby = $this->params['orderby'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
+
+		$db = $dms->getDB();
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+
+		$this->htmlStartPage(getMLText("expired_documents"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("expired_documents"), "admin_tools");
+
+			$this->contentHeading(getMLText("all_documents"));
+			$this->contentContainerStart();
+
+			if($docs = $dms->getDocumentsExpired(-1400)) {
+
+				print "<table class=\"table table-condensed\">";
+				print "<thead>\n<tr>\n";
+				print "<th></th>";
+				print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=n\">".getMLText("name")."</a></th>\n";
+				print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=s\">".getMLText("status")."</a></th>\n";
+				print "<th>".getMLText("version")."</th>\n";
+//				print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=u\">".getMLText("last_update")."</a></th>\n";
+				print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=e\">".getMLText("expires")."</a></th>\n";
+				print "</tr>\n</thead>\n<tbody>\n";
+
+				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+				foreach ($docs as $document) {
+					print "<tr>\n";
+					$latestContent = $document->getLatestContent();
+					$previewer->createPreview($latestContent);
+					print "<td><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."\">";
+					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\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+					}
+					print "</a></td>";
+					print "<td><a href=\"out.ViewDocument.php?documentid=".$document->getID()."\">" . htmlspecialchars($document->getName()) . "</a></td>\n";
+					$status = $latestContent->getStatus();
+					print "<td>".getOverallStatusText($status["status"])."</td>";
+					print "<td>".$latestContent->getVersion()."</td>";
+//					print "<td>".$status["statusDate"]." ". htmlspecialchars($status["statusName"])."</td>";
+					print "<td>".(!$document->getExpires() ? "-":getReadableDate($document->getExpires()))."</td>";				
+					print "</tr>\n";
+				}
+				print "</tbody></table>";
+			}
+			else printMLText("empty_notify_list");
+			
+			$this->contentContainerEnd();
+
+		$this->contentEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>

From 44ed1bd93112bf96be0a9a2754fa072bca4b47f8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Oct 2017 18:00:57 +0200
Subject: [PATCH 014/308] add entries for 5.1.4

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index d2b6ae9f8..2535dbe5d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,8 @@
 --------------------------------------------------------------------------------
 - fix javascript error when indexing document, because the indexer was also
   created when the js-code was requested (Closes #340)
+- new list of expired documents
+- access on document links and attachments can be controlled by a hook
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.3

From 0577a058dc472fb4c8388dcc77eb661c1b9f710e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Oct 2017 18:05:39 +0200
Subject: [PATCH 015/308] fix title of page

---
 views/bootstrap/class.ExpiredDocuments.php | 68 +++++++++++-----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/views/bootstrap/class.ExpiredDocuments.php b/views/bootstrap/class.ExpiredDocuments.php
index bf8e8993e..bd682f529 100644
--- a/views/bootstrap/class.ExpiredDocuments.php
+++ b/views/bootstrap/class.ExpiredDocuments.php
@@ -52,46 +52,46 @@ class SeedDMS_View_ExpiredDocuments extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("expired_documents"), "admin_tools");
 
-			$this->contentHeading(getMLText("all_documents"));
-			$this->contentContainerStart();
+		$this->contentHeading(getMLText("expired_documents"));
+		$this->contentContainerStart();
 
-			if($docs = $dms->getDocumentsExpired(-1400)) {
+		if($docs = $dms->getDocumentsExpired(-1400)) {
 
-				print "<table class=\"table table-condensed\">";
-				print "<thead>\n<tr>\n";
-				print "<th></th>";
-				print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=n\">".getMLText("name")."</a></th>\n";
-				print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=s\">".getMLText("status")."</a></th>\n";
-				print "<th>".getMLText("version")."</th>\n";
+			print "<table class=\"table table-condensed\">";
+			print "<thead>\n<tr>\n";
+			print "<th></th>";
+			print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=n\">".getMLText("name")."</a></th>\n";
+			print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=s\">".getMLText("status")."</a></th>\n";
+			print "<th>".getMLText("version")."</th>\n";
 //				print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=u\">".getMLText("last_update")."</a></th>\n";
-				print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=e\">".getMLText("expires")."</a></th>\n";
-				print "</tr>\n</thead>\n<tbody>\n";
+			print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=e\">".getMLText("expires")."</a></th>\n";
+			print "</tr>\n</thead>\n<tbody>\n";
 
-				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
-				foreach ($docs as $document) {
-					print "<tr>\n";
-					$latestContent = $document->getLatestContent();
-					$previewer->createPreview($latestContent);
-					print "<td><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."\">";
-					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\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-					}
-					print "</a></td>";
-					print "<td><a href=\"out.ViewDocument.php?documentid=".$document->getID()."\">" . htmlspecialchars($document->getName()) . "</a></td>\n";
-					$status = $latestContent->getStatus();
-					print "<td>".getOverallStatusText($status["status"])."</td>";
-					print "<td>".$latestContent->getVersion()."</td>";
-//					print "<td>".$status["statusDate"]." ". htmlspecialchars($status["statusName"])."</td>";
-					print "<td>".(!$document->getExpires() ? "-":getReadableDate($document->getExpires()))."</td>";				
-					print "</tr>\n";
+			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+			foreach ($docs as $document) {
+				print "<tr>\n";
+				$latestContent = $document->getLatestContent();
+				$previewer->createPreview($latestContent);
+				print "<td><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."\">";
+				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\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 				}
-				print "</tbody></table>";
+				print "</a></td>";
+				print "<td><a href=\"out.ViewDocument.php?documentid=".$document->getID()."\">" . htmlspecialchars($document->getName()) . "</a></td>\n";
+				$status = $latestContent->getStatus();
+				print "<td>".getOverallStatusText($status["status"])."</td>";
+				print "<td>".$latestContent->getVersion()."</td>";
+//					print "<td>".$status["statusDate"]." ". htmlspecialchars($status["statusName"])."</td>";
+				print "<td>".(!$document->getExpires() ? "-":getReadableDate($document->getExpires()))."</td>";				
+				print "</tr>\n";
 			}
-			else printMLText("empty_notify_list");
-			
-			$this->contentContainerEnd();
+			print "</tbody></table>";
+		}
+		else printMLText("empty_notify_list");
+		
+		$this->contentContainerEnd();
 
 		$this->contentEnd();
 		$this->htmlEndPage();

From 2e628d462024d9e92695f349f9e0bd8d1eaea49f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Oct 2017 18:05:59 +0200
Subject: [PATCH 016/308] add list of expired documents

---
 views/bootstrap/class.MyDocuments.php | 57 +++++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 4f8e3511f..0aeb7cdfd 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -810,12 +810,63 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 					print "</tr>\n";
 				}		
 				print "</tbody></table>";	
-				
+
 			}
 			else printMLText("no_docs_locked");
-			
+
 			$this->contentContainerEnd();
-			
+
+			/* Documents expired */
+			if($docs = $dms->getDocumentsExpired(-3*365, $user)) {
+			$this->contentHeading(getMLText("documents_expired"));
+			$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 ($docs as $document) {
+				
+					print "<tr>\n";
+					$latestContent = $document->getLatestContent();
+					if($workflowmode == 'advanced')
+						$workflow = $latestContent->getWorkflow();
+					$previewer->createPreview($latestContent);
+					print "<td><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."\">";
+					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\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+					}
+					print "</a></td>";
+					$status = $latestContent->getStatus();
+					print "<td><a href=\"out.ViewDocument.php?documentid=".$document->getID()."\">" . htmlspecialchars($document->getName()) . "</a></td>\n";
+					if($workflowmode == 'advanced' && $workflow) {
+						$workflowstate = $latestContent->getWorkflowState();
+						print '<td>'.getOverallStatusText($status["status"]).': '.$workflow->getName().'<br />'.$workflowstate->getName().'</td>';
+					} else {
+						print "<td>".getOverallStatusText($status["status"])."</td>";
+					}
+					print "<td>".$latestContent->getVersion()."</td>";
+					print "<td>".$status["date"]." ".htmlspecialchars($dms->getUser($status["userID"])->getFullName())."</td>";
+					print "<td>".(!$document->getExpires() ? "-":getReadableDate($document->getExpires()))."</td>";				
+					print "</tr>\n";
+				}		
+				print "</tbody></table>";	
+
+			}
+			else printMLText("no_docs_locked");
+
+			$this->contentContainerEnd();
+			}
+
 		}
 		else {
 

From 856d7a85af689c116f6979306ecb3b1e2ee3125b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Oct 2017 18:06:18 +0200
Subject: [PATCH 017/308] add menu item for expired documents

---
 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 addd3163f..c63eed521 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -661,6 +661,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "      <li><a href=\"../out/out.Charts.php\">".getMLText("charts")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.Timeline.php\">".getMLText("timeline")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.ObjectCheck.php\">".getMLText("objectcheck")."</a></li>\n";
+		echo "      <li><a href=\"../out/out.ExpiredDocuments.php\">".getMLText("documents_expired")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.ExtensionMgr.php\">".getMLText("extension_manager")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.ClearCache.php\">".getMLText("clear_cache")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.Info.php\">".getMLText("version_info")."</a></li>\n";

From 1fe00c1a027966c881e07aac8b4c97e56bb57279 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Oct 2017 18:06:34 +0200
Subject: [PATCH 018/308] add changes for 5.1.4

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

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index f7088d46a..422bfa92f 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,6 +24,9 @@
  </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>
  <contents>

From b1c4b63acef3f01d352ece7cd4f1593efe0cc3ee Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Oct 2017 18:08:13 +0200
Subject: [PATCH 019/308] various updates

---
 languages/ar_EG/lang.inc |   15 +-
 languages/bg_BG/lang.inc |   13 +-
 languages/ca_ES/lang.inc |    1 +
 languages/cs_CZ/lang.inc |    9 +-
 languages/de_DE/lang.inc |    5 +-
 languages/el_GR/lang.inc |    1 +
 languages/en_GB/lang.inc |   29 +-
 languages/es_ES/lang.inc |    7 +-
 languages/fr_FR/lang.inc |  393 +++++++-------
 languages/hr_HR/lang.inc |    1 +
 languages/hu_HU/lang.inc |    1 +
 languages/it_IT/lang.inc |   11 +-
 languages/ko_KR/lang.inc |    1 +
 languages/nl_NL/lang.inc |   11 +-
 languages/pl_PL/lang.inc |   19 +-
 languages/pt_BR/lang.inc |    5 +-
 languages/ro_RO/lang.inc |    5 +-
 languages/ru_RU/lang.inc |    1 +
 languages/sk_SK/lang.inc |    1 +
 languages/sv_SE/lang.inc |   22 +-
 languages/tr_TR/lang.inc |    1 +
 languages/uk_UA/lang.inc |    1 +
 languages/zh_CN/lang.inc | 1053 ++++++++++++++++++++++----------------
 languages/zh_TW/lang.inc |    1 +
 24 files changed, 906 insertions(+), 701 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index dfd192cea..befec2fca 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 (1277)
+//    Translators: Admin (1283)
 
 $text = array(
 '2_factor_auth' => '',
@@ -312,6 +312,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'المستندات',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'مستندات رهن المعالجة',
 'documents_locked' => '',
 'documents_locked_by_you' => 'المستندات محمية من التعديل بواسطتك',
@@ -461,14 +462,14 @@ URL: [url]',
 'expired' => 'انتهى صلاحيته',
 'expired_at_date' => '',
 'expires' => 'تنتهى صلاحيته',
-'expire_by_date' => '',
+'expire_by_date' => 'ﻲﻨﺘﻫﻯ ﻑﻯ ﺕﺍﺮﻴﺧ',
 'expire_in_1d' => '',
 'expire_in_1h' => '',
-'expire_in_1m' => '',
-'expire_in_1w' => '',
-'expire_in_1y' => '',
+'expire_in_1m' => 'ﻲﻨﺘﻫﻯ ﻑﻯ 1 ﺶﻫﺭ',
+'expire_in_1w' => 'ﻲﻨﺘﻫﻯ ﻑﻯ 1 ﺎﺴﺑﻮﻋ',
+'expire_in_1y' => 'ﻲﻨﺘﻫﻯ ﻑﻯ 1 ﺲﻧﺓ',
 'expire_in_2h' => '',
-'expire_in_2y' => '',
+'expire_in_2y' => 'ﻲﻨﺘﻫﻯ ﻑﻯ 2 ﺲﻧﺓ',
 'expire_today' => '',
 'expire_tomorrow' => '',
 'expiry_changed_email' => 'تم تغيير تاريخ الصلاحية',
@@ -837,7 +838,7 @@ URL: [url]',
 'personal_default_keywords' => 'قوائم الكلمات البحثية الشخصية',
 'pl_PL' => 'ﺎﻠﺑﻮﻠﻧﺪﻳﺓ',
 'possible_substitutes' => '',
-'preset_expires' => '',
+'preset_expires' => 'ﺕﺍﺮﻴﺧ ﺍﻼﻨﺘﻫﺍﺀ',
 'preview' => '',
 'preview_converters' => '',
 'preview_images' => '',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index cdd82ff53..3f57f74a6 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/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 (831)
+//    Translators: Admin (836)
 
 $text = array(
 '2_factor_auth' => '',
@@ -235,7 +235,7 @@ $text = array(
 'clear_cache' => 'Изчистване на кеша',
 'clear_clipboard' => '',
 'clear_password' => '',
-'clipboard' => '',
+'clipboard' => 'Клипборд',
 'close' => 'Затвори',
 'command' => '',
 'comment' => 'Коментар',
@@ -297,6 +297,7 @@ $text = array(
 'documentcontent' => '',
 'documents' => 'Документи',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'Документи в процес на работа',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Документи, блокирани от Вас',
@@ -358,7 +359,7 @@ $text = array(
 'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Файл от drop папка',
 'dropfolder_folder' => '',
-'dropupload' => '',
+'dropupload' => 'Бърз ъплоуд',
 'drop_files_here' => 'Пусни файла тук!',
 'dump_creation' => 'Създаване дъмп на БД',
 'dump_creation_warning' => 'Тази операция шъ създаде дамп на базата данни. След създаването, файлът ще бъде съхранен в папката с данни на сървъра.',
@@ -1248,7 +1249,7 @@ $text = array(
 'sign_out_user' => '',
 'sk_SK' => 'Словашки',
 'space_used_on_data_folder' => 'Размер на каталога с данните',
-'splash_added_to_clipboard' => '',
+'splash_added_to_clipboard' => 'Добавено към клипборда',
 'splash_add_attribute' => '',
 'splash_add_group' => '',
 'splash_add_group_member' => '',
@@ -1263,7 +1264,7 @@ $text = array(
 'splash_document_edited' => '',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Документът е заключен',
-'splash_document_unlocked' => '',
+'splash_document_unlocked' => 'Документа е отключен',
 'splash_edit_attribute' => '',
 'splash_edit_event' => '',
 'splash_edit_group' => '',
@@ -1284,7 +1285,7 @@ $text = array(
 'splash_rm_attribute' => '',
 'splash_rm_document' => 'Документът е преместен',
 'splash_rm_download_link' => '',
-'splash_rm_folder' => '',
+'splash_rm_folder' => 'Папката е изтрита',
 'splash_rm_group' => '',
 'splash_rm_group_member' => '',
 'splash_rm_role' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index aef6afc4b..f1453366a 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -302,6 +302,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Documents',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'Documents en procés',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Documents bloquejats per vostè',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 12885970b..d0f2d34d7 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 (726), kreml (455)
+//    Translators: Admin (729), kreml (455)
 
 $text = array(
 '2_factor_auth' => '',
@@ -319,6 +319,7 @@ URL: [url]',
 'documentcontent' => 'Obsah dokumentu',
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'Zpracovávané dokumenty',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Vámi uzamčené dokumenty',
@@ -472,10 +473,10 @@ URL: [url]',
 'expire_in_1d' => '',
 'expire_in_1h' => '',
 'expire_in_1m' => 'Expiruje o mesiac',
-'expire_in_1w' => '',
-'expire_in_1y' => '',
+'expire_in_1w' => 'Expiruje za týden',
+'expire_in_1y' => 'Expiruje za rok',
 'expire_in_2h' => '',
-'expire_in_2y' => '',
+'expire_in_2y' => 'Expiruje za dva roky',
 'expire_today' => '',
 'expire_tomorrow' => '',
 'expiry_changed_email' => 'Datum expirace změněno',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 0052b399f..77d35e8b3 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 (2481), dgrutsch (22)
+//    Translators: Admin (2483), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -324,6 +324,7 @@ URL: [url]',
 'documentcontent' => 'Dokumentenversion',
 'documents' => 'Dokumente',
 'documents_checked_out_by_you' => 'Von mir ausgecheckte Dokumente',
+'documents_expired' => 'Abgelaufende Dokumente',
 'documents_in_process' => 'Dokumente in Bearbeitung',
 'documents_locked' => 'Gesperrte Dokumente',
 'documents_locked_by_you' => 'Von mir gesperrte Dokumente',
@@ -1217,7 +1218,7 @@ Name: [username]
 'settings_enableConverting' => 'Dokumentenkonvertierung einschalten',
 'settings_enableConverting_desc' => 'Ein/Auschalten der automatischen Konvertierung von Dokumenten',
 'settings_enableDropFolderList' => 'Liste der Dateien im Ablageordner im Menü',
-'settings_enableDropFolderList_desc' => '',
+'settings_enableDropFolderList_desc' => 'Schaltet einen Liste der im Ablageordner befindlichen Dateien als Eintrag im Menü ein.',
 'settings_enableDropUpload' => 'Schnelles Hochladen einschalten',
 'settings_enableDropUpload_desc' => 'Ein/Ausschalten des Bereichs auf der \'View Folder\' Seite zum Hochladen von Dateien per Drag&Drop.',
 'settings_enableDuplicateDocNames' => 'Erlaube doppelte Dokumentennamen',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 24b17965b..c8464578f 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -297,6 +297,7 @@ $text = array(
 'documentcontent' => '',
 'documents' => 'Έγγραφα',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => '',
 'documents_locked' => '',
 'documents_locked_by_you' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index a17a10b05..19b1d1c4e 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 (1608), dgrutsch (9), netixw (14)
+//    Translators: Admin (1610), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -324,6 +324,7 @@ URL: [url]',
 'documentcontent' => 'Document content',
 'documents' => 'Documents',
 'documents_checked_out_by_you' => 'Documents checked out by you',
+'documents_expired' => 'Expired documents',
 'documents_in_process' => 'Documents In Process',
 'documents_locked' => 'Locked documents',
 'documents_locked_by_you' => 'Documents locked by you',
@@ -381,21 +382,21 @@ User: [username]
 URL: [url]',
 'document_renamed_email_subject' => '[sitename]: [name] - Document renamed',
 'document_status_changed_email' => 'Document status changed',
-'document_status_changed_email_body' => 'Document status changed
-Document: [name]
-Status: [status]
-Parent folder: [folder_path]
-User: [username]
+'document_status_changed_email_body' => 'Document status changed
+Document: [name]
+Status: [status]
+Parent folder: [folder_path]
+User: [username]
 URL: [url]',
 'document_status_changed_email_subject' => '[sitename]: [name] - Document status changed',
 'document_title' => 'Document \'[documentname]\'',
 'document_updated_email' => 'Document updated',
-'document_updated_email_body' => 'Document updated
-Document: [name]
-Parent folder: [folder_path]
-User: [username]
-Comment: [comment]
-Version comment: [version_comment]
+'document_updated_email_body' => 'Document updated
+Document: [name]
+Parent folder: [folder_path]
+User: [username]
+Comment: [comment]
+Version comment: [version_comment]
 URL: [url]',
 'document_updated_email_subject' => '[sitename]: [name] - Document updated',
 'does_not_expire' => 'Does not expire',
@@ -1056,7 +1057,7 @@ URL: [url]',
 'role_info' => 'Information',
 'role_management' => 'Role management',
 'role_name' => 'Name',
-'role_type' => 'Typ of role',
+'role_type' => 'Type of role',
 'role_user' => 'User',
 'ro_RO' => 'Romanian',
 'run_subworkflow' => 'Run sub workflow',
@@ -1212,7 +1213,7 @@ Name: [username]
 'settings_enableConverting' => 'Enable Converting',
 'settings_enableConverting_desc' => 'Enable/disable converting of files',
 'settings_enableDropFolderList' => 'Enable list of files in drop folder in menu',
-'settings_enableDropFolderList_desc' => '',
+'settings_enableDropFolderList_desc' => 'Turn on a list of files in the drop folder. The list is shown in the main menu.',
 'settings_enableDropUpload' => 'Enable Fast Upload',
 'settings_enableDropUpload_desc' => 'Enable/Disable the drop area on the \'View Folder\' page for uploading files by Drag&Drop.',
 'settings_enableDuplicateDocNames' => 'Allow duplicate document names',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 77fbf5d27..1a804b1f8 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 (1036), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1038), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -319,6 +319,7 @@ URL: [url]',
 'documentcontent' => 'Contenido del documento',
 'documents' => 'Documentos',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'Documentos en proceso',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Documentos bloqueados por usted',
@@ -459,7 +460,7 @@ URL: [url]',
 'error_no_folder_selected' => 'Ninguna carpeta seleccionada',
 'error_occured' => 'Ha ocurrido un error',
 'error_remove_document' => '',
-'error_remove_folder' => '',
+'error_remove_folder' => 'Error al eliminar la carpeta',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => 'Castellano',
@@ -1327,7 +1328,7 @@ URL: [url]',
 'settings_SaveError' => 'Error guardando archivo de configuración',
 'settings_Server' => 'Configuración del servidor',
 'settings_showFullPreview' => 'Visualizar documento completo',
-'settings_showFullPreview_desc' => '',
+'settings_showFullPreview_desc' => 'Habilitar/deshabilitar una vista previa completa del documento en la página de detalles, siempre y cuando el navegador lo permita.',
 'settings_showMissingTranslations' => 'Mostrar traducciones faltantes',
 'settings_showMissingTranslations_desc' => 'Listar todos los términos pendientes de traducción de esta página al final de la misma. En entorno productivo no activar esta función',
 'settings_showSingleSearchHit' => '',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index a49bbca37..d87bb4881 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 (1063), jeromerobert (50), lonnnew (9), Oudiceval (275)
+//    Translators: Admin (1064), jeromerobert (50), lonnnew (9), Oudiceval (465)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -34,7 +34,7 @@ $text = array(
 'access_mode_all' => 'Contrôle total',
 'access_mode_none' => 'Aucun accès',
 'access_mode_read' => 'Lecture',
-'access_mode_readwrite' => 'Lecture-Ecriture',
+'access_mode_readwrite' => 'Lecture-écriture',
 'access_permission_changed_email' => 'Permission modifiée',
 'access_permission_changed_email_body' => 'Permission modifiée
 Document: [name]
@@ -45,7 +45,7 @@ URL: [url]',
 'according_settings' => 'Paramètres en fonction',
 'action' => 'Action',
 'actions' => 'Actions',
-'action_approve' => 'Aprouver',
+'action_approve' => 'Approuver',
 'action_complete' => 'Compléter',
 'action_is_complete' => 'Complet',
 'action_is_not_complete' => 'Non complet',
@@ -53,22 +53,22 @@ URL: [url]',
 'action_review' => 'Vérifier',
 'action_revise' => 'Réviser',
 'add' => 'Ajouter',
-'add_approval' => 'Soumettre approbation',
-'add_attrdefgroup' => '',
+'add_approval' => 'Confirmer l’approbation',
+'add_attrdefgroup' => 'Ajouter un nouveau groupe d’attributs',
 'add_document' => 'Ajouter un document',
 'add_document_link' => 'Ajouter un lien',
 '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_reviewer_approver_warning' => 'N.B. Les documents sont automatiquement marqués comme publiés s’il n’y a pas d’examinateur 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',
 'add_group' => 'Ajouter un groupe',
 '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_revision' => '',
-'add_role' => '',
+'add_receipt' => 'Confirmer la réception',
+'add_review' => 'Confirmer la vérification',
+'add_revision' => 'Confirmer l’approbation',
+'add_role' => 'Ajouter un rôle',
 'add_subfolder' => 'Ajouter un sous-dossier',
 'add_to_clipboard' => 'Ajouter au presse-papiers',
 'add_to_transmittal' => '',
@@ -88,14 +88,14 @@ URL: [url]',
 'already_subscribed' => 'Déjà abonné',
 'and' => 'et',
 'apply' => 'Appliquer',
-'approvals_accepted' => '',
-'approvals_and_reviews_accepted' => '',
-'approvals_and_reviews_not_touched' => '',
-'approvals_and_reviews_rejected' => '',
-'approvals_not_touched' => '',
-'approvals_rejected' => '',
-'approvals_without_group' => '',
-'approvals_without_user' => '',
+'approvals_accepted' => '[no_approvals] approbations déjà confirmées',
+'approvals_and_reviews_accepted' => '[no_approvals] approbations et [no_reviews] vérifications déjà confirmées',
+'approvals_and_reviews_not_touched' => '[no_approvals] approbations et [no_reviews] vérifications non amorcées',
+'approvals_and_reviews_rejected' => '[no_approvals] approbations et [no_reviews] vérifications déjà rejetées',
+'approvals_not_touched' => '[no_approvals] approbations non amorcées',
+'approvals_rejected' => '[no_approvals] approbations déjà rejetées',
+'approvals_without_group' => 'Approbations sans groupe',
+'approvals_without_user' => 'Approbations sans utilisateur',
 'approval_deletion_email' => 'Demande d\'approbation supprimée',
 'approval_deletion_email_body' => 'Demande d\'approbation supprimée
 Document : [name]
@@ -116,7 +116,7 @@ Utilisateur: [username]
 URL: [url]',
 'approval_request_email_subject' => '[sitename]: [name] - Demande d\'approbation',
 'approval_status' => 'Statut d\'approbation',
-'approval_submit_email' => '',
+'approval_submit_email' => 'Approbation d\'un document',
 'approval_submit_email_body' => 'Approbation d\'un document
 Document : [name]
 Version : [version]
@@ -126,20 +126,20 @@ Commentaire : [comment]
 Utilisateur : [username]
 URL : [url]',
 'approval_submit_email_subject' => '[sitename]: [name] - Approbation soumise',
-'approval_summary' => 'Sommaire d\'approbation',
+'approval_summary' => 'Vue d’ensemble approbation',
 'approval_update_failed' => 'Erreur de la mise à jour du statut d\'approbation. Echec de la mise à jour.',
 'approvers' => 'Approbateurs',
 'approver_already_assigned' => 'L’utilisateur est déjà assigné comme approbateur.',
-'approver_already_removed' => '',
+'approver_already_removed' => 'L’approbateur a déjà été retiré du processus d’approbation ou a déjà soumis l’approbation.',
 'april' => 'Avril',
 'archive_creation' => 'Créer une 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.',
 'ar_EG' => 'Arabe – Égypte',
 'assign_approvers' => 'Approbateurs désignés',
-'assign_reviewers' => 'Correcteurs désignés',
+'assign_reviewers' => 'Examinateurs désignés',
 'assign_user_property_to' => 'Assigner les propriétés de l\'utilisateur à',
 'assumed_released' => 'Supposé publié',
-'attrdefgroup_management' => '',
+'attrdefgroup_management' => 'Gestion des groupes d’attributs',
 'attrdefgrp_show_detail' => 'Détails',
 'attrdefgrp_show_list' => 'Liste',
 'attrdefgrp_show_search' => 'Recherche',
@@ -152,7 +152,7 @@ URL : [url]',
 'attrdef_minvalues' => 'Nombre minimum de valeurs',
 'attrdef_min_greater_max' => 'Le nombre minimum de valeurs est supérieur au maximum',
 'attrdef_multiple' => 'Permettre des valeurs multiples',
-'attrdef_multiple_needs_valueset' => '',
+'attrdef_multiple_needs_valueset' => 'Une définition d’attribut à valeurs multiples nécessite un ensemble de valeurs.',
 'attrdef_must_be_multiple' => 'L\'attribut a plusieurs valeurs mais n\'est pas définit comme possédant des valeurs multiples',
 'attrdef_name' => 'Nom',
 'attrdef_noname' => 'Le nom d\'attribut est manquant',
@@ -178,7 +178,7 @@ URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: [name] - Attribut changé',
 'attribute_count' => 'Nombre d\'utilisations',
 'attribute_value' => 'Valeur de l\'attribut',
-'attribute_value_not_in_valueset' => '',
+'attribute_value_not_in_valueset' => 'Valeur en dehors de l’ensemble',
 'attr_malformed_boolean' => 'La valeur « [value] » de l’attribut « [attrname] » n’est pas un booléen valide.',
 'attr_malformed_date' => 'La valeur « [value] » de l’attribut « [attrname] » n’est pas une date valide.',
 'attr_malformed_email' => 'La valeur « [value] » de l’attribut « [attrname] » n’est pas une adresse e-mail valide.',
@@ -207,12 +207,12 @@ URL: [url]',
 'calendar_week' => 'Semaine',
 'cancel' => 'Annuler',
 'cannot_assign_invalid_state' => 'Impossible de modifier un document obsolète ou rejeté',
-'cannot_change_final_states' => 'Attention: Vous ne pouvez pas modifier le statut d\'un document rejeté, expiré ou en attente de révision ou d\'approbation',
+'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.',
 'cannot_delete_user' => 'Ne peut pas effacer l\'utilisateur',
 'cannot_delete_yourself' => 'Vous ne pouvez pas vous supprimer',
 'cannot_move_root' => 'Erreur : Impossible de déplacer le dossier racine.',
 'cannot_retrieve_approval_snapshot' => 'Impossible de retrouver l\'instantané de statut d\'approbation pour cette version de document.',
-'cannot_retrieve_review_snapshot' => 'Impossible de retrouver l\'instantané de statut de correction pour cette version du document.',
+'cannot_retrieve_review_snapshot' => 'Impossible de récupérer l’instantané du statut de vérification pour cette version du document.',
 'cannot_rm_root' => 'Erreur : Dossier racine ineffaçable.',
 'categories' => 'Catégories',
 'categories_loading' => 'Veuillez patienter durant le chargement de la liste des catégories…',
@@ -226,15 +226,15 @@ 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_recipients' => 'Définir destinataires',
 'change_revisors' => '',
 'change_status' => 'Modifier le statut',
 'charts' => 'Graphiques',
 'chart_docsaccumulated_title' => 'Nombre de documents',
 'chart_docspercategory_title' => 'Documents par catégorie',
 'chart_docspermimetype_title' => 'Documents par type',
-'chart_docspermonth_title' => 'Nouveau document par mois',
-'chart_docsperstatus_title' => 'Documents par status',
+'chart_docspermonth_title' => 'Nouveaux documents par mois',
+'chart_docsperstatus_title' => 'Documents par statut',
 'chart_docsperuser_title' => 'Documents par utilisateur',
 'chart_selection' => 'Sélectionnez un graphique',
 'chart_sizeperuser_title' => 'Volume par utilisateur',
@@ -246,7 +246,7 @@ URL: [url]',
 'checkout_document' => 'Bloquer (check-out)',
 'checkout_is_disabled' => 'Le blocage (check-out) de documents est désactivé dans la configuration.',
 'choose_attrdef' => 'Choisissez une définition d\'attribut',
-'choose_attrdefgroup' => '',
+'choose_attrdefgroup' => 'Choisir un groupe d’attributs',
 'choose_category' => 'Sélectionnez une catégorie',
 'choose_group' => 'Choisir un groupe',
 'choose_role' => 'Choisir un rôle',
@@ -285,7 +285,7 @@ URL: [url]',
 'confirm_rm_transmittal' => '',
 '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_user_from_processes' => '',
+'confirm_rm_user_from_processes' => 'Voulez-vous vraiment retirer l’utilisateur « [username] » de tous les processus ?<br>Attention : Cette action peut entrainer la publication des documents si l’utilisateur était le seul (ou dernier) approbateur.',
 'confirm_rm_version' => 'Voulez-vous réellement supprimer la [version] du document "[documentname]"?<br>Attention: Cette action ne peut pas être annulée.',
 'confirm_transfer_objects' => 'Voulez-vous vraiment transférer les documents, dossiers, etc. de l’utilisateur « [username] » ?<br>Attention : Cette action est irréversible.',
 'confirm_update_transmittalitem' => '',
@@ -294,7 +294,7 @@ URL: [url]',
 '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])',
-'create_download_link' => '',
+'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',
@@ -324,16 +324,17 @@ URL: [url]',
 'documentcontent' => 'Version de document',
 'documents' => 'Documents',
 'documents_checked_out_by_you' => 'Documents bloqués par vous',
+'documents_expired' => '',
 'documents_in_process' => 'Documents en cours',
 'documents_locked' => 'Documents verrouillés',
 'documents_locked_by_you' => 'Documents verrouillés',
 'documents_only' => 'Documents uniquement',
 'documents_to_approve' => 'Documents en attente d\'approbation',
 'documents_to_process' => 'Documents à traiter',
-'documents_to_receipt' => '',
-'documents_to_review' => 'Documents en attente de correction',
+'documents_to_receipt' => 'Documents en attente de confirmation de réception',
+'documents_to_review' => 'Documents en attente de vérification',
 'documents_to_revise' => '',
-'documents_user_reception' => '',
+'documents_user_reception' => 'Documents en attente de réception',
 'documents_user_rejected' => 'Documents rejetés',
 'documents_user_requiring_attention' => 'Documents à surveiller',
 'documents_with_notification' => 'Documents avec notification',
@@ -416,8 +417,8 @@ Le lien est valide jusqu’au [valid].
 'do_object_setfilesize' => 'Définir la taille du fichier',
 'do_object_unlink' => 'Supprimer la version du document',
 'draft' => 'Ébauche',
-'draft_pending_approval' => 'Ebauche - En cours d\'approbation',
-'draft_pending_review' => 'Ebauche - En cours de correction',
+'draft_pending_approval' => 'Ébauche - en attente d’approbation',
+'draft_pending_review' => 'Ébauche - en attente de vérification',
 'drag_icon_here' => 'Glisser/déposer le fichier ou document ici!',
 'dropfolderdir_missing' => 'Votre dossier de dépôt personnel n\'existe pas sur le serveur ! Veuillez faire une demande à l\'administrateur.',
 'dropfolder_file' => 'Fichier du dossier de dépôt',
@@ -564,13 +565,13 @@ URL: [url]',
 'global_workflow_states' => 'Etat de Workflow',
 'group' => 'Groupe',
 'groups' => 'Groupes',
-'group_approval_summary' => 'Résumé groupe d\'approbation',
+'group_approval_summary' => 'Vue d’ensemble groupe approbation',
 'group_exists' => 'Ce groupe existe déjà.',
 'group_info' => 'Informations du groupe',
-'group_management' => 'Groupes',
+'group_management' => 'Gestion des groupes',
 'group_members' => 'Membres de groupes',
-'group_receipt_summary' => '',
-'group_review_summary' => 'Résumé groupe correcteur',
+'group_receipt_summary' => 'Vue d’ensemble groupe réception',
+'group_review_summary' => 'Vue d’ensemble groupe vérification',
 'guest_login' => 'Se connecter comme invité',
 'guest_login_disabled' => 'Connexion d\'invité désactivée.',
 'hash' => 'Hash',
@@ -592,14 +593,14 @@ URL: [url]',
 'include_documents' => 'Inclure les documents',
 'include_subdirectories' => 'Inclure les sous-dossiers',
 'indexing_tasks_in_queue' => 'Opérations d’indexation en attente',
-'index_converters' => 'Conversion de document Index',
+'index_converters' => 'Conversion des documents pour indexation',
 'index_done' => 'Terminé',
 'index_error' => 'Erreur',
 'index_folder' => 'Dossier Index',
 'index_pending' => 'En attente',
 'index_waiting' => 'Chargement…',
 'individuals' => 'Individuels',
-'indivіduals_in_groups' => '',
+'indivіduals_in_groups' => 'Membres d’un groupe',
 'inherited' => 'hérité',
 'inherits_access_copy_msg' => 'Copier la liste des accès hérités',
 'inherits_access_empty_msg' => 'Commencer avec une liste d\'accès vide',
@@ -620,7 +621,7 @@ URL: [url]',
 'invalid_group_id' => 'Identifiant de groupe invalide',
 'invalid_link_id' => 'Identifiant de lien invalide',
 'invalid_request_token' => 'Jeton de demande incorrect',
-'invalid_review_status' => 'Statut de correction invalide',
+'invalid_review_status' => 'Statut de vérification invalide',
 'invalid_sequence' => 'Valeur de séquence invalide',
 'invalid_status' => 'Statut de document invalide',
 'invalid_target_doc_id' => 'Identifiant de document cible invalide',
@@ -649,8 +650,8 @@ URL: [url]',
 'js_no_override_status' => 'Veuillez sélectionner le nouveau statut [override]',
 'js_no_pwd' => 'Vous devez saisir votre mot de passe',
 'js_no_query' => 'Saisir une requête',
-'js_no_review_group' => 'Veuillez sélectionner un groupe de correcteurs',
-'js_no_review_status' => 'Veuillez sélectionner le statut de correction',
+'js_no_review_group' => 'Veuillez sélectionner un groupe d’examinateurs',
+'js_no_review_status' => 'Veuillez sélectionner le statut de vérification',
 'js_pwd_not_conf' => 'Mot de passe et confirmation de mot de passe non identiques',
 'js_select_user' => 'Veuillez sélectionner un utilisateur',
 'js_select_user_or_group' => 'Sélectionner au moins un utilisateur ou un groupe',
@@ -670,9 +671,9 @@ URL: [url]',
 'librarydoc' => '',
 'linked_documents' => 'Documents liés',
 'linked_files' => 'Fichiers attachés',
-'linked_to_current_version' => '',
-'linked_to_document' => '',
-'linked_to_this_version' => '',
+'linked_to_current_version' => 'Lié à la version actuelle',
+'linked_to_document' => 'Lié au document',
+'linked_to_this_version' => 'Lié à cette version',
 'link_alt_updatedocument' => 'Pour déposer des fichiers de taille supérieure, utilisez la <a href="%s">page d\'ajout multiple</a>.',
 'link_to_version' => 'Version',
 'list_access_rights' => 'Liste des droits d’accès…',
@@ -691,14 +692,14 @@ URL: [url]',
 'login_not_given' => 'Nom utilisateur non fourni',
 'login_ok' => 'Connexion établie',
 'logout' => 'Déconnexion',
-'log_management' => 'Gestion des fichiers Log',
+'log_management' => 'Gestion des fichiers journaux',
 'manager' => 'Responsable',
 'manager_of_group' => 'Vous êtes le gestionnaire de ce groupe',
 'mandatory_approvergroups' => 'Obligatoire : groupes de valideurs',
 'mandatory_approvergroup_no_access' => 'Groupe requis d\'approbateurs \'[group]\' ne dispose pas des droits suffisants',
 'mandatory_approvers' => 'Approbateurs désignés',
 'mandatory_approver_no_access' => 'L\'approbateur désigné \'[user]\' ne dispose pas des droits d\'accès suffisants.',
-'mandatory_reviewergroups' => 'Obligatoire : groupe des relecteurs',
+'mandatory_reviewergroups' => 'Groupe obligatoire d’examinateurs',
 'mandatory_reviewergroup_no_access' => 'Groupe d\'examinateurs \'[group]\' ne dispose pas des droits suffisants',
 'mandatory_reviewers' => 'Examinateurs',
 'mandatory_reviewer_no_access' => 'Examinateur \'[user]\' ne dispose pas des droits suffisants',
@@ -789,11 +790,11 @@ URL: [url]',
 'no_default_keywords' => 'Aucun mot-clé disponible',
 'no_docs_checked_out' => '',
 'no_docs_locked' => 'Aucun document verrouillé',
-'no_docs_rejected' => '',
+'no_docs_rejected' => 'Aucun document rejeté.',
 '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_receipt' => 'Aucune confirmation de réception de document n’est requise',
+'no_docs_to_review' => 'Aucun document en attente de vérification',
 'no_docs_to_revise' => '',
 'no_email_or_login' => 'L’identifiant et l’e-mail doivent être saisis.',
 'no_fulltextindex' => 'Aucun fichier d\'index disponibles',
@@ -801,15 +802,15 @@ 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_receipt_needed' => 'Il n’y a actuellement aucun document nécessitant une confirmation de réception.',
+'no_review_needed' => 'Aucune vérification 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',
 'no_version_check' => 'La vérification de l\'existence d\'une nouvelle version de SeedDMS a échouée ! Ceci est peut être lié au paramétre allow_url_fopen positionné à 0 dans votre configuration PHP.',
 'no_version_modification' => 'Pas de modification de version',
-'no_workflow_available' => '',
+'no_workflow_available' => 'Aucun workflow disponible',
 'objectcheck' => 'Vérification des dossiers et documents',
 'object_check_critical' => '',
 'object_check_warning' => '',
@@ -854,14 +855,14 @@ En cas de problème persistant, veuillez contacter votre administrateur.',
 'password_strength' => 'Fiabilité du mot de passe',
 'password_strength_insuffient' => 'Mot de passe trop faible',
 'password_wrong' => 'Mauvais mot de passe',
-'pending_approvals' => '',
-'pending_receipt' => '',
-'pending_reviews' => '',
+'pending_approvals' => 'Approbations en attente',
+'pending_receipt' => 'Réceptions en attente',
+'pending_reviews' => 'Vérifications en attente',
 'pending_revision' => '',
 'pending_workflows' => 'Workflows en attente',
 'personal_default_keywords' => 'Mots-clés personnels',
 'pl_PL' => 'Polonais',
-'possible_substitutes' => '',
+'possible_substitutes' => 'Substituts',
 'preset_expires' => 'Expiration prédéfinie',
 'preview' => 'Aperçu',
 'preview_converters' => '',
@@ -870,18 +871,18 @@ En cas de problème persistant, veuillez contacter votre administrateur.',
 'preview_plain' => 'Texte',
 'previous_state' => 'État précédent',
 'previous_versions' => 'Versions précédentes',
-'process' => '',
-'process_without_user_group' => '',
+'process' => 'Processus',
+'process_without_user_group' => 'Processus sans utilisateur/groupe',
 'pt_BR' => 'Portuguais (BR)',
 'quota' => 'Quota',
 'quota_exceeded' => 'Votre quota de disque est dépassé de [bytes].',
 'quota_is_disabled' => 'Le support des quotas 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 quota d’espace disque est dépassé de [bytes]. Veuillez supprimer des documents ou d\'anciennes versions.',
-'receipts_accepted' => '',
-'receipts_not_touched' => '',
-'receipts_rejected' => '',
-'receipts_without_group' => '',
-'receipts_without_user' => '',
+'receipts_accepted' => '[no_receipts] réceptions déjà confirmées',
+'receipts_not_touched' => '[no_receipts] réceptions non amorcées',
+'receipts_rejected' => '[no_receipts] réceptions déjà rejetées',
+'receipts_without_group' => 'Réceptions sans groupe',
+'receipts_without_user' => 'Réceptions sans utilisateur',
 'receipt_deletion_email_body' => 'L’utilisateur a été retiré de la liste des destinataires
 Document : [name]
 Version : [version]
@@ -890,16 +891,21 @@ Destinataire : [recipient]
 Utilisateur : [username]
 URL : [url]',
 'receipt_deletion_email_subject' => '[sitename] : [name] - Destinataire supprimé',
-'receipt_log' => '',
-'receipt_request_email_body' => '',
-'receipt_request_email_subject' => '',
+'receipt_log' => 'Journal des réceptions',
+'receipt_request_email_body' => 'Demande de réception
+Document : [name]
+Version : [version]
+Dossier parent : [folder_path]
+Utilisateur : [username]
+URL : [url]',
+'receipt_request_email_subject' => '[sitename] : [name] - Demande de réception',
 'receipt_status' => 'Statut',
-'receipt_summary' => '',
-'receipt_update_failed' => '',
-'reception' => '',
-'reception_acknowleged' => '',
-'reception_noaction' => '',
-'reception_rejected' => '',
+'receipt_summary' => 'Vue d’ensemble réception',
+'receipt_update_failed' => 'La confirmation de réception a échoué',
+'reception' => 'Réception',
+'reception_acknowleged' => 'Réception confirmée',
+'reception_noaction' => 'Aucune action',
+'reception_rejected' => 'Réception rejetée',
 'recipients' => 'Destinataires',
 'redraw' => 'Redessiner',
 'refresh' => 'Actualiser',
@@ -913,7 +919,7 @@ Utilisateur: [username]
 URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Attachement supprimé',
 'removed_recipient' => 'a été supprimé de la liste des destinataires.',
-'removed_reviewer' => 'a été retiré de la liste des correcteurs.',
+'removed_reviewer' => 'a été retiré de la liste des examinateurs.',
 'removed_revisor' => '',
 'removed_workflow_email_body' => 'Workflow du document supprimé: [name]
 Version: [version]
@@ -935,46 +941,56 @@ URL: [url]',
 'return_from_subworkflow_email_body' => '',
 'return_from_subworkflow_email_subject' => '',
 'reverse_links' => 'Documents liés au document courant',
-'reviewers' => 'Correcteurs',
-'reviewer_already_assigned' => 'est déjà déclaré en tant que correcteur',
-'reviewer_already_removed' => 'a déjà été retiré du processus de correction ou a déjà soumis une correction',
-'reviews_accepted' => '',
-'reviews_not_touched' => '',
-'reviews_rejected' => '',
-'reviews_without_group' => '',
-'reviews_without_user' => '',
-'review_deletion_email' => 'Demande de correction supprimée',
-'review_deletion_email_body' => '',
-'review_deletion_email_subject' => '',
+'reviewers' => 'Examinateurs',
+'reviewer_already_assigned' => 'est déjà déclaré en tant qu’examinateur',
+'reviewer_already_removed' => 'L’examinateur a déjà été retiré du processus de vérification ou a déjà soumis la vérification.',
+'reviews_accepted' => '[no_reviews] vérifications déjà confirmées',
+'reviews_not_touched' => '[no_reviews] vérifications non amorcées',
+'reviews_rejected' => '[no_reviews] vérifications déjà rejetées',
+'reviews_without_group' => 'Vérifications sans groupe',
+'reviews_without_user' => 'Vérifications sans utilisateur',
+'review_deletion_email' => 'Demande de vérification supprimée',
+'review_deletion_email_body' => 'Demande de vérification supprimée
+Document : [name]
+Version : [version]
+Dossier parent : [folder_path]
+Utilisateur : [username]
+URL : [url]',
+'review_deletion_email_subject' => '[sitename] : [name] - Demande de vérification supprimée',
 'review_file' => 'Fichier',
-'review_group' => 'Groupe de correction',
+'review_group' => 'Groupe de vérification',
 'review_log' => 'Journal des modifications',
-'review_request_email' => 'Demande de correction',
-'review_request_email_body' => '',
-'review_request_email_subject' => '',
-'review_status' => 'Statut de correction',
-'review_submit_email' => 'Correction soumise',
-'review_submit_email_body' => 'Correction soumise
-Document: [name]
-Version: [version]
-Statut: [status]
-Commentaire: [comment]
-Dossier parent: [folder_path]
-Utilisateur: [username]
-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.',
+'review_request_email' => 'Demande de vérification',
+'review_request_email_body' => 'Demande de vérification
+Document : [name]
+Version : [version]
+Dossier parent : [folder_path]
+Utilisateur : [username]
+URL : [url]',
+'review_request_email_subject' => '[sitename] : [name] - Demande de vérification',
+'review_status' => 'Statut de vérification',
+'review_submit_email' => 'Vérification faite',
+'review_submit_email_body' => 'Vérification faite
+Document : [name]
+Version : [version]
+Statut : [status]
+Commentaire : [comment]
+Dossier parent : [folder_path]
+Utilisateur : [username]
+URL : [url]',
+'review_submit_email_subject' => '[sitename] : [name] - Vérification faite',
+'review_summary' => 'Vue d’ensemble vérification',
+'review_update_failed' => 'Erreur lors de la mise à jour du statut de vérification. Échec de la mise à jour.',
 'revise_document' => '',
 'revise_document_on' => '',
-'revisions_accepted' => '',
+'revisions_accepted' => '[no_revisions] révisions déjà confirmées',
 'revisions_not_touched' => '',
-'revisions_pending' => '',
-'revisions_rejected' => '',
-'revisions_without_group' => '',
-'revisions_without_user' => '',
+'revisions_pending' => '[no_revisions] révisions à venir en attente',
+'revisions_rejected' => '[no_revisions] révisions déjà rejetées',
+'revisions_without_group' => 'Approbations sans groupe',
+'revisions_without_user' => 'Approbations sans utilisateur',
 'revision_date' => '',
-'revision_log' => '',
+'revision_log' => 'Journal des révisions',
 'revision_request_email_body' => '',
 'revision_request_email_subject' => '',
 'revision_status' => '',
@@ -988,7 +1004,7 @@ URL: [url]',
 'rewind_workflow_email_subject' => '[sitename]: [name] - Le workflow a été réinitialisé',
 'rewind_workflow_warning' => 'Si vous remonter à l\'état initial du workflow, le log de workflow de ce document sera supprimé et impossible à récupérer.',
 'rm_attrdef' => 'Retirer définition d\'attribut',
-'rm_attrdefgroup' => '',
+'rm_attrdefgroup' => 'Supprimer ce groupe d’attributs',
 'rm_default_keyword_category' => 'Supprimer la catégorie',
 'rm_document' => 'Supprimer le document',
 'rm_document_category' => 'Supprimer la catégorie',
@@ -1001,7 +1017,7 @@ URL: [url]',
 'rm_transmittal' => '',
 'rm_transmittalitem' => '',
 'rm_user' => 'Supprimer cet utilisateur',
-'rm_user_from_processes' => '',
+'rm_user_from_processes' => 'Retirer l’utilisateur des processus',
 'rm_version' => 'Retirer la version',
 'rm_workflow' => 'Supprimer le Workflow',
 'rm_workflow_action' => 'Supprimer l\'action du Workflow',
@@ -1011,13 +1027,20 @@ URL: [url]',
 'role_admin' => 'Administrateur',
 'role_guest' => 'Invité',
 'role_info' => '',
-'role_management' => '',
+'role_management' => 'Gestion des rôles',
 'role_name' => 'Nom',
 'role_type' => '',
 'role_user' => 'Utilisateur',
 'ro_RO' => 'Roumain',
 'run_subworkflow' => 'Lancer le sous-workflow',
-'run_subworkflow_email_body' => '',
+'run_subworkflow_email_body' => 'Sous-workflow démarré
+Document : [name]
+Version : [version]
+Workflow : [workflow]
+Sous-workflow : [subworkflow]
+Dossier parent : [folder_path]
+Utilisateur : [username]
+URL : [url]',
 'run_subworkflow_email_subject' => '[sitename]: [name] - Sous-workflow initialisé',
 'ru_RU' => 'Russe',
 'saturday' => 'Samedi',
@@ -1048,20 +1071,20 @@ URL: [url]',
 'select_grp_ind_approvers' => '',
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
-'select_grp_ind_reviewers' => '',
+'select_grp_ind_reviewers' => 'Cliquer pour choisir un groupe d’examinateurs',
 '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_reviewers' => 'Cliquer pour choisir un groupe d’examinateurs',
 'select_grp_revisors' => '',
 'select_ind_approvers' => 'Cliquer pour choisir un approbateur individuel',
-'select_ind_notification' => 'Cliquer pour séleéctionner une notification individuelle',
+'select_ind_notification' => 'Cliquer pour sélectionner une notification individuelle',
 'select_ind_recipients' => '',
-'select_ind_reviewers' => 'Cliquer pour choisir un correcteur individuel',
+'select_ind_reviewers' => 'Cliquer pour choisir un examinateur individuel',
 'select_ind_revisors' => '',
 'select_one' => 'Selectionner',
 'select_users' => 'Cliquer pour choisir un utilisateur',
 'select_workflow' => 'Choisir un workflow',
-'send_email' => '',
+'send_email' => 'Envoyer un e-mail',
 'send_login_data' => 'Envoyer les informations de connexion',
 'send_login_data_body' => 'Informations de connexion
 
@@ -1074,7 +1097,7 @@ Nom : [username]
 'september' => 'Septembre',
 'sequence' => 'Position dans le répertoire',
 'seq_after' => 'Après "[prevname]"',
-'seq_end' => 'A la fin',
+'seq_end' => 'À la fin',
 'seq_keep' => 'Conserver la position',
 'seq_start' => 'Première position',
 'sessions' => 'Utilisateurs en ligne',
@@ -1092,8 +1115,8 @@ Nom : [username]
 'settings_autoLoginUser_desc' => 'Utiliser l’ID de cet utilisateur pour se connecter automatiquement. Ce type d’accès ne permet pas la création de nouveaux comptes.',
 'settings_available_languages' => 'Langues disponibles',
 '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' => '',
-'settings_backupDir_desc' => '',
+'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_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',
@@ -1149,12 +1172,12 @@ Nom : [username]
 'settings_editOnlineFileTypes_desc' => 'Le contenu des fichiers portant les extensions précisées pourra être modifié en ligne (utiliser des lettres minuscules)',
 'settings_enable2FactorAuthentication' => 'Activer l’authentification forte',
 'settings_enable2FactorAuthentication_desc' => 'Active/désactive l\'authentification forte à 2 facteurs. Les utilisateurs devront installer Google Authenticator sur leur téléphone mobile.',
-'settings_enableAcknowledgeWorkflow' => '',
-'settings_enableAcknowledgeWorkflow_desc' => '',
-'settings_enableAdminReceipt' => '',
-'settings_enableAdminReceipt_desc' => '',
+'settings_enableAcknowledgeWorkflow' => 'Activer la réception de document',
+'settings_enableAcknowledgeWorkflow_desc' => 'Activer cette option pour permettre de confirmer la réception de document dans le workflow.',
+'settings_enableAdminReceipt' => 'Réception de document autorisée par l’administrateur',
+'settings_enableAdminReceipt_desc' => 'Activer cette option pour permettre aux administrateurs d’être listés en tant que destinataires.',
 'settings_enableAdminRevApp' => 'Activer Admin Rev App',
-'settings_enableAdminRevApp_desc' => 'Décochez pour ne pas lister l\'administrateur à titre de correcteur/approbateur',
+'settings_enableAdminRevApp_desc' => 'Activer cette option pour ajouter les administrateurs à la liste des examinateurs/approbateurs et pour les transitions de workflow.',
 'settings_enableCalendar' => 'Activer agenda',
 'settings_enableCalendar_desc' => 'Activer/Désactiver agenda',
 'settings_enableClipboard' => 'Activer le presse-papier',
@@ -1187,31 +1210,31 @@ Nom : [username]
 'settings_enableMenuTasks_desc' => 'Affiche un menu avec la liste des tâches. Cette liste contient les documents en attente d’une action par l’utilisateur.',
 'settings_enableMultiUpload' => 'Autoriser le dépôt de plusieurs fichiers',
 'settings_enableMultiUpload_desc' => 'Lors de la création d’un document, autoriser le dépôt de plusieurs fichiers à la fois. Un nouveau document sera créé pour chaque fichier.',
-'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_enableNotificationAppRev' => 'Notification examinateur/approbateur',
+'settings_enableNotificationAppRev_desc' => 'Cocher pour envoyer une notification à l’examinateur/approbateur quand une nouvelle version du document est ajoutée.',
 'settings_enableNotificationWorkflow' => 'Envoyer les notifications aux utilisateurs dans le prochain workflow',
 'settings_enableNotificationWorkflow_desc' => 'Si cette option est activée, les utilisateurs et les groupes qui doivent intervenir dans la prochaine transition du workflow seront notifiés. Même s\'ils n\'ont pas demandé de notification pour le document.',
 'settings_enableOwnerNotification' => 'Activer la notification du propriétaire par défaut',
 'settings_enableOwnerNotification_desc' => 'Cocher pour ajouter une notification pour le propriétaire si un document quand il est ajouté.',
-'settings_enableOwnerReceipt' => '',
-'settings_enableOwnerReceipt_desc' => '',
-'settings_enableOwnerRevApp' => 'Autoriser correction/approbbation pour le propriétaire',
-'settings_enableOwnerRevApp_desc' => 'A autoriser pour avoir le propriétaire d\'un document designé correcteur/approbateur et pour les transitions de workflow.',
+'settings_enableOwnerReceipt' => 'Réception de document autorisée par le propriétaire',
+'settings_enableOwnerReceipt_desc' => 'Activer cette option pour permettre au propriétaire du document d’être listé en tant que destinataire.',
+'settings_enableOwnerRevApp' => 'Autoriser vérification/approbation par le propriétaire',
+'settings_enableOwnerRevApp_desc' => 'Activer cette option pour ajouter le propriétaire du document à la liste des examinateurs/approbateurs et pour les transitions de workflow.',
 'settings_enablePasswordForgotten' => 'Activer Mot de passe oublié',
 '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_enableSelfRevApp' => 'Autoriser vérification/approbation par l’utilisateur actuel',
+'settings_enableSelfRevApp_desc' => 'Activer cette option pour ajouter l’utilisateur actuel à la liste des examinateurs/approbateurs et pour les transitions de workflow.',
 'settings_enableSessionList' => 'Activer la liste des utilisateurs en ligne',
 'settings_enableSessionList_desc' => 'Affiche un menu avec la liste des utilisateurs connectés.',
 'settings_enableThemeSelector' => 'Sélection du thème',
 'settings_enableThemeSelector_desc' => 'Activer/désactiver le sélecteur de thème sur la page de connexion.',
-'settings_enableUpdateReceipt' => '',
-'settings_enableUpdateReceipt_desc' => '',
-'settings_enableUpdateRevApp' => 'Autorise la modification de révisions et approbations existantes',
+'settings_enableUpdateReceipt' => 'Réception de document modifiable',
+'settings_enableUpdateReceipt_desc' => 'Activer cette option pour permettre à l’utilisateur qui a accusé une réception de modifier sa décision.',
+'settings_enableUpdateRevApp' => 'Autoriser la modification des vérifications/approbations existantes',
 'settings_enableUpdateRevApp_desc' => 'A activer si l\'utilisateur qui a fait la révision/approbations peut changer sa position alors que l\'étape actuelle du processus n\'est pas terminée',
 'settings_enableUserImage' => 'Activer image utilisateurs',
 'settings_enableUserImage_desc' => 'Activer les images utilisateurs',
@@ -1244,8 +1267,8 @@ Nom : [username]
 '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' => 'État initial d’un document',
+'settings_initialDocumentStatus_desc' => 'État du document défini lors de l’ajout',
 'settings_initialDocumentStatus_draft' => 'ébauche',
 'settings_initialDocumentStatus_released' => 'publié',
 'settings_installADOdb' => 'Installer ADOdb',
@@ -1264,13 +1287,13 @@ Nom : [username]
 'settings_logFileEnable_desc' => 'Activer/désactiver le fichier journal',
 'settings_logFileRotation' => 'Rotation fichier journal',
 'settings_logFileRotation_desc' => 'Rotation fichier journal',
-'settings_loginFailure' => 'Erreur Login',
+'settings_loginFailure' => 'Max. échecs de connexion',
 'settings_loginFailure_desc' => 'Désactiver le compte après n échecs de connexion.',
 'settings_luceneClassDir' => 'Répertoire Lucene SeedDMS',
 'settings_luceneClassDir_desc' => 'Chemin vers SeedDMS_Lucene (optionnel)',
 'settings_luceneDir' => 'Répertoire index Lucene',
 'settings_luceneDir_desc' => 'Chemin vers index Lucene',
-'settings_maxDirID' => 'Max ID répertoire',
+'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)',
 'settings_maxExecutionTime_desc' => 'Ceci définit la durée maximale en secondes q\'un script est autorisé à exécuter avant de se terminer par l\'analyse syntaxique',
@@ -1363,7 +1386,7 @@ Nom : [username]
 'settings_stopWordsFile' => 'Fichier des mots à exclure',
 'settings_stopWordsFile_desc' => 'Si la recherche plein texte est activée, ce fichier contient la liste des mots à ne pas indexer.',
 'settings_strictFormCheck' => 'Formulaires stricts',
-'settings_strictFormCheck_desc' => 'Contrôl strict des formulaires. Si définie sur true, tous les champs du formulaire seront vérifié. Si définie sur false, les commentaires et mots clés deviennent facultatifs. Les commentaires sont toujours nécessaires lors de la soumission d\'une correction ou état ​​du document',
+'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_System' => 'Système',
 'settings_theme' => 'Thème par défaut',
@@ -1374,7 +1397,7 @@ Nom : [username]
 'settings_undelUserIds_desc' => 'Liste des identifiants des utilisateurs qui ne peuvent pas être supprimés. Séparer les identifiants par des virgules.',
 'settings_updateDatabase' => 'Exécuter les scripts de mise à jour du schéma de la base',
 'settings_updateNotifyTime' => 'Délai de notification des modifications',
-'settings_updateNotifyTime_desc' => 'Users are notified about document-changes that took place within the last \'Update Notify Time\' seconds',
+'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.2.0',
 'settings_versioningFileName' => 'Nom des fichiers de versionnage',
 'settings_versioningFileName_desc' => 'Nom des fichiers textes d’information créés depuis les outils de sauvegarde',
@@ -1402,7 +1425,7 @@ Nom : [username]
 'splash_add_attribute' => 'Attribut ajouté',
 'splash_add_group' => 'Nouveau groupe ajouté',
 'splash_add_group_member' => 'Nouveau membre ajouté au groupe',
-'splash_add_role' => '',
+'splash_add_role' => 'Nouveau rôle ajouté',
 'splash_add_to_transmittal' => '',
 'splash_add_transmittal' => '',
 'splash_add_user' => 'Nouvel utilisateur ajouté',
@@ -1416,8 +1439,8 @@ Nom : [username]
 'splash_document_unlocked' => 'Document déverrouillé',
 'splash_edit_attribute' => 'Attribut modifié',
 'splash_edit_event' => 'Événement modifié',
-'splash_edit_group' => 'Groupe sauvé',
-'splash_edit_role' => '',
+'splash_edit_group' => 'Groupe modifié',
+'splash_edit_role' => 'Rôle modifié',
 'splash_edit_user' => 'Utilisateur modifié',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => 'Erreur lors de la suppression du lien de téléchargement',
@@ -1429,7 +1452,7 @@ Nom : [username]
 'splash_moved_clipboard' => 'Presse-papier déplacé dans le répertoire courant',
 'splash_move_document' => 'Document déplacé',
 'splash_move_folder' => 'Dossier déplacé',
-'splash_receipt_update_success' => '',
+'splash_receipt_update_success' => 'Réception ajoutée avec succès',
 'splash_removed_from_clipboard' => 'Enlevé du presse-papiers',
 'splash_rm_attribute' => 'Attribut supprimé',
 'splash_rm_document' => 'Document supprimé',
@@ -1437,10 +1460,10 @@ Nom : [username]
 'splash_rm_folder' => 'Dossier supprimé',
 'splash_rm_group' => 'Groupe supprimé',
 'splash_rm_group_member' => 'Membre retiré du groupe',
-'splash_rm_role' => '',
+'splash_rm_role' => 'Rôle supprimé',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Utilisateur supprimé',
-'splash_rm_user_processes' => '',
+'splash_rm_user_processes' => 'Utilisateur retiré de tous les processus',
 'splash_saved_file' => 'Version enregistrée',
 'splash_save_user_data' => 'Données utilisateur enregistrées',
 'splash_send_download_link' => 'Lien de téléchargement envoyé par e-mail',
@@ -1453,19 +1476,19 @@ Nom : [username]
 'state_and_next_state' => 'État initial/suivant',
 'statistic' => 'Statistiques',
 'status' => 'Statut',
-'status_approval_rejected' => 'Approbation rejeté',
+'status_approval_rejected' => 'Ébauche rejetée',
 'status_approved' => 'Approuvé',
 'status_approver_removed' => 'Approbateur retiré du processus',
 'status_not_approved' => 'Non approuvé',
-'status_not_receipted' => '',
-'status_not_reviewed' => 'Non corrigé',
+'status_not_receipted' => 'Pas encore réceptionné',
+'status_not_reviewed' => 'Non vérifié',
 '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_receipted' => 'Réceptionné',
+'status_receipt_rejected' => 'Rejeté',
+'status_recipient_removed' => 'Destinataire retiré de la liste',
+'status_reviewed' => 'Vérifié',
+'status_reviewer_rejected' => 'Ébauche rejetée',
+'status_reviewer_removed' => 'Examinateur retiré du processus',
 'status_revised' => '',
 'status_revision_rejected' => 'Rejeté',
 'status_revision_sleeping' => '',
@@ -1475,14 +1498,14 @@ Nom : [username]
 'submit_2_fact_auth' => 'Enregistrer la clé secrète',
 'submit_approval' => 'Soumettre approbation',
 'submit_login' => 'Connexion',
-'submit_password' => 'Entrez nouveau mot de passe',
+'submit_password' => 'Définir le nouveau mot de passe',
 'submit_password_forgotten' => 'Envoyer',
-'submit_receipt' => '',
-'submit_review' => 'Soumettre la correction',
+'submit_receipt' => 'Confirmer la réception',
+'submit_review' => 'Soumettre la vérification',
 'submit_revision' => '',
 'submit_userinfo' => 'Soumettre info',
-'subsribe_timelinefeed' => '',
-'substitute_to_user' => '',
+'subsribe_timelinefeed' => 'S’abonner au flux RSS',
+'substitute_to_user' => 'Basculer sur \'[username]\'',
 'substitute_user' => 'Utilisateur de substitution',
 'success_add_aro' => '',
 'success_add_permission' => 'Permission ajoutée',
@@ -1519,12 +1542,12 @@ Nom : [username]
 'timeline_skip_status_change_2' => 'publié',
 'timeline_skip_status_change_3' => 'encore dans un workflow',
 'timeline_skip_status_change_4' => 'en révision',
-'timeline_skip_status_change_5' => 'brouillon',
+'timeline_skip_status_change_5' => 'ébauche',
 'timeline_status_change' => 'Version [version] : [status]',
 'to' => 'Au',
 'toggle_manager' => 'Basculer \'Responsable\'',
 'toggle_qrcode' => 'Afficher/masquer le QR code',
-'to_before_from' => '',
+'to_before_from' => 'La date de fin ne peut pas être avant la date de début.',
 'transfer_objects' => 'Transférer des objets',
 'transfer_objects_to_user' => 'Nouveau propriétaire',
 'transition_triggered_email' => 'Transition de workflow activé',
@@ -1538,7 +1561,7 @@ Workflow : [workflow]
 Dossier parent : [folder_path]
 Utilisateur : [username]
 URL : [url]',
-'transition_triggered_email_subject' => '',
+'transition_triggered_email_subject' => '[sitename] : [name] - Transition de workflow déclenchée',
 'transmittal' => '',
 'transmittalitem_removed' => '',
 'transmittalitem_updated' => '',
@@ -1554,11 +1577,11 @@ URL : [url]',
 'type_to_search' => 'Effectuer une recherche',
 'uk_UA' => 'Ukrénien',
 'under_folder' => 'Dans le dossier',
-'unknown_attrdef' => '',
+'unknown_attrdef' => 'Définition d’attribut inconnue',
 'unknown_command' => 'Commande non reconnue.',
 'unknown_document_category' => 'Catégorie inconnue',
 'unknown_group' => 'Identifiant de groupe inconnu',
-'unknown_id' => 'unknown id',
+'unknown_id' => 'ID inconnu',
 'unknown_keyword_category' => 'Catégorie inconnue',
 'unknown_owner' => 'Identifiant de propriétaire inconnu',
 'unknown_user' => 'Identifiant d\'utilisateur inconnu',
@@ -1570,13 +1593,13 @@ URL : [url]',
 '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',
-'update_approvers' => 'Mise à jour de la liste d\'Approbateurs',
+'update_approvers' => 'Mettre à jour la liste des approbateurs',
 'update_document' => 'Mettre à jour',
 '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_recipients' => 'Mettre à jour la liste des destinataires',
+'update_reviewers' => 'Mettre à jour la liste des examinateurs',
 'update_revisors' => '',
 'update_transmittalitem' => '',
 'uploaded_by' => 'Déposé par',
@@ -1591,12 +1614,12 @@ URL : [url]',
 'users_done_work' => 'Actions des utilisateurs',
 'user_exists' => 'Cet utilisateur existe déjà',
 'user_group' => 'Utilisateur/Groupe',
-'user_group_management' => 'Gestion d\'Utilisateurs/de Groupes',
+'user_group_management' => 'Gestion des utilisateurs/groupes',
 'user_image' => 'Image',
 'user_info' => 'Informations utilisateur',
 'user_list' => 'Liste des utilisateurs',
 'user_login' => 'Identifiant',
-'user_management' => 'Utilisateurs',
+'user_management' => 'Gestion des utilisateurs',
 'user_name' => 'Nom d’affichage',
 'use_comment_of_document' => 'Utiliser le commentaire du document',
 'use_default_categories' => 'Use predefined categories',
@@ -1625,30 +1648,30 @@ URL: [url]',
 'week_view' => 'Vue par semaine',
 'workflow' => 'Workflow',
 'workflows_involded' => '',
-'workflow_actions_management' => 'Gestion d\'actions de workflow',
+'workflow_actions_management' => 'Gestion des actions de workflow',
 'workflow_action_in_use' => 'Cette action est actuellement utilisée par des workflows.',
 'workflow_action_name' => 'Nom',
 'workflow_editor' => 'Editeur de Workflow',
-'workflow_group_summary' => 'Résumé de groupe',
+'workflow_group_summary' => 'Vue d’ensemble du groupe',
 'workflow_has_cycle' => '',
 'workflow_initstate' => 'Etat initial',
 'workflow_in_use' => 'Ce workflow est actuellement utilisé par des documents.',
 'workflow_layoutdata_saved' => '',
-'workflow_management' => 'Gestion de workflow',
+'workflow_management' => 'Gestion des workflows',
 'workflow_name' => 'Nom',
 'workflow_no_doc_rejected_state' => 'L’état « rejeté » n’a été défini sur aucune action !',
 'workflow_no_doc_released_state' => '',
 'workflow_no_initial_state' => 'Aucune transition ne débute par l’état initial défini pour ce workflow !',
 'workflow_no_states' => 'Vous devez d\'abord définir des états de workflow avant d\'ajouter un workflow.',
 'workflow_save_layout' => '',
-'workflow_state' => '',
-'workflow_states_management' => 'Gestion d\'états de workflow',
+'workflow_state' => 'État de workflow',
+'workflow_states_management' => 'Gestion des états de workflow',
 'workflow_state_docstatus' => 'Etat du document',
 'workflow_state_in_use' => 'Cet état est actuellement utilisé par des workflows.',
 'workflow_state_name' => 'Nom',
-'workflow_summary' => 'Résumé du workflow',
-'workflow_transition_without_user_group' => '',
-'workflow_user_summary' => 'Résumé d\'utilisateur',
+'workflow_summary' => 'Vue d’ensemble du workflow',
+'workflow_transition_without_user_group' => 'Au moins une transition a ni utilisateur, ni groupe !',
+'workflow_user_summary' => 'Vue d’ensemble de l’utilisateur',
 'year_view' => 'Vue annuelle',
 'yes' => 'Oui',
 'zh_CN' => 'Chinois (CN)',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 356278299..faa368d3f 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -324,6 +324,7 @@ Internet poveznica: [url]',
 'documentcontent' => '',
 'documents' => 'Dokumenti',
 'documents_checked_out_by_you' => 'Dokumenti koje ste Vi odjavili',
+'documents_expired' => '',
 'documents_in_process' => 'Dokumenti u postupku',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Dokumenti koje ste vi zaključali',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 84b144f00..a2cbef2cc 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -319,6 +319,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Dokumentumok',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'Feldolgozás alatt lévő dokumentumok',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Ön által zárolt dokumentumok',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 05a41479a..327ba5a8f 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 (1563), rickr (144), s.pnt (26)
+//    Translators: Admin (1567), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -286,7 +286,7 @@ URL: [url]',
 'confirm_rm_transmittal' => 'Si prega di confermare l\'eliminazione della trasmissione.',
 'confirm_rm_transmittalitem' => 'Conferma rimozione',
 'confirm_rm_user' => 'Vuoi davvero rimuovere l\'utente "[username]"? Attenzione: questa operazione non può essere annullata.',
-'confirm_rm_user_from_processes' => '',
+'confirm_rm_user_from_processes' => 'Processo',
 'confirm_rm_version' => 'Vuoi veramente eliminare la versione [version] del documento "[documentname]"? Attenzione: questa operazione non può essere annullata.',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => 'Conferma aggiornamento',
@@ -325,6 +325,7 @@ URL: [url]',
 'documentcontent' => 'Contenuto documento',
 'documents' => 'Documenti',
 'documents_checked_out_by_you' => 'Documenti approvati da te',
+'documents_expired' => '',
 'documents_in_process' => 'Documenti in lavorazione',
 'documents_locked' => 'Documenti bloccati',
 'documents_locked_by_you' => 'Documenti bloccati da te',
@@ -866,8 +867,8 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di
 'preview_plain' => 'Testo',
 'previous_state' => 'Stato precedente',
 'previous_versions' => 'Versioni precedenti',
-'process' => '',
-'process_without_user_group' => '',
+'process' => 'Processi',
+'process_without_user_group' => 'Processi senza Utente/Gruppo',
 'pt_BR' => 'Portoghese (BR)',
 'quota' => 'Quota',
 'quota_exceeded' => 'La quota-disco è stata superata di [bytes].',
@@ -1618,7 +1619,7 @@ URL: [url]',
 'uploading_zerosize' => 'Si sta caricando un file vuoto. Operazione abortita.',
 'used_discspace' => 'Spazio su disco occupato',
 'user' => 'Utente',
-'userid_groupid' => '',
+'userid_groupid' => 'id Utente/id Gruppo',
 'users' => 'Utenti',
 'users_and_groups' => 'Utenti/Gruppi',
 'users_done_work' => 'Lavoro eseguito dagli Utenti',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index edc3b4407..e9ebd1507 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -327,6 +327,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => '문서',
 'documents_checked_out_by_you' => '당신으로 부터 문서가 체크아웃 되었습니다.',
+'documents_expired' => '',
 'documents_in_process' => '진행중인 문서',
 'documents_locked' => '잠긴 문서',
 'documents_locked_by_you' => '당신에 의해 잠긴 문서',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index d34c50ea9..0b6463089 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 (734), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (738), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 '2_factor_auth' => '',
@@ -317,6 +317,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Documenten',
 'documents_checked_out_by_you' => 'Door u in behandeling genomen documenten',
+'documents_expired' => '',
 'documents_in_process' => 'Documenten in behandeling',
 'documents_locked' => 'Geblokkeerde documenten',
 'documents_locked_by_you' => 'Documenten door U geblokkeerd',
@@ -414,7 +415,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',
-'duplicates' => '',
+'duplicates' => 'Duplicaat',
 'duplicate_content' => 'Dubbele inhoud',
 'edit' => 'Wijzigen',
 'edit_attributes' => 'Bewerk attributen',
@@ -850,7 +851,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' => 'Mogelijke alternatieven',
-'preset_expires' => '',
+'preset_expires' => 'Standaard vervaltermijn',
 'preview' => 'Voorbeeld',
 'preview_converters' => 'Converters',
 'preview_images' => '',
@@ -1612,12 +1613,12 @@ URL: [url]',
 'uploading_zerosize' => 'Uploaden van een leeg bestand. Upload wordt geannuleerd.',
 'used_discspace' => 'Gebruike schijf ruimte',
 'user' => 'Gebruiker',
-'userid_groupid' => '',
+'userid_groupid' => 'Gebruiker id/Groep id',
 'users' => 'Gebruikers',
 'users_and_groups' => 'Gebruikers / Groepen',
 'users_done_work' => 'Uitgevoerd werk gebruikers',
 'user_exists' => 'Gebruiker bestaat reeds.',
-'user_group' => '',
+'user_group' => 'Gebruiker/Groep',
 'user_group_management' => 'Gebruikers / Groepen beheer',
 'user_image' => 'Afbeelding',
 'user_info' => 'Gebruikers informatie',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index af936a09c..69d48f96a 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 (776), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (784), netixw (84), romi (93), uGn (112)
 
 $text = array(
 '2_factor_auth' => '',
@@ -312,6 +312,7 @@ URL: [url]',
 'documentcontent' => 'Zawartość dokumentu',
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'Dokumenty procesowane',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Dokumenty zablokowane przez Ciebie',
@@ -845,7 +846,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' => '',
-'preset_expires' => '',
+'preset_expires' => 'Wygasa',
 'preview' => '',
 'preview_converters' => '',
 'preview_images' => '',
@@ -1049,7 +1050,7 @@ URL: [url]',
 'send_login_data' => '',
 'send_login_data_body' => '',
 'send_login_data_subject' => '',
-'send_test_mail' => '',
+'send_test_mail' => 'Wyślij wiadomość testową',
 'september' => 'Wrzesień',
 'sequence' => 'Kolejność',
 'seq_after' => 'Za "[prevname]"',
@@ -1067,7 +1068,7 @@ URL: [url]',
 'settings_advancedAcl_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Moduł Rewrite',
 'settings_Authentication' => 'Ustawienia uwierzytelniania',
-'settings_autoLoginUser' => '',
+'settings_autoLoginUser' => 'Automatyczne logowanie',
 'settings_autoLoginUser_desc' => '',
 'settings_available_languages' => 'Dostępne języki',
 '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.',
@@ -1152,7 +1153,7 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Odznacz aby nie pokazywać drzewa katalogów',
 'settings_enableFullSearch' => 'Włącz przeszukiwanie pełnotekstowe',
 'settings_enableFullSearch_desc' => 'Włącz przeszukiwanie pełnotekstowe',
-'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin' => 'Włącz automatyczne logowanie dla gości',
 'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Pozwól na logowanie gościa',
 'settings_enableGuestLogin_desc' => 'Jeśli chcesz dowolnej osobie zalogować się jako gość, zaznacz tę opcję. Uwaga: logowanie gościa powinno być używane wyłącznie w zaufanym środowisku.',
@@ -1327,11 +1328,11 @@ URL: [url]',
 'settings_smtpServer_desc' => 'Nazwa hosta serwera SMTP',
 'settings_smtpUser' => 'Użytkownik SMTP',
 'settings_smtpUser_desc' => 'Użytkownik SMTP',
-'settings_sortFoldersDefault' => '',
+'settings_sortFoldersDefault' => 'Domyślna metoda sotowania',
 'settings_sortFoldersDefault_desc' => '',
-'settings_sortFoldersDefault_val_name' => '',
-'settings_sortFoldersDefault_val_sequence' => '',
-'settings_sortFoldersDefault_val_unsorted' => '',
+'settings_sortFoldersDefault_val_name' => 'po nazwie',
+'settings_sortFoldersDefault_val_sequence' => 'po sekwencji',
+'settings_sortFoldersDefault_val_unsorted' => 'niesortowane',
 'settings_sortUsersInList' => 'Uporządkuj użytkowników na liście',
 'settings_sortUsersInList_desc' => 'Ustawia porządek sortowania użytkowników w menu wyboru wg loginu lub wg pełnej nazwy.',
 'settings_sortUsersInList_val_fullname' => 'Sortowanie wg pełnej nazwy',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 09484b4c2..7cc7ca9f8 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 (960), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (961), flaviove (627), lfcristofoli (352)
 
 $text = array(
 '2_factor_auth' => '',
@@ -319,6 +319,7 @@ URL: [url]',
 'documentcontent' => 'Conteúdo do Documento',
 'documents' => 'Documentos',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'Documentos em Processo',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Documentos bloqueados por você',
@@ -658,7 +659,7 @@ URL: [url]',
 'linked_documents' => 'Documentos relacionados',
 'linked_files' => 'Arquivos anexados',
 'linked_to_current_version' => '',
-'linked_to_document' => '',
+'linked_to_document' => 'Ligado ao documento',
 'linked_to_this_version' => '',
 '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>.',
 'link_to_version' => '',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index cd530bf02..30043e7ed 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 (1065), balan (87)
+//    Translators: Admin (1066), balan (87)
 
 $text = array(
 '2_factor_auth' => '',
@@ -324,6 +324,7 @@ URL: [url]',
 'documentcontent' => 'Continut Document',
 'documents' => 'Documente',
 'documents_checked_out_by_you' => 'Documente verificate de tine',
+'documents_expired' => '',
 'documents_in_process' => 'Documente în procesare',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Documente blocate de tine',
@@ -664,7 +665,7 @@ URL: [url]',
 'linked_documents' => 'Documente relationate',
 'linked_files' => 'Atașamente',
 'linked_to_current_version' => '',
-'linked_to_document' => '',
+'linked_to_document' => 'Atasat documentului',
 'linked_to_this_version' => '',
 '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>.',
 'link_to_version' => '',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index bf616338d..5275ecd36 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -324,6 +324,7 @@ URL: [url]',
 'documentcontent' => 'Содержание документа',
 'documents' => 'док.',
 'documents_checked_out_by_you' => 'Документ проверен вами',
+'documents_expired' => '',
 'documents_in_process' => 'Документы в работе',
 'documents_locked' => 'Заблокированные документы',
 'documents_locked_by_you' => 'Документы, заблокированные вами',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index ad420ec02..0ed720223 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -301,6 +301,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'Dokumenty v spracovaní',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Vami uzamknuté dokumenty',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index ca64d810b..ab7c0b532 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 (1144), tmichelfelder (106)
+//    Translators: Admin (1151), tmichelfelder (106)
 
 $text = array(
 '2_factor_auth' => '',
@@ -312,6 +312,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Dokument',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'Dokument i bearbetning',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Dokument som du har låst',
@@ -656,7 +657,7 @@ URL: [url]',
 'linked_to_this_version' => '',
 '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>.',
 'link_to_version' => '',
-'list_access_rights' => '',
+'list_access_rights' => 'Lista alla rättigheter...',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Lokal fil',
@@ -818,7 +819,12 @@ URL: [url]',
 'password_expired' => '',
 'password_expires_in_days' => '',
 'password_forgotten' => 'Glömt lösenord',
-'password_forgotten_email_body' => 'Bästa användare av dokumenthanteringssystemet,nnvi fick en förfrågan om att ändra ditt lösenord.nnDu kan göra det genom att klicka på följande länk:nn[url_prefix]out/out.ChangePassword.php?hash=[hash]nnOm du fortfarande har problem med inloggningen, kontakta administratören.',
+'password_forgotten_email_body' => 'Bästa användare av dokumenthanteringssystemet,
+vi fick en förfrågan om att ändra ditt lösenord.nnDu kan göra det genom att klicka på följande länk:
+
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
+
+Om du fortfarande har problem med inloggningen, kontakta administratören.',
 'password_forgotten_email_subject' => '[sitename]: Glömt lösenord',
 'password_forgotten_send_hash' => 'En beskrivning av vad du måste göra har nu skickats till din e-postadress.',
 'password_forgotten_text' => 'Fyll i formuläret nedan och följ instruktionerna som skickas till din e-postadress.',
@@ -1093,8 +1099,8 @@ URL: [url]',
 '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',
 'settings_contentOffsetDir_desc' => 'För att undvika begränsningar i det underliggande filsystemet har en ny mappstruktur skapats inom innehållsmappen (Content Directory). Detta behöver en bas-mapp att utgå ifrån. Vanligtvis är default-inställningen 1048576 men det kan vara vilket nummer eller vilken sträng som helst som inte redan finns i mappen (Content Directory)',
-'settings_convertToPdf' => '',
-'settings_convertToPdf_desc' => '',
+'settings_convertToPdf' => 'Konvertera till PDF för förhandsgranskning',
+'settings_convertToPdf_desc' => 'Om dokumentet inte kan visas direkt i webbläsaren, visas istället en PDF-konverterad version.',
 'settings_cookieLifetime' => 'Livslängd för cookies',
 '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',
@@ -1162,7 +1168,7 @@ URL: [url]',
 'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Tillåt gäst-inloggning',
 'settings_enableGuestLogin_desc' => 'Om du vill att alla ska kunna logga in som gäst, aktivera denna option. OBS! Gästinloggning bör endast användas i en säker omgivning',
-'settings_enableHelp' => '',
+'settings_enableHelp' => 'Aktivera hjälp',
 'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Aktivera språkval',
 'settings_enableLanguageSelector_desc' => 'Visa språkurval i användargränssnittet efter inloggning.',
@@ -1170,7 +1176,7 @@ URL: [url]',
 '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_enableMultiUpload' => '',
+'settings_enableMultiUpload' => 'TIllåt uppladdning av multipla filer',
 'settings_enableMultiUpload_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',
@@ -1312,7 +1318,7 @@ URL: [url]',
 'settings_SaveError' => 'Fel när konfigurationsfilen sparades',
 'settings_Server' => 'Server-inställningar',
 'settings_showFullPreview' => 'Visa komplett dokument',
-'settings_showFullPreview_desc' => '',
+'settings_showFullPreview_desc' => 'Aktivera/avaktivera förhandsgranskning av helt dokument beroende på stöd i webbläsare',
 'settings_showMissingTranslations' => 'Visa saknade översättningar',
 'settings_showMissingTranslations_desc' => 'Lista alla saknade översättningar längst ner på sidan. Den inloggade användaren får möjligheten att skicka in ett förslag för saknade översättningar som kommer sparas i en CSV fil. Sätt denna option inte på, på ett DMS som används i verksamheten.',
 'settings_showSingleSearchHit' => '',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index e33e2af64..4bfc11602 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -318,6 +318,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Dokümanlar',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'İşlemdeki Dokümanlar',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Doküman sizin tarafınızdan kilitlendi',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 35fe12472..787828651 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -324,6 +324,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'док.',
 'documents_checked_out_by_you' => 'Документи на Опрацюванні у вас',
+'documents_expired' => '',
 'documents_in_process' => 'Документи в роботі',
 'documents_locked' => 'Заблоковані документи',
 'documents_locked_by_you' => 'Документи, які ви заблокували',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 3687a6cb4..148d1cedc 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -19,15 +19,15 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (732), fengjohn (5)
+//    Translators: Admin (732), archonwang (469), fengjohn (5)
 
 $text = array(
-'2_factor_auth' => '',
-'2_factor_auth_info' => '',
-'2_fact_auth_secret' => '',
+'2_factor_auth' => '双重认证',
+'2_factor_auth_info' => '该系统启用双重认证。您需要在手机上进行 Google 认证。下面你会看到两个 QR 码。正确的是你目前的密码。在左边你可以设置一个新的密码。如果您设置了新的密码，请重新扫描并通过 Google 认证。',
+'2_fact_auth_secret' => '双重认证密码',
 'accept' => '接受',
-'access_control' => '',
-'access_control_is_off' => '',
+'access_control' => '访问控制',
+'access_control_is_off' => '高级访问控制已关闭',
 'access_denied' => '拒绝访问',
 'access_inheritance' => '继承访问权限',
 'access_mode' => '访问模式',
@@ -45,16 +45,16 @@ URL: [url]',
 'according_settings' => '相应的设置',
 'action' => '执行',
 'actions' => '动作',
-'action_approve' => '',
-'action_complete' => '',
+'action_approve' => '确认',
+'action_complete' => '完成',
 'action_is_complete' => '完成',
 'action_is_not_complete' => '未完成',
 'action_reject' => '拒绝',
 'action_review' => '检查',
-'action_revise' => '',
+'action_revise' => '修改',
 'add' => '添加',
 'add_approval' => '提交审核',
-'add_attrdefgroup' => '',
+'add_attrdefgroup' => '添加属性组',
 'add_document' => '添加文档',
 'add_document_link' => '添加链接',
 'add_document_notify' => '派发通知',
@@ -67,17 +67,17 @@ URL: [url]',
 'add_multiple_files' => '批量添加文档(文档名无法手动修改)',
 'add_receipt' => '',
 'add_review' => '提交校对',
-'add_revision' => '',
-'add_role' => '',
+'add_revision' => '添加审核人',
+'add_role' => '新建角色',
 'add_subfolder' => '添加子文件夹',
 'add_to_clipboard' => '复制',
 'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => '添加新用户',
-'add_user_to_group' => '',
-'add_workflow' => '',
-'add_workflow_action' => '',
-'add_workflow_state' => '',
+'add_user_to_group' => '添加用户到组',
+'add_workflow' => '新建工作流',
+'add_workflow_action' => '新建工作流节点',
+'add_workflow_state' => '新建工作流状态',
 'admin' => '管理员',
 'admin_tools' => '管理员工具',
 'all' => '所有',
@@ -89,31 +89,48 @@ URL: [url]',
 'and' => 'and',
 'apply' => '应用',
 'approvals_accepted' => '',
-'approvals_and_reviews_accepted' => '',
-'approvals_and_reviews_not_touched' => '',
-'approvals_and_reviews_rejected' => '',
-'approvals_not_touched' => '',
-'approvals_rejected' => '',
-'approvals_without_group' => '',
-'approvals_without_user' => '',
+'approvals_and_reviews_accepted' => '[no_approvals] 审核和 [no_reviews] 校对已通过',
+'approvals_and_reviews_not_touched' => '[no_approvals] 审核和 [no_reviews] 校对暂未执行',
+'approvals_and_reviews_rejected' => '[no_approvals] 审核和 [no_reviews] 校对未通过',
+'approvals_not_touched' => '[no_approvals] 审核未执行',
+'approvals_rejected' => '[no_approvals] 审核未通过',
+'approvals_without_group' => '不含组的审核',
+'approvals_without_user' => '不含用户的审核',
 'approval_deletion_email' => '审核请求已被删除',
-'approval_deletion_email_body' => '',
-'approval_deletion_email_subject' => '',
-'approval_file' => '',
+'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' => '',
-'approval_request_email_subject' => '',
+'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' => '',
+'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' => '',
+'approver_already_assigned' => '用户已被设置为审核人。',
+'approver_already_removed' => '审核人已从审核进程中移除，或已提交审核结果。',
 'april' => '四 月',
 'archive_creation' => '创建存档',
 'archive_creation_warning' => '通过此操作您可以创建一个包含这个DMS(文档管理系统)的数据文件夹。之后，所有文档都将保存到您服务器的数据文件夹中.<br>警告:如果所创建文档名为非数字的，那么将在服务器备份中不可用',
@@ -122,12 +139,12 @@ URL: [url]',
 'assign_reviewers' => '指派校对人',
 'assign_user_property_to' => '分配用户属性给',
 'assumed_released' => '假定发布',
-'attrdefgroup_management' => '',
-'attrdefgrp_show_detail' => '',
-'attrdefgrp_show_list' => '',
-'attrdefgrp_show_search' => '',
-'attrdefgrp_show_searchlist' => '',
-'attrdef_exists' => '',
+'attrdefgroup_management' => '属性组管理',
+'attrdefgrp_show_detail' => '详情',
+'attrdefgrp_show_list' => '显示列表',
+'attrdefgrp_show_search' => '检索',
+'attrdefgrp_show_searchlist' => '检索结果',
+'attrdef_exists' => '属性定义已存在',
 'attrdef_info' => '',
 'attrdef_in_use' => '属性定义仍在使用中',
 'attrdef_management' => '属性定义管理',
@@ -144,11 +161,11 @@ URL: [url]',
 'attrdef_type' => '类型',
 'attrdef_type_boolean' => '布尔',
 'attrdef_type_date' => '日期',
-'attrdef_type_email' => '',
+'attrdef_type_email' => 'Email',
 'attrdef_type_float' => '浮点',
 'attrdef_type_int' => '整数',
 'attrdef_type_string' => '字符串',
-'attrdef_type_url' => '',
+'attrdef_type_url' => 'URL',
 'attrdef_valueset' => '属性值',
 'attributes' => '属性',
 'attribute_changed_email_body' => '',
@@ -156,17 +173,17 @@ URL: [url]',
 'attribute_count' => '使用次数',
 'attribute_value' => '属性值',
 'attribute_value_not_in_valueset' => '',
-'attr_malformed_boolean' => '',
-'attr_malformed_date' => '',
-'attr_malformed_email' => '',
-'attr_malformed_float' => '',
-'attr_malformed_int' => '',
-'attr_malformed_url' => '',
+'attr_malformed_boolean' => '属性 \'[attrname]\' 的值 \'[value]\' 不是合法的布尔（boolean）值。',
+'attr_malformed_date' => '属性 \'[attrname]\' 的值 \'[value]\' 不是合法的日期（date）值。',
+'attr_malformed_email' => '属性 \'[attrname]\' 的值 \'[value]\' 不是合法的 URL。',
+'attr_malformed_float' => '属性 \'[attrname]\' 的值 \'[value]\' 不是合法的浮点数（float）值。',
+'attr_malformed_int' => '属性 \'[attrname]\' 的值 \'[value]\' 不是合法的数值（interger）。',
+'attr_malformed_url' => '属性 \'[attrname]\' 的值 \'[value]\' 不是合法的 URL。',
 'attr_max_values' => '',
 'attr_min_values' => '最小值没达到',
 'attr_not_in_valueset' => '',
 'attr_no_regex_match' => '',
-'attr_validation_error' => '',
+'attr_validation_error' => '属性 \'[attrname]\' 的值 \'[value]\' 非法。',
 'at_least_n_users_of_group' => '',
 'august' => '八 月',
 'authentication' => '认证',
@@ -181,35 +198,35 @@ URL: [url]',
 'bg_BG' => '保加利亚语',
 'browse' => '浏览',
 'calendar' => '日历',
-'calendar_week' => '',
+'calendar_week' => '周历',
 'cancel' => '取消',
 'cannot_assign_invalid_state' => '不能修改文档的最终状态',
 'cannot_change_final_states' => '警告:您不能更改文档的拒绝、过期、待校对、或是待审核等状态',
-'cannot_delete_user' => '',
+'cannot_delete_user' => '不能删除用户',
 'cannot_delete_yourself' => '不能删除自己',
 'cannot_move_root' => '错误：不能移动根目录',
 'cannot_retrieve_approval_snapshot' => '无法检索到该文件版本的审核快照.',
 'cannot_retrieve_review_snapshot' => '无法检索到该文件版本的校对快照.',
 'cannot_rm_root' => '错误：不能删除根目录.',
 'categories' => '分类',
-'categories_loading' => '',
+'categories_loading' => '请稍候，类别列表正在拼命加载中……',
 'category' => '分类',
-'category_exists' => '',
+'category_exists' => '类别已存在。',
 'category_filter' => '指定分类',
-'category_info' => '',
+'category_info' => '类别信息',
 'category_in_use' => '已有文件使用此分类',
-'category_noname' => '',
+'category_noname' => '类别名称不能为空。',
 'ca_ES' => '加泰罗尼亚语',
 'change_assignments' => '分配变更',
-'change_password' => '',
-'change_password_message' => '',
-'change_recipients' => '',
-'change_revisors' => '',
+'change_password' => '修改密码',
+'change_password_message' => '您的密码已更新。',
+'change_recipients' => '指定接收人',
+'change_revisors' => '指定修订人',
 'change_status' => '变更状态',
 'charts' => '图表',
 'chart_docsaccumulated_title' => '文档数量',
 'chart_docspercategory_title' => '目录文档数',
-'chart_docspermimetype_title' => '',
+'chart_docspermimetype_title' => '每个 MIME 类型的文档数',
 'chart_docspermonth_title' => '每月创建的新文档',
 'chart_docsperstatus_title' => '各状态文档数',
 'chart_docsperuser_title' => '单用户文档数',
@@ -218,27 +235,27 @@ URL: [url]',
 'checkedout_file_has_different_version' => '',
 'checkedout_file_has_disappeared' => '',
 'checkedout_file_is_unchanged' => '',
-'checkin_document' => '',
-'checkoutpath_does_not_exist' => '',
-'checkout_document' => '',
+'checkin_document' => '签入',
+'checkoutpath_does_not_exist' => '签出路径不存在',
+'checkout_document' => '签出',
 'checkout_is_disabled' => '',
 'choose_attrdef' => '请选择属性',
-'choose_attrdefgroup' => '',
+'choose_attrdefgroup' => '选择属性组',
 'choose_category' => '请选择',
 'choose_group' => '选择组别',
-'choose_role' => '',
-'choose_target_category' => '',
+'choose_role' => '选择角色',
+'choose_target_category' => '选择类别',
 'choose_target_document' => '选择文档',
 'choose_target_file' => '选择文件',
 'choose_target_folder' => '选择文件夹',
 'choose_user' => '选择用户',
-'choose_workflow' => '',
-'choose_workflow_action' => '',
-'choose_workflow_state' => '',
-'class_name' => '',
+'choose_workflow' => '选择工作流',
+'choose_workflow_action' => '选择工作流节点',
+'choose_workflow_state' => '选择工作流状态',
+'class_name' => '类名',
 'clear_cache' => '清除缓存',
 'clear_clipboard' => '清除粘贴板',
-'clear_password' => '',
+'clear_password' => '清除密码',
 'clipboard' => '剪切板',
 'close' => '关闭',
 'command' => '命令',
@@ -248,7 +265,7 @@ URL: [url]',
 'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '确认重新创建全文索引',
 'confirm_move_document' => '',
-'confirm_move_folder' => '',
+'confirm_move_folder' => '请确认移动文件夹',
 'confirm_pwd' => '确认密码',
 'confirm_rm_backup' => '您确定要删除"[arkname]"备份文档?<br>请注意：此动作执行后不能撤销.',
 'confirm_rm_document' => '您确定要删除\'[documentname]\'文档?<br>请注意：此动作执行后不能撤销.',
@@ -260,18 +277,18 @@ URL: [url]',
 'confirm_rm_group' => '您确定要删除"[groupname]"组?<br>请注意：此动作执行后不能撤销.',
 'confirm_rm_log' => '您确定要删除"[logname]"日志文件?<br>请注意：此动作执行后不能撤销.',
 'confirm_rm_transmittal' => '',
-'confirm_rm_transmittalitem' => '',
+'confirm_rm_transmittalitem' => '确认删除',
 'confirm_rm_user' => '您确定要删除"[username]"用户?<br>请注意：此动作执行后不能撤销.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '您确定要删除"[documentname]文档的[version]版本文件?<br>请注意：此动作执行后不能撤销.',
 'confirm_transfer_objects' => '',
-'confirm_update_transmittalitem' => '',
+'confirm_update_transmittalitem' => '确认更新',
 'content' => '内容',
 'continue' => '继续',
 'converter_new_cmd' => '',
-'converter_new_mimetype' => '',
+'converter_new_mimetype' => '新建 MIME 类型',
 'copied_to_checkout_as' => '',
-'create_download_link' => '',
+'create_download_link' => '添加下载链接',
 'create_fulltext_index' => '创建全文索引',
 'create_fulltext_index_warning' => '你将重新创建全
 文索引。这将花费一定的时间但是会提升系统的整体表现。如果你想要重新创建索引，请确
@@ -280,13 +297,13 @@ URL: [url]',
 'cs_CZ' => '捷克语',
 'current_password' => '当前密码',
 'current_quota' => '',
-'current_state' => '',
+'current_state' => '当前状态',
 'current_version' => '当前版本',
 'daily' => '天',
 'databasesearch' => '数据库搜索',
 'date' => '日期',
-'days' => '',
-'debug' => '',
+'days' => '天',
+'debug' => '调试',
 'december' => '十二月',
 'default_access' => '缺省访问模式',
 'default_keywords' => '可用关键字',
@@ -302,9 +319,10 @@ URL: [url]',
 'document' => '文档',
 'documentcontent' => '文档内容',
 'documents' => '文档',
-'documents_checked_out_by_you' => '',
+'documents_checked_out_by_you' => '您签出的文档',
+'documents_expired' => '',
 'documents_in_process' => '待处理文档',
-'documents_locked' => '',
+'documents_locked' => '已锁定的文档',
 'documents_locked_by_you' => '被您锁定的文档',
 'documents_only' => '指定文件',
 'documents_to_approve' => '待您审核的文档',
@@ -313,51 +331,87 @@ URL: [url]',
 'documents_to_review' => '待您校对的文档',
 'documents_to_revise' => '',
 'documents_user_reception' => '',
-'documents_user_rejected' => '',
+'documents_user_rejected' => '已拒绝的文档',
 'documents_user_requiring_attention' => '需您关注的文档',
 'documents_with_notification' => '',
-'document_already_checkedout' => '',
+'document_already_checkedout' => '当前文档已签出',
 'document_already_locked' => '该文档已被锁定',
-'document_comment_changed_email' => '',
-'document_comment_changed_email_body' => '',
-'document_comment_changed_email_subject' => '',
-'document_count' => '',
+'document_comment_changed_email' => '批注已更新',
+'document_comment_changed_email_body' => '批注已更新
+文档: [name]
+历史批注: [old_comment]
+当前批注: [new_comment]
+父文件夹: [folder_path]
+用户: [username]
+URL: [url]',
+'document_comment_changed_email_subject' => '[sitename]: [name] - 批注已更新',
+'document_count' => '文档数量',
 'document_deleted' => '删除文档',
 'document_deleted_email' => '文档已被删除',
-'document_deleted_email_body' => '',
-'document_deleted_email_subject' => '',
-'document_duplicate_name' => '',
-'document_has_no_workflow' => '',
+'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_checked_out' => '文档已签出。如上传了新版本，则已签出的版本则不能再被签回。',
 'document_is_not_locked' => '该文档没有被锁定',
 'document_link_by' => '链接',
 'document_link_public' => '公开',
 'document_moved_email' => '文档已被移动',
-'document_moved_email_body' => '',
-'document_moved_email_subject' => '',
-'document_not_checkedout' => '',
+'document_moved_email_body' => '文档已迁移
+文档: [name]
+原文件夹: [old_folder_path]
+当前所在文件夹: [new_folder_path]
+用户: [username]
+URL: [url]',
+'document_moved_email_subject' => '[sitename]: [name] - 文档已移动',
+'document_not_checkedout' => '文档未签出。',
 'document_renamed_email' => '文档已被重命名',
-'document_renamed_email_body' => '',
-'document_renamed_email_subject' => '',
+'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' => '',
-'document_status_changed_email_subject' => '',
+'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' => '',
-'document_updated_email_subject' => '',
+'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' => '下载',
-'download_links' => '',
-'download_link_email_body' => '',
-'download_link_email_subject' => '',
+'download_links' => '下载链接',
+'download_link_email_body' => '点击以下链接下载文档 \'[docname]\' 的 [version] 版本。
+
+[url]
+
+该链接有效性：[valid]
+
+[comment]',
+'download_link_email_subject' => '下载链接',
 'do_object_repair' => '',
 'do_object_setchecksum' => '',
 'do_object_setfilesize' => '设置文件大小',
-'do_object_unlink' => '',
-'draft' => '',
+'do_object_unlink' => '删除文档版本信息',
+'draft' => '草稿',
 'draft_pending_approval' => '待审核',
 'draft_pending_review' => '待校对',
 'drag_icon_here' => '拖动图标到这里',
@@ -370,7 +424,7 @@ URL: [url]',
 'dump_creation_warning' => '通过此操作，您可以创建一个您数据库的转储文件，之后可以将转储数据保存到您服务器所在的数据文件夹中',
 'dump_list' => '存在转储文件',
 'dump_remove' => '删除转储文件',
-'duplicates' => '',
+'duplicates' => '复制',
 'duplicate_content' => '重复的内容',
 'edit' => '编辑',
 'edit_attributes' => '编辑属性',
@@ -381,10 +435,10 @@ URL: [url]',
 'edit_document_props' => '编辑文档',
 'edit_event' => '编辑事件',
 'edit_existing_access' => '编辑访问列表',
-'edit_existing_attribute_groups' => '',
+'edit_existing_attribute_groups' => '编辑属性组',
 'edit_existing_notify' => '编辑通知列表',
 'edit_folder_access' => '编辑访问权限',
-'edit_folder_attrdefgrp' => '',
+'edit_folder_attrdefgrp' => '编辑属性组',
 'edit_folder_notify' => '文件夹通知列表',
 'edit_folder_props' => '编辑文件夹',
 'edit_group' => '编辑组别',
@@ -392,30 +446,30 @@ URL: [url]',
 'edit_transmittal_props' => '',
 'edit_user' => '编辑用户',
 'edit_user_details' => '编辑用户详情',
-'edit_version' => '',
+'edit_version' => '编辑版本',
 'el_GR' => '希腊人',
 'email' => 'Email',
-'email_error_title' => '',
+'email_error_title' => '未输入 Email 地址',
 'email_footer' => '您可以用‘我的账户’选项来改变您的e-mail设置',
 'email_header' => '这是来自于DMS(文档管理系统)的自动发送消息',
-'email_not_given' => '',
+'email_not_given' => '请输入有效的 Email 地址',
 'empty_attribute_group_list' => '',
 'empty_folder_list' => '没有文件或子目录',
 'empty_notify_list' => '没有条目',
 'en_GB' => '英语',
-'equal_transition_states' => '',
+'equal_transition_states' => '开始日期和结束日期相同',
 'error' => '错误',
 'error_add_aro' => '',
-'error_add_permission' => '',
-'error_cleared_cache' => '',
-'error_importfs' => '',
+'error_add_permission' => '添加权限时出错',
+'error_cleared_cache' => '清理缓存时出错',
+'error_importfs' => '从文件系统导入时出错',
 'error_no_document_selected' => '请选择文档',
 'error_no_folder_selected' => '请选择文件夹',
 'error_occured' => '出错',
-'error_remove_document' => '',
-'error_remove_folder' => '',
-'error_remove_permission' => '',
-'error_toogle_permission' => '',
+'error_remove_document' => '删除文档时出错',
+'error_remove_folder' => '删除文件夹时出错',
+'error_remove_permission' => '移除权限时报错',
+'error_toogle_permission' => '修改权限时报错',
 'es_ES' => '西班牙语',
 'event_details' => '错误详情',
 'exclude_items' => '排除项目',
@@ -423,19 +477,19 @@ URL: [url]',
 'expired_at_date' => '',
 'expires' => '有效限期',
 'expire_by_date' => '指定过期时间',
-'expire_in_1d' => '',
-'expire_in_1h' => '',
+'expire_in_1d' => '一天后截止',
+'expire_in_1h' => '一小时后截止',
 'expire_in_1m' => '1月后过期',
 'expire_in_1w' => '1周后过期',
 'expire_in_1y' => '1年后过期',
-'expire_in_2h' => '',
+'expire_in_2h' => '两小时后截止',
 'expire_in_2y' => '2年后过期',
-'expire_today' => '',
-'expire_tomorrow' => '',
+'expire_today' => '截止今天',
+'expire_tomorrow' => '截止至明天',
 'expiry_changed_email' => '到期日子已改变',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
-'export' => '',
+'export' => '导出',
 'extension_manager' => '扩展管理器',
 'february' => '二 月',
 'file' => '文件',
@@ -450,20 +504,40 @@ URL: [url]',
 'folders' => '文件夹',
 'folders_and_documents_statistic' => '内容概要',
 'folders_with_notification' => '',
-'folder_comment_changed_email' => '',
-'folder_comment_changed_email_body' => '',
-'folder_comment_changed_email_subject' => '',
+'folder_comment_changed_email' => '注释已更新',
+'folder_comment_changed_email_body' => '批注已更新
+文件夹: [name]
+最近批注: [old_comment]
+当前批注: [new_comment]
+父文件夹: [folder_path]
+用户: [username]
+URL: [url]',
+'folder_comment_changed_email_subject' => '[sitename]: [name] - 批注已更新',
 'folder_contents' => '文件夹内容',
 'folder_deleted_email' => '文件夹已被删除',
-'folder_deleted_email_body' => '',
-'folder_deleted_email_subject' => '',
+'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' => '',
-'folder_moved_email_subject' => '',
+'folder_moved_email_body' => '文件夹已迁移
+文件夹: [name]
+文件夹最近所在路径: [old_folder_path]
+文件夹当前所在路径: [new_folder_path]
+用户: [username]
+URL: [url]',
+'folder_moved_email_subject' => '[sitename]: [name] - 文件夹已迁移',
 'folder_renamed_email' => '文件夹已被重命名',
-'folder_renamed_email_body' => '',
-'folder_renamed_email_subject' => '',
+'folder_renamed_email_body' => '文件夹已重命名
+文件夹: [name]
+父文件夹: [folder_path]
+历史名称: [old_name]
+用户: [username]
+URL: [url]',
+'folder_renamed_email_subject' => '[sitename]: [name] - 文件夹已重命名',
 'folder_title' => '文件夹 \'[foldername]\'',
 'friday' => 'Friday',
 'friday_abbr' => '',
@@ -471,53 +545,53 @@ URL: [url]',
 'fr_FR' => '法语',
 'fullsearch' => '全文搜索',
 'fullsearch_hint' => '使用全文索引',
-'fulltextsearch_disabled' => '',
+'fulltextsearch_disabled' => '全文索引已禁用',
 'fulltext_info' => '全文索引信息',
-'global_attributedefinitiongroups' => '',
+'global_attributedefinitiongroups' => '属性组',
 'global_attributedefinitions' => '属性',
 'global_default_keywords' => '全局关键字',
 'global_document_categories' => '分类',
-'global_workflows' => '',
-'global_workflow_actions' => '',
-'global_workflow_states' => '',
+'global_workflows' => '工作流',
+'global_workflow_actions' => '工作流程节点',
+'global_workflow_states' => '工作流状态',
 'group' => '组别',
 'groups' => '组别',
 'group_approval_summary' => '审核组汇总',
 'group_exists' => '组已存在',
-'group_info' => '',
+'group_info' => '组信息',
 'group_management' => '组管理',
 'group_members' => '组成员',
 'group_receipt_summary' => '',
 'group_review_summary' => '校对组汇总',
 'guest_login' => '来宾登录',
 'guest_login_disabled' => '来宾登录被禁止',
-'hash' => '',
+'hash' => '哈希',
 'help' => '帮助',
-'home_folder' => '',
-'hook_name' => '',
+'home_folder' => '主文件夹',
+'hook_name' => '钩子名称',
 'hourly' => '小时',
-'hours' => '',
+'hours' => '小时',
 'hr_HR' => '克罗地亚人',
 'human_readable' => '可读存档',
 'hu_HU' => '匈牙利语',
 'id' => '序号',
 'identical_version' => '',
 'import' => '导入',
-'importfs' => '',
+'importfs' => '从文件系统中导入',
 'import_fs' => '从文件系统导入',
-'import_fs_warning' => '',
+'import_fs_warning' => '这将只适用于拖动文件夹。该操作将递归导入所有文件夹和文件。文件将立即释放。',
 'include_content' => '',
 'include_documents' => '包含文档',
 'include_subdirectories' => '包含子目录',
 'indexing_tasks_in_queue' => '队列中的检索任务',
 'index_converters' => '索引文件转换',
-'index_done' => '',
-'index_error' => '',
+'index_done' => '已完成',
+'index_error' => '系统错误',
 'index_folder' => '索引目录',
-'index_pending' => '',
+'index_pending' => '待处理',
 'index_waiting' => '',
 'individuals' => '个人',
-'indivіduals_in_groups' => '',
+'indivіduals_in_groups' => '组成员',
 'inherited' => '继承',
 'inherits_access_copy_msg' => '复制继承访问权限列表',
 'inherits_access_empty_msg' => '从访问权限空列表开始',
@@ -552,13 +626,13 @@ URL: [url]',
 'is_hidden' => '从用户列表中隐藏',
 'it_IT' => '意大利语',
 'january' => '一 月',
-'js_form_error' => '',
-'js_form_errors' => '',
-'js_invalid_email' => '',
+'js_form_error' => '表单仍包含 # 错误。',
+'js_form_errors' => '表单仍包含 # c错误。',
+'js_invalid_email' => 'Email 地址非法',
 'js_no_approval_group' => '请选择审核组',
 'js_no_approval_status' => '请选择审核状态',
 'js_no_comment' => '没有添加说明',
-'js_no_currentpwd' => '',
+'js_no_currentpwd' => '请输入当前密码',
 'js_no_email' => '输入您的e-mail',
 'js_no_file' => '请选择一个文件',
 'js_no_keywords' => '指定关键字',
@@ -572,10 +646,10 @@ URL: [url]',
 'js_pwd_not_conf' => '密码与确认密码不一致',
 'js_select_user' => '请选择一个用户',
 'js_select_user_or_group' => '选择至少一个用户或一个组',
-'js_unequal_passwords' => '',
+'js_unequal_passwords' => '两次输入密码不一致',
 'july' => '七 月',
 'june' => '六 月',
-'keep' => '',
+'keep' => '未变更',
 'keep_doc_status' => '',
 'keywords' => '关键字',
 'keywords_loading' => '请稍等，直到关键字列表载入',
@@ -585,25 +659,25 @@ URL: [url]',
 'lastaccess' => '最后登录',
 'last_update' => '上次更新',
 'legend' => '图例',
-'librarydoc' => '',
+'librarydoc' => '库内文件',
 'linked_documents' => '相关文档',
 'linked_files' => '附件',
-'linked_to_current_version' => '',
-'linked_to_document' => '',
-'linked_to_this_version' => '',
+'linked_to_current_version' => '已链接到当前版本',
+'linked_to_document' => '链接到文档',
+'linked_to_this_version' => '链接到版本',
 'link_alt_updatedocument' => '超过20M大文件，请选择<a href="%s">上传大文件</a>.',
-'link_to_version' => '',
+'link_to_version' => '附加到版本',
 'list_access_rights' => '列出所有的访问权限',
 'list_contains_no_access_docs' => '',
-'list_hooks' => '',
+'list_hooks' => '钩子列表',
 'local_file' => '本地文件',
 'locked_by' => '锁定人',
 'lock_document' => '锁定',
 'lock_message' => '此文档已被 [username] 锁定. 只有授权用户才能解锁.',
 'lock_status' => '锁定状态',
-'login' => '',
+'login' => '登录',
 'login_disabled_text' => '',
-'login_disabled_title' => '',
+'login_disabled_title' => '账号已禁用',
 'login_error_text' => '登录错误.用户名或密码不正确',
 'login_error_title' => '登录错误',
 'login_not_given' => '缺少用户名',
@@ -611,21 +685,21 @@ URL: [url]',
 'logout' => '登出',
 'log_management' => '日志管理',
 'manager' => '管理员',
-'manager_of_group' => '',
+'manager_of_group' => '您是当前组的管理员',
 'mandatory_approvergroups' => '',
 'mandatory_approvergroup_no_access' => '',
 'mandatory_approvers' => '必须的审批者',
 'mandatory_approver_no_access' => '',
 'mandatory_reviewergroups' => '',
 'mandatory_reviewergroup_no_access' => '',
-'mandatory_reviewers' => '',
+'mandatory_reviewers' => '必选校对人',
 'mandatory_reviewer_no_access' => '',
 'march' => '三 月',
 'max_upload_size' => '最大上传文件大小',
 'may' => '五 月',
-'menu_dropfolder' => '',
+'menu_dropfolder' => '删除文件夹',
 'mimetype' => 'MIME类型',
-'minutes' => '',
+'minutes' => '分钟',
 'misc' => '其他',
 'missing_checksum' => '缺失校验',
 'missing_file' => '',
@@ -646,42 +720,66 @@ URL: [url]',
 'my_transmittals' => '',
 'name' => '名称',
 'needs_workflow_action' => '',
-'network_drive' => '',
-'never' => '',
+'network_drive' => '网络驱动器',
+'never' => '从不',
 'new' => 'New',
 'new_attrdef' => '添加属性',
 'new_default_keywords' => '添加关键字',
 'new_default_keyword_category' => '添加类别',
 'new_document_category' => '增加分类',
 'new_document_email' => '添加新文档',
-'new_document_email_body' => '',
-'new_document_email_subject' => '',
+'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' => '',
-'new_file_email_subject' => '',
+'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' => '',
-'new_subfolder_email_subject' => '',
+'new_subfolder_email_body' => '新建文件夹
+名称: [name]
+父文件夹: [folder_path]
+备注: [comment]
+用户: [username]
+URL: [url]',
+'new_subfolder_email_subject' => '[sitename]: [name] - 新建文件夹',
 'new_user_image' => '新建图片',
-'next_state' => '',
+'next_state' => '新建状态',
 'nl_NL' => '荷兰语',
 'no' => '否',
 'notify_added_email' => '您已被添加到了通知名单中',
-'notify_added_email_body' => '',
-'notify_added_email_subject' => '',
+'notify_added_email_body' => '添加到通知列表
+名称: [name]
+父文件夹: [folder_path]
+用户: [username]
+URL: [url]',
+'notify_added_email_subject' => '[sitename]: [name] - 添加到通知列表',
 'notify_deleted_email' => '您已经从通知名单中删除',
-'notify_deleted_email_body' => '',
-'notify_deleted_email_subject' => '',
+'notify_deleted_email_body' => '从通知列表中移除
+名称: [name]
+父文件夹: [folder_path]
+用户: [username]
+URL: [url]',
+'notify_deleted_email_subject' => '[sitename]: [name] - 从通知列表中移除',
 'november' => '十一月',
-'now' => '',
+'now' => '现在',
 'no_action' => '无动作请求',
 'no_approval_needed' => '无待审核的文件',
 'no_attached_files' => '无附件',
 'no_current_version' => '',
 'no_default_keywords' => '无关键字',
-'no_docs_checked_out' => '',
+'no_docs_checked_out' => '文档未签出',
 'no_docs_locked' => '无锁定的文档',
 'no_docs_rejected' => '',
 'no_docs_to_approve' => '当前没有需要审核的文档',
@@ -689,8 +787,8 @@ URL: [url]',
 'no_docs_to_receipt' => '',
 'no_docs_to_review' => '当前没有需要校对的文档',
 'no_docs_to_revise' => '',
-'no_email_or_login' => '',
-'no_fulltextindex' => '',
+'no_email_or_login' => '登录名和 Email 必须填写',
+'no_fulltextindex' => '全文索引不可用',
 'no_groups' => '无组别',
 'no_group_members' => '该组没有成员',
 'no_linked_files' => '无链接文件',
@@ -702,11 +800,11 @@ URL: [url]',
 'no_update_cause_locked' => '您不能更新此文档，请联系该文档锁定人',
 'no_user_image' => '无图片',
 'no_version_check' => '检查SeedDMS的新版本失败！这可能是由于在您的php配置中allow_url_fopen设置为0引起的。',
-'no_version_modification' => '',
-'no_workflow_available' => '',
+'no_version_modification' => '版本未修改',
+'no_workflow_available' => '工作流不可用',
 'objectcheck' => '文件夹/文件检查',
-'object_check_critical' => '',
-'object_check_warning' => '',
+'object_check_critical' => '重大错误',
+'object_check_warning' => '警告',
 'obsolete' => '过时的',
 'october' => '十 月',
 'old' => 'Old',
@@ -716,49 +814,63 @@ URL: [url]',
 'overall_indexing_progress' => '所有索引进程',
 'owner' => '所有者',
 'ownership_changed_email' => '所有者已变更',
-'ownership_changed_email_body' => '',
-'ownership_changed_email_subject' => '',
+'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' => '',
-'password_expired' => '',
-'password_expires_in_days' => '',
-'password_forgotten' => '',
-'password_forgotten_email_body' => '',
-'password_forgotten_email_subject' => '',
+'password_already_used' => '密码已被使用',
+'password_expiration' => '密码过期',
+'password_expiration_text' => '您的密码已过期。若要继续使用本系统，请立即重置新密码。',
+'password_expired' => '密码已过期',
+'password_expires_in_days' => '密码将在 %s 天后过期。',
+'password_forgotten' => '忘记密码',
+'password_forgotten_email_body' => '尊敬的 SeedDMS 用户，
+
+我们接收到您要求修改密码的请求。
+
+您可以通过点击以下链接处理该事务：
+
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
+
+若您在修改后仍无法登录系统，请联系您 SeedDMS 管理员寻求帮助。',
+'password_forgotten_email_subject' => '[sitename]: 忘记密码',
 'password_forgotten_send_hash' => '',
-'password_forgotten_text' => '',
-'password_forgotten_title' => '',
-'password_repeat' => '',
-'password_send' => '',
-'password_send_text' => '',
+'password_forgotten_text' => '填写以下表格，并遵循邮件中的指示找回遗失密码。',
+'password_forgotten_title' => '密码已发送',
+'password_repeat' => '重复密码',
+'password_send' => '发送密码',
+'password_send_text' => '您的新密码已通过邮件发送给您。若您尚未收到该邮件，请确认登陆用户名和对应的电子邮件填写是否正确，并重试。',
 'password_strength' => '密码强度',
 'password_strength_insuffient' => '密码强度不够',
-'password_wrong' => '',
-'pending_approvals' => '',
-'pending_receipt' => '',
-'pending_reviews' => '',
-'pending_revision' => '',
-'pending_workflows' => '',
+'password_wrong' => '密码错误',
+'pending_approvals' => '待处理的审核',
+'pending_receipt' => '待处理的接收',
+'pending_reviews' => '待处理的校对',
+'pending_revision' => '待处理的修订',
+'pending_workflows' => '待处理的工作流',
 'personal_default_keywords' => '用户关键字',
 'pl_PL' => '波兰语',
 'possible_substitutes' => '',
-'preset_expires' => '',
+'preset_expires' => '预设失效时间',
 'preview' => '预览',
-'preview_converters' => '',
-'preview_images' => '',
-'preview_markdown' => '',
-'preview_plain' => '',
-'previous_state' => '',
+'preview_converters' => '预览文档',
+'preview_images' => '预览图片',
+'preview_markdown' => 'Markdown',
+'preview_plain' => 'TEXT',
+'previous_state' => 'Previous state',
 'previous_versions' => '先前版本',
-'process' => '',
-'process_without_user_group' => '',
+'process' => '进程',
+'process_without_user_group' => '不含用户/组的进程',
 'pt_BR' => '葡萄牙语',
 'quota' => '配额',
-'quota_exceeded' => '',
+'quota_exceeded' => '您的磁盘配额已超过 [bytes]。',
 'quota_is_disabled' => '配额的支持',
-'quota_warning' => '',
+'quota_warning' => '您的磁盘最大使用量已超过 [bytes]。请删除文档或以前的版本。',
 'receipts_accepted' => '',
 'receipts_not_touched' => '',
 'receipts_rejected' => '',
@@ -766,10 +878,15 @@ URL: [url]',
 'receipts_without_user' => '',
 'receipt_deletion_email_body' => '',
 'receipt_deletion_email_subject' => '',
-'receipt_log' => '',
-'receipt_request_email_body' => '',
+'receipt_log' => '处理日志',
+'receipt_request_email_body' => '接收请求
+文档: [name]
+版本: [version]
+父文件夹: [folder_path]
+用户: [username]
+URL: [url]',
 'receipt_request_email_subject' => '',
-'receipt_status' => '',
+'receipt_status' => '状态',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
 'reception' => '',
@@ -783,21 +900,30 @@ URL: [url]',
 'released' => '发布',
 'removed_approver' => '已经从审核人名单中删除',
 'removed_file_email' => '删除附件',
-'removed_file_email_body' => '',
-'removed_file_email_subject' => '',
+'removed_file_email_body' => '附件已删除
+文档: [document]
+用户: [username]
+URL: [url]',
+'removed_file_email_subject' => '[sitename]: [document] - 已删除附件',
 'removed_recipient' => '',
 'removed_reviewer' => '已经从校对人名单中删除',
 'removed_revisor' => '',
-'removed_workflow_email_body' => '',
-'removed_workflow_email_subject' => '',
+'removed_workflow_email_body' => '从文档版本中移除工作流
+文档: [name]
+版本: [version]
+工作流: [workflow]
+父文件夹: [folder_path]
+用户: [username]
+URL: [url]',
+'removed_workflow_email_subject' => '[sitename]: [name] - 已从文档版本中移除工作流',
 'removeFolderFromDropFolder' => '导入后删除文件夹',
 'remove_marked_files' => '删除选中的文件',
-'repaired' => '',
+'repaired' => '已修复',
 'repairing_objects' => '',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
-'reset_checkout' => '',
-'restrict_access' => '',
+'reset_checkout' => '完成签出',
+'restrict_access' => '无访问权限',
 'results_page' => '结果页面',
 'return_from_subworkflow' => '',
 'return_from_subworkflow_email_body' => '',
@@ -814,37 +940,49 @@ URL: [url]',
 'review_deletion_email' => '校对请求被删除',
 'review_deletion_email_body' => '',
 'review_deletion_email_subject' => '',
-'review_file' => '',
+'review_file' => '文件',
 'review_group' => '校对组',
 'review_log' => '审阅记录',
 'review_request_email' => '校对请求',
 'review_request_email_body' => '',
-'review_request_email_subject' => '',
+'review_request_email_subject' => '[sitename]: [name] - 校对请求',
 'review_status' => '校对状态',
 'review_submit_email' => '提交校对',
-'review_submit_email_body' => '',
+'review_submit_email_body' => '已提交校对
+文档: [name]
+版本: [version]
+状态: [status]
+批注: [comment]
+父文件夹: [folder_path]
+用户: [username]
+URL: [url]',
 'review_submit_email_subject' => '',
 'review_summary' => '校对汇总',
 'review_update_failed' => '错误 更新校对状态.更新失败',
 'revise_document' => '',
 'revise_document_on' => '',
-'revisions_accepted' => '',
+'revisions_accepted' => '[no_revisions] 修订已被接受',
 'revisions_not_touched' => '',
 'revisions_pending' => '',
 'revisions_rejected' => '',
 'revisions_without_group' => '',
 'revisions_without_user' => '',
-'revision_date' => '',
-'revision_log' => '',
-'revision_request_email_body' => '',
-'revision_request_email_subject' => '',
-'revision_status' => '',
+'revision_date' => '修订日期',
+'revision_log' => '修订日志',
+'revision_request_email_body' => '修订请求
+文档: [name]
+版本: [version]
+父文件夹: [folder_path]
+用户: [username]
+URL: [url]',
+'revision_request_email_subject' => '[sitename]: [name] - 修订请求',
+'revision_status' => '修订状态',
 'revision_submit_email_body' => '',
 'revision_submit_email_subject' => '',
-'revisors' => '',
-'revisor_already_assigned' => '',
-'revisor_already_removed' => '',
-'rewind_workflow' => '',
+'revisors' => '修订人',
+'revisor_already_assigned' => '用户已被分配为修订人',
+'revisor_already_removed' => '修订人已经从修订过程中删除，或者已经修改了文档。',
+'rewind_workflow' => '回退工作流',
 'rewind_workflow_email_body' => '',
 'rewind_workflow_email_subject' => '',
 'rewind_workflow_warning' => '',
@@ -853,39 +991,46 @@ URL: [url]',
 'rm_default_keyword_category' => '删除类别',
 'rm_document' => '删除文档',
 'rm_document_category' => '删除分类',
-'rm_event' => '',
+'rm_event' => '删除事件',
 'rm_file' => '删除文件',
 'rm_folder' => '删除文件夹',
 'rm_from_clipboard' => '从剪切板删除',
 'rm_group' => '删除该组',
-'rm_role' => '',
+'rm_role' => '删除角色',
 'rm_transmittal' => '',
-'rm_transmittalitem' => '',
+'rm_transmittalitem' => '移除项目',
 'rm_user' => '删除该用户',
 'rm_user_from_processes' => '',
 'rm_version' => '删除该版本',
-'rm_workflow' => '',
-'rm_workflow_action' => '',
-'rm_workflow_state' => '',
+'rm_workflow' => '删除工作流',
+'rm_workflow_action' => '删除工作流节点',
+'rm_workflow_state' => '删除工作流状态',
 'rm_workflow_warning' => '',
 'role' => '角色',
 'role_admin' => '管理员',
 'role_guest' => '来宾',
-'role_info' => '',
-'role_management' => '',
-'role_name' => '',
-'role_type' => '',
+'role_info' => '角色信息',
+'role_management' => '角色管理',
+'role_name' => '角色名称',
+'role_type' => '角色类型',
 'role_user' => '用户',
 'ro_RO' => '罗马尼亚语',
-'run_subworkflow' => '',
-'run_subworkflow_email_body' => '',
-'run_subworkflow_email_subject' => '',
+'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',
 'saturday_abbr' => '',
 'save' => '保存',
 'search' => '搜索',
-'search_fulltext' => '',
+'search_fulltext' => '全文检索',
 'search_in' => '搜索于',
 'search_mode_and' => '与模式',
 'search_mode_documents' => '仅文档',
@@ -894,22 +1039,22 @@ URL: [url]',
 'search_no_results' => '没有找到与您搜索添加相匹配的文件',
 'search_query' => '搜索',
 'search_report' => '找到 [count] 个文档',
-'search_report_fulltext' => '',
+'search_report_fulltext' => '已找到 [doccount] 篇文档',
 'search_resultmode' => '搜索模式',
 'search_resultmode_both' => '文档和目录',
 'search_results' => '搜索结果',
 'search_results_access_filtered' => '搜索到得结果中可能包含受限访问的文档',
 'search_time' => '耗时:[time]秒',
-'seconds' => '',
+'seconds' => '秒',
 'selection' => '选择',
 'select_attrdefgrp_show' => '',
 'select_category' => '选中分类',
 'select_groups' => '点击选择组',
 'select_grp_approvers' => '点击选择组审批组',
-'select_grp_ind_approvers' => '',
-'select_grp_ind_notification' => '',
-'select_grp_ind_recipients' => '',
-'select_grp_ind_reviewers' => '',
+'select_grp_ind_approvers' => '点击选择组',
+'select_grp_ind_notification' => '点击选择组',
+'select_grp_ind_recipients' => '点击选择组',
+'select_grp_ind_reviewers' => '点击选择组',
 'select_grp_notification' => '点击选择被通知组',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => '点击选择审核群组',
@@ -921,11 +1066,16 @@ URL: [url]',
 'select_ind_revisors' => '',
 'select_one' => '选择一个',
 'select_users' => '点击选择用户',
-'select_workflow' => '',
-'send_email' => '',
-'send_login_data' => '',
-'send_login_data_body' => '',
-'send_login_data_subject' => '',
+'select_workflow' => '选择工作流',
+'send_email' => '发送邮件',
+'send_login_data' => '发送登录数据',
+'send_login_data_body' => '登录数据
+
+登录: [login]
+用户: [username]
+
+[comment]',
+'send_login_data_subject' => '[sitename]: [login] - 您的登录数据',
 'send_test_mail' => '发送测试邮件',
 'september' => '九 月',
 'sequence' => '次序',
@@ -933,30 +1083,30 @@ URL: [url]',
 'seq_end' => '末尾',
 'seq_keep' => '当前',
 'seq_start' => '首位',
-'sessions' => '',
+'sessions' => '在线用户',
 'settings' => '设置',
-'settings_activate_module' => '',
-'settings_activate_php_extension' => '',
+'settings_activate_module' => '启用模块',
+'settings_activate_php_extension' => '启用 PHP 扩展',
 'settings_adminIP' => '管理员IP',
 'settings_adminIP_desc' => '',
 'settings_Advanced' => '高级设置',
-'settings_advancedAcl' => '',
+'settings_advancedAcl' => '高级访问控制',
 'settings_advancedAcl_desc' => '',
 'settings_apache_mod_rewrite' => '',
-'settings_Authentication' => '',
-'settings_autoLoginUser' => '',
+'settings_Authentication' => '授权管理',
+'settings_autoLoginUser' => '自动登陆',
 'settings_autoLoginUser_desc' => '',
 'settings_available_languages' => '可用的语言',
 'settings_available_languages_desc' => '只有选中的语言会被显示在语言选>择框内。默认的语言始终可选。',
-'settings_backupDir' => '',
+'settings_backupDir' => '备份目录',
 'settings_backupDir_desc' => '',
-'settings_cacheDir' => '',
+'settings_cacheDir' => 'Cashe 缓存目录',
 'settings_cacheDir_desc' => '',
 'settings_Calendar' => '日历设置',
 'settings_calendarDefaultView' => '日历默认试图',
 'settings_calendarDefaultView_desc' => '日历默认试图',
-'settings_cannot_disable' => '',
-'settings_checkOutDir' => '',
+'settings_cannot_disable' => 'ENABLE_INSTALL_TOOL 文件不能删除',
+'settings_checkOutDir' => '用于已签出文件的目录',
 'settings_checkOutDir_desc' => '',
 'settings_cmdTimeout' => '',
 'settings_cmdTimeout_desc' => '',
@@ -970,11 +1120,11 @@ URL: [url]',
 'settings_cookieLifetime_desc' => '',
 'settings_coreDir' => 'SeedDMS核心目录',
 'settings_coreDir_desc' => '',
-'settings_createCheckOutDir' => '',
-'settings_createCheckOutDir_desc' => '',
-'settings_createdatabase' => '',
-'settings_createdirectory' => '',
-'settings_currentvalue' => '',
+'settings_createCheckOutDir' => '创建签出目录',
+'settings_createCheckOutDir_desc' => '若签出目录不存在，则创建签出目录',
+'settings_createdatabase' => '新建数据库表',
+'settings_createdirectory' => '创建目录',
+'settings_currentvalue' => '当前值',
 'settings_Database' => '数据库设置',
 'settings_dbDatabase' => '数据库名称',
 'settings_dbDatabase_desc' => '设置连接的数据库',
@@ -987,38 +1137,38 @@ URL: [url]',
 'settings_dbUser' => '数据库用户',
 'settings_dbUser_desc' => '设置连接数据库的用户',
 'settings_dbVersion' => '',
-'settings_defaultAccessDocs' => '',
-'settings_defaultAccessDocs_desc' => '',
-'settings_defaultSearchMethod' => '',
-'settings_defaultSearchMethod_desc' => '',
+'settings_defaultAccessDocs' => '新增文档时默认访问控制',
+'settings_defaultAccessDocs_desc' => '创建新文档时的默认访问权限',
+'settings_defaultSearchMethod' => '默认搜索模式',
+'settings_defaultSearchMethod_desc' => '在主菜单中启动检索时，设置默认的搜索方式',
 'settings_defaultSearchMethod_valdatabase' => '数据库',
 'settings_defaultSearchMethod_valfulltext' => '全文',
-'settings_delete_install_folder' => '',
-'settings_disableSelfEdit' => '',
-'settings_disableSelfEdit_desc' => '',
-'settings_disable_install' => '',
+'settings_delete_install_folder' => '在使用 SeedDMS 前，您必须先删除配置目录（config）下的 ENABLE_INSTALL_TOOL 文件',
+'settings_disableSelfEdit' => '禁用自编辑',
+'settings_disableSelfEdit_desc' => '若勾选，则用户不能编辑自己的档案信息',
+'settings_disable_install' => '如有可能，则删除 ENABLE_INSTALL_TOOL 文件',
 'settings_Display' => '设置显示',
 'settings_dropFolderDir' => '',
 'settings_dropFolderDir_desc' => '',
 'settings_Edition' => '编辑设置',
 'settings_editOnlineFileTypes' => '编辑在线文件类型',
 'settings_editOnlineFileTypes_desc' => '',
-'settings_enable2FactorAuthentication' => '',
-'settings_enable2FactorAuthentication_desc' => '',
-'settings_enableAcknowledgeWorkflow' => '',
+'settings_enable2FactorAuthentication' => '启用双重认证',
+'settings_enable2FactorAuthentication_desc' => '启用/禁用双重认证机制。用户将需要在手机上进行 Google 认证。',
+'settings_enableAcknowledgeWorkflow' => '启用文档接收确认通知',
 'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminReceipt' => '',
 'settings_enableAdminReceipt_desc' => '',
-'settings_enableAdminRevApp' => '',
+'settings_enableAdminRevApp' => '允许管理员账号进行校对/审核处理',
 'settings_enableAdminRevApp_desc' => '',
 'settings_enableCalendar' => '开启日历',
-'settings_enableCalendar_desc' => '',
+'settings_enableCalendar_desc' => '启用/禁用日历模块',
 'settings_enableClipboard' => '允许剪切板',
-'settings_enableClipboard_desc' => '',
+'settings_enableClipboard_desc' => '在【查看文件夹】页，启用/禁用粘贴板',
 'settings_enableConverting' => '打开转换',
 'settings_enableConverting_desc' => '打开/关闭文件转换',
-'settings_enableDropFolderList' => '',
-'settings_enableDropFolderList_desc' => '',
+'settings_enableDropFolderList' => '在菜单的拖拽文件夹中启用文件列表',
+'settings_enableDropFolderList_desc' => '打开拖拽文件夹中的文件列表。该列表将在主菜单中显示。',
 'settings_enableDropUpload' => '允许快速上传',
 'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => '允许重复的文件名',
@@ -1026,65 +1176,65 @@ URL: [url]',
 'settings_enableEmail' => '开启邮件',
 'settings_enableEmail_desc' => '开启/关闭邮件自动提醒',
 'settings_enableFolderTree' => '开启目录树',
-'settings_enableFolderTree_desc' => '',
+'settings_enableFolderTree_desc' => '在【查看文件夹】页面上，启用/禁用文件夹树',
 'settings_enableFullSearch' => '允许全文搜索',
 'settings_enableFullSearch_desc' => '允许全文搜索',
-'settings_enableGuestAutoLogin' => '',
-'settings_enableGuestAutoLogin_desc' => '',
-'settings_enableGuestLogin' => '',
+'settings_enableGuestAutoLogin' => '启用游客账户自动登陆',
+'settings_enableGuestAutoLogin_desc' => '若访客登陆并自动登录的选项启用，则访客将自动登录系统。',
+'settings_enableGuestLogin' => '启用访客登录',
 'settings_enableGuestLogin_desc' => '',
 'settings_enableHelp' => '开启帮助',
 'settings_enableHelp_desc' => '',
-'settings_enableLanguageSelector' => '',
+'settings_enableLanguageSelector' => '启用多语言支持',
 'settings_enableLanguageSelector_desc' => '',
 'settings_enableLargeFileUpload' => '开启大文件上传',
 'settings_enableLargeFileUpload_desc' => '',
-'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks' => '在菜单中启用任务列表',
 'settings_enableMenuTasks_desc' => '',
-'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload' => '允许一次性上传多个文件',
 'settings_enableMultiUpload_desc' => '',
-'settings_enableNotificationAppRev' => '',
-'settings_enableNotificationAppRev_desc' => '',
+'settings_enableNotificationAppRev' => '启用校对/审核通知',
+'settings_enableNotificationAppRev_desc' => '勾选后，将向校对人/审核人发送文档新版本通知',
 'settings_enableNotificationWorkflow' => '',
 'settings_enableNotificationWorkflow_desc' => '',
-'settings_enableOwnerNotification' => '',
+'settings_enableOwnerNotification' => '默认通知所有者',
 'settings_enableOwnerNotification_desc' => '',
 'settings_enableOwnerReceipt' => '',
 'settings_enableOwnerReceipt_desc' => '',
 'settings_enableOwnerRevApp' => '允许所有者进行审查或批准',
 'settings_enableOwnerRevApp_desc' => '',
-'settings_enablePasswordForgotten' => '',
-'settings_enablePasswordForgotten_desc' => '',
+'settings_enablePasswordForgotten' => '启用忘记密码功能',
+'settings_enablePasswordForgotten_desc' => '如您想让用户可以通过邮件方式自主设置新密码，请勾选此选项',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
-'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow' => '启用文档修订记录',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
-'settings_enableSessionList' => '',
-'settings_enableSessionList_desc' => '',
+'settings_enableSessionList' => '在菜单中启用在线用户列表',
+'settings_enableSessionList_desc' => '在菜单中启用当前已登录用户列表',
 'settings_enableThemeSelector' => '主题选择',
-'settings_enableThemeSelector_desc' => '',
-'settings_enableUpdateReceipt' => '',
-'settings_enableUpdateReceipt_desc' => '',
+'settings_enableThemeSelector_desc' => '在登录页启用/禁用主题选择',
+'settings_enableUpdateReceipt' => '允许修改已处理内容',
+'settings_enableUpdateReceipt_desc' => '若允许用户修改已提交的处理意见，则启用该选项。',
 'settings_enableUpdateRevApp' => '',
-'settings_enableUpdateRevApp_desc' => '',
-'settings_enableUserImage' => '',
-'settings_enableUserImage_desc' => '',
+'settings_enableUpdateRevApp_desc' => '启用该选项，如果已经进行审核/审批的用户可以在当前工作流程步骤尚未完成的情况下更改解除条件。',
+'settings_enableUserImage' => '启用用户图片',
+'settings_enableUserImage_desc' => '启用用户图片',
 'settings_enableUsersView' => '开启用户视图',
-'settings_enableUsersView_desc' => '',
-'settings_enableVersionDeletion' => '',
-'settings_enableVersionDeletion_desc' => '',
-'settings_enableVersionModification' => '',
-'settings_enableVersionModification_desc' => '',
+'settings_enableUsersView_desc' => '（所有人）启用/禁用组视图和用户视图',
+'settings_enableVersionDeletion' => '允许删除之前版本',
+'settings_enableVersionDeletion_desc' => '启用/禁用普通用户删除以前的文档版本。管理员除外（可随时删除旧版本）。',
+'settings_enableVersionModification' => '启用版本修改功能',
+'settings_enableVersionModification_desc' => '通过用户上传新版本，启用/禁用文档版本修改',
 'settings_encryptionKey' => '加密密钥',
 'settings_encryptionKey_desc' => '',
-'settings_error' => '',
+'settings_error' => '错误',
 'settings_expandFolderTree' => '展开文件夹树',
 'settings_expandFolderTree_desc' => '展开文件夹树',
-'settings_expandFolderTree_val0' => '',
-'settings_expandFolderTree_val1' => '',
-'settings_expandFolderTree_val2' => '',
+'settings_expandFolderTree_val0' => '启动时隐藏树形结构',
+'settings_expandFolderTree_val1' => '启动时显示树形结构并展开第一级',
+'settings_expandFolderTree_val2' => '启动时显示属性结构并全部展开',
 'settings_Extensions' => '设置扩展',
 'settings_extraPath' => '额外的PHP的include路径',
 'settings_extraPath_desc' => '附加软件的路径。这是包含目录，例如在ADODB目录或额外的PEAR包',
@@ -1093,39 +1243,39 @@ URL: [url]',
 'settings_footNote' => '附注',
 'settings_footNote_desc' => '显示在每个页面底部的信息',
 'settings_fullSearchEngine' => '全文搜索引擎',
-'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine_desc' => '设置用于全文检索的方法',
 'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => '访客名称',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => '',
 'settings_httpRoot_desc' => '',
-'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus' => '初始化文档状态',
 'settings_initialDocumentStatus_desc' => '',
-'settings_initialDocumentStatus_draft' => '',
-'settings_initialDocumentStatus_released' => '',
-'settings_installADOdb' => '',
-'settings_install_disabled' => '',
+'settings_initialDocumentStatus_draft' => '起草中',
+'settings_initialDocumentStatus_released' => '已发布',
+'settings_installADOdb' => '安装 ADOdb',
+'settings_install_disabled' => 'ENABLE_INSTALL_TOOL 文件已删除。祝贺您，您现在可以登陆并开始使用 SeedDMS 系统了！',
 'settings_install_pear_package_log' => '',
 'settings_install_pear_package_webdav' => '',
-'settings_install_success' => '',
-'settings_install_welcome_text' => '',
-'settings_install_welcome_title' => '',
+'settings_install_success' => '安装已完成！',
+'settings_install_welcome_text' => '在开始安装 SeedDMS 之前，请确保您已经在配置目录中创建了文件“ENABLE_INSTALL_TOOL”，否则将不能安装。在 Unix 系统上，这可以很容易地通过命令 “touch conf / ENABLE_INSTALL_TOOL” 完成。完成安装后，请务必删除该文件。</ p> <p> SeedDMS 的要求非常低。您需要安装 mysql 数据库或 sqlite 支持，并启用支持 php 的 Web 服务器。Pear Package Log 也必须安装。对于 lucene 全文搜索，您还需要安装在光盘上的 Zend 框架，可以通过 php 找到它。对于 WebDAV 服务器，您还需要 HTTP_WebDAV_Server。您可以在安装过程中设置路径。</ p> <p>如果您希望在开始安装之前创建数据库，那么只需使用自己喜爱的工具手动创建数据库，可以选择创建具有数据库访问权限的数据库用户并在配置目录中导入数据库转储之一。安装脚本也可以为您做到这一点，但是它需要数据库访问权限才能创建数据库。</ p>',
+'settings_install_welcome_title' => '欢迎使用 SeedDMS 安装向导！',
 'settings_install_zendframework' => '',
 'settings_language' => '语言设置',
 'settings_language_desc' => '默认语言（“语言”文件夹的一个子文件夹的名字',
-'settings_libraryFolder' => '',
+'settings_libraryFolder' => '库文件夹',
 'settings_libraryFolder_desc' => '',
 'settings_logFileEnable' => '开启日历文件',
-'settings_logFileEnable_desc' => '',
+'settings_logFileEnable_desc' => '启用 / 禁用日志文件',
 'settings_logFileRotation' => '',
 'settings_logFileRotation_desc' => '',
 'settings_loginFailure' => '登录失败',
-'settings_loginFailure_desc' => '',
+'settings_loginFailure_desc' => '在 n 次登陆失败后，锁定账号',
 'settings_luceneClassDir' => 'Lucene的SeedDMS目录',
 'settings_luceneClassDir_desc' => '',
-'settings_luceneDir' => '',
-'settings_luceneDir_desc' => '',
+'settings_luceneDir' => '全文索引目录',
+'settings_luceneDir_desc' => 'Lucene 索引路径',
 'settings_maxDirID' => '最大目录编号',
 'settings_maxDirID_desc' => '每个父目录的子目录的最大数目。默认值：0。',
 'settings_maxExecutionTime' => '最大执行时间（秒）',
@@ -1134,22 +1284,22 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
 'settings_maxSizeForFullText_desc' => '',
-'settings_maxUploadSize' => '',
+'settings_maxUploadSize' => '上传文件尺寸上限',
 'settings_maxUploadSize_desc' => '',
-'settings_more_settings' => '',
-'settings_notfound' => '',
+'settings_more_settings' => '更多设置。默认登陆账户： admin / admin',
+'settings_notfound' => '未找到',
 'settings_Notification' => '通知设置',
 'settings_notwritable' => '设置_不可写',
-'settings_no_content_dir' => '',
+'settings_no_content_dir' => '内容目录',
 'settings_overrideMimeType' => '覆盖Mime Type',
 'settings_overrideMimeType_desc' => '',
 'settings_partitionSize' => '',
 'settings_partitionSize_desc' => '',
-'settings_passwordExpiration' => '',
+'settings_passwordExpiration' => '密码过期',
 'settings_passwordExpiration_desc' => '',
-'settings_passwordHistory' => '',
+'settings_passwordHistory' => '密码历史',
 'settings_passwordHistory_desc' => '',
-'settings_passwordStrength' => '',
+'settings_passwordStrength' => '密码最小强度',
 'settings_passwordStrengthAlgorithm' => '',
 'settings_passwordStrengthAlgorithm_desc' => '',
 'settings_passwordStrengthAlgorithm_valadvanced' => '高级',
@@ -1157,11 +1307,11 @@ URL: [url]',
 'settings_passwordStrength_desc' => '',
 'settings_pear_log' => '',
 'settings_pear_webdav' => '',
-'settings_perms' => '',
+'settings_perms' => '权限',
 'settings_php_dbDriver' => '',
 'settings_php_gd2' => '',
 'settings_php_mbstring' => '',
-'settings_php_version' => '',
+'settings_php_version' => 'PHP 版本',
 'settings_presetExpirationDate' => '',
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => '缩略图宽度（详情页中)',
@@ -1174,13 +1324,13 @@ URL: [url]',
 'settings_quota_desc' => '',
 'settings_removeFromDropFolder' => '',
 'settings_removeFromDropFolder_desc' => '',
-'settings_restricted' => '',
+'settings_restricted' => '禁止访问',
 'settings_restricted_desc' => '',
 'settings_rootDir' => '根目录',
 'settings_rootDir_desc' => '',
 'settings_rootFolderID' => '根文件夹名称',
 'settings_rootFolderID_desc' => '',
-'settings_SaveError' => '',
+'settings_SaveError' => '配置文件报错时发生错误',
 'settings_Server' => '服务设置',
 'settings_showFullPreview' => '显示完整的文档',
 'settings_showFullPreview_desc' => '启用/禁用详细页面完整预览, 如果浏览器>支持的话',
@@ -1190,7 +1340,7 @@ URL: [url]',
 'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => '站点设置',
 'settings_siteDefaultPage' => '网站的默认页',
-'settings_siteDefaultPage_desc' => '',
+'settings_siteDefaultPage_desc' => '登录时的默认页。若为空则设置为 out/out.ViewFolder.php',
 'settings_siteName' => '站点名称',
 'settings_siteName_desc' => '用于页面标题的站点名称，默认为SeedDMS',
 'settings_SMTP' => 'SMTP 服务器设定',
@@ -1204,23 +1354,23 @@ URL: [url]',
 'settings_smtpServer_desc' => 'SMTP 服务器名称',
 'settings_smtpUser' => 'SMTP服务器用户',
 'settings_smtpUser_desc' => 'SMTP服务器用户',
-'settings_sortFoldersDefault' => '',
+'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_sortUsersInList_val_fullname' => '按用户全称排序',
+'settings_sortUsersInList_val_login' => '按用户登录名排序',
 'settings_stagingDir' => '',
 'settings_stagingDir_desc' => '',
-'settings_start_install' => '',
-'settings_stopWordsFile' => '',
-'settings_stopWordsFile_desc' => '',
+'settings_start_install' => '开始安装',
+'settings_stopWordsFile' => '停止词文件所在路径',
+'settings_stopWordsFile_desc' => '如果启用全文搜索，包含停止词的文件则不会被索引',
 'settings_strictFormCheck' => '严格表格检查',
 'settings_strictFormCheck_desc' => '严格表格检查。如果此项为是，将检查所有表格中字段的值。如果设置为否，内容和关键字段检查将成为可选项。同时提交评论或覆盖文件时，始终要求注释',
-'settings_suggestionvalue' => '',
+'settings_suggestionvalue' => '推荐值',
 'settings_System' => '系统设置',
 'settings_theme' => '主题设置',
 'settings_theme_desc' => '默认风格（“风格”文件夹的一个子文件夹的名字',
@@ -1249,59 +1399,59 @@ URL: [url]',
 'set_password' => '设定密码',
 'set_workflow' => '',
 'signed_in_as' => '登录为',
-'sign_in' => '',
+'sign_in' => '登录',
 'sign_out' => '登出',
 'sign_out_user' => '退出登录',
 'sk_SK' => '斯洛伐克语',
 'space_used_on_data_folder' => '数据文件夹使用空间',
 'splash_added_to_clipboard' => '已复制',
-'splash_add_attribute' => '',
-'splash_add_group' => '',
-'splash_add_group_member' => '',
-'splash_add_role' => '',
+'splash_add_attribute' => '属性已添加',
+'splash_add_group' => '组已添加',
+'splash_add_group_member' => '组成员已添加',
+'splash_add_role' => '添加新角色',
 'splash_add_to_transmittal' => '',
 'splash_add_transmittal' => '',
-'splash_add_user' => '',
-'splash_cleared_cache' => '',
-'splash_cleared_clipboard' => '',
-'splash_document_added' => '',
-'splash_document_checkedout' => '',
-'splash_document_edited' => '',
-'splash_document_indexed' => '',
+'splash_add_user' => '用户已添加',
+'splash_cleared_cache' => 'Cache 缓存已清理',
+'splash_cleared_clipboard' => '剪贴板已清空',
+'splash_document_added' => '文档已添加',
+'splash_document_checkedout' => '文档已签出',
+'splash_document_edited' => '文档已保存',
+'splash_document_indexed' => '文档 \'[name]\' 已索引。',
 'splash_document_locked' => '文档已被锁定',
 'splash_document_unlocked' => '已解锁的文档',
-'splash_edit_attribute' => '',
-'splash_edit_event' => '',
-'splash_edit_group' => '',
-'splash_edit_role' => '',
-'splash_edit_user' => '',
+'splash_edit_attribute' => '属性已保存',
+'splash_edit_event' => '事件已保存',
+'splash_edit_group' => '组已保存',
+'splash_edit_role' => '角色已保存',
+'splash_edit_user' => '用户信息已保存',
 'splash_error_add_to_transmittal' => '',
-'splash_error_rm_download_link' => '',
-'splash_error_send_download_link' => '',
-'splash_folder_edited' => '',
-'splash_importfs' => '',
-'splash_invalid_folder_id' => '',
-'splash_invalid_searchterm' => '',
+'splash_error_rm_download_link' => '移除下载链接时报错',
+'splash_error_send_download_link' => '发送下载链接时报错',
+'splash_folder_edited' => '更新文件夹',
+'splash_importfs' => '已导入文档 [docs] 和文件夹 [folders]',
+'splash_invalid_folder_id' => '非法的文件夹 ID',
+'splash_invalid_searchterm' => '无效的搜索项',
 'splash_moved_clipboard' => '',
-'splash_move_document' => '',
-'splash_move_folder' => '',
+'splash_move_document' => '文档已迁移',
+'splash_move_folder' => '文件夹已迁移',
 'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => '已从剪切板删除',
-'splash_rm_attribute' => '',
+'splash_rm_attribute' => '属性已移除',
 'splash_rm_document' => '文档已被移除',
-'splash_rm_download_link' => '',
+'splash_rm_download_link' => '下载链接已移除',
 'splash_rm_folder' => '已删除的文件夹',
-'splash_rm_group' => '',
-'splash_rm_group_member' => '',
-'splash_rm_role' => '',
+'splash_rm_group' => '组信息已删除',
+'splash_rm_group_member' => '组成员已移除',
+'splash_rm_role' => '角色已删除',
 'splash_rm_transmittal' => '',
-'splash_rm_user' => '',
+'splash_rm_user' => '用户信息已删除',
 'splash_rm_user_processes' => '',
-'splash_saved_file' => '',
-'splash_save_user_data' => '',
-'splash_send_download_link' => '',
-'splash_send_login_data' => '',
-'splash_settings_saved' => '',
+'splash_saved_file' => '版本已保存',
+'splash_save_user_data' => '用户数据已保存',
+'splash_send_download_link' => '下载链接已通过邮件发送。',
+'splash_send_login_data' => '登录数据已发送',
+'splash_settings_saved' => '设置已保存',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
@@ -1331,42 +1481,42 @@ URL: [url]',
 'submit_2_fact_auth' => '',
 'submit_approval' => '提交审核',
 'submit_login' => '登录',
-'submit_password' => '',
-'submit_password_forgotten' => '',
+'submit_password' => '设置新密码',
+'submit_password_forgotten' => '开始处理',
 'submit_receipt' => '',
 'submit_review' => '提交校对',
-'submit_revision' => '',
-'submit_userinfo' => '',
-'subsribe_timelinefeed' => '',
-'substitute_to_user' => '',
+'submit_revision' => '添加修订',
+'submit_userinfo' => '提交信息',
+'subsribe_timelinefeed' => '订阅时间线更新',
+'substitute_to_user' => '切换到 \'[username]\' 账户',
 'substitute_user' => '代理人',
 'success_add_aro' => '',
-'success_add_permission' => '',
-'success_remove_permission' => '',
-'success_toogle_permission' => '',
+'success_add_permission' => '权限已添加',
+'success_remove_permission' => '权限已移除',
+'success_toogle_permission' => '权限已更新',
 'sunday' => 'Sunday',
 'sunday_abbr' => '',
 'sv_SE' => '瑞典语',
 'switched_to' => '登录为',
 'takeOverAttributeValue' => '',
-'takeOverGrpApprover' => '',
-'takeOverGrpReviewer' => '',
+'takeOverGrpApprover' => '继承上一版本的审核人',
+'takeOverGrpReviewer' => '继承上一版本的校对人',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
-'tasks' => '',
+'tasks' => '任务',
 'temp_jscode' => '',
 'testmail_body' => '',
-'testmail_subject' => '',
+'testmail_subject' => '测试邮件配置',
 'theme' => '主题',
 'thursday' => 'Thursday',
 'thursday_abbr' => '',
 'timeline' => '时间轴',
 'timeline_add_file' => '新附件',
-'timeline_add_version' => '',
-'timeline_full_add_file' => '',
-'timeline_full_add_version' => '',
-'timeline_full_status_change' => '',
-'timeline_selected_item' => '',
+'timeline_add_version' => '新建版本 [version]',
+'timeline_full_add_file' => '[document]<br />新建附件',
+'timeline_full_add_version' => '[document]<br /> 新建版本 [version]',
+'timeline_full_status_change' => '[document]<br />版本[version]: [status]',
+'timeline_selected_item' => '已选择文档',
 'timeline_skip_add_file' => '添加附件',
 'timeline_skip_status_change_-1' => '拒绝',
 'timeline_skip_status_change_-3' => '过期',
@@ -1375,12 +1525,12 @@ URL: [url]',
 'timeline_skip_status_change_2' => '发布',
 'timeline_skip_status_change_3' => '在工作咯流中',
 'timeline_skip_status_change_4' => '',
-'timeline_skip_status_change_5' => '',
+'timeline_skip_status_change_5' => '起草中',
 'timeline_status_change' => '版本 [版本]: [状态]',
 'to' => '到',
 'toggle_manager' => '角色切换',
-'toggle_qrcode' => '',
-'to_before_from' => '',
+'toggle_qrcode' => '显示/隐藏 QR 码',
+'to_before_from' => '结束日期不能早于开始日期',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
 'transition_triggered_email' => '',
@@ -1389,19 +1539,19 @@ URL: [url]',
 'transmittal' => '',
 'transmittalitem_removed' => '',
 'transmittalitem_updated' => '',
-'transmittal_comment' => '',
+'transmittal_comment' => '备注',
 'transmittal_name' => '',
 'transmittal_size' => '',
 'tree_loading' => '文档结构尚未加载完成，请等待...',
-'trigger_workflow' => '',
+'trigger_workflow' => '工作流',
 'tr_TR' => '土耳其',
 'tuesday' => 'Tuesday',
 'tuesday_abbr' => '',
-'type_of_hook' => '',
+'type_of_hook' => '钩子类型',
 'type_to_search' => '搜索类型',
 'uk_UA' => '乌克兰语',
 'under_folder' => '文件夹内',
-'unknown_attrdef' => '',
+'unknown_attrdef' => '未知属性',
 'unknown_command' => '未知命令',
 'unknown_document_category' => '未知文件分类',
 'unknown_group' => '未知组ID号',
@@ -1410,9 +1560,9 @@ URL: [url]',
 'unknown_owner' => '未知所有者ID号',
 'unknown_user' => '未知用户ID号',
 'unlinked_content' => '未链接内容',
-'unlinked_documents' => '',
-'unlinked_folders' => '',
-'unlinking_objects' => '',
+'unlinked_documents' => '未链接的文档',
+'unlinked_folders' => '未链接的文件夹',
+'unlinking_objects' => '未链接的目录',
 'unlock_cause_access_mode_all' => '您仍然可以更新，因为您有拥有所有权限"all". 锁定状态被自动解除.',
 'unlock_cause_locking_user' => '您仍然可以更新，因为是您锁定了该文件. 锁定状态被自动解除.',
 'unlock_document' => '解锁',
@@ -1422,7 +1572,7 @@ URL: [url]',
 'update_fulltext_index' => '更新全文索引',
 'update_info' => '更新信息',
 'update_locked_msg' => '该文档被锁定',
-'update_recipients' => '',
+'update_recipients' => '更新收件人列表',
 'update_reviewers' => '更新校对人名单',
 'update_revisors' => '',
 'update_transmittalitem' => '',
@@ -1432,12 +1582,12 @@ URL: [url]',
 'uploading_zerosize' => '上传失败！请检查是否没有选择上传的文件。',
 'used_discspace' => '使用磁盘空间',
 'user' => '用户',
-'userid_groupid' => '',
+'userid_groupid' => '用户ID/组ID',
 'users' => '用户',
-'users_and_groups' => '',
+'users_and_groups' => '用户/组',
 'users_done_work' => '',
 'user_exists' => '用户已存在',
-'user_group' => '',
+'user_group' => '用户/组',
 'user_group_management' => '用户/组的管理',
 'user_image' => '用户图片',
 'user_info' => '用户信息',
@@ -1455,42 +1605,47 @@ URL: [url]',
 'versioning_info' => '版本信息',
 'versiontolow' => '',
 'version_deleted_email' => '版本已被删除',
-'version_deleted_email_body' => '',
-'version_deleted_email_subject' => '',
+'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',
 'wednesday_abbr' => '',
-'weeks' => '',
+'weeks' => '周',
 'week_view' => '周视图',
-'workflow' => '',
+'workflow' => '工作流',
 'workflows_involded' => '',
-'workflow_actions_management' => '',
-'workflow_action_in_use' => '',
-'workflow_action_name' => '',
-'workflow_editor' => '',
-'workflow_group_summary' => '',
-'workflow_has_cycle' => '',
-'workflow_initstate' => '',
-'workflow_in_use' => '',
+'workflow_actions_management' => '工作流活动管理',
+'workflow_action_in_use' => '当前活动已被工作流使用。',
+'workflow_action_name' => '工作流节点名称',
+'workflow_editor' => '工作流编辑器',
+'workflow_group_summary' => '组概述',
+'workflow_has_cycle' => '周期性工作流',
+'workflow_initstate' => '初始状态',
+'workflow_in_use' => '文档正使用当前工作流。',
 'workflow_layoutdata_saved' => '',
-'workflow_management' => '',
-'workflow_name' => '',
+'workflow_management' => '工作流管理',
+'workflow_name' => '工作流名称',
 'workflow_no_doc_rejected_state' => '',
 'workflow_no_doc_released_state' => '',
 'workflow_no_initial_state' => '',
 'workflow_no_states' => '',
 'workflow_save_layout' => '',
-'workflow_state' => '',
-'workflow_states_management' => '',
-'workflow_state_docstatus' => '',
-'workflow_state_in_use' => '',
-'workflow_state_name' => '',
-'workflow_summary' => '',
+'workflow_state' => '工作流状态',
+'workflow_states_management' => '工作流状态管理',
+'workflow_state_docstatus' => '文档状态',
+'workflow_state_in_use' => '当前状态在工作流中已被使用。',
+'workflow_state_name' => '状态名称',
+'workflow_summary' => '工作流概述',
 'workflow_transition_without_user_group' => '',
-'workflow_user_summary' => '',
+'workflow_user_summary' => '用户概述',
 'year_view' => '年视图',
 'yes' => '是',
 'zh_CN' => '中文简体',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 6195d4aaf..433b61410 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -301,6 +301,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => '文檔',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => '待處理文檔',
 'documents_locked' => '',
 'documents_locked_by_you' => '被您鎖定的文檔',

From b24efc1fd38a69fdee49c41ac150ac825b7874c3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Oct 2017 14:34:16 +0200
Subject: [PATCH 020/308] add icon for files of type opus

---
 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 c63eed521..ab35287b5 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -848,6 +848,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$icons["pdf"]  = "gnome-mime-application-pdf.svg";
 		$icons["wav"]  = "audio.svg";
 		$icons["mp3"]  = "audio.svg";
+		$icons["opus"]  = "audio.svg";
 		$icons["c"]    = "text-x-preview.svg";
 		$icons["cpp"]  = "text-x-preview.svg";
 		$icons["h"]    = "text-x-preview.svg";

From adf227f18335c98431ceab35d2cdb55cb1d9dc4a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Oct 2017 14:34:46 +0200
Subject: [PATCH 021/308] don't use latest content anymore

the version is passed to the view
---
 views/bootstrap/class.DocumentVersionDetail.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index acd6dcc8e..c2ab77245 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -67,7 +67,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		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%">
+			<img src="../op/op.Download.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $version->getVersion(); ?>" width="100%">
 <?php
 			break;
 		default:
@@ -96,7 +96,6 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		$previewwidthdetail = $this->params['previewWidthDetail'];
 		$timeout = $this->params['timeout'];
 
-		$latestContent = $document->getLatestContent();
 		$status = $version->getStatus();
 		$reviewStatus = $version->getReviewStatus();
 		$approvalStatus = $version->getApprovalStatus();
@@ -254,7 +253,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 			if($status["status"] != S_OBSOLETE)
 				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>";
+				print "<li><a href=\"out.EditAttributes.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-edit\"></i> ".getMLText("edit_attributes")."</a></li>";
 		}
 			print "</ul>";
 		}

From e0038f25d96ea44822cdaf723ab5a59b18f8f77d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Oct 2017 14:35:23 +0200
Subject: [PATCH 022/308] add more hooks before and after setting access rights
 and owner

---
 op/op.DocumentAccess.php | 61 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 59 insertions(+), 2 deletions(-)

diff --git a/op/op.DocumentAccess.php b/op/op.DocumentAccess.php
index fcdc674c3..53b6a98a5 100644
--- a/op/op.DocumentAccess.php
+++ b/op/op.DocumentAccess.php
@@ -117,15 +117,29 @@ if ($action == "setowner") {
 	if (!isset($_GET["ownerid"]) || !is_numeric($_GET["ownerid"]) || $_GET["ownerid"]<1) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_user"));	
 	}
-	
+
 	$newOwner = $dms->getUser($_GET["ownerid"]);
 	
 	if (!is_object($newOwner)) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_user"));	
 	}
+	if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
+		foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
+			if (method_exists($hookObj, 'preSetOwner')) {
+				$hookObj->preSetOwner(null, array('document'=>$document, 'newowner'=>$newowner));
+			}
+		}
+	}
 	$oldOwner = $document->getOwner();
 	if($document->setOwner($newOwner)) {
 		// Send notification to subscribers.
+		if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
+			foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
+				if (method_exists($hookObj, 'postSetOwner')) {
+					$hookObj->postSetOwner(null, array('document'=>$document, 'newowner'=>$newowner));
+				}
+			}
+		}
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();
@@ -153,7 +167,13 @@ if ($action == "setowner") {
 // Change to not inherit ---------------------------------------------------
 else if ($action == "notinherit") {
 
-	$defAccess = $document->getDefaultAccess();
+	if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
+		foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
+			if (method_exists($hookObj, 'preSetNotInherit')) {
+				$hookObj->preSetOwner(null, array('document'=>$document));
+			}
+		}
+	}
 	if($document->setInheritAccess(false)) {
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
@@ -174,6 +194,7 @@ else if ($action == "notinherit") {
 
 		}
 	}
+	$defAccess = $document->getDefaultAccess();
 	if($document->setDefaultAccess($defAccess)) {
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
@@ -203,11 +224,33 @@ else if ($action == "notinherit") {
 		foreach ($accessList["groups"] as $groupAccess)
 			$document->addAccess($groupAccess->getMode(), $groupAccess->getGroupID(), false);
 	}
+
+	if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
+		foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
+			if (method_exists($hookObj, 'postSetNotInherit')) {
+				$hookObj->postSetNotInherit(null, array('document'=>$document));
+			}
+		}
+	}
 }
 
 // Change to inherit-----------------------------------------------------
 else if ($action == "inherit") {
+	if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
+		foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
+			if (method_exists($hookObj, 'preSetInherit')) {
+				$hookObj->preSetInherit(null, array('document'=>$document));
+			}
+		}
+	}
 	if($document->clearAccessList() && $document->setInheritAccess(true)) {
+		if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
+			foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
+				if (method_exists($hookObj, 'postSetInherit')) {
+					$hookObj->postSetInherit(null, array('document'=>$document));
+				}
+			}
+		}
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();
@@ -231,7 +274,21 @@ else if ($action == "inherit") {
 
 // Set default permissions ----------------------------------------------
 else if ($action == "setdefault") {
+	if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
+		foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
+			if (method_exists($hookObj, 'preSetDefaultAccess')) {
+				$hookObj->preSetDefaultAccess(null, array('document'=>$document));
+			}
+		}
+	}
 	if($document->setDefaultAccess($mode)) {
+		if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
+			foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
+				if (method_exists($hookObj, 'postSetDefaultAccess')) {
+					$hookObj->postSetDefaultAccess(null, array('document'=>$document));
+				}
+			}
+		}
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();

From 0be8766fce96587d836c5e065c1f843cf1c10ded Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Oct 2017 14:40:14 +0200
Subject: [PATCH 023/308] fix typo in converter

---
 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 c32271c29..519307dc5 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -40,7 +40,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
 			'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",
+			'application/x-compressed-tar' => "tar tzvf '%f' | convert -density 100 -resize %wx text:-[0] '%o'",
 		);
 		$this->width = intval($width);
 	} /* }}} */

From 5fc430f1ea570529873f91843f509f01b20ba069 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Oct 2017 14:41:45 +0200
Subject: [PATCH 024/308] new version 1.2.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 6c0211aef..5e1e50990 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>2017-09-18</date>
+ <date>2017-10-11</date>
  <time>07:14:32</time>
  <version>
-  <release>1.2.3</release>
+  <release>1.2.4</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>
-createPreview() returns false if running the converter command fails
+fix typo in converter for tar.gz files
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -287,5 +287,21 @@ commands can be set for mimetypes 'xxxx/*' and '*'
 pass mimetype as parameter '%m' to converter
    </notes>
   </release>
+  <release>
+   <date>2017-09-18</date>
+   <time>07:14:32</time>
+   <version>
+    <release>1.2.3</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>
+createPreview() returns false if running the converter command fails
+   </notes>
+  </release>
  </changelog>
 </package>

From 0e9179a9e552f071a4235641a1d39f9cdb9a62a6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 12 Oct 2017 15:38:41 +0200
Subject: [PATCH 025/308] move most of the logic into the controller

---
 controllers/class.DocumentAccess.php | 148 ++++++++++++++++++++++++
 controllers/class.EditDocument.php   | 161 +++++++++++++++++++++++++++
 2 files changed, 309 insertions(+)
 create mode 100644 controllers/class.DocumentAccess.php
 create mode 100644 controllers/class.EditDocument.php

diff --git a/controllers/class.DocumentAccess.php b/controllers/class.DocumentAccess.php
new file mode 100644
index 000000000..aaeb6a457
--- /dev/null
+++ b/controllers/class.DocumentAccess.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Implementation of DocumentAccess controller
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2017 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class which does the busines logic for editing a folder
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2017 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Controller_DocumentAccess extends SeedDMS_Controller_Common {
+
+	public function run() {
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+		$document = $this->params['document'];
+		$settings = $this->params['settings'];
+		$action = $this->params['action'];
+
+		// Change owner -----------------------------------------------------------
+		if ($action == "setowner") {
+			if(false === $this->callHook('preSetOwner', $document)) {
+				if(empty($this->errormsg))
+					$this->errormsg = 'hook_preSetOwner_failed';
+				return null;
+			}
+			$newowner = $this->params['newowner'];
+			$oldowner = $document->getOwner();
+			if($document->setOwner($newowner)) {
+				if(false === $this->callHook('postSetOwner', $document, $oldowner)) {
+					if(empty($this->errormsg))
+						$this->errormsg = 'hook_postSetOwner_failed';
+					return null;
+				}
+			}
+		} elseif ($action == "notinherit") {
+			if(false === $this->callHook('preSetNotInherit', $document)) {
+				if(empty($this->errormsg))
+					$this->errormsg = 'hook_preSetNotInherit_failed';
+				return null;
+			}
+
+			/* Get default access before access is not longer inherited. This
+			 * will return the default access from the parent folder.
+			 */
+			$defAccess = $document->getDefaultAccess();
+			if(!$document->setInheritAccess(false)) {
+				return false;
+			}
+
+			if(!$document->setDefaultAccess($defAccess)) {
+				return false;
+			}
+
+			//copy ACL of parent folder
+			$mode = $this->params['mode'];
+			if ($mode == "copy") {
+				$accessList = $folder->getAccessList();
+				foreach ($accessList["users"] as $userAccess)
+					$document->addAccess($userAccess->getMode(), $userAccess->getUserID(), true);
+				foreach ($accessList["groups"] as $groupAccess)
+					$document->addAccess($groupAccess->getMode(), $groupAccess->getGroupID(), false);
+			}
+
+			if(false === $this->callHook('postSetNotInherit', $document)) {
+				if(empty($this->errormsg))
+					$this->errormsg = 'hook_postSetNotInherit_failed';
+				return null;
+			}
+		} elseif ($action == "inherit") {
+			if(false === $this->callHook('preSetInherit', $document)) {
+				if(empty($this->errormsg))
+					$this->errormsg = 'hook_preSetInherit_failed';
+				return null;
+			}
+			if(!$document->clearAccessList() || !$document->setInheritAccess(true)) {
+				return false;
+			}
+
+			if(false === $this->callHook('postSetInherit', $document)) {
+				if(empty($this->errormsg))
+					$this->errormsg = 'hook_postSetInherit_failed';
+				return null;
+			}
+		} elseif ($action == "setdefault") {
+			if(false === $this->callHook('preSetDefault', $document)) {
+				if(empty($this->errormsg))
+					$this->errormsg = 'hook_preSetDefault_failed';
+				return null;
+			}
+
+			$mode = $this->params['mode'];
+			if(!$document->setDefaultAccess($mode)) {
+				return false;
+			}
+
+			if(false === $this->callHook('postSetDefault', $document)) {
+				if(empty($this->errormsg))
+					$this->errormsg = 'hook_postSetDefault_failed';
+				return null;
+			}
+		} elseif ($action == "editaccess") {
+			$mode = $this->params['mode'];
+			$userid = $this->params['userid'];
+			$groupid = $this->params['groupid'];
+			if ($userid) {
+				$document->changeAccess($mode, $userid, true);
+			}
+			elseif ($groupid) {
+				$document->changeAccess($mode, $groupid, false);
+			}
+		} elseif ($action == "delaccess") {
+			$userid = $this->params['userid'];
+			$groupid = $this->params['groupid'];
+			if ($userid) {
+				$document->removeAccess($userid, true);
+			}
+			elseif ($groupid) {
+				$document->removeAccess($groupid, false);
+			}
+		} elseif ($action == "addaccess") {
+			$mode = $this->params['mode'];
+			$userid = $this->params['userid'];
+			$groupid = $this->params['groupid'];
+			if ($userid && $userid != -1) {
+				$document->addAccess($mode, $userid, true);
+			}
+			elseif ($groupid && $groupid != -1) {
+				$document->addAccess($mode, $groupid, false);
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/controllers/class.EditDocument.php b/controllers/class.EditDocument.php
new file mode 100644
index 000000000..356907ae6
--- /dev/null
+++ b/controllers/class.EditDocument.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * Implementation of EditDocument 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 editing 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_EditDocument extends SeedDMS_Controller_Common {
+
+	public function run() {
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$settings = $this->params['settings'];
+		$document = $this->params['document'];
+		$name = $this->params['name'];
+
+		if(false === $this->callHook('preEditDocument')) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_preEditDocument_failed';
+			return null;
+		}
+
+		$result = $this->callHook('editDocument', $document);
+		if($result === null) {
+			$name = $this->params['name'];
+			$oldname = $document->getName());
+			if($oldname != $name)
+				if(!$document->setName($name))
+					return false;
+
+			$comment = $this->params['comment'];
+			if(($oldcomment = $document->getComment()) != $comment)
+				if(!$document->setComment($comment))
+					return false;
+
+			$expires = $this->params['expires'];
+			$oldexpires = $document->getExpires();
+			if ($expires != $oldexpires) {
+				if(!$this->callHook('preSetExpires', $document, $expires)) {
+				}
+
+				if(!$document->setExpires($expires)) {
+					return false;
+				}
+
+				$document->verifyLastestContentExpriry();
+
+				if(!$this->callHook('postSetExpires', $document, $expires)) {
+				}
+			}
+
+			$keywords = $this->params['keywords'];
+			$oldkeywords = $document->getKeywords();
+			if ($oldkeywords != $keywords) {
+				if(!$this->callHook('preSetKeywords', $document, $keywords, $oldkeywords)) {
+				}
+
+				if(!$document->setKeywords($keywords)) {
+					return false;
+				}
+
+				if(!$this->callHook('postSetKeywords', $document, $keywords, $oldkeywords)) {
+				}
+			}
+
+			$categories = $this->params['categories'];
+			$oldcategories = $document->getCategories();
+			if($categories) {
+				$categoriesarr = array();
+				foreach($categories as $catid) {
+					if($cat = $dms->getDocumentCategory($catid)) {
+						$categoriesarr[] = $cat;
+					}
+					
+				}
+				$oldcatsids = array();
+				foreach($oldcategories as $oldcategory)
+					$oldcatsids[] = $oldcategory->getID();
+
+				if (count($categoriesarr) != count($oldcategories) ||
+						array_diff($categories, $oldcatsids)) {
+					if(!$this->callHook('preSetCategories', $document, $categoriesarr, $oldcategories)) {
+					}
+					if(!$document->setCategories($categoriesarr)) {
+						return false;
+					}
+					if(!$this->callHook('postSetCategories', $document, $categoriesarr, $oldcategories)) {
+					}
+				}
+			} elseif($oldcategories) {
+				if(!$this->callHook('preSetCategories', $document, array(), $oldcategories)) {
+				}
+				if(!$document->setCategories(array())) {
+					return false;
+				}
+				if(!$this->callHook('postSetCategories', $document, array(), $oldcategories)) {
+				}
+			}
+
+			$attributes = $this->params['attributes'];
+			$oldattributes = $document->getAttributes();
+			if($attributes) {
+				foreach($attributes as $attrdefid=>$attribute) {
+					$attrdef = $dms->getAttributeDefinition($attrdefid);
+					if($attribute) {
+						if(!$attrdef->validate($attribute)) {
+							$this->errormsg	= getAttributeValidationText($attrdef->getValidationError(), $attrdef->getName(), $attribute);
+							return false;
+						}
+
+						if(!isset($oldattributes[$attrdefid]) || $attribute != $oldattributes[$attrdefid]->getValue()) {
+							if(!$document->setAttributeValue($dms->getAttributeDefinition($attrdefid), $attribute))
+								return false;
+						}
+					} elseif($attrdef->getMinValues() > 0) {
+						$this->errormsg = getMLText("attr_min_values", array("attrname"=>$attrdef->getName()));
+					} elseif(isset($oldattributes[$attrdefid])) {
+						if(!$document->removeAttribute($dms->getAttributeDefinition($attrdefid)))
+							return false;
+					}
+				}
+			}
+			foreach($oldattributes as $attrdefid=>$oldattribute) {
+				if(!isset($attributes[$attrdefid])) {
+					if(!$document->removeAttribute($dms->getAttributeDefinition($attrdefid)))
+						return false;
+				}
+			}
+
+			$sequence = $this->params['sequence'];
+			if(strcasecmp($sequence, "keep")) {
+				if($document->setSequence($sequence)) {
+				} else {
+					return false;
+				}
+			}
+
+			if(!$this->callHook('postEditDocument')) {
+			}
+
+		} else
+			return $result;
+
+		return true;
+	}
+}

From f6aa3bfc94d9189f38fd5e21b1af51aece778142 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 12 Oct 2017 15:39:28 +0200
Subject: [PATCH 026/308] move most of the code into the controller

---
 op/op.DocumentAccess.php | 176 +++++-------------------
 op/op.EditDocument.php   | 283 +++++++++++----------------------------
 2 files changed, 116 insertions(+), 343 deletions(-)

diff --git a/op/op.DocumentAccess.php b/op/op.DocumentAccess.php
index 53b6a98a5..d0821e25f 100644
--- a/op/op.DocumentAccess.php
+++ b/op/op.DocumentAccess.php
@@ -26,8 +26,12 @@ 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["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,6 +55,7 @@ if(!checkFormKey('documentaccess', 'GET')) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_request_token"));
 }
 
+$mode = '';
 switch ($_GET["action"]) {
 	case "setowner":
 	case "delaccess":
@@ -78,6 +83,7 @@ switch ($_GET["action"]) {
 		break;
 }
 
+$userid = '';
 if (isset($_GET["userid"])) {
 	if (!is_numeric($_GET["userid"])) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_user"));
@@ -94,6 +100,7 @@ if (isset($_GET["userid"])) {
 	}
 }
 
+$groupid = '';
 if (isset($_GET["groupid"])) {
 	if (!is_numeric($_GET["groupid"])) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_group"));
@@ -109,37 +116,36 @@ if (isset($_GET["groupid"])) {
 	}
 }
 
-// Change owner -----------------------------------------------------------
-if ($action == "setowner") {
+$newowner = null;
+if($action == 'setowner') {
 	if (!$user->isAdmin()) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 	}
-	if (!isset($_GET["ownerid"]) || !is_numeric($_GET["ownerid"]) || $_GET["ownerid"]<1) {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_user"));	
+	if (empty($_GET["ownerid"])) {
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_group"));
 	}
+	if (!($newowner = $dms->getUser($_GET["ownerid"]))) {
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_group"));
+	}
+	$oldowner = $document->getOwner();
+}
 
-	$newOwner = $dms->getUser($_GET["ownerid"]);
-	
-	if (!is_object($newOwner)) {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_user"));	
-	}
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
-			if (method_exists($hookObj, 'preSetOwner')) {
-				$hookObj->preSetOwner(null, array('document'=>$document, 'newowner'=>$newowner));
-			}
-		}
-	}
-	$oldOwner = $document->getOwner();
-	if($document->setOwner($newOwner)) {
-		// Send notification to subscribers.
-		if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
-			foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
-				if (method_exists($hookObj, 'postSetOwner')) {
-					$hookObj->postSetOwner(null, array('document'=>$document, 'newowner'=>$newowner));
-				}
-			}
-		}
+
+$controller->setParam('document', $document);
+$controller->setParam('folder', $folder);
+$controller->setParam('settings', $settings);
+$controller->setParam('action', $action);
+$controller->setParam('mode', $mode);
+$controller->setParam('userid', $userid);
+$controller->setParam('groupid', $groupid);
+$controller->setParam('newowner', $newowner);
+if(!$controller->run()) {
+	UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($foldername))),getMLText("error_change_access"));
+}
+
+// Change owner -----------------------------------------------------------
+if ($action == "setowner") {
+	if($oldowner->getID() != $newowner->getID()) {
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();
@@ -149,8 +155,8 @@ if ($action == "setowner") {
 			$params['name'] = $document->getName();
 			$params['folder_path'] = $folder->getFolderPathPlain();
 			$params['username'] = $user->getFullName();
-			$params['old_owner'] = $oldOwner->getFullName();
-			$params['new_owner'] = $newOwner->getFullName();
+			$params['old_owner'] = $oldowner->getFullName();
+			$params['new_owner'] = $newowner->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;
@@ -158,8 +164,7 @@ if ($action == "setowner") {
 			foreach ($notifyList["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message, $params);
 			}
-//			$notifier->toIndividual($user, $oldOwner, $subject, $message, $params);
-
+//			$notifier->toIndividual($user, $oldowner, $subject, $message, $params);
 		}
 	}
 }
@@ -167,14 +172,6 @@ if ($action == "setowner") {
 // Change to not inherit ---------------------------------------------------
 else if ($action == "notinherit") {
 
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
-			if (method_exists($hookObj, 'preSetNotInherit')) {
-				$hookObj->preSetOwner(null, array('document'=>$document));
-			}
-		}
-	}
-	if($document->setInheritAccess(false)) {
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();
@@ -193,64 +190,10 @@ else if ($action == "notinherit") {
 			}
 
 		}
-	}
-	$defAccess = $document->getDefaultAccess();
-	if($document->setDefaultAccess($defAccess)) {
-		if($notifier) {
-			$notifyList = $document->getNotifyList();
-			$folder = $document->getFolder();
-			$subject = "access_permission_changed_email_subject";
-			$message = "access_permission_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);
-			}
-
-		}
-	}
-
-	//copy ACL of parent folder
-	if ($mode == "copy") {
-		$accessList = $folder->getAccessList();
-		foreach ($accessList["users"] as $userAccess)
-			$document->addAccess($userAccess->getMode(), $userAccess->getUserID(), true);
-		foreach ($accessList["groups"] as $groupAccess)
-			$document->addAccess($groupAccess->getMode(), $groupAccess->getGroupID(), false);
-	}
-
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
-			if (method_exists($hookObj, 'postSetNotInherit')) {
-				$hookObj->postSetNotInherit(null, array('document'=>$document));
-			}
-		}
-	}
 }
 
 // Change to inherit-----------------------------------------------------
 else if ($action == "inherit") {
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
-			if (method_exists($hookObj, 'preSetInherit')) {
-				$hookObj->preSetInherit(null, array('document'=>$document));
-			}
-		}
-	}
-	if($document->clearAccessList() && $document->setInheritAccess(true)) {
-		if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
-			foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
-				if (method_exists($hookObj, 'postSetInherit')) {
-					$hookObj->postSetInherit(null, array('document'=>$document));
-				}
-			}
-		}
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();
@@ -267,28 +210,11 @@ else if ($action == "inherit") {
 			foreach ($notifyList["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message, $params);
 			}
-
 		}
-	}
 }
 
 // Set default permissions ----------------------------------------------
 else if ($action == "setdefault") {
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
-			if (method_exists($hookObj, 'preSetDefaultAccess')) {
-				$hookObj->preSetDefaultAccess(null, array('document'=>$document));
-			}
-		}
-	}
-	if($document->setDefaultAccess($mode)) {
-		if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
-			foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
-				if (method_exists($hookObj, 'postSetDefaultAccess')) {
-					$hookObj->postSetDefaultAccess(null, array('document'=>$document));
-				}
-			}
-		}
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();
@@ -305,39 +231,7 @@ else if ($action == "setdefault") {
 			foreach ($notifyList["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message, $params);
 			}
-
 		}
-	}
-}
-
-// Modify permission ------------------------------------------------------
-else if ($action == "editaccess") {
-	if (isset($userid)) {
-		$document->changeAccess($mode, $userid, true);
-	}
-	else if (isset($groupid)) {
-		$document->changeAccess($mode, $groupid, false);
-	}
-}
-
-// Delete permission-------------------------------------------------------
-else if ($action == "delaccess") {
-	if (isset($userid)) {
-		$document->removeAccess($userid, true);
-	}
-	else if (isset($groupid)) {
-		$document->removeAccess($groupid, false);
-	}
-}
-
-// Add new permission -----------------------------------------------------
-else if ($action == "addaccess") {
-	if (isset($userid) && $userid != -1) {
-		$document->addAccess($mode, $userid, true);
-	}
-	if (isset($groupid) && $groupid != -1) {
-		$document->addAccess($mode, $groupid, false);
-	}
 }
 
 add_log_line("");
diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php
index d46602413..505827e61 100644
--- a/op/op.EditDocument.php
+++ b/op/op.EditDocument.php
@@ -26,8 +26,12 @@ 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($_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"));
 }
@@ -73,74 +77,6 @@ if(isset($_POST["attributes"]))
 else
 	$attributes = array();
 
-if (($oldname = $document->getName()) != $name) {
-	if($document->setName($name)) {
-		// Send notification to subscribers.
-		if($notifier) {
-			$notifyList = $document->getNotifyList();
-			$folder = $document->getFolder();
-			$subject = "document_renamed_email_subject";
-			$message = "document_renamed_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['old_name'] = $oldname;
-			$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;
-
-			// if user is not owner send notification to owner
-			if ($user->getID() != $document->getOwner()->getID() &&
-				false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
-				$notifyList['users'][] = $document->getOwner();
-			}
-			$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"));
-	}
-}
-
-if (($oldcomment = $document->getComment()) != $comment) {
-	if($document->setComment($comment)) {
-		// Send notification to subscribers.
-		if($notifier) {
-			$notifyList = $document->getNotifyList();
-			$folder = $document->getFolder();
-			$subject = "document_comment_changed_email_subject";
-			$message = "document_comment_changed_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['old_comment'] = $oldcomment;
-			$params['new_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;
-
-			// if user is not owner send notification to owner
-			if ($user->getID() != $document->getOwner()->getID() &&
-				false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
-				$notifyList['users'][] = $document->getOwner();
-			}
-			$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"));
-	}
-}
-
 switch($_POST["presetexpdate"]) {
 case "date":
 	$tmp = explode('-', $_POST["expdate"]);
@@ -168,16 +104,85 @@ default:
 	break;
 }
 
-if ($expires != $document->getExpires()) {
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
-			if (method_exists($hookObj, 'preSetExpires')) {
-				$hookObj->preSetExpires(null, array('document'=>$document, 'expires'=>&$expires));
+$oldname = $document->getName();
+$oldcomment = $document->getComment();
+$oldcategories = $document->getCategories();
+$oldkeywords = $document->getKeywords();
+$oldexpires = $document->getExpires();
+$oldattributes = $document->getAttributes();
+
+$controller->setParam('document', $document);
+$controller->setParam('name', $name);
+$controller->setParam('comment', $comment);
+$controller->setParam('keywords', $keywords);
+$controller->setParam('categories', $categories);
+$controller->setParam('expires', $expires);
+$controller->setParam('sequence', $sequence);
+$controller->setParam('attributes', $attributes);
+if(!$controller->run()) {
+	if($controller->getErrorNo()) {
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())), $controller->getErrorMsg());
+	}
+}
+
+if ($oldname != $name) {
+		// Send notification to subscribers.
+		if($notifier) {
+			$notifyList = $document->getNotifyList();
+			$folder = $document->getFolder();
+			$subject = "document_renamed_email_subject";
+			$message = "document_renamed_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['old_name'] = $oldname;
+			$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;
+
+			// if user is not owner send notification to owner
+			if ($user->getID() != $document->getOwner()->getID() &&
+				false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
+				$notifyList['users'][] = $document->getOwner();
+			}
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			foreach ($notifyList["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
 			}
 		}
-	}
+}
 
-	if($document->setExpires($expires)) {
+if ($oldcomment != $comment) {
+		// Send notification to subscribers.
+		if($notifier) {
+			$notifyList = $document->getNotifyList();
+			$folder = $document->getFolder();
+			$subject = "document_comment_changed_email_subject";
+			$message = "document_comment_changed_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['old_comment'] = $oldcomment;
+			$params['new_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;
+
+			// if user is not owner send notification to owner
+			if ($user->getID() != $document->getOwner()->getID() &&
+				false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
+				$notifyList['users'][] = $document->getOwner();
+			}
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			foreach ($notifyList["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
+		}
+}
+
+if ($expires != $oldexpires) {
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();
@@ -202,135 +207,9 @@ if ($expires != $document->getExpires()) {
 				$notifier->toGroup($user, $grp, $subject, $message, $params);
 			}
 		}
-	} else {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
-	}
-
-	$document->verifyLastestContentExpriry();
-
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
-			if (method_exists($hookObj, 'postSetExpires')) {
-				$hookObj->postSetExpires(null, array('document'=>$document, 'expires'=>$expires));
-			}
-		}
-	}
 }
 
-if (($oldkeywords = $document->getKeywords()) != $keywords) {
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
-			if (method_exists($hookObj, 'preSetKeywords')) {
-				$hookObj->preSetKeywords(null, array('document'=>$document, 'keywords'=>&$keywords, 'oldkeywords'=>&$oldkeywords));
-			}
-		}
-	}
-
-	if($document->setKeywords($keywords)) {
-	}
-	else {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
-	}
-
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
-			if (method_exists($hookObj, 'postSetKeywords')) {
-				$hookObj->postSetKeywords(null, array('document'=>$document, 'keywords'=>&$keywords, 'oldkeywords'=>&$oldkeywords));
-			}
-		}
-	}
-}
-
-$oldcategories = $document->getCategories();
-if($categories) {
-	$categoriesarr = array();
-	foreach($categories as $catid) {
-		if($cat = $dms->getDocumentCategory($catid)) {
-			$categoriesarr[] = $cat;
-		}
-		
-	}
-	$oldcatsids = array();
-	foreach($oldcategories as $oldcategory)
-		$oldcatsids[] = $oldcategory->getID();
-
-	if (count($categoriesarr) != count($oldcategories) ||
-			array_diff($categories, $oldcatsids)) {
-		if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
-			foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
-				if (method_exists($hookObj, 'preSetCategories')) {
-					$hookObj->preSetCategories(null, array('document'=>$document, 'categories'=>&$categoriesarr, 'oldcategories'=>&$oldcategories));
-				}
-			}
-		}
-		if($document->setCategories($categoriesarr)) {
-		} else {
-			UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
-		}
-		if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
-			foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
-				if (method_exists($hookObj, 'postSetCategories')) {
-					$hookObj->postSetCategories(null, array('document'=>$document, 'categories'=>&$categoriesarr, 'oldcategories'=>&$oldcategories));
-				}
-			}
-		}
-	}
-} elseif($oldcategories) {
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
-			if (method_exists($hookObj, 'preSetCategories')) {
-				$hookObj->preSetCategories(null, array('document'=>$document, 'categories'=>array(), 'oldcategories'=>&$oldcategories));
-			}
-		}
-	}
-	if($document->setCategories(array())) {
-	} else {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
-	}
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
-			if (method_exists($hookObj, 'postSetCategories')) {
-				$hookObj->postSetCategories(null, array('document'=>$document, 'categories'=>array(), 'oldcategories'=>&$oldcategories));
-			}
-		}
-	}
-}
-
-$oldattributes = $document->getAttributes();
-if($attributes) {
-	foreach($attributes as $attrdefid=>$attribute) {
-		$attrdef = $dms->getAttributeDefinition($attrdefid);
-		if($attribute) {
-			if(!$attrdef->validate($attribute)) {
-				$errmsg = getAttributeValidationText($attrdef->getValidationError(), $attrdef->getName(), $attribute);
-				UI::exitError(getMLText("document_title", array("documentname" => $document->getName())), $errmsg);
-			}
-			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)))
-			UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
-	}
-	
-}
-
-if($sequence != "keep") {
- 	if($document->setSequence($sequence)) {
-	}
-	else {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
-	}
+if ($oldkeywords != $keywords) {
 }
 
 $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_document_edited')));

From 7563ebdbf7f1b55a672deb7d522055ff5a77890a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 12 Oct 2017 15:40:09 +0200
Subject: [PATCH 027/308] do not pass name and comment to preAddDocument hook

---
 controllers/class.AddDocument.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/controllers/class.AddDocument.php b/controllers/class.AddDocument.php
index 7fc97b1a4..dd5bff46f 100644
--- a/controllers/class.AddDocument.php
+++ b/controllers/class.AddDocument.php
@@ -23,13 +23,17 @@
 class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 
 	public function run() { /* {{{ */
-		$name = $this->getParam('name');
-		$comment = $this->getParam('comment');
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$settings = $this->params['settings'];
+		$index = $this->params['index'];
+		$indexconf = $this->params['indexconf'];
+		$folder = $this->params['folder'];
 
 		/* Call preAddDocument early, because it might need to modify some
 		 * of the parameters.
 		 */
-		if(false === $this->callHook('preAddDocument', array('name'=>&$name, 'comment'=>&$comment))) {
+		if(false === $this->callHook('preAddDocument')) {
 			if(empty($this->errormsg))
 				$this->errormsg = 'hook_preAddDocument_failed';
 			return null;
@@ -37,13 +41,7 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 
 		$name = $this->getParam('name');
 		$comment = $this->getParam('comment');
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$settings = $this->params['settings'];
 		$documentsource = $this->params['documentsource'];
-		$index = $this->params['index'];
-		$indexconf = $this->params['indexconf'];
-		$folder = $this->params['folder'];
 		$expires = $this->getParam('expires');
 		$keywords = $this->getParam('keywords');
 		$cats = $this->getParam('categories');

From 9720703c375dbdea92e6ef6531aae723a91c0592 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 12 Oct 2017 15:40:38 +0200
Subject: [PATCH 028/308] get parameters from view right before used

allows to modify those parameters in preEditFolder hook
---
 controllers/class.EditFolder.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/controllers/class.EditFolder.php b/controllers/class.EditFolder.php
index 30aeee6b4..eeaf02634 100644
--- a/controllers/class.EditFolder.php
+++ b/controllers/class.EditFolder.php
@@ -27,28 +27,26 @@ class SeedDMS_Controller_EditFolder extends SeedDMS_Controller_Common {
 		$user = $this->params['user'];
 		$settings = $this->params['settings'];
 		$folder = $this->params['folder'];
-		$name = $this->params['name'];
-		$comment = $this->params['comment'];
-		$sequence = $this->params['sequence'];
-		$attributes = $this->params['attributes'];
 
-		/* Get the document id and name before removing the document */
-		$foldername = $folder->getName();
-		$folderid = $folder->getID();
-
-		if(!$this->callHook('preEditFolder')) {
+		if(false === $this->callHook('preEditFolder')) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_preEditFolder_failed';
+			return null;
 		}
 
 		$result = $this->callHook('editFolder', $folder);
 		if($result === null) {
+			$name = $this->params['name'];
 			if(($oldname = $folder->getName()) != $name)
 				if(!$folder->setName($name))
 					return false;
 
+			$comment = $this->params['comment'];
 			if(($oldcomment = $folder->getComment()) != $comment)
 				if(!$folder->setComment($comment))
 					return false;
 
+			$attributes = $this->params['attributes'];
 			$oldattributes = $folder->getAttributes();
 			if($attributes) {
 				foreach($attributes as $attrdefid=>$attribute) {
@@ -78,6 +76,7 @@ class SeedDMS_Controller_EditFolder extends SeedDMS_Controller_Common {
 				}
 			}
 
+			$sequence = $this->params['sequence'];
 			if(strcasecmp($sequence, "keep")) {
 				if($folder->setSequence($sequence)) {
 				} else {

From 578bb7c89647c3ca1b0a145381009108381bae3f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 12 Oct 2017 15:41:31 +0200
Subject: [PATCH 029/308] check if preRemove[Folder|Document] hook succeeds

---
 controllers/class.RemoveDocument.php | 5 ++++-
 controllers/class.RemoveFolder.php   | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/controllers/class.RemoveDocument.php b/controllers/class.RemoveDocument.php
index 282300e05..6371ec1e1 100644
--- a/controllers/class.RemoveDocument.php
+++ b/controllers/class.RemoveDocument.php
@@ -36,7 +36,10 @@ class SeedDMS_Controller_RemoveDocument extends SeedDMS_Controller_Common {
 		$docname = $document->getName();
 		$documentid = $document->getID();
 
-		if(!$this->callHook('preRemoveDocument')) {
+		if(false === $this->callHook('preRemoveDocument')) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_preRemoveDocument_failed';
+			return null;
 		}
 
 		$result = $this->callHook('removeDocument', $document);
diff --git a/controllers/class.RemoveFolder.php b/controllers/class.RemoveFolder.php
index d8ae53128..c41b7f74f 100644
--- a/controllers/class.RemoveFolder.php
+++ b/controllers/class.RemoveFolder.php
@@ -34,7 +34,10 @@ class SeedDMS_Controller_RemoveFolder extends SeedDMS_Controller_Common {
 		$foldername = $folder->getName();
 		$folderid = $folder->getID();
 
-		if(!$this->callHook('preRemoveFolder')) {
+		if(false === $this->callHook('preRemoveFolder')) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_preRemoveFolder_failed';
+			return null;
 		}
 
 		$result = $this->callHook('removeFolder', $folder);

From bd4b85d15eee40c74c3523aeb01eed179c1ac9e2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 16 Oct 2017 09:04:01 +0200
Subject: [PATCH 030/308] fix syntax error (Closes: #358)

---
 controllers/class.EditDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/class.EditDocument.php b/controllers/class.EditDocument.php
index 356907ae6..6d8714df4 100644
--- a/controllers/class.EditDocument.php
+++ b/controllers/class.EditDocument.php
@@ -38,7 +38,7 @@ class SeedDMS_Controller_EditDocument extends SeedDMS_Controller_Common {
 		$result = $this->callHook('editDocument', $document);
 		if($result === null) {
 			$name = $this->params['name'];
-			$oldname = $document->getName());
+			$oldname = $document->getName();
 			if($oldname != $name)
 				if(!$document->setName($name))
 					return false;

From 91b16892db10e5b53ec3d97de8ee6a01ab6814f8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 16 Oct 2017 09:05:45 +0200
Subject: [PATCH 031/308] also check if last content exists

---
 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 ce2c28b53..8156d7900 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -49,7 +49,7 @@ $accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
 
 $folder = $document->getFolder();
 
-if ($document->getAccessMode($user) < M_READ) {
+if ($document->getAccessMode($user) < M_READ || !$document->getLatestContent()) {
 	$view->exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
 

From 02b91a52cc6b558311d403af49cbc30a0319a6f5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 16 Oct 2017 09:06:37 +0200
Subject: [PATCH 032/308] execute extension code

---
 restapi/index.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index 7bf436660..aaa41f8a2 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -2,12 +2,15 @@
 define('USE_PHP_SESSION', 0);
 
 include("../inc/inc.Settings.php");
-require_once "SeedDMS/Core.php";
+include("../inc/inc.Extension.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.DBInit.php");
+//require_once "SeedDMS/Core.php";
 require_once "SeedDMS/Preview.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 . "\"");
-$dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
+//$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 . "\"");
+//$dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
 
 if(USE_PHP_SESSION) {
 	session_start();
@@ -783,7 +786,8 @@ function doSearch() { /* {{{ */
 	$count = 0;
 	if($resArr['docs']) {
 		foreach ($resArr['docs'] as $entry) {
-			if ($entry->getAccessMode($userobj) >= M_READ) {
+			$lc = $entry->getLatestContent();
+			if ($entry->getAccessMode($userobj) >= M_READ && $lc) {
 				$entries[] = $entry;
 				$count++;
 			}

From 4889a8a6f224fca2bf22808276a817d43dfb3d0e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 16 Oct 2017 09:07:04 +0200
Subject: [PATCH 033/308] minor change in comment

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

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 414742f0f..8956136d7 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -431,7 +431,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			}
 		}
 
-		/* Retrieve attacheѕ files */
+		/* Retrieve latest content and  attacheѕ files */
 		$latestContent = $document->getLatestContent();
 		$files = $document->getDocumentFiles($latestContent->getVersion());
 		$files = SeedDMS_Core_DMS::filterDocumentFiles($user, $files);
@@ -444,8 +444,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$reverselinks = $document->getReverseDocumentLinks();
 		$reverselinks = SeedDMS_Core_DMS::filterDocumentLinks($user, $reverselinks, 'source');
 
-		/* Retrieve latest content */
-		$latestContent = $document->getLatestContent();
 		$needwkflaction = false;
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 		} else {

From e31ce5d8c355f5e839da6e5450e905ed7deaa35b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 18 Oct 2017 06:50:15 +0200
Subject: [PATCH 034/308] move code into controller

---
 controllers/class.AddSubFolder.php | 71 ++++++++++++++++++++++++++++++
 op/op.AddSubFolder.php             | 54 ++++++++++++++---------
 2 files changed, 104 insertions(+), 21 deletions(-)
 create mode 100644 controllers/class.AddSubFolder.php

diff --git a/controllers/class.AddSubFolder.php b/controllers/class.AddSubFolder.php
new file mode 100644
index 000000000..0d6582855
--- /dev/null
+++ b/controllers/class.AddSubFolder.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Implementation of AddSubFolder 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_AddSubFolder extends SeedDMS_Controller_Common {
+
+	public function run() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+
+		/* Call preAddSubFolder early, because it might need to modify some
+		 * of the parameters.
+		 */
+		if(false === $this->callHook('preAddSubFolder')) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_preAddSubFolder_failed';
+			return null;
+		}
+
+		$name = $this->getParam('name');
+		$comment = $this->getParam('comment');
+		$sequence = $this->getParam('sequence');
+		$attributes = $this->getParam('attributes');
+		$notificationgroups = $this->getParam('notificationgroups');
+		$notificationusers = $this->getParam('notificationusers');
+
+		$result = $this->callHook('addSubFolder');
+		if($result === null) {
+			$subFolder = $folder->addSubFolder($name, $comment, $user, $sequence, $attributes);
+			if (!is_object($subFolder)) {
+				$this->errormsg = "error_occured";
+				return false;
+			}
+			/* Check if additional notification shall be added */
+			foreach($notificationusers as $notuser) {
+				if($subFolder->getAccessMode($user) >= M_READ)
+					$res = $subFolder->addNotify($notuser->getID(), true);
+			}
+			foreach($notificationgroups as $notgroup) {
+				if($subFolder->getGroupAccessMode($notgroup) >= M_READ)
+					$res = $subFolder->addNotify($notgroup->getID(), false);
+			}
+
+			if(!$this->callHook('postAddSubFolder', $subFolder)) {
+			}
+			$result = $subFolder;
+		}
+
+		return $result;
+	} /* }}} */
+}
+
diff --git a/op/op.AddSubFolder.php b/op/op.AddSubFolder.php
index 8d6e74f26..83a83de6f 100644
--- a/op/op.AddSubFolder.php
+++ b/op/op.AddSubFolder.php
@@ -27,8 +27,12 @@ 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]);
+
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('addsubfolder')) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
@@ -75,29 +79,40 @@ foreach($attributes as $attrdefid=>$attribute) {
 	}
 }
 
-$subFolder = $folder->addSubFolder($name, $comment, $user, $sequence, $attributes);
+/* 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) {
+			$notusers[] = $notuser;
+		}
+	}
+}
+$notgroups = array();
+if(!empty($_POST['notification_groups'])) {
+	foreach($_POST['notification_groups'] as $notgroupid) {
+		$notgroup = $dms->getGroup($notgroupid);
+		if($notgroup) {
+			$notgroups[] = $notgroup;
+		}
+	}
+}
 
-if (is_object($subFolder)) {
+$controller->setParam('folder', $folder);
+$controller->setParam('name', $name);
+$controller->setParam('comment', $comment);
+$controller->setParam('sequence', $sequence);
+$controller->setParam('attributes', $attributes);
+$controller->setParam('notificationgroups', $notgroups);
+$controller->setParam('notificationusers', $notusers);
+if(!$subFolder = $controller->run()) {
+	UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText($controller->getErrorMsg()));
+} else {
 	// Send notification to subscribers.
 	if($notifier) {
 		$notifyList = $folder->getNotifyList();
 
-/*
-		$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("new_subfolder_email");
-		$message = getMLText("new_subfolder_email")."\r\n";
-		$message .= 
-			getMLText("name").": ".$name."\r\n".
-			getMLText("folder").": ".$subFolder->getFolderPathPlain()."\r\n".
-			getMLText("comment").": ".$comment."\r\n".
-			getMLText("user").": ".$user->getFullName()."\r\n".
-			"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$subFolder->getID()."\r\n";
-
-		$notifier->toList($user, $folder->_notifyList["users"], $subject, $message);
-		foreach ($folder->_notifyList["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message);
-		}
-*/
-
 		$subject = "new_subfolder_email_subject";
 		$message = "new_subfolder_email_body";
 		$params = array();
@@ -114,9 +129,6 @@ if (is_object($subFolder)) {
 			$notifier->toGroup($user, $grp, $subject, $message, $params);
 		}
 	}
-
-} else {
-	UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured"));
 }
 
 add_log_line("?name=".$name."&folderid=".$folderid);

From bd6d66858a5eca7ee35581e3a121924eadba9031 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 18 Oct 2017 06:50:29 +0200
Subject: [PATCH 035/308] add changes for 5.1.4

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

diff --git a/CHANGELOG b/CHANGELOG
index 2535dbe5d..97265597e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,10 @@
   created when the js-code was requested (Closes #340)
 - new list of expired documents
 - access on document links and attachments can be controlled by a hook
+- move AddSubFolder code into controller, add hooks equivalent to AddDocment (Closes #359)
+- add list of expired documents to MyDocument page
+- move code of DocumentAccess and EditDocument into controller
+- make width of preview images in drop folder configurable
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.3

From 51c3b90a58eec148c864aced4d209dd0d76dfb95 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 Oct 2017 13:47:25 +0200
Subject: [PATCH 036/308] http headers can be passed to htmlStartPage()

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

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index ab35287b5..e992cbbfb 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -49,7 +49,7 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 		$this->footerjs[] = $script;
 	} /* }}} */
 
-	function htmlStartPage($title="", $bodyClass="", $base="") { /* {{{ */
+	function htmlStartPage($title="", $bodyClass="", $base="", $httpheader=array()) { /* {{{ */
 		if(1 || method_exists($this, 'js')) {
 			/* We still need unsafe-eval, because printDocumentChooserHtml and
 			 * printFolderChooserHtml will include a javascript file with ajax
@@ -64,6 +64,11 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 				header($csp . ": " . $csp_rules);
 			}
 		}
+		if($httpheader) {
+			foreach($httpheader as $name=>$value) {
+				header($name . ": " . $value);
+			}
+		}
 		$hookObjs = $this->getHookObjects('SeedDMS_View_Bootstrap');
 		foreach($hookObjs as $hookObj) {
 			if (method_exists($hookObj, 'startPage')) {

From 10c7f33d8e0238181444ec1ec77ac68f53b56a79 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 Oct 2017 13:47:52 +0200
Subject: [PATCH 037/308] add hook addDocumentAttributes

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

diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php
index c3199197b..10f18e780 100644
--- a/views/bootstrap/class.EditDocument.php
+++ b/views/bootstrap/class.EditDocument.php
@@ -174,6 +174,15 @@ $(document).ready( function() {
 				}
 			}
 		}
+		$arrs = $this->callHook('addDocumentAttributes', $folder);
+		if(is_array($arrs)) {
+			foreach($arrs as $arr) {
+				echo "<tr>";
+				echo "<td>".$arr[0].":</td>";
+				echo "<td>".$arr[1]."</td>";
+				echo "</tr>";
+			}
+		}
 ?>
 		<tr>
 			<td></td>

From 339c45d5c5f9a3170ea488a7f230c51eb35ec7b6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 21 Oct 2017 14:36:54 +0200
Subject: [PATCH 038/308] various updates

---
 languages/ar_EG/lang.inc |  9 +++++++--
 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 | 11 ++++++++---
 languages/fr_FR/lang.inc |  5 +++++
 languages/hr_HR/lang.inc |  5 +++++
 languages/hu_HU/lang.inc |  5 +++++
 languages/it_IT/lang.inc |  9 +++++++--
 languages/ko_KR/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 | 11 ++++++++---
 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 +++++
 24 files changed, 132 insertions(+), 12 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index befec2fca..b807e969b 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 (1283)
+//    Translators: Admin (1284)
 
 $text = array(
 '2_factor_auth' => '',
@@ -453,7 +453,7 @@ URL: [url]',
 'error_no_folder_selected' => 'لم يتم اختيار مجلد',
 'error_occured' => 'حدث خطأ',
 'error_remove_document' => '',
-'error_remove_folder' => '',
+'error_remove_folder' => 'ﺡﺪﺛ ﺦﻃﺃ ﺎﺜﻧﺍﺀ ﺡﺬﻓ ﺎﻠﻤﺠﻟﺩ',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => 'الإسبانية',
@@ -461,6 +461,7 @@ URL: [url]',
 'exclude_items' => '',
 'expired' => 'انتهى صلاحيته',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'تنتهى صلاحيته',
 'expire_by_date' => 'ﻲﻨﺘﻫﻯ ﻑﻯ ﺕﺍﺮﻴﺧ',
 'expire_in_1d' => '',
@@ -1296,8 +1297,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => '',
 'settings_previewWidthDetail_desc' => '',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => '',
 'settings_previewWidthList_desc' => '',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => '',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => '',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 3f57f74a6..60bfb5cab 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -416,6 +416,7 @@ $text = array(
 'exclude_items' => '',
 'expired' => 'Изтекъл',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Изтича',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1161,8 +1162,12 @@ $text = array(
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => '',
 'settings_previewWidthDetail_desc' => '',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => '',
 'settings_previewWidthList_desc' => '',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Показвай дисклаймер',
 'settings_printDisclaimer_desc' => 'Ако е включено, то дисклаймер из lang.inc ще се показва под всяка страница',
 'settings_quota' => 'Квота за потребител',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index f1453366a..5dbf0a928 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -421,6 +421,7 @@ URL: [url]',
 'exclude_items' => '',
 'expired' => 'Caducat',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Caduca',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1166,8 +1167,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => '',
 'settings_previewWidthDetail_desc' => '',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => '',
 'settings_previewWidthList_desc' => '',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => '',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index d0f2d34d7..e4751160a 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -468,6 +468,7 @@ URL: [url]',
 'exclude_items' => '',
 'expired' => 'Platnost vypršela',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Platnost vyprší',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1305,8 +1306,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => 'Šířka náhledů (detail)',
 'settings_previewWidthDetail_desc' => 'Šířka náhledu na stránce podrobností',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Šířka náhledů (seznam)',
 'settings_previewWidthList_desc' => 'Šířka náhledů v seznamech',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Print Disclaimer',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => 'Kvóta uživatele',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 77d35e8b3..fe5b69301 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 (2483), dgrutsch (22)
+//    Translators: Admin (2484), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -479,6 +479,7 @@ Der Link ist bis zum [valid] gültig.
 'exclude_items' => 'Einträge auslassen',
 'expired' => 'abgelaufen',
 'expired_at_date' => 'Abgelaufen am [datetime]',
+'expired_documents' => 'Abgelaufende Dokumente',
 'expires' => 'Ablaufdatum',
 'expire_by_date' => 'Ablauf nach Datum',
 'expire_in_1d' => 'Ablauf in 1 Tag',
@@ -1366,8 +1367,12 @@ Name: [username]
 'settings_presetExpirationDate_desc' => 'Alle neu hochgeladenen Dokumente bekommen das eingegebene Datum als Ablaufdatum. Das Datum muss der Form entsprechen, wie es von der PHP-Funktion strtotime() verstanden wird, z.B. +5 weeks.',
 'settings_previewWidthDetail' => 'Breite der Vorschaubilder (Detail)',
 'settings_previewWidthDetail_desc' => 'Breite des Vorschaubildes, das auf der Detailseite angezeigt wird',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Breite der Vorschaubilder (Liste)',
 'settings_previewWidthList_desc' => 'Breite der Vorschaubilder, die in Listen angezeigt werden',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Rechtliche Hinweise',
 'settings_printDisclaimer_desc' => 'Anwählen, um die rechtlichen Hinweise am Ende jeder Seite anzuzeigen.',
 'settings_quota' => 'User\'s quota',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index c8464578f..ee60eb7de 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -416,6 +416,7 @@ $text = array(
 'exclude_items' => '',
 'expired' => 'Έχει λήξει',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Λήγει',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1172,8 +1173,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => '',
 'settings_previewWidthDetail_desc' => '',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => '',
 'settings_previewWidthList_desc' => '',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => '',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 19b1d1c4e..6d2259b71 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 (1610), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1615), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -480,6 +480,7 @@ The link is valid until [valid].
 'exclude_items' => 'Exclude items',
 'expired' => 'Expired',
 'expired_at_date' => 'Expired at [datetime]',
+'expired_documents' => 'Expired documents',
 'expires' => 'Expires',
 'expire_by_date' => 'Expires by date',
 'expire_in_1d' => 'Expires in 1 day',
@@ -1361,8 +1362,12 @@ Name: [username]
 'settings_presetExpirationDate_desc' => 'All new uploaded documents will have an expiration date set to this value. The date entered can be specified as understood by PHP\'s strtotime() function, e.g. +5 weeks.',
 'settings_previewWidthDetail' => 'Width of preview images (detail)',
 'settings_previewWidthDetail_desc' => 'Width of preview image shown on details page',
+'settings_previewWidthDropFolderList' => 'Width of preview images (dropfolder list)',
+'settings_previewWidthDropFolderList_desc' => 'Width of preview images shown in list when selecting a file from the drop folder.',
 'settings_previewWidthList' => 'Width of preview images (list)',
 'settings_previewWidthList_desc' => 'Width of preview images shown in lists',
+'settings_previewWidthMenuList' => 'Width of preview images (menu list)',
+'settings_previewWidthMenuList_desc' => 'Width of preview images shown as items in drop folder menu.',
 'settings_printDisclaimer' => 'Print Disclaimer',
 'settings_printDisclaimer_desc' => 'If enabled, the disclaimer message will be printed on the bottom of every page',
 'settings_quota' => 'User\'s quota',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 1a804b1f8..188f6049f 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 (1038), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1040), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -468,6 +468,7 @@ URL: [url]',
 'exclude_items' => 'Registros excluidos',
 'expired' => 'Caducado',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Caduca',
 'expire_by_date' => 'Fecha de expiración',
 'expire_in_1d' => '',
@@ -580,7 +581,7 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'Incluir documentos',
 'include_subdirectories' => 'Incluir subcarpetas',
-'indexing_tasks_in_queue' => '',
+'indexing_tasks_in_queue' => 'Tareas de indexación en cola',
 'index_converters' => 'Conversión de índice de documentos',
 'index_done' => '',
 'index_error' => '',
@@ -808,7 +809,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Sólo puede usar imágenes .jpg como imágenes de usuario',
 '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',
-'overall_indexing_progress' => '',
+'overall_indexing_progress' => 'Proceso de indexación global',
 'owner' => 'Propietario',
 'ownership_changed_email' => 'Propietario modificado',
 'ownership_changed_email_body' => 'Propietario modificado
@@ -1311,8 +1312,12 @@ URL: [url]',
 '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_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Ancho de las imágenes de vista en miniatura (listas)',
 'settings_previewWidthList_desc' => 'Ancho de las imágenes de vista en miniatura que se muestran en las listas',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Mostrar renuncia',
 'settings_printDisclaimer_desc' => 'Si es Verdadero el mensaje de renuncia de los ficheros lang.inc se mostratá al final de la página',
 'settings_quota' => 'Cuota de usuario',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index d87bb4881..0a694f424 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -480,6 +480,7 @@ Le lien est valide jusqu’au [valid].
 'exclude_items' => 'Exclure des élements',
 'expired' => 'Expiré',
 'expired_at_date' => 'Expiré le [datetime]',
+'expired_documents' => '',
 'expires' => 'Expiration',
 'expire_by_date' => 'Expire à une date',
 'expire_in_1d' => 'Expire dans 1 jour',
@@ -1333,8 +1334,12 @@ Nom : [username]
 'settings_presetExpirationDate_desc' => 'La date d\'expiration de tous les nouveaux documents sera égale à cette valeur. La date peut être renseignée au format PHP strtotime(), par exemple +5 weeks',
 'settings_previewWidthDetail' => 'Largeur des vignettes (vue détaillée)',
 'settings_previewWidthDetail_desc' => 'Largeur des vignettes affichées sur la vue détaillée',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Largeur des vignettes (vue liste)',
 'settings_previewWidthList_desc' => 'Largeur des vignettes affichées dans les listes',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Afficher la clause de non-responsabilité',
 'settings_printDisclaimer_desc' => 'Si activé, le message d’avertissement sera affiché en bas de chaque page.',
 'settings_quota' => 'Quota de l\'utilisateur',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index faa368d3f..9db446471 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -473,6 +473,7 @@ Internet poveznica: [url]',
 'exclude_items' => 'Isključivanje stavki',
 'expired' => 'Isteklo',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Datum isteka',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1332,8 +1333,12 @@ Internet poveznica: [url]',
 'settings_presetExpirationDate_desc' => 'Svi novo učitani dokumenti će datum isteka imati postavljen na ovu vrijednost. Unešeni datum se može odrediti razumljivom PHP strtotime() funkcijom, npr. +5 tjedana.',
 'settings_previewWidthDetail' => 'Širina pretpregleda slika (detalj)',
 'settings_previewWidthDetail_desc' => 'Širina pretpregleda slike prikazanog na stranici detalja',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Širina pretpregleda slika (popis)',
 'settings_previewWidthList_desc' => 'Širina pretpregleda slika prikazanih u popisima',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Ispiši odricanje od odgovornosti',
 'settings_printDisclaimer_desc' => 'Ako je omogućeno, poruka odricanja od odgovornosti će se ispisati na dnu svake stranice',
 'settings_quota' => 'Korisnička kvota',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index a2cbef2cc..8e21bf951 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -468,6 +468,7 @@ URL: [url]',
 'exclude_items' => 'Kizárt elemek',
 'expired' => 'Lejárt',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Lejárat',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1310,8 +1311,12 @@ URL: [url]',
 '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_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Előnézeti képek szélessége (lista)',
 'settings_previewWidthList_desc' => 'A listában megjelenő előnézeti képek szélessége',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Nyilatkozat nyomtatása',
 'settings_printDisclaimer_desc' => 'Ha igaz a nyilatkozat üzenet a lang.inc állományok lesznek kiíratva a lap alján',
 'settings_quota' => 'Felhasználói kvóta',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 327ba5a8f..8f793f608 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 (1567), rickr (144), s.pnt (26)
+//    Translators: Admin (1568), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -474,6 +474,7 @@ URL: [url]',
 'exclude_items' => 'Escludi Elementi',
 'expired' => 'Scaduto',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Scadenza',
 'expire_by_date' => 'Scadenza per Data',
 'expire_in_1d' => '',
@@ -1219,7 +1220,7 @@ URL: [url]',
 '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' => 'Abilita compito delle attività nel menù',
 'settings_enableMenuTasks_desc' => 'Abilita / Disabilita la voce di menu che contiene tutte le attività degli utenti. Questo conterrà i documenti che devono essere rivisti, approvati, etc.',
-'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload' => 'Consenti il caricamento di più files',
 'settings_enableMultiUpload_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.',
@@ -1344,8 +1345,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => 'Tutti i nuovi documenti caricati avranno la data di scadenza impostata su questo valore. La data inserita può essere specificata nel formato accettato dalla funzione strtotime() di PHP, ad esempio +5 settimane.',
 'settings_previewWidthDetail' => 'Larghezza immagini di anteprima (dettagli)',
 'settings_previewWidthDetail_desc' => 'Larghezza delle immagini di anteprima mostrate nella pagina dei dettagli',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Larghezza delle immagini di anteprima (lista)',
 'settings_previewWidthList_desc' => 'Larghezza delle immagini di anteprima mostrate nella lista',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Mostra disclaimer',
 'settings_printDisclaimer_desc' => 'Se abilitato il messaggio circa i termini e le condizioni d\'uso verrà mostrato nel pié di pagina.',
 'settings_quota' => 'Quota utente',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index e9ebd1507..aaca1d95a 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -474,6 +474,7 @@ URL: [url]',
 'exclude_items' => '항목 제외',
 'expired' => '만료됨',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => '만료하기',
 'expire_by_date' => '지정일에 만료',
 'expire_in_1d' => '1일 후 만료',
@@ -1326,8 +1327,12 @@ URL : [url]',
 'settings_presetExpirationDate_desc' => '새로운 업로드된 문서는 설정 유효 기간을 갖게 됩니다. 이 값은 PHP의 strtotime() 함수에 의해 입력 날짜가 지정 됩니다. 예: 5중',
 'settings_previewWidthDetail' => '미리보기 이미지의 폭 (세부 사항)',
 'settings_previewWidthDetail_desc' => '상세정보에 표시되는 미리보기 이미자의 폭',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => '미리보기 이미지의 폭 (목록)',
 'settings_previewWidthList_desc' => '목록에 표시된 미리보기 이미지의 폭',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => '인쇄 면책 조항',
 'settings_printDisclaimer_desc' => '활성인 경우 메시지 내역이 모든 페이지의 하단에 출력됩니다',
 'settings_quota' => '사용자의 할당량',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 0b6463089..4c201c8a2 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -466,6 +466,7 @@ URL: [url]',
 'exclude_items' => 'Sluit iems uit',
 'expired' => 'Verlopen',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Verloopt',
 'expire_by_date' => 'Vervaldatum',
 'expire_in_1d' => '',
@@ -1338,8 +1339,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => 'Alle nieuw geüploade documenten krijgen een verloopdatum toegekend. U kunt ook een datum invoeren overeenkomstig PHP\'s strtotime() function, e.g. +5 weeks.',
 'settings_previewWidthDetail' => 'Breedte van het voorbeeld (detail)',
 'settings_previewWidthDetail_desc' => 'Breedte van het voorbeeld weergegeven op de detail pagina',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Breedte van het voorbeeld (lijst)',
 'settings_previewWidthList_desc' => 'Breedte van het voorbeeld weergegeven in lijsten',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Print Vrijwaring',
 'settings_printDisclaimer_desc' => 'Indien ingeschakeld zal het vrijwarings bericht in de lang.inc bestanden worden getoond onderop de pagina',
 'settings_quota' => 'Gebruikersquotum',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 69d48f96a..4f16e1d84 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -461,6 +461,7 @@ URL: [url]',
 'exclude_items' => '',
 'expired' => 'Wygasłe',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Wygasa',
 'expire_by_date' => 'Wygaśnięcie wg daty',
 'expire_in_1d' => '',
@@ -1290,8 +1291,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => 'Szerokość obrazka podglądu (szczegóły)',
 'settings_previewWidthDetail_desc' => 'Szerokość obrazka podglądu na stronie szczegółów',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Szerokość obrazka podglądu (lista)',
 'settings_previewWidthList_desc' => 'Szerokość podglądu obrazu pokazanego na liście',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Wyświetlaj Zrzeczenie się',
 'settings_printDisclaimer_desc' => 'Zaznaczenie tej opcji spowoduje, że na dole strony będzie wyświetlany komunikat zrzeczenia się zawarty w pliku lang.inc.',
 'settings_quota' => 'Przydział dysku użytkownika',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 7cc7ca9f8..e2b342c3c 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -467,6 +467,7 @@ URL: [url]',
 'exclude_items' => 'Excluir ítens',
 'expired' => 'Expirado',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Expira',
 'expire_by_date' => 'Data de vencimento',
 'expire_in_1d' => '',
@@ -1308,8 +1309,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => 'Largura de imagens de visualização (detalhe)',
 'settings_previewWidthDetail_desc' => 'Largura imagem de visualização mostrados na página de detalhes',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Largura de imagens de visualização (lista)',
 'settings_previewWidthList_desc' => 'Largura de imagens de visualização mostrados em listas',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Imprimir Responsabilidade',
 'settings_printDisclaimer_desc' => 'Se for verdade a mensagem de aviso de isenção os arquivos lang.inc será impresso na parte inferior da página',
 'settings_quota' => 'Quota do Usuário',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 30043e7ed..0cdfd130d 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -473,6 +473,7 @@ URL: [url]',
 'exclude_items' => 'Elemente excluse',
 'expired' => 'Expirat',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Expiră',
 'expire_by_date' => 'Expirare dupa data',
 'expire_in_1d' => '',
@@ -1333,8 +1334,12 @@ URL: [url]',
 '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_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Lățimea imaginii de previzualizare (listă)',
 'settings_previewWidthList_desc' => 'Lățimea imaginii de previzualizare afișată în liste',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Print Disclaimer',
 'settings_printDisclaimer_desc' => 'Dacă este setat, mesajul de Disclaimer din fișierele lang.inc va fi printat în partea de jos a paginii',
 'settings_quota' => 'Spatiu alocat utilizator',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 5275ecd36..1efdcc22a 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -473,6 +473,7 @@ URL: [url]',
 'exclude_items' => 'Не показывать события:',
 'expired' => 'Срок действия вышел',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Срок действия',
 'expire_by_date' => 'дата',
 'expire_in_1d' => '',
@@ -1340,8 +1341,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => 'Все новые загружаемые документы имеют срок действия, установленный по этому шаблону. Дата может быть указана в понятном для функции PHP strtotime() виде, например +5 weeks.',
 'settings_previewWidthDetail' => 'Ширина изображения предварительного просмотра (детально)',
 'settings_previewWidthDetail_desc' => 'Ширина изображения для предварительного просмотра на странице информации',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Ширина изображения для предварительного просмотра (список)',
 'settings_previewWidthList_desc' => 'Ширина картинок предварительного просмотра показана в списках',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Выводить предупреждение',
 'settings_printDisclaimer_desc' => 'Если включено, то предупреждение из lang.inc будет выводится внизу каждой страницы.',
 'settings_quota' => 'Квота пользователя',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 0ed720223..a1a15dac1 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 (551), destinqo (19)
+//    Translators: Admin (553), destinqo (19)
 
 $text = array(
 '2_factor_auth' => '',
@@ -170,7 +170,7 @@ URL: [url]',
 'at_least_n_users_of_group' => '',
 'august' => 'August',
 'authentication' => '',
-'author' => '',
+'author' => 'Autor',
 'automatic_status_update' => 'Automaticka zmena stavu',
 'back' => 'Prejsť späť',
 'backup_list' => 'Zoznam záloh',
@@ -420,6 +420,7 @@ URL: [url]',
 'exclude_items' => '',
 'expired' => 'Platnosť vypršala',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Platnosť vyprší',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -777,7 +778,7 @@ URL: [url]',
 'reception_rejected' => '',
 'recipients' => '',
 'redraw' => '',
-'refresh' => '',
+'refresh' => 'Obnoviť',
 'rejected' => 'Odmietnuté',
 'released' => 'Vydané',
 'removed_approver' => 'bol odstránený zo zoznamu schvaľovateľov.',
@@ -1165,8 +1166,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => '',
 'settings_previewWidthDetail_desc' => '',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => '',
 'settings_previewWidthList_desc' => 'Šírka pre náhľad obrázkov je uvedené v zoznamoch',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => '',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => '',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index ab7c0b532..5cb96ec1b 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -461,6 +461,7 @@ URL: [url]',
 'exclude_items' => '',
 'expired' => 'Har gått ut',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Kommer att gå ut',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1301,8 +1302,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => 'Alla nya dokument som uppladdas kommer att ha ett utgångsdatum satt till detta värde. Det datum som har angetts kan anges som förstås av PHP strtotime () funktion, t.ex. +5 Veckor.',
 'settings_previewWidthDetail' => 'Bredd av bild förhandsvisning av (detalj)',
 'settings_previewWidthDetail_desc' => 'Bredd av bild förhandsvisning på detaljsidan',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Bredd av bild förhandsvisning (lista)',
 'settings_previewWidthList_desc' => 'Bredd av bild förhandsvisning som visas i litor',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Visa disclaimer-meddelande',
 'settings_printDisclaimer_desc' => 'Om denna inställning sätts till ja, används meddelande som finns i lang.inc-filen och skrivs ut på slutet av sidan',
 'settings_quota' => 'Användarens kvot',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 4bfc11602..e51d11efe 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -467,6 +467,7 @@ URL: [url]',
 'exclude_items' => '',
 'expired' => 'Süresi doldu',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Süresinin dolacağı zaman',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1312,8 +1313,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => 'Yeni yüklenen tüm dokümanların son geçerlilik tarihi bu değer olacak. Girilen tarih PHP strtotime() fonksiyonu tarafından anlaşılır olmalıdır. Ör. +5 weeks.',
 'settings_previewWidthDetail' => 'Resim önizleme genişliği (detay)',
 'settings_previewWidthDetail_desc' => 'Detay sayfasında görünecek önizleme resminin genişliği',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Resim önizleme genişliği (liste)',
 'settings_previewWidthList_desc' => 'Listelerde görünecek önizleme resminin genişliği',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Gizlilik Notu Yazdır',
 'settings_printDisclaimer_desc' => 'Seçildiğinde sayfanın en altında lang.inc dosyasındaki gizlilik notu yazılacak',
 'settings_quota' => 'Kullanıcı kotası',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 787828651..bfa8abdd9 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -473,6 +473,7 @@ URL: [url]',
 'exclude_items' => 'Виключені елементи',
 'expired' => 'Термін виконання вийшов',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Термін виконання виходить',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1333,8 +1334,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => 'Всі нові завантажені документи матимуть термін виконання, встановлений за цим шаблоном. Дата може бути вказана в зрозумілому для функції PHP strtotime() вигляді, наприклад +5 weeks.',
 'settings_previewWidthDetail' => 'Ширина попереднього перегляду зображення (детально)',
 'settings_previewWidthDetail_desc' => 'Ширина зображення при перегляді на сторінці інформації',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Ширина зображення при попередньому перегляді (список)',
 'settings_previewWidthList_desc' => 'Ширина зображення при попередньому перегляді і відображенні в режимі списку',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Виводити попередження',
 'settings_printDisclaimer_desc' => 'Якщо увімкнено, то попередження з lang.inc буде виводитися внизу кожної сторінки.',
 'settings_quota' => 'Квота користувача',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 148d1cedc..8f0ada7d3 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -475,6 +475,7 @@ URL: [url]',
 'exclude_items' => '排除项目',
 'expired' => '过期',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => '有效限期',
 'expire_by_date' => '指定过期时间',
 'expire_in_1d' => '一天后截止',
@@ -1316,8 +1317,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => '缩略图宽度（详情页中)',
 'settings_previewWidthDetail_desc' => '详情页面中缩略图的宽度',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => '缩略图宽度(列表中)',
 'settings_previewWidthList_desc' => '列表中缩略图的宽度',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => '显示免责声明',
 'settings_printDisclaimer_desc' => '如果开启，这个免责声明信息将在每个页面的底部显示',
 'settings_quota' => '设置磁盘配额',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 433b61410..9fa589e4f 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -420,6 +420,7 @@ URL: [url]',
 'exclude_items' => '',
 'expired' => '過期',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => '有效限期',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1165,8 +1166,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => '',
 'settings_previewWidthDetail_desc' => '',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => '',
 'settings_previewWidthList_desc' => '',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => '',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => '',

From 593ea696cdbbe011d911f0df3e8aaec09dd08261 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 21 Oct 2017 14:37:37 +0200
Subject: [PATCH 039/308] add entry for 4.3.37

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

diff --git a/CHANGELOG b/CHANGELOG
index d43439ad7..0c84110de 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 4.3.37
 --------------------------------------------------------------------------------
 - fix label in password forgotten form (Closes #346)
+- translation updates
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.36

From 2892c1e2fbace9602151a49f3c56d70ada6930d8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Oct 2017 06:32:36 +0200
Subject: [PATCH 040/308] do not show page browser when all search hits are
 listed

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

diff --git a/out/out.Search.php b/out/out.Search.php
index 700813959..e2643ed86 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -383,11 +383,13 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 			}
 		}
 	}
-	$totalPages = (int) (count($entries)/$limit);
-	if(count($entries)%$limit)
-		$totalPages++;
-	if (!isset($_GET["pg"]) || strcasecmp($_GET["pg"], "all"))
+	if (!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;
 // }}}
 }
 

From d4d79f1a84a14a2afafd1ff7eac6f80740f3c58b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Oct 2017 07:35:48 +0200
Subject: [PATCH 041/308] add entry for 5.1.4

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

diff --git a/CHANGELOG b/CHANGELOG
index ee5ce107d..aafbd0c7f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@
 - add list of expired documents to MyDocument page
 - move code of DocumentAccess and EditDocument into controller
 - make width of preview images in drop folder configurable
+- hide pager on search page when all folders/documents are listed
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.3

From cd075c720f9eb7bf2dd9572bb2626ad00066c4c7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Oct 2017 07:54:16 +0200
Subject: [PATCH 042/308] fix params for hook documentListItem

---
 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 8956136d7..965f76994 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -130,7 +130,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if($document) {
 			if ($document->getAccessMode($user) >= M_READ) {
 				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
-				$txt = $this->callHook('documentListItem', $document, $previewer, true, '');
+				$txt = $this->callHook('documentListItem', $document, $previewer, '');
 				if(is_string($txt))
 					$content = $txt;
 				else 

From 72b5fc7e8d59ef97a9e3347b90d9927dc7c419b5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Oct 2017 07:57:19 +0200
Subject: [PATCH 043/308] pass context 'viewitem' to hook documentListItem

---
 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 965f76994..f7988f496 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -130,7 +130,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if($document) {
 			if ($document->getAccessMode($user) >= M_READ) {
 				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
-				$txt = $this->callHook('documentListItem', $document, $previewer, '');
+				$txt = $this->callHook('documentListItem', $document, $previewer, 'viewitem');
 				if(is_string($txt))
 					$content = $txt;
 				else 

From d4b3540130cf06558ca67023d061b3df01168fa3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 27 Oct 2017 07:22:11 +0200
Subject: [PATCH 044/308] add some more preview commands

---
 SeedDMS_Preview/Preview/PdfPreviewer.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/SeedDMS_Preview/Preview/PdfPreviewer.php b/SeedDMS_Preview/Preview/PdfPreviewer.php
index 49b303359..99294584f 100644
--- a/SeedDMS_Preview/Preview/PdfPreviewer.php
+++ b/SeedDMS_Preview/Preview/PdfPreviewer.php
@@ -31,6 +31,13 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base {
 			'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'",
 		);
 	} /* }}} */
 

From fcddf29f7614ecfdca618a32be8aaa294b30b65a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 27 Oct 2017 07:42:05 +0200
Subject: [PATCH 045/308] add entry for 5.0.14

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

diff --git a/CHANGELOG b/CHANGELOG
index ec3f66916..0187c08f9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 5.0.14
 --------------------------------------------------------------------------------
 - use cmd timeout when indexing documents (Closes #344)
+- add change password function to rest api (merge from sebbuku)
 
 --------------------------------------------------------------------------------
                      Changes in version 5.0.13

From e03bbf112a370c896159ba4ae42aadce76e27b91 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 27 Oct 2017 07:59:12 +0200
Subject: [PATCH 046/308] various small updates

---
 languages/ca_ES/lang.inc | 20 ++++++++++----------
 languages/cs_CZ/lang.inc |  8 ++++----
 languages/de_DE/lang.inc |  8 ++++----
 languages/fr_FR/lang.inc |  4 ++--
 languages/hu_HU/lang.inc | 26 +++++++++++++-------------
 languages/it_IT/lang.inc |  8 ++++----
 languages/nl_NL/lang.inc |  4 ++--
 languages/pl_PL/lang.inc |  4 ++--
 languages/pt_BR/lang.inc |  6 +++---
 9 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 5dbf0a928..48cebbf54 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 (725)
+//    Translators: Admin (735)
 
 $text = array(
 '2_factor_auth' => '',
@@ -175,7 +175,7 @@ URL: [url]',
 'automatic_status_update' => 'Canvi automátic d\'estat',
 'back' => 'Endarrere',
 'backup_list' => 'Llista de còpies de seguretat existents',
-'backup_log_management' => '',
+'backup_log_management' => 'Còpia / Accés',
 'backup_remove' => 'Eliminar fitxer de còpia de seguretat',
 'backup_tools' => 'Eines de còpia de seguretat',
 'between' => 'entre',
@@ -302,7 +302,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Documents',
 'documents_checked_out_by_you' => '',
-'documents_expired' => '',
+'documents_expired' => 'Documents caducats',
 'documents_in_process' => 'Documents en procés',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Documents bloquejats per vostè',
@@ -363,7 +363,7 @@ URL: [url]',
 'drag_icon_here' => 'Arrossegui aquí una icona de carpeta o document',
 'dropfolderdir_missing' => '',
 'dropfolder_file' => '',
-'dropfolder_folder' => '',
+'dropfolder_folder' => 'Carpeta',
 'dropupload' => 'Pujada ràpida',
 'drop_files_here' => 'Dugui arxius aquí',
 'dump_creation' => 'Creació de bolcat de BDD',
@@ -443,7 +443,7 @@ URL: [url]',
 'files' => 'Fitxers',
 'files_deletion' => 'Eliminació de fitxers',
 'files_deletion_warning' => 'Amb aquesta opció es poden eliminar tots els fitxers del DMS complet. La informació de versionat romandrà visible.',
-'files_loading' => '',
+'files_loading' => 'Esperi, fins que l\'arxiu estigui carregat …',
 'file_size' => 'Mida',
 'filter_for_documents' => '',
 'filter_for_folders' => 'Filtre adicional per les carpetes',
@@ -503,10 +503,10 @@ URL: [url]',
 'hu_HU' => 'Hongarès',
 'id' => 'ID',
 'identical_version' => '',
-'import' => '',
+'import' => 'importar',
 'importfs' => '',
 'import_fs' => 'Importa del sistema d\'arxius',
-'import_fs_warning' => '',
+'import_fs_warning' => 'Només funciona arrastrant carpetes.La operació importarà recursivament totes les carpetes i arxius.',
 'include_content' => '',
 'include_documents' => 'Incloure documents',
 'include_subdirectories' => 'Incloure subdirectoris',
@@ -705,7 +705,7 @@ URL: [url]',
 'no_version_check' => '',
 'no_version_modification' => '',
 'no_workflow_available' => '',
-'objectcheck' => '',
+'objectcheck' => 'Carpeta / Comprobació del document',
 'object_check_critical' => '',
 'object_check_warning' => '',
 'obsolete' => 'Obsolet',
@@ -791,7 +791,7 @@ URL: [url]',
 'removed_revisor' => '',
 'removed_workflow_email_body' => '',
 'removed_workflow_email_subject' => '',
-'removeFolderFromDropFolder' => '',
+'removeFolderFromDropFolder' => 'Esborrar carpeta després de la importació',
 'remove_marked_files' => '',
 'repaired' => '',
 'repairing_objects' => '',
@@ -1443,7 +1443,7 @@ URL: [url]',
 'users_done_work' => '',
 'user_exists' => 'L\'usuari ja existeix.',
 'user_group' => '',
-'user_group_management' => '',
+'user_group_management' => 'Usuaris/Control de grups',
 'user_image' => 'Imatge',
 'user_info' => 'Informació d\'usuari',
 'user_list' => 'Llista d\'usuaris',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index e4751160a..2eb9f5826 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 (729), kreml (455)
+//    Translators: Admin (732), kreml (455)
 
 $text = array(
 '2_factor_auth' => '',
@@ -319,7 +319,7 @@ URL: [url]',
 'documentcontent' => 'Obsah dokumentu',
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
-'documents_expired' => '',
+'documents_expired' => 'Expirované dokumenty',
 'documents_in_process' => 'Zpracovávané dokumenty',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Vámi uzamčené dokumenty',
@@ -470,7 +470,7 @@ URL: [url]',
 'expired_at_date' => '',
 'expired_documents' => '',
 'expires' => 'Platnost vyprší',
-'expire_by_date' => '',
+'expire_by_date' => 'Platnost končí k datu',
 'expire_in_1d' => '',
 'expire_in_1h' => '',
 'expire_in_1m' => 'Expiruje o mesiac',
@@ -494,7 +494,7 @@ URL: [url]',
 'files' => 'Soubory',
 'files_deletion' => 'Soubor odstraněn',
 'files_deletion_warning' => 'Pomocí této volby můžete odstranit všechny soubory z celé složky DMS. Verzovací informace zůstanou viditelné.',
-'files_loading' => 'Vyčkejte dokud se nenahraje seznam souborů ...',
+'files_loading' => 'Vyčkejte dokud se nenahraje seznam souborů …',
 'file_size' => 'Velikost souboru',
 'filter_for_documents' => 'Další filtr pro dokumenty',
 'filter_for_folders' => 'Další filtr pro složky',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index fe5b69301..3192f1cf7 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 (2484), dgrutsch (22)
+//    Translators: Admin (2487), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -310,7 +310,7 @@ URL: [url]',
 'debug' => 'Debug',
 'december' => 'Dezember',
 'default_access' => 'Standardberechtigung',
-'default_keywords' => 'Verfügbare Schlüsselworte',
+'default_keywords' => 'Verfügbare Stichworte',
 'definitions' => 'Definitionen',
 'delete' => 'Löschen',
 'details' => 'Details',
@@ -433,7 +433,7 @@ Der Link ist bis zum [valid] gültig.
 'edit' => 'Bearbeiten',
 'edit_attributes' => 'Edit attributes',
 'edit_comment' => 'Kommentar bearbeiten',
-'edit_default_keywords' => 'Schlüsselworte bearbeiten',
+'edit_default_keywords' => 'Stichworte bearbeiten',
 'edit_document_access' => 'Zugriffsrechte bearbeiten',
 'edit_document_notify' => 'Beobachtung von Dokumenten',
 'edit_document_props' => 'Bearbeiten',
@@ -661,7 +661,7 @@ URL: [url]',
 'keep' => 'Beibehalten',
 'keep_doc_status' => 'Dokumentenstatus beibehalten',
 'keywords' => 'Stichworte',
-'keywords_loading' => 'Bitte warten, bis die Schlüsselwortliste geladen ist …',
+'keywords_loading' => 'Bitte warten, bis die Stichwortliste geladen ist …',
 'keyword_exists' => 'Stichwort besteht bereits',
 'ko_KR' => 'Koreanisch',
 'language' => 'Sprache',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 0a694f424..e6f48cf9b 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 (1064), jeromerobert (50), lonnnew (9), Oudiceval (465)
+//    Translators: Admin (1065), jeromerobert (50), lonnnew (9), Oudiceval (465)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -324,7 +324,7 @@ URL: [url]',
 'documentcontent' => 'Version de document',
 'documents' => 'Documents',
 'documents_checked_out_by_you' => 'Documents bloqués par vous',
-'documents_expired' => '',
+'documents_expired' => 'Documents périmés',
 'documents_in_process' => 'Documents en cours',
 'documents_locked' => 'Documents verrouillés',
 'documents_locked_by_you' => 'Documents verrouillés',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 8e21bf951..8a85bc519 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 (607), ribaz (1023)
+//    Translators: Admin (619), ribaz (1023)
 
 $text = array(
 '2_factor_auth' => '',
@@ -319,7 +319,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Dokumentumok',
 'documents_checked_out_by_you' => '',
-'documents_expired' => '',
+'documents_expired' => 'Lejárt dokumentumok',
 'documents_in_process' => 'Feldolgozás alatt lévő dokumentumok',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Ön által zárolt dokumentumok',
@@ -468,16 +468,16 @@ URL: [url]',
 'exclude_items' => 'Kizárt elemek',
 'expired' => 'Lejárt',
 'expired_at_date' => '',
-'expired_documents' => '',
+'expired_documents' => 'Lejárt dokumentumok',
 'expires' => 'Lejárat',
-'expire_by_date' => '',
+'expire_by_date' => 'Érvényesség dátum szerint',
 'expire_in_1d' => '',
 'expire_in_1h' => '',
-'expire_in_1m' => '',
-'expire_in_1w' => '',
-'expire_in_1y' => '',
+'expire_in_1m' => 'Érvényesség egy hónapon belül',
+'expire_in_1w' => 'Érvényesség egy héten belül',
+'expire_in_1y' => 'Érvényesség egy éven belül',
 'expire_in_2h' => '',
-'expire_in_2y' => '',
+'expire_in_2y' => 'Érvényesség két éven belül',
 'expire_today' => '',
 'expire_tomorrow' => '',
 'expiry_changed_email' => 'Lejárati dátum módosítva',
@@ -574,7 +574,7 @@ URL: [url]',
 'hu_HU' => 'Magyar',
 'id' => 'ID',
 'identical_version' => 'Az új verzió megegyezik az eredetivel.',
-'import' => '',
+'import' => 'Import',
 'importfs' => '',
 'import_fs' => 'Importálás fájlrendszerből',
 'import_fs_warning' => '',
@@ -854,7 +854,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' => '',
-'preset_expires' => '',
+'preset_expires' => 'Érvényesség beállítása',
 'preview' => 'Előnézet',
 'preview_converters' => '',
 'preview_images' => '',
@@ -862,7 +862,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'preview_plain' => '',
 'previous_state' => 'Előző állapot',
 'previous_versions' => 'Előző változatok',
-'process' => '',
+'process' => 'Folyamat',
 'process_without_user_group' => '',
 'pt_BR' => 'Portugál (BR)',
 'quota' => 'Kvóta',
@@ -1590,12 +1590,12 @@ URL: [url]',
 'uploading_zerosize' => 'Üres állomány feltöltése. Feltöltés megszakítva.',
 'used_discspace' => 'Felhasznált lemezterület',
 'user' => 'Felhasználó',
-'userid_groupid' => '',
+'userid_groupid' => 'Felhasználó ID/Csoport ID',
 'users' => 'Felhasználók',
 'users_and_groups' => 'Felhasználók/Csoportok',
 'users_done_work' => 'Felhasználók elvégzett munka',
 'user_exists' => 'Felhasználó már létezik.',
-'user_group' => '',
+'user_group' => 'Felhasználó/Csoport',
 'user_group_management' => 'Felhasználók/Csoportok kezelése',
 'user_image' => 'Kép',
 'user_info' => 'Felhasználói információ',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 8f793f608..39a5a82a9 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 (1568), rickr (144), s.pnt (26)
+//    Translators: Admin (1571), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -325,7 +325,7 @@ URL: [url]',
 'documentcontent' => 'Contenuto documento',
 'documents' => 'Documenti',
 'documents_checked_out_by_you' => 'Documenti approvati da te',
-'documents_expired' => '',
+'documents_expired' => 'Documenti scaduti',
 'documents_in_process' => 'Documenti in lavorazione',
 'documents_locked' => 'Documenti bloccati',
 'documents_locked_by_you' => 'Documenti bloccati da te',
@@ -860,7 +860,7 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di
 'personal_default_keywords' => 'Parole-chiave personali',
 'pl_PL' => 'Polacco',
 'possible_substitutes' => 'Sostituti',
-'preset_expires' => '',
+'preset_expires' => 'Scadenza preimpostata',
 'preview' => 'Anteprima',
 'preview_converters' => 'Anteprima convesione documento',
 'preview_images' => '',
@@ -1629,7 +1629,7 @@ URL: [url]',
 'users_and_groups' => 'Utenti/Gruppi',
 'users_done_work' => 'Lavoro eseguito dagli Utenti',
 'user_exists' => 'Utente già esistente',
-'user_group' => '',
+'user_group' => 'Utente/Gruppo',
 'user_group_management' => 'Gestione Utenti/Gruppi',
 'user_image' => 'Immagine',
 'user_info' => 'Informazioni utente',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 4c201c8a2..5157a814b 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 (738), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (739), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 '2_factor_auth' => '',
@@ -317,7 +317,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Documenten',
 'documents_checked_out_by_you' => 'Door u in behandeling genomen documenten',
-'documents_expired' => '',
+'documents_expired' => 'Verlopen documenten',
 'documents_in_process' => 'Documenten in behandeling',
 'documents_locked' => 'Geblokkeerde documenten',
 'documents_locked_by_you' => 'Documenten door U geblokkeerd',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 4f16e1d84..a2475b1b4 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 (784), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (785), netixw (84), romi (93), uGn (112)
 
 $text = array(
 '2_factor_auth' => '',
@@ -312,7 +312,7 @@ URL: [url]',
 'documentcontent' => 'Zawartość dokumentu',
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
-'documents_expired' => '',
+'documents_expired' => 'Wygasłe dokumenty',
 'documents_in_process' => 'Dokumenty procesowane',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Dokumenty zablokowane przez Ciebie',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index e2b342c3c..335bcd25e 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 (961), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (963), flaviove (627), lfcristofoli (352)
 
 $text = array(
 '2_factor_auth' => '',
@@ -319,7 +319,7 @@ URL: [url]',
 'documentcontent' => 'Conteúdo do Documento',
 'documents' => 'Documentos',
 'documents_checked_out_by_you' => '',
-'documents_expired' => '',
+'documents_expired' => 'Documentos Expirados',
 'documents_in_process' => 'Documentos em Processo',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Documentos bloqueados por você',
@@ -1144,7 +1144,7 @@ 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_editOnlineFileTypes' => '',
+'settings_editOnlineFileTypes' => 'Editar online os tipos de arquivos',
 'settings_editOnlineFileTypes_desc' => 'Arquivos com as seguintes extensões podem ser editados online (use somente letras minúsculas)',
 'settings_enable2FactorAuthentication' => '',
 'settings_enable2FactorAuthentication_desc' => '',

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 047/308] 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 048/308] 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 049/308] 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 050/308] 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 d4c6dc8962c748dd959904b327752b3139755cb3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 27 Oct 2017 19:42:56 +0200
Subject: [PATCH 051/308] fix getting last sessions

group by didn't work anymore in new mysql versions
---
 inc/inc.ClassSession.php          | 3 +--
 views/bootstrap/class.Session.php | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassSession.php b/inc/inc.ClassSession.php
index 67e5983f8..8aa9f0d44 100644
--- a/inc/inc.ClassSession.php
+++ b/inc/inc.ClassSession.php
@@ -496,8 +496,7 @@ class SeedDMS_SessionMgr {
 	function getLastAccessedSessions($datetime) { /* {{{ */
 		if(!$ts = makeTsFromLongDate($datetime))
 			return false;
-		$queryStr = "SELECT * FROM `tblSessions` WHERE `lastAccess`>=".$ts;
-		$queryStr .= " ORDER BY `lastAccess` DESC";
+		$queryStr = "SELECT a.* FROM `tblSessions` AS a LEFT OUTER JOIN `tblSessions` AS b ON a.`userID`=b.`userID` AND a.`lastAccess`< b.`lastAccess` WHERE b.`userID` IS NULL AND a.`lastAccess` >=".$ts;
 		$resArr = $this->db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr == false)
 			return false;
diff --git a/views/bootstrap/class.Session.php b/views/bootstrap/class.Session.php
index 9146fc901..d844eefd3 100644
--- a/views/bootstrap/class.Session.php
+++ b/views/bootstrap/class.Session.php
@@ -46,6 +46,8 @@ class SeedDMS_View_Session extends SeedDMS_Bootstrap_Style {
 
 		$sessionmgr = new SeedDMS_SessionMgr($dms->getDB());
 		$sessions = $sessionmgr->getLastAccessedSessions(date('Y-m-d H:i:s', time()-3600));
+		if(!$sessions)
+			return '';
 
 		if ($user->isGuest() || count($sessions) == 0) {
 			return '';

From 04c83d0fff2dacb219b29f9298b6d56717c44148 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 2 Nov 2017 07:54:47 +0100
Subject: [PATCH 052/308] init $indexconf just in case the full text engine is
 turned off

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

diff --git a/inc/inc.Settings.php b/inc/inc.Settings.php
index 53b9005ed..ed3ae548e 100644
--- a/inc/inc.Settings.php
+++ b/inc/inc.Settings.php
@@ -92,6 +92,7 @@ if (get_magic_quotes_gpc()) {
 	unset($process);
 }
 
+$indexconf = null;
 if($settings->_enableFullSearch) {
 	if($settings->_fullSearchEngine == 'sqlitefts') {
 		$indexconf = array(

From ad5b4e35b1a4ed33d49eaf8a70235be5e00597f5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 2 Nov 2017 08:42:22 +0100
Subject: [PATCH 053/308] some minor updates

---
 languages/es_ES/lang.inc | 4 ++--
 languages/tr_TR/lang.inc | 4 ++--
 languages/zh_CN/lang.inc | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 188f6049f..e8a5409cc 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 (1040), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1041), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -319,7 +319,7 @@ URL: [url]',
 'documentcontent' => 'Contenido del documento',
 'documents' => 'Documentos',
 'documents_checked_out_by_you' => '',
-'documents_expired' => '',
+'documents_expired' => 'Documentos Caducos',
 'documents_in_process' => 'Documentos en proceso',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Documentos bloqueados por usted',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index e51d11efe..4d0140d2d 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 (1052), aydin (83)
+//    Translators: Admin (1053), aydin (83)
 
 $text = array(
 '2_factor_auth' => '',
@@ -318,7 +318,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Dokümanlar',
 'documents_checked_out_by_you' => '',
-'documents_expired' => '',
+'documents_expired' => 'Süresi dolan belgeler',
 'documents_in_process' => 'İşlemdeki Dokümanlar',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Doküman sizin tarafınızdan kilitlendi',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 8f0ada7d3..799dcd108 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 (732), archonwang (469), fengjohn (5)
+//    Translators: Admin (733), archonwang (469), fengjohn (5)
 
 $text = array(
 '2_factor_auth' => '双重认证',
@@ -320,7 +320,7 @@ URL: [url]',
 'documentcontent' => '文档内容',
 'documents' => '文档',
 'documents_checked_out_by_you' => '您签出的文档',
-'documents_expired' => '',
+'documents_expired' => '过期的文档',
 'documents_in_process' => '待处理文档',
 'documents_locked' => '已锁定的文档',
 'documents_locked_by_you' => '被您锁定的文档',

From 441086887445c6686bbd44e2d003b8896ad650b6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 7 Nov 2017 06:43:25 +0100
Subject: [PATCH 054/308] started new version 5.1.5

---
 Makefile                           |  2 +-
 SeedDMS_Core/Core/inc.ClassDMS.php |  2 +-
 SeedDMS_Core/package.xml           | 29 ++++++++++++++++++++++-------
 inc/inc.Version.php                |  2 +-
 install/install.php                |  2 +-
 5 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 8456bad83..0805e195a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=5.1.4
+VERSION=5.1.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 26a196243..96f3678fc 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -371,7 +371,7 @@ class SeedDMS_Core_DMS {
 		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '5.1.4';
+			$this->version = '5.1.5';
 	} /* }}} */
 
 	/**
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 422bfa92f..f1a9e9dee 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-09-05</date>
+ <date>2017-11-07</date>
  <time>09:19:24</time>
  <version>
-  <release>5.1.4</release>
-  <api>5.1.4</api>
+  <release>5.1.5</release>
+  <api>5.1.5</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,10 +24,6 @@
  </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>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1518,5 +1514,24 @@ returns just users which are not disabled
 - add method SeedDMS_Core_DMS::getDocumentByOriginalFilename()
    </notes>
   </release>
+  <release>
+   <date>2017-09-05</date>
+   <time>09:19:24</time>
+   <version>
+    <release>5.1.4</release>
+    <api>5.1.4</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </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>
  </changelog>
 </package>
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index 8dd1de705..3fcc1c88b 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "5.1.4";
+	public $_number = "5.1.5";
 	private $_string = "SeedDMS";
 
 	function __construct() {
diff --git a/install/install.php b/install/install.php
index 69a1491e1..ecf7d5870 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", "5.1.4");
+define("SEEDDMS_VERSION", "5.1.5");
 
 require_once('../inc/inc.ClassSettings.php');
 

From cc8161e353aee3fdae99b257cd1fb14236d2f024 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 7 Nov 2017 17:50:58 +0100
Subject: [PATCH 055/308] fix php warning when login fails

---
 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 c6ee172b0..f758ddb89 100644
--- a/op/op.Login.php
+++ b/op/op.Login.php
@@ -33,7 +33,7 @@ include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc";
 
 function _printMessage($heading, $message) { /* {{{ */
 	global $dms, $theme;
-	$view = UI::factory($theme, 'ErrorDlg', array('dms'=>$dms));
+	$view = UI::factory($theme, 'Login', array('dms'=>$dms));
 	$view->exitError($heading, $message, true);
 	return;
 } /* }}} */

From 6e05806447bb57a7d31b896ef4ea68890affa415 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 06:52:24 +0100
Subject: [PATCH 056/308] remove some tasks already done

---
 TODO | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/TODO b/TODO
index 5a54b295a..097943d42 100644
--- a/TODO
+++ b/TODO
@@ -2,16 +2,11 @@ Show workflow steps after document has been released (keep workflow tab)
 
 Show documents in calendar when they where uploaded.
 
-Add attribute type 'date'
-
 Update comment and date of a review/approval, if the same status is set
 again. Currently setting the same status is turned of, because it didn't
 have any effect, which is quite confusing if the user can do an operation
 which has not the expected result.
 
-Show number of documents that needs care (approval, review, any other action
-in a workflog) next to Login/Logout-Menu.
-
 Show message on doc info page if documents expects an action like review,
 approval, etc.
 
@@ -34,23 +29,15 @@ Allow to specify fine grained notification (e.g. deleting a document, folder)
 Have access rights depending on document status. This will allow to
 restrict access when a document is in a workflow or has been rejected.
 
-There are still global variable in class SeedetoDMS_Bootstrap_Style
-
 Settings::searchConfigFilePath() and Settings::getConfigDir() use different
 approaches to get the configuration directory.
 
 Show expiration status of documents in document list
 
-Export/Import content as xml (even for subfolders)
-
 Copy folders recursivly
 
 Allow operations like  delete, move, approve, etc. on a list of documents
 
-Upload of multiple documents without an applet
-
-Do not show documents which are not reviewed or approved or rejected
-
 installation script:
 - user simply unpack the tar.gz in a server folder and access that folder
 - on startup if there are installation problems php automatically run the configuration script
@@ -70,9 +57,6 @@ Sometimes in the DB are written messages strings in plain language whose
 language depends on the current user and will never be translated.
 This can be avoided using only coded messages
 
-The mail language is translated using the current user language but should use 
-the receiver language (not easy).
-
 In my Documents->all documents there should be two lists: one (the current) with 
 the user's document, and another with the user's updated document (that's because 
 one user could have updated a document not owned by himself)

From 5c77b3aa7d35159acb4eee1b0821e34875e78d6d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 07:09:55 +0100
Subject: [PATCH 057/308] add replacement for empty.png

---
 views/bootstrap/images/empty.svg | 466 +++++++++++++++++++++++++++++++
 1 file changed, 466 insertions(+)
 create mode 100644 views/bootstrap/images/empty.svg

diff --git a/views/bootstrap/images/empty.svg b/views/bootstrap/images/empty.svg
new file mode 100644
index 000000000..772a3c0dc
--- /dev/null
+++ b/views/bootstrap/images/empty.svg
@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="240.00000"
+   inkscape:export-xdpi="240.00000"
+   inkscape:export-filename="/home/jimmac/gfx/novell/pdes/trunk/docs/BIGmime-text.png"
+   sodipodi:docname="empty.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="48.000000px"
+   width="48.000000px"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
+  <defs
+     id="defs3">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3520">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.41295547"
+         offset="0"
+         id="stop3522" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3524" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3520"
+       id="linearGradient13786"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5946829,0,0,0.5927814,-62.327355,-48.725799)"
+       x1="-18.618725"
+       y1="10.211342"
+       x2="-30.558546"
+       y2="12.189651" />
+    <linearGradient
+       id="linearGradient3671">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3673" />
+      <stop
+         id="stop3691"
+         offset="0.47533694"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3675" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3671"
+       id="radialGradient13784"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2626416,-0.1805803,0.4842474,0.7055033,-76.987986,-55.026495)"
+       cx="-26.305403"
+       cy="10.108011"
+       fx="-26.305403"
+       fy="10.108011"
+       r="7.0421038" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3656">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3658" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3660" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3656"
+       id="linearGradient13792"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-90,-60)"
+       x1="-24.756966"
+       y1="9.5694666"
+       x2="-22.611664"
+       y2="7.4241643" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3741">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3743" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3745" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3741"
+       id="radialGradient13636"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8860258,0,0,1.1764706,-3.5441033,-4.2352941)"
+       cx="4"
+       cy="5.2999997"
+       fx="4"
+       fy="5.2999997"
+       r="17" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3613">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0"
+         id="stop3615" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop3617" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3613"
+       id="linearGradient13634"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-90,-60)"
+       x1="-47.5"
+       y1="49.020683"
+       x2="-62.75"
+       y2="-22.502075" />
+    <linearGradient
+       id="linearGradient3683">
+      <stop
+         id="stop3685"
+         offset="0"
+         style="stop-color:#f6f6f5;stop-opacity:1;" />
+      <stop
+         id="stop3689"
+         offset="1"
+         style="stop-color:#d3d7cf;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3683"
+       id="radialGradient13632"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.9957492,0,0,1.9350367,0.62141,-91.167422)"
+       cx="-30.249996"
+       cy="35.357208"
+       fx="-30.249996"
+       fy="35.357208"
+       r="18.000002" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient13630"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient13628"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient13626"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient13624"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient13622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient13620"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop3704" />
+      <stop
+         id="stop3710"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop3706" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3688">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop3690" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop3692" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="33"
+     inkscape:window-x="0"
+     inkscape:window-height="1018"
+     inkscape:window-width="1920"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="false"
+     inkscape:current-layer="layer5"
+     inkscape:cy="25.524092"
+     inkscape:cx="10.952889"
+     inkscape:zoom="5.6568542"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Text Preview</dc:title>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>text</rdf:li>
+            <rdf:li>plaintext</rdf:li>
+            <rdf:li>regular</rdf:li>
+            <rdf:li>document</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <cc:license
+           rdf:resource="" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Lapo Calamandrei</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+        <dc:date />
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier />
+        <dc:relation />
+        <dc:language />
+        <dc:coverage />
+        <dc:description />
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:contributor>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow" />
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline">
+    <g
+       style="display:inline"
+       id="g13794"
+       transform="translate(150,60)">
+      <g
+         transform="translate(0,-60)"
+         id="g13584"
+         style="display:inline">
+        <rect
+           style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
+           id="rect13586"
+           width="48"
+           height="48"
+           x="-150"
+           y="0" />
+        <g
+           id="g13588">
+          <g
+             transform="matrix(1.0464281,0,0,0.8888889,-151.18571,5.7222396)"
+             inkscape:label="Shadow"
+             id="g13590"
+             style="opacity:0.65587045;display:inline">
+            <g
+               transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"
+               style="opacity:0.4"
+               id="g13592">
+              <rect
+                 style="opacity:1;fill:url(#radialGradient13620);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                 id="rect13594"
+                 width="5"
+                 height="7"
+                 x="38"
+                 y="40" />
+              <rect
+                 style="opacity:1;fill:url(#radialGradient13622);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                 id="rect13596"
+                 width="5"
+                 height="7"
+                 x="-10"
+                 y="-47"
+                 transform="scale(-1,-1)" />
+              <rect
+                 style="opacity:1;fill:url(#linearGradient13624);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                 id="rect13598"
+                 width="28"
+                 height="7.0000005"
+                 x="10"
+                 y="40" />
+            </g>
+          </g>
+          <g
+             transform="matrix(0.9548466,0,0,0.5555562,-148.98776,19.888875)"
+             inkscape:label="Shadow"
+             id="g13600"
+             style="display:inline">
+            <g
+               transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"
+               style="opacity:0.4"
+               id="g13602">
+              <rect
+                 style="opacity:1;fill:url(#radialGradient13626);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                 id="rect13604"
+                 width="5"
+                 height="7"
+                 x="38"
+                 y="40" />
+              <rect
+                 style="opacity:1;fill:url(#radialGradient13628);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                 id="rect13606"
+                 width="5"
+                 height="7"
+                 x="-10"
+                 y="-47"
+                 transform="scale(-1,-1)" />
+              <rect
+                 style="opacity:1;fill:url(#linearGradient13630);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                 id="rect13608"
+                 width="28"
+                 height="7.0000005"
+                 x="10"
+                 y="40" />
+            </g>
+          </g>
+          <path
+             sodipodi:nodetypes="cccccccscc"
+             id="path13610"
+             transform="translate(0,60)"
+             d="M -141.46875,-56.5 C -142.58997,-56.5 -143.5,-55.589966 -143.5,-54.46875 L -143.5,-17.53125 C -143.5,-16.410033 -142.58997,-15.5 -141.46875,-15.5 L -110.53125,-15.5 C -109.41004,-15.5 -108.5,-16.410034 -108.5,-17.53125 C -108.5,-27.447917 -108.5,-37.364583 -108.5,-47.28125 C -108.75793,-49.746835 -110.13765,-51.573876 -111.78125,-53.21875 C -113.42485,-54.863625 -115.16982,-56.452007 -117.71875,-56.5 C -125.63542,-56.5 -133.55208,-56.5 -141.46875,-56.5 z"
+             style="fill:url(#radialGradient13632);fill-opacity:1;stroke:url(#linearGradient13634);stroke-width:1;stroke-miterlimit:4;display:inline" />
+          <path
+             transform="translate(-150,0)"
+             d="M 8.53125,4 C 7.6730803,4 7,4.6730802 7,5.53125 L 7,42.46875 C 7,43.32692 7.6730802,44 8.53125,44 L 39.46875,44 C 40.326919,44 41,43.326918 41,42.46875 C 41,42.46875 41,19 41,17.5 C 41,16.10803 40.513021,13.200521 38.65625,11.34375 C 36.65625,9.34375 35.65625,8.34375 33.65625,6.34375 C 31.799479,4.4869792 28.89197,4 27.5,4 C 26,4 8.53125,4 8.53125,4 z"
+             id="path13612"
+             style="opacity:0.68016196;fill:url(#radialGradient13636);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;display:inline"
+             inkscape:original="M 8.53125 3.5 C 7.410033 3.5 6.5 4.4100329 6.5 5.53125 L 6.5 42.46875 C 6.5 43.589967 7.4100329 44.5 8.53125 44.5 L 39.46875 44.5 C 40.589967 44.5 41.5 43.589966 41.5 42.46875 C 41.5 42.46875 41.5 19 41.5 17.5 C 41.5 16 41 13 39 11 C 37 9 36 8 34 6 C 32 4 29 3.5 27.5 3.5 C 26 3.5 8.5312499 3.5 8.53125 3.5 z "
+             inkscape:radius="-0.4861359"
+             sodipodi:type="inkscape:offset" />
+          <path
+             id="path13618"
+             transform="translate(0,60)"
+             d="M -141.46875,-55.5 C -142.05192,-55.5 -142.5,-55.051916 -142.5,-54.46875 L -142.5,-17.53125 C -142.5,-16.948085 -142.05191,-16.5 -141.46875,-16.5 L -110.53125,-16.5 C -109.94808,-16.5 -109.5,-16.948086 -109.5,-17.53125 C -109.5,-17.53125 -109.5,-41 -109.5,-42.5 C -109.5,-42.606586 -109.52415,-42.779716 -109.53125,-42.90625 C -109.53125,-44.658248 -109.53125,-47.01807 -109.53125,-47.28125 C -109.53125,-48.038629 -109.86422,-49.800936 -110.875,-50.8125 C -112.18988,-52.128398 -112.84137,-52.8091 -114.15625,-54.125 C -115.16704,-55.136562 -116.96195,-55.46875 -117.71875,-55.46875 C -118.06477,-55.46875 -120.11232,-55.46875 -122.09375,-55.46875 C -122.22028,-55.475855 -122.39341,-55.5 -122.5,-55.5 C -124,-55.5 -141.46875,-55.5 -141.46875,-55.5 z"
+             style="fill:none;fill-opacity:1;stroke:url(#linearGradient13792);stroke-width:1;stroke-miterlimit:4;display:inline" />
+        </g>
+      </g>
+      <g
+         transform="translate(-36.006942,-8.993441)"
+         id="g13771">
+        <path
+           style="fill:url(#radialGradient13784);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;display:inline"
+           d="M -81.704642,-47 C -82.600168,-47 -81.731767,-46.679215 -80.83822,-46.274007 C -79.944674,-45.868798 -78.473456,-44.361864 -79,-42 C -74.43068,-42.707107 -73.851802,-39.822428 -73.644912,-39.074576 C -73.438023,-38.326725 -73.000134,-37.391796 -73.000134,-38.288084 C -72.981865,-40.743928 -74.834804,-42.438635 -76.123279,-43.874197 C -77.411755,-45.309758 -79.348756,-46.692333 -81.704642,-47 z"
+           id="path13676"
+           sodipodi:nodetypes="ccccczc" />
+        <path
+           style="opacity:0.87854249;fill:url(#linearGradient13786);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;display:inline"
+           d="M -80.994821,-46.345411 C -80.400137,-46.345411 -80,-42.5 -80,-40 C -77,-40 -74.29634,-39.548186 -74,-39 C -74.20689,-39.747852 -74.538563,-42.773398 -79,-42 C -78.442483,-44.500797 -80.212993,-46.107705 -80.994821,-46.345411 z"
+           id="path13678"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+    </g>
+    <g
+       aria-label="?"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.33333397px;line-height:25px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text874"
+       transform="translate(-1.375,2.625)">
+      <path
+         d="M 27.260417,23.25 H 23.5 v -0.510417 q 0,-0.854167 0.34375,-1.510417 0.34375,-0.666666 1.447917,-1.6875 L 25.958334,18.9375 q 0.59375,-0.541667 0.864583,-1.020834 0.28125,-0.479166 0.28125,-0.958333 0,-0.729167 -0.5,-1.135417 -0.5,-0.416666 -1.395834,-0.416666 -0.84375,0 -1.822916,0.354166 -0.979167,0.34375 -2.041667,1.03125 v -3.270833 q 1.260417,-0.4375 2.302083,-0.645833 1.041667,-0.208334 2.010417,-0.208334 2.541667,0 3.875,1.041667 1.333334,1.03125 1.333334,3.020833 0,1.020834 -0.40625,1.833334 -0.40625,0.802083 -1.385417,1.729166 l -0.666667,0.59375 q -0.708333,0.645834 -0.927083,1.041667 -0.21875,0.385417 -0.21875,0.854167 z M 23.5,24.791667 h 3.760417 V 28.5 H 23.5 Z"
+         id="path876"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>

From f7224e445e4ba6d276ef3931667b62f680a916f7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 07:10:15 +0100
Subject: [PATCH 058/308] ignore ext

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 732a19b99..6ac6ee7b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.tar.gz
 SeedDMS_*/*.tgz
+ext/*

From 55433332913697aceef585ec86f3c066bf4582ba Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 08:33:57 +0100
Subject: [PATCH 059/308] move getUser() in file

---
 inc/inc.ClassSession.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/inc/inc.ClassSession.php b/inc/inc.ClassSession.php
index 8aa9f0d44..30e8d6496 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
 	 *
@@ -186,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 7520634c612600e4b7288c3033dbdc98cb8a6e4b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 08:34:19 +0100
Subject: [PATCH 060/308] add addDirSep()

---
 inc/inc.Utils.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 093f4b9bb..327cdbf3f 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -565,9 +565,25 @@ 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;
 	}
 } /* }}} */
+
+/**
+ * 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(trim($str) == '')
+		return '';
+	if(substr(trim($str), -1, 1) != DIRECTORY_SEPARATOR)
+		return trim($str).DIRECTORY_SEPARATOR;
+	else
+		return trim($str);
+} /* }}} */
 ?>

From cc6f64a1a35a0fd45c728f2a5952a281a81bdb68 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 08:34:38 +0100
Subject: [PATCH 061/308] add dir separator to various install directories

---
 op/op.Settings.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/op/op.Settings.php b/op/op.Settings.php
index 3ca583bb3..7e9c89581 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -106,14 +106,14 @@ 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->_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->_logFileEnable = getBoolValue("logFileEnable");
   $settings->_logFileRotation = $_POST["logFileRotation"];
   $settings->_enableLargeFileUpload = getBoolValue("enableLargeFileUpload");

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 062/308] 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 64f7e9be10a2d57af2b82ef80befa78bf491c75b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 08:41:10 +0100
Subject: [PATCH 063/308] call notification hooks before and after setting up
 email notification

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

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 404abb96a..61209da3c 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -60,9 +60,25 @@ if (isset($_COOKIE["mydms_session"])) {
 		}
 	}
 	$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));
 	}
+
+	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 {
 	$user = null;

From 51228b5a8facf377eb4a8e162f4d2dcf62dd3555 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 08:46:48 +0100
Subject: [PATCH 064/308] init index

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

diff --git a/op/op.RemoveDocument.php b/op/op.RemoveDocument.php
index 361c9ca17..afdcceb8b 100644
--- a/op/op.RemoveDocument.php
+++ b/op/op.RemoveDocument.php
@@ -59,6 +59,7 @@ if($document->isLocked()) {
 
 if($settings->_enableFullSearch) {
 	$index = $indexconf['Indexer']::open($settings->_luceneDir);
+	$indexconf['Indexer']::init($settings->_stopWordsFile);
 } else {
 	$index = null;
 }

From 0421b2f0acaae5d54f0097a3c59f74cee819a432 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 08:47:00 +0100
Subject: [PATCH 065/308] add fold marks

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

diff --git a/op/op.Download.php b/op/op.Download.php
index 3d157a968..742c210c9 100644
--- a/op/op.Download.php
+++ b/op/op.Download.php
@@ -33,7 +33,7 @@ include("../inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1]);
 
-if (isset($_GET["version"])) {
+if (isset($_GET["version"])) { /* {{{ */
 
 	// document download
 	if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
@@ -68,7 +68,8 @@ if (isset($_GET["version"])) {
 	$controller->setParam('type', 'version');
 	$controller->run();
 
-} elseif (isset($_GET["file"])) {
+} /* }}} */
+elseif (isset($_GET["file"])) { /* {{{ */
 
 	// file download
 	

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 066/308] 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 53b0d98fa530972635fbf6fb9930f1afe62c83af Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 08:48:29 +0100
Subject: [PATCH 067/308] init index

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

diff --git a/op/op.RemoveFolder.php b/op/op.RemoveFolder.php
index 826b2dea8..34758e135 100644
--- a/op/op.RemoveFolder.php
+++ b/op/op.RemoveFolder.php
@@ -56,6 +56,7 @@ if ($folder->getAccessMode($user) < M_ALL) {
 
 if($settings->_enableFullSearch) {
 	$index = $indexconf['Indexer']::open($settings->_luceneDir);
+	$indexconf['Indexer']::init($settings->_stopWordsFile);
 } else {
 	$index = null;
 }

From d329de70362b80e395de2a005807dcdad4419376 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 10:23:34 +0100
Subject: [PATCH 068/308] some minor code reorganisation

---
 out/out.AddDocument.php                |  5 +++--
 out/out.AddEvent.php                   |  5 +++--
 out/out.AddFile.php                    |  8 +++-----
 out/out.AddSubFolder.php               |  5 +++--
 out/out.AdminTools.php                 |  7 ++-----
 out/out.ApprovalSummary.php            |  5 +++--
 out/out.AttributeMgr.php               |  4 ++--
 out/out.BackupTools.php                |  4 ++--
 out/out.Calendar.php                   |  5 +++--
 out/out.Categories.php                 |  8 ++++----
 out/out.Charts.php                     |  1 +
 out/out.ClearCache.php                 |  4 ++--
 out/out.CreateIndex.php                |  4 ++--
 out/out.DefaultKeywords.php            |  6 ++++--
 out/out.EditEvent.php                  |  5 +++--
 out/out.EditFolder.php                 |  5 +++--
 out/out.EditOnline.php                 |  5 +++--
 out/out.EditUserData.php               | 10 ++++++++--
 out/out.ExpiredDocuments.php           |  4 ++--
 out/out.ExtensionMgr.php               |  8 +++++---
 out/out.FolderAccess.php               |  5 +++--
 out/out.FolderNotify.php               |  5 +++--
 out/out.GroupMgr.php                   | 14 ++++++++++----
 out/out.GroupView.php                  |  5 +++--
 out/out.Hooks.php                      |  5 +++--
 out/out.ImportFS.php                   |  7 ++++---
 out/out.IndexInfo.php                  |  4 ++--
 out/out.Indexer.php                    |  4 ++--
 out/out.Info.php                       |  6 ++----
 out/out.LogManagement.php              |  7 +++++--
 out/out.ManageNotify.php               |  8 ++++++--
 out/out.MoveFolder.php                 |  5 +++--
 out/out.MyAccount.php                  |  5 +++--
 out/out.MyDocuments.php                |  5 +++--
 out/out.RemoveArchive.php              |  4 ++--
 out/out.RemoveDump.php                 |  4 ++--
 out/out.RemoveFolder.php               |  5 +++--
 out/out.RemoveFolderFiles.php          |  4 ++--
 out/out.RemoveGroup.php                |  4 ++--
 out/out.RemoveLog.php                  |  4 ++--
 out/out.RemoveUser.php                 |  4 ++--
 out/out.RemoveWorkflow.php             |  4 ++--
 out/out.RemoveWorkflowFromDocument.php |  8 +++-----
 out/out.ReviewSummary.php              |  5 +++--
 out/out.RewindWorkflow.php             |  8 +++-----
 out/out.RunSubWorkflow.php             |  9 ++++-----
 out/out.Session.php                    |  2 +-
 out/out.Settings.php                   | 11 +++++++++--
 out/out.Statistic.php                  |  5 +++--
 out/out.SubstituteUser.php             |  4 ++--
 out/out.Timeline.php                   |  5 +----
 out/out.UpdateDocument.php             |  9 ++++-----
 out/out.UserDefaultKeywords.php        |  5 +++--
 out/out.UserList.php                   | 10 ++++++----
 out/out.UsrMgr.php                     | 18 ++++++++++++++----
 out/out.UsrView.php                    |  5 +++--
 out/out.ViewDocument.php               | 15 +++++++--------
 out/out.ViewEvent.php                  |  4 ++--
 out/out.WorkflowActionsMgr.php         |  4 ++--
 out/out.WorkflowGraph.php              |  5 +++--
 out/out.WorkflowMgr.php                |  4 ++--
 out/out.WorkflowStatesMgr.php          |  4 ++--
 out/out.WorkflowSummary.php            |  5 +++--
 63 files changed, 210 insertions(+), 161 deletions(-)

diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php
index 54d81dfd6..fda77b3f7 100644
--- a/out/out.AddDocument.php
+++ b/out/out.AddDocument.php
@@ -29,6 +29,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"));
 }
@@ -49,8 +52,6 @@ if($settings->_quota > 0) {
 	}
 }
 
-$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);
diff --git a/out/out.AddEvent.php b/out/out.AddEvent.php
index ef176ab9a..0412c9ccf 100644
--- a/out/out.AddEvent.php
+++ b/out/out.AddEvent.php
@@ -26,12 +26,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));
+
 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->setParam('strictformcheck', $settings->_strictFormCheck);
 	$view($_GET);
diff --git a/out/out.AddFile.php b/out/out.AddFile.php
index 3b3f717be..ce68400e4 100644
--- a/out/out.AddFile.php
+++ b/out/out.AddFile.php
@@ -30,6 +30,9 @@ 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"));
 }
@@ -46,11 +49,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, $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.AddSubFolder.php b/out/out.AddSubFolder.php
index 289150c5a..ba8999d91 100644
--- a/out/out.AddSubFolder.php
+++ b/out/out.AddSubFolder.php
@@ -29,6 +29,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"));
 }
@@ -41,8 +44,6 @@ 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);
diff --git a/out/out.AdminTools.php b/out/out.AdminTools.php
index 210ff2329..873222e61 100644
--- a/out/out.AdminTools.php
+++ b/out/out.AdminTools.php
@@ -26,17 +26,14 @@ 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"));
 }
 
-$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('logfileenable', $settings->_logFileEnable);
 	$view($_GET);
-	exit;
 }
-
-?>
diff --git a/out/out.ApprovalSummary.php b/out/out.ApprovalSummary.php
index 07b78928c..1e5091fa9 100644
--- a/out/out.ApprovalSummary.php
+++ b/out/out.ApprovalSummary.php
@@ -28,12 +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));
+
 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);
diff --git a/out/out.AttributeMgr.php b/out/out.AttributeMgr.php
index 33b28facc..e02d80b7c 100644
--- a/out/out.AttributeMgr.php
+++ b/out/out.AttributeMgr.php
@@ -28,6 +28,8 @@ 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"));
 }
@@ -40,8 +42,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);
diff --git a/out/out.BackupTools.php b/out/out.BackupTools.php
index b3cb12444..a9cdbef56 100644
--- a/out/out.BackupTools.php
+++ b/out/out.BackupTools.php
@@ -27,12 +27,12 @@ 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, 'contentdir'=>$settings->_contentDir));
 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, 'contentdir'=>$settings->_contentDir));
 if($view) {
 	$view($_GET);
 	exit;
diff --git a/out/out.Calendar.php b/out/out.Calendar.php
index 0f8ca4804..9ada3263b 100644
--- a/out/out.Calendar.php
+++ b/out/out.Calendar.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["start"])) $start=$_GET["start"];
 else $start = '';
 if (isset($_GET["end"])) $end=$_GET["end"];
@@ -57,8 +60,6 @@ if(isset($_GET['eventtype']) && $_GET['eventtype']) {
 } else
 	$eventtype = 'regular';
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('calendar', $calendar);
 	$view->setParam('start', $start);
diff --git a/out/out.Categories.php b/out/out.Categories.php
index cda9b14e6..12f809dc3 100644
--- a/out/out.Categories.php
+++ b/out/out.Categories.php
@@ -28,6 +28,8 @@ 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"));
 }
@@ -40,10 +42,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);
 }
-
-?>
diff --git a/out/out.Charts.php b/out/out.Charts.php
index 016981f3b..84591584d 100644
--- a/out/out.Charts.php
+++ b/out/out.Charts.php
@@ -33,6 +33,7 @@ $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
+
 $rootfolder = $dms->getFolder($settings->_rootFolderID);
 
 $type = 'docsperuser';
diff --git a/out/out.ClearCache.php b/out/out.ClearCache.php
index 74ec26f61..96f0b1b7b 100644
--- a/out/out.ClearCache.php
+++ b/out/out.ClearCache.php
@@ -29,12 +29,12 @@ 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 (!$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));
 if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view($_GET);
diff --git a/out/out.CreateIndex.php b/out/out.CreateIndex.php
index 7adf4aca8..330f4fabe 100644
--- a/out/out.CreateIndex.php
+++ b/out/out.CreateIndex.php
@@ -30,6 +30,8 @@ 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"));
 }
@@ -38,8 +40,6 @@ 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($_GET);
diff --git a/out/out.DefaultKeywords.php b/out/out.DefaultKeywords.php
index 2e572e7f6..0864b462c 100644
--- a/out/out.DefaultKeywords.php
+++ b/out/out.DefaultKeywords.php
@@ -28,6 +28,8 @@ 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"));
 }
@@ -39,9 +41,9 @@ 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($_GET);
 	exit;
 }
diff --git a/out/out.EditEvent.php b/out/out.EditEvent.php
index 1d4297ca2..b60b00075 100644
--- a/out/out.EditEvent.php
+++ b/out/out.EditEvent.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 ($user->isGuest()) {
 	UI::exitError(getMLText("edit_event"),getMLText("access_denied"));
 }
@@ -44,8 +47,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->setParam('strictformcheck', $settings->_strictFormCheck);
diff --git a/out/out.EditFolder.php b/out/out.EditFolder.php
index 8f56eb58a..813886b9b 100644
--- a/out/out.EditFolder.php
+++ b/out/out.EditFolder.php
@@ -28,6 +28,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,8 +46,6 @@ 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);
diff --git a/out/out.EditOnline.php b/out/out.EditOnline.php
index 780c035d0..bfc5c6027 100644
--- a/out/out.EditOnline.php
+++ b/out/out.EditOnline.php
@@ -28,6 +28,9 @@ 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));
+
 $documentid = $_GET["documentid"];
 
 if (!isset($documentid) || !is_numeric($documentid) || intval($documentid)<1) {
@@ -83,8 +86,6 @@ if(!$accessop->mayEditVersion($version)) {
 
 $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);
diff --git a/out/out.EditUserData.php b/out/out.EditUserData.php
index 64aa2613e..348723ef3 100644
--- a/out/out.EditUserData.php
+++ b/out/out.EditUserData.php
@@ -28,6 +28,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("edit_user_details"),getMLText("access_denied"));
 }
@@ -37,9 +40,12 @@ 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($_GET);
 	exit;
 }
diff --git a/out/out.ExpiredDocuments.php b/out/out.ExpiredDocuments.php
index 4e38a85aa..b81b83a61 100644
--- a/out/out.ExpiredDocuments.php
+++ b/out/out.ExpiredDocuments.php
@@ -28,6 +28,8 @@ 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("expired_documents"),getMLText("access_denied"));
 }
@@ -37,8 +39,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('cachedir', $settings->_cacheDir);
diff --git a/out/out.ExtensionMgr.php b/out/out.ExtensionMgr.php
index 92db8bb06..da2e5c728 100644
--- a/out/out.ExtensionMgr.php
+++ b/out/out.ExtensionMgr.php
@@ -26,16 +26,18 @@ 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"));
 }
 
 $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));
 if($view) {
-	$view->show();
+	$view->setParam('httproot', $settings->_httpRoot);
+	$view->setParam('version', $v);
+	$view($_GET);
 	exit;
 }
 
diff --git a/out/out.FolderAccess.php b/out/out.FolderAccess.php
index fdf987425..970769c1a 100644
--- a/out/out.FolderAccess.php
+++ b/out/out.FolderAccess.php
@@ -29,6 +29,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"));
 }
@@ -45,8 +48,6 @@ 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);
diff --git a/out/out.FolderNotify.php b/out/out.FolderNotify.php
index d6ec6b7f2..100a6e248 100644
--- a/out/out.FolderNotify.php
+++ b/out/out.FolderNotify.php
@@ -28,6 +28,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"));
 }
@@ -44,8 +47,6 @@ 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));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('allusers', $allUsers);
diff --git a/out/out.GroupMgr.php b/out/out.GroupMgr.php
index 46fed3fbd..7f61bdaf5 100644
--- a/out/out.GroupMgr.php
+++ b/out/out.GroupMgr.php
@@ -28,6 +28,8 @@ 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"));
 }
@@ -48,10 +50,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.GroupView.php b/out/out.GroupView.php
index dfd596af3..8024323cb 100644
--- a/out/out.GroupView.php
+++ b/out/out.GroupView.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("my_account"),getMLText("access_denied"));
 }
@@ -44,8 +47,6 @@ 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);
diff --git a/out/out.Hooks.php b/out/out.Hooks.php
index 990247d41..9eda3c44b 100644
--- a/out/out.Hooks.php
+++ b/out/out.Hooks.php
@@ -25,13 +25,14 @@ 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"));
 }
 
-$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($_GET);
 	exit;
 }
diff --git a/out/out.ImportFS.php b/out/out.ImportFS.php
index 4dd0f1ee2..af394806a 100644
--- a/out/out.ImportFS.php
+++ b/out/out.ImportFS.php
@@ -24,16 +24,17 @@ 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");
+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"));
 }
 
-$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 04479e9b9..6e614a927 100644
--- a/out/out.IndexInfo.php
+++ b/out/out.IndexInfo.php
@@ -29,6 +29,8 @@ 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"));
 }
@@ -42,8 +44,6 @@ 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);
diff --git a/out/out.Indexer.php b/out/out.Indexer.php
index 85137fa2c..f7593b984 100644
--- a/out/out.Indexer.php
+++ b/out/out.Indexer.php
@@ -29,6 +29,8 @@ 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"));
 }
@@ -68,8 +70,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);
diff --git a/out/out.Info.php b/out/out.Info.php
index f880c8be3..09a382473 100644
--- a/out/out.Info.php
+++ b/out/out.Info.php
@@ -29,6 +29,8 @@ 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"));
 }
@@ -44,13 +46,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));
 if($view) {
 	$view->setParam('version', $v);
 	$view->setParam('availversions', $versions);
 	$view($_GET);
 	exit;
 }
-
-?>
diff --git a/out/out.LogManagement.php b/out/out.LogManagement.php
index 41fa7aa5c..b6b2ba6cc 100644
--- a/out/out.LogManagement.php
+++ b/out/out.LogManagement.php
@@ -27,6 +27,8 @@ 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"));
 }
@@ -37,9 +39,10 @@ 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($_GET);
 	exit;
 }
diff --git a/out/out.ManageNotify.php b/out/out.ManageNotify.php
index b554354dd..6d2419fdb 100644
--- a/out/out.ManageNotify.php
+++ b/out/out.ManageNotify.php
@@ -26,13 +26,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));
+
 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, 'timeout'=>$settings->_cmdTimeout));
 if($view) {
+	$view->setParam('cachedir', $settings->_cacheDir);
+	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.MoveFolder.php b/out/out.MoveFolder.php
index 0a467a2e7..3cace3498 100644
--- a/out/out.MoveFolder.php
+++ b/out/out.MoveFolder.php
@@ -28,6 +28,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"));
 }
@@ -63,8 +66,6 @@ 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);
diff --git a/out/out.MyAccount.php b/out/out.MyAccount.php
index 2e4d267b8..27fbbd853 100644
--- a/out/out.MyAccount.php
+++ b/out/out.MyAccount.php
@@ -28,12 +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));
+
 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);
diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php
index 9a7eb4987..4af578678 100644
--- a/out/out.MyDocuments.php
+++ b/out/out.MyDocuments.php
@@ -28,6 +28,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("my_documents"),getMLText("access_denied"));
 }
@@ -44,8 +47,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);
diff --git a/out/out.RemoveArchive.php b/out/out.RemoveArchive.php
index 39af2aa29..c8da8401b 100644
--- a/out/out.RemoveArchive.php
+++ b/out/out.RemoveArchive.php
@@ -26,6 +26,8 @@ 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"));
 }
@@ -36,8 +38,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 245e2a990..f07777424 100644
--- a/out/out.RemoveDump.php
+++ b/out/out.RemoveDump.php
@@ -26,6 +26,8 @@ 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"));
 }
@@ -36,8 +38,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.RemoveFolder.php b/out/out.RemoveFolder.php
index 94ae913a1..35b40cc52 100644
--- a/out/out.RemoveFolder.php
+++ b/out/out.RemoveFolder.php
@@ -28,6 +28,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"));
 }
@@ -46,8 +49,6 @@ 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($_GET);
diff --git a/out/out.RemoveFolderFiles.php b/out/out.RemoveFolderFiles.php
index a8fa1bc91..2151648d0 100644
--- a/out/out.RemoveFolderFiles.php
+++ b/out/out.RemoveFolderFiles.php
@@ -26,6 +26,8 @@ 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"));
 }
@@ -40,8 +42,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 8e228b8e4..0dc75c962 100644
--- a/out/out.RemoveGroup.php
+++ b/out/out.RemoveGroup.php
@@ -27,6 +27,8 @@ 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"));
 }
@@ -40,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 2674cbe61..f8e39942c 100644
--- a/out/out.RemoveLog.php
+++ b/out/out.RemoveLog.php
@@ -26,6 +26,8 @@ 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"));
 }
@@ -50,8 +52,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 d11421be0..541957199 100644
--- a/out/out.RemoveUser.php
+++ b/out/out.RemoveUser.php
@@ -27,6 +27,8 @@ 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"));
 }
@@ -50,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 2136c6940..a87592ed1 100644
--- a/out/out.RemoveWorkflow.php
+++ b/out/out.RemoveWorkflow.php
@@ -29,6 +29,8 @@ 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"));
 }
@@ -42,8 +44,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 d719ccc1f..54b6ae2b5 100644
--- a/out/out.RemoveWorkflowFromDocument.php
+++ b/out/out.RemoveWorkflowFromDocument.php
@@ -30,6 +30,9 @@ 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 (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
@@ -61,11 +64,6 @@ if (!is_object($workflow)) {
 
 $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.ReviewSummary.php b/out/out.ReviewSummary.php
index 07b78928c..1e5091fa9 100644
--- a/out/out.ReviewSummary.php
+++ b/out/out.ReviewSummary.php
@@ -28,12 +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));
+
 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);
diff --git a/out/out.RewindWorkflow.php b/out/out.RewindWorkflow.php
index d719ccc1f..54b6ae2b5 100644
--- a/out/out.RewindWorkflow.php
+++ b/out/out.RewindWorkflow.php
@@ -30,6 +30,9 @@ 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 (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
@@ -61,11 +64,6 @@ if (!is_object($workflow)) {
 
 $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.RunSubWorkflow.php b/out/out.RunSubWorkflow.php
index 981c8c1fd..98cfd3fa5 100644
--- a/out/out.RunSubWorkflow.php
+++ b/out/out.RunSubWorkflow.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, $document, $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"));
 }
@@ -66,11 +70,6 @@ if (!is_object($subworkflow)) {
 
 $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.Session.php b/out/out.Session.php
index 4c07bc48c..cc6ac7e71 100644
--- a/out/out.Session.php
+++ b/out/out.Session.php
@@ -25,9 +25,9 @@ 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.ClassAccessOperation.php");
-include("../inc/inc.ClassUI.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
diff --git a/out/out.Settings.php b/out/out.Settings.php
index e7ebebee0..c379177c7 100644
--- a/out/out.Settings.php
+++ b/out/out.Settings.php
@@ -26,6 +26,8 @@ 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"));
 }
@@ -34,9 +36,14 @@ 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'] : '')));
+$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($_GET);
 	exit;
 }
diff --git a/out/out.Statistic.php b/out/out.Statistic.php
index 4217d5b65..e5b025637 100644
--- a/out/out.Statistic.php
+++ b/out/out.Statistic.php
@@ -27,14 +27,15 @@ 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"));
 }
 $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($_GET);
 	exit;
 }
diff --git a/out/out.SubstituteUser.php b/out/out.SubstituteUser.php
index a4cc03e00..295ee3bb5 100644
--- a/out/out.SubstituteUser.php
+++ b/out/out.SubstituteUser.php
@@ -27,14 +27,14 @@ 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]);
 if (!$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]);
 if($view) {
 	$view->setParam('dms', $dms);
 	$view->setParam('user', $user);
diff --git a/out/out.Timeline.php b/out/out.Timeline.php
index 628e528f8..8ce4607ac 100644
--- a/out/out.Timeline.php
+++ b/out/out.Timeline.php
@@ -28,10 +28,7 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1]);
-if(!$view) {
-}
-
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if (!$user->isAdmin()) {
 	$view->exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
diff --git a/out/out.UpdateDocument.php b/out/out.UpdateDocument.php
index 82a743ed8..2f4081222 100644
--- a/out/out.UpdateDocument.php
+++ b/out/out.UpdateDocument.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, $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"));
 }
@@ -59,11 +63,6 @@ if($settings->_quota > 0) {
 
 $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.UserDefaultKeywords.php b/out/out.UserDefaultKeywords.php
index 85dacdeb1..d78691960 100644
--- a/out/out.UserDefaultKeywords.php
+++ b/out/out.UserDefaultKeywords.php
@@ -27,14 +27,15 @@ 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("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($_GET);
diff --git a/out/out.UserList.php b/out/out.UserList.php
index a135e91ae..6b17312df 100644
--- a/out/out.UserList.php
+++ b/out/out.UserList.php
@@ -27,17 +27,19 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 include("../inc/inc.ClassPasswordStrength.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"));
 }
 
 $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 27fdeae53..99e70f3f1 100644
--- a/out/out.UsrMgr.php
+++ b/out/out.UsrMgr.php
@@ -28,6 +28,8 @@ 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"));
 }
@@ -48,10 +50,18 @@ 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, '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, 'enableemail'=>$settings->_enableEmail));
 if($view) {
+	$view->setParam('seluser', $seluser);
+	$view->setParam('allusers', $users);
+	$view->setParam('allgroups', $groups);
+	$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('enableemail', $settings->_enableEmail);
 	$view($_GET);
 }
-
-?>
diff --git a/out/out.UsrView.php b/out/out.UsrView.php
index 242c2421c..db19bb304 100644
--- a/out/out.UsrView.php
+++ b/out/out.UsrView.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("my_account"),getMLText("access_denied"));
 }
@@ -39,8 +42,6 @@ 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);
diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index 8156d7900..15ccfe4a4 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -31,9 +31,8 @@ include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1]);
-if(!$view) {
-}
+$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) {
 	$view->exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
@@ -44,15 +43,17 @@ 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, $document, $user, $settings);
-
 $folder = $document->getFolder();
 
 if ($document->getAccessMode($user) < M_READ || !$document->getLatestContent()) {
 	$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
@@ -63,8 +64,6 @@ if ($document->verifyLastestContentExpriry()){
 }
 
 if($view) {
-	$view->setParam('dms', $dms);
-	$view->setParam('user', $user);
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
 	$view->setParam('accessobject', $accessop);
diff --git a/out/out.ViewEvent.php b/out/out.ViewEvent.php
index 61926f3e3..a19d60484 100644
--- a/out/out.ViewEvent.php
+++ b/out/out.ViewEvent.php
@@ -27,6 +27,8 @@ 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"])){
 	UI::exitError(getMLText("event_details"),getMLText("error_occured"));
 }
@@ -36,8 +38,6 @@ 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($_GET);
diff --git a/out/out.WorkflowActionsMgr.php b/out/out.WorkflowActionsMgr.php
index 82f787ad7..84593a195 100644
--- a/out/out.WorkflowActionsMgr.php
+++ b/out/out.WorkflowActionsMgr.php
@@ -28,6 +28,8 @@ 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 +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.WorkflowGraph.php b/out/out.WorkflowGraph.php
index 24ea7d051..0ea650493 100644
--- a/out/out.WorkflowGraph.php
+++ b/out/out.WorkflowGraph.php
@@ -28,6 +28,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));
+
 $workflow = $dms->getWorkflow($_GET['workflow']);
 if (is_bool($workflow)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"));
@@ -51,8 +54,6 @@ 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);
diff --git a/out/out.WorkflowMgr.php b/out/out.WorkflowMgr.php
index a51f7dc34..b56414147 100644
--- a/out/out.WorkflowMgr.php
+++ b/out/out.WorkflowMgr.php
@@ -28,6 +28,8 @@ 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"));
 }
@@ -48,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 101679e1a..fe226f977 100644
--- a/out/out.WorkflowStatesMgr.php
+++ b/out/out.WorkflowStatesMgr.php
@@ -28,6 +28,8 @@ 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"));
 }
@@ -38,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);
diff --git a/out/out.WorkflowSummary.php b/out/out.WorkflowSummary.php
index 2269e4b97..e76e17833 100644
--- a/out/out.WorkflowSummary.php
+++ b/out/out.WorkflowSummary.php
@@ -28,12 +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));
+
 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);

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 069/308] 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 b6ce91c8ee83b63a55640e0173fe4a5e6a0f3440 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 11:27:17 +0100
Subject: [PATCH 070/308] fix validation return value

---
 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 58bb5b027..b1d74c5e9 100644
--- a/SeedDMS_Core/Core/inc.ClassAttribute.php
+++ b/SeedDMS_Core/Core/inc.ClassAttribute.php
@@ -942,8 +942,10 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 					$values = array($attrvalue);
 			} else
 				$values = $attrvalue;
-		} else {
+		} elseif($attrvalue) {
 			$values = array($attrvalue);
+		} else {
+			$values = array();
 		}
 
 		$this->_validation_error = 0;

From b29f7b1e9c7239c71bb8f6592c9eb5fed177b79d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 11:28:18 +0100
Subject: [PATCH 071/308] add method getParent()

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

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 3359ab1a8..9fc14d18e 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -441,6 +441,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);

From 8af798fe86e15c9b00c0b23523217dfa88bc1da1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 11:28:49 +0100
Subject: [PATCH 072/308] views instead of temp. tables can be used

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 225 +++++++++++++++++++++++++-
 1 file changed, 221 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index 0e5260aae..ae7fb09ca 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -102,6 +102,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
 	 *
@@ -130,6 +135,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
 	 *
@@ -171,6 +204,7 @@ class SeedDMS_Core_DatabaseAccess {
 		$this->_ttapproveid = false;
 		$this->_ttstatid = false;
 		$this->_ttcontentid = false;
+		$this->_useviews = true;
 		$this->_debug = false;
 	} /* }}} */
 
@@ -221,11 +255,22 @@ 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');
 				break;
 		}
+		if($this->_useviews) {
+			$tmp = $this->ViewList();
+			foreach(array('ttreviewid', 'ttapproveid', 'ttstatid', 'ttcontentid') as $viewname) {
+				if(in_array($viewname, $tmp)) {
+					$this->{"_".$viewname} = true;
+				}
+			}
+		}
+
 		$this->_connected = true;
 		return true;
 	} /* }}} */
@@ -365,7 +410,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':
@@ -407,7 +452,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 ".
@@ -448,7 +493,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 ".
@@ -489,7 +534,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 IF NOT EXISTS `ttcontentid` AS ".
@@ -533,6 +578,178 @@ 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;
+		}
+		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 8bb3821a2f031a3d19fdbc1c7e29b120afd8e7ee Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 11:29:49 +0100
Subject: [PATCH 073/308] $accessop must be instanciated later

---
 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 15ccfe4a4..cd5b1ae66 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -32,7 +32,6 @@ 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) {
 	$view->exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
@@ -43,6 +42,7 @@ 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 78f4d62e367f88a8d33ce2dbe271e9ec437a17a3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 11:51:12 +0100
Subject: [PATCH 074/308] optimized code to get various document lists

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

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 96f3678fc..7c4e91b28 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -797,6 +797,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
@@ -812,6 +813,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`, ".
@@ -827,9 +829,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();
@@ -873,6 +899,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')
@@ -880,6 +909,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(1) {
+			$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();
 
@@ -915,8 +971,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')
@@ -924,6 +984,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(1) {
+			$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();
 
@@ -959,8 +1046,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();
@@ -993,6 +1083,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')
@@ -1011,6 +1103,8 @@ class SeedDMS_Core_DMS {
 //				"ORDER BY `statusDate` DESC";
 			break; // }}}
 		case 'RejectOwner': // Documents that has been rejected and I'm owning {{{
+			$queryStr .= "WHERE 1=1 ";
+
 			$user = $param1;
 			$orderby = $param3;
 			if($param4 == 'desc')
@@ -1027,6 +1121,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')
@@ -1055,13 +1151,53 @@ 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 ";
+
 			$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')
@@ -1078,7 +1214,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 545cdb4e32908452136483396c741f47323c1c64 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 11:51:45 +0100
Subject: [PATCH 075/308] backup dir can be set in configuration

---
 inc/inc.ClassSettings.php             |  4 +++
 op/op.Settings.php                    |  1 +
 out/out.BackupTools.php               |  7 +++++
 views/bootstrap/class.BackupTools.php | 44 +++++++++++++++------------
 views/bootstrap/class.Settings.php    |  4 +++
 5 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index e253030d7..bb7f503ea 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -89,6 +89,8 @@ class Settings { /* {{{ */
 	var $_luceneDir = null;
 	// Where the drop folders are located
 	var $_dropFolderDir = null;
+	// Where the backup directory is located
+	var $_backupDir = null;
 	// enable removal of file from dropfolder after success import
 	var $_removeFromDropFolder = false;
 	// Where the stop word file is located
@@ -467,6 +469,7 @@ class Settings { /* {{{ */
 		$this->_stagingDir = strval($tab["stagingDir"]);
 		$this->_luceneDir = strval($tab["luceneDir"]);
 		$this->_dropFolderDir = strval($tab["dropFolderDir"]);
+		$this->_backupDir = strval($tab["backupDir"]);
 		$this->_logFileEnable = Settings::boolVal($tab["logFileEnable"]);
 		$this->_logFileRotation = strval($tab["logFileRotation"]);
 		$this->_enableLargeFileUpload = Settings::boolVal($tab["enableLargeFileUpload"]);
@@ -779,6 +782,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, "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 7e9c89581..190227213 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -114,6 +114,7 @@ if ($action == "saveSettings")
   $settings->_luceneDir = addDirSep($_POST["luceneDir"]);
   $settings->_extraPath = addDirSep($_POST["extraPath"]);
   $settings->_dropFolderDir = addDirSep($_POST["dropFolderDir"]);
+  $settings->_backupDir = addDirSep($_POST["backupDir"]);
   $settings->_logFileEnable = getBoolValue("logFileEnable");
   $settings->_logFileRotation = $_POST["logFileRotation"];
   $settings->_enableLargeFileUpload = getBoolValue("enableLargeFileUpload");
diff --git a/out/out.BackupTools.php b/out/out.BackupTools.php
index a9cdbef56..3202da372 100644
--- a/out/out.BackupTools.php
+++ b/out/out.BackupTools.php
@@ -34,6 +34,13 @@ if (!$user->isAdmin()) {
 }
 
 if($view) {
+	if($settings->_backupDir && file_exists($settings->_backupDir)) {
+		$view->setParam('backupdir', $settings->_backupDir);
+		$view->setParam('hasbackupdir', true);
+	} else {
+		$view->setParam('backupdir', $settings->_contentDir);
+		$view->setParam('hasbackupdir', false);
+	}
 	$view($_GET);
 	exit;
 }
diff --git a/views/bootstrap/class.BackupTools.php b/views/bootstrap/class.BackupTools.php
index 911da6a19..f9b28b892 100644
--- a/views/bootstrap/class.BackupTools.php
+++ b/views/bootstrap/class.BackupTools.php
@@ -42,24 +42,29 @@ 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();
 		$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($contentdir));
-		$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,9 +75,8 @@ 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";
-
+		$this->contentContainerStart();
 		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>";
@@ -81,10 +85,10 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 
 		// list backup files
 
-		$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;
 		}
@@ -113,8 +117,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";	
@@ -128,18 +132,18 @@ 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";
 
 		// list backup files
-		$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;
 		}
@@ -160,9 +164,11 @@ 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>".getLongReadableDate(filectime($contentdir.$entry))."</td>\n";
-				print "<td>".SeedDMS_Core_File::format_filesize(filesize($contentdir.$entry))."</td>\n";
+				print "<td>";
+				print "<a href=\"../op/op.Download.php?dumpname=".$entry."\">".$entry."</a>";
+				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>";
 				print "</td>\n";	
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 7eba8eff8..befb7fc08 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -398,6 +398,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_contentDir");?>:</td>
         <td><?php $this->showTextField("contentDir", $settings->_contentDir); ?></td>
       </tr>
+      <tr title="<?php printMLText("settings_backupDir_desc");?>">
+        <td><?php printMLText("settings_backupDir");?>:</td>
+        <td><?php $this->showTextField("backupDir", $settings->_backupDir); ?></td>
+      </tr>
       <tr title="<?php printMLText("settings_cacheDir_desc");?>">
         <td><?php printMLText("settings_cacheDir");?>:</td>
         <td><?php $this->showTextField("cacheDir", $settings->_cacheDir); ?></td>

From 1d8743fd7fa39967cda60bbe4db6d50153ce5fff Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 17:12:58 +0100
Subject: [PATCH 076/308] handle 'from' propperly, even if it contains a time

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

diff --git a/op/op.EditEvent.php b/op/op.EditEvent.php
index b287e40ae..55dc8cf84 100644
--- a/op/op.EditEvent.php
+++ b/op/op.EditEvent.php
@@ -61,7 +61,8 @@ else
 	$comment = $_POST["comment"];
 
 if(isset($_POST["from"])) {
-	$tmp = explode('-', $_POST["from"]);
+	$from = explode('T', $_POST["from"]);
+	$tmp = explode('-', $from[0]);
 	$from = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]);
 } else {
 	UI::exitError(getMLText("edit_event"),getMLText("error_occured"));

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 077/308] 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 1d21c18aa3cfed0f253cec53c1bcd16d8a13dc69 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 17:34:24 +0100
Subject: [PATCH 078/308] commands for creating previews can be set

---
 op/op.Settings.php                 | 24 ++++++++++++++++++------
 views/bootstrap/class.Settings.php | 27 ++++++++++++++++++++++-----
 2 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/op/op.Settings.php b/op/op.Settings.php
index 190227213..bffefec43 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -194,12 +194,24 @@ if ($action == "saveSettings")
   $settings->_maxExecutionTime = intval($_POST["maxExecutionTime"]);
   $settings->_cmdTimeout = (intval($_POST["cmdTimeout"]) > 0) ?intval($_POST["cmdTimeout"]) : 1;
 
-  // SETTINGS - ADVANCED - INDEX CMD
-	$settings->_converters['fulltext'] = $_POST["converters"];
-	$newmimetype = preg_replace('#[^A-Za-z0-9_/+.*-]+#', '', $_POST["converters_newmimetype"]);
-  if($newmimetype && trim($_POST["converters_newcmd"])) {
-    $settings->_converters['fulltext'][$newmimetype] = trim($_POST["converters_newcmd"]);
-  }
+	// SETTINGS - ADVANCED - INDEX CMD
+	if(isset($_POST["converters"]["fulltext"]))
+		$settings->_converters['fulltext'] = $_POST["converters"]["fulltext"];
+	else
+		$settings->_converters['fulltext'] = $_POST["converters"];
+	$newmimetype = preg_replace('#[^A-Za-z0-9_/+.*-]+#', '', $settings->_converters["fulltext"]["newmimetype"]);
+	if($newmimetype && trim($settings->_converters['fulltext']['newcmd']))
+		$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"];
+	$newmimetype = preg_replace('#[^A-Za-z0-9_/+.*-]+#', '', $settings->_converters["preview"]["newmimetype"]);
+	if($newmimetype && trim($settings->_converters['preview']['newcmd']))
+		$settings->_converters['preview'][$newmimetype] = trim($settings->_converters['preview']['newcmd']);
+	unset($settings->_converters['preview']['newmimetype']);
+	unset($settings->_converters['preview']['newcmd']);
 
   // SETTINGS - EXTENSIONS
   $settings->_extensions = isset($_POST["extensions"]) ? $_POST["extensions"] : array();
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index befb7fc08..cd258805e 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -740,20 +740,37 @@ if(!is_writeable($settings->_configFilePath)) {
 ?>
       <tr title="<?php echo $mimetype;?>">
         <td><?php echo $mimetype;?>:</td>
-        <td><?php $this->showTextField("converters[".$mimetype."]", htmlspecialchars($cmd)); ?></td>
+        <td><?php $this->showTextField("converters[fulltext][".$mimetype."]", htmlspecialchars($cmd)); ?></td>
       </tr>
 <?php
 	}
 ?>
       <tr title="">
-        <td><?php $this->showTextField("converters_newmimetype", "", '', getMLText('mimetype')); ?></td>
-        <td><?php $this->showTextField("converters_newcmd", "", '', getMLText('command')); ?></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
+	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="">
+        <td><?php $this->showTextField("converters[preview][newmimetype]", "", '', getMLText('mimetype')); ?>:</td>
+        <td><?php $this->showTextField("converters[preview][newcmd]", "", '', getMLText('command')); ?></td>
       </tr>
     </table>
 <?php		$this->contentContainerEnd(); ?>
   </div>
 
-	  <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">
       <!--
@@ -762,7 +779,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 26d8c08ce92fb7afea676b9f0ae7b7efc84fe98e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 18:12:58 +0100
Subject: [PATCH 079/308] add converters for pdf output

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

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

From 8e73d88e8e3f2022bd7a1b8e3f8f25f8853b2485 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Nov 2017 13:50:24 +0100
Subject: [PATCH 080/308] hasConverter() checks if cmd is actually set

---
 SeedDMS_Preview/Preview/Base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Preview/Preview/Base.php b/SeedDMS_Preview/Preview/Base.php
index 25a36cdee..e09470330 100644
--- a/SeedDMS_Preview/Preview/Base.php
+++ b/SeedDMS_Preview/Preview/Base.php
@@ -113,7 +113,7 @@ class SeedDMS_Preview_Base {
 	 * @return boolean true if converter exists, otherwise false
 	 */
 	function hasConverter($mimetype) { /* {{{ */
-		return array_key_exists($mimetype, $this->converters);
+		return array_key_exists($mimetype, $this->converters) && $this->converters[$mimetype];
 	} /* }}} */
 
 }

From 59be3c3598bc383b6ab385670cbd9eefef863288 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Nov 2017 13:52:24 +0100
Subject: [PATCH 081/308] start new version 1.2.5, add default converter for
 images

---
 SeedDMS_Preview/Preview/PdfPreviewer.php |  6 +++---
 SeedDMS_Preview/package.xml              | 20 ++++++++++++++++++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Preview/Preview/PdfPreviewer.php b/SeedDMS_Preview/Preview/PdfPreviewer.php
index 99294584f..458611e98 100644
--- a/SeedDMS_Preview/Preview/PdfPreviewer.php
+++ b/SeedDMS_Preview/Preview/PdfPreviewer.php
@@ -35,9 +35,9 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base {
 			'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'",
+			'image/jpeg' => "convert '%f' pdf:- > '%o'",
+			'image/png' => "convert '%f' pdf:- > '%o'",
+			'image/gif' => "convert '%f' pdf:- > '%o'",
 		);
 	} /* }}} */
 
diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index 5e1e50990..208170a4e 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -14,7 +14,7 @@
  <date>2017-10-11</date>
  <time>07:14:32</time>
  <version>
-  <release>1.2.4</release>
+  <release>1.2.5</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>
-fix typo in converter for tar.gz files
+SeedDMS_Preview_Base::hasConvertert() returns only try if command is set
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -303,5 +303,21 @@ pass mimetype as parameter '%m' to converter
 createPreview() returns false if running the converter command fails
    </notes>
   </release>
+  <release>
+   <date>2017-10-11</date>
+   <time>07:14:32</time>
+   <version>
+    <release>1.2.4</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>
+fix typo in converter for tar.gz files
+   </notes>
+  </release>
  </changelog>
 </package>

From 54ae8b33aa5c82c787a449a62a167fc052746dcb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Nov 2017 13:53:06 +0100
Subject: [PATCH 082/308] set pdfconverters from settings

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

diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index cd5b1ae66..d63e96c54 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -73,6 +73,8 @@ 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('pdfConverters', $settings->_converters['pdf']);
 	$view->setParam('showFullPreview', $settings->_showFullPreview);
 	$view->setParam('convertToPdf', $settings->_convertToPdf);
 	$view->setParam('currenttab', isset($_GET['currenttab']) ? $_GET['currenttab'] : "");

From 313054e1cb3a9a6f1f30064f5fb7219fa1f195d6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Nov 2017 13:53:30 +0100
Subject: [PATCH 083/308] set pdf converters

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

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index f7988f496..69b01f2e4 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -331,6 +331,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$timeout = $this->params['timeout'];
 		$showfullpreview = $this->params['showFullPreview'];
 		$converttopdf = $this->params['convertToPdf'];
+		$pdfconverters = $this->params['pdfConverters'];
 		$cachedir = $this->params['cachedir'];
 		if(!$showfullpreview)
 			return;
@@ -380,6 +381,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 		if($converttopdf) {
 			$pdfpreviewer = new SeedDMS_Preview_PdfPreviewer($cachedir, $timeout);
+			$pdfpreviewer->setConverters($pdfconverters);
 			if($pdfpreviewer->hasConverter($latestContent->getMimeType())) {
 				$this->contentHeading(getMLText("preview"));
 ?>
@@ -402,6 +404,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$cachedir = $this->params['cachedir'];
 		$previewwidthlist = $this->params['previewWidthList'];
 		$previewwidthdetail = $this->params['previewWidthDetail'];
+		$previewconverters = $this->params['previewConverters'];
+		$pdfconverters = $this->params['pdfConverters'];
 		$documentid = $document->getId();
 		$currenttab = $this->params['currenttab'];
 		$timeout = $this->params['timeout'];
@@ -534,6 +538,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		print "</ul>";
 		*/
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout);
+		$previewer->setConverters($previewconverters);
 		$previewer->createPreview($latestContent);
 		if ($file_exists) {
 			if ($viewonlinefiletypes && in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes)) {

From 6cf40f8312c4bc23e8d81e3d0a48c2376e6a66ed Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Nov 2017 15:28:09 +0100
Subject: [PATCH 084/308] add preview for videos

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

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 69b01f2e4..5031aaf1b 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -354,6 +354,14 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			<audio controls style="width: 100%;">
 			<source  src="../op/op.ViewOnline.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" type="audio/mpeg">
 			</audio>
+	<?php
+				break;
+			case 'video/mp4':
+				$this->contentHeading(getMLText("preview"));
+	?>
+			<video controls style="width: 100%;">
+			<source  src="../op/op.ViewOnline.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" type="video/mp4">
+			</video>
 	<?php
 				break;
 			case 'application/pdf':
@@ -383,7 +391,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			$pdfpreviewer = new SeedDMS_Preview_PdfPreviewer($cachedir, $timeout);
 			$pdfpreviewer->setConverters($pdfconverters);
 			if($pdfpreviewer->hasConverter($latestContent->getMimeType())) {
-				$this->contentHeading(getMLText("preview"));
+				$this->contentHeading(getMLText("preview_pdf"));
 ?>
 				<iframe src="../pdfviewer/web/viewer.html?file=<?php echo urlencode('../../op/op.PdfPreview.php?documentid='.$document->getID().'&version='.$latestContent->getVersion()); ?>" width="100%" height="700px"></iframe>
 <?php

From 68a6904f70e2c238bad0e19aa3a10a9d5c1e8395 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Nov 2017 15:28:28 +0100
Subject: [PATCH 085/308] add converter for mp4 videos

---
 SeedDMS_Preview/Preview/PdfPreviewer.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Preview/Preview/PdfPreviewer.php b/SeedDMS_Preview/Preview/PdfPreviewer.php
index 458611e98..3b563b334 100644
--- a/SeedDMS_Preview/Preview/PdfPreviewer.php
+++ b/SeedDMS_Preview/Preview/PdfPreviewer.php
@@ -38,6 +38,7 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base {
 			'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 67ed00787fd7405c3e2bc831ed0f7228614393a8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Nov 2017 15:30:42 +0100
Subject: [PATCH 086/308] major update of slovak, various changes in other
 languages

---
 languages/ar_EG/lang.inc |   4 +-
 languages/bg_BG/lang.inc |  10 +-
 languages/ca_ES/lang.inc |   4 +-
 languages/cs_CZ/lang.inc |   4 +-
 languages/de_DE/lang.inc |   6 +-
 languages/el_GR/lang.inc |  12 +-
 languages/en_GB/lang.inc |   6 +-
 languages/es_ES/lang.inc |   8 +-
 languages/fr_FR/lang.inc |  24 +-
 languages/hr_HR/lang.inc |   4 +-
 languages/hu_HU/lang.inc |  10 +-
 languages/it_IT/lang.inc |   4 +-
 languages/ko_KR/lang.inc |   4 +-
 languages/nl_NL/lang.inc |   8 +-
 languages/pl_PL/lang.inc |   4 +-
 languages/pt_BR/lang.inc |  10 +-
 languages/ro_RO/lang.inc |   8 +-
 languages/ru_RU/lang.inc |   4 +-
 languages/sk_SK/lang.inc | 988 ++++++++++++++++++++-------------------
 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 +-
 24 files changed, 595 insertions(+), 547 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index b807e969b..ed0de30e6 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -537,6 +537,7 @@ URL: [url]',
 'fullsearch' => 'البحث النصي الكامل',
 'fullsearch_hint' => 'استخدم فهرس النص الكامل',
 'fulltextsearch_disabled' => '',
+'fulltext_converters' => 'فهرس تحويل المستند',
 'fulltext_info' => 'معلومات فهرس النص الكامل',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'سمات',
@@ -575,7 +576,6 @@ URL: [url]',
 'include_documents' => 'اشمل مستندات',
 'include_subdirectories' => 'اشمل مجلدات فرعية',
 'indexing_tasks_in_queue' => '',
-'index_converters' => 'فهرس تحويل المستند',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'ﻒﻫﺮﺳﺓ ﺎﻠﻤﺠﻟﺩ',
@@ -831,6 +831,7 @@ URL: [url]',
 'password_strength' => 'قوة كلمة السر',
 'password_strength_insuffient' => 'قوة كلمة السر غير كافية',
 'password_wrong' => 'كلمة سر خاطئة',
+'pdf_converters' => '',
 'pending_approvals' => '',
 'pending_receipt' => '',
 'pending_reviews' => '',
@@ -844,6 +845,7 @@ URL: [url]',
 'preview_converters' => '',
 'preview_images' => '',
 'preview_markdown' => '',
+'preview_pdf' => '',
 'preview_plain' => '',
 'previous_state' => 'حالة سابقة',
 'previous_versions' => 'اصدارات سابقة',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 60bfb5cab..2055e99f7 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/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 (836)
+//    Translators: Admin (838)
 
 $text = array(
 '2_factor_auth' => '',
@@ -297,7 +297,7 @@ $text = array(
 'documentcontent' => '',
 'documents' => 'Документи',
 'documents_checked_out_by_you' => '',
-'documents_expired' => '',
+'documents_expired' => 'просрочени документи',
 'documents_in_process' => 'Документи в процес на работа',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Документи, блокирани от Вас',
@@ -416,7 +416,7 @@ $text = array(
 'exclude_items' => '',
 'expired' => 'Изтекъл',
 'expired_at_date' => '',
-'expired_documents' => '',
+'expired_documents' => 'просрочени документи',
 'expires' => 'Изтича',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -468,6 +468,7 @@ $text = array(
 'fullsearch' => 'Пълнотекстово търсене',
 'fullsearch_hint' => 'Използвай пълнотекстов индекс',
 'fulltextsearch_disabled' => '',
+'fulltext_converters' => 'Index document conversion',
 'fulltext_info' => 'Информация за пълнотекстов индексе',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'атрибути',
@@ -506,7 +507,6 @@ $text = array(
 'include_documents' => 'Включи документи',
 'include_subdirectories' => 'Включи под-папки',
 'indexing_tasks_in_queue' => '',
-'index_converters' => 'Index document conversion',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Индекс на директорията',
@@ -732,6 +732,7 @@ $text = array(
 'password_strength' => 'Устойчивост на паролата',
 'password_strength_insuffient' => 'Недостатъчна устойчивост на паролата',
 'password_wrong' => 'Грешна парола',
+'pdf_converters' => '',
 'pending_approvals' => '',
 'pending_receipt' => '',
 'pending_reviews' => '',
@@ -745,6 +746,7 @@ $text = array(
 'preview_converters' => '',
 'preview_images' => '',
 'preview_markdown' => '',
+'preview_pdf' => '',
 'preview_plain' => '',
 'previous_state' => 'Предишно състояние',
 'previous_versions' => 'Предишни версии',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 48cebbf54..bbbf9099c 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -473,6 +473,7 @@ URL: [url]',
 'fullsearch' => 'Cerca full-text',
 'fullsearch_hint' => '',
 'fulltextsearch_disabled' => '',
+'fulltext_converters' => '',
 'fulltext_info' => 'Informació de full-text',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Atributs',
@@ -511,7 +512,6 @@ URL: [url]',
 'include_documents' => 'Incloure documents',
 'include_subdirectories' => 'Incloure subdirectoris',
 'indexing_tasks_in_queue' => '',
-'index_converters' => '',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Carpeta d\'índex',
@@ -737,6 +737,7 @@ URL: [url]',
 'password_strength' => '',
 'password_strength_insuffient' => '',
 'password_wrong' => '',
+'pdf_converters' => '',
 'pending_approvals' => '',
 'pending_receipt' => '',
 'pending_reviews' => '',
@@ -750,6 +751,7 @@ URL: [url]',
 'preview_converters' => '',
 'preview_images' => '',
 'preview_markdown' => '',
+'preview_pdf' => '',
 'preview_plain' => '',
 'previous_state' => '',
 'previous_versions' => 'Versions anteriors',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 2eb9f5826..f0b09beba 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -544,6 +544,7 @@ URL: [url]',
 'fullsearch' => 'Fulltextové vyhledávání',
 'fullsearch_hint' => 'Použijte fultext index',
 'fulltextsearch_disabled' => '',
+'fulltext_converters' => 'Index konverze dokumentu',
 'fulltext_info' => 'Fulltext index info',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Atributy',
@@ -582,7 +583,6 @@ URL: [url]',
 'include_documents' => 'Včetně dokumentů',
 'include_subdirectories' => 'Včetně podadresářů',
 'indexing_tasks_in_queue' => 'Indexování úkolů ve frontě',
-'index_converters' => 'Index konverze dokumentu',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Složka indexu',
@@ -842,6 +842,7 @@ Pokud budete mít problém s přihlášením i po změně hesla, kontaktujte Adm
 'password_strength' => 'Síla hesla',
 'password_strength_insuffient' => 'Nedostatečná síla hesla',
 'password_wrong' => 'Špatné heslo',
+'pdf_converters' => '',
 'pending_approvals' => '',
 'pending_receipt' => '',
 'pending_reviews' => '',
@@ -855,6 +856,7 @@ Pokud budete mít problém s přihlášením i po změně hesla, kontaktujte Adm
 'preview_converters' => '',
 'preview_images' => '',
 'preview_markdown' => '',
+'preview_pdf' => '',
 'preview_plain' => '',
 'previous_state' => 'Předchozí stav',
 'previous_versions' => 'Předešlé verze',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 3192f1cf7..198e6f816 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 (2487), dgrutsch (22)
+//    Translators: Admin (2489), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -555,6 +555,7 @@ URL: [url]',
 'fullsearch' => 'Volltext',
 'fullsearch_hint' => 'Volltextindex benutzen',
 'fulltextsearch_disabled' => 'Volltext-Index ist ausgeschaltet',
+'fulltext_converters' => 'Index Dokumentenumwandlung',
 'fulltext_info' => 'Volltext-Index Info',
 'global_attributedefinitiongroups' => 'Attributgruppen',
 'global_attributedefinitions' => 'Attribute',
@@ -593,7 +594,6 @@ URL: [url]',
 'include_documents' => 'Dokumente miteinbeziehen',
 'include_subdirectories' => 'Unterverzeichnisse miteinbeziehen',
 'indexing_tasks_in_queue' => 'Indiziervorgänge in der Warteschleife',
-'index_converters' => 'Index Dokumentenumwandlung',
 'index_done' => 'Fertig',
 'index_error' => 'Fehler',
 'index_folder' => 'Indiziere Ordner',
@@ -856,6 +856,7 @@ Sollen Sie danach immer noch Problem bei der Anmeldung haben, dann kontaktieren
 'password_strength' => 'Passwortstärke',
 'password_strength_insuffient' => 'Ungenügend starkes Passwort',
 'password_wrong' => 'Falsches Passwort',
+'pdf_converters' => 'PDF Konvertierer',
 'pending_approvals' => 'Ausstehende Freigaben',
 'pending_receipt' => 'Ausstehende Empfangsbestätigungen',
 'pending_reviews' => 'Ausstehende Prüfungen',
@@ -869,6 +870,7 @@ Sollen Sie danach immer noch Problem bei der Anmeldung haben, dann kontaktieren
 'preview_converters' => 'Vorschau Dokumentenumwandlung',
 'preview_images' => 'Vorschaubilder',
 'preview_markdown' => 'Markdown',
+'preview_pdf' => 'Vorschau als PDF',
 'preview_plain' => 'Text',
 'previous_state' => 'Voriger Status',
 'previous_versions' => 'Vorhergehende Versionen',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index ee60eb7de..a885ce1b1 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/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 (226)
+//    Translators: Admin (229)
 
 $text = array(
 '2_factor_auth' => '',
@@ -251,7 +251,7 @@ $text = array(
 'confirm_rm_dump' => '',
 'confirm_rm_event' => '',
 'confirm_rm_file' => '',
-'confirm_rm_folder' => '',
+'confirm_rm_folder' => 'Θέλετε πραγματικα να διαγράψετε το Φάκελο [foldername] kκαι το περιεχόμενό του? ΠΡΟΣΟΧΗ!!! Αυτη η λειτουργία δεν μπορεί να ανακληθεί.',
 'confirm_rm_folder_files' => '',
 'confirm_rm_group' => '',
 'confirm_rm_log' => '',
@@ -468,6 +468,7 @@ $text = array(
 'fullsearch' => 'Πλήρης αναζήτηση (full text)',
 'fullsearch_hint' => '',
 'fulltextsearch_disabled' => '',
+'fulltext_converters' => '',
 'fulltext_info' => '',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Ιδιότητες',
@@ -506,7 +507,6 @@ $text = array(
 'include_documents' => '',
 'include_subdirectories' => '',
 'indexing_tasks_in_queue' => '',
-'index_converters' => '',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Ταξινόμηση φακέλου',
@@ -743,6 +743,7 @@ URL: [url]',
 'password_strength' => '',
 'password_strength_insuffient' => '',
 'password_wrong' => '',
+'pdf_converters' => '',
 'pending_approvals' => '',
 'pending_receipt' => '',
 'pending_reviews' => '',
@@ -756,6 +757,7 @@ URL: [url]',
 'preview_converters' => '',
 'preview_images' => '',
 'preview_markdown' => '',
+'preview_pdf' => '',
 'preview_plain' => '',
 'previous_state' => '',
 'previous_versions' => '',
@@ -1299,7 +1301,7 @@ URL: [url]',
 'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => '',
 'splash_rm_attribute' => '',
-'splash_rm_document' => '',
+'splash_rm_document' => 'Το έγγραφο αφαιρέθηκε',
 'splash_rm_download_link' => '',
 'splash_rm_folder' => '',
 'splash_rm_group' => '',
@@ -1319,7 +1321,7 @@ URL: [url]',
 'splash_transfer_objects' => '',
 'state_and_next_state' => '',
 'statistic' => '',
-'status' => '',
+'status' => 'κατάσταση',
 'status_approval_rejected' => '',
 'status_approved' => '',
 'status_approver_removed' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 6d2259b71..25cfd5746 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 (1615), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1617), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -556,6 +556,7 @@ URL: [url]',
 'fullsearch' => 'Full text search',
 'fullsearch_hint' => 'Use fulltext index',
 'fulltextsearch_disabled' => 'Fulltext index is disabled',
+'fulltext_converters' => 'Index document conversion',
 'fulltext_info' => 'Fulltext index info',
 'global_attributedefinitiongroups' => 'Attribute groups',
 'global_attributedefinitions' => 'Attributes',
@@ -594,7 +595,6 @@ URL: [url]',
 'include_documents' => 'Include documents',
 'include_subdirectories' => 'Include subdirectories',
 'indexing_tasks_in_queue' => 'Indexing tasks in queue',
-'index_converters' => 'Index document conversion',
 'index_done' => 'Done',
 'index_error' => 'Error',
 'index_folder' => 'Index folder',
@@ -858,6 +858,7 @@ If you have still problems to login, then please contact your administrator.',
 'password_strength' => 'Password strength',
 'password_strength_insuffient' => 'Insufficient password strength',
 'password_wrong' => 'Wrong password',
+'pdf_converters' => 'PDF converters',
 'pending_approvals' => 'Pending approvals',
 'pending_receipt' => 'Pending receipts',
 'pending_reviews' => 'Pending reviews',
@@ -871,6 +872,7 @@ If you have still problems to login, then please contact your administrator.',
 'preview_converters' => 'Preview document conversion',
 'preview_images' => 'Preview images',
 'preview_markdown' => 'Markdown',
+'preview_pdf' => 'Preview as PDF',
 'preview_plain' => 'Text',
 'previous_state' => 'Previous state',
 'previous_versions' => 'Previous versions',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index e8a5409cc..065781104 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 (1041), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1042), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -544,6 +544,7 @@ URL: [url]',
 'fullsearch' => 'Búsqueda en texto completo',
 'fullsearch_hint' => 'Utilizar índice de texto completo',
 'fulltextsearch_disabled' => '',
+'fulltext_converters' => 'Conversión de índice de documentos',
 'fulltext_info' => 'Información de índice de texto completo',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Definición de atributos',
@@ -582,7 +583,6 @@ URL: [url]',
 'include_documents' => 'Incluir documentos',
 'include_subdirectories' => 'Incluir subcarpetas',
 'indexing_tasks_in_queue' => 'Tareas de indexación en cola',
-'index_converters' => 'Conversión de índice de documentos',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Índice de carpetas',
@@ -846,6 +846,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado
 'password_strength' => 'Fortaleza de la contraseña',
 'password_strength_insuffient' => 'Insuficiente Seguridad de la contraseña',
 'password_wrong' => 'Contraseña incorrecta',
+'pdf_converters' => '',
 'pending_approvals' => '',
 'pending_receipt' => '',
 'pending_reviews' => '',
@@ -859,6 +860,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado
 'preview_converters' => '',
 'preview_images' => '',
 'preview_markdown' => '',
+'preview_pdf' => '',
 'preview_plain' => '',
 'previous_state' => 'Estado anterior',
 'previous_versions' => 'Versiones anteriores',
@@ -1214,7 +1216,7 @@ URL: [url]',
 'settings_enableUpdateReceipt' => '',
 'settings_enableUpdateReceipt_desc' => '',
 'settings_enableUpdateRevApp' => 'Permitir edición de revisión/aprobación existente',
-'settings_enableUpdateRevApp_desc' => '',
+'settings_enableUpdateRevApp_desc' => 'Habilite si el usuario que ha hecho la revisión/aprobación puede cambiar de decisión siempre que el flujo de trabajo no haya culminado.',
 'settings_enableUserImage' => 'Habilitar imágenes de usuario',
 'settings_enableUserImage_desc' => 'Habilitar imágenes de usuario',
 'settings_enableUsersView' => 'Habilitar vista de usuarios',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index e6f48cf9b..b95a8f499 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 (1065), jeromerobert (50), lonnnew (9), Oudiceval (465)
+//    Translators: Admin (1065), jeromerobert (50), lonnnew (9), Oudiceval (474)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -324,7 +324,7 @@ URL: [url]',
 'documentcontent' => 'Version de document',
 'documents' => 'Documents',
 'documents_checked_out_by_you' => 'Documents bloqués par vous',
-'documents_expired' => 'Documents périmés',
+'documents_expired' => 'Documents expirés',
 'documents_in_process' => 'Documents en cours',
 'documents_locked' => 'Documents verrouillés',
 'documents_locked_by_you' => 'Documents verrouillés',
@@ -447,7 +447,7 @@ Le lien est valide jusqu’au [valid].
 'edit_folder_notify' => 'Liste de notification de dossiers',
 'edit_folder_props' => 'Modifier le dossier',
 'edit_group' => 'Modifier un groupe',
-'edit_online' => '',
+'edit_online' => 'Modification en ligne',
 'edit_transmittal_props' => '',
 'edit_user' => 'Modifier un utilisateur',
 'edit_user_details' => 'Modifier les détails d\'utilisateur',
@@ -480,7 +480,7 @@ Le lien est valide jusqu’au [valid].
 'exclude_items' => 'Exclure des élements',
 'expired' => 'Expiré',
 'expired_at_date' => 'Expiré le [datetime]',
-'expired_documents' => '',
+'expired_documents' => 'Documents expirés',
 'expires' => 'Expiration',
 'expire_by_date' => 'Expire à une date',
 'expire_in_1d' => 'Expire dans 1 jour',
@@ -556,6 +556,7 @@ URL: [url]',
 'fullsearch' => 'Recherche dans le contenu',
 'fullsearch_hint' => 'Utiliser la recherche plein texte',
 'fulltextsearch_disabled' => 'La recherche plein texte est désactivée.',
+'fulltext_converters' => 'Conversion des documents pour indexation',
 'fulltext_info' => 'Information sur l\'index plein texte',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Définitions d\'attributs',
@@ -594,7 +595,6 @@ URL: [url]',
 'include_documents' => 'Inclure les documents',
 'include_subdirectories' => 'Inclure les sous-dossiers',
 'indexing_tasks_in_queue' => 'Opérations d’indexation en attente',
-'index_converters' => 'Conversion des documents pour indexation',
 'index_done' => 'Terminé',
 'index_error' => 'Erreur',
 'index_folder' => 'Dossier Index',
@@ -856,6 +856,7 @@ En cas de problème persistant, veuillez contacter votre administrateur.',
 'password_strength' => 'Fiabilité du mot de passe',
 'password_strength_insuffient' => 'Mot de passe trop faible',
 'password_wrong' => 'Mauvais mot de passe',
+'pdf_converters' => '',
 'pending_approvals' => 'Approbations en attente',
 'pending_receipt' => 'Réceptions en attente',
 'pending_reviews' => 'Vérifications en attente',
@@ -869,6 +870,7 @@ En cas de problème persistant, veuillez contacter votre administrateur.',
 'preview_converters' => '',
 'preview_images' => 'Miniatures',
 'preview_markdown' => 'Prévisualisation',
+'preview_pdf' => '',
 'preview_plain' => 'Texte',
 'previous_state' => 'État précédent',
 'previous_versions' => 'Versions précédentes',
@@ -1030,7 +1032,7 @@ URL : [url]',
 'role_info' => '',
 'role_management' => 'Gestion des rôles',
 'role_name' => 'Nom',
-'role_type' => '',
+'role_type' => 'Type de rôle',
 'role_user' => 'Utilisateur',
 'ro_RO' => 'Roumain',
 'run_subworkflow' => 'Lancer le sous-workflow',
@@ -1334,16 +1336,16 @@ Nom : [username]
 'settings_presetExpirationDate_desc' => 'La date d\'expiration de tous les nouveaux documents sera égale à cette valeur. La date peut être renseignée au format PHP strtotime(), par exemple +5 weeks',
 'settings_previewWidthDetail' => 'Largeur des vignettes (vue détaillée)',
 'settings_previewWidthDetail_desc' => 'Largeur des vignettes affichées sur la vue détaillée',
-'settings_previewWidthDropFolderList' => '',
-'settings_previewWidthDropFolderList_desc' => '',
+'settings_previewWidthDropFolderList' => 'Largeur des vignettes (liste du dossier de dépôt)',
+'settings_previewWidthDropFolderList_desc' => 'Largeur des vignettes affichées dans la liste lors de la sélection d’un fichier du dossier de dépôt.',
 'settings_previewWidthList' => 'Largeur des vignettes (vue liste)',
 'settings_previewWidthList_desc' => 'Largeur des vignettes affichées dans les listes',
-'settings_previewWidthMenuList' => '',
-'settings_previewWidthMenuList_desc' => '',
+'settings_previewWidthMenuList' => 'Largeur des vignettes (menu Dossier de dépôt)',
+'settings_previewWidthMenuList_desc' => 'Largeur des vignettes affichées dans le menu déroulant « Dossier de dépôt ».',
 'settings_printDisclaimer' => 'Afficher la clause de non-responsabilité',
 'settings_printDisclaimer_desc' => 'Si activé, le message d’avertissement sera affiché en bas de chaque page.',
 'settings_quota' => 'Quota de l\'utilisateur',
-'settings_quota_desc' => 'Le maximum de bytes qu\'un utilisateur peut utiliser sur le disque. Définir à 0 pour un espace illimité. Cette valeur peut être outrepasser pour chaque utilisation dans son profile.',
+'settings_quota_desc' => 'Espace maximum (en octets) qu’un utilisateur peut occuper sur le disque. Définir à 0 pour un espace illimité. Une valeur spécifique peut être définie par utilisateur depuis son profil.',
 'settings_removeFromDropFolder' => 'Supprimer le fichier du dossier de dépôt après un chargement réussi',
 'settings_removeFromDropFolder_desc' => 'Activez ceci si un fichier pris du dossier de dépôt doit être supprimé après un upload réussi.',
 'settings_restricted' => 'Accès restreint',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 9db446471..c1e95d077 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -549,6 +549,7 @@ Internet poveznica: [url]',
 'fullsearch' => 'Pretraživanje cijelog teksta',
 'fullsearch_hint' => 'Koristi indeks cijelog teksta',
 'fulltextsearch_disabled' => '',
+'fulltext_converters' => 'Pretvorba indeksa dokumenta',
 'fulltext_info' => 'Informacije cijelog teksta',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Atributi',
@@ -587,7 +588,6 @@ Internet poveznica: [url]',
 'include_documents' => 'Sadrži dokumente',
 'include_subdirectories' => 'Sadrži podmape',
 'indexing_tasks_in_queue' => '',
-'index_converters' => 'Pretvorba indeksa dokumenta',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Mapa indeksa',
@@ -850,6 +850,7 @@ Ako i dalje imate problema s prijavom, molimo kontaktirajte Vašeg administrator
 'password_strength' => 'Jačina lozinke',
 'password_strength_insuffient' => 'Nedovoljna jačina lozinke',
 'password_wrong' => 'Pogrešna lozinka',
+'pdf_converters' => '',
 'pending_approvals' => '',
 'pending_receipt' => '',
 'pending_reviews' => '',
@@ -863,6 +864,7 @@ Ako i dalje imate problema s prijavom, molimo kontaktirajte Vašeg administrator
 'preview_converters' => 'Pretpregled konverzije dokumenta',
 'preview_images' => '',
 'preview_markdown' => 'Smanjenje',
+'preview_pdf' => '',
 'preview_plain' => 'Obični tekst',
 'previous_state' => 'Prethodni status',
 'previous_versions' => 'Prethodne verzije',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 8a85bc519..278f5f637 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 (619), ribaz (1023)
+//    Translators: Admin (621), ribaz (1023)
 
 $text = array(
 '2_factor_auth' => '',
@@ -544,6 +544,7 @@ URL: [url]',
 'fullsearch' => 'Keresés a teljes szövegben',
 'fullsearch_hint' => 'Használja a teljes szöveg indexet',
 'fulltextsearch_disabled' => '',
+'fulltext_converters' => 'Index dokumentum konverzió',
 'fulltext_info' => 'Teljes szöveg index információ',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Jellemzők',
@@ -582,7 +583,6 @@ URL: [url]',
 'include_documents' => 'Tartalmazó dokumentumok',
 'include_subdirectories' => 'Tartalmazó alkönyvtárak',
 'indexing_tasks_in_queue' => '',
-'index_converters' => 'Index dokumentum konverzió',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Mappa indexelése',
@@ -846,6 +846,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'password_strength' => 'Jelszó erősség',
 'password_strength_insuffient' => 'Jelszó erőssége elégtelen',
 'password_wrong' => 'Hibás jelszó',
+'pdf_converters' => '',
 'pending_approvals' => '',
 'pending_receipt' => '',
 'pending_reviews' => '',
@@ -859,6 +860,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'preview_converters' => '',
 'preview_images' => '',
 'preview_markdown' => '',
+'preview_pdf' => '',
 'preview_plain' => '',
 'previous_state' => 'Előző állapot',
 'previous_versions' => 'Előző változatok',
@@ -1530,8 +1532,8 @@ URL: [url]',
 'toggle_manager' => 'Kulcs kezelő',
 'toggle_qrcode' => '',
 'to_before_from' => 'A lejárati dátum nem előzheti meg a kezdési dátumot',
-'transfer_objects' => '',
-'transfer_objects_to_user' => '',
+'transfer_objects' => 'Adatok átadása',
+'transfer_objects_to_user' => 'Új tulajdonos',
 'transition_triggered_email' => 'Munkamenet átmenet kiváltva',
 'transition_triggered_email_body' => 'Munkafolyamat átmenet kiváltva
 Dokumentum: [name]
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 39a5a82a9..404f76d06 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -550,6 +550,7 @@ URL: [url]',
 'fullsearch' => 'Ricerca Fulltext',
 'fullsearch_hint' => 'Usa l\'indice fulltext',
 'fulltextsearch_disabled' => '',
+'fulltext_converters' => 'Indice di conversione documenti',
 'fulltext_info' => 'Info indice Fulltext',
 'global_attributedefinitiongroups' => 'Attributo gruppi',
 'global_attributedefinitions' => 'Definizione attributi',
@@ -588,7 +589,6 @@ URL: [url]',
 'include_documents' => 'Includi documenti',
 'include_subdirectories' => 'Includi sottocartelle',
 'indexing_tasks_in_queue' => 'Operazione di indicizzazione in corso',
-'index_converters' => 'Indice di conversione documenti',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Indicizza cartella',
@@ -852,6 +852,7 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di
 'password_strength' => 'Sicurezza password',
 'password_strength_insuffient' => 'Efficacia della password insufficiente',
 'password_wrong' => 'Password errata',
+'pdf_converters' => '',
 'pending_approvals' => 'Approvazioni in sospeso',
 'pending_receipt' => '',
 'pending_reviews' => 'In attesa di recensioni',
@@ -865,6 +866,7 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di
 'preview_converters' => 'Anteprima convesione documento',
 'preview_images' => '',
 'preview_markdown' => 'Riduione ribasso',
+'preview_pdf' => '',
 'preview_plain' => 'Testo',
 'previous_state' => 'Stato precedente',
 'previous_versions' => 'Versioni precedenti',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index aaca1d95a..ca418a9c0 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -550,6 +550,7 @@ URL: [url]',
 'fullsearch' => '전체 텍스트 검색',
 'fullsearch_hint' => '전체 텍스트 색인 사용',
 'fulltextsearch_disabled' => '',
+'fulltext_converters' => '인덱스 문서 변환',
 'fulltext_info' => '전체 텍스트 색인 정보',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => '속성',
@@ -588,7 +589,6 @@ URL: [url]',
 'include_documents' => '문서 포함',
 'include_subdirectories' => '하위 디렉터리 포함',
 'indexing_tasks_in_queue' => '큐에서 대기중인 색인 작업들',
-'index_converters' => '인덱스 문서 변환',
 'index_done' => '마침',
 'index_error' => '오류',
 'index_folder' => '인덱스 폴더',
@@ -844,6 +844,7 @@ URL : [url]',
 'password_strength' => '강력한 비밀번호',
 'password_strength_insuffient' => '부족한 비밀번호 강도',
 'password_wrong' => '잘못된 비밀번호',
+'pdf_converters' => '',
 'pending_approvals' => '보류된 승인',
 'pending_receipt' => '',
 'pending_reviews' => '보류된 검토',
@@ -857,6 +858,7 @@ URL : [url]',
 'preview_converters' => '문서 변환 미리보기',
 'preview_images' => '',
 'preview_markdown' => '마크다운',
+'preview_pdf' => '',
 'preview_plain' => '텍스트',
 'previous_state' => '이전 상태',
 'previous_versions' => '이전 버전',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 5157a814b..d3bfaa9b2 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 (739), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (740), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 '2_factor_auth' => '',
@@ -542,6 +542,7 @@ URL: [url]',
 'fullsearch' => 'Zoek in volledige tekst',
 'fullsearch_hint' => 'Volledige tekst index',
 'fulltextsearch_disabled' => '',
+'fulltext_converters' => 'Index document conversie',
 'fulltext_info' => 'Volledige tekst index info',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Kenmerk definities',
@@ -580,7 +581,6 @@ URL: [url]',
 'include_documents' => 'Inclusief documenten',
 'include_subdirectories' => 'Inclusief submappen',
 'indexing_tasks_in_queue' => 'Indexerings taken in wachtrij',
-'index_converters' => 'Index document conversie',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Inhoud',
@@ -844,6 +844,7 @@ Mocht u de komende minuten geen email ontvangen, probeer het dan nogmaals en con
 'password_strength' => 'Sterkte wachtwoord',
 'password_strength_insuffient' => 'Onvoldoende sterk wachtwoord',
 'password_wrong' => 'Verkeerd wachtwoord',
+'pdf_converters' => '',
 'pending_approvals' => 'Wachten op goedkeuring',
 'pending_receipt' => '',
 'pending_reviews' => 'Wachten op beoordeling',
@@ -857,6 +858,7 @@ Mocht u de komende minuten geen email ontvangen, probeer het dan nogmaals en con
 'preview_converters' => 'Converters',
 'preview_images' => '',
 'preview_markdown' => 'Voorbeeld in Markdown',
+'preview_pdf' => '',
 'preview_plain' => 'Voorbeeld in platte tekst',
 'previous_state' => 'Vorige staat',
 'previous_versions' => 'Vorige versies',
@@ -1119,7 +1121,7 @@ URL: [url]',
  => ,
  => ,
  =>',
-'settings_available_languages' => '',
+'settings_available_languages' => 'Beschikbare talen',
 'settings_available_languages_desc' => '',
 'settings_backupDir' => 'Instellingen backupmap',
 'settings_backupDir_desc' => 'Instellingen backupmap',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index a2475b1b4..2f75e8b34 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -537,6 +537,7 @@ URL: [url]',
 'fullsearch' => 'Przeszukiwanie treści dokumentów',
 'fullsearch_hint' => 'Przeszukuj treść dokumentów',
 'fulltextsearch_disabled' => '',
+'fulltext_converters' => 'Konwersja indeksu dokumentów',
 'fulltext_info' => 'Informacje o indeksie pełnotekstowym',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Definicje atrybutów',
@@ -575,7 +576,6 @@ URL: [url]',
 'include_documents' => 'Uwzględnij dokumenty',
 'include_subdirectories' => 'Uwzględnij podkatalogi',
 'indexing_tasks_in_queue' => 'Zadanie indeksowania w kolejce',
-'index_converters' => 'Konwersja indeksu dokumentów',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Indeksuj folder',
@@ -839,6 +839,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem
 'password_strength' => 'Siła hasła',
 'password_strength_insuffient' => 'Niewystarczająca siła hasła',
 'password_wrong' => 'Złe hasło',
+'pdf_converters' => '',
 'pending_approvals' => '',
 'pending_receipt' => '',
 'pending_reviews' => '',
@@ -852,6 +853,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem
 'preview_converters' => '',
 'preview_images' => '',
 'preview_markdown' => '',
+'preview_pdf' => '',
 'preview_plain' => '',
 'previous_state' => 'Poprzedni stan',
 'previous_versions' => 'Poprzednie wersje',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 335bcd25e..8d7920a1c 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 (963), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (965), flaviove (627), lfcristofoli (352)
 
 $text = array(
 '2_factor_auth' => '',
@@ -330,7 +330,7 @@ URL: [url]',
 'documents_to_review' => 'Documents Awaiting User\'s Review',
 'documents_to_revise' => '',
 'documents_user_reception' => '',
-'documents_user_rejected' => '',
+'documents_user_rejected' => 'Documentos rejeitados',
 'documents_user_requiring_attention' => 'Documents Owned by User That Require Attention',
 'documents_with_notification' => '',
 'document_already_checkedout' => '',
@@ -459,7 +459,7 @@ URL: [url]',
 'error_no_folder_selected' => 'Nenhuma pasta selecionada',
 'error_occured' => 'Ocorreu um erro',
 'error_remove_document' => '',
-'error_remove_folder' => '',
+'error_remove_folder' => 'Erro na exclusão da pasta',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => 'Espanhol',
@@ -543,6 +543,7 @@ URL: [url]',
 'fullsearch' => 'Pesquisa de texto completo',
 'fullsearch_hint' => 'Use índice de texto completo',
 'fulltextsearch_disabled' => '',
+'fulltext_converters' => 'Índice de conversão de documentos',
 'fulltext_info' => 'Informações índice Texto completo',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Atributos',
@@ -581,7 +582,6 @@ URL: [url]',
 'include_documents' => 'Include documents',
 'include_subdirectories' => 'Include subdirectories',
 'indexing_tasks_in_queue' => 'Tarefas de indexação em fila',
-'index_converters' => 'Índice de conversão de documentos',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Pasta Raiz',
@@ -844,6 +844,7 @@ Se você ainda tiver problemas para fazer o login, por favor, contate o administ
 'password_strength' => 'Força da senha',
 'password_strength_insuffient' => 'A força da senha é insuficiente',
 'password_wrong' => 'Senha errada',
+'pdf_converters' => '',
 'pending_approvals' => '',
 'pending_receipt' => '',
 'pending_reviews' => '',
@@ -857,6 +858,7 @@ Se você ainda tiver problemas para fazer o login, por favor, contate o administ
 'preview_converters' => '',
 'preview_images' => '',
 'preview_markdown' => '',
+'preview_pdf' => '',
 'preview_plain' => '',
 'previous_state' => 'Estado anterior',
 'previous_versions' => 'Previous Versions',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 0cdfd130d..611f28bee 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 (1066), balan (87)
+//    Translators: Admin (1067), balan (87)
 
 $text = array(
 '2_factor_auth' => '',
@@ -324,7 +324,7 @@ URL: [url]',
 'documentcontent' => 'Continut Document',
 'documents' => 'Documente',
 'documents_checked_out_by_you' => 'Documente verificate de tine',
-'documents_expired' => '',
+'documents_expired' => 'Documente expirate',
 'documents_in_process' => 'Documente în procesare',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Documente blocate de tine',
@@ -549,6 +549,7 @@ URL: [url]',
 'fullsearch' => 'Căutare text complet',
 'fullsearch_hint' => 'Foloseste indexarea intregului text',
 'fulltextsearch_disabled' => '',
+'fulltext_converters' => 'Indexare conversie documente',
 'fulltext_info' => 'Info indexarea intregului text',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Atribute',
@@ -587,7 +588,6 @@ URL: [url]',
 'include_documents' => 'Include documente',
 'include_subdirectories' => 'Include subfoldere',
 'indexing_tasks_in_queue' => 'Actiuni de indexare in stiva',
-'index_converters' => 'Indexare conversie documente',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Index folder',
@@ -851,6 +851,7 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț
 'password_strength' => 'Siguranța parolei',
 'password_strength_insuffient' => 'Siguranța parolei este insuficientă',
 'password_wrong' => 'Parolă greșită',
+'pdf_converters' => '',
 'pending_approvals' => '',
 'pending_receipt' => '',
 'pending_reviews' => '',
@@ -864,6 +865,7 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț
 'preview_converters' => '',
 'preview_images' => '',
 'preview_markdown' => '',
+'preview_pdf' => '',
 'preview_plain' => '',
 'previous_state' => 'Stare precedentă',
 'previous_versions' => 'Versiune precedentă',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 1efdcc22a..82f717236 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -549,6 +549,7 @@ URL: [url]',
 'fullsearch' => 'Полнотекстовый поиск',
 'fullsearch_hint' => 'Использовать полнотекстовый индекс',
 'fulltextsearch_disabled' => '',
+'fulltext_converters' => 'Индексирование документов',
 'fulltext_info' => 'Информация о полнотекстовом индексе',
 'global_attributedefinitiongroups' => 'Глобальные группы атрибутов',
 'global_attributedefinitions' => 'Атрибуты',
@@ -587,7 +588,6 @@ URL: [url]',
 'include_documents' => 'Включая документы',
 'include_subdirectories' => 'Включая подкаталоги',
 'indexing_tasks_in_queue' => 'Задача индексирования поставлена в очередь',
-'index_converters' => 'Индексирование документов',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Полнотекстовый индекс',
@@ -848,6 +848,7 @@ URL: [url]',
 'password_strength' => 'Надёжность пароля',
 'password_strength_insuffient' => 'Недостаточная надёжность пароля',
 'password_wrong' => 'Неверный пароль',
+'pdf_converters' => '',
 'pending_approvals' => 'В ожидании утверждения',
 'pending_receipt' => '',
 'pending_reviews' => 'В ожидании рецензии',
@@ -861,6 +862,7 @@ URL: [url]',
 'preview_converters' => 'Предварительный просмотр конвертации документа',
 'preview_images' => '',
 'preview_markdown' => 'Markdown',
+'preview_pdf' => '',
 'preview_plain' => 'Текст',
 'previous_state' => 'Предыдущее состояние',
 'previous_versions' => 'Предыдущие версии',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index a1a15dac1..3db9ceb02 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -19,14 +19,14 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (553), destinqo (19)
+//    Translators: Admin (553), destinqo (19), pS2017 (508)
 
 $text = array(
-'2_factor_auth' => '',
+'2_factor_auth' => '2-faktorové overovanie',
 '2_factor_auth_info' => '',
-'2_fact_auth_secret' => '',
+'2_fact_auth_secret' => 'Tajný',
 'accept' => 'Prijať',
-'access_control' => '',
+'access_control' => 'Kontrola prístupu',
 'access_control_is_off' => '',
 'access_denied' => 'Prístup zamietnutý.',
 'access_inheritance' => 'Dedičnosť prístupu',
@@ -65,19 +65,19 @@ URL: [url]',
 '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_receipt' => 'Potvrďte príjem',
 'add_review' => 'Poslať kontrolu',
-'add_revision' => '',
-'add_role' => '',
+'add_revision' => 'Pridať schválenie',
+'add_role' => 'Pridať novú rolu',
 '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' => '',
-'add_workflow' => '',
-'add_workflow_action' => '',
-'add_workflow_state' => '',
+'add_user_to_group' => 'Pridať používateľa do skupiny',
+'add_workflow' => 'Pridať nový pracovný postup',
+'add_workflow_action' => 'Pridať novú akciu pracovného postupu',
+'add_workflow_state' => 'Pridať nový stav pracovného postupu',
 'admin' => 'Správca',
 'admin_tools' => 'Nástroje správcu',
 'all' => 'Všetko',
@@ -85,7 +85,7 @@ URL: [url]',
 'all_documents' => 'Všetky dokumenty',
 'all_pages' => 'Všetky',
 'all_users' => 'Všetci používatelia',
-'already_subscribed' => '',
+'already_subscribed' => 'Už ste sa prihlásili na odber',
 'and' => 'a',
 'apply' => 'Použiť',
 'approvals_accepted' => '',
@@ -123,53 +123,53 @@ URL: [url]',
 'assign_user_property_to' => 'Assign user\'s properties to',
 'assumed_released' => 'Pokladá sa za zverejnené',
 'attrdefgroup_management' => '',
-'attrdefgrp_show_detail' => '',
-'attrdefgrp_show_list' => '',
-'attrdefgrp_show_search' => '',
-'attrdefgrp_show_searchlist' => '',
+'attrdefgrp_show_detail' => 'Detaily',
+'attrdefgrp_show_list' => 'Zoznam',
+'attrdefgrp_show_search' => 'Hľadať',
+'attrdefgrp_show_searchlist' => 'Výsledok hľadania',
 'attrdef_exists' => '',
 'attrdef_info' => 'Informácia',
 'attrdef_in_use' => '',
 'attrdef_management' => '',
-'attrdef_maxvalues' => '',
-'attrdef_minvalues' => '',
+'attrdef_maxvalues' => 'Max. počet hodnôt',
+'attrdef_minvalues' => 'Min. počet hodnôt',
 'attrdef_min_greater_max' => '',
 'attrdef_multiple' => '',
 'attrdef_multiple_needs_valueset' => '',
-'attrdef_must_be_multiple' => '',
+'attrdef_must_be_multiple' => 'Atribút musí mať viac ako jednu hodnotu, ale nie je nastavená viacnásobná hodnota',
 'attrdef_name' => 'Meno',
-'attrdef_noname' => '',
+'attrdef_noname' => 'Chýba názov definície atribútu',
 'attrdef_objtype' => 'Typ objektu',
-'attrdef_regex' => '',
-'attrdef_type' => '',
-'attrdef_type_boolean' => '',
+'attrdef_regex' => 'Regulárny výraz',
+'attrdef_type' => 'Typ',
+'attrdef_type_boolean' => 'Boolean',
 'attrdef_type_date' => 'Dátum',
-'attrdef_type_email' => '',
-'attrdef_type_float' => '',
-'attrdef_type_int' => '',
-'attrdef_type_string' => '',
-'attrdef_type_url' => '',
-'attrdef_valueset' => '',
-'attributes' => '',
-'attribute_changed_email_body' => '',
-'attribute_changed_email_subject' => '',
-'attribute_count' => '',
-'attribute_value' => '',
-'attribute_value_not_in_valueset' => '',
-'attr_malformed_boolean' => '',
-'attr_malformed_date' => '',
-'attr_malformed_email' => '',
-'attr_malformed_float' => '',
-'attr_malformed_int' => '',
-'attr_malformed_url' => '',
-'attr_max_values' => '',
+'attrdef_type_email' => 'E-mail',
+'attrdef_type_float' => 'Float',
+'attrdef_type_int' => 'Integer',
+'attrdef_type_string' => 'String',
+'attrdef_type_url' => 'URL',
+'attrdef_valueset' => 'Nastaviť hodnoty',
+'attributes' => 'Atribúty',
+'attribute_changed_email_body' => 'Zmenené atribúty Dokumentu: [name] Vezia: [version] Atribút: [attribute] Nadradená zložka: [folder_path] Používateľ: [username] URL: [url]',
+'attribute_changed_email_subject' => '[sitename]: [name] - Atribút sa zmenil',
+'attribute_count' => 'Počet použití',
+'attribute_value' => 'Hodnota atribútu',
+'attribute_value_not_in_valueset' => 'Hodnota nie je nastavená',
+'attr_malformed_boolean' => 'Hodnota atribútu \'[value]\' z atribútu \'[attrname]\' nie je platný boolean.',
+'attr_malformed_date' => 'Hodnota atribútu \'[value]\' v atribúte \'[attrname]\' nie je platný date.',
+'attr_malformed_email' => 'Hodnota atribútu \'[value]\' v atribúte \'[attrname]\' nie je platná URL.',
+'attr_malformed_float' => 'Hodnota atribútu \'[value]\' v atribúte \'[attrname]\' nie je platný float.',
+'attr_malformed_int' => 'Hodnota atribútu \'[value]\' v atribúte \'[attrname]\' nie je platný integer.',
+'attr_malformed_url' => 'Hodnota atribútu \'[value]\' v atribúte \'[attrname]\' nie je platná URL.',
+'attr_max_values' => 'Je prekročený maximálny počet požadovaných hodnôt pre atribút [attrname].',
 'attr_min_values' => '',
 'attr_not_in_valueset' => '',
 'attr_no_regex_match' => '',
 'attr_validation_error' => '',
 'at_least_n_users_of_group' => '',
 'august' => 'August',
-'authentication' => '',
+'authentication' => 'Overenie pravosti',
 'author' => 'Autor',
 'automatic_status_update' => 'Automaticka zmena stavu',
 'back' => 'Prejsť späť',
@@ -181,74 +181,74 @@ URL: [url]',
 'bg_BG' => 'Bulharsky',
 'browse' => 'Prehľadávať',
 'calendar' => 'Kalendár',
-'calendar_week' => '',
+'calendar_week' => 'Kalendárny týždeň',
 'cancel' => 'Zrušiť',
 'cannot_assign_invalid_state' => 'Nie je možné prideliť schvaľovateľov dokumentu, ktorý nečaká na kontrolu alebo schválenie.',
 'cannot_change_final_states' => 'Upozornenie: Nebolo možné zmeniť stav dokumentov, ktoré boli odmietnuté, označené ako zastaralé alebo platnosť vypršala.',
-'cannot_delete_user' => '',
-'cannot_delete_yourself' => '',
+'cannot_delete_user' => 'Nie je možné odstrániť používateľa',
+'cannot_delete_yourself' => 'Vás nie je možné odstrániť',
 'cannot_move_root' => 'Chyba: Nie je možné presunúť koreňovú zložku.',
 'cannot_retrieve_approval_snapshot' => 'Nie je možné získať informáciu o stave schválenia tejto verzie dokumentu.',
 'cannot_retrieve_review_snapshot' => 'Nie je možné získať informáciu o stave kontroly tejto verzie dokumentu.',
 'cannot_rm_root' => 'Chyba: Nie je možné zmazať koreňovú zložku.',
 'categories' => 'Kategórie',
-'categories_loading' => '',
-'category' => '',
-'category_exists' => '',
-'category_filter' => '',
-'category_info' => '',
-'category_in_use' => '',
-'category_noname' => '',
+'categories_loading' => 'Počkajte, kým nebude načítaný zoznam kategórií ...',
+'category' => 'Kategória',
+'category_exists' => 'Kategória už existuje.',
+'category_filter' => 'Iba kategórie',
+'category_info' => 'Informácia',
+'category_in_use' => 'Táto kategória sa v súčasnosti používa v dokumentoch.',
+'category_noname' => 'Nebolo zadané žiadne meno kategórie.',
 'ca_ES' => 'Katalánština',
 'change_assignments' => 'Zmeniť úlohy',
-'change_password' => '',
-'change_password_message' => '',
-'change_recipients' => '',
-'change_revisors' => '',
+'change_password' => 'Zmeniť heslo',
+'change_password_message' => 'Vaše heslo bolo zmenené.',
+'change_recipients' => 'Nastaviť príjemcov',
+'change_revisors' => 'Nastaviť kontrolórov',
 'change_status' => 'Zmeniť stav',
 'charts' => 'Grafy',
 'chart_docsaccumulated_title' => 'Počet dokumentov',
 'chart_docspercategory_title' => 'Dokumenty podľa kategórie',
-'chart_docspermimetype_title' => '',
+'chart_docspermimetype_title' => 'Dokumenty podľa mime-type',
 'chart_docspermonth_title' => 'Nové dokumenty za mesiac',
 'chart_docsperstatus_title' => 'Dokumenty podľa stavu',
 'chart_docsperuser_title' => 'Dokumenty podľa používateľa',
 'chart_selection' => 'Vyber graf',
-'chart_sizeperuser_title' => '',
+'chart_sizeperuser_title' => 'Diskový priestor na používateľa',
 'checkedout_file_has_different_version' => '',
 'checkedout_file_has_disappeared' => '',
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '',
 'checkoutpath_does_not_exist' => '',
-'checkout_document' => '',
-'checkout_is_disabled' => '',
-'choose_attrdef' => '',
-'choose_attrdefgroup' => '',
+'checkout_document' => 'Pozrieť sa na dokument',
+'checkout_is_disabled' => 'Kontrola dokumentov je zakázaná v konfigurácii.',
+'choose_attrdef' => 'Vyberte prosím definíciu atribútu',
+'choose_attrdefgroup' => 'Vyberte skupinu atribútov',
 'choose_category' => 'Vyberte prosím',
 'choose_group' => 'Vyberte skupinu',
-'choose_role' => '',
-'choose_target_category' => '',
+'choose_role' => 'Vybrať rolu',
+'choose_target_category' => 'Vybrať kategóriu',
 'choose_target_document' => 'Vyberte dokument',
 'choose_target_file' => 'Vyberte súbor',
 'choose_target_folder' => 'Vyberte cieľovú zložku',
 'choose_user' => 'Vyberte používateľa',
-'choose_workflow' => '',
-'choose_workflow_action' => '',
-'choose_workflow_state' => '',
-'class_name' => '',
+'choose_workflow' => 'Vyprať pracovný postup',
+'choose_workflow_action' => 'Vybrať akciu pracovného postupu',
+'choose_workflow_state' => 'Vybrať stav pracovného postupu',
+'class_name' => 'Názov triedy',
 'clear_cache' => 'Vyčistiť pamäť cache',
-'clear_clipboard' => '',
-'clear_password' => '',
+'clear_clipboard' => 'Vymazať schránku',
+'clear_password' => 'Vymazať heslo',
 'clipboard' => 'Schránka',
 'close' => 'Zavrieť',
-'command' => '',
+'command' => 'Príkaz',
 'comment' => 'Komentár',
-'comment_changed_email' => '',
+'comment_changed_email' => 'Nepreložené',
 'comment_for_current_version' => 'Version comment',
-'confirm_clear_cache' => '',
-'confirm_create_fulltext_index' => '',
-'confirm_move_document' => '',
-'confirm_move_folder' => '',
+'confirm_clear_cache' => 'Chcete naozaj vyčistiť vyrovnávaciu pamäť? Tým sa odstránia všetky predbežne náhľady obrázkov.',
+'confirm_create_fulltext_index' => 'Áno, chcel by som obnoviť fullttext index!',
+'confirm_move_document' => 'Potvrďte presunutie dokumentu.',
+'confirm_move_folder' => 'Potvrďte presunutie zložky.',
 'confirm_pwd' => 'Potvrdenie hesla',
 'confirm_rm_backup' => 'Skutočne si prajete odstrániť zálohu "[arkname]"?<br>Buďte opatrní, táto akcia je nezvratná.',
 'confirm_rm_document' => 'Naozaj chcete odstrániť dokument \'[documentname]\'?<br>Buďte opatrní: Túto činnosť nemožno vrátiť späť.',
@@ -260,31 +260,31 @@ URL: [url]',
 '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_transmittal' => '',
-'confirm_rm_transmittalitem' => '',
+'confirm_rm_transmittalitem' => 'Potvrďte odstránenie',
 'confirm_rm_user' => 'Skutočne si prajete odstrániť používateľa "[username]"?<br>Buďte opatrní, táto akcia je nezvratná.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Naozaj chcete odstrániť verziu [version] dokumentu "[documentname]"?<br>Buďte opatrní: Túto činnosť nemožno vrátiť späť.',
 'confirm_transfer_objects' => '',
-'confirm_update_transmittalitem' => '',
+'confirm_update_transmittalitem' => 'Potvrdiť aktualizáciu',
 'content' => 'Obsah',
 'continue' => 'Pokračovať',
-'converter_new_cmd' => '',
-'converter_new_mimetype' => '',
+'converter_new_cmd' => 'Príkaz',
+'converter_new_mimetype' => 'Nový mime-type',
 'copied_to_checkout_as' => '',
-'create_download_link' => '',
+'create_download_link' => 'Vytvoriť odkaz na stiahnutie',
 'create_fulltext_index' => 'Vytvoriť fulltext index',
 'create_fulltext_index_warning' => '',
 'creation_date' => 'Vytvorené',
 'cs_CZ' => 'Čestina',
 'current_password' => '',
-'current_quota' => '',
-'current_state' => '',
+'current_quota' => 'Súčasná kvóta systému je nastavená na [quota].',
+'current_state' => 'Aktuálny stav',
 'current_version' => 'Aktuálna verzia',
 'daily' => 'Denná',
-'databasesearch' => '',
+'databasesearch' => 'Hľadať databázu',
 'date' => 'Dátum',
-'days' => '',
-'debug' => '',
+'days' => 'dní',
+'debug' => 'Ladiť',
 'december' => 'December',
 'default_access' => 'Štandardný režim prístupu',
 'default_keywords' => 'Dostupné kľúčové slová',
@@ -294,39 +294,39 @@ URL: [url]',
 'details_version' => 'Podrobnosti verzie: [version]',
 'de_DE' => 'Nemčina',
 'disclaimer' => 'Toto je zabezpečená zóna. Prístup je povolený len autorizovaným osobám.',
-'discspace' => '',
+'discspace' => 'Priestor na disku',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
 'document' => 'Dokument',
-'documentcontent' => '',
+'documentcontent' => 'Obsah dokumentu',
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
-'documents_expired' => '',
+'documents_expired' => 'Dokumenty, ktorým skončila platnosť',
 'documents_in_process' => 'Dokumenty v spracovaní',
-'documents_locked' => '',
+'documents_locked' => 'Zamknuté dokumenty',
 'documents_locked_by_you' => 'Vami uzamknuté dokumenty',
-'documents_only' => '',
+'documents_only' => 'Iba dokumenty',
 'documents_to_approve' => 'Dokumenty čakajúce na schválenie používateľa',
-'documents_to_process' => '',
+'documents_to_process' => 'Dokumenty, ktoré potrebujú spracovanie',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čakajúce na kontrolu používateľa',
-'documents_to_revise' => '',
-'documents_user_reception' => '',
-'documents_user_rejected' => '',
+'documents_to_revise' => 'Dokumenty čakajúce na vašu revíziu',
+'documents_user_reception' => 'Dokumenty čakajúce na prijatie',
+'documents_user_rejected' => 'Zamietnuté dokumenty',
 'documents_user_requiring_attention' => 'Dokumenty, ktoré používateľ vlastní a vyžadujú pozornosť',
-'documents_with_notification' => '',
+'documents_with_notification' => 'Dokumenty s upozornením',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Tento dokument je už zamknutý',
-'document_comment_changed_email' => '',
+'document_comment_changed_email' => 'Komentár sa zmenil',
 'document_comment_changed_email_body' => '',
-'document_comment_changed_email_subject' => '',
-'document_count' => '',
+'document_comment_changed_email_subject' => '[sitename]: [name] - Komentár sa zmenil',
+'document_count' => 'Počet dokumentov',
 'document_deleted' => 'Dokument zmazaný',
 'document_deleted_email' => 'Dokument zmazany',
-'document_deleted_email_body' => '',
-'document_deleted_email_subject' => '',
-'document_duplicate_name' => '',
-'document_has_no_workflow' => '',
+'document_deleted_email_body' => 'Dokument bol odstránený: [name] Nadradená zložka: [folder_path] Používateľ: [username]',
+'document_deleted_email_subject' => '[sitename]: [name] - Dokument bol zmazaný',
+'document_duplicate_name' => 'Duplicitný názov dokumentu',
+'document_has_no_workflow' => 'Dokument nemá pracovný postup',
 'document_infos' => 'Informácie o dokumente',
 'document_is_checked_out' => '',
 'document_is_not_locked' => 'Tento dokument nie je zamknutý',
@@ -334,43 +334,43 @@ URL: [url]',
 'document_link_public' => 'Verejný',
 'document_moved_email' => 'Dokument presunuty',
 'document_moved_email_body' => '',
-'document_moved_email_subject' => '',
+'document_moved_email_subject' => '[sitename]: [name] - Dokument bol presunutý',
 'document_not_checkedout' => '',
 'document_renamed_email' => 'Dokument premenovany',
-'document_renamed_email_body' => '',
-'document_renamed_email_subject' => '',
+'document_renamed_email_body' => 'Názov dokumentu zmenený Dokument: [name] Nadradená zložka: [folder_path] Starý názov: [old_name] Používateľ: [username] URL: [url]',
+'document_renamed_email_subject' => '[sitename]: [name] - Dokument bol premenovaný',
 'document_status_changed_email' => 'Stav dokumentu zmeneny',
 'document_status_changed_email_body' => '',
 'document_status_changed_email_subject' => '',
 'document_title' => 'Dokument \'[documentname]\'',
 'document_updated_email' => 'Dokument aktualizovany',
 'document_updated_email_body' => '',
-'document_updated_email_subject' => '',
+'document_updated_email_subject' => '[sitename]: [name] - Dokument bol aktualizovaný',
 'does_not_expire' => 'Platnosť nikdy nevyprší',
 'does_not_inherit_access_msg' => 'Zdediť prístup',
 'download' => 'Stiahnuť',
-'download_links' => '',
+'download_links' => 'Odkazy na stiahnutie',
 'download_link_email_body' => '',
-'download_link_email_subject' => '',
-'do_object_repair' => '',
-'do_object_setchecksum' => '',
-'do_object_setfilesize' => '',
-'do_object_unlink' => '',
-'draft' => '',
+'download_link_email_subject' => 'Odkaz na stiahnutie',
+'do_object_repair' => 'Opraviť všetky zložky a dokumenty.',
+'do_object_setchecksum' => 'Nastaviť kontrolný súčet',
+'do_object_setfilesize' => 'Nastaviť veľkosť súboru',
+'do_object_unlink' => 'Zmazať verziu dokumentu',
+'draft' => 'Návrh',
 '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',
 'dropfolderdir_missing' => '',
-'dropfolder_file' => '',
-'dropfolder_folder' => '',
+'dropfolder_file' => 'Súbor z drop zložky',
+'dropfolder_folder' => 'Zložka z drop zložky',
 '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',
-'duplicates' => '',
-'duplicate_content' => '',
+'duplicates' => 'Duplikáty',
+'duplicate_content' => 'Duplicitný obsah',
 'edit' => 'upraviť',
 'edit_attributes' => 'Uprav parametre',
 'edit_comment' => 'Upraviť komentár',
@@ -387,55 +387,55 @@ URL: [url]',
 'edit_folder_notify' => 'Zoznam upozornení',
 'edit_folder_props' => 'Uprav priečinok',
 'edit_group' => 'Upraviť skupinu',
-'edit_online' => '',
+'edit_online' => 'Upraviť online',
 'edit_transmittal_props' => '',
 'edit_user' => 'Upraviť používateľa',
 'edit_user_details' => 'Upraviť podrobnosti používateľa',
-'edit_version' => '',
+'edit_version' => 'Upraviť verziu',
 'el_GR' => 'Grécky',
 'email' => 'Email',
-'email_error_title' => '',
+'email_error_title' => 'Nebol zadaný žiadny E-mail',
 'email_footer' => 'Nastavenia e-mailu si kedykoľvek môžete zmeniť cez \'Môj účet\'',
 'email_header' => 'Toto je automatická správa od DMS servera.',
-'email_not_given' => '',
+'email_not_given' => 'Prosím, zadajte platnú emailovú adresu.',
 'empty_attribute_group_list' => '',
 'empty_folder_list' => 'Žiadne dokumenty alebo priečinky',
 'empty_notify_list' => 'Žiadne položky',
 'en_GB' => 'Angličtina (UK)',
-'equal_transition_states' => '',
+'equal_transition_states' => 'Začiatok a koniec sú rovnaké',
 'error' => 'Chyba',
 'error_add_aro' => '',
 'error_add_permission' => '',
-'error_cleared_cache' => '',
+'error_cleared_cache' => 'Chyba pri vymazaní vyrovnávacej pamäte',
 'error_importfs' => '',
-'error_no_document_selected' => '',
-'error_no_folder_selected' => '',
+'error_no_document_selected' => 'Nie je vybratý žiadny dokument',
+'error_no_folder_selected' => 'Nie je vybratá žiadna zložka',
 'error_occured' => 'Vyskytla sa chyba',
-'error_remove_document' => '',
-'error_remove_folder' => '',
-'error_remove_permission' => '',
-'error_toogle_permission' => '',
+'error_remove_document' => 'Pri odstraňovaní dokumentu sa vyskytla chyba',
+'error_remove_folder' => 'Pri odstraňovaní zložky sa vyskytla chyba',
+'error_remove_permission' => 'Chyba pri odstránení povolenia',
+'error_toogle_permission' => 'Chyba pri zmene povolenia',
 'es_ES' => 'Španielčina',
 'event_details' => 'Detail udalosti',
-'exclude_items' => '',
+'exclude_items' => 'Vylúčiť položky',
 'expired' => 'Platnosť vypršala',
-'expired_at_date' => '',
-'expired_documents' => '',
+'expired_at_date' => 'Platnosť vypršala [datetime]',
+'expired_documents' => 'Dokumenty, ktorým skončila platnosť',
 'expires' => 'Platnosť vyprší',
-'expire_by_date' => '',
-'expire_in_1d' => '',
-'expire_in_1h' => '',
-'expire_in_1m' => '',
-'expire_in_1w' => '',
-'expire_in_1y' => '',
-'expire_in_2h' => '',
-'expire_in_2y' => '',
-'expire_today' => '',
-'expire_tomorrow' => '',
+'expire_by_date' => 'Platnosť skončí podľa dátumu',
+'expire_in_1d' => 'Platnosť vyprší za 1 deň',
+'expire_in_1h' => 'Platnosť vyprší za 1 h',
+'expire_in_1m' => 'Platnosť vyprší za 1 mesiac',
+'expire_in_1w' => 'Platnosť vyprší za 1 týždeň',
+'expire_in_1y' => 'Platnosť vyprší za 1 rok',
+'expire_in_2h' => 'Platnosť vyprší za 2 h',
+'expire_in_2y' => 'Platnosť vyprší za 2 roky',
+'expire_today' => 'Platnosť vyprší dnes',
+'expire_tomorrow' => 'Platnosť vyprší zajtra',
 'expiry_changed_email' => 'Datum platnosti zmeneny',
 'expiry_changed_email_body' => '',
-'expiry_changed_email_subject' => '',
-'export' => '',
+'expiry_changed_email_subject' => '[sitename]: [name] - Dátum vypršania platnosti bol zmenený',
+'export' => 'Exportovať',
 'extension_manager' => 'Správa rozšírení',
 'february' => 'Február',
 'file' => 'Súbor',
@@ -444,47 +444,48 @@ URL: [url]',
 'files_deletion_warning' => 'Touto akciou môžete odstrániť celú DMS zložku. Verziovacie informácie zostanú viditeľné.',
 'files_loading' => 'Prosím počkajte, kým sa načíta zoznam súborov ...',
 'file_size' => 'Veľkosť súboru',
-'filter_for_documents' => '',
-'filter_for_folders' => '',
+'filter_for_documents' => 'Ďalší filter pre dokumenty',
+'filter_for_folders' => 'Ďalší filter pre zložky',
 'folder' => 'Zlozka',
 'folders' => 'Zložky',
 'folders_and_documents_statistic' => 'Prehľad zložiek a dokumentov',
-'folders_with_notification' => '',
-'folder_comment_changed_email' => '',
-'folder_comment_changed_email_body' => '',
-'folder_comment_changed_email_subject' => '',
+'folders_with_notification' => 'Zložky s upozornením',
+'folder_comment_changed_email' => 'Komentár sa zmenil',
+'folder_comment_changed_email_body' => 'Komentár zmenený pre Zložku: [name] Starý komentár: [old_comment] Komentár: [new_comment] Nadradená zložka: [folder_path] Používateľ: [username] URL: [url]',
+'folder_comment_changed_email_subject' => '[sitename]: [name] - Komentár zmenený',
 'folder_contents' => 'Obsah zložky',
 'folder_deleted_email' => 'Zlozka zmazana',
 'folder_deleted_email_body' => '',
-'folder_deleted_email_subject' => '',
+'folder_deleted_email_subject' => '[sitename]: [name] - Zložka bola odstránená',
 'folder_infos' => 'Informácie o zložke',
 'folder_moved_email' => 'Zlozka presunuta',
 'folder_moved_email_body' => '',
-'folder_moved_email_subject' => '',
+'folder_moved_email_subject' => '[sitename]: [name] - Zložka bola presunutá',
 'folder_renamed_email' => 'Zlozka premenovana',
-'folder_renamed_email_body' => '',
-'folder_renamed_email_subject' => '',
+'folder_renamed_email_body' => 'Zložka bola premenovaná Zložka: [name] Nadradená zložka: [folder_path] Starý názov: [old_name] Používateľ: [username] URL: [url]',
+'folder_renamed_email_subject' => '[sitename]: [name] - Zložka bola premenovaná',
 'folder_title' => 'Zložka \'[foldername]\'',
 'friday' => 'Piatok',
-'friday_abbr' => '',
+'friday_abbr' => 'Pia',
 'from' => 'Od',
 'fr_FR' => 'Francúzština',
 'fullsearch' => 'Fulltext index vyhľadávanie',
 'fullsearch_hint' => 'Použiť fulltext index',
-'fulltextsearch_disabled' => '',
+'fulltextsearch_disabled' => 'Fulltext index ze zakázaný',
+'fulltext_converters' => '',
 'fulltext_info' => 'Informácie o fulltext indexe',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Atribúty',
 'global_default_keywords' => 'Globálne kľúčové slová',
 'global_document_categories' => 'Kategórie',
-'global_workflows' => '',
+'global_workflows' => 'Pracovný postup',
 'global_workflow_actions' => '',
 'global_workflow_states' => '',
 'group' => 'Skupina',
 'groups' => 'Skupiny',
 'group_approval_summary' => 'Zhrnutie skupinového schválenia',
 'group_exists' => 'Skupina už existuje.',
-'group_info' => '',
+'group_info' => 'Informácie o skupine',
 'group_management' => 'Skupiny',
 'group_members' => 'Členovia skupiny',
 'group_receipt_summary' => '',
@@ -493,31 +494,30 @@ URL: [url]',
 'guest_login_disabled' => 'Prihlásenie ako hosť je vypnuté.',
 'hash' => '',
 'help' => 'Pomoc',
-'home_folder' => '',
+'home_folder' => 'Domovská zložka',
 'hook_name' => '',
-'hourly' => '',
-'hours' => '',
+'hourly' => 'Hodiny',
+'hours' => 'hodiny',
 'hr_HR' => 'Chorváčtina',
 'human_readable' => 'Použivateľský archív',
 'hu_HU' => 'Maďarčina',
 'id' => 'ID',
 'identical_version' => '',
-'import' => '',
-'importfs' => '',
+'import' => 'Importovať',
+'importfs' => 'Importovať zo súborového systému',
 'import_fs' => 'Importovanie zo súborového systému',
 'import_fs_warning' => '',
-'include_content' => '',
+'include_content' => 'Zahrnúť obsah',
 'include_documents' => 'Vrátane súborov',
 'include_subdirectories' => 'Vrátane podzložiek',
 'indexing_tasks_in_queue' => '',
-'index_converters' => '',
-'index_done' => '',
-'index_error' => '',
+'index_done' => 'Hotovo',
+'index_error' => 'Chyba',
 'index_folder' => 'Indexovať zložku',
 'index_pending' => '',
-'index_waiting' => '',
+'index_waiting' => 'Čakajte',
 'individuals' => 'Jednotlivci',
-'indivіduals_in_groups' => '',
+'indivіduals_in_groups' => 'Členovia skupiny',
 'inherited' => 'zdedené',
 'inherits_access_copy_msg' => 'Skopírovať zdedený zoznam riadenia prístupu',
 'inherits_access_empty_msg' => 'Založiť nový zoznam riadenia prístupu',
@@ -545,20 +545,20 @@ URL: [url]',
 'invalid_target_folder' => 'Neplatné cieľové ID zložky',
 'invalid_user_id' => 'Neplatné ID používateľa',
 'invalid_version' => 'Neplatná verzia dokumentu',
-'in_folder' => '',
-'in_revision' => '',
-'in_workflow' => '',
-'is_disabled' => '',
+'in_folder' => 'V',
+'in_revision' => 'V revízií',
+'in_workflow' => 'V pracovnom postupe',
+'is_disabled' => 'Zakázať účet',
 'is_hidden' => 'Nezobrazovať v zozname používateľov',
 'it_IT' => 'Taliančina',
 'january' => 'Január',
 'js_form_error' => '',
 'js_form_errors' => '',
-'js_invalid_email' => '',
+'js_invalid_email' => 'E-mailová adresa je neplatná',
 'js_no_approval_group' => 'Prosím, vyberte skupinu pre schválenie',
 'js_no_approval_status' => 'Prosím, vyberte stav schválenia',
 'js_no_comment' => 'Žiadny komentár',
-'js_no_currentpwd' => '',
+'js_no_currentpwd' => 'Zadajte svoje aktuálne heslo',
 'js_no_email' => 'Napíšte svoju emailovú adresu',
 'js_no_file' => 'Prosím, vyberte súbor',
 'js_no_keywords' => 'Zadajte nejaké kľúčové slová',
@@ -575,24 +575,24 @@ URL: [url]',
 'js_unequal_passwords' => '',
 'july' => 'Júl',
 'june' => 'Jún',
-'keep' => '',
-'keep_doc_status' => '',
+'keep' => 'Nemeňte',
+'keep_doc_status' => 'Zachovať stav dokumentu',
 'keywords' => 'Kľúčové slová',
 'keywords_loading' => 'Prosím počkajte, kým sa načíta zoznam kľúčových slov ...',
 'keyword_exists' => 'Kľúčové slovo už existuje',
 'ko_KR' => 'Kórejčina',
 'language' => 'Jazyk',
-'lastaccess' => '',
+'lastaccess' => 'Posledný prístup',
 'last_update' => 'Posledná aktualizácia',
-'legend' => '',
-'librarydoc' => '',
+'legend' => 'Legenda',
+'librarydoc' => 'Dokument z knižnice',
 'linked_documents' => 'Súvisiace dokumenty',
 'linked_files' => 'Prílohy',
-'linked_to_current_version' => '',
-'linked_to_document' => '',
-'linked_to_this_version' => '',
+'linked_to_current_version' => 'Prepojené s aktuálnou verziou',
+'linked_to_document' => 'Prepojené s dokumentom',
+'linked_to_this_version' => 'Prepojené s touto verziou',
 'link_alt_updatedocument' => '',
-'link_to_version' => '',
+'link_to_version' => 'Pripojiť k verzii',
 'list_access_rights' => 'Uveďte všetky prístupové práva',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
@@ -601,9 +601,9 @@ URL: [url]',
 'lock_document' => 'Zamknúť',
 'lock_message' => 'Tento dokument zamkol [username]. Iba oprávnení používatelia ho môžu odomknúť (pozri koniec stránky).',
 'lock_status' => 'Stav',
-'login' => '',
+'login' => 'Prihlásiť sa',
 'login_disabled_text' => 'Vaše konto bolo zakázané, pravdepodobne veľa pokusov o prihlásenie zlyhalo.',
-'login_disabled_title' => '',
+'login_disabled_title' => 'Účet je zakázaný',
 'login_error_text' => 'Chyba pri prihlasovaní. ID používateľa alebo heslo je nesprávne.',
 'login_error_title' => 'Chyba pri prihlasovaní',
 'login_not_given' => 'Nebolo zadané používateľské meno',
@@ -611,7 +611,7 @@ URL: [url]',
 'logout' => 'Odhlásenie',
 'log_management' => 'Správa protokolov',
 'manager' => 'Manager',
-'manager_of_group' => '',
+'manager_of_group' => 'Ste správcom tejto skupiny',
 'mandatory_approvergroups' => '',
 'mandatory_approvergroup_no_access' => '',
 'mandatory_approvers' => '',
@@ -623,59 +623,59 @@ URL: [url]',
 'march' => 'Marec',
 'max_upload_size' => 'Maximálna veľkosť každého súboru',
 'may' => 'Máj',
-'menu_dropfolder' => '',
-'mimetype' => '',
-'minutes' => '',
+'menu_dropfolder' => 'Drop zložka',
+'mimetype' => 'Mime typ',
+'minutes' => 'minúty',
 'misc' => 'Rôzne',
 'missing_checksum' => '',
-'missing_file' => '',
-'missing_filesize' => '',
+'missing_file' => 'Chýba súbor',
+'missing_filesize' => 'Chýba veľkosť súboru',
 'missing_reception' => '',
 'missing_request_object' => '',
 'missing_transition_user_group' => '',
 'monday' => 'Pondelok',
-'monday_abbr' => '',
-'monthly' => '',
+'monday_abbr' => 'Po',
+'monthly' => 'Mesačne',
 'month_view' => 'Mesiac',
 'move' => 'Presunúť',
-'move_clipboard' => '',
+'move_clipboard' => 'Presunúť schránku',
 'move_document' => 'Presunúť dokument',
 'move_folder' => 'Presunúť zložku',
 'my_account' => 'Môj účet',
 'my_documents' => 'Moje dokumenty',
 'my_transmittals' => '',
 'name' => 'Meno',
-'needs_workflow_action' => '',
-'network_drive' => '',
-'never' => '',
+'needs_workflow_action' => 'Tento dokument si vyžaduje vašu pozornosť. Skontrolujte kartu pracovného postupu.',
+'network_drive' => 'Sieťová jednotka',
+'never' => 'nikdy',
 'new' => 'Nove',
-'new_attrdef' => '',
+'new_attrdef' => 'Pridať definíciu atribútu',
 'new_default_keywords' => 'Pridať kľúčové slová',
 'new_default_keyword_category' => 'Pridať kategóriu',
 'new_document_category' => 'Pridať kategóriu',
 'new_document_email' => 'Novy dokument',
 'new_document_email_body' => '',
-'new_document_email_subject' => '',
+'new_document_email_subject' => '[sitename]: [folder_name] - Nový dokument',
 'new_file_email' => 'Nova priloha',
 'new_file_email_body' => '',
-'new_file_email_subject' => '',
-'new_folder' => '',
-'new_password' => '',
+'new_file_email_subject' => '[sitename]: [document] - Nová príloha',
+'new_folder' => 'Nová zložka',
+'new_password' => 'Nové heslo',
 'new_subfolder_email' => 'Nova zlozka',
 'new_subfolder_email_body' => '',
-'new_subfolder_email_subject' => '',
+'new_subfolder_email_subject' => '[sitename]: [name] - Nová zložka',
 'new_user_image' => 'Nový obrázok',
-'next_state' => '',
+'next_state' => 'Nový stav',
 'nl_NL' => 'Holandština',
 'no' => 'Nie',
 'notify_added_email' => 'Boli ste pridani do notifikacneho zoznamu',
 'notify_added_email_body' => '',
-'notify_added_email_subject' => '',
+'notify_added_email_subject' => '[sitename]: [name] - Pridané do zoznamu oznámení',
 'notify_deleted_email' => 'Boli ste odstraneni do notifikacneho zoznamu',
 'notify_deleted_email_body' => '',
 'notify_deleted_email_subject' => '',
 'november' => 'November',
-'now' => '',
+'now' => 'teraz',
 'no_action' => 'Nič sa nevykoná',
 'no_approval_needed' => '',
 'no_attached_files' => 'Žiadne prílohy',
@@ -683,10 +683,10 @@ URL: [url]',
 'no_default_keywords' => 'Nie sú dostupné žiadne kľúčové slová.',
 'no_docs_checked_out' => '',
 'no_docs_locked' => '',
-'no_docs_rejected' => '',
+'no_docs_rejected' => 'Žiadne dokumenty neboli zamietnuté.',
 '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_look_at' => 'Žiadne dokumenty, ktoré potrebujú pozornosť.',
+'no_docs_to_receipt' => 'Žiadne dokumenty, ktoré požadujú potvrdenie.',
 'no_docs_to_review' => 'Momentálne neexistujú žiadne dokumenty, ktoré vyžadujú kontrolu.',
 'no_docs_to_revise' => '',
 'no_email_or_login' => '',
@@ -705,62 +705,64 @@ URL: [url]',
 'no_version_modification' => 'Žiadne zmeny',
 'no_workflow_available' => '',
 'objectcheck' => 'Kontrola Adresárov/Dokumentov',
-'object_check_critical' => '',
-'object_check_warning' => '',
+'object_check_critical' => 'Kritické chyby',
+'object_check_warning' => 'Varovanie',
 'obsolete' => 'Zastaralé',
 'october' => 'Október',
 'old' => 'Stare',
 'only_jpg_user_images' => 'Ako obrázky používateľov je možné použiť iba obrázky .jpg',
 'order_by_sequence_off' => '',
-'original_filename' => '',
+'original_filename' => 'Pôvodný názov súboru',
 'overall_indexing_progress' => '',
 'owner' => 'Vlastník',
 'ownership_changed_email' => 'Majitel zmeneny',
 'ownership_changed_email_body' => '',
-'ownership_changed_email_subject' => '',
+'ownership_changed_email_subject' => '[sitename]: [name] - Vlastník sa zmenil',
 'password' => 'Heslo',
-'password_already_used' => '',
-'password_expiration' => '',
+'password_already_used' => 'Heslo sa už používa',
+'password_expiration' => 'Vypršanie hesla',
 'password_expiration_text' => '',
-'password_expired' => '',
-'password_expires_in_days' => '',
-'password_forgotten' => '',
+'password_expired' => 'Heslo vypršalo',
+'password_expires_in_days' => 'Heslo vyprší za %s dní.',
+'password_forgotten' => 'Zabudnuté heslo',
 'password_forgotten_email_body' => '',
-'password_forgotten_email_subject' => '',
+'password_forgotten_email_subject' => '[sitename]: Zabudnuté heslo',
 'password_forgotten_send_hash' => '',
 'password_forgotten_text' => '',
-'password_forgotten_title' => '',
-'password_repeat' => '',
-'password_send' => '',
+'password_forgotten_title' => 'Heslo bolo odoslané',
+'password_repeat' => 'Zopakovať heslo',
+'password_send' => 'Odoslať heslo',
 'password_send_text' => '',
-'password_strength' => '',
-'password_strength_insuffient' => '',
-'password_wrong' => '',
-'pending_approvals' => '',
-'pending_receipt' => '',
-'pending_reviews' => '',
+'password_strength' => 'Sila hesla',
+'password_strength_insuffient' => 'Nedostatočná sila hesla',
+'password_wrong' => 'Zlé heslo',
+'pdf_converters' => '',
+'pending_approvals' => 'Čakajúce schválenia',
+'pending_receipt' => 'Čakajúci príjemcovia',
+'pending_reviews' => 'Čakajúce recenzie',
 'pending_revision' => '',
 'pending_workflows' => '',
 'personal_default_keywords' => 'Osobné kľúčové slová',
 'pl_PL' => 'Polština',
 'possible_substitutes' => '',
 'preset_expires' => '',
-'preview' => '',
-'preview_converters' => '',
-'preview_images' => '',
-'preview_markdown' => '',
-'preview_plain' => '',
-'previous_state' => '',
+'preview' => 'Náhľad',
+'preview_converters' => 'Ukážka konverzie dokumentu',
+'preview_images' => 'Náhľad obrázkov',
+'preview_markdown' => 'Markdown',
+'preview_pdf' => '',
+'preview_plain' => 'Text',
+'previous_state' => 'Predchádzajúci stav',
 'previous_versions' => 'Predošlé verzie',
-'process' => '',
-'process_without_user_group' => '',
+'process' => 'Proces',
+'process_without_user_group' => 'Procesy bez používateľa/skupiny',
 'pt_BR' => 'Portugalčina',
-'quota' => '',
-'quota_exceeded' => '',
-'quota_is_disabled' => '',
-'quota_warning' => '',
-'receipts_accepted' => '',
-'receipts_not_touched' => '',
+'quota' => 'Kvóta',
+'quota_exceeded' => 'Vaša disková kvóta bola prekročená o [bytes].',
+'quota_is_disabled' => 'Podpora kvót je momentálne zakázaná v nastaveniach. Nastavenie kvóty používateľa nebude mať žiadny účinok, kým nebude znovu aktivovaná.',
+'quota_warning' => 'Maximálne využitie disku je prekročené o [bytes]. Odstráňte dokumenty alebo predchádzajúce verzie.',
+'receipts_accepted' => '[no_receipts] príjemcovia už prijatí',
+'receipts_not_touched' => '[no_receipts] príjemcovia nedotknutí',
 'receipts_rejected' => '',
 'receipts_without_group' => '',
 'receipts_without_user' => '',
@@ -769,40 +771,40 @@ URL: [url]',
 'receipt_log' => '',
 'receipt_request_email_body' => '',
 'receipt_request_email_subject' => '',
-'receipt_status' => '',
+'receipt_status' => 'Stav',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
 'reception' => '',
 'reception_acknowleged' => '',
-'reception_noaction' => '',
+'reception_noaction' => 'Žiadna akcia',
 'reception_rejected' => '',
-'recipients' => '',
-'redraw' => '',
+'recipients' => 'Príjemcovia',
+'redraw' => 'Prekresliť',
 'refresh' => 'Obnoviť',
 'rejected' => 'Odmietnuté',
 'released' => 'Vydané',
 'removed_approver' => 'bol odstránený zo zoznamu schvaľovateľov.',
 'removed_file_email' => 'Odstranena priloha',
 'removed_file_email_body' => '',
-'removed_file_email_subject' => '',
+'removed_file_email_subject' => '[sitename]: [document] - Príloha bola odstránená',
 'removed_recipient' => '',
 'removed_reviewer' => 'bol odstránený zo zoznamu kontrolórov.',
 'removed_revisor' => '',
 'removed_workflow_email_body' => '',
 'removed_workflow_email_subject' => '',
-'removeFolderFromDropFolder' => '',
+'removeFolderFromDropFolder' => 'Po importu odstráňte zložku',
 'remove_marked_files' => 'Zrušiť označenie súborov',
-'repaired' => '',
-'repairing_objects' => '',
+'repaired' => 'opravené',
+'repairing_objects' => 'Oprava dokumentov a zložiek.',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
-'restrict_access' => '',
+'restrict_access' => 'Žiadny prístup k',
 'results_page' => 'Výsledky',
 'return_from_subworkflow' => '',
 'return_from_subworkflow_email_body' => '',
 'return_from_subworkflow_email_subject' => '',
-'reverse_links' => '',
+'reverse_links' => 'Dokumenty, ktoré majú odkaz na aktuálny dokument',
 'reviewers' => 'Kontrolóri',
 'reviewer_already_assigned' => 'je už poverený ako kontrolór',
 'reviewer_already_removed' => 'už bol odstránený z procesu kontroly alebo poslal kontrolu',
@@ -814,7 +816,7 @@ URL: [url]',
 'review_deletion_email' => 'Poziadavka na recenziu zmazana',
 'review_deletion_email_body' => '',
 'review_deletion_email_subject' => '',
-'review_file' => '',
+'review_file' => 'Súbor',
 'review_group' => 'Skupina kontroly',
 'review_log' => '',
 'review_request_email' => 'Poziadavka na recenziu',
@@ -826,19 +828,19 @@ URL: [url]',
 'review_submit_email_subject' => '',
 'review_summary' => 'Zhrnutie kontroly',
 'review_update_failed' => 'Chyba pri aktualizácii stavu kontroly. Aktualizácia zlyhala.',
-'revise_document' => '',
+'revise_document' => 'Revidujte dokument',
 'revise_document_on' => '',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
 'revisions_pending' => '',
 'revisions_rejected' => '',
-'revisions_without_group' => '',
-'revisions_without_user' => '',
-'revision_date' => '',
-'revision_log' => '',
+'revisions_without_group' => 'Revízie bez skupiny',
+'revisions_without_user' => 'Revízie bez používateľa',
+'revision_date' => 'Dátum revízie',
+'revision_log' => 'Protokol revízie',
 'revision_request_email_body' => '',
 'revision_request_email_subject' => '',
-'revision_status' => '',
+'revision_status' => 'Stav',
 'revision_submit_email_body' => '',
 'revision_submit_email_subject' => '',
 'revisors' => '',
@@ -848,146 +850,146 @@ URL: [url]',
 'rewind_workflow_email_body' => '',
 'rewind_workflow_email_subject' => '',
 'rewind_workflow_warning' => '',
-'rm_attrdef' => '',
+'rm_attrdef' => 'Odstrániť definíciu atribútu',
 'rm_attrdefgroup' => '',
 'rm_default_keyword_category' => 'Zmazať kategóriu',
 'rm_document' => 'Odstrániť dokument',
-'rm_document_category' => '',
-'rm_event' => '',
+'rm_document_category' => 'Odstrániť kategóriu',
+'rm_event' => 'Odstrániť udalosť',
 'rm_file' => 'Odstrániť súbor',
 'rm_folder' => 'Odstrániť zložku',
-'rm_from_clipboard' => '',
+'rm_from_clipboard' => 'Odstrániť zo schránky',
 'rm_group' => 'Odstrániť túto skupinu',
-'rm_role' => '',
+'rm_role' => 'Odstrániť túto rolu',
 'rm_transmittal' => '',
-'rm_transmittalitem' => '',
+'rm_transmittalitem' => 'Odstrániť položku',
 'rm_user' => 'Odstrániť tohto používateľa',
-'rm_user_from_processes' => '',
+'rm_user_from_processes' => 'Odstrániť používateľa z procesu',
 'rm_version' => 'Odstrániť verziu',
-'rm_workflow' => '',
+'rm_workflow' => 'Odstrániť pracovný postup',
 'rm_workflow_action' => '',
 'rm_workflow_state' => '',
 'rm_workflow_warning' => '',
-'role' => '',
-'role_admin' => '',
-'role_guest' => '',
-'role_info' => '',
+'role' => 'Rola',
+'role_admin' => 'Administrátor',
+'role_guest' => 'Hosť',
+'role_info' => 'Informácia',
 'role_management' => '',
-'role_name' => '',
-'role_type' => '',
-'role_user' => '',
+'role_name' => 'Názov role',
+'role_type' => 'Typ role',
+'role_user' => 'Používateľ',
 'ro_RO' => 'Rumunština',
 'run_subworkflow' => '',
 'run_subworkflow_email_body' => '',
 'run_subworkflow_email_subject' => '',
 'ru_RU' => 'Ruština',
 'saturday' => 'Sobota',
-'saturday_abbr' => '',
+'saturday_abbr' => 'So',
 'save' => 'Uložiť',
 'search' => 'Hľadať',
-'search_fulltext' => '',
+'search_fulltext' => 'Vyhľadávanie vo fulltexte',
 'search_in' => 'Prehľadávať',
 'search_mode_and' => 'všetky slová',
-'search_mode_documents' => '',
-'search_mode_folders' => '',
+'search_mode_documents' => 'Iba dokumenty',
+'search_mode_folders' => 'Iba zložky',
 '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_report_fulltext' => 'Nájdené [doccount] dokumenty',
+'search_resultmode' => 'Výsledok hľadania',
+'search_resultmode_both' => 'Dokumenty a zložky',
 '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',
-'seconds' => '',
+'seconds' => 'sekundy',
 'selection' => 'Výber',
 'select_attrdefgrp_show' => '',
 'select_category' => 'Vyber kategóriu',
 'select_groups' => '',
 'select_grp_approvers' => '',
-'select_grp_ind_approvers' => '',
-'select_grp_ind_notification' => '',
-'select_grp_ind_recipients' => '',
-'select_grp_ind_reviewers' => '',
-'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_grp_ind_approvers' => 'Kliknutím vyberte skupinu',
+'select_grp_ind_notification' => 'Kliknutím vyberte skupinu',
+'select_grp_ind_recipients' => 'Kliknutím vyberte skupinu',
+'select_grp_ind_reviewers' => 'Kliknutím vyberte skupinu',
+'select_grp_notification' => 'Kliknutím vyberte upozornenie skupiny',
+'select_grp_recipients' => 'Kliknutím vyberte skupinu príjemcov',
+'select_grp_reviewers' => 'Kliknutím vyberte recenzenta skupiny',
+'select_grp_revisors' => 'Kliknutím vyberte skupinu kontrolórov',
+'select_ind_approvers' => 'Kliknutím vyberte individuálneho schvaľovača',
+'select_ind_notification' => 'Kliknutím vyberte individuálne upozornenie',
+'select_ind_recipients' => 'Kliknutím vyberte individuálnych príjemcov',
+'select_ind_reviewers' => 'Kliknutím vyberte individuálneho recenzenta',
 'select_ind_revisors' => '',
 'select_one' => 'Vyberte jeden',
-'select_users' => '',
+'select_users' => 'Kliknutím vyberte používateľov',
 'select_workflow' => '',
-'send_email' => '',
-'send_login_data' => '',
+'send_email' => 'Poslať E-mail',
+'send_login_data' => 'Poslať prihlasovacie údaje',
 'send_login_data_body' => '',
-'send_login_data_subject' => '',
-'send_test_mail' => '',
+'send_login_data_subject' => '[sitename]: [login] - Vaše prihlasovacie údaje',
+'send_test_mail' => 'Poslať testovací E-mail',
 'september' => 'September',
 'sequence' => 'Postupnosť',
 'seq_after' => 'Po "[prevname]"',
 'seq_end' => 'Na koniec',
 'seq_keep' => 'Ponechať pozíciu',
 'seq_start' => 'Prvá pozícia',
-'sessions' => '',
+'sessions' => 'Používatelia online',
 'settings' => 'Nastavenia',
-'settings_activate_module' => '',
-'settings_activate_php_extension' => '',
-'settings_adminIP' => '',
+'settings_activate_module' => 'Aktivovať modul',
+'settings_activate_php_extension' => 'Aktivovať PHP rozšírenie',
+'settings_adminIP' => 'IP administrátora',
 'settings_adminIP_desc' => '',
 'settings_Advanced' => 'Rozšírené',
 'settings_advancedAcl' => '',
 'settings_advancedAcl_desc' => '',
-'settings_apache_mod_rewrite' => '',
+'settings_apache_mod_rewrite' => 'Apache - Modul Rewrite',
 'settings_Authentication' => '',
-'settings_autoLoginUser' => '',
+'settings_autoLoginUser' => 'Automatické prihlásenie',
 'settings_autoLoginUser_desc' => '',
-'settings_available_languages' => '',
+'settings_available_languages' => 'Dostupné jazyky',
 'settings_available_languages_desc' => '',
-'settings_backupDir' => '',
+'settings_backupDir' => 'Zložka na zálohovanie',
 'settings_backupDir_desc' => '',
-'settings_cacheDir' => '',
+'settings_cacheDir' => 'Zložka medzipamäte',
 'settings_cacheDir_desc' => '',
 'settings_Calendar' => 'Nastavenie kalendára',
 'settings_calendarDefaultView' => 'Predvolené zobrazenie kalendára',
 'settings_calendarDefaultView_desc' => 'Predvolené zobrazenie kalendára',
-'settings_cannot_disable' => '',
+'settings_cannot_disable' => 'Súbor ENABLE_INSTALL_TOOL nie je možné odstrániť',
 'settings_checkOutDir' => '',
 'settings_checkOutDir_desc' => '',
 'settings_cmdTimeout' => '',
 'settings_cmdTimeout_desc' => '',
-'settings_contentDir' => '',
+'settings_contentDir' => 'Zložka obsahu',
 'settings_contentDir_desc' => '',
 'settings_contentOffsetDir' => '',
 'settings_contentOffsetDir_desc' => '',
-'settings_convertToPdf' => '',
-'settings_convertToPdf_desc' => '',
-'settings_cookieLifetime' => '',
+'settings_convertToPdf' => 'Konvertovať dokument do PDF pre náhľad',
+'settings_convertToPdf_desc' => 'Ak dokument nemôže byť prirodzene zobrazený prehliadačom, konvertovaná verzia do formátu PDF bude zobrazená',
+'settings_cookieLifetime' => 'Čas trvania súboru cookie',
 'settings_cookieLifetime_desc' => '',
 'settings_coreDir' => '',
 'settings_coreDir_desc' => '',
 'settings_createCheckOutDir' => '',
 'settings_createCheckOutDir_desc' => '',
-'settings_createdatabase' => '',
-'settings_createdirectory' => '',
-'settings_currentvalue' => '',
-'settings_Database' => '',
-'settings_dbDatabase' => '',
+'settings_createdatabase' => 'Vytvoriť databázové tabuľky',
+'settings_createdirectory' => 'Vytvoriť zložku',
+'settings_currentvalue' => 'Aktuálna hodnota',
+'settings_Database' => 'Nastavenia databazy',
+'settings_dbDatabase' => 'Databáza',
 'settings_dbDatabase_desc' => '',
-'settings_dbDriver' => '',
+'settings_dbDriver' => 'Typ databázy',
 'settings_dbDriver_desc' => '',
-'settings_dbHostname' => '',
+'settings_dbHostname' => 'Názov servera',
 'settings_dbHostname_desc' => '',
-'settings_dbPass' => '',
-'settings_dbPass_desc' => '',
-'settings_dbUser' => '',
+'settings_dbPass' => 'Heslo',
+'settings_dbPass_desc' => 'Heslo pre prístup k databáze zadané počas inštalácie.',
+'settings_dbUser' => 'Používateľské meno',
 'settings_dbUser_desc' => '',
 'settings_dbVersion' => '',
-'settings_defaultAccessDocs' => '',
+'settings_defaultAccessDocs' => 'Štandardný prístup pre nové dokumenty',
 'settings_defaultAccessDocs_desc' => '',
 'settings_defaultSearchMethod' => '',
 'settings_defaultSearchMethod_desc' => '',
@@ -998,7 +1000,7 @@ URL: [url]',
 'settings_disableSelfEdit_desc' => '',
 'settings_disable_install' => '',
 'settings_Display' => 'Zobraziť nastavenia',
-'settings_dropFolderDir' => '',
+'settings_dropFolderDir' => 'Zložka pre drop zložku',
 'settings_dropFolderDir_desc' => '',
 'settings_Edition' => '',
 'settings_editOnlineFileTypes' => '',
@@ -1015,33 +1017,33 @@ URL: [url]',
 'settings_enableCalendar_desc' => 'Zapnúť/vypnúť kalendár',
 'settings_enableClipboard' => 'Aktivovať schránky',
 'settings_enableClipboard_desc' => '',
-'settings_enableConverting' => '',
-'settings_enableConverting_desc' => '',
+'settings_enableConverting' => 'Povoliť konverziu',
+'settings_enableConverting_desc' => 'Povoliť/zakázať konvertovať súbory',
 'settings_enableDropFolderList' => '',
 'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => 'Zapnúť rýchle nahratie',
 'settings_enableDropUpload_desc' => '',
-'settings_enableDuplicateDocNames' => '',
-'settings_enableDuplicateDocNames_desc' => '',
+'settings_enableDuplicateDocNames' => 'Povoliť duplicitné názvy dokumentov',
+'settings_enableDuplicateDocNames_desc' => 'Povoliť duplicitné názvy dokumentov v zložke.',
 'settings_enableEmail' => 'Povoliť e-mail',
 'settings_enableEmail_desc' => 'Povoliť/zakázať automatické emailové upozornenie',
 'settings_enableFolderTree' => 'Aktivovať strom priečinkov',
 'settings_enableFolderTree_desc' => '',
-'settings_enableFullSearch' => '',
-'settings_enableFullSearch_desc' => '',
-'settings_enableGuestAutoLogin' => '',
+'settings_enableFullSearch' => 'Povoliť Fulltextové vyhľadávanie',
+'settings_enableFullSearch_desc' => 'Povoliť Fulltextové vyhľadávanie',
+'settings_enableGuestAutoLogin' => 'Povoliť automatické prihlásenie pre hosťa',
 'settings_enableGuestAutoLogin_desc' => '',
-'settings_enableGuestLogin' => '',
+'settings_enableGuestLogin' => 'Povoliť prihlásenie Hosťa',
 'settings_enableGuestLogin_desc' => '',
 'settings_enableHelp' => 'Zapnúť nápovedu',
 'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Aktivovať voľbu jazyka',
 'settings_enableLanguageSelector_desc' => 'Zobraziť výber pre jazyk používateľského rozhrania potom, čo bol prihlásený.',
-'settings_enableLargeFileUpload' => '',
+'settings_enableLargeFileUpload' => 'Povoliť nahrať veľké súbory',
 'settings_enableLargeFileUpload_desc' => '',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
-'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload' => 'Povoliť nahrať viac súborov',
 'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
@@ -1053,11 +1055,11 @@ URL: [url]',
 'settings_enableOwnerReceipt_desc' => '',
 'settings_enableOwnerRevApp' => '',
 'settings_enableOwnerRevApp_desc' => '',
-'settings_enablePasswordForgotten' => '',
+'settings_enablePasswordForgotten' => 'Povoliť zabudnuté heslo',
 'settings_enablePasswordForgotten_desc' => '',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
-'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow' => 'Povoliť revíziu dokumentov',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
@@ -1069,9 +1071,9 @@ URL: [url]',
 'settings_enableUpdateReceipt_desc' => '',
 'settings_enableUpdateRevApp' => '',
 'settings_enableUpdateRevApp_desc' => '',
-'settings_enableUserImage' => '',
-'settings_enableUserImage_desc' => '',
-'settings_enableUsersView' => '',
+'settings_enableUserImage' => 'Povoliť obrázok používateľa',
+'settings_enableUserImage_desc' => 'Povoliť používateľské obrázky',
+'settings_enableUsersView' => 'Povoliť zobrazenie používateľov',
 'settings_enableUsersView_desc' => '',
 'settings_enableVersionDeletion' => '',
 'settings_enableVersionDeletion_desc' => '',
@@ -1079,13 +1081,13 @@ URL: [url]',
 'settings_enableVersionModification_desc' => '',
 'settings_encryptionKey' => '',
 'settings_encryptionKey_desc' => '',
-'settings_error' => '',
+'settings_error' => 'Chyba',
 'settings_expandFolderTree' => 'Rozbaliť',
 'settings_expandFolderTree_desc' => 'Rozbaľte strom priečinkov',
-'settings_expandFolderTree_val0' => '',
-'settings_expandFolderTree_val1' => '',
+'settings_expandFolderTree_val0' => 'začať so skrytou stromovou štruktúrou',
+'settings_expandFolderTree_val1' => 'začať so stromovou štruktúrou a prvou rozbalenou úrovňou',
 'settings_expandFolderTree_val2' => '',
-'settings_Extensions' => '',
+'settings_Extensions' => 'Rozšírenia',
 'settings_extraPath' => '',
 'settings_extraPath_desc' => '',
 'settings_firstDayOfWeek' => 'Prvý deň v týždni',
@@ -1096,37 +1098,37 @@ URL: [url]',
 'settings_fullSearchEngine_desc' => '',
 'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
-'settings_guestID' => '',
+'settings_guestID' => 'Hosť ID',
 'settings_guestID_desc' => '',
-'settings_httpRoot' => '',
+'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
-'settings_initialDocumentStatus_draft' => '',
-'settings_initialDocumentStatus_released' => '',
-'settings_installADOdb' => '',
+'settings_initialDocumentStatus_draft' => 'Návrh',
+'settings_initialDocumentStatus_released' => 'Vydaný',
+'settings_installADOdb' => 'Inštalovať ADOdb',
 'settings_install_disabled' => '',
-'settings_install_pear_package_log' => '',
-'settings_install_pear_package_webdav' => '',
-'settings_install_success' => '',
+'settings_install_pear_package_log' => 'Inštalovať Pear balíček \'Log\'',
+'settings_install_pear_package_webdav' => 'Inštalovať Pear balíček \'HTTP_WebDAV_Server\', ak máte v umysle používať rozhranie webdav',
+'settings_install_success' => 'Inštalácia bola úspešne dokončená.',
 'settings_install_welcome_text' => '',
-'settings_install_welcome_title' => '',
+'settings_install_welcome_title' => 'Vitajte v inštalácii SeedDMS',
 'settings_install_zendframework' => '',
 'settings_language' => 'Predvolený jazyk',
 'settings_language_desc' => '',
 'settings_libraryFolder' => '',
 'settings_libraryFolder_desc' => '',
-'settings_logFileEnable' => '',
-'settings_logFileEnable_desc' => '',
+'settings_logFileEnable' => 'Povoliť Log súbor',
+'settings_logFileEnable_desc' => 'Povoliť/zakázať log súbor',
 'settings_logFileRotation' => '',
 'settings_logFileRotation_desc' => '',
-'settings_loginFailure' => '',
+'settings_loginFailure' => 'Prihlásenie zlyhalo',
 'settings_loginFailure_desc' => '',
-'settings_luceneClassDir' => '',
+'settings_luceneClassDir' => 'Lucene SeedDMS zložka',
 'settings_luceneClassDir_desc' => '',
 'settings_luceneDir' => '',
-'settings_luceneDir_desc' => '',
-'settings_maxDirID' => '',
+'settings_luceneDir_desc' => 'Cesta do Lucene indexu',
+'settings_maxDirID' => 'Max Zložka ID',
 'settings_maxDirID_desc' => '',
 'settings_maxExecutionTime' => '',
 'settings_maxExecutionTime_desc' => '',
@@ -1134,47 +1136,47 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
 'settings_maxSizeForFullText_desc' => '',
-'settings_maxUploadSize' => '',
+'settings_maxUploadSize' => 'Maximálna veľkosť pre nahrávané súbory',
 'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => '',
-'settings_notfound' => '',
-'settings_Notification' => '',
+'settings_notfound' => 'Nenájdené',
+'settings_Notification' => 'Nastavenia upozornení',
 'settings_notwritable' => '',
 'settings_no_content_dir' => '',
 'settings_overrideMimeType' => '',
 'settings_overrideMimeType_desc' => '',
-'settings_partitionSize' => '',
+'settings_partitionSize' => 'Čiastočná veľkosť súboru',
 'settings_partitionSize_desc' => '',
-'settings_passwordExpiration' => '',
+'settings_passwordExpiration' => 'Vypršanie hesla',
 'settings_passwordExpiration_desc' => '',
-'settings_passwordHistory' => '',
+'settings_passwordHistory' => 'História hesla',
 'settings_passwordHistory_desc' => '',
-'settings_passwordStrength' => '',
-'settings_passwordStrengthAlgorithm' => '',
+'settings_passwordStrength' => 'Min. sila hesla',
+'settings_passwordStrengthAlgorithm' => 'Algoritmus pre silu hesla',
 'settings_passwordStrengthAlgorithm_desc' => '',
-'settings_passwordStrengthAlgorithm_valadvanced' => '',
-'settings_passwordStrengthAlgorithm_valsimple' => '',
+'settings_passwordStrengthAlgorithm_valadvanced' => 'pokročilý',
+'settings_passwordStrengthAlgorithm_valsimple' => 'jednoduchý',
 'settings_passwordStrength_desc' => '',
-'settings_pear_log' => '',
-'settings_pear_webdav' => '',
-'settings_perms' => '',
-'settings_php_dbDriver' => '',
-'settings_php_gd2' => '',
-'settings_php_mbstring' => '',
-'settings_php_version' => '',
+'settings_pear_log' => 'Pear balíček : Log',
+'settings_pear_webdav' => 'Pear balíček : HTTP_WebDAV_Server',
+'settings_perms' => 'Oprávnenie',
+'settings_php_dbDriver' => 'PHP rozšírenie : php_\'see current value\'',
+'settings_php_gd2' => 'PHP rozšírenie : php_gd2',
+'settings_php_mbstring' => 'PHP rozšírenie : php_mbstring',
+'settings_php_version' => 'PHP verzia',
 'settings_presetExpirationDate' => '',
 'settings_presetExpirationDate_desc' => '',
-'settings_previewWidthDetail' => '',
-'settings_previewWidthDetail_desc' => '',
-'settings_previewWidthDropFolderList' => '',
-'settings_previewWidthDropFolderList_desc' => '',
-'settings_previewWidthList' => '',
+'settings_previewWidthDetail' => 'Šírka náhľadu obrázkov (detail)',
+'settings_previewWidthDetail_desc' => 'Šírka náhľadu obrázku zobrazená na stránke podrobností',
+'settings_previewWidthDropFolderList' => 'Šírka náhľadu obrázku (zoznam drop zložka)',
+'settings_previewWidthDropFolderList_desc' => 'Šírka náhľadu obrázkov zobrazených v zozname pri výbere súboru z drop zložky.',
+'settings_previewWidthList' => 'Šírka náhľadu obrázku (zoznam)',
 'settings_previewWidthList_desc' => 'Šírka pre náhľad obrázkov je uvedené v zoznamoch',
-'settings_previewWidthMenuList' => '',
-'settings_previewWidthMenuList_desc' => '',
+'settings_previewWidthMenuList' => 'Šírka náhľadu obrázku (zoznam ponúk)',
+'settings_previewWidthMenuList_desc' => 'Šírka náhľadu obrázkov zobrazených ako položky v ponuke drop zložky.',
 'settings_printDisclaimer' => '',
 'settings_printDisclaimer_desc' => '',
-'settings_quota' => '',
+'settings_quota' => 'Kvóta používateľa',
 'settings_quota_desc' => '',
 'settings_removeFromDropFolder' => '',
 'settings_removeFromDropFolder_desc' => '',
@@ -1182,13 +1184,13 @@ URL: [url]',
 'settings_restricted_desc' => '',
 'settings_rootDir' => 'Koreňový adresár',
 'settings_rootDir_desc' => 'Cesta k miestu, kde sa nachádza SeedDMS',
-'settings_rootFolderID' => '',
+'settings_rootFolderID' => 'Koreňová zložka ID',
 'settings_rootFolderID_desc' => '',
 'settings_SaveError' => '',
 'settings_Server' => 'Nastavenie servera',
-'settings_showFullPreview' => '',
+'settings_showFullPreview' => 'Zobraziť kompletný dokument',
 'settings_showFullPreview_desc' => '',
-'settings_showMissingTranslations' => '',
+'settings_showMissingTranslations' => 'Ukázať chýbajúce preklady',
 'settings_showMissingTranslations_desc' => '',
 'settings_showSingleSearchHit' => '',
 'settings_showSingleSearchHit_desc' => '',
@@ -1197,29 +1199,29 @@ URL: [url]',
 'settings_siteDefaultPage_desc' => '',
 'settings_siteName' => 'Názov stránky',
 'settings_siteName_desc' => 'Názov stránky používaný v nadpisoch. Predvolený: SeedDMS',
-'settings_SMTP' => '',
-'settings_smtpPassword' => '',
-'settings_smtpPassword_desc' => '',
-'settings_smtpPort' => '',
-'settings_smtpPort_desc' => '',
-'settings_smtpSendFrom' => '',
-'settings_smtpSendFrom_desc' => '',
-'settings_smtpServer' => '',
-'settings_smtpServer_desc' => '',
-'settings_smtpUser' => '',
-'settings_smtpUser_desc' => '',
-'settings_sortFoldersDefault' => '',
+'settings_SMTP' => 'SMTP Server nastavenia',
+'settings_smtpPassword' => 'SMTP Server heslo',
+'settings_smtpPassword_desc' => 'SMTP Server heslo',
+'settings_smtpPort' => 'SMTP Server port',
+'settings_smtpPort_desc' => 'SMTP Server port, štandardne 25',
+'settings_smtpSendFrom' => 'Odoslané z',
+'settings_smtpSendFrom_desc' => 'Odoslané z',
+'settings_smtpServer' => 'SMTP Server názov hostiteľa',
+'settings_smtpServer_desc' => 'SMTP Server názov hostiteľa',
+'settings_smtpUser' => 'SMTP Server používateľ',
+'settings_smtpUser_desc' => 'SMTP Server používateľ',
+'settings_sortFoldersDefault' => 'Predvolená metóda triedenia',
 'settings_sortFoldersDefault_desc' => 'Toto nastavenie triedi metódy pre zložky a dokumenty v zobrazení priečinkov.',
 'settings_sortFoldersDefault_val_name' => 'podľa mena',
 'settings_sortFoldersDefault_val_sequence' => 'podľa sekvencií',
-'settings_sortFoldersDefault_val_unsorted' => '',
+'settings_sortFoldersDefault_val_unsorted' => 'neutriedený',
 'settings_sortUsersInList' => 'Triediť užívateľov v zozname',
 'settings_sortUsersInList_desc' => '',
 'settings_sortUsersInList_val_fullname' => 'Triediť podľa celého mena',
 'settings_sortUsersInList_val_login' => 'Triediť podľa prihlásenie',
 'settings_stagingDir' => '',
 'settings_stagingDir_desc' => '',
-'settings_start_install' => '',
+'settings_start_install' => 'Začať inštaláciu',
 'settings_stopWordsFile' => '',
 'settings_stopWordsFile_desc' => '',
 'settings_strictFormCheck' => '',
@@ -1233,85 +1235,85 @@ URL: [url]',
 'settings_undelUserIds' => '',
 'settings_undelUserIds_desc' => '',
 'settings_updateDatabase' => '',
-'settings_updateNotifyTime' => '',
+'settings_updateNotifyTime' => 'Aktualizovať čas upozornenia',
 'settings_updateNotifyTime_desc' => '',
 'settings_upgrade_php' => '',
 'settings_versioningFileName' => '',
 'settings_versioningFileName_desc' => '',
-'settings_versiontolow' => '',
-'settings_viewOnlineFileTypes' => '',
+'settings_versiontolow' => 'Verzia je nízka',
+'settings_viewOnlineFileTypes' => 'Zobraziť online typy súborov',
 'settings_viewOnlineFileTypes_desc' => '',
 'settings_workflowMode' => '',
 'settings_workflowMode_desc' => '',
-'settings_workflowMode_valadvanced' => '',
+'settings_workflowMode_valadvanced' => 'pokročilý',
 'settings_workflowMode_valtraditional' => '',
 'settings_workflowMode_valtraditional_only_approval' => '',
-'settings_zendframework' => '',
+'settings_zendframework' => 'Zend Framework',
 'set_expiry' => 'Nastaviť vypršanie',
 'set_owner' => 'Nastaviť vlastníka',
 'set_owner_error' => '',
-'set_password' => '',
+'set_password' => 'Nastaviť heslo',
 'set_workflow' => '',
 'signed_in_as' => 'Prihlásený ako',
-'sign_in' => '',
+'sign_in' => 'Prihlásiť sa',
 'sign_out' => 'odhlásiť',
-'sign_out_user' => '',
+'sign_out_user' => 'Odhlásiť používateľa',
 'sk_SK' => 'Slovenčina',
 'space_used_on_data_folder' => 'Space used on data folder',
 'splash_added_to_clipboard' => 'Pridané do schránky',
-'splash_add_attribute' => '',
-'splash_add_group' => '',
+'splash_add_attribute' => 'Bol pridaný nový atribút',
+'splash_add_group' => 'Bola pridaná nová skupina',
 'splash_add_group_member' => '',
-'splash_add_role' => '',
+'splash_add_role' => 'Nová rola bola pridaná',
 'splash_add_to_transmittal' => '',
 'splash_add_transmittal' => '',
-'splash_add_user' => '',
-'splash_cleared_cache' => '',
-'splash_cleared_clipboard' => '',
-'splash_document_added' => '',
+'splash_add_user' => 'Pridaný nový používateľ',
+'splash_cleared_cache' => 'Vymazanie vyrovnávacej pamäte',
+'splash_cleared_clipboard' => 'Schránka bola vymazaná',
+'splash_document_added' => 'Dokument bol pridaný',
 'splash_document_checkedout' => '',
-'splash_document_edited' => '',
-'splash_document_indexed' => '',
+'splash_document_edited' => 'Dokument bol uložený',
+'splash_document_indexed' => 'Dokument \'[name]\' bol indexovaný.',
 'splash_document_locked' => 'Dokument uzamknutý',
 'splash_document_unlocked' => 'Dokument odomknutý',
-'splash_edit_attribute' => '',
-'splash_edit_event' => '',
-'splash_edit_group' => '',
-'splash_edit_role' => '',
-'splash_edit_user' => '',
+'splash_edit_attribute' => 'Atribút bol uložený',
+'splash_edit_event' => 'Udalosť bola uložená',
+'splash_edit_group' => 'Skupina bola uložená',
+'splash_edit_role' => 'Rola bola uložená',
+'splash_edit_user' => 'Používateľ bol uložený',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
-'splash_folder_edited' => '',
-'splash_importfs' => '',
-'splash_invalid_folder_id' => '',
+'splash_folder_edited' => 'Uložiť zmeny zložky',
+'splash_importfs' => 'Importované dokumenty [docs] a zložky [folders]',
+'splash_invalid_folder_id' => 'Neplatné ID zložky',
 'splash_invalid_searchterm' => '',
-'splash_moved_clipboard' => '',
-'splash_move_document' => '',
-'splash_move_folder' => '',
+'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á',
 'splash_receipt_update_success' => '',
-'splash_removed_from_clipboard' => '',
-'splash_rm_attribute' => '',
+'splash_removed_from_clipboard' => 'Odstránené zo schránky',
+'splash_rm_attribute' => 'Atribút bol odstránený',
 'splash_rm_document' => 'Dokument odstránený',
-'splash_rm_download_link' => '',
+'splash_rm_download_link' => 'Odkaz na prevzatie bol odstránený',
 'splash_rm_folder' => 'Zložka zmazaná',
-'splash_rm_group' => '',
+'splash_rm_group' => 'Skupina bola odstránená',
 'splash_rm_group_member' => '',
-'splash_rm_role' => '',
+'splash_rm_role' => 'Rola bola odstránená',
 'splash_rm_transmittal' => '',
-'splash_rm_user' => '',
-'splash_rm_user_processes' => '',
-'splash_saved_file' => '',
-'splash_save_user_data' => '',
+'splash_rm_user' => 'Používateľ bol odstránený',
+'splash_rm_user_processes' => 'Používateľ bol odstránený zo všetkých procesov',
+'splash_saved_file' => 'Verzia bola uložená',
+'splash_save_user_data' => 'Používateľské údaje boli uložené',
 'splash_send_download_link' => '',
 'splash_send_login_data' => '',
-'splash_settings_saved' => '',
+'splash_settings_saved' => 'Nastavenia boli uložené',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => '',
-'statistic' => '',
+'statistic' => 'Štatistika',
 'status' => 'Stav',
 'status_approval_rejected' => 'Návrh zamietnutý',
 'status_approved' => 'Schválený',
@@ -1335,77 +1337,77 @@ URL: [url]',
 'submit_2_fact_auth' => '',
 'submit_approval' => 'Poslať schválenie',
 'submit_login' => 'Prihlásiť sa',
-'submit_password' => '',
-'submit_password_forgotten' => '',
+'submit_password' => 'Nastaviť nové heslo',
+'submit_password_forgotten' => 'Spustiť proces',
 'submit_receipt' => '',
 'submit_review' => 'Poslať kontrolu',
 'submit_revision' => '',
 'submit_userinfo' => '',
 'subsribe_timelinefeed' => '',
-'substitute_to_user' => '',
+'substitute_to_user' => 'Prepnúť do \'[username]\'',
 'substitute_user' => 'Nahradiť používateľa',
 'success_add_aro' => '',
 'success_add_permission' => '',
-'success_remove_permission' => '',
+'success_remove_permission' => 'Oprávnenie bolo odstránené',
 'success_toogle_permission' => '',
 'sunday' => 'Nedeľa',
-'sunday_abbr' => '',
+'sunday_abbr' => 'Ne',
 'sv_SE' => 'Švédština',
-'switched_to' => '',
+'switched_to' => 'Prepnúť na',
 'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => '',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
-'tasks' => '',
-'temp_jscode' => '',
+'tasks' => 'Úlohy',
+'temp_jscode' => 'Dočasný javascript kód',
 'testmail_body' => '',
-'testmail_subject' => '',
+'testmail_subject' => 'Testovací E-mail',
 'theme' => 'Vzhľad',
 'thursday' => 'Štvrtok',
-'thursday_abbr' => '',
+'thursday_abbr' => 'Št',
 'timeline' => 'Časová os',
-'timeline_add_file' => '',
-'timeline_add_version' => '',
-'timeline_full_add_file' => '',
-'timeline_full_add_version' => '',
-'timeline_full_status_change' => '',
-'timeline_selected_item' => '',
-'timeline_skip_add_file' => '',
-'timeline_skip_status_change_-1' => '',
-'timeline_skip_status_change_-3' => '',
+'timeline_add_file' => 'Nová príloha',
+'timeline_add_version' => 'Nová verzia [version]',
+'timeline_full_add_file' => '[document]<br/>Nová príloha',
+'timeline_full_add_version' => '[document]<br/>Nová verzia [version]',
+'timeline_full_status_change' => '[document]<br/>Verzia [version]: [status]',
+'timeline_selected_item' => 'Vybraný dokument',
+'timeline_skip_add_file' => 'príloha bola pridaná',
+'timeline_skip_status_change_-1' => 'odmietnuté',
+'timeline_skip_status_change_-3' => 'expirovaný',
 'timeline_skip_status_change_0' => '',
 'timeline_skip_status_change_1' => '',
-'timeline_skip_status_change_2' => '',
+'timeline_skip_status_change_2' => 'uvoľnený',
 'timeline_skip_status_change_3' => '',
 'timeline_skip_status_change_4' => '',
-'timeline_skip_status_change_5' => '',
+'timeline_skip_status_change_5' => 'návrh',
 'timeline_status_change' => 'Verzia [version]: [status]',
 'to' => 'Do',
 'toggle_manager' => 'Prepnúť stav manager',
-'toggle_qrcode' => '',
+'toggle_qrcode' => 'Ukázať/skryť QR kód',
 'to_before_from' => '',
-'transfer_objects' => '',
-'transfer_objects_to_user' => '',
+'transfer_objects' => 'Prenesené objekty',
+'transfer_objects_to_user' => 'Nový vlastník',
 'transition_triggered_email' => '',
 'transition_triggered_email_body' => '',
 'transition_triggered_email_subject' => '',
 'transmittal' => '',
 'transmittalitem_removed' => '',
-'transmittalitem_updated' => '',
-'transmittal_comment' => '',
-'transmittal_name' => '',
-'transmittal_size' => '',
+'transmittalitem_updated' => 'Dokument bol aktualizovaný na najnovšiu verziu',
+'transmittal_comment' => 'Komentár',
+'transmittal_name' => 'Názov',
+'transmittal_size' => 'Veľkosť',
 'tree_loading' => 'Prosím počkajte kým sa nahrá strom dokumentov...',
 'trigger_workflow' => '',
 'tr_TR' => 'Turecky',
 'tuesday' => 'Utorok',
-'tuesday_abbr' => '',
-'type_of_hook' => '',
+'tuesday_abbr' => 'Ut',
+'type_of_hook' => 'Typ',
 'type_to_search' => 'Vyhľadať typ',
 'uk_UA' => 'Ukrajinsky',
 'under_folder' => 'V zložke',
-'unknown_attrdef' => '',
+'unknown_attrdef' => 'Neznáme definovanie atribútu',
 'unknown_command' => 'Príkaz nebol rozpoznaný.',
 'unknown_document_category' => 'Neznáma kategória',
 'unknown_group' => 'Neznámy ID skupiny',
@@ -1413,10 +1415,10 @@ URL: [url]',
 'unknown_keyword_category' => 'Neznáma kategória',
 'unknown_owner' => 'Neznámy ID vlastníka',
 'unknown_user' => 'Neznámy ID používateľa',
-'unlinked_content' => '',
-'unlinked_documents' => '',
-'unlinked_folders' => '',
-'unlinking_objects' => '',
+'unlinked_content' => 'Obsah bol odpojený',
+'unlinked_documents' => 'Dokumenty boli odpojené',
+'unlinked_folders' => 'Zložky boli odpojené',
+'unlinking_objects' => 'Odpojenie obsahu',
 'unlock_cause_access_mode_all' => 'Môžete ho stále aktualizovať, pretože máte režim prístupu "all". Zámok bude automaticky odstránený.',
 '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úť',
@@ -1436,12 +1438,12 @@ URL: [url]',
 'uploading_zerosize' => 'Nahrávate prázdny súbor. Nahrávanie je zrušené.',
 'used_discspace' => 'Využitý priestor na disku',
 'user' => 'Používateľ',
-'userid_groupid' => '',
+'userid_groupid' => 'Používateľ id/Skupina id',
 'users' => 'Používateľ',
-'users_and_groups' => '',
-'users_done_work' => '',
+'users_and_groups' => 'Používatelia/Skupiny',
+'users_done_work' => 'Práca používateľov',
 'user_exists' => 'Používateľ už existuje.',
-'user_group' => '',
+'user_group' => 'Používateľ/Skupina',
 'user_group_management' => 'Správa užívateľov/skupín',
 'user_image' => 'Obrázok',
 'user_info' => 'Informácie o používateľovi',
@@ -1450,30 +1452,30 @@ URL: [url]',
 'user_management' => 'Používatelia',
 'user_name' => 'Plné meno',
 'use_comment_of_document' => 'Použite komentár dokumentu',
-'use_default_categories' => '',
+'use_default_categories' => 'Použiť preddefinované kategórie',
 'use_default_keywords' => 'Použiť preddefinované kľúčové slová',
-'valid_till' => '',
+'valid_till' => 'Platný do',
 'version' => 'Verzia',
 'versioning_file_creation' => 'Vytvorenie verziovacieho súboru',
 'versioning_file_creation_warning' => 'Touto akciou môžete vytvoriť súbor, obsahujúci verziovaciu informáciu celej DMS zložky. Po vytvorení bude každý súbor uložený do zložky súborov.',
 'versioning_info' => 'Informácie o verziách',
-'versiontolow' => '',
+'versiontolow' => 'Verzia je nízka',
 'version_deleted_email' => 'Verzia zmazana',
-'version_deleted_email_body' => '',
-'version_deleted_email_subject' => '',
+'version_deleted_email_body' => 'Verzia bola zmazaná Dokument: [name] Verzia: [version] Nadradená zložka: [folder_path] Používateľ: [username] URL: [url]',
+'version_deleted_email_subject' => '[sitename]: [name] - Verzia bola odstránená',
 'version_info' => 'Informácie o verzii',
 'view' => 'Zobraziť',
 'view_online' => 'Zobraziť online',
 'warning' => 'Upozornenie',
 'wednesday' => 'Streda',
-'wednesday_abbr' => '',
-'weeks' => '',
+'wednesday_abbr' => 'St',
+'weeks' => 'týždne',
 'week_view' => 'Týždeň',
 'workflow' => '',
 'workflows_involded' => '',
 'workflow_actions_management' => '',
 'workflow_action_in_use' => '',
-'workflow_action_name' => '',
+'workflow_action_name' => 'Názov',
 'workflow_editor' => '',
 'workflow_group_summary' => '',
 'workflow_has_cycle' => '',
@@ -1481,7 +1483,7 @@ URL: [url]',
 'workflow_in_use' => '',
 'workflow_layoutdata_saved' => '',
 'workflow_management' => '',
-'workflow_name' => '',
+'workflow_name' => 'Názov',
 'workflow_no_doc_rejected_state' => '',
 'workflow_no_doc_released_state' => '',
 'workflow_no_initial_state' => '',
@@ -1489,9 +1491,9 @@ URL: [url]',
 'workflow_save_layout' => '',
 'workflow_state' => '',
 'workflow_states_management' => '',
-'workflow_state_docstatus' => '',
+'workflow_state_docstatus' => 'Stav dokumentu',
 'workflow_state_in_use' => '',
-'workflow_state_name' => '',
+'workflow_state_name' => 'Názov',
 'workflow_summary' => '',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => '',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 5cb96ec1b..2d9fcb476 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -537,6 +537,7 @@ URL: [url]',
 'fullsearch' => 'Fulltext-sökning',
 'fullsearch_hint' => 'Använd fulltext-index',
 'fulltextsearch_disabled' => '',
+'fulltext_converters' => 'Omvandling av indexdokument',
 'fulltext_info' => 'Fulltext-indexinfo',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Attributdefinitioner',
@@ -575,7 +576,6 @@ URL: [url]',
 'include_documents' => 'Inkludera dokument',
 'include_subdirectories' => 'Inkludera under-kataloger',
 'indexing_tasks_in_queue' => '',
-'index_converters' => 'Omvandling av indexdokument',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Index mapp',
@@ -836,6 +836,7 @@ Om du fortfarande har problem med inloggningen, kontakta administratören.',
 'password_strength' => 'Lösenordskvalitet',
 'password_strength_insuffient' => 'För låg kvalitet på lösenordet',
 'password_wrong' => 'Fel lösenord',
+'pdf_converters' => '',
 'pending_approvals' => '',
 'pending_receipt' => '',
 'pending_reviews' => '',
@@ -849,6 +850,7 @@ Om du fortfarande har problem med inloggningen, kontakta administratören.',
 'preview_converters' => '',
 'preview_images' => '',
 'preview_markdown' => '',
+'preview_pdf' => '',
 'preview_plain' => '',
 'previous_state' => 'Föregående status',
 'previous_versions' => 'Tidigare versioner',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 4d0140d2d..b0313aabb 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -543,6 +543,7 @@ URL: [url]',
 'fullsearch' => 'Tam metinde ara',
 'fullsearch_hint' => 'Tam metin indeks kullan',
 'fulltextsearch_disabled' => '',
+'fulltext_converters' => 'Doküman dönüştürmeyi indeksle',
 'fulltext_info' => 'Tam metin indeks bilgi',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Nitelikler',
@@ -581,7 +582,6 @@ URL: [url]',
 'include_documents' => 'Dokümanları kapsa',
 'include_subdirectories' => 'Alt klasörleri kapsa',
 'indexing_tasks_in_queue' => '',
-'index_converters' => 'Doküman dönüştürmeyi indeksle',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Klasörü indeksle',
@@ -847,6 +847,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
 'password_strength' => 'Parola güvenlik düzeyi',
 'password_strength_insuffient' => 'Parola güvenlik düzeyi yetersiz',
 'password_wrong' => 'Yanlış parola',
+'pdf_converters' => '',
 'pending_approvals' => '',
 'pending_receipt' => '',
 'pending_reviews' => '',
@@ -860,6 +861,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
 'preview_converters' => '',
 'preview_images' => '',
 'preview_markdown' => '',
+'preview_pdf' => '',
 'preview_plain' => '',
 'previous_state' => 'Önceki durum',
 'previous_versions' => 'Önceki versiyonlar',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index bfa8abdd9..975bed8eb 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -549,6 +549,7 @@ URL: [url]',
 'fullsearch' => 'Повнотекстовий пошук',
 'fullsearch_hint' => 'Використовувати повнотекстовий індекс',
 'fulltextsearch_disabled' => '',
+'fulltext_converters' => 'Індексування документів',
 'fulltext_info' => 'Інформація про повнотекстовий індекс',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Атрибути',
@@ -587,7 +588,6 @@ URL: [url]',
 'include_documents' => 'Включно з документами',
 'include_subdirectories' => 'Включно з підкаталогами',
 'indexing_tasks_in_queue' => '',
-'index_converters' => 'Індексування документів',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Каталог індексу',
@@ -848,6 +848,7 @@ URL: [url]',
 'password_strength' => 'Надійність пароля',
 'password_strength_insuffient' => 'Недостатня надійність пароля',
 'password_wrong' => 'Невірний пароль',
+'pdf_converters' => '',
 'pending_approvals' => 'Очікує затвердження',
 'pending_receipt' => '',
 'pending_reviews' => 'Очікує рецензії',
@@ -861,6 +862,7 @@ URL: [url]',
 'preview_converters' => 'Попередній перегляд перетворення документу',
 'preview_images' => '',
 'preview_markdown' => 'Markdown',
+'preview_pdf' => '',
 'preview_plain' => 'Текст',
 'previous_state' => 'Попередній стан',
 'previous_versions' => 'Попередні версії',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 799dcd108..424faa36e 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -547,6 +547,7 @@ URL: [url]',
 'fullsearch' => '全文搜索',
 'fullsearch_hint' => '使用全文索引',
 'fulltextsearch_disabled' => '全文索引已禁用',
+'fulltext_converters' => '索引文件转换',
 'fulltext_info' => '全文索引信息',
 'global_attributedefinitiongroups' => '属性组',
 'global_attributedefinitions' => '属性',
@@ -585,7 +586,6 @@ URL: [url]',
 'include_documents' => '包含文档',
 'include_subdirectories' => '包含子目录',
 'indexing_tasks_in_queue' => '队列中的检索任务',
-'index_converters' => '索引文件转换',
 'index_done' => '已完成',
 'index_error' => '系统错误',
 'index_folder' => '索引目录',
@@ -849,6 +849,7 @@ URL: [url]',
 'password_strength' => '密码强度',
 'password_strength_insuffient' => '密码强度不够',
 'password_wrong' => '密码错误',
+'pdf_converters' => '',
 'pending_approvals' => '待处理的审核',
 'pending_receipt' => '待处理的接收',
 'pending_reviews' => '待处理的校对',
@@ -862,6 +863,7 @@ URL: [url]',
 'preview_converters' => '预览文档',
 'preview_images' => '预览图片',
 'preview_markdown' => 'Markdown',
+'preview_pdf' => '',
 'preview_plain' => 'TEXT',
 'previous_state' => 'Previous state',
 'previous_versions' => '先前版本',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 9fa589e4f..29c7eb25c 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -472,6 +472,7 @@ URL: [url]',
 'fullsearch' => '全文檢索搜尋',
 'fullsearch_hint' => '使用全文索引',
 'fulltextsearch_disabled' => '',
+'fulltext_converters' => '索引檔轉換',
 'fulltext_info' => '全文索引資訊',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => '屬性',
@@ -510,7 +511,6 @@ URL: [url]',
 'include_documents' => '包含文檔',
 'include_subdirectories' => '包含子目錄',
 'indexing_tasks_in_queue' => '',
-'index_converters' => '索引檔轉換',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => '索引目錄',
@@ -736,6 +736,7 @@ URL: [url]',
 'password_strength' => '密碼強度',
 'password_strength_insuffient' => '',
 'password_wrong' => '',
+'pdf_converters' => '',
 'pending_approvals' => '',
 'pending_receipt' => '',
 'pending_reviews' => '',
@@ -749,6 +750,7 @@ URL: [url]',
 'preview_converters' => '',
 'preview_images' => '',
 'preview_markdown' => '',
+'preview_pdf' => '',
 'preview_plain' => '',
 'previous_state' => '',
 'previous_versions' => '先前版本',

From 4f3548d44a9d8f7d12f5492499240c60bca11c12 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 24 Nov 2017 09:25:22 +0100
Subject: [PATCH 087/308] add changes for 5.1.5

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

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index f1a9e9dee..98dc47447 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>
+- use views instead of temp. tables
+- add list of expired documents in SeedDMS_Core_DMS::getDocumentList()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

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 088/308] 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 3c1cfe3a0d7d95a26e3d8e63c10f2332c7550b31 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Dec 2017 10:57:25 +0100
Subject: [PATCH 089/308] support wildcard in mimetypes of converters

---
 SeedDMS_Lucene/Lucene/IndexedDocument.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Lucene/Lucene/IndexedDocument.php b/SeedDMS_Lucene/Lucene/IndexedDocument.php
index 54dbb2676..32720007a 100644
--- a/SeedDMS_Lucene/Lucene/IndexedDocument.php
+++ b/SeedDMS_Lucene/Lucene/IndexedDocument.php
@@ -124,10 +124,17 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 		if($version && !$nocontent) {
 			$path = $dms->contentDir . $version->getPath();
 			$content = '';
-			$fp = null;
 			$mimetype = $version->getMimeType();
+			$cmd = '';
+			$mimeparts = explode('/', $mimetype, 2);
 			if(isset($_convcmd[$mimetype])) {
 				$cmd = sprintf($_convcmd[$mimetype], $path);
+			} elseif(isset($_convcmd[$mimeparts[0].'/*'])) {
+				$cmd = sprintf($_convcmd[$mimetype], $path);
+			} elseif(isset($_convcmd['*'])) {
+				$cmd = sprintf($_convcmd[$mimetype], $path);
+			}
+			if($cmd) {
 				try {
 					$content = self::execWithTimeout($cmd, $timeout);
 					if($content) {

From 4c16edf988b66e595108812aabd82a644bc91ac9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Dec 2017 10:58:42 +0100
Subject: [PATCH 090/308] new version 1.1.11

---
 SeedDMS_Lucene/package.xml | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Lucene/package.xml b/SeedDMS_Lucene/package.xml
index 774715d7b..4d1d826ca 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>2017-03-01</date>
- <time>15:55:32</time>
+ <date>2017-12-04</date>
+ <time>10:58:13</time>
  <version>
-  <release>1.1.10</release>
-  <api>1.1.10</api>
+  <release>1.1.11</release>
+  <api>1.1.11</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-catch exception in execWithTimeout()
+allow conversion commands for mimetypes with wildcards
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -251,5 +251,21 @@ pass variables to stream_select() to fullfill strict standards.
 make all functions in Indexer.php static
    </notes>
   </release>
+  <release>
+   <date>2017-03-01</date>
+   <time>15:55:32</time>
+   <version>
+    <release>1.1.10</release>
+    <api>1.1.10</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+catch exception in execWithTimeout()
+   </notes>
+  </release>
  </changelog>
 </package>

From 76bc672f5c6b5554911cada6d19f1f17d97b2e82 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Dec 2017 10:59:07 +0100
Subject: [PATCH 091/308] new method addConverter()

---
 SeedDMS_Preview/Preview/Base.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/SeedDMS_Preview/Preview/Base.php b/SeedDMS_Preview/Preview/Base.php
index e09470330..897c54d4a 100644
--- a/SeedDMS_Preview/Preview/Base.php
+++ b/SeedDMS_Preview/Preview/Base.php
@@ -103,6 +103,19 @@ class SeedDMS_Preview_Base {
 	 * and the value is the command to be called for creating the preview
 	 */
 	function setConverters($arr) { /* {{{ */
+		$this->converters = $arr;
+	} /* }}} */
+
+	/**
+	 * Add a list of converters
+	 *
+	 * Merges the list of passed converters with the already existing ones.
+	 * Existing converters will be overwritten.
+	 *
+	 * @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 addConverters($arr) { /* {{{ */
 		$this->converters = array_merge($this->converters, $arr);
 	} /* }}} */
 

From 7bd625c8fb0f3ac056107a5746b07f5d3a6e4236 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Dec 2017 10:59:48 +0100
Subject: [PATCH 092/308] new version 1.2.6

---
 SeedDMS_Preview/package.xml | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index 208170a4e..3d99daa0b 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>2017-10-11</date>
- <time>07:14:32</time>
+ <date>2017-12-04</date>
+ <time>10:59:39</time>
  <version>
-  <release>1.2.5</release>
+  <release>1.2.6</release>
   <api>1.2.0</api>
  </version>
  <stability>
@@ -23,7 +23,8 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-SeedDMS_Preview_Base::hasConvertert() returns only try if command is set
+SeedDMS_Preview_Base::setConverters() overrides existing converters.
+New method SeedDMS_Preview_Base::addConverters() merges new converters with old ones.
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -319,5 +320,21 @@ createPreview() returns false if running the converter command fails
 fix typo in converter for tar.gz files
    </notes>
   </release>
+  <release>
+   <date>2017-10-11</date>
+   <time>07:14:32</time>
+   <version>
+    <release>1.2.5</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>
+SeedDMS_Preview_Base::hasConverter() returns only try if command is set
+   </notes>
+  </release>
  </changelog>
 </package>

From 2a08a3bbaf2750c2895067ff79b31a564960f323 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Dec 2017 11:00:04 +0100
Subject: [PATCH 093/308] allow wildcard in mimetypes of converters

---
 SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
index 5d2914074..5a8e1cbfc 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
@@ -129,10 +129,17 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 		if($version && !$nocontent) {
 			$path = $dms->contentDir . $version->getPath();
 			$content = '';
-			$fp = null;
 			$mimetype = $version->getMimeType();
+			$cmd = '';
+			$mimeparts = explode('/', $mimetype, 2);
 			if(isset($_convcmd[$mimetype])) {
 				$cmd = sprintf($_convcmd[$mimetype], $path);
+			} elseif(isset($_convcmd[$mimeparts[0].'/*'])) {
+				$cmd = sprintf($_convcmd[$mimetype], $path);
+			} elseif(isset($_convcmd['*'])) {
+				$cmd = sprintf($_convcmd[$mimetype], $path);
+			}
+			if($cmd) {
 				try {
 					$content = self::execWithTimeout($cmd, $timeout);
 					if($content) {

From 552a74ba9f66decbedfda28233385bda8e070242 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Dec 2017 11:00:56 +0100
Subject: [PATCH 094/308] new version 1.0.8

---
 SeedDMS_SQLiteFTS/package.xml | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml
index 62167bb8e..89c93b4f4 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>2017-03-01</date>
- <time>15:53:24</time>
+ <date>2017-12-04</date>
+ <time>11:00:40</time>
  <version>
-  <release>1.0.7</release>
-  <api>1.0.7</api>
+  <release>1.0.8</release>
+  <api>1.0.8</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-catch exception in execWithTimeout()
+allow conversion commands for mimetypes with wildcards
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -178,5 +178,21 @@ set last parameter of stream_select() to 200000 micro sec. in case the timeout i
 fix calculation of timeout (see bug #269)
    </notes>
   </release>
+  <release>
+   <date>2017-03-01</date>
+   <time>15:53:24</time>
+   <version>
+    <release>1.0.7</release>
+    <api>1.0.7</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+catch exception in execWithTimeout()
+   </notes>
+  </release>
  </changelog>
 </package>

From 3e7f22fd69744406837fb2f67687795b5cfc2c2a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Dec 2017 11:08:59 +0100
Subject: [PATCH 095/308] remove some spaces in html output

---
 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 6a4cea6b8..72574c51c 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -737,7 +737,7 @@ if(!is_writeable($settings->_configFilePath)) {
 <?php
   foreach(array('fulltext', 'preview', 'pdf') as $target) {
 ?>
-      <tr ><td><b> <?php printMLText($target."_converters");?></b></td> </tr>
+      <tr><td><b><?php printMLText($target."_converters");?></b></td></tr>
 <?php
 	foreach($settings->_converters[$target] as $mimetype=>$cmd) {
 ?>

From b52ed03cf9828d71070109ef86f66f5c9a12dae8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Dec 2017 12:00:53 +0100
Subject: [PATCH 096/308] fix error msg if group id isn't passed

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

diff --git a/out/out.RemoveGroup.php b/out/out.RemoveGroup.php
index 0dc75c962..e1ffe181e 100644
--- a/out/out.RemoveGroup.php
+++ b/out/out.RemoveGroup.php
@@ -34,7 +34,7 @@ if (!$user->isAdmin()) {
 }
 
 if (!isset($_GET["groupid"]) || !is_numeric($_GET["groupid"]) || intval($_GET["groupid"])<1) {
-	UI::exitError(getMLText("rm_group"),getMLText("invalid_user_id"));
+	UI::exitError(getMLText("rm_group"),getMLText("invalid_group_id"));
 }
 $group = $dms->getGroup(intval($_GET["groupid"]));
 

From d2baa6ec009951acb9958d88c1aeb8388215b8f5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Dec 2017 12:01:29 +0100
Subject: [PATCH 097/308] add action menu

---
 views/bootstrap/class.GroupMgr.php | 41 +++++++++++++++++-------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/views/bootstrap/class.GroupMgr.php b/views/bootstrap/class.GroupMgr.php
index 6b039eb55..fba7d6773 100644
--- a/views/bootstrap/class.GroupMgr.php
+++ b/views/bootstrap/class.GroupMgr.php
@@ -147,6 +147,28 @@ $(document).ready( function() {
 		}
 	} /* }}} */
 
+	function actionmenu() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$selgroup = $this->params['selgroup'];
+
+		if($selgroup) {
+?>
+<div class="btn-group">
+  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+		<?php echo getMLText('action'); ?>
+    <span class="caret"></span>
+  </a>
+  <ul class="dropdown-menu">
+<?php
+			echo '<li><a href="../out/out.RemoveGroup.php?groupid='.$selgroup->getID().'"><i class="icon-remove"></i> '.getMLText("rm_group").'</a><li>';
+?>
+	</ul>
+</div>
+<?php
+		}
+	} /* }}} */
+
 	function showGroupForm($group) { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -169,17 +191,6 @@ $(document).ready( function() {
 		}
 ?>
 
-<?php
-		if($group) {
-?>
-		<div class="control-group">
-			<div class="controls">
-				<a href="../out/out.RemoveGroup.php?groupid=<?php print $group->getID();?>" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_group");?></a>
-			</div>
-		</div>
-<?php
-		}
-?>
 		<div class="control-group">
 			<label class="control-label"><?php printMLText("name");?>:</label>
 			<div class="controls">
@@ -281,11 +292,7 @@ $(document).ready( function() {
 
 <div class="row-fluid">
 <div class="span4">
-<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_group")?></option>
 <option value="0"><?php echo getMLText("add_group")?></option>
@@ -295,10 +302,8 @@ $(document).ready( function() {
 		}
 ?>
 </select>
-		</div>
-	</div>
 </form>
-</div>
+	<div class="ajax" style="margin-bottom: 15px;" data-view="GroupMgr" data-action="actionmenu" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>
 	<div class="ajax" data-view="GroupMgr" data-action="info" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>
 </div>
 

From 334f24a02cf5920db452d7d1046716ccabafd338 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Dec 2017 12:33:16 +0100
Subject: [PATCH 098/308] move remove button below selection menu

---
 views/bootstrap/class.AttributeMgr.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index 5acf0d580..1ccf9295a 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -145,17 +145,24 @@ $(document).ready( function() {
 		}
 	} /* }}} */
 
-	function showAttributeForm($attrdef) { /* {{{ */
-		if($attrdef && !$attrdef->isUsed()) {
+	function actionmenu() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$selattrdef = $this->params['selattrdef'];
+
+		if($selattrdef && !$selattrdef->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="attrdefid" value="<?php echo $selattrdef->getID()?>">
 				<input type="hidden" name="action" value="removeattrdef">
 				<button type="submit" class="btn"><i class="icon-remove"></i> <?php echo getMLText("rm_attrdef")?></button>
 			</form>
 <?php
 		}
+	} /* }}} */
+
+	function showAttributeForm($attrdef) { /* {{{ */
 ?>
 			<form class="form-horizontal" action="../op/op.AttributeMgr.php" method="post">
 <?php
@@ -282,11 +289,7 @@ $(document).ready( function() {
 
 <div class="row-fluid">
 <div class="span6">
-<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" class="input-xlarge">
 		<option value="-1"><?php echo getMLText("choose_attrdef")?></option>
 		<option value="0"><?php echo getMLText("new_attrdef")?></option>
@@ -329,10 +332,8 @@ $(document).ready( function() {
 		}
 ?>
 	</select>
-		</div>
-	</div>
 </form>
-</div>
+	<div class="ajax" style="margin-bottom: 15px;" data-view="AttributeMgr" data-action="actionmenu" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div>
 	<div class="ajax" data-view="AttributeMgr" data-action="info" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div>
 </div>
 

From c21388fd72256366eee1abb767098a77d2d88223 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Dec 2017 13:45:48 +0100
Subject: [PATCH 099/308] place remove button in left column

---
 views/bootstrap/class.Categories.php | 37 +++++++++-------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/views/bootstrap/class.Categories.php b/views/bootstrap/class.Categories.php
index 201d4e8c3..a7747e567 100644
--- a/views/bootstrap/class.Categories.php
+++ b/views/bootstrap/class.Categories.php
@@ -56,34 +56,25 @@ $(document).ready( function() {
 		}
 	} /* }}} */
 
-	function showCategoryForm($category) { /* {{{ */
-?>
-				<div class="control-group">
-					<label class="control-label"></label>
+	function actionmenu() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$selcat = $this->params['selcategory'];
 
-					<div class="controls">
-<?php
-		if($category) {
-			if($category->isUsed()) {
-?>
-						<p><?php echo getMLText('category_in_use') ?></p>
-<?php
-			} else {
+		if($selcat && !$selcat->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="categoryid" value="<?php echo $selcat->getID()?>">
 						<input type="hidden" name="action" value="removecategory">
 						<button class="btn" type="submit"><i class="icon-remove"></i> <?php echo getMLText("rm_document_category")?></button>
 						</form>
 <?php
-			}
 		}
+	} /* }}} */
+
+	function showCategoryForm($category) { /* {{{ */
 ?>
-					</div>
-				</div>
-
-
 				<form class="form-horizontal" style="margin-bottom: 0px;" action="../op/op.Categories.php" method="post">
 				<?php if(!$category) { ?>
 					<?php echo createHiddenFieldWithKey('addcategory'); ?>
@@ -130,12 +121,8 @@ $(document).ready( function() {
 ?>
 <div class="row-fluid">
 	<div class="span4">
-		<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 id="selector" class="input-xlarge">
+			<select class="chzn-select" id="selector" class="input-xlarge">
 				<option value="-1"><?php echo getMLText("choose_category")?>
 				<option value="0"><?php echo getMLText("new_document_category")?>
 <?php
@@ -144,10 +131,8 @@ $(document).ready( function() {
 				}
 ?>
 			</select>
-		</div>
-	</div>
 </form>
-		</div>
+	<div class="ajax" style="margin-bottom: 15px;" data-view="Categories" data-action="actionmenu" <?php echo ($selattrdef ? "data-query=\"categoryid=".$selcat->getID()."\"" : "") ?>></div>
 		<div class="ajax" data-view="Categories" data-action="info" <?php echo ($selcat ? "data-query=\"categoryid=".$selcat->getID()."\"" : "") ?>></div>
 	</div>
 

From 822e6c13f2328406fc7a49247428780cfb2cf097 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Dec 2017 15:22:48 +0100
Subject: [PATCH 100/308] add optional parameters to getDocumentsByCategory,
 new method countDocumentsByCategory

---
 SeedDMS_Core/Core/inc.ClassDocumentCategory.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocumentCategory.php b/SeedDMS_Core/Core/inc.ClassDocumentCategory.php
index 76011efd0..c859352fb 100644
--- a/SeedDMS_Core/Core/inc.ClassDocumentCategory.php
+++ b/SeedDMS_Core/Core/inc.ClassDocumentCategory.php
@@ -98,10 +98,14 @@ class SeedDMS_Core_DocumentCategory {
 		return true;
 	} /* }}} */
 
-	function getDocumentsByCategory() { /* {{{ */
+	function getDocumentsByCategory($limit=0, $offset=0) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$queryStr = "SELECT * FROM `tblDocumentCategory` where `categoryID`=".$this->_id;
+		if($limit && is_numeric($limit))
+			$queryStr .= " LIMIT ".(int) $limit;
+		if($offset && is_numeric($offset))
+			$queryStr .= " OFFSET ".(int) $offset;
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && !$resArr)
 			return false;
@@ -113,6 +117,17 @@ class SeedDMS_Core_DocumentCategory {
 		return $documents;
 	} /* }}} */
 
+	function countDocumentsByCategory() { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$queryStr = "SELECT COUNT(*) as `c` FROM `tblDocumentCategory` where `categoryID`=".$this->_id;
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && !$resArr)
+			return false;
+
+		return $resArr[0]['c'];
+	} /* }}} */
+
 }
 
 ?>

From bfcca8f83e71e2fafd904c3d0791f816b6c419aa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Dec 2017 15:23:27 +0100
Subject: [PATCH 101/308] show list of documents in selected category

---
 views/bootstrap/class.Categories.php | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.Categories.php b/views/bootstrap/class.Categories.php
index a7747e567..e65b73ab4 100644
--- a/views/bootstrap/class.Categories.php
+++ b/views/bootstrap/class.Categories.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 Categories view
  *
@@ -46,13 +51,30 @@ $(document).ready( function() {
 	function info() { /* {{{ */
 		$dms = $this->params['dms'];
 		$selcat = $this->params['selcategory'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
 
 		if($selcat) {
 			$this->contentHeading(getMLText("category_info"));
-			$documents = $selcat->getDocumentsByCategory();
+			$c = $selcat->countDocumentsByCategory();
 			echo "<table class=\"table table-condensed\">\n";
-			echo "<tr><td>".getMLText('document_count')."</td><td>".(count($documents))."</td></tr>\n";
+			echo "<tr><td>".getMLText('document_count')."</td><td>".($c)."</td></tr>\n";
 			echo "</table>";
+
+			$documents = $selcat->getDocumentsByCategory(10);
+			print "<table id=\"viewfolder-table\" class=\"table\">";
+			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";
+			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+			foreach($documents as $doc) {
+				echo $this->documentListRow($doc, $previewer);
+			}
+			print "</tbody></table>";
 		}
 	} /* }}} */
 
@@ -132,7 +154,7 @@ $(document).ready( function() {
 ?>
 			</select>
 </form>
-	<div class="ajax" style="margin-bottom: 15px;" data-view="Categories" data-action="actionmenu" <?php echo ($selattrdef ? "data-query=\"categoryid=".$selcat->getID()."\"" : "") ?>></div>
+	<div class="ajax" style="margin-bottom: 15px;" data-view="Categories" data-action="actionmenu" <?php echo ($selcat ? "data-query=\"categoryid=".$selcat->getID()."\"" : "") ?>></div>
 		<div class="ajax" data-view="Categories" data-action="info" <?php echo ($selcat ? "data-query=\"categoryid=".$selcat->getID()."\"" : "") ?>></div>
 	</div>
 

From 36b23b2bbc12d72554173084955a6d501d62f580 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Dec 2017 15:24:00 +0100
Subject: [PATCH 102/308] pass parameters for previewer

---
 out/out.Categories.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/out/out.Categories.php b/out/out.Categories.php
index 12f809dc3..5c359fe0e 100644
--- a/out/out.Categories.php
+++ b/out/out.Categories.php
@@ -45,5 +45,9 @@ if(isset($_GET['categoryid']) && $_GET['categoryid']) {
 if($view) {
 	$view->setParam('categories', $categories);
 	$view->setParam('selcategory', $selcat);
+	$view->setParam('showtree', showtree());
+	$view->setParam('cachedir', $settings->_cacheDir);
+	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view($_GET);
 }

From ecda0212897d644e6c682e59ffc0da24d2730b68 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Dec 2017 16:01:40 +0100
Subject: [PATCH 103/308] start new version 5.1.5

---
 CHANGELOG | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 215475164..324e51a3e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.5
+--------------------------------------------------------------------------------
+- converters for image previews and pdf previews can be configured in settings
+- show list of documents having the selected category on page for managing
+  categories
+- use same layout group, category manager as already used in user manager
+
 --------------------------------------------------------------------------------
                      Changes in version 5.1.4
 --------------------------------------------------------------------------------

From 795b6c52e27ca1c1f81cf958a1c618e89e963fe1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 5 Dec 2017 08:26:40 +0100
Subject: [PATCH 104/308] add scripts for modifying attachments

---
 controllers/class.EditDocumentFile.php     | 68 ++++++++++++++++
 op/op.EditDocumentFile.php                 | 82 +++++++++++++++++++
 out/out.EditDocumentFile.php               | 71 +++++++++++++++++
 views/bootstrap/class.EditDocumentFile.php | 92 ++++++++++++++++++++++
 4 files changed, 313 insertions(+)
 create mode 100644 controllers/class.EditDocumentFile.php
 create mode 100644 op/op.EditDocumentFile.php
 create mode 100644 out/out.EditDocumentFile.php
 create mode 100644 views/bootstrap/class.EditDocumentFile.php

diff --git a/controllers/class.EditDocumentFile.php b/controllers/class.EditDocumentFile.php
new file mode 100644
index 000000000..a789057f5
--- /dev/null
+++ b/controllers/class.EditDocumentFile.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Implementation of EditDocumentFile 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 editing 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_EditDocumentFile extends SeedDMS_Controller_Common {
+
+	public function run() {
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$settings = $this->params['settings'];
+		$document = $this->params['document'];
+		$file = $this->params['file'];
+
+		if(false === $this->callHook('preEditDocumentFile')) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_preEditDocumentFile_failed';
+			return null;
+		}
+
+		$result = $this->callHook('editDocumentFile', $document);
+		if($result === null) {
+			$name = $this->params['name'];
+			$oldname = $file->getName();
+			if($oldname != $name)
+				if(!$file->setName($name))
+					return false;
+
+			$comment = $this->params['comment'];
+			if(($oldcomment = $file->getComment()) != $comment)
+				if(!$file->setComment($comment))
+					return false;
+
+			$version = $this->params["version"];
+			$oldversion = $file->getVersion();
+			if ($oldversion != $version)
+				if(!$file->setVersion($version))
+					return false;
+
+			$public = $this->params["public"];
+			$file->setPublic($public == 'true' ? 1 : 0);
+
+			if(!$this->callHook('postEditDocumentFile')) {
+			}
+
+		} else
+			return $result;
+
+		return true;
+	}
+}
diff --git a/op/op.EditDocumentFile.php b/op/op.EditDocumentFile.php
new file mode 100644
index 000000000..2f93436f6
--- /dev/null
+++ b/op/op.EditDocumentFile.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
+//    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.Authentication.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$controller = Controller::factory($tmp[1]);
+
+/* Check if the form data comes from a trusted request */
+if(!checkFormKey('editdocumentfile')) {
+	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 (!isset($_POST["fileid"]) || !is_numeric($_POST["fileid"]) || intval($_POST["fileid"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_file_id"));
+}
+
+$file = $document->getDocumentFile($_POST["fileid"]);
+
+if (!is_object($file)) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_file_id"));
+}
+
+if (($document->getAccessMode($user) < M_ALL)&&($user->getID()!=$file->getUserID())) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
+}
+
+$controller->setParam('document', $document);
+$controller->setParam('file', $file);
+$controller->setParam('name', isset($_POST['name']) ? $_POST['name'] : '');
+$controller->setParam('comment', isset($_POST['comment']) ? $_POST['comment'] : '');
+$controller->setParam('version', isset($_POST['version']) ? $_POST['version'] : '');
+$controller->setParam('public', isset($_POST['public']) ? $_POST['public'] : '');
+if(!$controller->run()) {
+	if($controller->getErrorNo()) {
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())), $controller->getErrorMsg());
+	}
+}
+
+add_log_line("?documentid=".$documentid);
+
+header("Location:../out/out.ViewDocument.php?documentid=".$documentid."&currenttab=attachments");
+
+
diff --git a/out/out.EditDocumentFile.php b/out/out.EditDocumentFile.php
new file mode 100644
index 000000000..20499f566
--- /dev/null
+++ b/out/out.EditDocumentFile.php
@@ -0,0 +1,71 @@
+<?php
+//    MyDMS. Document Management System
+//    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.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 (!isset($_GET["fileid"]) || !is_numeric($_GET["fileid"]) || intval($_GET["fileid"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_file_id"));
+}
+
+$file = $document->getDocumentFile($_GET["fileid"]);
+
+if (!is_object($file)) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_file_id"));
+}
+
+if (($document->getAccessMode($user) < M_ALL)&&($user->getID()!=$file->getUserID())) {
+	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, $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);
+	$view->setParam('file', $file);
+	$view->setParam('accessobject', $accessop);
+	$view($_GET);
+	exit;
+}
+
+?>
diff --git a/views/bootstrap/class.EditDocumentFile.php b/views/bootstrap/class.EditDocumentFile.php
new file mode 100644
index 000000000..a374d4da0
--- /dev/null
+++ b/views/bootstrap/class.EditDocumentFile.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Implementation of EditDocumentFile 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 EditDocumentFile 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_EditDocumentFile extends SeedDMS_Bootstrap_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->contentStart();
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
+		$this->contentHeading(getMLText("edit"));
+		$this->contentContainerStart();
+
+?>
+<form action="../op/op.EditDocumentFile.php" class="form-horizontal" name="form1" method="post">
+  <?php echo createHiddenFieldWithKey('editdocumentfile'); ?>
+	<input type="hidden" name="documentid" value="<?php echo $document->getID()?>">
+	<input type="hidden" name="fileid" value="<?php echo $file->getID()?>">
+	<div class="control-group">
+		<label class="control-label"><?php printMLText("version");?>:</label>
+		<div class="controls"><select name="version" id="version">
+			<option value=""><?= getMLText('document') ?></option>
+<?php
+		$versions = $document->getContent();
+		foreach($versions as $version)
+			echo "<option value=\"".$version->getVersion()."\"".($version->getVersion() == $file->getVersion() ? " selected" : "").">".getMLText('version')." ".$version->getVersion()."</option>";
+?>
+		</select></div>
+	</div>
+	<div class="control-group">
+			<label class="control-label"><?php printMLText("name");?>:</label>
+			<div class="controls">
+				<input name="name" type="text" value="<?php print htmlspecialchars($file->getName());?>" />
+			</div>
+	</div>
+	<div class="control-group">
+			<label class="control-label"><?php printMLText("comment");?>:</label>
+			<div class="controls">
+				<textarea name="comment" rows="4" cols="80"><?php print htmlspecialchars($file->getComment());?></textarea>
+			</div>
+	</div>
+	<div class="control-group">
+			<label class="control-label"><?php printMLText("document_link_public");?>:</label>
+			<div class="controls">
+				<input type="checkbox" name="public" value="true"<?php echo ($file->isPublic() ? " checked" : "");?> />
+			</div>
+	</div>
+	<div class="controls">
+		<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save") ?></button>
+	</div>
+</form>
+<?php
+		$this->contentContainerEnd();
+		$this->contentEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>

From e3d1cc172b9cd2b581239dbf658b31830a3bb34c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 5 Dec 2017 08:27:14 +0100
Subject: [PATCH 105/308] add method to set name, comment, version, public flag
 of document files

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

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 9fc14d18e..dc94f8023 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -4729,6 +4729,23 @@ class SeedDMS_Core_DocumentFile { /* {{{ */
 	function getDocument() { return $this->_document; }
 	function getUserID() { return $this->_userID; }
 	function getComment() { return $this->_comment; }
+
+	/*
+	 * Set the comment of the document file
+	 *
+	 * @param $newComment string new comment of document
+	 */
+	function setComment($newComment) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		$queryStr = "UPDATE `tblDocumentFiles` SET `comment` = ".$db->qstr($newComment)." WHERE `document` = ".$this->_document->getId()." AND `id` = ". $this->_id;
+		if (!$db->getResult($queryStr))
+			return false;
+
+		$this->_comment = $newComment;
+		return true;
+	} /* }}} */
+
 	function getDate() { return $this->_date; }
 	function getDir() { return $this->_dir; }
 	function getFileType() { return $this->_fileType; }
@@ -4736,6 +4753,22 @@ class SeedDMS_Core_DocumentFile { /* {{{ */
 	function getOriginalFileName() { return $this->_orgFileName; }
 	function getName() { return $this->_name; }
 
+	/*
+	 * Set the name of the document file
+	 *
+	 * @param $newComment string new name of document
+	 */
+	function setName($newName) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		$queryStr = "UPDATE `tblDocumentFiles` SET `name` = ".$db->qstr($newName)." WHERE `document` = ".$this->_document->getId()." AND `id` = ". $this->_id;
+		if (!$db->getResult($queryStr))
+			return false;
+
+		$this->_name = $newName;
+		return true;
+	} /* }}} */
+
 	function getUser() {
 		if (!isset($this->_user))
 			$this->_user = $this->_document->_dms->getUser($this->_userID);
@@ -4748,8 +4781,43 @@ class SeedDMS_Core_DocumentFile { /* {{{ */
 
 	function getVersion() { return $this->_version; }
 
+	/*
+	 * Set the version of the document file
+	 *
+	 * @param $newComment string new version of document
+	 */
+	function setVersion($newVersion) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		if(!is_numeric($newVersion) && $newVersion != '')
+			return false;
+
+		$queryStr = "UPDATE `tblDocumentFiles` SET `version` = ".(int) $newVersion." WHERE `document` = ".$this->_document->getId()." AND `id` = ". $this->_id;
+		if (!$db->getResult($queryStr))
+			return false;
+
+		$this->_version = (int) $newVersion;
+		return true;
+	} /* }}} */
+
 	function isPublic() { return $this->_public; }
 
+	/*
+	 * Set the public flag of the document file
+	 *
+	 * @param $newComment string new comment of document
+	 */
+	function setPublic($newPublic) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		$queryStr = "UPDATE `tblDocumentFiles` SET `public` = ".($newPublic ? 1 : 0)." WHERE `document` = ".$this->_document->getId()." AND `id` = ". $this->_id;
+		if (!$db->getResult($queryStr))
+			return false;
+
+		$this->_public = $newPublic ? 1 : 0;
+		return true;
+	} /* }}} */
+
 	/**
 	 * Returns the access mode similar to a document
 	 *

From 67949fd1cc668698a658b6d70e8a92d65d408243 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 5 Dec 2017 08:28:03 +0100
Subject: [PATCH 106/308] add link for editing data of attachments

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

diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index c2ab77245..031ad5a8a 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -439,8 +439,10 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 					}
 				} 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()))
+				if (($document->getAccessMode($user) == M_ALL)||($file->getUserID()==$user->getID())) {
 					print "<li><a href=\"out.RemoveDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"icon-remove\"></i>".getMLText("delete")."</a></li>";
+					print "<li><a href=\"out.EditDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"icon-edit\"></i>".getMLText("edit")."</a></li>";
+				}
 				print "</ul></td>";		
 				
 				print "</tr>";
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 5031aaf1b..45023aebf 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1299,8 +1299,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						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>";
 				}
 				echo "</ul><ul class=\"unstyled actions\">";
-				if (($document->getAccessMode($user) == M_ALL)||($file->getUserID()==$user->getID()))
+				if (($document->getAccessMode($user) == M_ALL)||($file->getUserID()==$user->getID())) {
 					print "<li><a href=\"out.RemoveDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"icon-remove\"></i>".getMLText("delete")."</a></li>";
+					print "<li><a href=\"out.EditDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"icon-edit\"></i>".getMLText("edit")."</a></li>";
+				}
 				print "</ul></td>";		
 				
 				print "</tr>";

From b593b2471cd7ad7364e4c0edb8c236163b7288a0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 5 Dec 2017 08:29:10 +0100
Subject: [PATCH 107/308] set option name when attaching to document

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

diff --git a/views/bootstrap/class.AddFile.php b/views/bootstrap/class.AddFile.php
index e05ec8b10..2cafae90a 100644
--- a/views/bootstrap/class.AddFile.php
+++ b/views/bootstrap/class.AddFile.php
@@ -166,7 +166,7 @@ $(document).ready( function() {
 <div class="control-group">
 	<label class="control-label"><?php printMLText("version");?>:</label>
 	<div class="controls"><select name="version" id="version">
-		<option value=""></option>
+		<option value=""><?= getMLText('document') ?></option>
 <?php
 		$versions = $document->getContent();
 		foreach($versions as $version)

From 541e3ba358dd92607963ccc4ad37b32a8a243962 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 5 Dec 2017 10:12:37 +0100
Subject: [PATCH 108/308] show number or reverse links in documentListRow()

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

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index e992cbbfb..1b8e24795 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1887,6 +1887,10 @@ $(document).ready( function() {
 			$links = $document->getDocumentLinks();
 			$links = SeedDMS_Core_DMS::filterDocumentLinks($user, $links);
 
+			/* Retrieve reverse linked documents */
+			$revlinks = $document->getReverseDocumentLinks();
+			$revlinks = SeedDMS_Core_DMS::filterDocumentLinks($user, $revlinks);
+
 			$content .= "<td>";
 			if (file_exists($dms->contentDir . $latestContent->getPath())) {
 				$content .= "<a draggable=\"false\" href=\"../op/op.Download.php?documentid=".$docID."&version=".$version."\">";
@@ -1921,8 +1925,8 @@ $(document).ready( function() {
 			$content .= "<small>";
 			if(count($files))
 				$content .= count($files)." ".getMLText("linked_files")."<br />";
-			if(count($links))
-				$content .= count($links)." ".getMLText("linked_documents")."<br />";
+			if(count($links) || count($revlinks))
+				$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"]).': '.$workflow->getName().'">'.$workflowstate->getName().'</span>';

From 740b871a7a5edf1117eb078993d70a566cac3dd2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 5 Dec 2017 10:14:14 +0100
Subject: [PATCH 109/308] add note for 5.1.5

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

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 98dc47447..171905d02 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -26,6 +26,7 @@
  <notes>
 - 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
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 33881582de0f5f39722b56cf9061188c6d3b60d6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 5 Dec 2017 10:14:24 +0100
Subject: [PATCH 110/308] add entry for 5.1.5

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 324e51a3e..12f1a8146 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,8 @@
 - show list of documents having the selected category on page for managing
   categories
 - use same layout group, category manager as already used in user manager
+- meta data of attachments can be edited
+- show number of reverse document links in folder/document list
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.4

From bd616ac46e9bcfec0043013d9f29a44e19a1a3fc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 5 Dec 2017 18:30:22 +0100
Subject: [PATCH 111/308] put template func of chzn select into var and reuse
 it

---
 styles/bootstrap/application.js | 53 +++++++++++----------------------
 1 file changed, 17 insertions(+), 36 deletions(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index c4968940f..65fccac65 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -1,3 +1,16 @@
+/* Template function which outputs an option in a chzn-select */
+chzn_template_func =  function (state) {
+	var subtitle = $(state.element).data('subtitle');
+	var warning = $(state.element).data('warning');
+	var html = '<span>'+state.text+'';
+	if(subtitle)
+		html += '<br /><i>'+subtitle+'</i>';
+	if(warning)
+		html += '<br /><i class="icon-warning-sign"></i> '+warning+'';
+	html += '</span>';
+	var $newstate = $(html);
+	return $newstate;
+};
 $(document).ready( function() {
 	/* close popovers when clicking somewhere except in the popover or the
 	 * remove icon
@@ -27,28 +40,12 @@ $(document).ready( function() {
 
 	$(".chzn-select").select2({
 		width: '100%',
-		templateResult: function (state) {
-			var subtitle = $(state.element).data('subtitle');
-			var html = '<span>'+state.text+'';
-			if(subtitle)
-				html += '<br /><i>'+subtitle+'</i>';
-			html += '</span>';
-			var $newstate = $(html);
-			return $newstate;
-		}
+		templateResult: chzn_template_func
 	});
 	$(".chzn-select-deselect").select2({
 		allowClear:true,
 		width: '100%',
-		templateResult: function (state) {
-			var subtitle = $(state.element).data('subtitle');
-			var html = '<span>'+state.text+'';
-			if(subtitle)
-				html += '<br /><i>'+subtitle+'</i>';
-			html += '</span>';
-			var $newstate = $(html);
-			return $newstate;
-		}
+		templateResult: chzn_template_func
 	});
 
 	/* change the color and length of the bar graph showing the password
@@ -382,15 +379,7 @@ $(document).ready( function() {
 //			$(".chzn-select").chosen();
 			$(".chzn-select").select2({
 				width: '100%',
-				templateResult: function (state) {
-					var subtitle = $(state.element).data('subtitle');
-					var html = '<span>'+state.text+'';
-					if(subtitle)
-						html += '<br /><i>'+subtitle+'</i>';
-					html += '</span>';
-					var $newstate = $(html);
-					return $newstate;
-				}
+				templateResult: chzn_template_func
 			});
 		});
 	}); /* }}} */
@@ -424,15 +413,7 @@ $(document).ready( function() {
 //			$(".chzn-select").chosen();
 			$(".chzn-select").select2({
 				width: '100%',
-				templateResult: function (state) {
-					var subtitle = $(state.element).data('subtitle');
-					var html = '<span>'+state.text+'';
-					if(subtitle)
-						html += '<br /><i>'+subtitle+'</i>';
-					html += '</span>';
-					var $newstate = $(html);
-					return $newstate;
-				}
+				templateResult: chzn_template_func
 			});
 			$(".pwd").passStrength({ /* {{{ */
 				url: "../op/op.Ajax.php",

From b68cfe389398e75d84f4a703407cf838cf48270b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 5 Dec 2017 18:31:04 +0100
Subject: [PATCH 112/308] add SeedDMS_Core_Document::transferToUser()

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 46 +++++++++++++++++++++++++
 SeedDMS_Core/package.xml                |  1 +
 2 files changed, 47 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index dc94f8023..8c7b38442 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2429,6 +2429,52 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		return $timeline;
 	} /* }}} */
 
+	/**
+	 * Transfers the document to a new user
+	 * 
+	 * This method not just sets a new owner of the document but also
+	 * transfers the document links, attachments and locks to the new user.
+	 *
+	 * @return boolean true if successful, otherwise false
+	 */
+	function transferToUser($newuser) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		if($newuser->getId() == $this->_ownerID)
+			return true;
+
+		$db->startTransaction();
+		$queryStr = "UPDATE `tblDocuments` SET `owner` = ".$newuser->getId()." WHERE `id` = " . $this->_id;
+		if (!$db->getResult($queryStr)) {
+			$db->rollbackTransaction();
+			return false;
+		}
+
+		$queryStr = "UPDATE `tblDocumentLocks` SET `userID` = ".$newuser->getId()." WHERE `document` = " . $this->_id . " AND `userID` = ".$this->_ownerID;
+		if (!$db->getResult($queryStr)) {
+			$db->rollbackTransaction();
+			return false;
+		}
+
+		$queryStr = "UPDATE `tblDocumentLinks` SET `userID` = ".$newuser->getId()." WHERE `document` = " . $this->_id . " AND `userID` = ".$this->_ownerID;
+		if (!$db->getResult($queryStr)) {
+			$db->rollbackTransaction();
+			return false;
+		}
+
+		$queryStr = "UPDATE `tblDocumentFiles` SET `userID` = ".$newuser->getId()." WHERE `document` = " . $this->_id . " AND `userID` = ".$this->_ownerID;
+		if (!$db->getResult($queryStr)) {
+			$db->rollbackTransaction();
+			return false;
+		}
+
+		$this->_ownerID = $newuser->getID();
+		$this->_owner = $newuser;
+
+		$db->commitTransaction();
+		return true;
+	} /* }}} */
+
 } /* }}} */
 
 
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 171905d02..1aed451d0 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -27,6 +27,7 @@
 - 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()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 8a26b51ff3ebea5817946c7c0bf989fec5ac4dcf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 5 Dec 2017 18:38:06 +0100
Subject: [PATCH 113/308] documents can be transfered to another user

include document links, attachments, locks
---
 controllers/class.TransferDocument.php     | 53 ++++++++++++
 op/op.TransferDocument.php                 | 96 ++++++++++++++++++++++
 out/out.TransferDocument.php               | 67 +++++++++++++++
 views/bootstrap/class.TransferDocument.php | 85 +++++++++++++++++++
 4 files changed, 301 insertions(+)
 create mode 100644 controllers/class.TransferDocument.php
 create mode 100644 op/op.TransferDocument.php
 create mode 100644 out/out.TransferDocument.php
 create mode 100644 views/bootstrap/class.TransferDocument.php

diff --git a/controllers/class.TransferDocument.php b/controllers/class.TransferDocument.php
new file mode 100644
index 000000000..6585e3f0b
--- /dev/null
+++ b/controllers/class.TransferDocument.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Implementation of TransferDocument controller
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2017 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) 2017 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Controller_TransferDocument extends SeedDMS_Controller_Common {
+
+	public function run() {
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$settings = $this->params['settings'];
+		$document = $this->params['document'];
+		$newuser = $this->params['newuser'];
+
+		$folder = $document->getFolder();
+
+		if(false === $this->callHook('preTransferDocument')) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_preTransferDocument_failed';
+			return null;
+		}
+
+		$result = $this->callHook('transferDocument', $document);
+		if($result === null) {
+			if (!$document->transferToUser($newuser)) {
+				return false;
+			} else {
+				if(!$this->callHook('postTransferDocument')) {
+				}
+			}
+		}
+
+		return true;
+	}
+}
+
diff --git a/op/op.TransferDocument.php b/op/op.TransferDocument.php
new file mode 100644
index 000000000..62c180213
--- /dev/null
+++ b/op/op.TransferDocument.php
@@ -0,0 +1,96 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    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.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 (!$user->isAdmin()) {
+	UI::exitError(getMLText("document"),getMLText("access_denied"));
+}
+
+/* Check if the form data comes from a trusted request */
+if(!checkFormKey('transferdocument')) {
+	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 (!isset($_POST["userid"]) || !is_numeric($_POST["userid"]) || intval($_POST["userid"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+$userid = $_POST["userid"];
+$newuser = $dms->getUser($userid);
+
+if (!is_object($newuser)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+$folder = $document->getFolder();
+
+$controller->setParam('document', $document);
+$controller->setParam('newuser', $newuser);
+if(!$controller->run()) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("error_transfer_document"));
+}
+
+if ($notifier){
+	/* Get the notify list before removing the document */
+	$nl =	$document->getNotifyList();
+	$subject = "document_transfered_email_subject";
+	$message = "document_transfered_email_body";
+	$params = array();
+	$params['name'] = $document->getName();
+	$params['newuser'] = $newuser->getFullName();
+	$params['folder_path'] = $folder->getFolderPathPlain();
+	$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);
+	}
+}
+
+$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_transfer_document')));
+
+add_log_line("?documentid=".$documentid);
+
+header("Location:../out/out.ViewFolder.php?folderid=".$folder->getID());
+
+?>
+
diff --git a/out/out.TransferDocument.php b/out/out.TransferDocument.php
new file mode 100644
index 000000000..7d423e1f1
--- /dev/null
+++ b/out/out.TransferDocument.php
@@ -0,0 +1,67 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005 Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    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.ClassAccessOperation.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("document"),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"));
+}
+$document = $dms->getDocument($_GET["documentid"]);
+
+if (!is_object($document)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+$users = $dms->getAllUsers($settings->_sortUsersInList);
+if (is_bool($users)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"));
+}
+
+$folder = $document->getFolder();
+
+/* Create object for checking access to certain operations */
+$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+
+if($view) {
+	$view->setParam('folder', $folder);
+	$view->setParam('document', $document);
+	$view->setParam('allusers', $users);
+	$view->setParam('accessobject', $accessop);
+	$view($_GET);
+	exit;
+}
+
+?>
+
diff --git a/views/bootstrap/class.TransferDocument.php b/views/bootstrap/class.TransferDocument.php
new file mode 100644
index 000000000..cace14192
--- /dev/null
+++ b/views/bootstrap/class.TransferDocument.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Implementation of TransferDocument view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2017 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for TransferDocument view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2017 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_TransferDocument extends SeedDMS_Bootstrap_Style {
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$allusers = $this->params['allusers'];
+		$document = $this->params['document'];
+		$folder = $this->params['folder'];
+
+		$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("transfer_document"));
+		$this->contentContainerStart();
+?>
+<form class="form-horizontal" action="../op/op.TransferDocument.php" name="form1" method="post">
+<input type="hidden" name="documentid" value="<?php print $document->getID();?>">
+<?php echo createHiddenFieldWithKey('transferdocument'); ?>
+
+<div class="control-group">
+	<label class="control-label" for="assignTo">
+<?php printMLText("transfer_to_user"); ?>:
+	</label>
+	<div class="controls">
+<select name="userid" class="chzn-select">
+<?php
+		$owner = $document->getOwner();
+		foreach ($allusers as $currUser) {
+			if ($currUser->isGuest() || ($currUser->getID() == $owner->getID()))
+				continue;
+
+			print "<option value=\"".$currUser->getID()."\"";
+			if($folder->getAccessMode($currUser) < M_READ)
+				print " disabled data-warning=\"".getMLText('transfer_no_read_access')."\"";
+			elseif($folder->getAccessMode($currUser) < M_READWRITE)
+				print " data-warning=\"".getMLText('transfer_no_write_access')."\"";
+			print ">" . htmlspecialchars($currUser->getLogin()." - ".$currUser->getFullName());
+		}
+?>
+</select>
+	</div>
+</div>
+
+<div class="control-group">
+	<div class="controls">
+		<button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("transfer_document");?></button>
+	</div>
+</div>
+
+</form>
+<?php
+		$this->contentContainerEnd();
+		$this->contentEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>

From 116cf9708ead3a81baa084ad5939a0a5178e678b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Dec 2017 09:13:50 +0100
Subject: [PATCH 114/308] add transfer document to menu

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

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 1b8e24795..8f63323ac 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -535,6 +535,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		if ($accessMode >= M_READ && !$this->params['user']->isGuest()) {
 			$menuitems['edit_existing_notify'] = array('link'=>"../out/out.DocumentNotify". $docid, 'label'=>'edit_existing_notify');
 		}
+		if ($this->params['user']->isAdmin()) {
+			$menuitems['transfer_document'] = array('link'=>"../out/out.TransferDocument". $docid, 'label'=>'transfer_document');
+		}
 
 		/* Check if hook exists because otherwise callHook() will override $menuitems */
 		if($this->hasHook('documentNavigationBar'))

From 6e90ef6b34a1656187448d9c5fb77617ca22ddd6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Dec 2017 09:14:02 +0100
Subject: [PATCH 115/308] add entry to 5.1.5

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

diff --git a/CHANGELOG b/CHANGELOG
index 12f1a8146..71f5d9181 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@
 - use same layout group, category manager as already used in user manager
 - meta data of attachments can be edited
 - show number of reverse document links in folder/document list
+- documents can be transfered to another user
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.4

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 116/308] 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 c4f9986900b66c480d70bff9b834b91d8df82b57 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Dec 2017 15:26:23 +0100
Subject: [PATCH 117/308] change icon on button

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

diff --git a/views/bootstrap/class.TransferDocument.php b/views/bootstrap/class.TransferDocument.php
index cace14192..ab1bd58a8 100644
--- a/views/bootstrap/class.TransferDocument.php
+++ b/views/bootstrap/class.TransferDocument.php
@@ -71,7 +71,7 @@ class SeedDMS_View_TransferDocument extends SeedDMS_Bootstrap_Style {
 
 <div class="control-group">
 	<div class="controls">
-		<button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("transfer_document");?></button>
+		<button type="submit" class="btn"><i class="icon-exchange"></i> <?php printMLText("transfer_document");?></button>
 	</div>
 </div>
 

From 6b1c6db9c5e3566a5d4bea35c68a84cac845a5cc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Dec 2017 15:27:18 +0100
Subject: [PATCH 118/308] some new phrases for transfering documents, minor
 updates

---
 languages/ar_EG/lang.inc |  4 ++++
 languages/bg_BG/lang.inc |  8 ++++++--
 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/it_IT/lang.inc |  4 ++++
 languages/ko_KR/lang.inc |  4 ++++
 languages/nl_NL/lang.inc | 12 ++++++++----
 languages/pl_PL/lang.inc |  4 ++++
 languages/pt_BR/lang.inc |  4 ++++
 languages/ro_RO/lang.inc |  4 ++++
 languages/ru_RU/lang.inc |  8 ++++++--
 languages/sk_SK/lang.inc |  4 ++++
 languages/sv_SE/lang.inc | 12 ++++++++----
 languages/tr_TR/lang.inc | 16 ++++++++++------
 languages/uk_UA/lang.inc |  4 ++++
 languages/zh_CN/lang.inc |  4 ++++
 languages/zh_TW/lang.inc | 10 +++++++---
 24 files changed, 119 insertions(+), 23 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index ed0de30e6..f1855888f 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -1518,8 +1518,12 @@ URL: [url]',
 'toggle_manager' => 'رجح مدير',
 'toggle_qrcode' => '',
 'to_before_from' => '',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
+'transfer_to_user' => '',
 'transition_triggered_email' => 'تم تحريك انتقال مسار العمل',
 'transition_triggered_email_body' => 'تم تحريك انتقال مسار العمل
 المستند: [name]
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 2055e99f7..a6616c507 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/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 (838)
+//    Translators: Admin (839)
 
 $text = array(
 '2_factor_auth' => '',
@@ -541,7 +541,7 @@ $text = array(
 'invalid_target_folder' => 'Неправилен идентификатор на целевата папка',
 'invalid_user_id' => 'Неправилен идентификатор на потребителя',
 'invalid_version' => 'Неправилна версия на документа',
-'in_folder' => '',
+'in_folder' => 'В папка',
 'in_revision' => '',
 'in_workflow' => 'в процес',
 'is_disabled' => 'забранена сметка',
@@ -1383,8 +1383,12 @@ $text = array(
 'toggle_manager' => 'Превключи мениджър',
 'toggle_qrcode' => '',
 'to_before_from' => '',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
+'transfer_to_user' => '',
 'transition_triggered_email' => 'Забелязана промяна на процес',
 'transition_triggered_email_body' => '',
 'transition_triggered_email_subject' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index bbbf9099c..8af277c14 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -1388,8 +1388,12 @@ URL: [url]',
 'toggle_manager' => 'Intercanviar manager',
 'toggle_qrcode' => '',
 'to_before_from' => '',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
+'transfer_to_user' => '',
 'transition_triggered_email' => '',
 'transition_triggered_email_body' => '',
 'transition_triggered_email_subject' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index f0b09beba..d2b1f3dfd 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -1527,8 +1527,12 @@ URL: [url]',
 'toggle_manager' => 'Přepnout správce',
 'toggle_qrcode' => '',
 'to_before_from' => 'Datum ukončení nesmí být před datem zahájení',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
+'transfer_to_user' => '',
 'transition_triggered_email' => 'Transformace pracovního postupu spuštěna',
 'transition_triggered_email_body' => 'Transformace pracovního postupu spuštěna
 Dokument: [jméno]
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 198e6f816..76924e85f 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 (2489), dgrutsch (22)
+//    Translators: Admin (2493), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -1588,8 +1588,12 @@ Name: [username]
 'toggle_manager' => 'Managerstatus wechseln',
 'toggle_qrcode' => 'Zeige/verberge QR-Code',
 'to_before_from' => 'Endedatum darf nicht vor dem Startdatum liegen',
+'transfer_document' => 'Dokument übertragen',
+'transfer_no_read_access' => 'Der Benutzer hat in dem Ordner keine Schreibrechte',
+'transfer_no_write_access' => 'Der Benutzer hat in dem Ordner keine Schreibrechte',
 'transfer_objects' => 'Objekte übertragen',
 'transfer_objects_to_user' => 'Neuer Eigentümer',
+'transfer_to_user' => 'Auf Benutzer übertragen',
 'transition_triggered_email' => 'Workflow transition triggered',
 'transition_triggered_email_body' => 'Workflow transition triggered
 Document: [name]
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index a885ce1b1..3e744a00f 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -1394,8 +1394,12 @@ URL: [url]',
 'toggle_manager' => '',
 'toggle_qrcode' => '',
 'to_before_from' => '',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
+'transfer_to_user' => '',
 'transition_triggered_email' => '',
 'transition_triggered_email_body' => '',
 'transition_triggered_email_subject' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 25cfd5746..e3fb0baff 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 (1617), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1621), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -1583,8 +1583,12 @@ Name: [username]
 'toggle_manager' => 'Toggle manager',
 'toggle_qrcode' => 'Show/hide QR code',
 'to_before_from' => 'End date may not be before start date',
+'transfer_document' => 'Transfer document',
+'transfer_no_read_access' => 'The user does not have read access in the folder',
+'transfer_no_write_access' => 'The user does not have write access in the folder',
 'transfer_objects' => 'Transfer objects',
 'transfer_objects_to_user' => 'New owner',
+'transfer_to_user' => 'Transfer to user',
 'transition_triggered_email' => 'Workflow transition triggered',
 'transition_triggered_email_body' => 'Workflow transition triggered
 Document: [name]
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 065781104..9b46f4ec4 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -1533,8 +1533,12 @@ URL: [url]',
 'toggle_manager' => 'Intercambiar mánager',
 'toggle_qrcode' => '',
 'to_before_from' => 'La fecha de finalización no debe ser anterior a la de inicio',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
+'transfer_to_user' => '',
 'transition_triggered_email' => 'Workflow transition triggered',
 'transition_triggered_email_body' => 'Workflow transition triggered
 Documento: [name]
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index b95a8f499..89358a26e 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -1555,8 +1555,12 @@ Nom : [username]
 'toggle_manager' => 'Basculer \'Responsable\'',
 'toggle_qrcode' => 'Afficher/masquer le QR code',
 'to_before_from' => 'La date de fin ne peut pas être avant la date de début.',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => 'Transférer des objets',
 'transfer_objects_to_user' => 'Nouveau propriétaire',
+'transfer_to_user' => '',
 'transition_triggered_email' => 'Transition de workflow activé',
 'transition_triggered_email_body' => 'Transition de workflow déclenchée
 Document : [name]
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index c1e95d077..89adbf522 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -1554,8 +1554,12 @@ Internet poveznica: [url]',
 'toggle_manager' => 'Zamjeni upravitelja',
 'toggle_qrcode' => '',
 'to_before_from' => 'Datum završetka ne može biti prije datuma početka',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
+'transfer_to_user' => '',
 'transition_triggered_email' => 'Zatražena promjena toka rada',
 'transition_triggered_email_body' => 'Zatražena promjena toka rada
 Dokument: [name]
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 278f5f637..7c4363124 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -1532,8 +1532,12 @@ URL: [url]',
 'toggle_manager' => 'Kulcs kezelő',
 'toggle_qrcode' => '',
 'to_before_from' => 'A lejárati dátum nem előzheti meg a kezdési dátumot',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => 'Adatok átadása',
 'transfer_objects_to_user' => 'Új tulajdonos',
+'transfer_to_user' => '',
 'transition_triggered_email' => 'Munkamenet átmenet kiváltva',
 'transition_triggered_email_body' => 'Munkafolyamat átmenet kiváltva
 Dokumentum: [name]
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 404f76d06..d7a27923f 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -1566,8 +1566,12 @@ URL: [url]',
 'toggle_manager' => 'Gestore',
 'toggle_qrcode' => 'Mostri / nascondi codice QR',
 'to_before_from' => 'La data di fine non può essere antecedente a quella di inizio',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
+'transfer_to_user' => '',
 'transition_triggered_email' => 'Inizio transizione del flusso di lavoro',
 'transition_triggered_email_body' => 'Transizione del flusso di lavoro iniziata
 Documento: [name]
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index ca418a9c0..f33432439 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -1548,8 +1548,12 @@ URL : [url]',
 'toggle_manager' => '전환 매니저',
 'toggle_qrcode' => 'QR code 보이기/숨기기',
 'to_before_from' => '종료일은 시작일 전이 될수 없습니다',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '새 소유자',
+'transfer_to_user' => '',
 'transition_triggered_email' => '워크플로우 전환 트리거',
 'transition_triggered_email_body' => '워크플로우 전환 트리거
 문서: [name]
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index d3bfaa9b2..d7c014c78 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 (740), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (744), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 '2_factor_auth' => '',
@@ -408,7 +408,7 @@ URL: [url]',
 'drag_icon_here' => 'Versleep icoon van de folder of bestand hier!',
 'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Bestand van dropfolder',
-'dropfolder_folder' => '',
+'dropfolder_folder' => 'Map van de drop-map',
 'dropupload' => 'Snel toevoegen',
 'drop_files_here' => 'Sleep bestanden hierheen!',
 'dump_creation' => 'DB dump aanmaken',
@@ -576,7 +576,7 @@ URL: [url]',
 'import' => 'Importeer',
 'importfs' => '',
 'import_fs' => 'Importeer van bestandssysteem',
-'import_fs_warning' => '',
+'import_fs_warning' => 'Dit werkt alleen voor mappen in de drop-map. Alle mappen en bestanden worden recursief geimporteerd. Bestanden worden onmiddelijk vrijgegeven.',
 'include_content' => 'inclusief inhoud',
 'include_documents' => 'Inclusief documenten',
 'include_subdirectories' => 'Inclusief submappen',
@@ -913,7 +913,7 @@ Bovenliggende map: [folder_path]
 Gebruiker: [username]
 URL: [url]',
 'removed_workflow_email_subject' => '[sitename]: [name] - Workflow verwijderd van document versie',
-'removeFolderFromDropFolder' => '',
+'removeFolderFromDropFolder' => 'Verwijder de map na de import',
 'remove_marked_files' => 'Geselecteerde bestanden zijn verwijderd',
 'repaired' => 'Gerepareerd',
 'repairing_objects' => 'Documenten en mappen repareren.',
@@ -1560,8 +1560,12 @@ URL: [url]',
 'toggle_manager' => 'Wijzig Beheerder',
 'toggle_qrcode' => '',
 'to_before_from' => 'De einddatum mag niet voor de startdatum liggen',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
+'transfer_to_user' => '',
 'transition_triggered_email' => 'Workflow-overgang geactiveerd',
 'transition_triggered_email_body' => 'Workflow Overgang
 Document: [name]
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 2f75e8b34..3dad29a2f 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -1512,8 +1512,12 @@ URL: [url]',
 'toggle_manager' => 'Przełączanie zarządcy',
 'toggle_qrcode' => '',
 'to_before_from' => '',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
+'transfer_to_user' => '',
 'transition_triggered_email' => 'Uruchomiono proces przepływu',
 'transition_triggered_email_body' => 'Uruchomiono proces przepływu 
 Dokument: [name]
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 8d7920a1c..3d8de5c04 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -1530,8 +1530,12 @@ URL: [url]',
 'toggle_manager' => 'Toggle manager',
 'toggle_qrcode' => '',
 'to_before_from' => 'A data de término não pode ser anterior a data de início',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
+'transfer_to_user' => '',
 'transition_triggered_email' => 'Transição de fluxo de trabalho desencadeado',
 'transition_triggered_email_body' => 'Transição do fluxo de trabalho triggered
 Document: [name]
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 611f28bee..fdf459aba 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -1555,8 +1555,12 @@ URL: [url]',
 'toggle_manager' => 'Comută Manager',
 'toggle_qrcode' => '',
 'to_before_from' => 'Data de încheiere nu poate fi înainte de data de începere',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
+'transfer_to_user' => '',
 'transition_triggered_email' => 'Tranziție Workflow declanșată',
 'transition_triggered_email_body' => 'Tranziție Workflow declanșată
 Document: [name]
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 82f717236..dd3da40d5 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 (1658)
+//    Translators: Admin (1659)
 
 $text = array(
 '2_factor_auth' => 'Двухфакторная аутентификация',
@@ -622,7 +622,7 @@ URL: [url]',
 'invalid_target_folder' => 'Неверный идентификатор целевого каталога',
 'invalid_user_id' => 'Неверный идентификатор пользователя',
 'invalid_version' => 'Неверная версия документа',
-'in_folder' => '',
+'in_folder' => 'В каталоге',
 'in_revision' => 'В рассмотрении',
 'in_workflow' => 'В процессе',
 'is_disabled' => 'Отключить учётную запись',
@@ -1562,8 +1562,12 @@ URL: [url]',
 'toggle_manager' => 'Изменить как менеджера',
 'toggle_qrcode' => '',
 'to_before_from' => 'Конечная дата не может быть меньше начальной даты',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
+'transfer_to_user' => '',
 'transition_triggered_email' => 'Изменено состояние процесса',
 'transition_triggered_email_body' => 'Изменено состояние процесса
 Документ: [name]
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 3db9ceb02..d88f8187b 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -1387,8 +1387,12 @@ URL: [url]',
 'toggle_manager' => 'Prepnúť stav manager',
 'toggle_qrcode' => 'Ukázať/skryť QR kód',
 'to_before_from' => '',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => 'Prenesené objekty',
 'transfer_objects_to_user' => 'Nový vlastník',
+'transfer_to_user' => '',
 'transition_triggered_email' => '',
 'transition_triggered_email_body' => '',
 'transition_triggered_email_subject' => '',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 2d9fcb476..033bce64e 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 (1151), tmichelfelder (106)
+//    Translators: Admin (1154), tmichelfelder (106)
 
 $text = array(
 '2_factor_auth' => '',
@@ -312,7 +312,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Dokument',
 'documents_checked_out_by_you' => '',
-'documents_expired' => '',
+'documents_expired' => 'Utgångna dokument',
 'documents_in_process' => 'Dokument i bearbetning',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Dokument som du har låst',
@@ -575,7 +575,7 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'Inkludera dokument',
 'include_subdirectories' => 'Inkludera under-kataloger',
-'indexing_tasks_in_queue' => '',
+'indexing_tasks_in_queue' => 'Indexeringsuppgifter i kö',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Index mapp',
@@ -802,7 +802,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Bara .jpg-bilder kan användas som användarbild',
 'order_by_sequence_off' => '',
 'original_filename' => 'Ursprungligt filnamn',
-'overall_indexing_progress' => '',
+'overall_indexing_progress' => 'Total indexeringsprocess',
 'owner' => 'Ägare',
 'ownership_changed_email' => 'Ägare har ändrats',
 'ownership_changed_email_body' => 'Ägare har ändrats
@@ -1523,8 +1523,12 @@ URL: [url]',
 'toggle_manager' => 'Byt manager',
 'toggle_qrcode' => '',
 'to_before_from' => 'Slutdatum får inte vara innan startdatum',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
+'transfer_to_user' => '',
 'transition_triggered_email' => 'Arbetsflödesövergång utlöstes',
 'transition_triggered_email_body' => 'Arbetsflödesövergång utlöstes
 Dokument: [name]
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index b0313aabb..f1b7bf5c8 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 (1053), aydin (83)
+//    Translators: Admin (1058), aydin (83)
 
 $text = array(
 '2_factor_auth' => '',
@@ -469,14 +469,14 @@ URL: [url]',
 'expired_at_date' => '',
 'expired_documents' => '',
 'expires' => 'Süresinin dolacağı zaman',
-'expire_by_date' => '',
+'expire_by_date' => 'Tarihe göre sil',
 'expire_in_1d' => '',
 'expire_in_1h' => '',
-'expire_in_1m' => '',
-'expire_in_1w' => '',
-'expire_in_1y' => '',
+'expire_in_1m' => '1 Ay içinde silinecek',
+'expire_in_1w' => '1 Hafta içinde silinecek',
+'expire_in_1y' => '1 Yıl içinde silinecek',
 'expire_in_2h' => '',
-'expire_in_2y' => '',
+'expire_in_2y' => '2 Yıl içinde silinecek',
 'expire_today' => '',
 'expire_tomorrow' => '',
 'expiry_changed_email' => 'Süresinin dolacağı tarihi değişti',
@@ -1534,8 +1534,12 @@ URL: [url]',
 'toggle_manager' => 'Değişim yönetimi',
 'toggle_qrcode' => '',
 'to_before_from' => 'Bitiş tarihi başlama tarihinden önce olamaz',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
+'transfer_to_user' => '',
 'transition_triggered_email' => 'İş Akış Geçişi Tetiklendi',
 'transition_triggered_email_body' => 'İş Akış Geçişi Tetiklendi
 Doküman: [name]
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 975bed8eb..8e5757a0c 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -1555,8 +1555,12 @@ URL: [url]',
 'toggle_manager' => 'Змінити ознаку менеджера',
 'toggle_qrcode' => '',
 'to_before_from' => 'Кінцева дата не може бути меншою початкової дати',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
+'transfer_to_user' => '',
 'transition_triggered_email' => 'Змінено стан процесу',
 'transition_triggered_email_body' => 'Змінено стан процесу
 Документ: [name]
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 424faa36e..48bc77b03 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -1538,8 +1538,12 @@ URL: [url]',
 'toggle_manager' => '角色切换',
 'toggle_qrcode' => '显示/隐藏 QR 码',
 'to_before_from' => '结束日期不能早于开始日期',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
+'transfer_to_user' => '',
 'transition_triggered_email' => '',
 'transition_triggered_email_body' => '',
 'transition_triggered_email_subject' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 29c7eb25c..198437bca 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 (2378)
+//    Translators: Admin (2380)
 
 $text = array(
 '2_factor_auth' => '',
@@ -818,7 +818,7 @@ URL: [url]',
 'review_deletion_email_subject' => '',
 'review_file' => '',
 'review_group' => '校對組',
-'review_log' => '',
+'review_log' => '檢閱紀錄',
 'review_request_email' => '校對請求',
 'review_request_email_body' => '',
 'review_request_email_subject' => '',
@@ -1358,7 +1358,7 @@ URL: [url]',
 'takeOverGrpApprover' => '',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
-'takeOverIndReviewer' => '',
+'takeOverIndReviewer' => '從上個版本接管個別審稿人',
 'tasks' => '',
 'temp_jscode' => '',
 'testmail_body' => '',
@@ -1387,8 +1387,12 @@ URL: [url]',
 'toggle_manager' => '角色切換',
 'toggle_qrcode' => '',
 'to_before_from' => '',
+'transfer_document' => '',
+'transfer_no_read_access' => '',
+'transfer_no_write_access' => '',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
+'transfer_to_user' => '',
 'transition_triggered_email' => '',
 'transition_triggered_email_body' => '',
 'transition_triggered_email_subject' => '',

From 838d6c775395cdfe7e49f7b6b181bafb07d50c2d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Dec 2017 15:37:43 +0100
Subject: [PATCH 119/308] set warning label in chzn select list

---
 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 65fccac65..9fd2192ad 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -6,7 +6,7 @@ chzn_template_func =  function (state) {
 	if(subtitle)
 		html += '<br /><i>'+subtitle+'</i>';
 	if(warning)
-		html += '<br /><i class="icon-warning-sign"></i> '+warning+'';
+		html += '<br /><span class="label label-warning"><i class="icon-warning-sign"></i></span> '+warning+'';
 	html += '</span>';
 	var $newstate = $(html);
 	return $newstate;

From aed61df96e5605c3f9411edc06db2f5a8aa0e0f7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Dec 2017 15:46:41 +0100
Subject: [PATCH 120/308] new phrases for transfering documents

---
 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 | 12 +++++++++++-
 languages/el_GR/lang.inc |  4 ++++
 languages/en_GB/lang.inc | 12 +++++++++++-
 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/it_IT/lang.inc |  4 ++++
 languages/ko_KR/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 ++++
 24 files changed, 110 insertions(+), 2 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index f1855888f..8af960d48 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -378,6 +378,8 @@ Parent folder: [folder_path]
 URL: [url]',
 'document_status_changed_email_subject' => '[sitename]: [name] - تم تغيير حالةالمستند',
 'document_title' => 'المستند \'[documentname]\'',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => 'تم تحديث المستند',
 'document_updated_email_body' => 'تم تحديث المستند
 المستند: [name]
@@ -456,6 +458,7 @@ URL: [url]',
 'error_remove_folder' => 'ﺡﺪﺛ ﺦﻃﺃ ﺎﺜﻧﺍﺀ ﺡﺬﻓ ﺎﻠﻤﺠﻟﺩ',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
+'error_transfer_document' => '',
 'es_ES' => 'الإسبانية',
 'event_details' => 'تفاصيل الحدث',
 'exclude_items' => '',
@@ -1442,6 +1445,7 @@ URL: [url]',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => '',
 'statistic' => '',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index a6616c507..71819f44f 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -339,6 +339,8 @@ $text = array(
 'document_status_changed_email_body' => '',
 'document_status_changed_email_subject' => '',
 'document_title' => 'Документ \'[documentname]\'',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => 'Документът обновен',
 'document_updated_email_body' => '',
 'document_updated_email_subject' => '',
@@ -411,6 +413,7 @@ $text = array(
 'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
+'error_transfer_document' => '',
 'es_ES' => 'Испански',
 'event_details' => 'Детайли за събитието',
 'exclude_items' => '',
@@ -1307,6 +1310,7 @@ $text = array(
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => '',
 'statistic' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 8af277c14..77598d412 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -344,6 +344,8 @@ URL: [url]',
 'document_status_changed_email_body' => '',
 'document_status_changed_email_subject' => '',
 'document_title' => 'Document \'[documentname]\'',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => 'Document actualizat',
 'document_updated_email_body' => '',
 'document_updated_email_subject' => '',
@@ -416,6 +418,7 @@ URL: [url]',
 'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
+'error_transfer_document' => '',
 'es_ES' => 'Castellà',
 'event_details' => 'Detalls de l\'event',
 'exclude_items' => '',
@@ -1312,6 +1315,7 @@ URL: [url]',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => '',
 'statistic' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index d2b1f3dfd..e8a784985 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -385,6 +385,8 @@ User: [username]
 URL: [url]',
 'document_status_changed_email_subject' => '[sitename]: [name] - Stav dokumentu změněn',
 'document_title' => 'Dokument \'[documentname]\'',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => 'Dokument aktualizován',
 'document_updated_email_body' => 'Dokument aktualizován
 Dokument: [name]
@@ -463,6 +465,7 @@ URL: [url]',
 'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
+'error_transfer_document' => '',
 'es_ES' => 'Španělština',
 'event_details' => 'Údaje akce',
 'exclude_items' => '',
@@ -1451,6 +1454,7 @@ URL: [url]',
 'splash_substituted_user' => 'Zaměněný uživatel',
 'splash_switched_back_user' => 'Přepnuto zpět na původního uživatele',
 'splash_toogle_group_manager' => 'Manažer skupiny přepnut',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => 'Stav/Další stav',
 'statistic' => 'Statistika',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 76924e85f..56c2d2f35 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 (2493), dgrutsch (22)
+//    Translators: Admin (2497), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -390,6 +390,14 @@ Benutzer: [username]
 URL: [url]',
 'document_status_changed_email_subject' => '[sitename]: [name] - Dokumentenstatus geändert',
 'document_title' => 'Dokument \'[documentname]\'',
+'document_transfered_email_body' => 'Dokument an anderen Benutzer übertragen
+Dokument: [name]
+Version: [version]
+Neuer Besitzer: [newuser]
+Elternordner: [folder_path]
+Benutzer: [username]
+URL: [url]',
+'document_transfered_email_subject' => '[sitename]: [name] - Dokument übertragen',
 'document_updated_email' => 'Dokument aktualisiert',
 'document_updated_email_body' => 'Dokument aktualisiert
 Dokument: [name]
@@ -474,6 +482,7 @@ Der Link ist bis zum [valid] gültig.
 'error_remove_folder' => 'Fehler beim Löschen des Ordners',
 'error_remove_permission' => 'Fehler beim Entfernen der Berechtigung',
 'error_toogle_permission' => 'Fehler beim Ändern der Berechtigung',
+'error_transfer_document' => 'Fehler beim Übertragen des Dokuments',
 'es_ES' => 'Spanisch',
 'event_details' => 'Ereignisdetails',
 'exclude_items' => 'Einträge auslassen',
@@ -1512,6 +1521,7 @@ Name: [username]
 'splash_substituted_user' => 'Benutzer gewechselt',
 'splash_switched_back_user' => 'Zum ursprünglichen Benutzer zurückgekehrt',
 'splash_toogle_group_manager' => 'Gruppenverwalter gewechselt',
+'splash_transfer_document' => 'Dokument übertragen',
 'splash_transfer_objects' => 'Objekte übertragen',
 'state_and_next_state' => 'Status/Nächster Status',
 'statistic' => 'Statistik',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 3e744a00f..e44a368d5 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -339,6 +339,8 @@ $text = array(
 'document_status_changed_email_body' => '',
 'document_status_changed_email_subject' => '',
 'document_title' => '',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => '',
 'document_updated_email_body' => '',
 'document_updated_email_subject' => '',
@@ -411,6 +413,7 @@ $text = array(
 'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
+'error_transfer_document' => '',
 'es_ES' => 'Spanish/Ισπανικά',
 'event_details' => '',
 'exclude_items' => '',
@@ -1318,6 +1321,7 @@ URL: [url]',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => '',
 'statistic' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index e3fb0baff..5f31b4447 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 (1621), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1625), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -390,6 +390,14 @@ User: [username]
 URL: [url]',
 'document_status_changed_email_subject' => '[sitename]: [name] - Document status changed',
 'document_title' => 'Document \'[documentname]\'',
+'document_transfered_email_body' => 'Document transfer to other user
+Document: [name]
+Version: [version]
+New owner: [newuser]
+Parent folder: [folder_path]
+User: [username]
+URL: [url]',
+'document_transfered_email_subject' => '[sitename]: [name] - Transfer Dokument',
 'document_updated_email' => 'Document updated',
 'document_updated_email_body' => 'Document updated
 Document: [name]
@@ -475,6 +483,7 @@ The link is valid until [valid].
 'error_remove_folder' => 'Error while deleting folder',
 'error_remove_permission' => 'Error while remove permission',
 'error_toogle_permission' => 'Error while changing permission',
+'error_transfer_document' => 'Error while transfering document',
 'es_ES' => 'Spanish',
 'event_details' => 'Event details',
 'exclude_items' => 'Exclude items',
@@ -1507,6 +1516,7 @@ Name: [username]
 'splash_substituted_user' => 'Substituted user',
 'splash_switched_back_user' => 'Switched back to original user',
 'splash_toogle_group_manager' => 'Group manager toogled',
+'splash_transfer_document' => 'Document transfered',
 'splash_transfer_objects' => 'Objects transfered',
 'state_and_next_state' => 'State/Next state',
 'statistic' => 'Statistic',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 9b46f4ec4..c8db57658 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -385,6 +385,8 @@ Usuario: [username]
 URL: [url]',
 'document_status_changed_email_subject' => '[sitename]: [name] - Estado del documento modificado',
 'document_title' => 'Documento \'[documentname]\'',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => 'Documento actualizado',
 'document_updated_email_body' => 'Documento actualizado
 Documento: [name]
@@ -463,6 +465,7 @@ URL: [url]',
 'error_remove_folder' => 'Error al eliminar la carpeta',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
+'error_transfer_document' => '',
 'es_ES' => 'Castellano',
 'event_details' => 'Detalles del evento',
 'exclude_items' => 'Registros excluidos',
@@ -1457,6 +1460,7 @@ URL: [url]',
 'splash_substituted_user' => 'Usuario sustituido',
 'splash_switched_back_user' => 'Cambió de nuevo al usuario original',
 'splash_toogle_group_manager' => 'Administrador de grupo activado',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => 'Estado/Estado siguiente',
 'statistic' => 'Estadística',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 89358a26e..ade94852e 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -390,6 +390,8 @@ Utilisateur: [username]
 URL: [url]',
 'document_status_changed_email_subject' => '[sitename]: [name] - Statut du document modifié',
 'document_title' => 'Document \'[documentname]\'',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => 'Document mis à jour',
 'document_updated_email_body' => 'Document mis à jour
 Document: [name]
@@ -475,6 +477,7 @@ Le lien est valide jusqu’au [valid].
 'error_remove_folder' => '',
 'error_remove_permission' => 'Erreur lors de la suppression de permission',
 'error_toogle_permission' => 'Erreur lors de la modification de permission',
+'error_transfer_document' => '',
 'es_ES' => 'Espagnol',
 'event_details' => 'Détails de l\'événement',
 'exclude_items' => 'Exclure des élements',
@@ -1479,6 +1482,7 @@ Nom : [username]
 'splash_substituted_user' => 'Utilisateur de substitution',
 'splash_switched_back_user' => 'Revenu à l\'utilisateur initial',
 'splash_toogle_group_manager' => 'Responsable de groupe changé',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => 'Objets transférés',
 'state_and_next_state' => 'État initial/suivant',
 'statistic' => 'Statistiques',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 89adbf522..492518e21 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -390,6 +390,8 @@ Korisnik: [username]
 Internet poveznica: [url]',
 'document_status_changed_email_subject' => '[sitename]: [name] - Promijenjen status dokumenta',
 'document_title' => 'Dokument \'[documentname]\'',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => 'Ažuriran dokument',
 'document_updated_email_body' => 'Ažuriran dokument
 Dokument: [name]
@@ -468,6 +470,7 @@ Internet poveznica: [url]',
 'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
+'error_transfer_document' => '',
 'es_ES' => 'Španjolski',
 'event_details' => 'Detalji događaja',
 'exclude_items' => 'Isključivanje stavki',
@@ -1478,6 +1481,7 @@ Internet poveznica: [url]',
 'splash_substituted_user' => 'Zamjenski korisnik',
 'splash_switched_back_user' => 'Prebačeno nazad na izvornog korisnika',
 'splash_toogle_group_manager' => 'Zamjenjen upravitelj grupe',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => 'Status/Slijedeći status',
 'statistic' => 'Statistika',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 7c4363124..532faa278 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -385,6 +385,8 @@ Felhasználó: [username]
 URL: [url]',
 'document_status_changed_email_subject' => '[sitename]: [name] - Dokumentum állapot módosult',
 'document_title' => 'Dokumentum \'[documentname]\'',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => 'Dokumentum frissült',
 'document_updated_email_body' => 'Dokumentum frissült
 Dokumentum: [name]
@@ -463,6 +465,7 @@ URL: [url]',
 'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
+'error_transfer_document' => '',
 'es_ES' => 'Spanyol',
 'event_details' => 'Esemény részletek',
 'exclude_items' => 'Kizárt elemek',
@@ -1456,6 +1459,7 @@ URL: [url]',
 'splash_substituted_user' => 'Helyettesített felhasználó',
 'splash_switched_back_user' => 'Visszaváltva az eredeti felhasználóra',
 'splash_toogle_group_manager' => 'Csoport kezelő kiválasztva',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => 'Állapot/Következő állapot',
 'statistic' => 'Statisztika',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index d7a27923f..57c0bd452 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -391,6 +391,8 @@ Utente: [username]
 URL: [url]',
 'document_status_changed_email_subject' => '[sitename]: [name] - Modificato lo stato di un documento',
 'document_title' => 'Documento \'[documentname]\'',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => 'Documento aggiornato',
 'document_updated_email_body' => 'Documento aggiornato
 Documento: [name]
@@ -469,6 +471,7 @@ URL: [url]',
 'error_remove_folder' => '',
 'error_remove_permission' => 'Errore durante la rimozione delle autorizzazioni',
 'error_toogle_permission' => 'Errore durante la modifica permessi',
+'error_transfer_document' => '',
 'es_ES' => 'Spagnolo',
 'event_details' => 'Dettagli evento',
 'exclude_items' => 'Escludi Elementi',
@@ -1490,6 +1493,7 @@ URL: [url]',
 'splash_substituted_user' => 'Utente sostituito',
 'splash_switched_back_user' => 'Ritorno all\'utente originale',
 'splash_toogle_group_manager' => 'Amministratore di gruppo invertito',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => 'Stato/Prossimo stato',
 'statistic' => 'Statistiche',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index f33432439..c9c9c2b94 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -393,6 +393,8 @@ URL: [url]',
 URL: [url]',
 'document_status_changed_email_subject' => '[sitename] : [name] - 문서 상태가 변경',
 'document_title' => '문서\'[documentname]\'',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => '문서 업데이트',
 'document_updated_email_body' => '문서 업데이트
 문서: [name]
@@ -469,6 +471,7 @@ URL: [url]',
 'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
+'error_transfer_document' => '',
 'es_ES' => '스페인어',
 'event_details' => '이벤트의 자세한 사항',
 'exclude_items' => '항목 제외',
@@ -1472,6 +1475,7 @@ URL : [url]',
 'splash_substituted_user' => '전환된 사용자',
 'splash_switched_back_user' => '원래 사용자로 전환',
 'splash_toogle_group_manager' => '그룹 관리자 전환',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => '상태 / 다음 상태',
 'statistic' => '통계',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index d7c014c78..4c8cc7545 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -383,6 +383,8 @@ Gebruiker: [username]
 URL: [url]',
 'document_status_changed_email_subject' => '[sitename]: [name] - Document status gewijzigd',
 'document_title' => 'Document \'[documentname]\'',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => 'Document bijgewerkt',
 'document_updated_email_body' => 'Document geupdate
 Document: [name]
@@ -461,6 +463,7 @@ URL: [url]',
 'error_remove_folder' => '',
 'error_remove_permission' => 'Verwijder permissie',
 'error_toogle_permission' => 'Wijzig permissie',
+'error_transfer_document' => '',
 'es_ES' => 'Spaans',
 'event_details' => 'Activiteit details',
 'exclude_items' => 'Sluit iems uit',
@@ -1484,6 +1487,7 @@ URL: [url]',
 'splash_substituted_user' => 'Invallers gebruiker',
 'splash_switched_back_user' => 'Teruggeschakeld naar de oorspronkelijke gebruiker',
 'splash_toogle_group_manager' => 'Group manager toogled',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => 'staat/ volgende staat',
 'statistic' => 'Statistieken',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 3dad29a2f..3b2ca7629 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -378,6 +378,8 @@ Użytkownik: [username]
 URL: [url]',
 'document_status_changed_email_subject' => '[sitename]: [name] - Zmiana statusu dokumentu',
 'document_title' => 'Dokument \'[documentname]\'',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => 'Dokument zaktualizowany',
 'document_updated_email_body' => 'Document zaktualizowano
 Dokument: [name]
@@ -456,6 +458,7 @@ URL: [url]',
 'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
+'error_transfer_document' => '',
 'es_ES' => 'Hiszpański',
 'event_details' => 'Szczegóły zdarzenia',
 'exclude_items' => '',
@@ -1436,6 +1439,7 @@ URL: [url]',
 'splash_substituted_user' => 'Zmieniono użytkownika',
 'splash_switched_back_user' => 'Przełączono z powrotem do oryginalnego użytkownika',
 'splash_toogle_group_manager' => 'Przełączono grupę menadżerów',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => 'Status/Następny status',
 'statistic' => 'Statystyka',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 3d8de5c04..b411691d0 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -384,6 +384,8 @@ Pasta mãe: [folder_path]
 Usuário: [username] rnURL: [url]',
 'document_status_changed_email_subject' => '[sitename]: [name] - Status do documento modificado',
 'document_title' => 'Documento [documentname]',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => 'Documento atualizado',
 'document_updated_email_body' => 'Documento atualizado
 Documento: [name]
@@ -462,6 +464,7 @@ URL: [url]',
 'error_remove_folder' => 'Erro na exclusão da pasta',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
+'error_transfer_document' => '',
 'es_ES' => 'Espanhol',
 'event_details' => 'Event details',
 'exclude_items' => 'Excluir ítens',
@@ -1454,6 +1457,7 @@ URL: [url]',
 'splash_substituted_user' => 'Usuário substituido',
 'splash_switched_back_user' => 'Comutada de volta ao usuário original',
 'splash_toogle_group_manager' => 'Gerente Grupo alternado',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => 'Estado/Próximo estado',
 'statistic' => 'Estatística',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index fdf459aba..9ace2b3fb 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -390,6 +390,8 @@ Utilizator: [username]
 URL: [url]',
 'document_status_changed_email_subject' => '[sitename]: [name] - Status document schimbat',
 'document_title' => 'Document \'[documentname]\'',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => 'Document actualizat',
 'document_updated_email_body' => 'Document actualizat
 Document: [name]
@@ -468,6 +470,7 @@ URL: [url]',
 'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
+'error_transfer_document' => '',
 'es_ES' => 'Spaniola',
 'event_details' => 'Detalii eveniment',
 'exclude_items' => 'Elemente excluse',
@@ -1479,6 +1482,7 @@ URL: [url]',
 'splash_substituted_user' => 'Utilizator substituit',
 'splash_switched_back_user' => 'Comutat înapoi la utilizatorul original',
 'splash_toogle_group_manager' => 'Comută Managerul de grup',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => 'Stare/Stare urmatoare',
 'statistic' => 'Statistic',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index dd3da40d5..cdabe610e 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -390,6 +390,8 @@ URL: [url]',
 URL: [url]',
 'document_status_changed_email_subject' => '[sitename]: изменён статус документа «[name]»',
 'document_title' => 'Документ [documentname]',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => 'Документ обновлён',
 'document_updated_email_body' => 'Документ обновлён
 Документ: [name]
@@ -468,6 +470,7 @@ URL: [url]',
 'error_remove_folder' => '',
 'error_remove_permission' => 'Ошибка снятия разрешения',
 'error_toogle_permission' => 'Ошибка смены разрешения',
+'error_transfer_document' => '',
 'es_ES' => 'Spanish',
 'event_details' => 'Информация о событии',
 'exclude_items' => 'Не показывать события:',
@@ -1486,6 +1489,7 @@ URL: [url]',
 'splash_substituted_user' => 'Пользователь переключён',
 'splash_switched_back_user' => 'Переключён на исходного пользователя',
 'splash_toogle_group_manager' => 'Изменён менеджер группы',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => 'Статус / следующий статус',
 'statistic' => 'Статистика',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index d88f8187b..a1713c057 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -343,6 +343,8 @@ URL: [url]',
 'document_status_changed_email_body' => '',
 'document_status_changed_email_subject' => '',
 'document_title' => 'Dokument \'[documentname]\'',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => 'Dokument aktualizovany',
 'document_updated_email_body' => '',
 'document_updated_email_subject' => '[sitename]: [name] - Dokument bol aktualizovaný',
@@ -415,6 +417,7 @@ URL: [url]',
 'error_remove_folder' => 'Pri odstraňovaní zložky sa vyskytla chyba',
 'error_remove_permission' => 'Chyba pri odstránení povolenia',
 'error_toogle_permission' => 'Chyba pri zmene povolenia',
+'error_transfer_document' => '',
 'es_ES' => 'Španielčina',
 'event_details' => 'Detail udalosti',
 'exclude_items' => 'Vylúčiť položky',
@@ -1311,6 +1314,7 @@ URL: [url]',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => '',
 'statistic' => 'Štatistika',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 033bce64e..cd7aa4cb1 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -378,6 +378,8 @@ Användare: [username]
 URL: [url]',
 'document_status_changed_email_subject' => '[sitename]: [name] - Dokument status ändrad',
 'document_title' => 'Dokument \'[documentname]\'',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => 'Dokument har uppdaterats',
 'document_updated_email_body' => 'Dokument har uppdaterats
 Dokument: [name]
@@ -456,6 +458,7 @@ URL: [url]',
 'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
+'error_transfer_document' => '',
 'es_ES' => 'spanska',
 'event_details' => 'Händelseinställningar',
 'exclude_items' => '',
@@ -1447,6 +1450,7 @@ URL: [url]',
 'splash_substituted_user' => 'Bytt användare',
 'splash_switched_back_user' => 'Byt tillbaka till original användare',
 'splash_toogle_group_manager' => 'Gruppmanager har ändrats',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => 'Status/Nästa status',
 'statistic' => 'Statistik',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index f1b7bf5c8..84a29d4de 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -384,6 +384,8 @@ Kullanıcı: [username]
 URL: [url]',
 'document_status_changed_email_subject' => '[sitename]: [name] - Doküman durumu değişti',
 'document_title' => 'Doküman \'[documentname]\'',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => 'Doküman güncellendi',
 'document_updated_email_body' => 'Doküman güncellendi
 Doküman: [name]
@@ -462,6 +464,7 @@ URL: [url]',
 'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
+'error_transfer_document' => '',
 'es_ES' => 'İspanyolca',
 'event_details' => 'Etkinkil detayları',
 'exclude_items' => '',
@@ -1458,6 +1461,7 @@ URL: [url]',
 'splash_substituted_user' => 'Yerine geçilen kullanıcı',
 'splash_switched_back_user' => 'Orijinal kullanıcıya geri dönüldü',
 'splash_toogle_group_manager' => 'Grup yöneticisi değişti',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => 'Durum/Sonraki durum',
 'statistic' => 'İstatistik',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 8e5757a0c..bdcf12353 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -390,6 +390,8 @@ URL: [url]',
 URL: [url]',
 'document_status_changed_email_subject' => '[sitename]: змінено статус документа «[name]»',
 'document_title' => 'Документ [documentname]',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => 'Документ оновлено',
 'document_updated_email_body' => 'Оновлено документ
 Документ: [name]
@@ -468,6 +470,7 @@ URL: [url]',
 'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
+'error_transfer_document' => '',
 'es_ES' => 'Spanish',
 'event_details' => 'Інформація про подію',
 'exclude_items' => 'Виключені елементи',
@@ -1479,6 +1482,7 @@ URL: [url]',
 'splash_substituted_user' => 'Користувача переключено',
 'splash_switched_back_user' => 'Переключено на початкового користувача',
 'splash_toogle_group_manager' => 'Змінено менеджера групи',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => 'Статус / наступний статус',
 'statistic' => 'Статистика',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 48bc77b03..19652953b 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -386,6 +386,8 @@ URL: [url]',
 URL: [url]',
 'document_status_changed_email_subject' => '[sitename]: [name] - 文档状态已更新',
 'document_title' => '文档名称 \'[documentname]\'',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => '文档已被更新',
 'document_updated_email_body' => '文档已更新
 文档: [name]
@@ -470,6 +472,7 @@ URL: [url]',
 'error_remove_folder' => '删除文件夹时出错',
 'error_remove_permission' => '移除权限时报错',
 'error_toogle_permission' => '修改权限时报错',
+'error_transfer_document' => '',
 'es_ES' => '西班牙语',
 'event_details' => '错误详情',
 'exclude_items' => '排除项目',
@@ -1462,6 +1465,7 @@ URL: [url]',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => '',
 'statistic' => '统计',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 198437bca..d5261a0b4 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -343,6 +343,8 @@ URL: [url]',
 'document_status_changed_email_body' => '',
 'document_status_changed_email_subject' => '',
 'document_title' => '文檔名稱 \'[documentname]\'',
+'document_transfered_email_body' => '',
+'document_transfered_email_subject' => '',
 'document_updated_email' => '文檔已被更新',
 'document_updated_email_body' => '',
 'document_updated_email_subject' => '',
@@ -415,6 +417,7 @@ URL: [url]',
 'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
+'error_transfer_document' => '',
 'es_ES' => '西班牙語',
 'event_details' => '錯誤詳情',
 'exclude_items' => '',
@@ -1311,6 +1314,7 @@ URL: [url]',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
+'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => '',
 'statistic' => '',

From d0cef58ca700cd07987627d51ea1fdba8d09aa32 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Dec 2017 16:06:24 +0100
Subject: [PATCH 121/308] add url to notification mail

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

diff --git a/op/op.TransferDocument.php b/op/op.TransferDocument.php
index 62c180213..1491a45a5 100644
--- a/op/op.TransferDocument.php
+++ b/op/op.TransferDocument.php
@@ -80,6 +80,7 @@ if ($notifier){
 	$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);

From 5ddb4df7aa158bafc5054fb1640370bc9db20af8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Dec 2017 20:55:48 +0100
Subject: [PATCH 122/308] add entry for bug #368

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

diff --git a/CHANGELOG b/CHANGELOG
index 71f5d9181..8e1be5a28 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,7 +7,7 @@
 - use same layout group, category manager as already used in user manager
 - meta data of attachments can be edited
 - show number of reverse document links in folder/document list
-- documents can be transfered to another user
+- documents can be transfered to another user (Closes partly #368)
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.4

From e4e7dd838ffb0503e935702c157a5e6530131b61 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 7 Dec 2017 08:53:11 +0100
Subject: [PATCH 123/308] remove empty line in exitError()

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

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 8f63323ac..50712bbf8 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1351,7 +1351,6 @@ $(document).ready(function() {
 	} /* }}} */
 
 	function exitError($pagetitle, $error, $noexit=false) { /* {{{ */
-	
 		$this->htmlStartPage($pagetitle);
 		$this->globalNavigation();
 		$this->contentStart();

From 0640b39c85d6ef68d3770ef716901b6e33f7ee8d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 7 Dec 2017 08:53:40 +0100
Subject: [PATCH 124/308] check for === false after calling onPreRemoveDocument

---
 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 8c7b38442..752d22167 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2068,7 +2068,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		if(isset($this->_dms->callbacks['onPreRemoveDocument'])) {
 			foreach($this->_dms->callbacks['onPreRemoveDocument'] as $callback) {
 				$ret = call_user_func($callback[0], $callback[1], $this);
-				if(is_bool($ret))
+				if($ret === false)
 					return $ret;
 			}
 		}

From 4cd5d9cf21343e40046fad46119ae412d1b5aa78 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 7 Dec 2017 08:54:23 +0100
Subject: [PATCH 125/308] missing file causes error msg in webserver log

when ErrorDlg is called, the inclusion of js code (webrootjs and
footerjs) needs this file
---
 out/out.ErrorDlg.php | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 out/out.ErrorDlg.php

diff --git a/out/out.ErrorDlg.php b/out/out.ErrorDlg.php
new file mode 100644
index 000000000..8b97683f6
--- /dev/null
+++ b/out/out.ErrorDlg.php
@@ -0,0 +1,42 @@
+<?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.
+
+// This file is needed because SeedDMS_View_Bootstrap::htmlEndPage() includes
+// a file out/out.ErrorDlg.php?action=webrootjs and out/out.ErrorDlg.php?action=footerjs
+
+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.ClassAccessOperation.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($_GET);
+	exit;
+}

From 58cbc3a3272e6b766b2fccb4f7f76088ca032c41 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 7 Dec 2017 08:58:25 +0100
Subject: [PATCH 126/308] some minor updates

---
 languages/de_DE/lang.inc | 3 +--
 languages/en_GB/lang.inc | 3 +--
 languages/fr_FR/lang.inc | 8 ++++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 56c2d2f35..cdd81f997 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 (2497), dgrutsch (22)
+//    Translators: Admin (2498), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -392,7 +392,6 @@ URL: [url]',
 'document_title' => 'Dokument \'[documentname]\'',
 'document_transfered_email_body' => 'Dokument an anderen Benutzer übertragen
 Dokument: [name]
-Version: [version]
 Neuer Besitzer: [newuser]
 Elternordner: [folder_path]
 Benutzer: [username]
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 5f31b4447..ddb19e58e 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 (1625), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1626), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -392,7 +392,6 @@ URL: [url]',
 'document_title' => 'Document \'[documentname]\'',
 'document_transfered_email_body' => 'Document transfer to other user
 Document: [name]
-Version: [version]
 New owner: [newuser]
 Parent folder: [folder_path]
 User: [username]
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index ade94852e..8b7ae0d88 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 (1065), jeromerobert (50), lonnnew (9), Oudiceval (474)
+//    Translators: Admin (1068), jeromerobert (50), lonnnew (9), Oudiceval (474)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -1559,12 +1559,12 @@ Nom : [username]
 'toggle_manager' => 'Basculer \'Responsable\'',
 'toggle_qrcode' => 'Afficher/masquer le QR code',
 'to_before_from' => 'La date de fin ne peut pas être avant la date de début.',
-'transfer_document' => '',
+'transfer_document' => 'Transférer le document',
 'transfer_no_read_access' => '',
-'transfer_no_write_access' => '',
+'transfer_no_write_access' => 'L\'utilisateur n\'a pas accès à ce répertoire',
 'transfer_objects' => 'Transférer des objets',
 'transfer_objects_to_user' => 'Nouveau propriétaire',
-'transfer_to_user' => '',
+'transfer_to_user' => 'Transférer vers un utilisateur',
 'transition_triggered_email' => 'Transition de workflow activé',
 'transition_triggered_email_body' => 'Transition de workflow déclenchée
 Document : [name]

From 6f328af2c9e6fe74a42d6ee822ce4798efc96836 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 7 Dec 2017 09:47:03 +0100
Subject: [PATCH 127/308] minor rephrasing

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

diff --git a/CHANGELOG b/CHANGELOG
index 8e1be5a28..5527230e8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,7 +4,7 @@
 - converters for image previews and pdf previews can be configured in settings
 - show list of documents having the selected category on page for managing
   categories
-- use same layout group, category manager as already used in user manager
+- use same layout for group and category manager as already used in user manager
 - meta data of attachments can be edited
 - show number of reverse document links in folder/document list
 - documents can be transfered to another user (Closes partly #368)

From 7d4a0488ec96340bed3e5861a57e2c0e89700619 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 7 Dec 2017 18:23:07 +0100
Subject: [PATCH 128/308] add controller for AttributeMgr

---
 controllers/class.AttributeMgr.php | 87 ++++++++++++++++++++++++++++++
 op/op.AttributeMgr.php             | 74 ++++++++++++-------------
 2 files changed, 121 insertions(+), 40 deletions(-)
 create mode 100644 controllers/class.AttributeMgr.php

diff --git a/controllers/class.AttributeMgr.php b/controllers/class.AttributeMgr.php
new file mode 100644
index 000000000..f27a46090
--- /dev/null
+++ b/controllers/class.AttributeMgr.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Implementation of Attribute Definition 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 attribute definition 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_AttributeMgr extends SeedDMS_Controller_Common {
+
+	public function run() { /* {{{ */
+	} /* }}} */
+
+	public function addattrdef() { /* {{{ */
+		$dms = $this->params['dms'];
+		$name = $this->params['name'];
+		$type = $this->params['type'];
+		$objtype = $this->params['objtype'];
+		$multiple = $this->params['multiple'];
+		$minvalues = $this->params['minvalues'];
+		$maxvalues = $this->params['maxvalues'];
+		$valueset = $this->params['valueset'];
+		$regex = $this->params['regex'];
+
+		return($dms->addAttributeDefinition($name, $objtype, $type, $multiple, $minvalues, $maxvalues, $valueset, $regex));
+	} /* }}} */
+
+	public function removeattrdef() { /* {{{ */
+		$attrdef = $this->params['attrdef'];
+		return $attrdef->remove();
+	} /* }}} */
+
+	public function editattrdef() { /* {{{ */
+		$dms = $this->params['dms'];
+		$name = $this->params['name'];
+		$attrdef = $this->params['attrdef'];
+		$type = $this->params['type'];
+		$objtype = $this->params['objtype'];
+		$multiple = $this->params['multiple'];
+		$minvalues = $this->params['minvalues'];
+		$maxvalues = $this->params['maxvalues'];
+		$valueset = $this->params['valueset'];
+		$regex = $this->params['regex'];
+
+		if (!$attrdef->setName($name)) {
+			return false;
+		}
+		if (!$attrdef->setType($type)) {
+			return false;
+		}
+		if (!$attrdef->setObjType($objtype)) {
+			return false;
+		}
+		if (!$attrdef->setMultipleValues($multiple)) {
+			return false;
+		}
+		if (!$attrdef->setMinValues($minvalues)) {
+			return false;
+		}
+		if (!$attrdef->setMaxValues($maxvalues)) {
+			return false;
+		}
+		if (!$attrdef->setValueSet($valueset)) {
+			return false;
+		}
+		if (!$attrdef->setRegex($regex)) {
+			return false;
+		}
+
+		return true;
+	} /* }}} */
+}
+
diff --git a/op/op.AttributeMgr.php b/op/op.AttributeMgr.php
index 2da77ac30..1f886db36 100644
--- a/op/op.AttributeMgr.php
+++ b/op/op.AttributeMgr.php
@@ -24,8 +24,11 @@ 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 (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
@@ -33,13 +36,16 @@ if (!$user->isAdmin()) {
 if (isset($_POST["action"])) $action=$_POST["action"];
 else $action=NULL;
 
+if(!in_array($action, array('addattrdef', 'removeattrdef', 'editattrdef')))
+  UI::exitError(getMLText("admin_tools"),getMLText("unknown_command"));
+
+/* Check if the form data comes from a trusted request */
+if(!checkFormKey($action)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
+}
+
 // add new attribute definition ---------------------------------------------
 if ($action == "addattrdef") {
-	
-	/* Check if the form data comes from a trusted request */
-	if(!checkFormKey('addattrdef')) {
-		UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
-	}
 
 	$name = trim($_POST["name"]);
 	$type = intval($_POST["type"]);
@@ -69,10 +75,18 @@ if ($action == "addattrdef") {
 		UI::exitError(getMLText("admin_tools"),getMLText("attrdef_multiple_needs_valueset"));
 	}
 
-	$newAttrdef = $dms->addAttributeDefinition($name, $objtype, $type, $multiple, $minvalues, $maxvalues, $valueset, $regex);
-	if (!$newAttrdef) {
+	$controller->setParam('name', $name);
+	$controller->setParam('type', $type);
+	$controller->setParam('objtype', $objtype);
+	$controller->setParam('multiple', $multiple);
+	$controller->setParam('minvalues', $minvalues);
+	$controller->setParam('maxvalues', $maxvalues);
+	$controller->setParam('valueset', $valueset);
+	$controller->setParam('regex', $regex);
+	if (!($newAttrdef = $controller($_POST))) {
 		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
 	}
+
 	$attrdefid=$newAttrdef->getID();
 
 	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_add_attribute')));
@@ -83,11 +97,6 @@ if ($action == "addattrdef") {
 // delete attribute definition -----------------------------------------------
 else if ($action == "removeattrdef") {
 
-	/* Check if the form data comes from a trusted request */
-	if(!checkFormKey('removeattrdef')) {
-		UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
-	}
-
 	if (!isset($_POST["attrdefid"]) || !is_numeric($_POST["attrdefid"]) || intval($_POST["attrdefid"])<1) {
 		UI::exitError(getMLText("admin_tools"),getMLText("unknown_attrdef"));
 	}
@@ -97,9 +106,11 @@ else if ($action == "removeattrdef") {
 		UI::exitError(getMLText("admin_tools"),getMLText("unknown_attrdef"));
 	}
 
-	if (!$attrdef->remove()) {
+	$controller->setParam('attrdef', $attrdef);
+	if (!$controller($_POST)) {
 		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
 	}
+
 	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_rm_attribute')));
 
 	add_log_line("&action=removeattrdef&attrdefid=".$attrdefid);
@@ -110,11 +121,6 @@ else if ($action == "removeattrdef") {
 // edit attribute definition -----------------------------------------------
 else if ($action == "editattrdef") {
 
-	/* Check if the form data comes from a trusted request */
-	if(!checkFormKey('editattrdef')) {
-		UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
-	}
-
 	if (!isset($_POST["attrdefid"]) || !is_numeric($_POST["attrdefid"]) || intval($_POST["attrdefid"])<1) {
 		UI::exitError(getMLText("admin_tools"),getMLText("unknown_attrdef"));
 	}
@@ -146,28 +152,16 @@ else if ($action == "editattrdef") {
 		UI::exitError(getMLText("admin_tools"),getMLText("attrdef_multiple_needs_valueset"));
 	}
 
-	if (!$attrdef->setName($name)) {
-		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
-	}
-	if (!$attrdef->setType($type)) {
-		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
-	}
-	if (!$attrdef->setObjType($objtype)) {
-		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
-	}
-	if (!$attrdef->setMultipleValues($multiple)) {
-		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
-	}
-	if (!$attrdef->setMinValues($minvalues)) {
-		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
-	}
-	if (!$attrdef->setMaxValues($maxvalues)) {
-		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
-	}
-	if (!$attrdef->setValueSet($valueset)) {
-		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
-	}
-	if (!$attrdef->setRegex($regex)) {
+	$controller->setParam('name', $name);
+	$controller->setParam('type', $type);
+	$controller->setParam('objtype', $objtype);
+	$controller->setParam('multiple', $multiple);
+	$controller->setParam('minvalues', $minvalues);
+	$controller->setParam('maxvalues', $maxvalues);
+	$controller->setParam('valueset', $valueset);
+	$controller->setParam('regex', $regex);
+	$controller->setParam('attrdef', $attrdef);
+	if (!$controller($_POST)) {
 		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
 	}
 

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 129/308] 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 130/308] 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 0e4b10883fcecd0f3829a1676be0b43e7f9610b4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 8 Dec 2017 13:41:06 +0100
Subject: [PATCH 131/308] add entry for 5.1.5

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

diff --git a/CHANGELOG b/CHANGELOG
index 5527230e8..24155fb06 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 --------------------------------------------------------------------------------
                      Changes in version 5.1.5
 --------------------------------------------------------------------------------
+- add controller for AttributeMgr
 - converters for image previews and pdf previews can be configured in settings
 - show list of documents having the selected category on page for managing
   categories

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 132/308] 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 a78747cc104ea7a315a15a1725f1c8baa34f2eeb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Dec 2017 09:33:13 +0100
Subject: [PATCH 133/308] addDocumentFile() returns object of file, new method
 SeedDMS_Core_DocumentFile::setDate()

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

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 752d22167..82d503557 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2020,7 +2020,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			$err = SeedDMS_Core_File::copyFile($tmpFile, $this->_dms->contentDir . $file->getPath());
 		if (!$err) return false;
 
-		return true;
+		return $file;
 	} /* }}} */
 
 	function removeDocumentFile($ID) { /* {{{ */
@@ -4793,6 +4793,31 @@ class SeedDMS_Core_DocumentFile { /* {{{ */
 	} /* }}} */
 
 	function getDate() { return $this->_date; }
+
+	/**
+	 * Set creation date of the document file
+	 *
+	 * @param integer $date timestamp of creation date. If false then set it
+	 * to the current timestamp
+	 * @return boolean true on success
+	 */
+	function setDate($date) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		if(!$date)
+			$date = time();
+		else {
+			if(!is_numeric($date))
+				return false;
+		}
+
+		$queryStr = "UPDATE `tblDocumentFiles` SET `date` = " . (int) $date . " WHERE `id` = ". $this->_id;
+		if (!$db->getResult($queryStr))
+			return false;
+		$this->_date = $date;
+		return true;
+	} /* }}} */
+
 	function getDir() { return $this->_dir; }
 	function getFileType() { return $this->_fileType; }
 	function getMimeType() { return $this->_mimeType; }

From b26c8a6dcfd2280da0ed96284e0b95da66e63936 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Dec 2017 09:34:00 +0100
Subject: [PATCH 134/308] add items for 5.1.5

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

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 1aed451d0..579beeec0 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -28,6 +28,8 @@
 - 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()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From da972bbc2b5d482f57e11a3778ae6a72bbb6d3bb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Dec 2017 09:48:05 +0100
Subject: [PATCH 135/308] fix SeedDMS_Core_DocumentFile::setDate()

---
 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 82d503557..76e53d5fe 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -4802,7 +4802,7 @@ class SeedDMS_Core_DocumentFile { /* {{{ */
 	 * @return boolean true on success
 	 */
 	function setDate($date) { /* {{{ */
-		$db = $this->_dms->getDB();
+		$db = $this->_document->_dms->getDB();
 
 		if(!$date)
 			$date = time();

From 074aee914d0645b3c39e1b1b49c9bccaeb89b4fc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Dec 2017 09:48:32 +0100
Subject: [PATCH 136/308] set date of attachment

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

diff --git a/utils/xmlimport.php b/utils/xmlimport.php
index 703782300..08299948a 100644
--- a/utils/xmlimport.php
+++ b/utils/xmlimport.php
@@ -764,7 +764,7 @@ function insert_document($document) { /* {{{ */
 					$filename = tempnam('/tmp', 'FOO');
 					file_put_contents($filename, $filecontents);
 				}
-				$newDocument->addDocumentFile(
+				$newfile = $newDocument->addDocumentFile(
 					$file['attributes']['name'],
 					$file['attributes']['comment'],
 					$owner,
@@ -775,6 +775,7 @@ function insert_document($document) { /* {{{ */
 					$file['attributes']['version'],
 					$file['attributes']['public']
 				);
+				$newfile->setDate(dateToTimestamp($file['attributes']['date']));
 				unlink($filename);
 			}
 		}

From dec3b441230adbb4fea7ff8754bae709db46372e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 14 Dec 2017 09:39:05 +0100
Subject: [PATCH 137/308] add configuration for number of entries on viewfolder
 page

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

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index bb7f503ea..e5c36969f 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -229,6 +229,10 @@ class Settings { /* {{{ */
 	var $_showFullPreview = false;
 	// convert to pdf for preview on document details page
 	var $_convertToPdf = false;
+	// maximum number of documents/folders on ViewFolder page
+	var $_maxItemsPerPage = 0;
+	// number of documents/folders fetched when scrolling to bottom of ViewFolder page
+	var $_incItemsPerPage = 0;
 	// Show form to submit missing translations at end of page
 	var $_showMissingTranslations = false;
 	// Extra Path to additional software, will be added to include path
@@ -418,6 +422,10 @@ class Settings { /* {{{ */
 			$this->_previewWidthDropFolderList = intval($tab["previewWidthDropFolderList"]);
 		$this->_showFullPreview = Settings::boolVal($tab["showFullPreview"]);
 		$this->_convertToPdf = Settings::boolVal($tab["convertToPdf"]);
+		if(isset($tab["maxItemsPerPage"]))
+			$this->_maxItemsPerPage = intval($tab["maxItemsPerPage"]);
+		if(isset($tab["incItemsPerPage"]))
+			$this->_incItemsPerPage = intval($tab["incItemsPerPage"]);
 
 		// XML Path: /configuration/site/edition
 		$node = $xml->xpath('/configuration/site/edition');
@@ -735,6 +743,8 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "previewWidthDropFolderList", $this->_previewWidthDropFolderList);
     $this->setXMLAttributValue($node, "showFullPreview", $this->_showFullPreview);
     $this->setXMLAttributValue($node, "convertToPdf", $this->_convertToPdf);
+    $this->setXMLAttributValue($node, "maxItemsPerPage", $this->_maxItemsPerPage);
+    $this->setXMLAttributValue($node, "incItemsPerPage", $this->_incItemsPerPage);
 
     // 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 5c14c0528..d81bd3354 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -70,6 +70,8 @@ if ($action == "saveSettings")
   $settings->_previewWidthDetail = $_POST["previewWidthDetail"];
   $settings->_showFullPreview = getBoolValue("showFullPreview");
   $settings->_convertToPdf = getBoolValue("convertToPdf");
+  $settings->_maxItemsPerPage = $_POST["maxItemsPerPage"];
+  $settings->_incItemsPerPage = $_POST["incItemsPerPage"];
 
   // SETTINGS - SITE - EDITION
   $settings->_strictFormCheck = getBoolValue("strictFormCheck");
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 72574c51c..a5d48b20e 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -207,6 +207,14 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_convertToPdf");?>:</td>
         <td><input name="convertToPdf" type="checkbox" <?php if ($settings->_convertToPdf) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_maxItemsPerPage_desc");?>">
+        <td><?php printMLText("settings_maxItemsPerPage");?>:</td>
+				<td><?php $this->showTextField("maxItemsPerPage", $settings->_maxItemsPerPage); ?></td>
+      </tr>
+      <tr title="<?php printMLText("settings_incItemsPerPage_desc");?>">
+        <td><?php printMLText("settings_incItemsPerPage");?>:</td>
+				<td><?php $this->showTextField("incItemsPerPage", $settings->_incItemsPerPage); ?></td>
+      </tr>
 
       <!--
         -- SETTINGS - SITE - EDITION

From 9a6786cc8d1875143f351ae18be3d1896d5905b7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 14 Dec 2017 09:39:43 +0100
Subject: [PATCH 138/308] show only limited number of entries, fetch more when
 scrolling down

---
 out/out.ViewFolder.php               |  12 +++
 views/bootstrap/class.ViewFolder.php | 137 ++++++++++++++++++++++++---
 2 files changed, 135 insertions(+), 14 deletions(-)

diff --git a/out/out.ViewFolder.php b/out/out.ViewFolder.php
index 168d280f4..18916c729 100644
--- a/out/out.ViewFolder.php
+++ b/out/out.ViewFolder.php
@@ -48,6 +48,14 @@ if (isset($_GET["orderby"]) && strlen($_GET["orderby"])==1 ) {
 	$orderby=$_GET["orderby"];
 } else $orderby=$settings->_sortFoldersDefault;
 
+if (!empty($_GET["offset"])) {
+	$offset=(int) $_GET["offset"];
+} else $offset = 0;
+
+if (!empty($_GET["limit"])) {
+	$limit=(int) $_GET["limit"];
+} else $limit = 10;
+
 if ($folder->getAccessMode($user) < M_READ) {
 	UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))),getMLText("access_denied"));
 }
@@ -66,6 +74,10 @@ if($view) {
 	$view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view->setParam('maxItemsPerPage', $settings->_maxItemsPerPage);
+	$view->setParam('incItemsPerPage', $settings->_incItemsPerPage != 0 ? $settings->_incItemsPerPage : $settings->_maxItemsPerPage);
+	$view->setParam('offset', $offset);
+	$view->setParam('limit', $limit);
 	$view($_GET);
 	exit;
 }
diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index c3ec44caf..5083eb814 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -96,6 +96,37 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 function folderSelected(id, name) {
 	window.location = '../out/out.ViewFolder.php?folderid=' + id;
 }
+function loadMoreObjects(element, limit) {
+	if(!$(element).is(":visible"))
+		return;
+	var folder = element.data('folder')
+	var offset = element.data('offset')
+//	var limit = element.data('limit')
+	url = seeddms_webroot+"out/out.ViewFolder.php?action=entries&folderid="+folder+"&offset="+offset+"&limit="+limit;
+	$.ajax({
+		type: 'GET',
+		url: url,
+		dataType: 'json',
+		success: function(data){
+			$('#viewfolder-table').append(data.html);
+console.log(data.count);
+			if(data.count <= 0) {
+				element.hide();
+			} else {
+				element.text(data.count+" more objects");
+				element.data('offset', offset+limit);
+			}
+		}
+	});
+}
+$(window).scroll(function() {
+	if($(window).scrollTop() + $(window).height() == $(document).height()) {
+		loadMoreObjects($('#loadmore'), $('#loadmore').data('limit'));
+	}
+});
+$('#loadmore').click(function(e) {
+	loadMoreObjects($(this), $(this).data('all'));
+});
 <?php
 		$this->printNewTreeNavigationJs($folder->getID(), M_READ, 0, '', $expandFolderTree == 2, $orderby);
 
@@ -111,6 +142,71 @@ function folderSelected(id, name) {
 		$this->printDeleteDocumentButtonJs();
 	} /* }}} */
 
+	function entries() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+		$orderby = $this->params['orderby'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
+		$offset = $this->params['offset'];
+		$limit = $this->params['limit'];
+
+		header('Content-Type: application/json');
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+
+		$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);
+
+		$content = '';
+		if ((count($subFolders) > 0)||(count($documents) > 0)){
+			$i = 0; // counts all entries
+			$j = 0; // counts only returned entries
+			foreach($subFolders as $subFolder) {
+				if($i >= $offset && $j < $limit) {
+					$txt = $this->callHook('folderListItem', $subFolder, 'viewfolder');
+					if(is_string($txt))
+						$content .= $txt;
+					else {
+						$content .= $this->folderListRow($subFolder);
+					}
+					$j++;
+				}
+				$i++;
+			}
+
+			if($subFolders && $documents) {
+				if(($j && $j < $limit) || ($offset + $limit == $i)) {
+					$txt = $this->callHook('folderListSeparator', $folder);
+					if(is_string($txt))
+						$content .= $txt;
+					else $content .= "<tr><td colspan=\"4\">kkkkk</td></tr>";
+				}
+			}
+
+			foreach($documents as $document) {
+				if($i >= $offset && $j < $limit) {
+					$document->verifyLastestContentExpriry();
+					$txt = $this->callHook('documentListItem', $document, $previewer, 'viewfolder');
+					if(is_string($txt))
+						$content .= $txt;
+					else {
+						$content .= $this->documentListRow($document, $previewer);
+					}
+					$j++;
+				}
+				$i++;
+			}
+
+			echo json_encode(array('error'=>0, 'count'=>$i-($offset+$limit), 'html'=>$content));
+		}
+
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -125,6 +221,8 @@ function folderSelected(id, name) {
 		$workflowmode = $this->params['workflowmode'];
 		$enableRecursiveCount = $this->params['enableRecursiveCount'];
 		$maxRecursiveCount = $this->params['maxRecursiveCount'];
+		$maxItemsPerPage = $this->params['maxItemsPerPage'];
+		$incItemsPerPage = $this->params['incItemsPerPage'];
 		$previewwidth = $this->params['previewWidthList'];
 		$timeout = $this->params['timeout'];
 
@@ -289,6 +387,7 @@ function folderSelected(id, name) {
 		$documents = $folder->getDocuments($orderby);
 		$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ);
 
+		$i = 0;
 		if ((count($subFolders) > 0)||(count($documents) > 0)){
 			$txt = $this->callHook('folderListHeader', $folder, $orderby);
 			if(is_string($txt))
@@ -306,28 +405,36 @@ function folderSelected(id, name) {
 			}
 
 			foreach($subFolders as $subFolder) {
-				$txt = $this->callHook('folderListItem', $subFolder, 'viewfolder');
-				if(is_string($txt))
-					echo $txt;
-				else {
-					echo $this->folderListRow($subFolder);
+				if(!$maxItemsPerPage || $i < $maxItemsPerPage) {
+					$txt = $this->callHook('folderListItem', $subFolder, 'viewfolder');
+					if(is_string($txt))
+						echo $txt;
+					else {
+						echo $this->folderListRow($subFolder);
+					}
 				}
+				$i++;
 			}
 
 			if($subFolders && $documents) {
-				$txt = $this->callHook('folderListSeparator', $folder);
-				if(is_string($txt))
-					echo $txt;
+				if(!$maxItemsPerPage || $maxItemsPerPage > count($subFolders)) {
+					$txt = $this->callHook('folderListSeparator', $folder);
+					if(is_string($txt))
+						echo $txt;
+				}
 			}
 
 			foreach($documents as $document) {
-				$document->verifyLastestContentExpriry();
-				$txt = $this->callHook('documentListItem', $document, $previewer, 'viewfolder');
-				if(is_string($txt))
-					echo $txt;
-				else {
-					echo $this->documentListRow($document, $previewer);
+				if(!$maxItemsPerPage || $i < $maxItemsPerPage) {
+					$document->verifyLastestContentExpriry();
+					$txt = $this->callHook('documentListItem', $document, $previewer, 'viewfolder');
+					if(is_string($txt))
+						echo $txt;
+					else {
+						echo $this->documentListRow($document, $previewer);
+					}
 				}
+				$i++;
 			}
 
 			$txt = $this->callHook('folderListFooter', $folder);
@@ -336,6 +443,8 @@ function folderSelected(id, name) {
 			else
 				echo "</tbody>\n</table>\n";
 
+			if($maxItemsPerPage && $i > $maxItemsPerPage)
+				echo "<button id=\"loadmore\" style=\"width: 100%; margin-bottom: 20px;\" class=\"btn btn-default\" data-folder=\"".$folder->getId()."\"data-offset=\"".$maxItemsPerPage."\" data-limit=\"".$incItemsPerPage."\" data-all=\"".($i-$maxItemsPerPage)."\">".($i-$maxItemsPerPage)." more objects</button>";
 		}
 		else printMLText("empty_folder_list");
 

From 464d57a9fdb4ce5d70c9aa6ae1786f2b24b9fb0c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 14 Dec 2017 09:54:26 +0100
Subject: [PATCH 139/308] more new phrases for inc. page load setup

---
 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 | 8 ++++++--
 languages/el_GR/lang.inc | 4 ++++
 languages/en_GB/lang.inc | 6 +++++-
 languages/es_ES/lang.inc | 4 ++++
 languages/fr_FR/lang.inc | 8 ++++++--
 languages/hr_HR/lang.inc | 4 ++++
 languages/hu_HU/lang.inc | 4 ++++
 languages/it_IT/lang.inc | 4 ++++
 languages/ko_KR/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 ++++
 24 files changed, 101 insertions(+), 5 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 8af960d48..956d1a190 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -1236,6 +1236,8 @@ URL: [url]',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => '',
 'settings_httpRoot_desc' => '',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1266,6 +1268,8 @@ URL: [url]',
 'settings_maxDirID_desc' => '',
 'settings_maxExecutionTime' => '',
 'settings_maxExecutionTime_desc' => '',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => '',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 71819f44f..d6b011912 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -1101,6 +1101,8 @@ $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_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1131,6 +1133,8 @@ $text = array(
 'settings_maxDirID_desc' => 'Максимум подпапки в родителската папка. По подразбиране: 0.',
 'settings_maxExecutionTime' => 'Максимално време за изпълнение (с)',
 'settings_maxExecutionTime_desc' => 'Установява максимално време за изпълнение на скрипта, преди да бъде прибит от парсера',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => '',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 77598d412..77f2d145c 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -1106,6 +1106,8 @@ URL: [url]',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => '',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1136,6 +1138,8 @@ URL: [url]',
 'settings_maxDirID_desc' => '',
 'settings_maxExecutionTime' => '',
 'settings_maxExecutionTime_desc' => '',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => '',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index e8a784985..00f593fdd 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -1245,6 +1245,8 @@ URL: [url]',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => '',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1275,6 +1277,8 @@ URL: [url]',
 'settings_maxDirID_desc' => '',
 'settings_maxExecutionTime' => '',
 'settings_maxExecutionTime_desc' => '',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Max. počet rekurzívních počítání dokumentů/složek',
 'settings_maxRecursiveCount_desc' => 'Toto je max. počet dokumentů a složek, kterým bude kontrolováno přístupové právo při rekurzivním počítání objektů. Po jeho překročení bude počet složek a dokumentů odhadnut.',
 'settings_maxSizeForFullText' => '',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index cdd81f997..ef57721a2 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 (2498), dgrutsch (22)
+//    Translators: Admin (2503), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -1007,7 +1007,7 @@ 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' => 'Wiederholungsprüfung',
 'revise_document_on' => 'Nächste Überprüfung des Dokuments am [date]',
 'revisions_accepted' => '[no_revisions] Wiederholungsprüfungen',
 'revisions_not_touched' => '[no_revisions] offene Wiederholungspüfungen',
@@ -1311,6 +1311,8 @@ Name: [username]
 '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_incItemsPerPage' => 'Zahl der Einträge, die nachgeladen werden',
+'settings_incItemsPerPage_desc' => 'Wenn die Anzahl der Ordner und Dokumente beschränkt wird, dann bestimmt dieser Wert die Anzahl der nachzuladenen Objekte, wenn man sich an das Ende der View-Folder Seite bewegt. Ein Wert 0, läd die gleiche Anzahl an Objekten nach, die anfänglich geladen wurden.',
 'settings_initialDocumentStatus' => 'Initialer Dokumentenstatus',
 'settings_initialDocumentStatus_desc' => 'Dieser STatus wird bei Dokumenten gesetzt, die neu hinzugefügt wurden.',
 'settings_initialDocumentStatus_draft' => 'Entwurf',
@@ -1341,6 +1343,8 @@ Name: [username]
 '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)',
 'settings_maxExecutionTime_desc' => 'Maximale Zeit in Sekunden bis ein Skript beendet wird.',
+'settings_maxItemsPerPage' => 'Max. Anzahl der Einträge auf einer Seite',
+'settings_maxItemsPerPage_desc' => 'Begrenzt die Anzahl der Ordner und Dokumente auf der View-Folder Seite. Weitere Objekte werden geladen, wenn man an das Ende der Seite rollt. Setze diesen Wert auf 0, um immer alle Objekte anzuzeigen.',
 'settings_maxRecursiveCount' => 'Max. Anzahl Anzahl rekursiver Dokumente/Ordner.',
 'settings_maxRecursiveCount_desc' => 'Dies ist die maximale Anzahl der Dokumente und Ordner die auf Zugriffsrechte geprüft werden, wenn rekursiv gezählt wird. Wenn diese Anzahl überschritten wird, wird die Anzahl der Dokumente und Unterordner in der Ordner Ansicht geschätzt.',
 'settings_maxSizeForFullText' => 'Maximale Dateigröße für sofortige Indezierung',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index e44a368d5..a2c4f1902 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -1112,6 +1112,8 @@ URL: [url]',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => '',
 'settings_httpRoot_desc' => '',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1142,6 +1144,8 @@ URL: [url]',
 'settings_maxDirID_desc' => '',
 'settings_maxExecutionTime' => '',
 'settings_maxExecutionTime_desc' => '',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => '',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index ddb19e58e..07c6c30ec 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 (1626), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1630), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -1306,6 +1306,8 @@ Name: [username]
 '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_incItemsPerPage' => 'Number of entries loaded at end of page',
+'settings_incItemsPerPage_desc' => 'If the number of folders and documents is limited, this will set the number of additionally loaded objects, when scrolling down to the bottom of the view folder page. Setting this to 0, will load the same number of objects as has been loaded initially.',
 'settings_initialDocumentStatus' => 'Initial document status',
 'settings_initialDocumentStatus_desc' => 'This status will be set when a document is added.',
 'settings_initialDocumentStatus_draft' => 'Draft',
@@ -1336,6 +1338,8 @@ Name: [username]
 '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)',
 'settings_maxExecutionTime_desc' => 'This sets the maximum time in seconds a script is allowed to run before it is terminated by the parse',
+'settings_maxItemsPerPage' => 'Max. number of entries on a page',
+'settings_maxItemsPerPage_desc' => 'Restricts the number of folders and documents shown on the view folder page. Further objects will be loaded when scrolling to the end of the page. Set to 0 to always show all objects.',
 'settings_maxRecursiveCount' => 'Max. number of recursive document/folder count',
 'settings_maxRecursiveCount_desc' => 'This is the maximum number of documents or folders that will be checked for access rights, when recursively counting objects. If this number is exceeded, the number of documents and folders in the folder view will be estimated.',
 'settings_maxSizeForFullText' => 'Maximum filesize for instant indexing',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index c8db57658..fdbc213f8 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -1251,6 +1251,8 @@ 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_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1281,6 +1283,8 @@ URL: [url]',
 'settings_maxDirID_desc' => 'Número máximo de subcarpetas por carpeta principal. Por defecto: 0.',
 'settings_maxExecutionTime' => 'Tiempo máximo de ejecución (s)',
 'settings_maxExecutionTime_desc' => 'Esto configura el tiempo máximo en segundos que un script puede estar ejectutándose antes de que el analizador lo pare',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Número máximo del contador de carpetas/documentos recursivos',
 'settings_maxRecursiveCount_desc' => 'Este es el número máximo de documentos o carpetas que pueden ser revisados con derechos de acceso, contando objetos recursivos. Si este número es excedido , el número de carpetas y documentos en la vista de carpeta será estimado.',
 'settings_maxSizeForFullText' => 'Tamaño máximo del fichero para el indexado inmediato',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 8b7ae0d88..04472dc7d 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 (1068), jeromerobert (50), lonnnew (9), Oudiceval (474)
+//    Translators: Admin (1068), jeromerobert (50), lonnnew (9), Oudiceval (475)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -286,7 +286,7 @@ URL: [url]',
 '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_user_from_processes' => 'Voulez-vous vraiment retirer l’utilisateur « [username] » de tous les processus ?<br>Attention : Cette action peut entrainer la publication des documents si l’utilisateur était le seul (ou dernier) approbateur.',
-'confirm_rm_version' => 'Voulez-vous réellement supprimer la [version] du document "[documentname]"?<br>Attention: Cette action ne peut pas être annulée.',
+'confirm_rm_version' => 'Voulez-vous réellement supprimer la version [version] du document « [documentname] » ?<br>Attention : Cette action est irréversible.',
 'confirm_transfer_objects' => 'Voulez-vous vraiment transférer les documents, dossiers, etc. de l’utilisateur « [username] » ?<br>Attention : Cette action est irréversible.',
 'confirm_update_transmittalitem' => '',
 'content' => 'Contenu',
@@ -1273,6 +1273,8 @@ Nom : [username]
 '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_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => 'État initial d’un document',
 'settings_initialDocumentStatus_desc' => 'État du document défini lors de l’ajout',
 'settings_initialDocumentStatus_draft' => 'ébauche',
@@ -1303,6 +1305,8 @@ Nom : [username]
 '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)',
 'settings_maxExecutionTime_desc' => 'Ceci définit la durée maximale en secondes q\'un script est autorisé à exécuter avant de se terminer par l\'analyse syntaxique',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Nombre maximal de document/dossier récursif',
 'settings_maxRecursiveCount_desc' => 'Nombre maximum de documents et répertoires dont l\'accès sera vérifié, lors d\'un décompte récursif. Si ce nombre est dépassé, le nombre de documents et répertoires affichés sera approximé.',
 'settings_maxSizeForFullText' => 'Taille maximum pour l\'indexation instantanée',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 492518e21..77a7a79ab 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -1272,6 +1272,8 @@ Internet poveznica: [url]',
 'settings_guestID_desc' => 'ID gost korisnika koja se koristi kada je prijavljen kao gost (uglavnom se ne treba mijenjati)',
 'settings_httpRoot' => 'Http korijen',
 'settings_httpRoot_desc' => 'U URL-u, putanja na što se odnosi, nakon domene. Ne sadrži http:// prefiks ili naziv web hosta. Npr. ako je puni URL http://www.example.com/seeddms/, postavi \'/seeddms/\'. Ako je URL http://www.example.com/, postavi \'/\'',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => 'Početni status dokumenta',
 'settings_initialDocumentStatus_desc' => 'Ovo je status koji će biti postavljen za dokument prilikom dodavanja.',
 'settings_initialDocumentStatus_draft' => 'Nacrt',
@@ -1302,6 +1304,8 @@ Internet poveznica: [url]',
 'settings_maxDirID_desc' => 'Maksimalni broj podmapa po nadređenoj mapi. Zadano: 0.',
 'settings_maxExecutionTime' => 'Max. vrijeme izvršenja (s)',
 'settings_maxExecutionTime_desc' => 'Ovo postavlja maksimalno vrijeme u sekundama u kojem je skripti dopušteno da se pokrene prije nego se prekine rasčlanjivanjem',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Max. broj rekurzivnog dokumenta/mape',
 'settings_maxRecursiveCount_desc' => 'To je maksimalni broj dokumenata ili mapa koji će biti označen pristupnim pravima, pri rekurzivnom brojanju objekata. Ako se taj broj premaši, broj dokumenata i mapa u pregledu mape će biti procjenjen.',
 'settings_maxSizeForFullText' => 'Maksimalna veličina dokumenta za instant indeksiranje',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 532faa278..f19ae8579 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -1250,6 +1250,8 @@ 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_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1280,6 +1282,8 @@ URL: [url]',
 '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)',
 'settings_maxExecutionTime_desc' => 'Beállítja a szkript maximális engedélyezett futási idejét másodpercben mielőtt megszakítja az értelmező',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Rekurzív dokumentum/mappa számláló legnagyobb értéke',
 'settings_maxRecursiveCount_desc' => 'A dokumentumok és mappák maximális mennyisége amelyeken ellenőrizni fogják a hozzáférési jogokat, ha rekurzívan számláló tárgyakat. Ha ezt az értéket túllépik, a dokumentumok számát és mappák a Mappa nézetben is becsülhetők.',
 'settings_maxSizeForFullText' => '',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 57c0bd452..0ffe2ff0f 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -1284,6 +1284,8 @@ 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_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => 'Stato iniziale documento',
 'settings_initialDocumentStatus_desc' => 'Stato assegnato quando si aggiunge documento',
 'settings_initialDocumentStatus_draft' => 'Bozza',
@@ -1314,6 +1316,8 @@ URL: [url]',
 'settings_maxDirID_desc' => 'Numero massimo di sottocartelle contenibili in una cartella. Default: 0.',
 'settings_maxExecutionTime' => 'Tempo Max di esecuzione (s)',
 'settings_maxExecutionTime_desc' => 'Imposta il tempo limite per l\'esecuzione di uno script prima che il parser lo termini.',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Conteggio ricursivo Max di files e cartelle',
 'settings_maxRecursiveCount_desc' => 'Numero massimo di documenti e cartelle considerati dal conteggio ricursivo per il controllo dei diritti d\'accesso. Se tale valore dovesse essere superato, il risultato del conteggio sarà stimato.',
 'settings_maxSizeForFullText' => 'La lungeza massima del file per l\'indicizzazione istantanea',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index c9c9c2b94..11308c7e6 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -1266,6 +1266,8 @@ URL : [url]',
 'settings_guestID_desc' => 'Guest로 로그인 할 때 사용하는 ID (변경이 필요치 않음)',
 'settings_httpRoot' => 'HTTP Root',
 'settings_httpRoot_desc' => 'URL의 상대 경로, 도메인 이후 부분 HTTP:// 접두사 를 포함하지 마십시오. 전체 URL이 http://www.example.com/seeddms/ 경우에는 \'/seeddms/\'로 설정합니다. URL이 http://www.example.com/에는 설정이 \'/\' 입니다.',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '초기 문서 상태',
 'settings_initialDocumentStatus_desc' => '문서가 추가 된 경우이 상태가 설정 됩니다.',
 'settings_initialDocumentStatus_draft' => '초안',
@@ -1296,6 +1298,8 @@ URL : [url]',
 'settings_maxDirID_desc' => '',
 'settings_maxExecutionTime' => '최대 실행 시간 (들)',
 'settings_maxExecutionTime_desc' => '종료되기 전 스크립트의 구문 분석 할 수있는 최대 시간을 초 단위로 설정',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => '최대 재귀 문서 / 폴더의 수',
 'settings_maxRecursiveCount_desc' => '이것은 재귀적으로 개체를 셀 때 사용 권한이 확인됩니다 문서 및 폴더의 최대 수입니다. 이 수를 초과하면 폴더보기에서 문서 나 폴더의 수가 추정됩니다.',
 'settings_maxSizeForFullText' => '',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 4c8cc7545..249e1c852 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -1278,6 +1278,8 @@ 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_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => 'Beginstatus document',
 'settings_initialDocumentStatus_desc' => 'De beginstatus van een document wordt ingesteld wanneer het document wordt toegevoegd.',
 'settings_initialDocumentStatus_draft' => 'Initieel document als concept',
@@ -1308,6 +1310,8 @@ URL: [url]',
 'settings_maxDirID_desc' => 'Maximaal toegestane aantal submappen per bovenliggende map. Standaard: 0.',
 'settings_maxExecutionTime' => 'Max Uitvoertijd (s)',
 'settings_maxExecutionTime_desc' => 'Dit bepaald de maximale tijd in seconden waarin een script mag worden uitgevoerd, voordat het afgebroken wordt',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Max. nummers of recursieve document/map telling',
 'settings_maxRecursiveCount_desc' => 'Dit is het maximum aantal documenten of mappen dat zal worden gecontroleerd voor toegangsrechten bij recursieve objecten telling. Als dit aantal is overschreden, zal het aantal documenten en mappen in de het map overzicht worden geschat.',
 'settings_maxSizeForFullText' => '',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 3b2ca7629..f0f1c313a 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -1230,6 +1230,8 @@ 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_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1260,6 +1262,8 @@ URL: [url]',
 'settings_maxDirID_desc' => 'Maksymalna liczba podkatalogów dla katalogu nadrzędnego. Domyślnie: 0.',
 'settings_maxExecutionTime' => 'Maksymalny czas wykonywania (s)',
 'settings_maxExecutionTime_desc' => 'Ustawia maksymalny czas, liczony w sekundach, jaki ma na wykonanie skrypt zanim zostanie zakończony.',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Max. liczba rekurencji dokumentów/folderów',
 'settings_maxRecursiveCount_desc' => 'Jest to maksymalna liczba dokumentów i folderów, które będą sprawdzane pod kątem praw dostępu, gdy włączone jest rekurencyjnie liczenie obiektów. Jeżeli liczba ta zostanie przekroczona to ilości dokumentów i folderów w widoku zostaną oszacowane.',
 'settings_maxSizeForFullText' => '',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index b411691d0..23af342fc 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -1248,6 +1248,8 @@ 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_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1278,6 +1280,8 @@ URL: [url]',
 'settings_maxDirID_desc' => 'O número máximo de sub-diretórios por diretório mãe. Padrão: 0.',
 'settings_maxExecutionTime' => 'Max Tempo de Execução (s)',
 'settings_maxExecutionTime_desc' => 'Isso define o tempo máximo em segundos que é permitido executar antes de ser finalizado pelo parse',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Max. número de contagem de documentos/pasta recursiva',
 'settings_maxRecursiveCount_desc' => 'Este é o número máximo de documentos ou pastas que serão verificados por direitos de acesso, quando recursivamente contar objetos. Se esse número for ultrapassado, será estimado o número de documentos e pastas na visualização da pasta.',
 'settings_maxSizeForFullText' => '',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 9ace2b3fb..b26ffa893 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -1273,6 +1273,8 @@ 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_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1303,6 +1305,8 @@ URL: [url]',
 'settings_maxDirID_desc' => 'Numărul maxim de sub-directoare pe director părinte. Implicit: 0.',
 'settings_maxExecutionTime' => 'Timp Maxim de executie (s)',
 'settings_maxExecutionTime_desc' => 'Acesta stabilește timpul maxim în secunde în care un script este permis să ruleze înainte de a fi oprit',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Numarul Maxim recursiv de numarare documente/foldere',
 'settings_maxRecursiveCount_desc' => 'Acesta este numărul maxim de documente sau foldere care vor fi verificate pentru drepturile de acces, atunci când se numără recursiv obiectele. Dacă acest număr este depășit, numărul de documente și foldere în vizualizarea directorului va fi estimat.',
 'settings_maxSizeForFullText' => '',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index cdabe610e..71313e3fe 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -1280,6 +1280,8 @@ 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_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => 'Начальный статус документа',
 'settings_initialDocumentStatus_desc' => 'Этот статус будет установлен, когда добавляется документ',
 'settings_initialDocumentStatus_draft' => 'Черновик',
@@ -1310,6 +1312,8 @@ URL: [url]',
 'settings_maxDirID_desc' => 'Максимум каталогов в родительском каталоге. По умолчанию 0.',
 'settings_maxExecutionTime' => 'Максимальное время выполнения, с',
 'settings_maxExecutionTime_desc' => 'Устанавливает максимальное время выполнения скрипта, перед тем как он будет завершён.',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Ограничение рекурсивного подсчёта<br/>документов и каталогов',
 'settings_maxRecursiveCount_desc' => 'Максимальное количество документов или каталогов, которые будут проверены на права доступа при рекурсивном подсчёте объектов. При превышении этого количества, будет оценено количество документов и каталогов в виде каталога.',
 'settings_maxSizeForFullText' => 'Макс. размер документа для индексирования на лету',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index a1713c057..73c2359df 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -1105,6 +1105,8 @@ URL: [url]',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => '',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => 'Návrh',
@@ -1135,6 +1137,8 @@ URL: [url]',
 'settings_maxDirID_desc' => '',
 'settings_maxExecutionTime' => '',
 'settings_maxExecutionTime_desc' => '',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => '',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index cd7aa4cb1..f49824b30 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -1241,6 +1241,8 @@ 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_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1271,6 +1273,8 @@ URL: [url]',
 'settings_maxDirID_desc' => 'Högsta antal undermappar per överordnade mapp. Standard: 0.',
 'settings_maxExecutionTime' => 'Max. exekveringstid (s)',
 'settings_maxExecutionTime_desc' => 'Detta sätter hösta tillåtna tiden i sekunder som ett skript får på sig att utföras innan det avslutas.',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Max antal rekursiva dokument/katalog',
 'settings_maxRecursiveCount_desc' => 'Detta är maximum antal av dokument eller katalog som kommer att testas om att det har korrekt rättigheter, när objekt räknas rekursiv. Om detta nummer överskrids, kommer antalet av dokument och katalog i katalogvyn bara bli uppskattat.',
 'settings_maxSizeForFullText' => '',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 84a29d4de..f9fe7d83c 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -1252,6 +1252,8 @@ 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_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1282,6 +1284,8 @@ URL: [url]',
 '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)',
 'settings_maxExecutionTime_desc' => 'Durdurulmadan önce bir betikin en fazla kaç saniye çalışabileceğini ayarlar',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Maks. özyinelemeli doküman/klasör sayısı',
 'settings_maxRecursiveCount_desc' => 'Nesneleri özyinelemeli olarak erişim hakkı kontrolü için sayarken bu değer en fazla sayılacak doküman ve klasör sayısını belirler. Bu sayı aşıldığında klasörün içindeki dosya ve diğer klasörlerin sayısı tahmin yolu ile belirlenecektir.',
 'settings_maxSizeForFullText' => '',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index bdcf12353..2aca60407 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -1273,6 +1273,8 @@ 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_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => 'Початковий статус документа',
 'settings_initialDocumentStatus_desc' => 'Цей статус буде встановлено, коли додається документ',
 'settings_initialDocumentStatus_draft' => 'Чернетка',
@@ -1303,6 +1305,8 @@ URL: [url]',
 'settings_maxDirID_desc' => 'Максимум каталогів у батьківському каталозі. По замовчуванню 0.',
 'settings_maxExecutionTime' => 'Максимальний час виконання, с',
 'settings_maxExecutionTime_desc' => 'Встановлює максимальний час виконання скрипта, перед тим як він буде завершений.',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Обмеження рекурсивного підрахунку<br/>документів і каталогів',
 'settings_maxRecursiveCount_desc' => 'Максимальна кількість документів і каталогів, які будуть перевірені на права доступу при рекурсивному підрахунку об\'єктів. При перевищенні цієї кількості, буде оцінено кількість документів і каталогів у вигляді каталогу.',
 'settings_maxSizeForFullText' => '',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 19652953b..271b2c68c 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -1256,6 +1256,8 @@ URL: [url]',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => '',
 'settings_httpRoot_desc' => '',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '初始化文档状态',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '起草中',
@@ -1286,6 +1288,8 @@ URL: [url]',
 'settings_maxDirID_desc' => '每个父目录的子目录的最大数目。默认值：0。',
 'settings_maxExecutionTime' => '最大执行时间（秒）',
 'settings_maxExecutionTime_desc' => '此设置最长时间，以秒为脚本允许运行之前它是由解析终止',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => '',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index d5261a0b4..d5a6d1a48 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -1105,6 +1105,8 @@ URL: [url]',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => '',
 'settings_httpRoot_desc' => '',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1135,6 +1137,8 @@ URL: [url]',
 'settings_maxDirID_desc' => '每個父目錄的子目錄的最大數目。預設值：0。',
 'settings_maxExecutionTime' => '最大執行時間（秒）',
 'settings_maxExecutionTime_desc' => '此設置最長時間，以秒為腳本允許運行之前它是由解析終止',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => '',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',

From f395c905f445f96c3ae2feb46fe1a256aa5f2970 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 14 Dec 2017 11:34:07 +0100
Subject: [PATCH 140/308] add entry for 5.1.5

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 24155fb06..256a4f3b6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,8 @@
 - meta data of attachments can be edited
 - show number of reverse document links in folder/document list
 - documents can be transfered to another user (Closes partly #368)
+- list of folders/documents on ViewFolder page can be limited, more objects
+  will be loaded when user scrolls to the end of the page
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.4

From 72143a1a787c3f1cb5a0338422a26b078d7c65ec Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 15 Dec 2017 08:09:01 +0100
Subject: [PATCH 141/308] use translation for button to download more
 docs/folders

---
 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 5083eb814..e4018f37f 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -444,7 +444,7 @@ $('#loadmore').click(function(e) {
 				echo "</tbody>\n</table>\n";
 
 			if($maxItemsPerPage && $i > $maxItemsPerPage)
-				echo "<button id=\"loadmore\" style=\"width: 100%; margin-bottom: 20px;\" class=\"btn btn-default\" data-folder=\"".$folder->getId()."\"data-offset=\"".$maxItemsPerPage."\" data-limit=\"".$incItemsPerPage."\" data-all=\"".($i-$maxItemsPerPage)."\">".($i-$maxItemsPerPage)." more objects</button>";
+				echo "<button id=\"loadmore\" style=\"width: 100%; margin-bottom: 20px;\" class=\"btn btn-default\" data-folder=\"".$folder->getId()."\"data-offset=\"".$maxItemsPerPage."\" data-limit=\"".$incItemsPerPage."\" data-all=\"".($i-$maxItemsPerPage)."\">".getMLText('x_more_objects', array('number', ($i-$maxItemsPerPage)))."</button>";
 		}
 		else printMLText("empty_folder_list");
 

From f22a770fcc6f3d088f76e9f0d4ca2a9d16009538 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 15 Dec 2017 08:12:45 +0100
Subject: [PATCH 142/308] new phrase x_more_documents

---
 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 |   3 +-
 languages/el_GR/lang.inc |   1 +
 languages/en_GB/lang.inc |   3 +-
 languages/es_ES/lang.inc |   5 +-
 languages/fr_FR/lang.inc |   1 +
 languages/hr_HR/lang.inc |   1 +
 languages/hu_HU/lang.inc |   1 +
 languages/it_IT/lang.inc |   5 +-
 languages/ko_KR/lang.inc |   1 +
 languages/nl_NL/lang.inc |   5 +-
 languages/pl_PL/lang.inc |   1 +
 languages/pt_BR/lang.inc |   1 +
 languages/ro_RO/lang.inc |   1 +
 languages/ru_RU/lang.inc |   1 +
 languages/sk_SK/lang.inc |   1 +
 languages/sv_SE/lang.inc | 259 +++++++++++++++++++++------------------
 languages/tr_TR/lang.inc |   1 +
 languages/uk_UA/lang.inc |   1 +
 languages/zh_CN/lang.inc |   1 +
 languages/zh_TW/lang.inc |   1 +
 24 files changed, 171 insertions(+), 127 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 956d1a190..06a22b4ca 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -1654,6 +1654,7 @@ URL: [url]',
 'workflow_summary' => 'ملخص مسار العمل',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'ملخص المستخدم',
+'x_more_objects' => '',
 'year_view' => 'عرض السنة',
 'yes' => 'نعم',
 'zh_CN' => 'الصينية (CN)',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index d6b011912..3a5e420fa 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -1505,6 +1505,7 @@ $text = array(
 'workflow_summary' => 'Резюме за процес',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Резюме за потребител',
+'x_more_objects' => '',
 'year_view' => 'годишен изглед',
 'yes' => 'Да',
 'zh_CN' => 'Китайски (Китай)',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 77f2d145c..1b613b0d0 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -1510,6 +1510,7 @@ URL: [url]',
 'workflow_summary' => '',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => '',
+'x_more_objects' => '',
 'year_view' => 'Vista d\'any',
 'yes' => 'Sí',
 'zh_CN' => 'Xinès (Xina)',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 00f593fdd..9a965c1f2 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -1663,6 +1663,7 @@ URL: [url]',
 'workflow_summary' => 'Přehled pracovního postupu',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Přehled uživatelů',
+'x_more_objects' => '',
 'year_view' => 'Zobrazení roku',
 'yes' => 'Ano',
 'zh_CN' => 'Čínština (CN)',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index ef57721a2..6f9765dfb 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 (2503), dgrutsch (22)
+//    Translators: Admin (2504), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -1729,6 +1729,7 @@ URL: [url]',
 'workflow_summary' => 'Übersicht Workflows',
 'workflow_transition_without_user_group' => 'Mindestens eine Transition hat weder einen Benutzer noch eine Gruppe zugewiesen!',
 'workflow_user_summary' => 'Übersicht Benutzer',
+'x_more_objects' => '[number] weitere Objekte',
 'year_view' => 'Jahresansicht',
 'yes' => 'Ja',
 'zh_CN' => 'Chinesisch (CN)',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index a2c4f1902..ec36852d9 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -1516,6 +1516,7 @@ URL: [url]',
 'workflow_summary' => '',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => '',
+'x_more_objects' => '',
 'year_view' => '',
 'yes' => 'Ναι',
 'zh_CN' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 07c6c30ec..ef9aa264a 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 (1630), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1631), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -1724,6 +1724,7 @@ URL: [url]',
 'workflow_summary' => 'Workflow summary',
 'workflow_transition_without_user_group' => 'At least one of the transitions has neither a user nor a group!',
 'workflow_user_summary' => 'User summary',
+'x_more_objects' => '[number] more objects',
 'year_view' => 'Year View',
 'yes' => 'Yes',
 'zh_CN' => 'Chinese (CN)',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index fdbc213f8..3a5580c23 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 (1042), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1043), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -286,7 +286,7 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Contenido',
 'continue' => 'Continuar',
-'converter_new_cmd' => '',
+'converter_new_cmd' => 'Comando',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
 'create_download_link' => '',
@@ -1669,6 +1669,7 @@ URL: [url]',
 'workflow_summary' => 'Resumen Flujo de Trabajo',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Resumen Usuario',
+'x_more_objects' => '',
 'year_view' => 'Vista del año',
 'yes' => 'Sí',
 'zh_CN' => 'Chino (CN)',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 04472dc7d..037d9114f 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -1691,6 +1691,7 @@ URL: [url]',
 'workflow_summary' => 'Vue d’ensemble du workflow',
 'workflow_transition_without_user_group' => 'Au moins une transition a ni utilisateur, ni groupe !',
 'workflow_user_summary' => 'Vue d’ensemble de l’utilisateur',
+'x_more_objects' => '',
 'year_view' => 'Vue annuelle',
 'yes' => 'Oui',
 'zh_CN' => 'Chinois (CN)',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 77a7a79ab..8f0dbab98 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -1690,6 +1690,7 @@ Internet poveznica: [url]',
 'workflow_summary' => 'Pregled toka rada',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Pregled korisnika',
+'x_more_objects' => '',
 'year_view' => 'Pregled po godini',
 'yes' => 'Da',
 'zh_CN' => 'Kineski (CN)',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index f19ae8579..d2e1a49d4 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -1668,6 +1668,7 @@ URL: [url]',
 'workflow_summary' => 'Munkafolyamat áttekintés',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Felhasználó áttekintés',
+'x_more_objects' => '',
 'year_view' => 'Éves nézet',
 'yes' => 'Igen',
 'zh_CN' => 'Kínai (CN)',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 0ffe2ff0f..1345ee9fc 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 (1571), rickr (144), s.pnt (26)
+//    Translators: Admin (1572), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -1574,7 +1574,7 @@ URL: [url]',
 'toggle_manager' => 'Gestore',
 'toggle_qrcode' => 'Mostri / nascondi codice QR',
 'to_before_from' => 'La data di fine non può essere antecedente a quella di inizio',
-'transfer_document' => '',
+'transfer_document' => 'Trasferisci Documento',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',
 'transfer_objects' => '',
@@ -1702,6 +1702,7 @@ URL: [url]',
 'workflow_summary' => 'Riepilogo flusso di lavoro',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Riepilogo utenti',
+'x_more_objects' => '',
 'year_view' => 'Vista anno',
 'yes' => 'Sì',
 'zh_CN' => 'Cinese (CN)',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 11308c7e6..b023567f7 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -1684,6 +1684,7 @@ URL : [url]',
 'workflow_summary' => '워크플로우 요약',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => '사용자 요약',
+'x_more_objects' => '',
 'year_view' => '연간 단위로 보기',
 'yes' => '예',
 'zh_CN' => '중국어 (CN)',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 249e1c852..dc5b1a988 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 (744), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (745), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 '2_factor_auth' => '',
@@ -1568,7 +1568,7 @@ URL: [url]',
 'toggle_manager' => 'Wijzig Beheerder',
 'toggle_qrcode' => '',
 'to_before_from' => 'De einddatum mag niet voor de startdatum liggen',
-'transfer_document' => '',
+'transfer_document' => 'Document overdragen',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',
 'transfer_objects' => '',
@@ -1696,6 +1696,7 @@ URL: [url]',
 'workflow_summary' => 'Workflow samenvatting',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Gebruiker samenvatting',
+'x_more_objects' => '',
 'year_view' => 'Jaar Overzicht',
 'yes' => 'Ja',
 'zh_CN' => 'Chinees (CN)',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index f0f1c313a..8a328dc64 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -1648,6 +1648,7 @@ URL: [url]',
 'workflow_summary' => 'Podsumowanie procesu',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Podsumowanie użytkownika',
+'x_more_objects' => '',
 'year_view' => 'Widok roczny',
 'yes' => 'Tak',
 'zh_CN' => 'Chiński (CN)',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 23af342fc..8a3531b12 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -1666,6 +1666,7 @@ URL: [url]',
 'workflow_summary' => 'Sumário de fluxo de trabalho',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Sumário de usuário',
+'x_more_objects' => '',
 'year_view' => 'Visualização Anual',
 'yes' => 'Sim',
 'zh_CN' => 'Chinês (CN)',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index b26ffa893..a02aadf4c 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -1691,6 +1691,7 @@ URL: [url]',
 'workflow_summary' => 'Sumar Workflow',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Sumar Utilizator',
+'x_more_objects' => '',
 'year_view' => 'Vizualizare an',
 'yes' => 'Da',
 'zh_CN' => 'Chineză (CN)',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 71313e3fe..a8953dd04 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -1698,6 +1698,7 @@ URL: [url]',
 'workflow_summary' => 'Сводка по процессу',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Сводка по пользователю',
+'x_more_objects' => '',
 'year_view' => 'Год',
 'yes' => 'Да',
 'zh_CN' => 'Chinese (CN)',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 73c2359df..1622629c1 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -1509,6 +1509,7 @@ URL: [url]',
 'workflow_summary' => '',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => '',
+'x_more_objects' => '',
 'year_view' => 'Rok',
 'yes' => 'Áno',
 'zh_CN' => 'Čínština (CN)',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index f49824b30..528e48730 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -19,15 +19,16 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1154), tmichelfelder (106)
+//    Translators: Admin (1154), MagnusI (119), tmichelfelder (106)
 
 $text = array(
-'2_factor_auth' => '',
-'2_factor_auth_info' => '',
-'2_fact_auth_secret' => '',
+'2_factor_auth' => '2-faktors autentisering',
+'2_factor_auth_info' => 'För stöd av 2-faktors autentisering behöver du Google Authenticator installerad på din mobiltelefon.
+Nedan ser du två QR-koder. Den högra är din hemliga kod och till vänster kan du skapa en ny kod. Om du skapar en ny kod måste du skanna den på nytt med Google Authenticator.',
+'2_fact_auth_secret' => 'Hemlighet',
 'accept' => 'Godkänn',
-'access_control' => '',
-'access_control_is_off' => '',
+'access_control' => 'Åtkomstkontroll',
+'access_control_is_off' => 'Avancerad åtkomstkontroll är avaktiverad',
 'access_denied' => 'Åtkomst nekas.',
 'access_inheritance' => 'Ärv åtkomst',
 'access_mode' => 'Åtkomstnivå',
@@ -54,7 +55,7 @@ URL: [url]',
 'action_revise' => 'Revidera',
 'add' => 'Lägg till',
 'add_approval' => 'Skicka godkännande',
-'add_attrdefgroup' => '',
+'add_attrdefgroup' => 'Lägg till en attributgrupp',
 'add_document' => 'Lägg till dokument',
 'add_document_link' => 'Lägg till länkat dokument',
 'add_document_notify' => 'Lägg till notifiering',
@@ -65,14 +66,14 @@ 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_receipt' => 'Mottagningsbevis',
 'add_review' => 'Skicka granskning',
-'add_revision' => '',
-'add_role' => '',
+'add_revision' => 'Lägg till godkännande',
+'add_role' => 'Lägg till ny roll',
 'add_subfolder' => 'Lägg till katalog',
 'add_to_clipboard' => 'Flytta till Urklipp',
-'add_to_transmittal' => '',
-'add_transmittal' => '',
+'add_to_transmittal' => 'Lägg till i meddelande',
+'add_transmittal' => 'Lägg till meddelande',
 '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',
@@ -94,14 +95,14 @@ URL: [url]',
 'approvals_and_reviews_rejected' => '',
 'approvals_not_touched' => '',
 'approvals_rejected' => '',
-'approvals_without_group' => '',
-'approvals_without_user' => '',
+'approvals_without_group' => 'Godkännandet saknar grupp',
+'approvals_without_user' => 'Godkännandet saknar användare',
 'approval_deletion_email' => 'Begäran om godkännande har raderats',
 'approval_deletion_email_body' => '',
-'approval_deletion_email_subject' => '',
+'approval_deletion_email_subject' => '[sitename]: [name] - Godkännandet har raderats',
 'approval_file' => '',
 'approval_group' => 'Grupp av personer som godkänner',
-'approval_log' => '',
+'approval_log' => 'Godkännandelogg',
 'approval_request_email' => 'Begäran om godkännande',
 'approval_request_email_body' => 'Begäran om godkännande
 Dokument: [name]
@@ -112,13 +113,20 @@ URL: [url]',
 'approval_request_email_subject' => '[sitename]: [name] - Begäran om godkännande',
 'approval_status' => 'Status för godkännande',
 'approval_submit_email' => '',
-'approval_submit_email_body' => '',
+'approval_submit_email_body' => 'Godkännande av dokument
+Dokument: [name]
+Version: [version]
+Överordnad katalog: [folder_path]
+Status: [status]
+Kommentar: [comment]
+Användare: [username]
+URL: [url]',
 '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',
-'approver_already_assigned' => '',
-'approver_already_removed' => '',
+'approver_already_assigned' => 'Användaren är redan godkännare',
+'approver_already_removed' => 'Användaren har redan godkänt dokumentet alternativt tagits bort från arbetsflödet.',
 '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.',
@@ -127,13 +135,13 @@ URL: [url]',
 'assign_reviewers' => 'Ge uppdrag till personer/grupper att granska dokumentet',
 'assign_user_property_to' => 'Sätt användarens egenskaper till',
 'assumed_released' => 'Antas klart för användning',
-'attrdefgroup_management' => '',
-'attrdefgrp_show_detail' => '',
-'attrdefgrp_show_list' => '',
-'attrdefgrp_show_search' => '',
-'attrdefgrp_show_searchlist' => '',
+'attrdefgroup_management' => 'Hantering av gruppattribut',
+'attrdefgrp_show_detail' => 'Detaljer',
+'attrdefgrp_show_list' => 'Lista',
+'attrdefgrp_show_search' => 'Sök',
+'attrdefgrp_show_searchlist' => 'Sökresutlat',
 'attrdef_exists' => 'Attributdefinitionen finns redan',
-'attrdef_info' => '',
+'attrdef_info' => 'Information',
 'attrdef_in_use' => 'Attributdefinitionen används',
 'attrdef_management' => 'Hantering av attributdefinitioner',
 'attrdef_maxvalues' => 'Max tillåtna värde',
@@ -149,11 +157,11 @@ URL: [url]',
 'attrdef_type' => 'Typ',
 'attrdef_type_boolean' => 'Logisk',
 'attrdef_type_date' => 'Datum',
-'attrdef_type_email' => '',
+'attrdef_type_email' => 'Email',
 'attrdef_type_float' => 'Flyttal',
 'attrdef_type_int' => 'Heltal',
 'attrdef_type_string' => 'Textsträng',
-'attrdef_type_url' => '',
+'attrdef_type_url' => 'URL',
 'attrdef_valueset' => 'Värden',
 'attributes' => 'Attribut',
 'attribute_changed_email_body' => 'Ändrad attribut
@@ -166,21 +174,21 @@ URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: [name] - Ändrad attribut',
 'attribute_count' => 'Antal användningar',
 'attribute_value' => 'Attributvärde',
-'attribute_value_not_in_valueset' => '',
-'attr_malformed_boolean' => '',
-'attr_malformed_date' => '',
-'attr_malformed_email' => '',
-'attr_malformed_float' => '',
-'attr_malformed_int' => '',
-'attr_malformed_url' => '',
-'attr_max_values' => '',
-'attr_min_values' => '',
-'attr_not_in_valueset' => '',
+'attribute_value_not_in_valueset' => 'Odefinierat värde',
+'attr_malformed_boolean' => 'Det angivna värdet \'[value]\' för \'[attrname]\' är inte ett giltigt boolean-värde.',
+'attr_malformed_date' => 'Det angivna värdet \'[value]\' för attributet \'[attrname]\' är inte ett giltigt datum.',
+'attr_malformed_email' => 'Det angivna värdet \'[value]\' för attributet \'[attrname]\' är inte en giltig URL.',
+'attr_malformed_float' => 'Det angivna värdet \'[value]\' för attributet \'[attrname]\' är inte ett giltigt flyttalsvärde.',
+'attr_malformed_int' => 'Det angivna värdet \'[value]\' för attributet \'[attrname]\' är inte ett giltigt heltal.',
+'attr_malformed_url' => 'Det angivna värdet \'[value]\' för attributet \'[attrname]\' är inte en giltig URL.',
+'attr_max_values' => 'Den maximala värdet för attribute [attrname] har överskridits.',
+'attr_min_values' => 'Det lägsta möjliga värdet för attributet [attrname] är ej uppnått.',
+'attr_not_in_valueset' => 'Värdet \'[value]\' för attributet \'[attrname]\' är inte definierat.',
 'attr_no_regex_match' => 'Värdet av attributet stämmer inte överens med regulära uttrycket',
-'attr_validation_error' => '',
+'attr_validation_error' => 'Värdet \'[value]\' av attributet \'[attrname]\' är inte giltigt.',
 'at_least_n_users_of_group' => 'Åtminstone [number_of_users] användare av [group]',
 'august' => 'augusti',
-'authentication' => '',
+'authentication' => 'Autentisering',
 'author' => 'Författare',
 'automatic_status_update' => 'Automatisk ändring av status',
 'back' => 'Tillbaka',
@@ -203,19 +211,19 @@ URL: [url]',
 'cannot_retrieve_review_snapshot' => 'Det är inte möjligt att skapa en snapshot för denna version av dokumentet.',
 'cannot_rm_root' => 'Fel: Det går inte att ta bort root-katalogen.',
 'categories' => 'Kategorier',
-'categories_loading' => '',
+'categories_loading' => 'Vänligen vänta på listning av kategorier...',
 'category' => 'Kategori',
 'category_exists' => 'Kategorin finns redan.',
 'category_filter' => 'Bara kategorier',
-'category_info' => '',
+'category_info' => 'Information',
 'category_in_use' => 'Denna kategori används av ett dokument.',
 'category_noname' => 'Inget kategorinamn angivet',
 'ca_ES' => 'katalonska',
 'change_assignments' => 'Ändra uppdrag',
 'change_password' => 'Ändra lösenord',
 'change_password_message' => 'Ditt lösenord har ändrats.',
-'change_recipients' => '',
-'change_revisors' => '',
+'change_recipients' => 'Ange mottagare',
+'change_revisors' => 'Ange granskare',
 'change_status' => 'Ändra status',
 'charts' => 'Diagram',
 'chart_docsaccumulated_title' => 'Antal dokument',
@@ -226,18 +234,18 @@ 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' => '',
-'checkoutpath_does_not_exist' => '',
-'checkout_document' => '',
-'checkout_is_disabled' => '',
+'checkedout_file_has_different_version' => 'Den utcheckade dokumentet är inte detsamma som nuvarande version. Checkin kommer inte att uppdatera dokumentet.',
+'checkedout_file_has_disappeared' => 'Filen för det utcheckade dokumentet saknas. Checkin är inte möjlig.',
+'checkedout_file_is_unchanged' => 'Filen för det utcheckade dokumentet är oförändrad och inchecknign är inte möjlig. Om du inte planerar att göra någon modifiering kan du återställa dokumentets utcheckningsstatus.',
+'checkin_document' => 'Incheckning',
+'checkoutpath_does_not_exist' => 'Sökvägen för utcheckning saknas',
+'checkout_document' => 'Utcheckning',
+'checkout_is_disabled' => 'Utcheckning av dokument är avvaktiverad i systemets inställningar.',
 'choose_attrdef' => 'Välj attributdefinition',
-'choose_attrdefgroup' => '',
+'choose_attrdefgroup' => 'Välj gruppattribut',
 'choose_category' => 'Välj',
 'choose_group' => 'Välj grupp',
-'choose_role' => '',
+'choose_role' => 'Välj roll',
 'choose_target_category' => 'Välj kategori',
 'choose_target_document' => 'Välj dokument',
 'choose_target_file' => 'Välj fil',
@@ -246,20 +254,20 @@ URL: [url]',
 'choose_workflow' => 'Välj arbetsflöde',
 'choose_workflow_action' => 'Välj åtgärd för arbetsflödet',
 'choose_workflow_state' => 'Välj status för arbetsflödet',
-'class_name' => '',
+'class_name' => 'Klassnamn',
 'clear_cache' => 'Rensa cache',
 'clear_clipboard' => 'Rensa urklipp',
-'clear_password' => '',
+'clear_password' => 'Ta bort lösenord',
 'clipboard' => 'Urklipp',
 'close' => 'Stäng',
-'command' => '',
+'command' => 'Kommando',
 'comment' => 'Kommentar',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Kommentar till versionen',
-'confirm_clear_cache' => '',
+'confirm_clear_cache' => 'Vill du verkligen tömma cachen? Detta kommer att ta bort alla lagrade bilder för förhandsvisning.',
 'confirm_create_fulltext_index' => 'Ja, jag vill återskapa fulltext-sökindex !',
-'confirm_move_document' => '',
-'confirm_move_folder' => '',
+'confirm_move_document' => 'Vänligen bekräfta flytt av dokumentet.',
+'confirm_move_folder' => 'Vänligen bekräfta flytt av katalogen.',
 'confirm_pwd' => 'Bekräfta lösenord',
 'confirm_rm_backup' => 'Vill du verkligen ta bort filen "[arkname]"?<br>OBS! Om filen tas bort, kan den inte återskapas!',
 'confirm_rm_document' => 'Vill du verkligen ta bort dokumentet \'[documentname]\'?<br>OBS! Om dokumentet tas bort, kan det inte återskapas!',
@@ -270,32 +278,32 @@ 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_transmittal' => '',
-'confirm_rm_transmittalitem' => '',
+'confirm_rm_transmittal' => 'Vänligen bekräfta radering av meddelande.',
+'confirm_rm_transmittalitem' => 'Bekräfta radering',
 'confirm_rm_user' => 'Vill du verkligen ta bort användaren "[username]"?<br>OBS! Användaren kan inte återskapas!',
-'confirm_rm_user_from_processes' => '',
+'confirm_rm_user_from_processes' => 'Vill du verkligen ta bort användaren "[username]" från alla arbetsflöden?<br>Var försiktig! Denna åtgärd kan innebära oönskad publicering om användaren är den sista eller enda godkännaren i ett arbetsflöde.',
 'confirm_rm_version' => 'Vill du verkligen ta bort versionen [version] av dokumentet "[documentname]"?<br>OBS! Versionen kan inte återskapas!',
-'confirm_transfer_objects' => '',
-'confirm_update_transmittalitem' => '',
+'confirm_transfer_objects' => 'Vill du verkligen flytta dokument, kataloger m m tillhörande användaren "[username]"? Var försiktig! Denna åtgärd kan inte ångras.',
+'confirm_update_transmittalitem' => 'Bekräfta uppdatering',
 'content' => 'Innehåll',
 'continue' => 'Fortsätt',
-'converter_new_cmd' => '',
-'converter_new_mimetype' => '',
-'copied_to_checkout_as' => '',
-'create_download_link' => '',
+'converter_new_cmd' => 'Kommando',
+'converter_new_mimetype' => 'Ny MIME-typ',
+'copied_to_checkout_as' => 'Filen har kopierats till utcheckningmappen som \'[filename]\' per [date]',
+'create_download_link' => 'Skapa länk för nedladdning',
 '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_password' => 'Nuvarande lösenord',
-'current_quota' => '',
+'current_quota' => 'Systemets värde för kvota har angivits [quota].',
 'current_state' => 'Aktuell status',
 'current_version' => 'Aktuell version',
 'daily' => 'dagligen',
 'databasesearch' => 'Sök databas',
 'date' => 'Datum',
 'days' => 'dagar',
-'debug' => '',
+'debug' => 'Felsökning',
 'december' => 'december',
 'default_access' => 'Standardrättigheter',
 'default_keywords' => 'Möjliga nyckelord',
@@ -305,28 +313,28 @@ URL: [url]',
 'details_version' => 'Detaljer för version: [version]',
 'de_DE' => 'tyska',
 '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' => '',
-'docs_in_reception_no_access' => '',
-'docs_in_revision_no_access' => '',
+'discspace' => 'Diskutrymme',
+'docs_in_reception_no_access' => 'Dokument med angiven mottagare som saknar behörighet till dokumentet',
+'docs_in_revision_no_access' => 'Dokument med angiven granskare som saknar behörighet till dokumentet',
 'document' => 'Dokument',
-'documentcontent' => '',
+'documentcontent' => 'Dokumentinnehåll',
 'documents' => 'Dokument',
-'documents_checked_out_by_you' => '',
+'documents_checked_out_by_you' => 'Dokument utcheckade av dig',
 'documents_expired' => 'Utgångna dokument',
 'documents_in_process' => 'Dokument i bearbetning',
-'documents_locked' => '',
+'documents_locked' => 'Låsta dokument',
 '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_process' => '',
+'documents_to_process' => 'Dokument som kräver åtgärd',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokument som du behöver granska',
-'documents_to_revise' => '',
-'documents_user_reception' => '',
-'documents_user_rejected' => '',
+'documents_to_revise' => 'Dokument som väntar på din granskning',
+'documents_user_reception' => 'Dokument som väntar på mottagande',
+'documents_user_rejected' => 'Avvisade dokument',
 'documents_user_requiring_attention' => 'Dokument som du behöver granska/godkänna',
-'documents_with_notification' => '',
-'document_already_checkedout' => '',
+'documents_with_notification' => 'Dokument med meddelande',
+'document_already_checkedout' => 'Dokumentet är redan utcheckat',
 'document_already_locked' => 'Detta dokument är redan låst',
 'document_comment_changed_email' => 'Kommentar ändrat',
 'document_comment_changed_email_body' => 'Kommentar ändrat
@@ -337,7 +345,7 @@ Kommentar: [new_comment]
 Användare: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Kommentar ändrat',
-'document_count' => '',
+'document_count' => 'Antal dokument',
 'document_deleted' => 'Dokumentet raderades',
 'document_deleted_email' => 'Dokument har raderats',
 'document_deleted_email_body' => 'Dokument har raderats
@@ -348,7 +356,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_checked_out' => 'Dokumentet är redan utcheckat. Om du laddar upp en ny version kan den utcheckade versionen inte checkas in igen.',
 'document_is_not_locked' => 'Detta dokument är inte låst',
 'document_link_by' => 'Länkat av',
 'document_link_public' => 'Offentlig länk',
@@ -360,7 +368,7 @@ Ny katalog: [new_folder_path]
 Användare: [username]
 URL: [url]',
 'document_moved_email_subject' => '[sitename]: [name] - Dokument har flyttats',
-'document_not_checkedout' => '',
+'document_not_checkedout' => 'Dokumentet är inte utcheckat',
 'document_renamed_email' => 'Dokument har bytt namn',
 'document_renamed_email_body' => 'Dokument har bytt namn
 Dokument: [name]
@@ -378,8 +386,13 @@ Användare: [username]
 URL: [url]',
 'document_status_changed_email_subject' => '[sitename]: [name] - Dokument status ändrad',
 'document_title' => 'Dokument \'[documentname]\'',
-'document_transfered_email_body' => '',
-'document_transfered_email_subject' => '',
+'document_transfered_email_body' => 'Dokument övedrfört till annan användare
+Dokument: [name]
+Ny ägare: [newuser]
+Överordnad katalog: [folder_path]
+Användare: [username]
+URL: [url]',
+'document_transfered_email_subject' => '[sitename]: [name] - Flytta dokument',
 'document_updated_email' => 'Dokument har uppdaterats',
 'document_updated_email_body' => 'Dokument har uppdaterats
 Dokument: [name]
@@ -392,18 +405,25 @@ URL: [url]',
 'does_not_expire' => 'Löper aldrig ut',
 'does_not_inherit_access_msg' => 'Ärv behörighet',
 'download' => 'Ladda ner',
-'download_links' => '',
-'download_link_email_body' => '',
-'download_link_email_subject' => '',
+'download_links' => 'Nedladdningslänkar',
+'download_link_email_body' => 'Klicka på länken nedan för nedladdning av version [version] av dokumentet
+\'[docname]\'.
+
+[url]
+
+Länken är giltig t o m [valid].
+
+[comment]',
+'download_link_email_subject' => 'Nedladdningslänk',
 'do_object_repair' => 'Försök att laga kataloger och dokument.',
 'do_object_setchecksum' => 'Lägg till checksumma',
 'do_object_setfilesize' => 'Ange filstorlek',
 'do_object_unlink' => 'Ta bort dokument version',
-'draft' => '',
+'draft' => 'Utkast',
 '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!',
-'dropfolderdir_missing' => '',
+'dropfolderdir_missing' => 'Du saknar en personlig mapp för uppladdning till servern. Kontakta systemadminiustratören för att få hjälp att skapa den.',
 'dropfolder_file' => 'Fil från mellanlagrings-mappen',
 'dropfolder_folder' => '',
 'dropupload' => 'Snabb uppladdning',
@@ -412,7 +432,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',
-'duplicates' => '',
+'duplicates' => 'Dubletter',
 'duplicate_content' => 'Duplicera innehåll',
 'edit' => 'Ändra',
 'edit_attributes' => 'Ändra attribut',
@@ -423,59 +443,59 @@ URL: [url]',
 'edit_document_props' => 'Ändra',
 'edit_event' => 'Ändra händelse',
 'edit_existing_access' => 'Ändra lista med behörigheter',
-'edit_existing_attribute_groups' => '',
+'edit_existing_attribute_groups' => 'Ändra grupp för attribut',
 'edit_existing_notify' => 'Ändra lista med meddelanden',
 'edit_folder_access' => 'Ändra behörighet',
-'edit_folder_attrdefgrp' => '',
+'edit_folder_attrdefgrp' => 'Ändra grupp för attribut',
 'edit_folder_notify' => 'Katalog-meddelandelista',
 'edit_folder_props' => 'Ändra katalog',
 'edit_group' => 'Ändra grupp',
-'edit_online' => '',
-'edit_transmittal_props' => '',
+'edit_online' => 'Uppdatera online',
+'edit_transmittal_props' => 'Ändra egenskaper för meddelande',
 'edit_user' => 'Ändra användare',
 'edit_user_details' => 'Ändra användarens information',
-'edit_version' => '',
+'edit_version' => 'Ändra version',
 'el_GR' => 'grekisk',
 'email' => 'E-post',
 'email_error_title' => 'E-post saknas',
 'email_footer' => 'Du kan alltid ändra dina e-postinställningar genom att gå till \'Min Sida\'',
 'email_header' => 'Detta meddelande skapades automatiskt från dokumentservern.',
 'email_not_given' => 'Skriv in en giltig e-postadress.',
-'empty_attribute_group_list' => '',
+'empty_attribute_group_list' => 'Grupp för attribut saknas',
 'empty_folder_list' => 'Inga dokument eller mappar',
 'empty_notify_list' => 'Inga meddelanden',
 'en_GB' => 'engelska (GB)',
 'equal_transition_states' => 'Start and slut status är lika',
 'error' => 'Fel',
 'error_add_aro' => '',
-'error_add_permission' => '',
-'error_cleared_cache' => '',
-'error_importfs' => '',
+'error_add_permission' => 'Fel vid tilldelning av behörighet',
+'error_cleared_cache' => 'Fel vid rensning av cache',
+'error_importfs' => 'Fel vid import från filsystem',
 '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_document' => '',
-'error_remove_folder' => '',
-'error_remove_permission' => '',
-'error_toogle_permission' => '',
-'error_transfer_document' => '',
+'error_remove_document' => 'Fel vid radering av dokument',
+'error_remove_folder' => 'Fel vid radering av katalog',
+'error_remove_permission' => 'Fel vid borttagen behörighet',
+'error_toogle_permission' => 'Fel vid förändring av behörighet',
+'error_transfer_document' => 'Fel vid förflyttning av dokument',
 'es_ES' => 'spanska',
 'event_details' => 'Händelseinställningar',
 'exclude_items' => '',
 'expired' => 'Har gått ut',
-'expired_at_date' => '',
-'expired_documents' => '',
+'expired_at_date' => 'Upphörde per [datetime]',
+'expired_documents' => 'Utgångna dokument',
 'expires' => 'Kommer att gå ut',
-'expire_by_date' => '',
-'expire_in_1d' => '',
-'expire_in_1h' => '',
-'expire_in_1m' => '',
-'expire_in_1w' => '',
-'expire_in_1y' => '',
-'expire_in_2h' => '',
-'expire_in_2y' => '',
-'expire_today' => '',
-'expire_tomorrow' => '',
+'expire_by_date' => 'Upphör att gälla per',
+'expire_in_1d' => 'Upphör att gälla om 1 dag',
+'expire_in_1h' => 'Upphör att gälla om 1 tim',
+'expire_in_1m' => 'Upphör att gälla inom 1 månad',
+'expire_in_1w' => 'Upphör att gälla inom 1 vecka',
+'expire_in_1y' => 'Upphör att gälla inom 1 år',
+'expire_in_2h' => 'Upphör att gälla inom 2 tim',
+'expire_in_2y' => 'Giltigt i 2 år',
+'expire_today' => 'Upphör att gälla idag',
+'expire_tomorrow' => 'Upphör att gälla i morgon',
 'expiry_changed_email' => 'Utgångsdatum ändrat',
 'expiry_changed_email_body' => 'Utgångsdatum ändrat
 Dokument: [name]
@@ -483,7 +503,7 @@ Dokument: [name]
 Användare: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Utgångsdatum ändrat',
-'export' => '',
+'export' => 'Exportera',
 'extension_manager' => 'Förvalta tillägg',
 'february' => 'februari',
 'file' => 'Dokumentinformation',
@@ -1659,6 +1679,7 @@ URL: [url]',
 'workflow_summary' => 'Sammanfattning arbetsflöde',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Sammanfattning användare',
+'x_more_objects' => '',
 'year_view' => 'årsvy',
 'yes' => 'Ja',
 'zh_CN' => 'kinesiska (CN)',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index f9fe7d83c..911440099 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -1670,6 +1670,7 @@ URL: [url]',
 'workflow_summary' => 'İş akış özeti',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Kullanıcı özeti',
+'x_more_objects' => '',
 'year_view' => 'Yıllık Görünüm',
 'yes' => 'Evet',
 'zh_CN' => 'Çince',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 2aca60407..7134f55f7 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -1691,6 +1691,7 @@ URL: [url]',
 'workflow_summary' => 'Підсумки по процесу',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Підсумки по користувачу',
+'x_more_objects' => '',
 'year_view' => 'Рік',
 'yes' => 'Так',
 'zh_CN' => 'Chinese (CN)',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 271b2c68c..94ebcece7 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -1665,6 +1665,7 @@ URL: [url]',
 'workflow_summary' => '工作流概述',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => '用户概述',
+'x_more_objects' => '',
 'year_view' => '年视图',
 'yes' => '是',
 'zh_CN' => '中文简体',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index d5a6d1a48..f4680e940 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -1509,6 +1509,7 @@ URL: [url]',
 'workflow_summary' => '',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => '',
+'x_more_objects' => '',
 'year_view' => '年視圖',
 'yes' => '是',
 'zh_CN' => '中文簡體',

From 9e85efd72e29feabb8f91cef6438710232173708 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 15 Dec 2017 09:33:17 +0100
Subject: [PATCH 143/308] set showtree for view

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

diff --git a/out/out.Timeline.php b/out/out.Timeline.php
index 8ce4607ac..798be2079 100644
--- a/out/out.Timeline.php
+++ b/out/out.Timeline.php
@@ -52,6 +52,7 @@ if(isset($_GET['documentid']) && $_GET['documentid'] && is_numeric($_GET['docume
 if($view) {
 	$view->setParam('dms', $dms);
 	$view->setParam('user', $user);
+	$view->setParam('showtree', showtree());
 	$view->setParam('fromdate', isset($_GET['fromdate']) ? $_GET['fromdate'] : '');
 	$view->setParam('todate', isset($_GET['todate']) ? $_GET['todate'] : '');
 	$view->setParam('skip', $skip);

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 144/308] 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 145/308] 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 146/308] 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 147/308] 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 148/308] 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 149/308] 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 150/308] 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 0bfac9cadd50353700d33f14539428dc74864b12 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Dec 2017 11:07:02 +0100
Subject: [PATCH 151/308] new phrases, swedish translation update

---
 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 |   3 +-
 languages/el_GR/lang.inc |   1 +
 languages/en_GB/lang.inc |   3 +-
 languages/es_ES/lang.inc |   5 +-
 languages/fr_FR/lang.inc |   1 +
 languages/hr_HR/lang.inc |   1 +
 languages/hu_HU/lang.inc |   1 +
 languages/it_IT/lang.inc |   1 +
 languages/ko_KR/lang.inc |   1 +
 languages/nl_NL/lang.inc |  11 +-
 languages/pl_PL/lang.inc |   1 +
 languages/pt_BR/lang.inc |   1 +
 languages/ro_RO/lang.inc |   1 +
 languages/ru_RU/lang.inc |   1 +
 languages/sk_SK/lang.inc |   1 +
 languages/sv_SE/lang.inc | 497 ++++++++++++++++++++-------------------
 languages/tr_TR/lang.inc |   5 +-
 languages/uk_UA/lang.inc |   1 +
 languages/zh_CN/lang.inc |   1 +
 languages/zh_TW/lang.inc |  17 +-
 24 files changed, 297 insertions(+), 261 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 06a22b4ca..70db532fa 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -322,6 +322,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'مستندات في انتظار المراجعة',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'مستندات ملكك تستلزم انتباهك',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 3a5e420fa..8c311ad38 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -307,6 +307,7 @@ $text = array(
 'documents_to_receipt' => '',
 'documents_to_review' => 'Документы, чакащи Вашата рецензия',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Ваши документи, изискващи внимание',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 1b613b0d0..7101cae06 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -312,6 +312,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents en espera de revisió d\'usuaris',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documents de la seva propietat que requereixen atenció',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 9a965c1f2..e8dec9d84 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -329,6 +329,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čekající na kontrolu uživatele',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dokumenty, které uživatel vlastní a vyžadují pozornost',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 6f9765dfb..1d2cdc7dd 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 (2504), dgrutsch (22)
+//    Translators: Admin (2505), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -334,6 +334,7 @@ URL: [url]',
 'documents_to_receipt' => 'Empfangsbestätigung erforderlich',
 'documents_to_review' => 'Prüfung erforderlich',
 'documents_to_revise' => 'Erneute Prüfung erforderlich',
+'documents_user_expiration' => 'Abgelaufende Dokumente',
 'documents_user_reception' => 'Dokumente mit Empfangsbestätigung',
 'documents_user_rejected' => 'Abgelehnte Dokumente',
 'documents_user_requiring_attention' => 'Diese Dokumente sollte ich mal nachsehen',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index ec36852d9..febcb780e 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -307,6 +307,7 @@ $text = array(
 'documents_to_receipt' => '',
 'documents_to_review' => '',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index ef9aa264a..804368f99 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 (1631), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1632), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -334,6 +334,7 @@ URL: [url]',
 'documents_to_receipt' => 'Documents awaiting to confirm the receipt',
 'documents_to_review' => 'Documents awaiting your review',
 'documents_to_revise' => 'Documents awaiting your revision',
+'documents_user_expiration' => 'Expired documents',
 'documents_user_reception' => 'Documents awaiting reception',
 'documents_user_rejected' => 'Rejected documents',
 'documents_user_requiring_attention' => 'Documents owned by you that require attention',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 3a5580c23..124c22094 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 (1043), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1044), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -329,6 +329,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documentos en espera de revisión de usuarios',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documentos de su propiedad que requieren atención',
@@ -1541,7 +1542,7 @@ URL: [url]',
 'toggle_manager' => 'Intercambiar mánager',
 'toggle_qrcode' => '',
 'to_before_from' => 'La fecha de finalización no debe ser anterior a la de inicio',
-'transfer_document' => '',
+'transfer_document' => 'Transferir documento',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',
 'transfer_objects' => '',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 037d9114f..b6bad742a 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -334,6 +334,7 @@ URL: [url]',
 'documents_to_receipt' => 'Documents en attente de confirmation de réception',
 'documents_to_review' => 'Documents en attente de vérification',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => 'Documents en attente de réception',
 'documents_user_rejected' => 'Documents rejetés',
 'documents_user_requiring_attention' => 'Documents à surveiller',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 8f0dbab98..e4513dbdd 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -334,6 +334,7 @@ Internet poveznica: [url]',
 'documents_to_receipt' => 'Dokumenti koji čekaju potvrdu primitka',
 'documents_to_review' => 'Dokumenti koji čekaju vaš pregled',
 'documents_to_revise' => 'Dokumenti za reviziju',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Odbijeni dokumenti',
 'documents_user_requiring_attention' => 'Dokumenti u vašem vlasništvu koji zahtjevaju pažnju',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index d2e1a49d4..e4b71e777 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -329,6 +329,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Felülvizsgálatára váró dokumentumok',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Az Ön tulajdonában álló dokumentumok, amelyekre figyelmet kell fordítani',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 1345ee9fc..acb391b66 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -335,6 +335,7 @@ URL: [url]',
 'documents_to_receipt' => 'Documenti in attesa di conferma ricezione',
 'documents_to_review' => 'Documenti in attesa della tua revisione',
 'documents_to_revise' => 'Documenti da revisionare.',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Documenti rifiutati',
 'documents_user_requiring_attention' => 'Tuoi documenti in attesa di revisione o approvazione',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index b023567f7..cd5943dfd 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -337,6 +337,7 @@ URL: [url]',
 'documents_to_receipt' => '당신의 접수확인을 기다리는 문서들',
 'documents_to_review' => '당신의 검토를 기다리는 문서',
 'documents_to_revise' => '문서 정정',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '거부된 문서',
 'documents_user_requiring_attention' => '주의가 필요한 당신 소유의 문서',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index dc5b1a988..b620407a3 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -19,15 +19,15 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (745), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (745), gijsbertush (333), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
-'2_factor_auth' => '',
-'2_factor_auth_info' => '',
-'2_fact_auth_secret' => '',
+'2_factor_auth' => 'Twee-factor-authorisatie',
+'2_factor_auth_info' => 'Info 2-factor-authorisatie',
+'2_fact_auth_secret' => 'Toegangscode 2-factor-authorisatie',
 'accept' => 'Accept',
 'access_control' => 'Toegangscontrole',
-'access_control_is_off' => '',
+'access_control_is_off' => 'Toegansgscontrole staat uit',
 'access_denied' => 'Geen toegang.',
 'access_inheritance' => 'Toegang overgeërfd',
 'access_mode' => 'Toegang modus',
@@ -327,6 +327,7 @@ URL: [url]',
 'documents_to_receipt' => 'documenten te ontvangen',
 'documents_to_review' => 'Documenten die wachten op uw controle',
 'documents_to_revise' => 'Te reviseren documenten',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'documenten niet geaccepteerd door gebruiker',
 'documents_user_requiring_attention' => 'Eigen documenten die (nog) aandacht behoeven',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 8a328dc64..c3a46892c 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -322,6 +322,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty oczekujące na Twoją recenzję',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dokumenty należące do Ciebie, które wymagają uwagi',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 8a3531b12..67a5aebfd 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -329,6 +329,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents Awaiting User\'s Review',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Documentos rejeitados',
 'documents_user_requiring_attention' => 'Documents Owned by User That Require Attention',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index a02aadf4c..846a4f78a 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -334,6 +334,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_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documente deținute de tine care necesită atenție',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index a8953dd04..3e5a374f1 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -334,6 +334,7 @@ URL: [url]',
 'documents_to_receipt' => 'Документы, которые ожидают подтверждение получения',
 'documents_to_review' => 'Документы, ожидающие вашей рецензии',
 'documents_to_revise' => 'Документы на ревизии',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Отклоненные документы',
 'documents_user_requiring_attention' => 'Ваши документы, требующие внимания',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 1622629c1..4963a0002 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -311,6 +311,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čakajúce na kontrolu používateľa',
 'documents_to_revise' => 'Dokumenty čakajúce na vašu revíziu',
+'documents_user_expiration' => '',
 'documents_user_reception' => 'Dokumenty čakajúce na prijatie',
 'documents_user_rejected' => 'Zamietnuté dokumenty',
 'documents_user_requiring_attention' => 'Dokumenty, ktoré používateľ vlastní a vyžadujú pozornosť',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 528e48730..bc1f3e537 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 (1154), MagnusI (119), tmichelfelder (106)
+//    Translators: Admin (1154), MagnusI (335), tmichelfelder (106)
 
 $text = array(
 '2_factor_auth' => '2-faktors autentisering',
@@ -28,12 +28,12 @@ Nedan ser du två QR-koder. Den högra är din hemliga kod och till vänster kan
 '2_fact_auth_secret' => 'Hemlighet',
 'accept' => 'Godkänn',
 'access_control' => 'Åtkomstkontroll',
-'access_control_is_off' => 'Avancerad åtkomstkontroll är avaktiverad',
+'access_control_is_off' => 'Avancerad åtkomstkontroll är inaktiverad',
 'access_denied' => 'Åtkomst nekas.',
 'access_inheritance' => 'Ärv åtkomst',
 'access_mode' => 'Åtkomstnivå',
 'access_mode_all' => 'Full behörighet',
-'access_mode_none' => 'Inga rättigheter',
+'access_mode_none' => 'Ingen åtkomst',
 'access_mode_read' => 'Läsrättighet',
 'access_mode_readwrite' => 'Läs/Skriv-rättigheter',
 'access_permission_changed_email' => 'Ändrade rättigheter',
@@ -98,9 +98,14 @@ URL: [url]',
 'approvals_without_group' => 'Godkännandet saknar grupp',
 'approvals_without_user' => 'Godkännandet saknar användare',
 'approval_deletion_email' => 'Begäran om godkännande har raderats',
-'approval_deletion_email_body' => '',
+'approval_deletion_email_body' => 'Begäran om godkännande har raderats
+Dokument: [name]
+Version: [version]
+Överordnad katalog: [folder_path]
+Användare: [username]
+URL: [url]',
 'approval_deletion_email_subject' => '[sitename]: [name] - Godkännandet har raderats',
-'approval_file' => '',
+'approval_file' => 'Fil',
 'approval_group' => 'Grupp av personer som godkänner',
 'approval_log' => 'Godkännandelogg',
 'approval_request_email' => 'Begäran om godkännande',
@@ -124,10 +129,10 @@ URL: [url]',
 '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',
+'approvers' => 'Godkännare',
 'approver_already_assigned' => 'Användaren är redan godkännare',
 'approver_already_removed' => 'Användaren har redan godkänt dokumentet alternativt tagits bort från arbetsflödet.',
-'april' => 'april',
+'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.',
 'ar_EG' => 'arabiska',
@@ -148,30 +153,30 @@ URL: [url]',
 'attrdef_minvalues' => 'Min tillåtna värde',
 'attrdef_min_greater_max' => 'Minimum antal värden är större än maximum antal värden',
 'attrdef_multiple' => 'Tillåt flera värden',
-'attrdef_multiple_needs_valueset' => '',
+'attrdef_multiple_needs_valueset' => 'Attribut med flera värden behöver definieras.',
 'attrdef_must_be_multiple' => 'Attribut måste ha mer än ett värde',
 'attrdef_name' => 'Namn',
-'attrdef_noname' => 'Saknar namn för attribut definition',
+'attrdef_noname' => 'Namn för definition av attribut saknas',
 'attrdef_objtype' => 'Objekttyp',
 'attrdef_regex' => 'Regulär uttryck',
 'attrdef_type' => 'Typ',
 'attrdef_type_boolean' => 'Logisk',
 'attrdef_type_date' => 'Datum',
-'attrdef_type_email' => 'Email',
+'attrdef_type_email' => 'E-post',
 'attrdef_type_float' => 'Flyttal',
 'attrdef_type_int' => 'Heltal',
 'attrdef_type_string' => 'Textsträng',
 'attrdef_type_url' => 'URL',
 'attrdef_valueset' => 'Värden',
 'attributes' => 'Attribut',
-'attribute_changed_email_body' => 'Ändrad attribut
-Dokument: [name]
-Version: [version]
-Attribut: [attribute]
-Överordnade katalog: [folder_path]
-Användare: [username]
+'attribute_changed_email_body' => 'Ändrat attribut
+Dokument: [name]
+Version: [version]
+Attribut: [attribute]
+Överordnad katalog: [folder_path]
+Användare: [username]
 URL: [url]',
-'attribute_changed_email_subject' => '[sitename]: [name] - Ändrad attribut',
+'attribute_changed_email_subject' => '[sitename]: [name] - Ändrat attribut',
 'attribute_count' => 'Antal användningar',
 'attribute_value' => 'Attributvärde',
 'attribute_value_not_in_valueset' => 'Odefinierat värde',
@@ -181,13 +186,13 @@ URL: [url]',
 'attr_malformed_float' => 'Det angivna värdet \'[value]\' för attributet \'[attrname]\' är inte ett giltigt flyttalsvärde.',
 'attr_malformed_int' => 'Det angivna värdet \'[value]\' för attributet \'[attrname]\' är inte ett giltigt heltal.',
 'attr_malformed_url' => 'Det angivna värdet \'[value]\' för attributet \'[attrname]\' är inte en giltig URL.',
-'attr_max_values' => 'Den maximala värdet för attribute [attrname] har överskridits.',
-'attr_min_values' => 'Det lägsta möjliga värdet för attributet [attrname] är ej uppnått.',
+'attr_max_values' => 'Den maximala värdet för attributet [attrname] har överskridits.',
+'attr_min_values' => 'Det lägsta tillåtnaa värdet för attributet [attrname] är ej uppnått.',
 'attr_not_in_valueset' => 'Värdet \'[value]\' för attributet \'[attrname]\' är inte definierat.',
 'attr_no_regex_match' => 'Värdet av attributet stämmer inte överens med regulära uttrycket',
 'attr_validation_error' => 'Värdet \'[value]\' av attributet \'[attrname]\' är inte giltigt.',
 'at_least_n_users_of_group' => 'Åtminstone [number_of_users] användare av [group]',
-'august' => 'augusti',
+'august' => 'Augusti',
 'authentication' => 'Autentisering',
 'author' => 'Författare',
 'automatic_status_update' => 'Automatisk ändring av status',
@@ -200,10 +205,10 @@ URL: [url]',
 'bg_BG' => 'Bulgariska',
 'browse' => 'Bläddra',
 'calendar' => 'Kalender',
-'calendar_week' => 'Kalender vecka',
+'calendar_week' => 'Kalendervecka',
 'cancel' => 'Avbryt',
 '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 statusen för ett dokument som har avvisats eller gått ut eller som väntar på att bli godkänt.',
+'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.',
 'cannot_delete_user' => 'Du kan inte ta bort användaren.',
 'cannot_delete_yourself' => 'Du kan inte ta bort dig själv.',
 'cannot_move_root' => 'Fel: Det går inte att flytta root-katalogen.',
@@ -218,7 +223,7 @@ URL: [url]',
 'category_info' => 'Information',
 'category_in_use' => 'Denna kategori används av ett dokument.',
 'category_noname' => 'Inget kategorinamn angivet',
-'ca_ES' => 'katalonska',
+'ca_ES' => 'Katalonska',
 'change_assignments' => 'Ändra uppdrag',
 'change_password' => 'Ändra lösenord',
 'change_password_message' => 'Ditt lösenord har ändrats.',
@@ -234,13 +239,13 @@ 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' => 'Den utcheckade dokumentet är inte detsamma som nuvarande version. Checkin kommer inte att uppdatera dokumentet.',
-'checkedout_file_has_disappeared' => 'Filen för det utcheckade dokumentet saknas. Checkin är inte möjlig.',
+'checkedout_file_has_different_version' => 'Det utcheckade dokumentet är inte detsamma som nuvarande version. Incheckning kommer inte att uppdatera dokumentet.',
+'checkedout_file_has_disappeared' => 'Filen för det utcheckade dokumentet saknas. Incheckning är inte möjlig.',
 'checkedout_file_is_unchanged' => 'Filen för det utcheckade dokumentet är oförändrad och inchecknign är inte möjlig. Om du inte planerar att göra någon modifiering kan du återställa dokumentets utcheckningsstatus.',
 'checkin_document' => 'Incheckning',
 'checkoutpath_does_not_exist' => 'Sökvägen för utcheckning saknas',
 'checkout_document' => 'Utcheckning',
-'checkout_is_disabled' => 'Utcheckning av dokument är avvaktiverad i systemets inställningar.',
+'checkout_is_disabled' => 'Utcheckning av dokument är invaktiverad i systemets inställningar.',
 'choose_attrdef' => 'Välj attributdefinition',
 'choose_attrdefgroup' => 'Välj gruppattribut',
 'choose_category' => 'Välj',
@@ -264,8 +269,8 @@ URL: [url]',
 'comment' => 'Kommentar',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Kommentar till versionen',
-'confirm_clear_cache' => 'Vill du verkligen tömma cachen? Detta kommer att ta bort alla lagrade bilder för förhandsvisning.',
-'confirm_create_fulltext_index' => 'Ja, jag vill återskapa fulltext-sökindex !',
+'confirm_clear_cache' => 'Vill du verkligen rensa cachen? Detta kommer att ta bort alla förlagrade bilder för förhandsvisning.',
+'confirm_create_fulltext_index' => 'Ja, jag vill återskapa fulltext-sökindex!',
 'confirm_move_document' => 'Vänligen bekräfta flytt av dokumentet.',
 'confirm_move_folder' => 'Vänligen bekräfta flytt av katalogen.',
 'confirm_pwd' => 'Bekräfta lösenord',
@@ -280,10 +285,10 @@ URL: [url]',
 'confirm_rm_log' => 'Vill du verkligen ta bort loggfilen "[logname]"?<br>OBS! Loggfilen kan inte återskapas!',
 'confirm_rm_transmittal' => 'Vänligen bekräfta radering av meddelande.',
 'confirm_rm_transmittalitem' => 'Bekräfta radering',
-'confirm_rm_user' => 'Vill du verkligen ta bort användaren "[username]"?<br>OBS! Användaren kan inte återskapas!',
+'confirm_rm_user' => 'Vill du verkligen ta bort användaren "[username]"?<br>OBS! Åtgärden kan inte ångras!',
 'confirm_rm_user_from_processes' => 'Vill du verkligen ta bort användaren "[username]" från alla arbetsflöden?<br>Var försiktig! Denna åtgärd kan innebära oönskad publicering om användaren är den sista eller enda godkännaren i ett arbetsflöde.',
-'confirm_rm_version' => 'Vill du verkligen ta bort versionen [version] av dokumentet "[documentname]"?<br>OBS! Versionen kan inte återskapas!',
-'confirm_transfer_objects' => 'Vill du verkligen flytta dokument, kataloger m m tillhörande användaren "[username]"? Var försiktig! Denna åtgärd kan inte ångras.',
+'confirm_rm_version' => 'Vill du verkligen ta bort versionen [version] av dokumentet "[documentname]"?<br>OBS! Åtgärden kan inte ångras!',
+'confirm_transfer_objects' => 'Vill du verkligen flytta dokument, kataloger m m tillhörande användaren "[username]"? OBS! Åtgärden kan inte ångras!',
 'confirm_update_transmittalitem' => 'Bekräfta uppdatering',
 'content' => 'Innehåll',
 'continue' => 'Fortsätt',
@@ -294,24 +299,24 @@ URL: [url]',
 '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',
+'cs_CZ' => 'Tjeckiska',
 'current_password' => 'Nuvarande lösenord',
 'current_quota' => 'Systemets värde för kvota har angivits [quota].',
 'current_state' => 'Aktuell status',
 'current_version' => 'Aktuell version',
-'daily' => 'dagligen',
+'daily' => 'Dagligen',
 'databasesearch' => 'Sök databas',
 'date' => 'Datum',
 'days' => 'dagar',
 'debug' => 'Felsökning',
-'december' => 'december',
+'december' => 'December',
 'default_access' => 'Standardrättigheter',
-'default_keywords' => 'Möjliga nyckelord',
+'default_keywords' => 'Tillgängliga nyckelord',
 'definitions' => 'Definitioner',
 'delete' => 'Ta bort',
 'details' => 'Detaljer',
 'details_version' => 'Detaljer för version: [version]',
-'de_DE' => 'tyska',
+'de_DE' => 'Tyska',
 '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',
 'docs_in_reception_no_access' => 'Dokument med angiven mottagare som saknar behörighet till dokumentet',
@@ -321,22 +326,23 @@ URL: [url]',
 'documents' => 'Dokument',
 'documents_checked_out_by_you' => 'Dokument utcheckade av dig',
 'documents_expired' => 'Utgångna dokument',
-'documents_in_process' => 'Dokument i bearbetning',
+'documents_in_process' => 'Dokument under bearbetning',
 'documents_locked' => 'Låsta dokument',
 'documents_locked_by_you' => 'Dokument som du har låst',
-'documents_only' => 'Bara dokument',
+'documents_only' => 'Endast dokument',
 'documents_to_approve' => 'Dokument som du behöver godkänna',
 'documents_to_process' => 'Dokument som kräver åtgärd',
-'documents_to_receipt' => '',
+'documents_to_receipt' => 'Dokument som väntar på bekräftad mottagning',
 'documents_to_review' => 'Dokument som du behöver granska',
 'documents_to_revise' => 'Dokument som väntar på din granskning',
+'documents_user_expiration' => '',
 'documents_user_reception' => 'Dokument som väntar på mottagande',
 'documents_user_rejected' => 'Avvisade dokument',
 'documents_user_requiring_attention' => 'Dokument som du behöver granska/godkänna',
 'documents_with_notification' => 'Dokument med meddelande',
 'document_already_checkedout' => 'Dokumentet är redan utcheckat',
 'document_already_locked' => 'Detta dokument är redan låst',
-'document_comment_changed_email' => 'Kommentar ändrat',
+'document_comment_changed_email' => 'Kommentar ändrad',
 'document_comment_changed_email_body' => 'Kommentar ändrat
 Document: [name]
 Gamla kommentaret: [old_comment]
@@ -353,28 +359,28 @@ Dokument: [name]
 Överordnade katalog: [folder_path]
 Användare: [username]',
 'document_deleted_email_subject' => '[sitename]: [name] - Dokument har raderats',
-'document_duplicate_name' => 'Dubbelt dokumentnamn',
-'document_has_no_workflow' => 'Dokumentet har inget arbetsflöde',
+'document_duplicate_name' => 'Dubblett av dokumentnamn',
+'document_has_no_workflow' => 'Dokumentet saknar arbetsflöde',
 'document_infos' => 'Dokumentinformation',
 'document_is_checked_out' => 'Dokumentet är redan utcheckat. Om du laddar upp en ny version kan den utcheckade versionen inte checkas in igen.',
 'document_is_not_locked' => 'Detta dokument är inte låst',
 'document_link_by' => 'Länkat av',
 'document_link_public' => 'Offentlig länk',
 'document_moved_email' => 'Dokument har flyttats',
-'document_moved_email_body' => 'Dokument har flyttats
-Dokument: [name]
-Gamla katalog: [old_folder_path]
-Ny katalog: [new_folder_path]
-Användare: [username]
+'document_moved_email_body' => 'Dokument har flyttats
+Dokument: [name]
+Tidigare katalog: [old_folder_path]
+Ny katalog: [new_folder_path]
+Användare: [username]
 URL: [url]',
 'document_moved_email_subject' => '[sitename]: [name] - Dokument har flyttats',
 'document_not_checkedout' => 'Dokumentet är inte utcheckat',
 'document_renamed_email' => 'Dokument har bytt namn',
-'document_renamed_email_body' => 'Dokument har bytt namn
-Dokument: [name]
-Överordnade katalog: [folder_path]
-Gamla namnet: [old_name]
-Användare: [username]
+'document_renamed_email_body' => 'Dokument har bytt namn
+Dokument: [name]
+Överordnade katalog: [folder_path]
+Tidigare namn: [old_name]
+Användare: [username]
 URL: [url]',
 'document_renamed_email_subject' => '[sitename]: [name] - Dokument har bytt namn',
 'document_status_changed_email' => 'Dokumentstatus ändrad',
@@ -394,12 +400,12 @@ Användare: [username]
 URL: [url]',
 'document_transfered_email_subject' => '[sitename]: [name] - Flytta dokument',
 'document_updated_email' => 'Dokument har uppdaterats',
-'document_updated_email_body' => 'Dokument har uppdaterats
-Dokument: [name]
-Överordnade katalog: [folder_path]
-Användare: [username]
-Kommentar: [comment]
-Versions kommentar: [version_comment]
+'document_updated_email_body' => 'Dokument har uppdaterats
+Dokument: [name]
+Överordnade katalog: [folder_path]
+Användare: [username]
+Kommentar: [comment]
+Versionskommentar: [version_comment]
 URL: [url]',
 'document_updated_email_subject' => '[sitename]: [name] - Dokument har uppdaterats',
 'does_not_expire' => 'Löper aldrig ut',
@@ -415,17 +421,17 @@ Länken är giltig t o m [valid].
 
 [comment]',
 'download_link_email_subject' => 'Nedladdningslänk',
-'do_object_repair' => 'Försök att laga kataloger och dokument.',
+'do_object_repair' => 'Reparera alla kataloger och dokument.',
 'do_object_setchecksum' => 'Lägg till checksumma',
 'do_object_setfilesize' => 'Ange filstorlek',
-'do_object_unlink' => 'Ta bort dokument version',
+'do_object_unlink' => 'Ta bort dokumentversion',
 'draft' => 'Utkast',
 '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!',
 'dropfolderdir_missing' => 'Du saknar en personlig mapp för uppladdning till servern. Kontakta systemadminiustratören för att få hjälp att skapa den.',
-'dropfolder_file' => 'Fil från mellanlagrings-mappen',
-'dropfolder_folder' => '',
+'dropfolder_file' => 'Fil från mellanlagringsmappen',
+'dropfolder_folder' => 'Katalog från mellanlagringsmappen',
 'dropupload' => 'Snabb uppladdning',
 'drop_files_here' => 'Släpp filer här!',
 'dump_creation' => 'Skapa DB-dump',
@@ -439,7 +445,7 @@ Länken är giltig t o m [valid].
 'edit_comment' => 'Ändra kommentar',
 'edit_default_keywords' => 'Ändra nyckelord',
 'edit_document_access' => 'Ändra behörighet',
-'edit_document_notify' => 'Dokument-meddelandelista',
+'edit_document_notify' => 'Meddelandelista dokument',
 'edit_document_props' => 'Ändra',
 'edit_event' => 'Ändra händelse',
 'edit_existing_access' => 'Ändra lista med behörigheter',
@@ -447,7 +453,7 @@ Länken är giltig t o m [valid].
 'edit_existing_notify' => 'Ändra lista med meddelanden',
 'edit_folder_access' => 'Ändra behörighet',
 'edit_folder_attrdefgrp' => 'Ändra grupp för attribut',
-'edit_folder_notify' => 'Katalog-meddelandelista',
+'edit_folder_notify' => 'Meddelandelista katalog',
 'edit_folder_props' => 'Ändra katalog',
 'edit_group' => 'Ändra grupp',
 'edit_online' => 'Uppdatera online',
@@ -455,7 +461,7 @@ Länken är giltig t o m [valid].
 'edit_user' => 'Ändra användare',
 'edit_user_details' => 'Ändra användarens information',
 'edit_version' => 'Ändra version',
-'el_GR' => 'grekisk',
+'el_GR' => 'Grekiska',
 'email' => 'E-post',
 'email_error_title' => 'E-post saknas',
 'email_footer' => 'Du kan alltid ändra dina e-postinställningar genom att gå till \'Min Sida\'',
@@ -464,22 +470,22 @@ Länken är giltig t o m [valid].
 'empty_attribute_group_list' => 'Grupp för attribut saknas',
 'empty_folder_list' => 'Inga dokument eller mappar',
 'empty_notify_list' => 'Inga meddelanden',
-'en_GB' => 'engelska (GB)',
-'equal_transition_states' => 'Start and slut status är lika',
+'en_GB' => 'Engelska (GB)',
+'equal_transition_states' => 'Status för start och slut är lika',
 'error' => 'Fel',
-'error_add_aro' => '',
+'error_add_aro' => 'Fel vid begärd åtkomst till objekt',
 'error_add_permission' => 'Fel vid tilldelning av behörighet',
 'error_cleared_cache' => 'Fel vid rensning av cache',
 'error_importfs' => 'Fel vid import från filsystem',
 'error_no_document_selected' => 'Inget dokument har valts',
 'error_no_folder_selected' => 'Ingen katalog har valts',
-'error_occured' => 'Ett fel har inträffat.',
+'error_occured' => 'Ett fel har inträffat',
 'error_remove_document' => 'Fel vid radering av dokument',
 'error_remove_folder' => 'Fel vid radering av katalog',
 'error_remove_permission' => 'Fel vid borttagen behörighet',
 'error_toogle_permission' => 'Fel vid förändring av behörighet',
 'error_transfer_document' => 'Fel vid förflyttning av dokument',
-'es_ES' => 'spanska',
+'es_ES' => 'Spanska',
 'event_details' => 'Händelseinställningar',
 'exclude_items' => '',
 'expired' => 'Har gått ut',
@@ -489,11 +495,11 @@ Länken är giltig t o m [valid].
 'expire_by_date' => 'Upphör att gälla per',
 'expire_in_1d' => 'Upphör att gälla om 1 dag',
 'expire_in_1h' => 'Upphör att gälla om 1 tim',
-'expire_in_1m' => 'Upphör att gälla inom 1 månad',
-'expire_in_1w' => 'Upphör att gälla inom 1 vecka',
-'expire_in_1y' => 'Upphör att gälla inom 1 år',
-'expire_in_2h' => 'Upphör att gälla inom 2 tim',
-'expire_in_2y' => 'Giltigt i 2 år',
+'expire_in_1m' => 'Upphör att gälla om 1 månad',
+'expire_in_1w' => 'Upphör att gälla om 1 vecka',
+'expire_in_1y' => 'Upphör att gälla om 1 år',
+'expire_in_2h' => 'Upphör att gälla om 2 tim',
+'expire_in_2y' => 'Upphör att gälla om 2 år',
 'expire_today' => 'Upphör att gälla idag',
 'expire_tomorrow' => 'Upphör att gälla i morgon',
 'expiry_changed_email' => 'Utgångsdatum ändrat',
@@ -504,27 +510,27 @@ Användare: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Utgångsdatum ändrat',
 'export' => 'Exportera',
-'extension_manager' => 'Förvalta tillägg',
+'extension_manager' => 'Hantera tillägg',
 'february' => 'februari',
-'file' => 'Dokumentinformation',
+'file' => 'Fil',
 'files' => 'Filer',
-'files_deletion' => 'Ta bort alla filer',
+'files_deletion' => 'Ta bort filer',
 'files_deletion_warning' => 'Med detta alternativ kan du ta bort alla filer i en dokumentkatalog. Versionsinformationen kommer fortfarande att visas.',
-'files_loading' => 'V.v. vänta tills listan med filer har laddats ...',
+'files_loading' => 'Vänligen vänta tills listan med filer har laddats ...',
 'file_size' => 'Filstorlek',
-'filter_for_documents' => '',
-'filter_for_folders' => '',
+'filter_for_documents' => 'Tilläggsfilter för dokument',
+'filter_for_folders' => 'Tilläggsfilter för kataloger',
 'folder' => 'Katalog',
 'folders' => 'Kataloger',
 'folders_and_documents_statistic' => 'Innehållsöversikt',
-'folders_with_notification' => '',
+'folders_with_notification' => 'Kataloger med meddelandefunktion',
 'folder_comment_changed_email' => 'Kommentar har ändrats',
-'folder_comment_changed_email_body' => 'Kommentar har ändrats
-Katalog: [name]
-Gamla kommentaret: [old_comment]
-Kommentar: [new_comment]
-Överordnade katalog: [folder_path]
-Användare: [username]
+'folder_comment_changed_email_body' => 'Kommentar har ändrats
+Katalog: [name]
+Tidigare kommentar: [old_comment]
+Kommentar: [new_comment]
+Överordnad katalog: [folder_path]
+Användare: [username]
 URL: [url]',
 'folder_comment_changed_email_subject' => '[sitename]: [name] - Kommentar har ändrats',
 'folder_contents' => 'Kataloginnehåll',
@@ -537,32 +543,32 @@ URL: [url]',
 'folder_deleted_email_subject' => '[sitename]: [name] - Katalog har tagits bort',
 'folder_infos' => 'Kataloginformation',
 'folder_moved_email' => 'Katalog har flyttats',
-'folder_moved_email_body' => 'Katalog har flyttats
-Katalog: [name]
-Gamla katalognamn: [old_folder_path]
-Ny katalognamn: [new_folder_path]
-Användare: [username]
+'folder_moved_email_body' => 'Katalog har flyttats
+Katalog: [name]
+Tidigare katalog: [old_folder_path]
+Ny katalog: [new_folder_path]
+Användare: [username]
 URL: [url]',
 'folder_moved_email_subject' => '[sitename]: [name] - Katalog har flyttats',
 'folder_renamed_email' => 'Katalog har bytt namn',
-'folder_renamed_email_body' => 'Katalog har bytt namn
-Katalog: [name]
-Överordnade katalog: [folder_path]
-Old name: [old_name]
-User: [username]
+'folder_renamed_email_body' => 'Katalog har bytt namn
+Katalog: [name]
+Överordnad katalog: [folder_path]
+Tidigare namn: [old_name]
+User: [username]
 URL: [url]',
 'folder_renamed_email_subject' => '[sitename]: [name] - Katalog har bytt namn',
 'folder_title' => 'Katalog \'[foldername]\'',
-'friday' => 'fredag',
-'friday_abbr' => 'fr',
+'friday' => 'Fredag',
+'friday_abbr' => 'Fr',
 'from' => 'från',
 'fr_FR' => 'franska',
 'fullsearch' => 'Fulltext-sökning',
 'fullsearch_hint' => 'Använd fulltext-index',
-'fulltextsearch_disabled' => '',
-'fulltext_converters' => 'Omvandling av indexdokument',
+'fulltextsearch_disabled' => 'Indexering för fulltextsökning är inaktiverad',
+'fulltext_converters' => 'Omvandling av dokumentindexering',
 'fulltext_info' => 'Fulltext-indexinfo',
-'global_attributedefinitiongroups' => '',
+'global_attributedefinitiongroups' => 'Attributgrupper',
 'global_attributedefinitions' => 'Attributdefinitioner',
 'global_default_keywords' => 'Globala nyckelord',
 'global_document_categories' => 'Kategorier',
@@ -573,41 +579,41 @@ URL: [url]',
 'groups' => 'Grupper',
 'group_approval_summary' => 'Sammanfattning av gruppgodkännande',
 'group_exists' => 'Grupp finns redan.',
-'group_info' => '',
+'group_info' => 'Gruppinformation',
 'group_management' => 'Grupphantering',
 'group_members' => 'Gruppmedlemmar',
-'group_receipt_summary' => '',
+'group_receipt_summary' => 'Sammanfattning av mottagningsbevis för grupp',
 'group_review_summary' => 'Sammanfattning av gruppgranskning',
 'guest_login' => 'Gästinloggning',
 'guest_login_disabled' => 'Gästinloggningen är inaktiverad.',
-'hash' => '',
+'hash' => 'Hash',
 'help' => 'Hjälp',
-'home_folder' => '',
-'hook_name' => '',
-'hourly' => 'timvis',
+'home_folder' => 'Hemkatalog',
+'hook_name' => 'Hook-namn',
+'hourly' => 'Timvis',
 'hours' => 'timmar',
 'hr_HR' => 'Kroatiska',
 'human_readable' => 'Arkiv som är läsbart av användare',
-'hu_HU' => 'ungerska',
+'hu_HU' => 'Ungerska',
 'id' => 'ID',
-'identical_version' => 'Ny version är lika med den aktuella versionen.',
+'identical_version' => 'Ny version är identisk med nuvarande version.',
 'import' => 'Importera',
-'importfs' => '',
+'importfs' => 'Import från filsystem',
 'import_fs' => 'Import från filsystem',
-'import_fs_warning' => '',
-'include_content' => '',
+'import_fs_warning' => 'Detta fungerar endast för kataloger i mellanlagringsmappen. Filer och mappar får godkänd status direkt efter importen.',
+'include_content' => 'Inkudera innehåll',
 'include_documents' => 'Inkludera dokument',
-'include_subdirectories' => 'Inkludera under-kataloger',
+'include_subdirectories' => 'Inkludera underkataloger',
 'indexing_tasks_in_queue' => 'Indexeringsuppgifter i kö',
-'index_done' => '',
-'index_error' => '',
-'index_folder' => 'Index mapp',
-'index_pending' => '',
-'index_waiting' => '',
+'index_done' => 'Klart',
+'index_error' => 'Fel',
+'index_folder' => 'Indexeringskatalog',
+'index_pending' => 'Förestående',
+'index_waiting' => 'Väntar',
 'individuals' => 'Personer',
-'indivіduals_in_groups' => '',
+'indivіduals_in_groups' => 'Medlemmar i en grupp',
 'inherited' => 'ärvd',
-'inherits_access_copy_msg' => 'Kopiera behörighetsarvslista',
+'inherits_access_copy_msg' => 'Kopiera lista för behörighetsarv',
 'inherits_access_empty_msg' => 'Börja med tom behörighetslista',
 'inherits_access_msg' => 'Behörigheten har ärvts.',
 'internal_error' => 'Internt fel',
@@ -618,9 +624,9 @@ URL: [url]',
 'invalid_create_date_end' => 'Ogiltigt slutdatum för intervall.',
 'invalid_create_date_start' => 'Ogiltigt startdatum för intervall.',
 'invalid_doc_id' => 'Ogiltigt dokument-ID',
-'invalid_dropfolder_folder' => '',
-'invalid_expiration_date_end' => '',
-'invalid_expiration_date_start' => '',
+'invalid_dropfolder_folder' => 'Ogiltig katalog i mellanlagringsmapp',
+'invalid_expiration_date_end' => 'Ogiltigt slutdatum för giltighetstid',
+'invalid_expiration_date_start' => 'Ogiltigt startdatum för giltighetstid',
 'invalid_file_id' => 'Ogiltigt fil-ID',
 'invalid_folder_id' => 'Ogiltigt katalog-ID',
 'invalid_group_id' => 'Ogiltigt grupp-ID',
@@ -633,20 +639,20 @@ URL: [url]',
 'invalid_target_folder' => 'Ogiltigt ID för målkatalogen',
 'invalid_user_id' => 'Ogiltigt användar-ID',
 'invalid_version' => 'Ogiltig dokumentversion',
-'in_folder' => '',
-'in_revision' => '',
+'in_folder' => 'I',
+'in_revision' => 'Under granskning',
 'in_workflow' => 'Utkast: under bearbetning',
 'is_disabled' => 'Inaktivera kontot',
 'is_hidden' => 'Dölj från listan med användare',
-'it_IT' => 'italienska',
-'january' => 'januari',
-'js_form_error' => '',
-'js_form_errors' => '',
-'js_invalid_email' => '',
+'it_IT' => 'Italienska',
+'january' => 'Januari',
+'js_form_error' => 'Formuläret innehåller fortfarande # fel.',
+'js_form_errors' => 'Formuläret innehåller fortfarande # fel.',
+'js_invalid_email' => 'E-postadressen är ogiltig',
 'js_no_approval_group' => 'Välj en grupp som ska godkänna',
-'js_no_approval_status' => 'Välj godkännandestatus',
+'js_no_approval_status' => 'Välj status för godkännande',
 'js_no_comment' => 'Det finns inga kommentarer',
-'js_no_currentpwd' => '',
+'js_no_currentpwd' => 'Ange ditt lösenord',
 'js_no_email' => 'Ange din e-postadress',
 'js_no_file' => 'Välj en fil',
 'js_no_keywords' => 'Skriv några nyckelord',
@@ -660,37 +666,37 @@ URL: [url]',
 'js_pwd_not_conf' => 'Lösenord och bekräftat lösenord stämmer inte överens',
 'js_select_user' => 'Välj en användare',
 'js_select_user_or_group' => 'Välj minst en användare eller en grupp',
-'js_unequal_passwords' => '',
-'july' => 'juli',
-'june' => 'juni',
-'keep' => '',
-'keep_doc_status' => 'Bibehåll dokumentstatus',
+'js_unequal_passwords' => 'Lösenorden är inte identiska',
+'july' => 'Juli',
+'june' => 'Juni',
+'keep' => 'Ändra inte',
+'keep_doc_status' => 'Behåll dokumentstatus',
 'keywords' => 'Nyckelord',
-'keywords_loading' => 'Vänta till nyckelordlistan har laddats',
+'keywords_loading' => 'Vänta tills listan med nyckelord har laddats...',
 'keyword_exists' => 'Nyckelordet finns redan',
 'ko_KR' => 'Koreanska',
 'language' => 'Språk',
-'lastaccess' => '',
+'lastaccess' => 'Senast åtkomst',
 'last_update' => 'Senast uppdaterat',
 'legend' => 'Förteckning',
-'librarydoc' => '',
+'librarydoc' => 'Dokument från bibliotek',
 'linked_documents' => 'Relaterade dokument',
 'linked_files' => 'Bilagor',
-'linked_to_current_version' => '',
-'linked_to_document' => '',
-'linked_to_this_version' => '',
+'linked_to_current_version' => 'Länkad till nuvarande version',
+'linked_to_document' => 'Länkad till dokument',
+'linked_to_this_version' => 'Länkad till denna version',
 '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>.',
-'link_to_version' => '',
+'link_to_version' => 'Kopppla till version',
 'list_access_rights' => 'Lista alla rättigheter...',
-'list_contains_no_access_docs' => '',
-'list_hooks' => '',
+'list_contains_no_access_docs' => 'Listan innehåller fler dokument som inte visas då du saknar rättigheter till dessa.',
+'list_hooks' => 'Lista hooks',
 'local_file' => 'Lokal fil',
 'locked_by' => 'Låst av',
 'lock_document' => 'Lås',
 'lock_message' => 'Detta dokument har låsts av [username]. Bara auktoriserade användare kan låsa upp dokumentet.',
 'lock_status' => 'Status',
 'login' => 'Inloggning',
-'login_disabled_text' => 'Ditt konto är inaktivt, förmodligen för att du har överskridit tillåtna antal inloggningsförsök.',
+'login_disabled_text' => 'Ditt konto är inaktivt, förmodligen för att du har överskridit antalet tillåtna inloggningsförsök.',
 'login_disabled_title' => 'Kontot är inaktivt',
 'login_error_text' => 'Fel vid inloggningen. Användar-ID eller lösenord är felaktigt.',
 'login_error_title' => 'Fel vid inloggningen',
@@ -700,42 +706,42 @@ URL: [url]',
 'log_management' => 'Loggfilshantering',
 'manager' => 'Manager',
 'manager_of_group' => 'Du är förvaltaren av denna grupp',
-'mandatory_approvergroups' => '',
+'mandatory_approvergroups' => 'Obligatoriska grupper för godkännande',
 'mandatory_approvergroup_no_access' => 'Obligatorisk grupp \'[group]\' som ska godkänna har inga rättigheter.',
-'mandatory_approvers' => '',
+'mandatory_approvers' => 'Obligatoriska godkännare',
 'mandatory_approver_no_access' => 'Obligatorisk person som godkänner \'[user]\' har inga rättigheter.',
-'mandatory_reviewergroups' => '',
+'mandatory_reviewergroups' => 'Obligatorisk grupp för granskare',
 'mandatory_reviewergroup_no_access' => 'Obligatorisk grupp \'[group]\' som ska granska har inga rättigheter.',
-'mandatory_reviewers' => '',
+'mandatory_reviewers' => 'Obligatoriska granskare',
 'mandatory_reviewer_no_access' => 'Obligatorisk person som granskar \'[user]\' ar inga rättigheter.',
-'march' => 'mars',
+'march' => 'Mars',
 'max_upload_size' => 'Maximal storlek för uppladdning',
-'may' => 'maj',
+'may' => 'Maj',
 'menu_dropfolder' => '',
 'mimetype' => 'Mimetyp',
 'minutes' => 'minuter',
 'misc' => 'Diverse',
 'missing_checksum' => 'Checksumma saknas',
-'missing_file' => '',
+'missing_file' => 'Fil saknas',
 'missing_filesize' => 'Filstorlek saknas',
-'missing_reception' => '',
-'missing_request_object' => '',
+'missing_reception' => 'Mottagande saknas',
+'missing_request_object' => 'Begärt objekt saknas',
 'missing_transition_user_group' => 'Användare/grupp saknas för övergång',
-'monday' => 'måndag',
-'monday_abbr' => 'må',
-'monthly' => 'månadsvis',
-'month_view' => 'månadsvisning',
+'monday' => 'Måndag',
+'monday_abbr' => 'Må',
+'monthly' => 'Månadsvis',
+'month_view' => 'Månadsvy',
 'move' => 'Flytta',
 'move_clipboard' => 'Flytta urklipp',
-'move_document' => 'Flytta',
+'move_document' => 'Flytta dokument',
 'move_folder' => 'Flytta katalog',
 'my_account' => 'Min Sida',
 'my_documents' => 'Mina dokument',
-'my_transmittals' => '',
+'my_transmittals' => 'Mina överföringar',
 'name' => 'Namn',
-'needs_workflow_action' => 'Detta dokument behöver din uppmärksamhet. Kolla arbetsflödet.',
-'network_drive' => '',
-'never' => '',
+'needs_workflow_action' => 'Detta dokument behöver din uppmärksamhet. Kontrollera inställningarna för arbetsflödet.',
+'network_drive' => 'Nätverkslagring',
+'never' => 'aldrig',
 'new' => 'Ny',
 'new_attrdef' => 'Lägg till attributdefinition',
 'new_default_keywords' => 'Lägg till nyckelord',
@@ -770,7 +776,7 @@ URL: [url]',
 'new_subfolder_email_subject' => '[sitename]: [name] - Ny katalog',
 'new_user_image' => 'Ny användarbild',
 'next_state' => 'Ny status',
-'nl_NL' => 'holländska',
+'nl_NL' => 'Holländska',
 'no' => 'Nej',
 'notify_added_email' => 'Du har lagts till för att få meddelanden',
 'notify_added_email_body' => 'Tillägg för att få meddelanden
@@ -778,76 +784,76 @@ Namn: [name]
 Överordnade katalog: [folder_path]
 Användare: [username]
 URL: [url]',
-'notify_added_email_subject' => '[sitename]: [name] - Tillägg för att få meddelanden',
-'notify_deleted_email' => 'Du har tagits bort från att få meddelanden',
-'notify_deleted_email_body' => 'Borttagen från att få meddelanden
-Namn: [name]
-Överordnad katalog: [folder_path]
-Användare: [username]
+'notify_added_email_subject' => '[sitename]: [name] - Adderad till meddelandelista',
+'notify_deleted_email' => 'Du har tagits bort från meddelandelistan',
+'notify_deleted_email_body' => 'Borttagen från meddelandelistan
+Namn: [name]
+Överordnad katalog: [folder_path]
+Användare: [username]
 URL: [url]',
-'notify_deleted_email_subject' => '[sitename]: [name] - Borttagen från att få meddelanden',
-'november' => 'november',
+'notify_deleted_email_subject' => '[sitename]: [name] - Borttagen från meddelandelistan',
+'november' => 'November',
 'now' => 'nu',
 'no_action' => 'Ingen åtgärd behövs.',
 'no_approval_needed' => 'Inget godkännande behövs.',
 '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_rejected' => '',
-'no_docs_to_approve' => 'Det finns inga dokument som du behöver godkänna.',
+'no_docs_checked_out' => 'Inga utcheckade dokument',
+'no_docs_locked' => 'Inga låsta dokument.',
+'no_docs_rejected' => 'Det finns inga avvisade dokument.',
+'no_docs_to_approve' => 'Det finns inga dokument som behöver godkännas.',
 'no_docs_to_look_at' => 'Det finns inga dokument som behöver godkännas eller granskas.',
-'no_docs_to_receipt' => '',
+'no_docs_to_receipt' => 'Det finns inga dokument som kräver mottagande',
 'no_docs_to_review' => 'Det finns inga dokument som du behöver granska.',
-'no_docs_to_revise' => '',
+'no_docs_to_revise' => 'Det finns inga dokument som behöver revideras.',
 'no_email_or_login' => 'Användarnamn och epost måste anges',
 'no_fulltextindex' => 'Fulltext-index saknas',
 'no_groups' => 'Inga grupper',
 'no_group_members' => 'Denna grupp har inga medlemmar',
-'no_linked_files' => 'Inga länkade dokumenter',
+'no_linked_files' => 'Inga länkade filer',
 'no_previous_versions' => 'Inga andra versioner hittades.',
-'no_receipt_needed' => '',
+'no_receipt_needed' => 'Det finns inga dokument som saknar mottagningsbevis.',
 '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_revision_needed' => 'Ingen förestående revidering.',
+'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_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.',
-'no_version_modification' => 'Inga andra versioner finns',
-'no_workflow_available' => '',
-'objectcheck' => 'Katalog/Dokument-kontroll',
-'object_check_critical' => '',
-'object_check_warning' => '',
+'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_workflow_available' => 'Arbetsflöde saknas',
+'objectcheck' => 'Kontroll av Katalog/Dokument',
+'object_check_critical' => 'Kritiska fel',
+'object_check_warning' => 'Varningar',
 'obsolete' => 'Föråldrat',
-'october' => 'oktober',
+'october' => 'Oktober',
 'old' => 'gammalt',
 'only_jpg_user_images' => 'Bara .jpg-bilder kan användas som användarbild',
-'order_by_sequence_off' => '',
+'order_by_sequence_off' => 'Sortering efter sekvens är inaktiverat i inställningarna.',
 'original_filename' => 'Ursprungligt filnamn',
 'overall_indexing_progress' => 'Total indexeringsprocess',
 'owner' => 'Ägare',
 'ownership_changed_email' => 'Ägare har ändrats',
-'ownership_changed_email_body' => 'Ägare har ändrats
-Dokument: [name]
-Överordnade katalog: [folder_path]
-Gamla ägare: [old_owner]
-Nya ägare: [new_owner]
-Användare: [username]
+'ownership_changed_email_body' => 'Ägare har ändrats
+Dokument: [name]
+Överordnade katalog: [folder_path]
+Tidigare ägare: [old_owner]
+Ny ägare: [new_owner]
+Användare: [username]
 URL: [url]',
 'ownership_changed_email_subject' => '[sitename]: [name] - Ägare har ändrats',
 'password' => 'Lösenord',
 'password_already_used' => 'Lösenordet används redan',
 'password_expiration' => 'Lösenord utgår',
 'password_expiration_text' => 'Ditt lösenord har gått ut. Vänligen välj ett nytt för att fortsätta använda DMS.',
-'password_expired' => '',
-'password_expires_in_days' => '',
+'password_expired' => 'Utgånget lösenord',
+'password_expires_in_days' => 'Lösenordet upphör att gälla om %s dagar.',
 'password_forgotten' => 'Glömt lösenord',
-'password_forgotten_email_body' => 'Bästa användare av dokumenthanteringssystemet,
-vi fick en förfrågan om att ändra ditt lösenord.nnDu kan göra det genom att klicka på följande länk:
-
-[url_prefix]out/out.ChangePassword.php?hash=[hash]
-
+'password_forgotten_email_body' => 'Bästa användare av dokumenthanteringssystemet,
+vi fick en förfrågan om att ändra ditt lösenord. Du kan göra det genom att klicka på följande länk:
+
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
+
 Om du fortfarande har problem med inloggningen, kontakta administratören.',
 'password_forgotten_email_subject' => '[sitename]: Glömt lösenord',
 'password_forgotten_send_hash' => 'En beskrivning av vad du måste göra har nu skickats till din e-postadress.',
@@ -855,35 +861,35 @@ Om du fortfarande har problem med inloggningen, kontakta administratören.',
 'password_forgotten_title' => 'Glömt lösenord',
 'password_repeat' => 'Upprepa lösenord',
 'password_send' => 'Lösenord skickat',
-'password_send_text' => 'Ditt nya lösenord har skickats till den angivna e-postadressen, om användarnamn och e-postadressen matchar för en existerande användare. Om du inte får ett epost inom några minuter, kontrollera att användarnamn och e-postadressen är rätt. Begär ett nytt lösenord igen.',
+'password_send_text' => 'Ditt nya lösenord har skickats till den angivna e-postadressen, förutsatt att användarnamn och e-postadressen matchar en existerande användare. Om du inte får ett epost inom några minuter, kontrollera att användarnamn och e-postadressen är rätt. Begär ett nytt lösenord igen.',
 'password_strength' => 'Lösenordskvalitet',
-'password_strength_insuffient' => 'För låg kvalitet på lösenordet',
+'password_strength_insuffient' => 'För svagt lösenord',
 'password_wrong' => 'Fel lösenord',
-'pdf_converters' => '',
-'pending_approvals' => '',
-'pending_receipt' => '',
-'pending_reviews' => '',
-'pending_revision' => '',
-'pending_workflows' => '',
+'pdf_converters' => 'PDF-konverterare',
+'pending_approvals' => 'Förestående godkännanden',
+'pending_receipt' => 'Förestående mottaganden',
+'pending_reviews' => 'Förestående granskningar',
+'pending_revision' => 'Förestående revisioner',
+'pending_workflows' => 'Förestående arbetsflöden',
 'personal_default_keywords' => 'Personlig nyckelordslista',
-'pl_PL' => 'polska',
-'possible_substitutes' => '',
-'preset_expires' => '',
-'preview' => '',
-'preview_converters' => '',
-'preview_images' => '',
-'preview_markdown' => '',
-'preview_pdf' => '',
-'preview_plain' => '',
+'pl_PL' => 'Polska',
+'possible_substitutes' => 'Alternativ',
+'preset_expires' => 'Förinställd utgångstid',
+'preview' => 'Förhandsgranskning',
+'preview_converters' => 'Konvertering för förhandsgranskning',
+'preview_images' => 'Förhandsgranska bilder',
+'preview_markdown' => 'Förminskning',
+'preview_pdf' => 'Förhandsgranska som PDF',
+'preview_plain' => 'Text',
 'previous_state' => 'Föregående status',
 'previous_versions' => 'Tidigare versioner',
-'process' => '',
-'process_without_user_group' => '',
-'pt_BR' => 'portugisiska (BR)',
+'process' => 'Process',
+'process_without_user_group' => 'Processer utan användare/grupp',
+'pt_BR' => 'Portugisiska (BR)',
 'quota' => 'Kvot',
 'quota_exceeded' => 'Din minneskvot har överskridits med [bytes].',
-'quota_is_disabled' => 'Kvot stöd är för närvarande inaktiverad i inställningarna. Ställa in en användarkvot kommer att ha någon effekt förrän den är aktiverad igen.',
-'quota_warning' => 'Din maximala minneskvot har överskridits med [bytes]. Ta bort dokument eller tidigare versioner.',
+'quota_is_disabled' => 'Kvotstöd är för närvarande inaktiverad i inställningarna. Ett värde för användarkvot kommer inte att ha någon effekt förrän den är aktiverad igen.',
+'quota_warning' => 'Din maximala lagringskvot har överskridits med [bytes]. Ta bort dokument eller tidigare versioner.',
 'receipts_accepted' => '',
 'receipts_not_touched' => '',
 'receipts_rejected' => '',
@@ -902,7 +908,7 @@ Om du fortfarande har problem med inloggningen, kontakta administratören.',
 'reception_noaction' => '',
 'reception_rejected' => '',
 'recipients' => '',
-'redraw' => '',
+'redraw' => 'Återkalla',
 'refresh' => 'Uppdatera',
 'rejected' => 'Avvisat',
 'released' => 'Klart för användning',
@@ -916,24 +922,31 @@ URL: [url]',
 'removed_recipient' => '',
 'removed_reviewer' => 'har tagits bort från listan med personer som ska granska dokumentet.',
 'removed_revisor' => '',
-'removed_workflow_email_body' => 'Arbetsflöde borttagen från dokument version
-Dokument: [name]
-Version: [version]
-Arbetsflöde: [workflow]
-Överordnade katalog: [folder_path]
-Användare: [username]
+'removed_workflow_email_body' => 'Arbetsflöde borttaget från dokument version
+Dokument: [name]
+Version: [version]
+Arbetsflöde: [workflow]
+Överordnad katalog: [folder_path]
+Användare: [username]
 URL: [url]',
-'removed_workflow_email_subject' => '[sitename]: [name] - Arbetsflöde borttagen från dokument version',
+'removed_workflow_email_subject' => '[sitename]: [name] - Arbetsflöde borttaget från dokumentversion',
 'removeFolderFromDropFolder' => '',
 'remove_marked_files' => 'Ta bort markerade filer',
-'repaired' => 'repaired',
-'repairing_objects' => 'Förbereder dokument och kataloger.',
-'request_workflow_action_email_body' => '',
+'repaired' => 'reparerat',
+'repairing_objects' => 'Reparerar dokument och kataloger.',
+'request_workflow_action_email_body' => 'Arbetsflödet har nått en status som kräver åtgärd av dig.
+Dokument: [name]
+Version: [version]
+Arbetsflöde: [workflow]
+Status: [current_state]
+Överordnad katalog: [folder_path]
+Användare: [username]
+URL: [url]',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
 'restrict_access' => '',
 'results_page' => 'Resultatsida',
-'return_from_subworkflow' => 'Tillbaka från under-arbetsflöde',
+'return_from_subworkflow' => 'Tillbaka från underordnat arbetsflöde',
 'return_from_subworkflow_email_body' => 'Tillbaka från underliggande arbetsflöde
 Dokument: [name]
 Version: [version]
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 911440099..2adbc265c 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 (1058), aydin (83)
+//    Translators: Admin (1059), aydin (83)
 
 $text = array(
 '2_factor_auth' => '',
@@ -328,6 +328,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Kontrol etmenizi bekleyen dokümanlar',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dikkatinizi gerektiren size ait dokümanlar',
@@ -850,7 +851,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
 'password_strength' => 'Parola güvenlik düzeyi',
 'password_strength_insuffient' => 'Parola güvenlik düzeyi yetersiz',
 'password_wrong' => 'Yanlış parola',
-'pdf_converters' => '',
+'pdf_converters' => 'PDF Dönüştürücü',
 'pending_approvals' => '',
 'pending_receipt' => '',
 'pending_reviews' => '',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 7134f55f7..883573593 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -334,6 +334,7 @@ URL: [url]',
 'documents_to_receipt' => 'Документи, які чекають підтвердження отримання',
 'documents_to_review' => 'Документи, які чекають вашої рецензії',
 'documents_to_revise' => 'Документи для повторного розгляду',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Документи, які відхилили',
 'documents_user_requiring_attention' => 'Ваші документи, які потребують уваги',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 94ebcece7..2fa8eb5f5 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -330,6 +330,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校对的文档',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '已拒绝的文档',
 'documents_user_requiring_attention' => '需您关注的文档',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index f4680e940..aec88701a 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 (2380)
+//    Translators: Admin (2387)
 
 $text = array(
 '2_factor_auth' => '',
@@ -301,7 +301,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => '文檔',
 'documents_checked_out_by_you' => '',
-'documents_expired' => '',
+'documents_expired' => '過期文件',
 'documents_in_process' => '待處理文檔',
 'documents_locked' => '',
 'documents_locked_by_you' => '被您鎖定的文檔',
@@ -311,6 +311,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校對的文檔',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => '需您關注的文檔',
@@ -356,7 +357,7 @@ URL: [url]',
 'download_link_email_subject' => '',
 'do_object_repair' => '',
 'do_object_setchecksum' => '',
-'do_object_setfilesize' => '',
+'do_object_setfilesize' => '設定檔案大小',
 'do_object_unlink' => '',
 'draft' => '',
 'draft_pending_approval' => '待審核',
@@ -372,7 +373,7 @@ URL: [url]',
 'dump_list' => '存在轉儲文件',
 'dump_remove' => '刪除轉儲檔',
 'duplicates' => '',
-'duplicate_content' => '',
+'duplicate_content' => '重複內容',
 'edit' => '編輯',
 'edit_attributes' => '編輯屬性',
 'edit_comment' => '編輯說明',
@@ -715,7 +716,7 @@ URL: [url]',
 'old' => 'Old',
 'only_jpg_user_images' => '只用jpg格式的圖片才可以作為使用者身份圖片',
 'order_by_sequence_off' => '',
-'original_filename' => '',
+'original_filename' => '原始檔名',
 'overall_indexing_progress' => '',
 'owner' => '所有者',
 'ownership_changed_email' => '所有者已變更',
@@ -758,7 +759,7 @@ URL: [url]',
 'previous_state' => '',
 'previous_versions' => '先前版本',
 'process' => '',
-'process_without_user_group' => '',
+'process_without_user_group' => '程序缺少使用者/群組',
 'pt_BR' => '葡萄牙語',
 'quota' => '配額',
 'quota_exceeded' => '',
@@ -1450,12 +1451,12 @@ URL: [url]',
 'uploading_zerosize' => '上傳失敗！請檢查是否沒有選擇上傳的檔。',
 'used_discspace' => '使用磁碟空間',
 'user' => '用戶',
-'userid_groupid' => '',
+'userid_groupid' => '使用者 id/群組 id',
 'users' => '用戶',
 'users_and_groups' => '',
 'users_done_work' => '',
 'user_exists' => '用戶已存在',
-'user_group' => '',
+'user_group' => '使用者/群組',
 'user_group_management' => '用戶/組的管理',
 'user_image' => '使用者圖片',
 'user_info' => '使用者資訊',

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 152/308] 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 153/308] 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 44f1026e92a7d585789009328bdb6147b957531c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Dec 2017 12:20:55 +0100
Subject: [PATCH 154/308] add new phrase select_grp_ind_revisors, swedish
 translation 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 |  3 +-
 languages/el_GR/lang.inc |  1 +
 languages/en_GB/lang.inc |  3 +-
 languages/es_ES/lang.inc |  1 +
 languages/fr_FR/lang.inc |  1 +
 languages/hr_HR/lang.inc |  1 +
 languages/hu_HU/lang.inc |  1 +
 languages/it_IT/lang.inc |  1 +
 languages/ko_KR/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 |  1 +
 languages/sk_SK/lang.inc |  1 +
 languages/sv_SE/lang.inc | 64 +++++++++++++++++++++++++---------------
 languages/tr_TR/lang.inc |  1 +
 languages/uk_UA/lang.inc |  1 +
 languages/zh_CN/lang.inc |  1 +
 languages/zh_TW/lang.inc |  1 +
 24 files changed, 65 insertions(+), 26 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 70db532fa..51147fcb9 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -1047,6 +1047,7 @@ URL: [url]',
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '',
+'select_grp_ind_revisors' => '',
 'select_grp_notification' => 'ﺎﻨﻗﺭ ﻼﺨﺘﻳﺍﺭ ﺍﻼﺸﻋﺍﺭ ﻞﻤﺠﻣﻮﻋﺓ',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'اضغط لاختيار مجموعة المراجعون',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 8c311ad38..e31367d48 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -912,6 +912,7 @@ $text = array(
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '',
+'select_grp_ind_revisors' => '',
 'select_grp_notification' => 'Избор на групова нотификация',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Кликни да избереш група рецензенти',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 7101cae06..0464bd0c9 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -917,6 +917,7 @@ URL: [url]',
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '',
+'select_grp_ind_revisors' => '',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index e8dec9d84..1554384a8 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -1056,6 +1056,7 @@ URL: [url]',
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '',
+'select_grp_ind_revisors' => '',
 'select_grp_notification' => 'Klikněte pro výběr skupinového oznámení',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Kliknutím vyberte skupinu posuzovatele',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 1d2cdc7dd..2de2fc537 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 (2505), dgrutsch (22)
+//    Translators: Admin (2506), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -1117,6 +1117,7 @@ URL: [url]',
 'select_grp_ind_notification' => 'Klicken zur Auswahl einer Gruppe',
 'select_grp_ind_recipients' => 'Klicken zur Auswahl einer Gruppe',
 'select_grp_ind_reviewers' => 'Klicken zur Auswahl einer Gruppe',
+'select_grp_ind_revisors' => 'Klicken zur Auswahl einer Gruppe',
 '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',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index febcb780e..e4af1b8ba 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -923,6 +923,7 @@ URL: [url]',
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '',
+'select_grp_ind_revisors' => '',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 804368f99..05d76b3af 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 (1632), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1633), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -1112,6 +1112,7 @@ URL: [url]',
 'select_grp_ind_notification' => 'Click to select group',
 'select_grp_ind_recipients' => 'Click to select group',
 'select_grp_ind_reviewers' => 'Click to select group',
+'select_grp_ind_revisors' => 'Click to select group',
 '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',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 124c22094..7c6fbd882 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -1062,6 +1062,7 @@ URL: [url]',
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '',
+'select_grp_ind_revisors' => '',
 'select_grp_notification' => 'Clic para seleccionar la notificación grupal',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Haga Click para seleccionar grupo de revisores',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index b6bad742a..995d31ea9 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -1079,6 +1079,7 @@ URL : [url]',
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => 'Cliquer pour choisir un groupe d’examinateurs',
+'select_grp_ind_revisors' => '',
 'select_grp_notification' => 'Cliquer pour sélectionner une notification de groupe',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Cliquer pour choisir un groupe d’examinateurs',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index e4513dbdd..d63979c46 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -1083,6 +1083,7 @@ Internet poveznica: [url]',
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '',
+'select_grp_ind_revisors' => '',
 'select_grp_notification' => 'Kliknite za odabir grupnog obavještavanja',
 'select_grp_recipients' => 'Kliknite za odabir grupe primatelja',
 'select_grp_reviewers' => 'Kliknite za odabir recezenta grupe',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index e4b71e777..59e2fe732 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -1061,6 +1061,7 @@ URL: [url]',
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '',
+'select_grp_ind_revisors' => '',
 'select_grp_notification' => 'Kattintson a csoport értesítés kiválasztásához',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Kattintson a csoport felülvizsgáló kijelöléséhez',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index acb391b66..9f218ba32 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -1095,6 +1095,7 @@ URL: [url]',
 'select_grp_ind_notification' => 'Fare clic per scegliere il gruppo',
 'select_grp_ind_recipients' => 'Fare clic per scegliere il gruppo',
 'select_grp_ind_reviewers' => 'Fare clic per scegliere il gruppo',
+'select_grp_ind_revisors' => '',
 'select_grp_notification' => 'Seleziona Gruppo',
 'select_grp_recipients' => 'Seleziona gruppo cartelle',
 'select_grp_reviewers' => 'Seleziona gruppo revisore',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index cd5943dfd..2cc63819c 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -1077,6 +1077,7 @@ URL : [url]',
 'select_grp_ind_notification' => '알림 그룹 선택',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '그룹 검토자 선택',
+'select_grp_ind_revisors' => '',
 'select_grp_notification' => '그룹 통지를 선택합니다',
 'select_grp_recipients' => '받는 사람 그룹을 클릭하시오',
 'select_grp_reviewers' => '클릭하여 그룹 검토자를 고릅니다.',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index b620407a3..c6f3c40da 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -1085,6 +1085,7 @@ URL: [url]',
 'select_grp_ind_notification' => 'Klik om groep beoordelaar te selecteren',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => 'Klik om groep beoordelaar te selecteren',
+'select_grp_ind_revisors' => '',
 'select_grp_notification' => 'Klik voor groepsnotificatiebeoordelaars',
 'select_grp_recipients' => 'Klik om groep beoordelaar te selecteren',
 'select_grp_reviewers' => 'Klik om groep beoordelaars te selecteren',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index c3a46892c..8ad6dbacb 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -1041,6 +1041,7 @@ URL: [url]',
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '',
+'select_grp_ind_revisors' => '',
 'select_grp_notification' => 'Kliknij, aby wybrać grupowe powiadomienia',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Kliknij by wybrać grupę recenzentów',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 67a5aebfd..5b8b107a3 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -1059,6 +1059,7 @@ URL: [url]',
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '',
+'select_grp_ind_revisors' => '',
 'select_grp_notification' => 'Click para selecionar um grupo a ser notificado',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Clique para selecionar o grupo revisor',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 846a4f78a..27152ba47 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -1084,6 +1084,7 @@ URL: [url]',
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '',
+'select_grp_ind_revisors' => '',
 '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',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 3e5a374f1..fdc0f3bc1 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -1091,6 +1091,7 @@ URL: [url]',
 'select_grp_ind_notification' => 'Выберите группу',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => 'Выберите группу',
+'select_grp_ind_revisors' => '',
 'select_grp_notification' => 'Выберите группу для уведомления',
 'select_grp_recipients' => 'Выберите группу получателей',
 'select_grp_reviewers' => 'Выберите рецензирующую группу',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 4963a0002..f53906a66 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -916,6 +916,7 @@ URL: [url]',
 'select_grp_ind_notification' => 'Kliknutím vyberte skupinu',
 'select_grp_ind_recipients' => 'Kliknutím vyberte skupinu',
 'select_grp_ind_reviewers' => 'Kliknutím vyberte skupinu',
+'select_grp_ind_revisors' => '',
 'select_grp_notification' => 'Kliknutím vyberte upozornenie skupiny',
 'select_grp_recipients' => 'Kliknutím vyberte skupinu príjemcov',
 'select_grp_reviewers' => 'Kliknutím vyberte recenzenta skupiny',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index bc1f3e537..519f0c0d4 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 (1154), MagnusI (335), tmichelfelder (106)
+//    Translators: Admin (1154), MagnusI (358), tmichelfelder (106)
 
 $text = array(
 '2_factor_auth' => '2-faktors autentisering',
@@ -900,7 +900,7 @@ Om du fortfarande har problem med inloggningen, kontakta administratören.',
 'receipt_log' => '',
 'receipt_request_email_body' => '',
 'receipt_request_email_subject' => '',
-'receipt_status' => '',
+'receipt_status' => 'Status',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
 'reception' => '',
@@ -919,7 +919,7 @@ Dokument: [document]
 Användare: [username]
 URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Borttagen bilaga',
-'removed_recipient' => '',
+'removed_recipient' => 'har tagits bort från meddelandelistan.',
 'removed_reviewer' => 'har tagits bort från listan med personer som ska granska dokumentet.',
 'removed_revisor' => '',
 'removed_workflow_email_body' => 'Arbetsflöde borttaget från dokument version
@@ -930,7 +930,7 @@ Arbetsflöde: [workflow]
 Användare: [username]
 URL: [url]',
 'removed_workflow_email_subject' => '[sitename]: [name] - Arbetsflöde borttaget från dokumentversion',
-'removeFolderFromDropFolder' => '',
+'removeFolderFromDropFolder' => 'Radera katalog efter import',
 'remove_marked_files' => 'Ta bort markerade filer',
 'repaired' => 'reparerat',
 'repairing_objects' => 'Reparerar dokument och kataloger.',
@@ -942,9 +942,9 @@ Status: [current_state]
 Överordnad katalog: [folder_path]
 Användare: [username]
 URL: [url]',
-'request_workflow_action_email_subject' => '',
-'reset_checkout' => '',
-'restrict_access' => '',
+'request_workflow_action_email_subject' => '[sitename]: [name] - Åtgärd krävs i arbetsflödet',
+'reset_checkout' => 'Slutför utcheckning',
+'restrict_access' => 'Ingen åtkomst till',
 'results_page' => 'Resultatsida',
 'return_from_subworkflow' => 'Tillbaka från underordnat arbetsflöde',
 'return_from_subworkflow_email_body' => 'Tillbaka från underliggande arbetsflöde
@@ -958,22 +958,32 @@ URL: [url]',
 'return_from_subworkflow_email_subject' => '[sitename]: [name] - Tillbaka from underliggande arbetsflöde',
 'reverse_links' => 'Dokument som är länkat till aktuell dokument.',
 'reviewers' => 'Granska',
-'reviewer_already_assigned' => 'ska redan granska dokumentet',
+'reviewer_already_assigned' => 'Användaren har redan tilldelats rollen som granskare',
 'reviewer_already_removed' => 'har redan tagits bort från granskningen eller har redan skickat en granskning',
 'reviews_accepted' => '',
 'reviews_not_touched' => '',
 'reviews_rejected' => '',
 'reviews_without_group' => '',
-'reviews_without_user' => '',
+'reviews_without_user' => 'Granskningar som saknar användare',
 'review_deletion_email' => 'Förfrågan om granskning borttagen',
-'review_deletion_email_body' => '',
-'review_deletion_email_subject' => '',
-'review_file' => '',
+'review_deletion_email_body' => 'Begäran om granskning har tagits bort
+Dokument: [name]
+Version: [version]
+Överordnad katalog: [folder_path]
+Användare: [username]
+URL: [url]',
+'review_deletion_email_subject' => '[sitename]: [name] - Begäran om granskning har tagits bort',
+'review_file' => 'Fil',
 'review_group' => 'Grupp som granskar',
-'review_log' => '',
+'review_log' => 'Granska logg',
 'review_request_email' => 'Förfrågan om granskning',
-'review_request_email_body' => '',
-'review_request_email_subject' => '',
+'review_request_email_body' => 'Begäran om granskning
+Dokument: [name]
+Version: [version]
+Överordnad katalog: [folder_path]
+Användare: [username]
+URL: [url]',
+'review_request_email_subject' => '[sitename]: [name] - Begäran om granskning',
 'review_status' => 'Status för granskningen',
 'review_submit_email' => 'Skickat granskning',
 'review_submit_email_body' => 'Skickat granskning
@@ -987,19 +997,24 @@ 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' => '',
+'revise_document' => 'Revidera dokument',
+'revise_document_on' => 'Nästa revidering av dokumentversion [date]',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
 'revisions_pending' => '',
 'revisions_rejected' => '',
-'revisions_without_group' => '',
-'revisions_without_user' => '',
-'revision_date' => '',
-'revision_log' => '',
-'revision_request_email_body' => '',
-'revision_request_email_subject' => '',
-'revision_status' => '',
+'revisions_without_group' => 'Revisioner som saknar grupp',
+'revisions_without_user' => 'Revisioner som saknar användare',
+'revision_date' => 'Datum för revision',
+'revision_log' => 'Revisionslogg',
+'revision_request_email_body' => 'Begäran om revision
+Dokument: [name]
+Version: [version]
+Överordnad katalog: [folder_path]
+Användare: [username]
+URL: [url]',
+'revision_request_email_subject' => '[sitename]: [name] - Begäran om revision',
+'revision_status' => 'Status',
 'revision_submit_email_body' => '',
 'revision_submit_email_subject' => '',
 'revisors' => '',
@@ -1084,6 +1099,7 @@ URL: [url]',
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '',
+'select_grp_ind_revisors' => '',
 'select_grp_notification' => 'Klicka för att välja gruppnotifiering',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Välj en grupp som ska granska',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 2adbc265c..af76dd730 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -1063,6 +1063,7 @@ URL: [url]',
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '',
+'select_grp_ind_revisors' => '',
 'select_grp_notification' => 'Gruplar için hatırlatma seçmek için tıklayın',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Grup kontrol edeni seçmek için tıklayın',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 883573593..51216e7e7 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -1084,6 +1084,7 @@ URL: [url]',
 'select_grp_ind_notification' => 'Оберіть групу',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => 'Оберіть групу',
+'select_grp_ind_revisors' => '',
 'select_grp_notification' => 'Оберіть групу сповіщення',
 'select_grp_recipients' => 'Оберіть групу отримувачів',
 'select_grp_reviewers' => 'Оберіть групу рецензентів',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 2fa8eb5f5..37ea45582 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -1062,6 +1062,7 @@ URL: [url]',
 'select_grp_ind_notification' => '点击选择组',
 'select_grp_ind_recipients' => '点击选择组',
 'select_grp_ind_reviewers' => '点击选择组',
+'select_grp_ind_revisors' => '',
 'select_grp_notification' => '点击选择被通知组',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => '点击选择审核群组',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index aec88701a..40f9cc810 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -916,6 +916,7 @@ URL: [url]',
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '',
+'select_grp_ind_revisors' => '',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => '請點選校對人員群組',

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 155/308] 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 156/308] 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 157/308] 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 158/308] 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 159/308] 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 160/308] 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 5a66db978c2ffd881b29c63ddaed5f059cfc4138 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Dec 2017 22:01:25 +0100
Subject: [PATCH 161/308] more swedish translations

---
 languages/sv_SE/lang.inc | 561 ++++++++++++++++++++-------------------
 1 file changed, 283 insertions(+), 278 deletions(-)

diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 519f0c0d4..1168981d2 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 (1154), MagnusI (358), tmichelfelder (106)
+//    Translators: Admin (1154), MagnusI (649), tmichelfelder (106)
 
 $text = array(
 '2_factor_auth' => '2-faktors autentisering',
@@ -335,7 +335,7 @@ URL: [url]',
 'documents_to_receipt' => 'Dokument som väntar på bekräftad mottagning',
 'documents_to_review' => 'Dokument som du behöver granska',
 'documents_to_revise' => 'Dokument som väntar på din granskning',
-'documents_user_expiration' => '',
+'documents_user_expiration' => 'Utgångna dokument',
 'documents_user_reception' => 'Dokument som väntar på mottagande',
 'documents_user_rejected' => 'Avvisade dokument',
 'documents_user_requiring_attention' => 'Dokument som du behöver granska/godkänna',
@@ -717,7 +717,7 @@ URL: [url]',
 'march' => 'Mars',
 'max_upload_size' => 'Maximal storlek för uppladdning',
 'may' => 'Maj',
-'menu_dropfolder' => '',
+'menu_dropfolder' => 'Mapp för snabbuppladdning',
 'mimetype' => 'Mimetyp',
 'minutes' => 'minuter',
 'misc' => 'Diverse',
@@ -905,9 +905,9 @@ Om du fortfarande har problem med inloggningen, kontakta administratören.',
 'receipt_update_failed' => '',
 'reception' => '',
 'reception_acknowleged' => '',
-'reception_noaction' => '',
+'reception_noaction' => 'Ingen åtgärd',
 'reception_rejected' => '',
-'recipients' => '',
+'recipients' => 'Mottagare',
 'redraw' => 'Återkalla',
 'refresh' => 'Uppdatera',
 'rejected' => 'Avvisat',
@@ -921,7 +921,7 @@ URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Borttagen bilaga',
 'removed_recipient' => 'har tagits bort från meddelandelistan.',
 'removed_reviewer' => 'har tagits bort från listan med personer som ska granska dokumentet.',
-'removed_revisor' => '',
+'removed_revisor' => 'har tagits bort från listan över reviderare.',
 'removed_workflow_email_body' => 'Arbetsflöde borttaget från dokument version
 Dokument: [name]
 Version: [version]
@@ -1017,9 +1017,9 @@ URL: [url]',
 'revision_status' => 'Status',
 'revision_submit_email_body' => '',
 'revision_submit_email_subject' => '',
-'revisors' => '',
-'revisor_already_assigned' => '',
-'revisor_already_removed' => '',
+'revisors' => 'Reviderare',
+'revisor_already_assigned' => 'Användaren innehar redan rollen som reviderare',
+'revisor_already_removed' => 'Dokumentet är redan reviderat alternativt användaren tillhör inte längre gruppen reviderare.',
 'rewind_workflow' => 'Återställ arbetsflödet',
 'rewind_workflow_email_body' => 'Återställ arbetsflödet
 Dokument: [name]
@@ -1031,20 +1031,20 @@ URL: [url]',
 'rewind_workflow_email_subject' => '[sitename]: [name] - Återställ arbetsflödet',
 'rewind_workflow_warning' => 'Om du återställer ett arbetsflöde till sin ursprungliga status, kommer hela loggboken för dokumentets arbetsflöde att raderas och kan då inte återställas.',
 'rm_attrdef' => 'Ta bort attributdefinition',
-'rm_attrdefgroup' => '',
+'rm_attrdefgroup' => 'Ta bort denna attributgrupp',
 'rm_default_keyword_category' => 'Ta bort kategori',
 'rm_document' => 'Ta bort',
 'rm_document_category' => 'Ta bort kategori',
-'rm_event' => '',
+'rm_event' => 'Ta bort händelse',
 'rm_file' => 'Ta bort fil',
 'rm_folder' => 'Ta bort katalog',
 'rm_from_clipboard' => 'Ta bort från Urklipp',
 'rm_group' => 'Ta bort denna grupp',
-'rm_role' => '',
+'rm_role' => 'Ta bort denna roll',
 'rm_transmittal' => '',
 'rm_transmittalitem' => '',
 'rm_user' => 'Ta bort denna användare',
-'rm_user_from_processes' => '',
+'rm_user_from_processes' => 'Ta bort användare från process',
 'rm_version' => 'Ta bort version',
 'rm_workflow' => 'Ta bort arbetsflöde',
 'rm_workflow_action' => 'Ta bort åtgärd från arbetsflödet',
@@ -1053,10 +1053,10 @@ URL: [url]',
 'role' => 'Roll',
 'role_admin' => 'Administratör',
 'role_guest' => 'Gäst',
-'role_info' => '',
-'role_management' => '',
-'role_name' => '',
-'role_type' => '',
+'role_info' => 'Information',
+'role_management' => 'Hantera roller',
+'role_name' => 'Namn',
+'role_type' => 'Rolltyp',
 'role_user' => 'Användare',
 'ro_RO' => 'Rumänska',
 'run_subworkflow' => 'Utför under-arbetsflöde',
@@ -1069,85 +1069,90 @@ Underliggande arbetsflöde: [subworkflow]
 Användare: [username]
 URL: [url]',
 'run_subworkflow_email_subject' => '[sitename]: [name] - Under-arbetsflöde utförs',
-'ru_RU' => 'ryska',
-'saturday' => 'lördag',
-'saturday_abbr' => 'lö',
+'ru_RU' => 'Ryska',
+'saturday' => 'Lördag',
+'saturday_abbr' => 'Lö',
 'save' => 'Spara',
 'search' => 'Sök',
 'search_fulltext' => 'Fulltext-sökning',
 'search_in' => 'Sök i',
 'search_mode_and' => 'alla ord',
-'search_mode_documents' => '',
-'search_mode_folders' => '',
+'search_mode_documents' => 'Endast dokument',
+'search_mode_folders' => 'Endast kataloger',
 '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_resultmode' => 'Sökresultat',
+'search_resultmode_both' => 'Dokument och kataloger',
 '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',
 'seconds' => 'sekunder',
 'selection' => 'Urval',
-'select_attrdefgrp_show' => '',
+'select_attrdefgrp_show' => 'Välj visingsalternativ',
 'select_category' => 'Klicka för att välja en kategori',
 'select_groups' => 'Välj grupper',
 'select_grp_approvers' => 'Välj en grupp som ska godkänna',
-'select_grp_ind_approvers' => '',
-'select_grp_ind_notification' => '',
-'select_grp_ind_recipients' => '',
-'select_grp_ind_reviewers' => '',
-'select_grp_ind_revisors' => '',
+'select_grp_ind_approvers' => 'Klicka för att välja grupp',
+'select_grp_ind_notification' => 'Klicka för att välja grupp',
+'select_grp_ind_recipients' => 'Klicka för att välja grupp',
+'select_grp_ind_reviewers' => 'Klicka för att välja grupp',
+'select_grp_ind_revisors' => 'Klicka för att välja grupp',
 'select_grp_notification' => 'Klicka för att välja gruppnotifiering',
-'select_grp_recipients' => '',
+'select_grp_recipients' => 'Klicka för att välja grupp för mottagande',
 'select_grp_reviewers' => 'Välj en grupp som ska granska',
-'select_grp_revisors' => '',
+'select_grp_revisors' => 'Klicka för att välja grupp av reviderare',
 'select_ind_approvers' => 'Välj en person som ska godkänna',
 'select_ind_notification' => 'Klicka för att välja individuell notifiering',
-'select_ind_recipients' => '',
+'select_ind_recipients' => 'Klicka för att välja individuell mottagare',
 'select_ind_reviewers' => 'Välj en person som ska granska',
-'select_ind_revisors' => '',
+'select_ind_revisors' => 'Klicka för att välja individuell reviderare',
 'select_one' => 'Välj',
 'select_users' => 'Välj användare',
 'select_workflow' => 'Välj arbetsflöde',
-'send_email' => '',
-'send_login_data' => '',
-'send_login_data_body' => '',
-'send_login_data_subject' => '',
-'send_test_mail' => '',
-'september' => 'september',
+'send_email' => 'Skicka e-post',
+'send_login_data' => 'Skicka inloggningsuppgifter',
+'send_login_data_body' => 'Inloggningsuppgifter
+
+Login: [login]
+Namn: [username]
+
+Kommentar: [comment]',
+'send_login_data_subject' => '[sitename]: [login] - Dina inloggningsuppgifter',
+'send_test_mail' => 'Skicka testmail',
+'september' => 'September',
 'sequence' => 'Position',
-'seq_after' => 'efter "[prevname]"',
-'seq_end' => 'på slutet',
-'seq_keep' => 'behåll positionen',
-'seq_start' => 'första positionen',
-'sessions' => '',
+'seq_after' => 'Efter "[prevname]"',
+'seq_end' => 'På slutet',
+'seq_keep' => 'Behåll positionen',
+'seq_start' => 'Första positionen',
+'sessions' => 'Användare online',
 'settings' => 'Inställningar',
 'settings_activate_module' => 'Aktivera modul',
 '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_Advanced' => 'Avancerat',
-'settings_advancedAcl' => '',
-'settings_advancedAcl_desc' => '',
+'settings_advancedAcl' => 'Avancerad åtkomstkontroll',
+'settings_advancedAcl_desc' => 'Avancerad åtkomskontroll används för att aktivera/avaktivera särskilda moduler i mjukvaran. Du kan inte använda denna funktion för att ange åtkomst till dokument eller kataloger.',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
-'settings_Authentication' => 'Autentiseringsinställningar',
-'settings_autoLoginUser' => '',
-'settings_autoLoginUser_desc' => '',
+'settings_Authentication' => 'Inställningar för autentisering',
+'settings_autoLoginUser' => 'Automatisk inloggning',
+'settings_autoLoginUser_desc' => 'Använd detta användar-ID för åtkomst om inte användaren redan är inloggad. Denna typ av inloggning kommer inte att skapa en session.',
 'settings_available_languages' => 'Tillgängliga språk',
 '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' => '',
-'settings_backupDir_desc' => '',
+'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_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',
 '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_checkOutDir' => 'Sökväg till utcheckade dokument',
+'settings_checkOutDir_desc' => 'Sökväg till den senaste versionen av ett utcheckat dokument. Om du ger användare åtkomst till denna katalog kan de ändra och checka in utcheckade filer.',
 'settings_cmdTimeout' => 'Tidsgräns för externa kommandon',
 'settings_cmdTimeout_desc' => 'Denna tid i sekunder bestämmer när ett externt kommando (t.ex. för att skapa den fullständiga texten till index) kommer att avslutas.',
 'settings_contentDir' => 'Mapp för innehållet',
@@ -1158,10 +1163,10 @@ URL: [url]',
 'settings_convertToPdf_desc' => 'Om dokumentet inte kan visas direkt i webbläsaren, visas istället en PDF-konverterad version.',
 'settings_cookieLifetime' => 'Livslängd för cookies',
 '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_coreDir' => 'Katalog för SeedDMS Core',
+'settings_coreDir_desc' => 'Sökväg till SeedDMS_Core (valfritt). Lämna denna tom om SeedDMS_Core är installerat med en sökväg som kan hittas av PHP (extra PHP Include-Path)',
+'settings_createCheckOutDir' => 'Skapa katalog för utcheckning',
+'settings_createCheckOutDir_desc' => 'Skapa katalog för utcheckning om sådant saknas',
 'settings_createdatabase' => 'Skapa databastabeller',
 'settings_createdirectory' => 'Skapa katalog',
 'settings_currentvalue' => 'Aktuellt värde',
@@ -1177,15 +1182,15 @@ URL: [url]',
 'settings_dbUser' => 'Användarnamn',
 'settings_dbUser_desc' => 'Användarnamnet för tillgång till databasen. Användarnamnet angavs under installationsprocessen.',
 'settings_dbVersion' => 'Databasschemat för gammalt',
-'settings_defaultAccessDocs' => '',
-'settings_defaultAccessDocs_desc' => '',
+'settings_defaultAccessDocs' => 'Standardåtkomst för nya dokument',
+'settings_defaultAccessDocs_desc' => 'När ett nytt dokument skapas, används denna behörighet som standard.',
 'settings_defaultSearchMethod' => 'Standard sökmetod',
 'settings_defaultSearchMethod_desc' => 'Standard sökmetod, när en sökning startas i sökformuläret i huvudmenyn.',
 'settings_defaultSearchMethod_valdatabase' => 'databas',
 'settings_defaultSearchMethod_valfulltext' => 'fulltext',
 'settings_delete_install_folder' => 'För att kunna använda LetoDMS måste du ta bort filen ENABLE_INSTALL_TOOL som finns i konfigurationsmappen.',
 'settings_disableSelfEdit' => 'Inaktivera själveditering',
-'settings_disableSelfEdit_desc' => 'Om utvald, kan användare inte ändra sin egen profil.',
+'settings_disableSelfEdit_desc' => 'Om ikryssad kan användare inte ändra sin egen profil.',
 'settings_disable_install' => 'Ta bort filen ENABLE_INSTALL_TOOL, om det är möjligt.',
 'settings_Display' => 'Sidinställningar',
 'settings_dropFolderDir' => 'Mapp för mellanlagring av filer',
@@ -1193,12 +1198,12 @@ URL: [url]',
 'settings_Edition' => 'Redigeringsinställningar',
 'settings_editOnlineFileTypes' => 'Redigera online-filtyper',
 'settings_editOnlineFileTypes_desc' => 'Filer med en av följande filtyper kan redigeras online OBS! ANVÄND BARA SMÅ BOKSTÄVER)',
-'settings_enable2FactorAuthentication' => '',
-'settings_enable2FactorAuthentication_desc' => '',
-'settings_enableAcknowledgeWorkflow' => '',
-'settings_enableAcknowledgeWorkflow_desc' => '',
-'settings_enableAdminReceipt' => '',
-'settings_enableAdminReceipt_desc' => '',
+'settings_enable2FactorAuthentication' => 'Aktivera 2-faktorsautentisering',
+'settings_enable2FactorAuthentication_desc' => 'Aktvierar/avaktiverar 2-faktorsautentisering. Användaren behöver Google Authenticater installerad på sin mobiltelefon.',
+'settings_enableAcknowledgeWorkflow' => 'Aktivera notifiering vid mottagande av dokument',
+'settings_enableAcknowledgeWorkflow_desc' => 'Aktivera notifiering av meddelanden i arbetsflödet.',
+'settings_enableAdminReceipt' => 'Tillåt Administratörer som mottagare av meddelanden.',
+'settings_enableAdminReceipt_desc' => 'Aktivera denna om du vill att Administratörer ska vara valbara för mottagande av meddelanden i arbetsflöden.',
 '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',
@@ -1207,11 +1212,11 @@ URL: [url]',
 'settings_enableClipboard_desc' => 'Aktivera/Inaktivera urklipp funktionen.',
 'settings_enableConverting' => 'Aktivera filkonvertering',
 'settings_enableConverting_desc' => 'Aktivera/Inaktivera konvertering av filer',
-'settings_enableDropFolderList' => '',
-'settings_enableDropFolderList_desc' => '',
+'settings_enableDropFolderList' => 'Aktivera fillista för snabbuppladdade filer.',
+'settings_enableDropFolderList_desc' => 'Aktiverar fillista för snabbuppladdade filer i menyfältet.',
 'settings_enableDropUpload' => 'Aktivera snabb uppladdning',
 'settings_enableDropUpload_desc' => 'Aktivera / avaktivera droppområdet på "Visa mapp" sidan för att ladda upp filer genom att dra och släppa.',
-'settings_enableDuplicateDocNames' => 'Tillåter samma dokumentnamn',
+'settings_enableDuplicateDocNames' => 'Tillåter dubletter av dokumentnamn',
 'settings_enableDuplicateDocNames_desc' => 'Tillåter att det finns dokument med samma namn i en mapp.',
 'settings_enableEmail' => 'Använd e-postmeddelanden',
 'settings_enableEmail_desc' => 'Aktivera/Inaktivera automatiska e-postmeddelanden',
@@ -1219,42 +1224,42 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Av för att inte visa katalogernas trädstruktur',
 'settings_enableFullSearch' => 'Aktivera fulltext-sökning',
 'settings_enableFullSearch_desc' => 'Aktivera fulltext-sökning',
-'settings_enableGuestAutoLogin' => '',
-'settings_enableGuestAutoLogin_desc' => '',
+'settings_enableGuestAutoLogin' => 'Aktivera automatisk gästinloggning',
+'settings_enableGuestAutoLogin_desc' => 'Om användaren är en gäst och automatisk gästinlogging är aktiverad loggas användaren på automatiskt.',
 'settings_enableGuestLogin' => 'Tillåt gäst-inloggning',
 'settings_enableGuestLogin_desc' => 'Om du vill att alla ska kunna logga in som gäst, aktivera denna option. OBS! Gästinloggning bör endast användas i en säker omgivning',
 'settings_enableHelp' => 'Aktivera hjälp',
-'settings_enableHelp_desc' => '',
+'settings_enableHelp_desc' => 'Aktiverar hjälpfunktion i menyn',
 'settings_enableLanguageSelector' => 'Aktivera språkval',
 '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_enableMultiUpload' => 'TIllåt uppladdning av multipla filer',
-'settings_enableMultiUpload_desc' => '',
+'settings_enableMenuTasks' => 'Aktivera uppgiftslista i menyn',
+'settings_enableMenuTasks_desc' => 'Aktiverar ett menyobjekt som visar användarens uppgifter, såsom dokument som behöver granskas eller godkännas.',
+'settings_enableMultiUpload' => 'Tillåt uppladdning av multipla filer',
+'settings_enableMultiUpload_desc' => 'Ger möjlighet att ladda upp flera filer parallellt. Varje uppladdad fil skapar ett nytt dokument.',
 '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' => '',
-'settings_enableNotificationWorkflow_desc' => '',
+'settings_enableNotificationWorkflow' => 'Skicka meddelande till användare som ingår i övergången till nästa steg i arbetsflödet',
+'settings_enableNotificationWorkflow_desc' => 'Meddelar alla användare och grupper som ingår i arbetsflödets övergång till nästa steg.',
 'settings_enableOwnerNotification' => 'Aktivera meddelande till dokumentägaren',
 'settings_enableOwnerNotification_desc' => 'Kryssa i, för att skapa ett meddelande till ägaren av dokumentet, när en ny version av dokumentet har laddats upp.',
-'settings_enableOwnerReceipt' => '',
-'settings_enableOwnerReceipt_desc' => '',
-'settings_enableOwnerRevApp' => 'Tillåt granskning/godkänning av dokumentägare',
+'settings_enableOwnerReceipt' => 'Meddelar ägaren vid förändringar av dokumentet',
+'settings_enableOwnerReceipt_desc' => 'Aktivera om du vill att dokumentägaren ska läggas till som mottagare av meddelanden för det aktuella dokumentet.',
+'settings_enableOwnerRevApp' => 'Tillåt granskning/godkännande av dokumentägare',
 'settings_enableOwnerRevApp_desc' => 'Aktivera om du vill att en dokumentägare visas i listan för personer som granskar/godkänner dokumentet och i övergång på arbetsflöden.',
 'settings_enablePasswordForgotten' => 'Aktivera glömt lösenord',
 '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_enableRevisionWorkflow' => 'Aktivera revidering av dokument',
+'settings_enableRevisionWorkflow_desc' => 'Aktivera för att kunna köra arbetsflöde för revidering av dokument efter en specifik tidsperiod.',
+'settings_enableSelfRevApp' => 'Tillåt granskning/godkännande 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_enableSessionList' => '',
-'settings_enableSessionList_desc' => '',
-'settings_enableThemeSelector' => 'Tema urval',
-'settings_enableThemeSelector_desc' => 'Stäng på/av tema urval vid inloggningssidan.',
+'settings_enableSessionList' => 'Aktivera visning av användare online i menyn',
+'settings_enableSessionList_desc' => 'Visar lista över inloggade användare i menyn.',
+'settings_enableThemeSelector' => 'Val av tema',
+'settings_enableThemeSelector_desc' => 'Aktiverar val av tema på inloggningssidan.',
 'settings_enableUpdateReceipt' => '',
 'settings_enableUpdateReceipt_desc' => '',
 'settings_enableUpdateRevApp' => '',
@@ -1262,7 +1267,7 @@ URL: [url]',
 'settings_enableUserImage' => 'Aktivera användarbilder',
 'settings_enableUserImage_desc' => 'Aktivera användarbilder',
 'settings_enableUsersView' => 'Aktivera visning av användare',
-'settings_enableUsersView_desc' => 'Aktivera/Inaktivera visning av grupp och användare för alla användare',
+'settings_enableUsersView_desc' => 'Aktivera visning av grupp och användare för alla användare',
 'settings_enableVersionDeletion' => 'Aktivera möjligheten att ta bort äldre versioner',
 'settings_enableVersionDeletion_desc' => 'Aktivera/Inaktivera möjlighet att ta bort äldre dokumentversioner genom användare. Administratorn kan alltid ta bort äldre versioner.',
 'settings_enableVersionModification' => 'Aktivera modifiering av versionen',
@@ -1290,24 +1295,24 @@ 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_incItemsPerPage' => '',
-'settings_incItemsPerPage_desc' => '',
-'settings_initialDocumentStatus' => '',
-'settings_initialDocumentStatus_desc' => '',
-'settings_initialDocumentStatus_draft' => '',
-'settings_initialDocumentStatus_released' => '',
+'settings_incItemsPerPage' => 'Antal visade resultat per sida',
+'settings_incItemsPerPage_desc' => 'Om en begränsning sätts för listnning av antal kataloger och dokument, visar denna inställning det totala antalet objekt i slutet av sidan. Om värdet är satt till 0, visas summan av alla listade objekt.',
+'settings_initialDocumentStatus' => 'Initial dokumentstatus',
+'settings_initialDocumentStatus_desc' => 'Denna status används som standard för nya dokument.',
+'settings_initialDocumentStatus_draft' => 'Utkast',
+'settings_initialDocumentStatus_released' => 'Klart för användning',
 '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\'',
 'settings_install_pear_package_webdav' => 'Installera Pear-paketet \'HTTP_WebDAV_Server\', om du tänker använda webdav-gränssnittet',
 'settings_install_success' => 'Installationen har avslutats utan problem.',
 'settings_install_welcome_text' => '<p>Innan du börjar installationen av letoDMS, se till att du har skapat en fil med namnet \'ENABLE_INSTALL_TOOL\' i konfigurationsmappen, annars kommer installationen inte att fungera. På Unix-system kan detta göras med \'touch conf/ENABLE_INSTALL_TOOL\'. När du har avslutat installationen måste filen tas bort.</p><p>letoDMS har bara minimala krav. Du behöver en mysql-databas och php måste finnas på din webbserver. För lucene fulltext-sökning måste du lägga Zend framework på servern, så att det kan hittas av php. Från och med version 3.2.0 av letoDMS, är ADOdb inte längre del av distributionen. En kopia kan laddas ner från <a href="http://adodb.sourceforge.net/">http://adodb.sourceforge.net</a>. Installera detta. Sökvägen kan sättas senare i samband med installationsprocessen.</p><p>Om du vill skapa en databas innan du börjar installationen, kan den skapas manuellt med ett valfritt verktyg. Alternativt, skapa en databas med en användare som har tillgång till databasen och importera en av databasdumparna som ligger i konfigurationsmappen. Installationsskriptet kan göra detta automatiskt, men det behöver tillgång till databasen och tillräckliga rättigheter för att skapa databasen.</p>',
-'settings_install_welcome_title' => 'Välkommen till installationen av letoDMS',
+'settings_install_welcome_title' => 'Välkommen till installationen av SeedDMS!',
 '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_libraryFolder_desc' => 'Katalog för kopiering av dokument för att skapa nya dokuemnt.',
 'settings_logFileEnable' => 'Aktivera loggfil',
 'settings_logFileEnable_desc' => 'Aktivera/Inaktivera loggfil',
 'settings_logFileRotation' => 'Loggfils-rotation',
@@ -1322,14 +1327,14 @@ URL: [url]',
 'settings_maxDirID_desc' => 'Högsta antal undermappar per överordnade mapp. Standard: 0.',
 'settings_maxExecutionTime' => 'Max. exekveringstid (s)',
 'settings_maxExecutionTime_desc' => 'Detta sätter hösta tillåtna tiden i sekunder som ett skript får på sig att utföras innan det avslutas.',
-'settings_maxItemsPerPage' => '',
-'settings_maxItemsPerPage_desc' => '',
+'settings_maxItemsPerPage' => 'Max antal objekt per sida',
+'settings_maxItemsPerPage_desc' => 'Begränsar antalet kataloger och dokument som visas. Ytterligare objekt laddas när du scrollar nedåt på sidan. Om du anger 0 som värde laddas alla objekt från start.',
 'settings_maxRecursiveCount' => 'Max antal rekursiva dokument/katalog',
 'settings_maxRecursiveCount_desc' => 'Detta är maximum antal av dokument eller katalog som kommer att testas om att det har korrekt rättigheter, när objekt räknas rekursiv. Om detta nummer överskrids, kommer antalet av dokument och katalog i katalogvyn bara bli uppskattat.',
-'settings_maxSizeForFullText' => '',
-'settings_maxSizeForFullText_desc' => '',
-'settings_maxUploadSize' => '',
-'settings_maxUploadSize_desc' => '',
+'settings_maxSizeForFullText' => 'Max filstorlek för realtidsindexering',
+'settings_maxSizeForFullText_desc' => 'Innehållet i alla nya dokument som understiger det angivna maxvärdet kommer att indexeras direkt efter uppladdning. För övriga dokument indexeras endast metadata.',
+'settings_maxUploadSize' => 'Max storlek (bytes) för uppladdadning av fil',
+'settings_maxUploadSize_desc' => 'Detta är den maximala storleken för uppladdning av filer. Begränsningen anges i bytes (1 GB = ca 1 000 000 000 bytes)',
 'settings_more_settings' => 'Konfigurera flera inställningar. Standard-inloggning: admin/admin',
 'settings_notfound' => 'Hittades inte',
 'settings_Notification' => 'Meddelandeinställningar',
@@ -1348,34 +1353,34 @@ URL: [url]',
 'settings_passwordStrengthAlgorithm_desc' => 'Algoritmen används för att beräkna lösenordets kvalitet. Den \'enkla\' algoritmen kollar att det finns minst 8 tecken, minst en liten bokstav, minst en stor bokstav, en siffra och ett specialtecken. Om alla dessa delar används, räknas kvaliteten som 100, annars 0.',
 'settings_passwordStrengthAlgorithm_valadvanced' => 'avancerad',
 'settings_passwordStrengthAlgorithm_valsimple' => 'enkel',
-'settings_passwordStrength_desc' => 'Den lägsta kvaliteten som ett lösenord måste ha. Det är ett värde från 0 till 100. Inställningen 0 stränger av övervakningen av lösenordets minimala kvalitet.',
+'settings_passwordStrength_desc' => 'Den lägsta kvaliteten som lösenord måste ha uttryckt i värde från 0 till 100. Inställningen 0 stänger av kontrollen av lösenordets minimala kvalitet.',
 'settings_pear_log' => 'Pear-paketet : Logg',
 'settings_pear_webdav' => 'Pear-paketet : HTTP_WebDAV_Server',
 'settings_perms' => 'Behörigheter',
 '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 Version',
-'settings_presetExpirationDate' => 'Förinställda utgångsdatum',
+'settings_php_version' => 'PHP-version',
+'settings_presetExpirationDate' => 'Förinställt utgångsdatum',
 'settings_presetExpirationDate_desc' => 'Alla nya dokument som uppladdas kommer att ha ett utgångsdatum satt till detta värde. Det datum som har angetts kan anges som förstås av PHP strtotime () funktion, t.ex. +5 Veckor.',
-'settings_previewWidthDetail' => 'Bredd av bild förhandsvisning av (detalj)',
-'settings_previewWidthDetail_desc' => 'Bredd av bild förhandsvisning på detaljsidan',
-'settings_previewWidthDropFolderList' => '',
-'settings_previewWidthDropFolderList_desc' => '',
-'settings_previewWidthList' => 'Bredd av bild förhandsvisning (lista)',
-'settings_previewWidthList_desc' => 'Bredd av bild förhandsvisning som visas i litor',
-'settings_previewWidthMenuList' => '',
-'settings_previewWidthMenuList_desc' => '',
+'settings_previewWidthDetail' => 'Bildbredd förhandsvisning (detalj)',
+'settings_previewWidthDetail_desc' => 'Bildbredd på förhandsvisning på detaljsidan',
+'settings_previewWidthDropFolderList' => 'Bildbredd förhandsvisning (snabbuppladdninglistan)',
+'settings_previewWidthDropFolderList_desc' => 'Bildbredd på förhandsvisad bild i listan över snabbuppladdade filer.',
+'settings_previewWidthList' => 'Bildbredd förhandsvisning (lista)',
+'settings_previewWidthList_desc' => 'Bildbredd på förhandsvisning som visas i listor',
+'settings_previewWidthMenuList' => 'Bildbredd förhandsgranskning (menylista)',
+'settings_previewWidthMenuList_desc' => 'Bildbredd vid förhandsgranskning av dokument i snabbuppladdningsmenyn.',
 'settings_printDisclaimer' => 'Visa disclaimer-meddelande',
 'settings_printDisclaimer_desc' => 'Om denna inställning sätts till ja, används meddelande som finns i lang.inc-filen och skrivs ut på slutet av sidan',
 'settings_quota' => 'Användarens kvot',
-'settings_quota_desc' => 'Maximala storlek av minnet i bytes som en användare har tillgång till. Storlek 0 bytes betyder obegränsad minne. Detta värde kan sättas individuellt för varje användare i dess profil.',
-'settings_removeFromDropFolder' => '',
-'settings_removeFromDropFolder_desc' => '',
+'settings_quota_desc' => 'Maximala storlek av lagringsutrymme i bytes som en användare har tillgång till. Storlek 0 bytes betyder obegränsad lagring. Detta värde kan sättas individuellt för varje användare i dess profil. 1 GB = ca 1 000 000 000 bytes.',
+'settings_removeFromDropFolder' => 'Ta bort filen från snabbuppladdningslistan efter slutförd uppladdning',
+'settings_removeFromDropFolder_desc' => 'Aktivera denna om du automatiskt vill ta bort filer från snabbuppladdningskatalogen efter slutförd uppladdning.',
 'settings_restricted' => 'Begränsad behörighet',
 'settings_restricted_desc' => 'Tillåt användare att logga in bara om det finns en inloggning för användaren i den lokala databasen (irrespective of successful authentication with LDAP)',
 'settings_rootDir' => 'Root-mapp',
-'settings_rootDir_desc' => 'Sökväk där letoDMS befinner sig',
+'settings_rootDir_desc' => 'Sökväg till SeedDMS',
 'settings_rootFolderID' => 'ID för root-mappen',
 'settings_rootFolderID_desc' => 'ID för root-mappen (oftast behövs ingen ändring här)',
 'settings_SaveError' => 'Fel när konfigurationsfilen sparades',
@@ -1384,12 +1389,12 @@ URL: [url]',
 'settings_showFullPreview_desc' => 'Aktivera/avaktivera förhandsgranskning av helt dokument beroende på stöd i webbläsare',
 'settings_showMissingTranslations' => 'Visa saknade översättningar',
 'settings_showMissingTranslations_desc' => 'Lista alla saknade översättningar längst ner på sidan. Den inloggade användaren får möjligheten att skicka in ett förslag för saknade översättningar som kommer sparas i en CSV fil. Sätt denna option inte på, på ett DMS som används i verksamheten.',
-'settings_showSingleSearchHit' => '',
-'settings_showSingleSearchHit_desc' => '',
-'settings_Site' => 'Sida',
-'settings_siteDefaultPage' => 'Standardsida',
-'settings_siteDefaultPage_desc' => 'Standardsida efter inloggning. Om fältet är tomt, används standard-out/out.ViewFolder.php',
-'settings_siteName' => 'Sidans namn',
+'settings_showSingleSearchHit' => 'Gå direkt till första bästa sökresultat',
+'settings_showSingleSearchHit_desc' => 'Om sökningen bara ger en träff, skickas du till det aktuella dokumentet istället för till listan med sökresultat.',
+'settings_Site' => 'Site',
+'settings_siteDefaultPage' => 'Startsida',
+'settings_siteDefaultPage_desc' => 'Startsida efter inloggning. Om fältet är tomt, används standard-out/out.ViewFolder.php',
+'settings_siteName' => 'Site namn',
 'settings_siteName_desc' => 'Sidans namn som visas i sidhuvud. Standard: letoDMS',
 'settings_SMTP' => 'SMTP server-inställningar',
 'settings_smtpPassword' => 'SMTP Server lösenord',
@@ -1413,7 +1418,7 @@ URL: [url]',
 'settings_sortUsersInList_val_login' => 'Sortera efter inloggning',
 'settings_stagingDir' => 'Mapp för i delar uppladdade filer',
 'settings_stagingDir_desc' => 'Mappen där Jumploader placerar delar av filer, som laddas upp, innan dessa delar kommer kopplas ihop igen.',
-'settings_start_install' => 'Börja installationen',
+'settings_start_install' => 'Starta installationen',
 'settings_stopWordsFile' => 'Sökväg till filen med förbjudna ord',
 'settings_stopWordsFile_desc' => 'Om fulltextsökning är aktiverad, kommer denna fil innehålla förbjudna ord som inte är indexerade.',
 'settings_strictFormCheck' => 'Noggrann format-kontroll',
@@ -1425,10 +1430,10 @@ URL: [url]',
 'settings_titleDisplayHack' => 'Titelvisningshack',
 'settings_titleDisplayHack_desc' => 'Speciallösning för sidor med titlar som går över två rader.',
 'settings_undelUserIds' => 'Användare IDs, som inte kan tas bort',
-'settings_undelUserIds_desc' => 'Lista med komma separerade användare IDs, som inte kan tas bort.',
+'settings_undelUserIds_desc' => 'Lista med kommaseparerade användar-IDs som inte kan tas bort.',
 'settings_updateDatabase' => 'Kör schemauppdateringsskript på databasen',
-'settings_updateNotifyTime' => 'Uppdateringsmeddelandetid',
-'settings_updateNotifyTime_desc' => 'Användare meddelas om att ändringar i dokumentet har genomförts inom de senaste \'Uppdateringsmeddelandetid\' sekunder.',
+'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.2.0',
 'settings_versioningFileName' => 'Versionsinfo-filnamn',
 'settings_versioningFileName_desc' => 'Namnet på versionsinfo-fil som skapas med backup-verktyget',
@@ -1439,153 +1444,153 @@ URL: [url]',
 'settings_workflowMode_desc' => 'Det avancerade arbetsflödet gör det möjligt att lägga upp ett eget definerat gransknings- och godkännandeflöde för dokumentversioner.',
 'settings_workflowMode_valadvanced' => 'avancerat',
 'settings_workflowMode_valtraditional' => 'traditionellt',
-'settings_workflowMode_valtraditional_only_approval' => 'traditionell (utan omdöme)',
+'settings_workflowMode_valtraditional_only_approval' => 'traditionellt (utan granskning)',
 'settings_zendframework' => 'Zend Framework',
 'set_expiry' => 'Sätt utgångstid',
 'set_owner' => 'Ange dokumentägare',
 'set_owner_error' => 'Fel vid val av ägare',
-'set_password' => 'Ändra lösenord',
+'set_password' => 'Ange lösenord',
 'set_workflow' => 'Välj arbetsflöde',
 'signed_in_as' => 'Inloggad som',
-'sign_in' => 'logga in',
-'sign_out' => 'logga ut',
-'sign_out_user' => 'logga ut användare',
-'sk_SK' => 'slovakiska',
-'space_used_on_data_folder' => 'Plats använd i datamappen',
+'sign_in' => 'Logga in',
+'sign_out' => 'Logga ut',
+'sign_out_user' => 'Logga ut användare',
+'sk_SK' => 'Slovakiska',
+'space_used_on_data_folder' => 'Utrymme använt i datakatalogen',
 'splash_added_to_clipboard' => 'Tillagt till urklipp',
-'splash_add_attribute' => 'Ny attribut tillagt',
-'splash_add_group' => 'Ny grupp tillagt',
+'splash_add_attribute' => 'Nytt attribut tillagt',
+'splash_add_group' => 'Ny grupp tillagd',
 'splash_add_group_member' => 'Ny gruppmedlem tillagt',
-'splash_add_role' => '',
-'splash_add_to_transmittal' => '',
-'splash_add_transmittal' => '',
-'splash_add_user' => 'Ny användare tillagt',
-'splash_cleared_cache' => '',
+'splash_add_role' => 'Lägg till ny roll',
+'splash_add_to_transmittal' => 'Lägg till meddelande',
+'splash_add_transmittal' => 'Meddelande tillagt',
+'splash_add_user' => 'Ny användare tillagd',
+'splash_cleared_cache' => 'Cachen är rensad',
 'splash_cleared_clipboard' => 'Urklipp rensat',
-'splash_document_added' => '',
-'splash_document_checkedout' => '',
-'splash_document_edited' => 'Dokument sparad',
-'splash_document_indexed' => '',
+'splash_document_added' => 'Dokument tillagt',
+'splash_document_checkedout' => 'Dokument utcheckat',
+'splash_document_edited' => 'Dokument sparat',
+'splash_document_indexed' => 'Dokument \'[name]\' indexerat.',
 'splash_document_locked' => 'Dokument låst',
 'splash_document_unlocked' => 'Dokument upplåst',
 'splash_edit_attribute' => 'Attribut sparat',
-'splash_edit_event' => '',
-'splash_edit_group' => 'Grupp sparat',
-'splash_edit_role' => '',
-'splash_edit_user' => 'Användare sparat',
+'splash_edit_event' => 'Händelse sparad',
+'splash_edit_group' => 'Grupp sparad',
+'splash_edit_role' => 'Roll sparad',
+'splash_edit_user' => 'Användare sparad',
 'splash_error_add_to_transmittal' => '',
-'splash_error_rm_download_link' => '',
-'splash_error_send_download_link' => '',
-'splash_folder_edited' => 'Spara katalog ändringar',
-'splash_importfs' => '',
-'splash_invalid_folder_id' => 'Ogiltigt katalog ID',
+'splash_error_rm_download_link' => 'Fel vid borttagande av nedladdningslänk',
+'splash_error_send_download_link' => 'Fel vid sändning av nedladdningslänk',
+'splash_folder_edited' => 'Spara ändringar i katalog',
+'splash_importfs' => 'Importerade [docs] dokument och [folders] kataloger',
+'splash_invalid_folder_id' => 'Ogiltigt katalog-ID',
 'splash_invalid_searchterm' => 'Ogiltigt sökord',
-'splash_moved_clipboard' => 'Urklipp flyttades till aktuella katalogen',
-'splash_move_document' => '',
-'splash_move_folder' => '',
-'splash_receipt_update_success' => '',
-'splash_removed_from_clipboard' => 'Borttagen från urklipp',
+'splash_moved_clipboard' => 'Urklipp flyttades till aktuell katalog',
+'splash_move_document' => 'Dokumentet flyttat',
+'splash_move_folder' => 'Katalogen flyttad',
+'splash_receipt_update_success' => 'Meddelande tillagt',
+'splash_removed_from_clipboard' => 'Borttaget från urklipp',
 'splash_rm_attribute' => 'Attribut har tagits bort',
 'splash_rm_document' => 'Dokument borttaget',
-'splash_rm_download_link' => '',
-'splash_rm_folder' => 'Mapp raderad',
+'splash_rm_download_link' => 'Nedladdningslänk borttagen',
+'splash_rm_folder' => 'Katalog raderad',
 'splash_rm_group' => 'Grupp har tagits bort',
 'splash_rm_group_member' => 'Gruppmedlem har tagits bort',
-'splash_rm_role' => '',
-'splash_rm_transmittal' => '',
+'splash_rm_role' => 'Rollen raderad',
+'splash_rm_transmittal' => 'Meddelande raderat',
 'splash_rm_user' => 'Användare har tagits bort',
-'splash_rm_user_processes' => '',
-'splash_saved_file' => '',
-'splash_save_user_data' => '',
-'splash_send_download_link' => '',
-'splash_send_login_data' => '',
+'splash_rm_user_processes' => 'Användare borttagen från alla processer',
+'splash_saved_file' => 'Version sparad',
+'splash_save_user_data' => 'Användarinställningar sparade',
+'splash_send_download_link' => 'Nedladdningslänk skickad via e-post.',
+'splash_send_login_data' => 'Inloggningsuppgifter skickade',
 'splash_settings_saved' => 'Inställningar sparat',
 'splash_substituted_user' => 'Bytt användare',
 'splash_switched_back_user' => 'Byt tillbaka till original användare',
 'splash_toogle_group_manager' => 'Gruppmanager har ändrats',
-'splash_transfer_document' => '',
-'splash_transfer_objects' => '',
+'splash_transfer_document' => 'Dokument överfört',
+'splash_transfer_objects' => 'Objekt överförda',
 'state_and_next_state' => 'Status/Nästa status',
 'statistic' => 'Statistik',
 'status' => 'Status',
 'status_approval_rejected' => 'Utkast avvisat',
 'status_approved' => 'Godkänt',
-'status_approver_removed' => 'Person som godkänner har tagits bort från processen',
+'status_approver_removed' => 'Godkännare har tagits bort från processen',
 'status_not_approved' => 'Ej godkänt',
-'status_not_receipted' => '',
+'status_not_receipted' => 'Ej mottaget ännu',
 'status_not_reviewed' => 'Ej granskat',
-'status_not_revised' => '',
-'status_receipted' => '',
-'status_receipt_rejected' => '',
-'status_recipient_removed' => '',
+'status_not_revised' => 'Ej reviderat',
+'status_receipted' => 'Mottaget',
+'status_receipt_rejected' => 'Avvisat',
+'status_recipient_removed' => 'Mottagare borttagen från lista',
 '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_reviewer_removed' => 'Granskare har tagits bort från processen',
+'status_revised' => 'Reviderat',
+'status_revision_rejected' => 'Avvisat',
+'status_revision_sleeping' => 'Vilande',
+'status_revisor_removed' => 'Reviderare borttagen från listan',
 'status_unknown' => 'Okänd',
-'storage_size' => 'Platsstorlek',
-'submit_2_fact_auth' => '',
+'storage_size' => 'Lagringsstorlek',
+'submit_2_fact_auth' => 'Spara hemlighet',
 'submit_approval' => 'Skicka godkännande',
 'submit_login' => 'Logga in',
 'submit_password' => 'Sätt nytt lösenord',
 'submit_password_forgotten' => 'Starta process',
-'submit_receipt' => '',
+'submit_receipt' => 'Skicka mottagningsbevis',
 'submit_review' => 'Skicka granskning',
-'submit_revision' => '',
+'submit_revision' => 'Lägg till revidering',
 'submit_userinfo' => 'Skicka info',
-'subsribe_timelinefeed' => '',
-'substitute_to_user' => '',
+'subsribe_timelinefeed' => 'Prenumerera på tidslinje',
+'substitute_to_user' => 'Byt till \'[username]\'',
 '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',
+'success_add_aro' => 'Objekt för åtkomst tillagt',
+'success_add_permission' => 'Rättighet tillagd',
+'success_remove_permission' => 'Rättighet borttagen',
+'success_toogle_permission' => 'Rättighet ändrad',
+'sunday' => 'Söndag',
+'sunday_abbr' => 'Sö',
+'sv_SE' => 'Svenska',
 'switched_to' => 'Bytt till',
-'takeOverAttributeValue' => '',
-'takeOverGrpApprover' => '',
-'takeOverGrpReviewer' => '',
-'takeOverIndApprover' => '',
-'takeOverIndReviewer' => '',
-'tasks' => '',
-'temp_jscode' => '',
-'testmail_body' => 'Denna epost är bara till för att testa epost inställningarna av SeedDMS.',
-'testmail_subject' => 'Test epost',
+'takeOverAttributeValue' => 'Ta över attributvärde från senaste version',
+'takeOverGrpApprover' => 'Ta över godkännandegrupp från senaste version',
+'takeOverGrpReviewer' => 'Ta över granskningsgrupp från senaste version',
+'takeOverIndApprover' => 'Ta över individuell godkännare från senaste version',
+'takeOverIndReviewer' => 'Ta över individuell granskare från senaste version',
+'tasks' => 'Uppgifter',
+'temp_jscode' => 'Tillfälligt javascript',
+'testmail_body' => 'Denna e-post avser bara test av e-postfunktion i SeedDMS.',
+'testmail_subject' => 'Test e-post',
 'theme' => 'Visningstema',
-'thursday' => 'torsdag',
-'thursday_abbr' => 'to',
+'thursday' => 'Torsdag',
+'thursday_abbr' => 'To',
 'timeline' => 'Tidslinje',
 'timeline_add_file' => 'Ny bilaga',
-'timeline_add_version' => '',
-'timeline_full_add_file' => '',
-'timeline_full_add_version' => '',
-'timeline_full_status_change' => '',
-'timeline_selected_item' => '',
-'timeline_skip_add_file' => '',
-'timeline_skip_status_change_-1' => '',
-'timeline_skip_status_change_-3' => '',
-'timeline_skip_status_change_0' => '',
-'timeline_skip_status_change_1' => '',
-'timeline_skip_status_change_2' => '',
-'timeline_skip_status_change_3' => '',
-'timeline_skip_status_change_4' => '',
-'timeline_skip_status_change_5' => '',
+'timeline_add_version' => 'Ny version [version]',
+'timeline_full_add_file' => '[document]<br />Ny bilaga',
+'timeline_full_add_version' => '[document]<br />Ny version [version]',
+'timeline_full_status_change' => '[document]<br />Version [version]: [status]',
+'timeline_selected_item' => 'Valt dokument',
+'timeline_skip_add_file' => 'Bilaga tillagd',
+'timeline_skip_status_change_-1' => 'avvisad',
+'timeline_skip_status_change_-3' => 'utgånget',
+'timeline_skip_status_change_0' => 'väntar på granskning',
+'timeline_skip_status_change_1' => 'väntar på godkännande',
+'timeline_skip_status_change_2' => 'klart för användning',
+'timeline_skip_status_change_3' => 'i arbetsflöde',
+'timeline_skip_status_change_4' => 'under revidering',
+'timeline_skip_status_change_5' => 'utkast',
 'timeline_status_change' => 'Version [version]: [status]',
 'to' => 'till',
 'toggle_manager' => 'Byt manager',
-'toggle_qrcode' => '',
+'toggle_qrcode' => 'Visa/göm QR-kod',
 'to_before_from' => 'Slutdatum får inte vara innan startdatum',
-'transfer_document' => '',
-'transfer_no_read_access' => '',
-'transfer_no_write_access' => '',
-'transfer_objects' => '',
-'transfer_objects_to_user' => '',
-'transfer_to_user' => '',
+'transfer_document' => 'Överför dokument',
+'transfer_no_read_access' => 'Användaren har inte läsrättigheter i katalogen',
+'transfer_no_write_access' => 'Användaren har inte skrivrättigheter i katalogen',
+'transfer_objects' => 'Överför objekt',
+'transfer_objects_to_user' => 'Ny ägare',
+'transfer_to_user' => 'Överför till användare',
 'transition_triggered_email' => 'Arbetsflödesövergång utlöstes',
 'transition_triggered_email_body' => 'Arbetsflödesövergång utlöstes
 Dokument: [name]
@@ -1598,23 +1603,23 @@ 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' => '',
-'tree_loading' => 'Vänligen vänta tills dokumentträdet laddats',
+'transmittal' => 'Meddelande',
+'transmittalitem_removed' => 'Komponent i meddelande borttaget',
+'transmittalitem_updated' => 'Dokument uppdaterat till senaste version',
+'transmittal_comment' => 'Kommentar',
+'transmittal_name' => 'Namn',
+'transmittal_size' => 'Storlek',
+'tree_loading' => 'Vänligen vänta tills dokumentträdet laddats...',
 'trigger_workflow' => 'Arbetsflöde',
 'tr_TR' => 'Turkiska',
-'tuesday' => 'tisdag',
-'tuesday_abbr' => 'ti',
-'type_of_hook' => '',
+'tuesday' => 'Tisdag',
+'tuesday_abbr' => 'Ti',
+'type_of_hook' => 'Typ',
 'type_to_search' => 'Skriv för att söka',
 'uk_UA' => 'Ukrainska',
 'under_folder' => 'I katalogen',
-'unknown_attrdef' => 'Okännd attributdefinition',
-'unknown_command' => 'Okänt kommando.',
+'unknown_attrdef' => 'Okänd attributdefinition',
+'unknown_command' => 'Okänt kommando',
 'unknown_document_category' => 'Okänd kategori',
 'unknown_group' => 'Okänt grupp-ID',
 'unknown_id' => 'Okänt ID',
@@ -1622,96 +1627,96 @@ URL: [url]',
 'unknown_owner' => 'Okänt ägar-ID',
 'unknown_user' => 'Okänt användar-ID',
 'unlinked_content' => 'Olänkat innehåll',
-'unlinked_documents' => 'Olänkade documenter',
-'unlinked_folders' => 'Olänkade katalog',
+'unlinked_documents' => 'Olänkade dokument',
+'unlinked_folders' => 'Olänkade kataloger',
 'unlinking_objects' => 'Bryta länk till innehåll',
 'unlock_cause_access_mode_all' => 'Du kan fortfarande uppdatera, eftersom du har behörighetsnivå "all". Låsningen kommer automatiskt att tas bort.',
 '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',
 'update_approvers' => 'Uppdatera lista med personer som godkänner',
-'update_document' => 'Uppdatera',
+'update_document' => 'Uppdatera dokument',
 '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_revisors' => '',
-'update_transmittalitem' => '',
+'update_locked_msg' => 'Dokumentet är låst',
+'update_recipients' => 'Uppdatera lista med mottagare',
+'update_reviewers' => 'Uppdatera listan med granskare',
+'update_revisors' => 'Uppdatera listan med reviderare',
+'update_transmittalitem' => 'Uppdatera till senaste dokumentversion',
 'uploaded_by' => 'Uppladdat av',
 'uploading_failed' => 'Fel vid uppladdningen. Kontakta administratören.',
-'uploading_maxsize' => 'Uppladdade filen översteg maxgränsen för storleken på filstorlek',
+'uploading_maxsize' => 'Den uppladdade filen översteg maxgränsen för filstorlek.',
 'uploading_zerosize' => 'Uppladdning av tom fil. Uppladdningen avbryts.',
-'used_discspace' => 'Använt minne',
+'used_discspace' => 'Använt lagringsutrymme',
 'user' => 'Användare',
-'userid_groupid' => '',
+'userid_groupid' => 'Användar-ID/Grupp-ID',
 'users' => 'Användare',
 'users_and_groups' => 'Användare/Grupper',
 'users_done_work' => 'Användarens utförda jobb',
 'user_exists' => 'Användaren finns redan.',
-'user_group' => '',
+'user_group' => 'Användare/Grupp',
 'user_group_management' => 'Hantering av användare/grupper',
 'user_image' => 'Bild',
 'user_info' => 'Användarinformation',
 'user_list' => 'Lista med användare',
 'user_login' => 'Användarnamn',
 'user_management' => 'Användar-hantering',
-'user_name' => 'Fullt namn',
+'user_name' => 'Helt namn',
 'use_comment_of_document' => 'Använd dokumentets kommentar',
 'use_default_categories' => 'Använd fördefinerade kategorier',
 'use_default_keywords' => 'Använd fördefinerade nyckelord',
-'valid_till' => '',
+'valid_till' => 'Giltigt till',
 'version' => 'Version',
 'versioning_file_creation' => 'Skapa versionsfil',
 'versioning_file_creation_warning' => 'Med denna funktion kan du skapa en fil som innehåller versionsinformationen för hela DMS-mappen. Efter skapandet kommer alla filer att sparas inom dokumentets mapp.',
 'versioning_info' => 'Versionsinformation',
 'versiontolow' => 'Version för låg',
 'version_deleted_email' => 'Version borttagen',
-'version_deleted_email_body' => 'Version borttagen
-Dokument: [name]
-Version: [version]
-Överordnade katalog: [folder_path]
-Användare: [username]
+'version_deleted_email_body' => 'Version borttagen
+Dokument: [name]
+Version: [version]
+Överordnad katalog: [folder_path]
+Användare: [username]
 URL: [url]',
 'version_deleted_email_subject' => '[sitename]: [name] - Version borttagen',
 'version_info' => 'Versionsinformation',
 'view' => 'Vy',
 'view_online' => 'Visa online',
 'warning' => 'Varning',
-'wednesday' => 'onsdag',
-'wednesday_abbr' => 'on',
+'wednesday' => 'Onsdag',
+'wednesday_abbr' => 'On',
 'weeks' => 'veckor',
-'week_view' => 'veckovy',
+'week_view' => 'Veckovy',
 'workflow' => 'Arbetsflöde',
-'workflows_involded' => '',
+'workflows_involded' => 'Tillhör ett arbetsflöde',
 'workflow_actions_management' => 'Åtgärder för arbetsflöde',
 'workflow_action_in_use' => 'Denna åtgärd används i ett arbetsflöde.',
 'workflow_action_name' => 'Namn',
 'workflow_editor' => 'Arbetsflöde Editor',
 'workflow_group_summary' => 'Sammanfattning grupp',
-'workflow_has_cycle' => '',
+'workflow_has_cycle' => 'Arbetsflödet har en cykel',
 'workflow_initstate' => 'Ursprungsstatus',
-'workflow_in_use' => 'Detta arbetsflöde används i ett dokument.',
-'workflow_layoutdata_saved' => '',
+'workflow_in_use' => 'Detta arbetsflöde används av dokument.',
+'workflow_layoutdata_saved' => 'Data för layout sparat',
 'workflow_management' => 'Arbetsflöden',
 'workflow_name' => 'Namn',
-'workflow_no_doc_rejected_state' => '',
-'workflow_no_doc_released_state' => '',
-'workflow_no_initial_state' => '',
-'workflow_no_states' => 'Du måste först fastlägga ett antal status för arbetsflödet, innan du kan lägga till ett arbetsflöde.',
-'workflow_save_layout' => '',
-'workflow_state' => '',
+'workflow_no_doc_rejected_state' => 'Dokumentet kommer inte att avvisas i någon status i  arbetsflödet!',
+'workflow_no_doc_released_state' => 'Dokumentet blir inte klart för använding i någon status i arbetsflödet!',
+'workflow_no_initial_state' => 'Ingen av övergångarna i arbetsflödet börjar med arbetsflödets initiala status.',
+'workflow_no_states' => 'Du måste först definiera statusar för arbetsflödet innan du kan skapa ett arbetsflöde.',
+'workflow_save_layout' => 'Spara layout',
+'workflow_state' => 'Status i arbetsflödet',
 'workflow_states_management' => 'Status för arbetsflöde',
 'workflow_state_docstatus' => 'Dokumentstatus',
-'workflow_state_in_use' => 'Detta status används i ett arbetsflöde.',
+'workflow_state_in_use' => 'Denna status används i ett arbetsflöde.',
 'workflow_state_name' => 'Namn',
 'workflow_summary' => 'Sammanfattning arbetsflöde',
-'workflow_transition_without_user_group' => '',
+'workflow_transition_without_user_group' => 'Minst en av övergångarna i arbetsflödet saknar användare eller grupp.',
 'workflow_user_summary' => 'Sammanfattning användare',
-'x_more_objects' => '',
-'year_view' => 'årsvy',
+'x_more_objects' => '[number] ytterligare objekt',
+'year_view' => 'Årsvy',
 'yes' => 'Ja',
-'zh_CN' => 'kinesiska (CN)',
-'zh_TW' => 'kinesiska (TW)',
+'zh_CN' => 'Kinesiska (CN)',
+'zh_TW' => 'Kinesiska (TW)',
 );
 ?>

From 476e2d15d5c8d7adf932c8825bbcd9b6f8f8e0cb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Dec 2017 06:23:44 +0100
Subject: [PATCH 162/308] remove bogus methods from
 SeedDMS_Core_DocumentCategory

---
 SeedDMS_Core/Core/inc.ClassDocumentCategory.php | 14 --------------
 SeedDMS_Core/package.xml                        |  1 +
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocumentCategory.php b/SeedDMS_Core/Core/inc.ClassDocumentCategory.php
index c859352fb..3951a5c9f 100644
--- a/SeedDMS_Core/Core/inc.ClassDocumentCategory.php
+++ b/SeedDMS_Core/Core/inc.ClassDocumentCategory.php
@@ -74,20 +74,6 @@ class SeedDMS_Core_DocumentCategory {
 		return true;
 	} /* }}} */
 
-	function getCategories() { /* {{{ */
-		$db = $this->_dms->getDB();
-
-		$queryStr = "SELECT * FROM `tblCategory`";
-		return $db->getResultArray($queryStr);
-	} /* }}} */
-
-	function addCategory($keywords) { /* {{{ */
-		$db = $this->_dms->getDB();
-
-		$queryStr = "INSERT INTO `tblCategory` (`category`) VALUES (".$db->qstr($keywords).")";
-		return $db->getResult($queryStr);
-	} /* }}} */
-
 	function remove() { /* {{{ */
 		$db = $this->_dms->getDB();
 
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 579beeec0..ef028bb7c 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -30,6 +30,7 @@
 - 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()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From c8ce5e9ea9a12e96d0272376a31dfcfa9ede7c34 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Dec 2017 06:34:26 +0100
Subject: [PATCH 163/308] add optional parameters $limit and $offset to
 SeedDMS_Core_Folder::getDocuments()

---
 SeedDMS_Core/Core/inc.ClassFolder.php | 8 +++++++-
 SeedDMS_Core/package.xml              | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index 9d2dee1cc..fdc497815 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -656,9 +656,11 @@ 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)
+	 * @param integer $limit limit number of documents
+	 * @param integer $offset offset in retrieved list of documents
 	 * @return array list of documents or false in case of an error
 	 */
-	function getDocuments($orderby="", $dir="asc") { /* {{{ */
+	function getDocuments($orderby="", $dir="asc", $limit=0, $offset=0) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		if (!isset($this->_documents)) {
@@ -668,6 +670,10 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 			elseif($orderby=="d") $queryStr .= " ORDER BY `date`";
 			if($dir == 'desc')
 				$queryStr .= " DESC";
+			if(is_int($limit) && $limit > 0)
+				$queryStr .= " LIMIT ".$limit;
+			if(is_int($offset) && $offset > 0)
+				$queryStr .= " OFFSET ".$offset;
 
 			$resArr = $db->getResultArray($queryStr);
 			if (is_bool($resArr) && !$resArr)
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index ef028bb7c..3e23c1076 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -31,6 +31,7 @@
 - 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()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From d80600cb5a380113d5fad438fdc981900f9224fd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Dec 2017 06:48:03 +0100
Subject: [PATCH 164/308] add hooks folderGetDocuments and folderGetSubFolders

---
 views/bootstrap/class.ViewFolder.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index e4018f37f..c6a7614b9 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -157,9 +157,13 @@ $('#loadmore').click(function(e) {
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 
-		$subFolders = $folder->getSubFolders($orderby);
+		$subFolders = $this->callHook('folderGetSubFolders', $folder, $orderby);
+		if($subFolders === null)
+			$subFolders = $folder->getSubFolders($orderby);
 		$subFolders = SeedDMS_Core_DMS::filterAccess($subFolders, $user, M_READ);
-		$documents = $folder->getDocuments($orderby);
+		$documents = $this->callHook('folderGetDocuments', $folder, $orderby);
+		if($documents === null)
+			$documents = $folder->getDocuments($orderby);
 		$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ);
 
 		$content = '';
@@ -382,9 +386,13 @@ $('#loadmore').click(function(e) {
 		else
 			$this->contentHeading(getMLText("folder_contents"));
 
-		$subFolders = $folder->getSubFolders($orderby);
+		$subFolders = $this->callHook('folderGetSubFolders', $folder, $orderby);
+		if($subFolders === null)
+			$subFolders = $folder->getSubFolders($orderby);
 		$subFolders = SeedDMS_Core_DMS::filterAccess($subFolders, $user, M_READ);
-		$documents = $folder->getDocuments($orderby);
+		$documents = $this->callHook('folderGetDocuments', $folder, $orderby);
+		if($documents === null)
+			$documents = $folder->getDocuments($orderby);
 		$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ);
 
 		$i = 0;

From 5c80a8bf6d0c492364b9ce687e58014f633c58bf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Dec 2017 06:48:51 +0100
Subject: [PATCH 165/308] new entry for 5.1.5

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

diff --git a/CHANGELOG b/CHANGELOG
index 256a4f3b6..ded6bb2f8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@
 - documents can be transfered to another user (Closes partly #368)
 - list of folders/documents on ViewFolder page can be limited, more objects
   will be loaded when user scrolls to the end of the page
+- add more hooks in ViewFolder
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.4

From b0747e74f0a202f68c250240df55e332ac9e36c3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Dec 2017 07:05:08 +0100
Subject: [PATCH 166/308] add optional parameter $limit and $offset to
 SeedDMS_Core_Folder::getSubFolders

---
 SeedDMS_Core/Core/inc.ClassFolder.php | 16 ++++++++++++----
 SeedDMS_Core/package.xml              |  1 +
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index fdc497815..308d02bac 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -462,9 +462,11 @@ 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)
+	 * @param integer $limit limit number of subfolders
+	 * @param integer $offset offset in retrieved list of subfolders
 	 * @return array list of folder objects or false in case of an error
 	 */
-	function getSubFolders($orderby="", $dir="asc") { /* {{{ */
+	function getSubFolders($orderby="", $dir="asc", $limit=0, $offset=0) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		if (!isset($this->_subFolders)) {
@@ -475,6 +477,11 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 			elseif ($orderby=="d") $queryStr .= " ORDER BY `date`";
 			if($dir == 'desc')
 				$queryStr .= " DESC";
+			if(is_int($limit) && $limit > 0) {
+				$queryStr .= " LIMIT ".$limit;
+				if(is_int($offset) && $offset > 0)
+					$queryStr .= " OFFSET ".$offset;
+			}
 
 			$resArr = $db->getResultArray($queryStr);
 			if (is_bool($resArr) && $resArr == false)
@@ -670,10 +677,11 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 			elseif($orderby=="d") $queryStr .= " ORDER BY `date`";
 			if($dir == 'desc')
 				$queryStr .= " DESC";
-			if(is_int($limit) && $limit > 0)
+			if(is_int($limit) && $limit > 0) {
 				$queryStr .= " LIMIT ".$limit;
-			if(is_int($offset) && $offset > 0)
-				$queryStr .= " OFFSET ".$offset;
+				if(is_int($offset) && $offset > 0)
+					$queryStr .= " OFFSET ".$offset;
+			}
 
 			$resArr = $db->getResultArray($queryStr);
 			if (is_bool($resArr) && !$resArr)
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 3e23c1076..ea12c1730 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -32,6 +32,7 @@
 - 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()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

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 167/308] 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 168/308] 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 169/308] 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 170/308] 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 99fbf808fd44fa2bd9f832aaf436feafec222e31 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Dec 2017 10:46:19 +0100
Subject: [PATCH 171/308] do not show table of documents if there are no
 documents

---
 views/bootstrap/class.Categories.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/views/bootstrap/class.Categories.php b/views/bootstrap/class.Categories.php
index e65b73ab4..bbddb8fb1 100644
--- a/views/bootstrap/class.Categories.php
+++ b/views/bootstrap/class.Categories.php
@@ -63,18 +63,20 @@ $(document).ready( function() {
 			echo "</table>";
 
 			$documents = $selcat->getDocumentsByCategory(10);
-			print "<table id=\"viewfolder-table\" class=\"table\">";
-			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";
-			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
-			foreach($documents as $doc) {
-				echo $this->documentListRow($doc, $previewer);
+			if($documents) {
+				print "<table id=\"viewfolder-table\" class=\"table\">";
+				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";
+				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+				foreach($documents as $doc) {
+					echo $this->documentListRow($doc, $previewer);
+				}
+				print "</tbody></table>";
 			}
-			print "</tbody></table>";
 		}
 	} /* }}} */
 

From abd8b77b2f03b6e27df63767790b3a42017d14bf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Dec 2017 10:46:42 +0100
Subject: [PATCH 172/308] check if document exists before adding it to result
 array

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

diff --git a/SeedDMS_Core/Core/inc.ClassDocumentCategory.php b/SeedDMS_Core/Core/inc.ClassDocumentCategory.php
index 3951a5c9f..6d5451664 100644
--- a/SeedDMS_Core/Core/inc.ClassDocumentCategory.php
+++ b/SeedDMS_Core/Core/inc.ClassDocumentCategory.php
@@ -98,7 +98,8 @@ class SeedDMS_Core_DocumentCategory {
 
 		$documents = array();
 		foreach ($resArr as $row) {
-			array_push($documents, $this->_dms->getDocument($row["documentID"]));
+			if($doc = $this->_dms->getDocument($row["documentID"]))
+				array_push($documents, $doc);
 		}
 		return $documents;
 	} /* }}} */

From 48c7dd3fc2534a71b403e4bedd64e489da10915d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Dec 2017 10:52:24 +0100
Subject: [PATCH 173/308] fix deletion of documents from document list

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

diff --git a/views/bootstrap/class.Categories.php b/views/bootstrap/class.Categories.php
index bbddb8fb1..426f723b4 100644
--- a/views/bootstrap/class.Categories.php
+++ b/views/bootstrap/class.Categories.php
@@ -46,6 +46,8 @@ $(document).ready( function() {
 	});
 });
 <?php
+		$this->printDeleteFolderButtonJs();
+		$this->printDeleteDocumentButtonJs();
 	} /* }}} */
 
 	function info() { /* {{{ */
@@ -136,6 +138,8 @@ $(document).ready( function() {
 		$categories = $this->params['categories'];
 		$selcat = $this->params['selcategory'];
 
+		$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();

From 7c7a9584ca52cde2edeeff9ca538bc10cc7717ff Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Dec 2017 11:09:20 +0100
Subject: [PATCH 174/308] fix output of text on button to load more documents

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

diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index c6a7614b9..9caf16c51 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -109,11 +109,11 @@ function loadMoreObjects(element, limit) {
 		dataType: 'json',
 		success: function(data){
 			$('#viewfolder-table').append(data.html);
-console.log(data.count);
 			if(data.count <= 0) {
 				element.hide();
 			} else {
-				element.text(data.count+" more objects");
+				var str = '<?= getMLText('x_more_objects') ?>';
+				element.text(str.replace('[number]', data.count));
 				element.data('offset', offset+limit);
 			}
 		}
@@ -452,7 +452,7 @@ $('#loadmore').click(function(e) {
 				echo "</tbody>\n</table>\n";
 
 			if($maxItemsPerPage && $i > $maxItemsPerPage)
-				echo "<button id=\"loadmore\" style=\"width: 100%; margin-bottom: 20px;\" class=\"btn btn-default\" data-folder=\"".$folder->getId()."\"data-offset=\"".$maxItemsPerPage."\" data-limit=\"".$incItemsPerPage."\" data-all=\"".($i-$maxItemsPerPage)."\">".getMLText('x_more_objects', array('number', ($i-$maxItemsPerPage)))."</button>";
+				echo "<button id=\"loadmore\" style=\"width: 100%; margin-bottom: 20px;\" class=\"btn btn-default\" data-folder=\"".$folder->getId()."\"data-offset=\"".$maxItemsPerPage."\" data-limit=\"".$incItemsPerPage."\" data-all=\"".($i-$maxItemsPerPage)."\">".getMLText('x_more_objects', array('number'=>($i-$maxItemsPerPage)))."</button>";
 		}
 		else printMLText("empty_folder_list");
 

From fc09a9408bbe1897d7c8f9153ec805165a1203f6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Dec 2017 11:21:44 +0100
Subject: [PATCH 175/308] pass orderby to js file, remove debug code

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

diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index 9caf16c51..0e0bce9fd 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -102,7 +102,7 @@ function loadMoreObjects(element, limit) {
 	var folder = element.data('folder')
 	var offset = element.data('offset')
 //	var limit = element.data('limit')
-	url = seeddms_webroot+"out/out.ViewFolder.php?action=entries&folderid="+folder+"&offset="+offset+"&limit="+limit;
+	url = seeddms_webroot+"out/out.ViewFolder.php?action=entries&folderid="+folder+"&offset="+offset+"&limit="+limit<?= $orderby ? '+"&orderby='.$orderby.'"' : "" ?>;
 	$.ajax({
 		type: 'GET',
 		url: url,
@@ -188,7 +188,6 @@ $('#loadmore').click(function(e) {
 					$txt = $this->callHook('folderListSeparator', $folder);
 					if(is_string($txt))
 						$content .= $txt;
-					else $content .= "<tr><td colspan=\"4\">kkkkk</td></tr>";
 				}
 			}
 

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 176/308] 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 177/308] 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 178/308] 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 5013fb154c42addea423010ba5e4ec2e30d40f81 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Dec 2017 11:22:16 +0100
Subject: [PATCH 179/308] do not htmlspecialchars() keywords, check attributes
 before setting them

---
 restapi/index.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index da9bb0fff..d64a7ec26 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -314,10 +314,12 @@ function createFolder($id) { /* {{{ */
 			$comment = $app->request()->post('comment');
 			$attributes = $app->request()->post('attributes');
 			$newattrs = array();
-			foreach($attributes as $attrname=>$attrvalue) {
-				$attrdef = $dms->getAttributeDefinitionByName($attrname);
-				if($attrdef) {
-					$newattrs[$attrdef->getID()] = $attrvalue;
+			if($attributes) {
+				foreach($attributes as $attrname=>$attrvalue) {
+					$attrdef = $dms->getAttributeDefinitionByName($attrname);
+					if($attrdef) {
+						$newattrs[$attrdef->getID()] = $attrvalue;
+					}
 				}
 			}
 			if($folder = $parent->addSubFolder($name, $comment, $userobj, 0, $newattrs)) {
@@ -469,7 +471,7 @@ function getDocument($id) { /* {{{ */
 				'version'=>$lc->getVersion(),
 				'orig_filename'=>$lc->getOriginalFileName(),
 				'size'=>$lc->getFileSize(),
-				'keywords'=>htmlspecialchars($document->getKeywords()),
+				'keywords'=>$document->getKeywords(),
 			);
 			$app->response()->header('Content-Type', 'application/json');
 			echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));

From be112427d6fcff831a73e513994352c42ffffebb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Dec 2017 11:24:40 +0100
Subject: [PATCH 180/308] remove white space, expand tabs

---
 restapi/index.php | 1714 ++++++++++++++++++++++-----------------------
 1 file changed, 857 insertions(+), 857 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index d64a7ec26..2e8b901d8 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -13,46 +13,46 @@ require_once "SeedDMS/Preview.php";
 //$dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
 
 if(USE_PHP_SESSION) {
-	session_start();
-	$userobj = null;
-	if(isset($_SESSION['userid']))
-		$userobj = $dms->getUser($_SESSION['userid']);
-	elseif($settings->_enableGuestLogin)
-		$userobj = $dms->getUser($settings->_guestID);
-	else
-		exit;
-	$dms->setUser($userobj);
+    session_start();
+    $userobj = null;
+    if(isset($_SESSION['userid']))
+        $userobj = $dms->getUser($_SESSION['userid']);
+    elseif($settings->_enableGuestLogin)
+        $userobj = $dms->getUser($settings->_guestID);
+    else
+        exit;
+    $dms->setUser($userobj);
 } else {
-	require_once("../inc/inc.ClassSession.php");
-	$session = new SeedDMS_Session($db);
-	if (isset($_COOKIE["mydms_session"])) {
-		$dms_session = $_COOKIE["mydms_session"];
-		if(!$resArr = $session->load($dms_session)) {
-			/* Delete Cookie */
-			setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot);
-			if($settings->_enableGuestLogin)
-				$userobj = $dms->getUser($settings->_guestID);
-			else
-				exit;
-		}
+    require_once("../inc/inc.ClassSession.php");
+    $session = new SeedDMS_Session($db);
+    if (isset($_COOKIE["mydms_session"])) {
+        $dms_session = $_COOKIE["mydms_session"];
+        if(!$resArr = $session->load($dms_session)) {
+            /* Delete Cookie */
+            setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot);
+            if($settings->_enableGuestLogin)
+                $userobj = $dms->getUser($settings->_guestID);
+            else
+                exit;
+        }
 
-		/* 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)
-				$userobj = $dms->getUser($settings->_guestID);
-			else
-				exit;
-		}
-		if($userobj->isAdmin()) {
-			if($resArr["su"]) {
-				$userobj = $dms->getUser($resArr["su"]);
-			}
-		}
-		$dms->setUser($userobj);
-	}
+        /* 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)
+                $userobj = $dms->getUser($settings->_guestID);
+            else
+                exit;
+        }
+        if($userobj->isAdmin()) {
+            if($resArr["su"]) {
+                $userobj = $dms->getUser($resArr["su"]);
+            }
+        }
+        $dms->setUser($userobj);
+    }
 }
 
 
@@ -61,702 +61,702 @@ require "vendor/autoload.php";
 #\Slim\Slim::registerAutoloader();
 
 function doLogin() { /* {{{ */
-	global $app, $dms, $userobj, $session, $settings;
+    global $app, $dms, $userobj, $session, $settings;
 
-	$username = $app->request()->post('user');
-	$password = $app->request()->post('pass');
+    $username = $app->request()->post('user');
+    $password = $app->request()->post('pass');
 
-	$userobj = $dms->getUserByLogin($username);
-	if(!$userobj || md5($password) != $userobj->getPwd()) {
-		if(USE_PHP_SESSION) {
-			unset($_SESSION['userid']);
-		} else {
-			setcookie("mydms_session", $session->getId(), time()-3600, $settings->_httpRoot);
-		}
-		$app->response()->header('Content-Type', 'application/json');
-		echo json_encode(array('success'=>false, 'message'=>'Login failed', 'data'=>''));
-	} else {
-		if(USE_PHP_SESSION) {
-			$_SESSION['userid'] = $userobj->getId();
-		} else {
-			if(!$id = $session->create(array('userid'=>$userobj->getId(), 'theme'=>$userobj->getTheme(), 'lang'=>$userobj->getLanguage()))) {
-				exit;
-			}
+    $userobj = $dms->getUserByLogin($username);
+    if(!$userobj || md5($password) != $userobj->getPwd()) {
+        if(USE_PHP_SESSION) {
+            unset($_SESSION['userid']);
+        } else {
+            setcookie("mydms_session", $session->getId(), time()-3600, $settings->_httpRoot);
+        }
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'Login failed', 'data'=>''));
+    } else {
+        if(USE_PHP_SESSION) {
+            $_SESSION['userid'] = $userobj->getId();
+        } else {
+            if(!$id = $session->create(array('userid'=>$userobj->getId(), 'theme'=>$userobj->getTheme(), 'lang'=>$userobj->getLanguage()))) {
+                exit;
+            }
 
-			// Set the session cookie.
-			if($settings->_cookieLifetime)
-				$lifetime = time() + intval($settings->_cookieLifetime);
-			else
-				$lifetime = 0;
-			setcookie("mydms_session", $id, $lifetime, $settings->_httpRoot);
-			$dms->setUser($userobj);
-		}
-		$app->response()->header('Content-Type', 'application/json');
-		echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$userobj->getId()));
-	}
+            // Set the session cookie.
+            if($settings->_cookieLifetime)
+                $lifetime = time() + intval($settings->_cookieLifetime);
+            else
+                $lifetime = 0;
+            setcookie("mydms_session", $id, $lifetime, $settings->_httpRoot);
+            $dms->setUser($userobj);
+        }
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$userobj->getId()));
+    }
 } /* }}} */
 
 function doLogout() { /* {{{ */
-	global $app, $dms, $userobj, $session, $settings;
+    global $app, $dms, $userobj, $session, $settings;
 
-	if(USE_PHP_SESSION) {
-		unset($_SESSION['userid']);
-	} else {
-		setcookie("mydms_session", $session->getId(), time()-3600, $settings->_httpRoot);
-	}
-	$userobj = null;
-	$app->response()->header('Content-Type', 'application/json');
-	echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
+    if(USE_PHP_SESSION) {
+        unset($_SESSION['userid']);
+    } else {
+        setcookie("mydms_session", $session->getId(), time()-3600, $settings->_httpRoot);
+    }
+    $userobj = null;
+    $app->response()->header('Content-Type', 'application/json');
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
 } /* }}} */
 
 function setFullName() { /* {{{ */
-	global $app, $dms, $userobj;
+    global $app, $dms, $userobj;
 
-	if(!$userobj) {
-		$app->response()->header('Content-Type', 'application/json');
-		echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
-	}
-	$userobj->setFullName($app->request()->put('fullname'));
-	echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$userobj->getFullName()));
+    if(!$userobj) {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
+    }
+    $userobj->setFullName($app->request()->put('fullname'));
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$userobj->getFullName()));
 } /* }}} */
 
 function setEmail($id) { /* {{{ */
-	global $app, $dms, $userobj;
+    global $app, $dms, $userobj;
 
-	if(!$userobj) {
-		$app->response()->header('Content-Type', 'application/json');
-		echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
-	}
-	$userobj->setEmail($app->request()->put('fullname'));
-	echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$userid));
+    if(!$userobj) {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
+    }
+    $userobj->setEmail($app->request()->put('fullname'));
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$userid));
 } /* }}} */
 
 function getLockedDocuments() { /* {{{ */
-	global $app, $dms, $userobj;
+    global $app, $dms, $userobj;
 
-	if(false !== ($documents = $dms->getDocumentsLockedByUser($userobj))) {
-		$documents = SeedDMS_Core_DMS::filterAccess($documents, $userobj, M_READ);
-		foreach($documents as $document) {
-			$lc = $document->getLatestContent();
-			$recs[] = array(
-				'type'=>'document',
-				'id'=>$document->getId(),
-				'date'=>$document->getDate(),
-				'name'=>$document->getName(),
-				'mimetype'=>$lc->getMimeType(),
-				'version'=>$lc->getVersion(),
-				'size'=>$lc->getFileSize(),
-				'comment'=>$document->getComment(),
-				'keywords'=>$document->getKeywords(),
-			);
-		}
-		$app->response()->header('Content-Type', 'application/json');
-		echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
-	} else {
-		$app->response()->header('Content-Type', 'application/json');
-		echo json_encode(array('success'=>false, 'message'=>'', 'data'=>''));
-	}
+    if(false !== ($documents = $dms->getDocumentsLockedByUser($userobj))) {
+        $documents = SeedDMS_Core_DMS::filterAccess($documents, $userobj, M_READ);
+        foreach($documents as $document) {
+            $lc = $document->getLatestContent();
+            $recs[] = array(
+                'type'=>'document',
+                'id'=>$document->getId(),
+                'date'=>$document->getDate(),
+                'name'=>$document->getName(),
+                'mimetype'=>$lc->getMimeType(),
+                'version'=>$lc->getVersion(),
+                'size'=>$lc->getFileSize(),
+                'comment'=>$document->getComment(),
+                'keywords'=>$document->getKeywords(),
+            );
+        }
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
+    } else {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'', 'data'=>''));
+    }
 } /* }}} */
 
 function getFolder($id) { /* {{{ */
-	global $app, $dms, $userobj;
-	$forcebyname = $app->request()->get('forcebyname');
-	if(is_numeric($id) && empty($forcebyname))
-		$folder = $dms->getFolder($id);
-	else {
-		$parentid = $app->request()->get('parentid');
-		$folder = $dms->getFolderByName($id, $parentid);
-	}
-	if($folder) {
-		if($folder->getAccessMode($userobj) >= M_READ) {
-			$app->response()->header('Content-Type', 'application/json');
-			$data = array(
-				'id'=>$folder->getID(),
-				'name'=>$folder->getName()
-			);
-			echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
-		} else {
-			$app->response()->status(404);
-		}
-	} else {
-		$app->response()->status(404);
-	}
+    global $app, $dms, $userobj;
+    $forcebyname = $app->request()->get('forcebyname');
+    if(is_numeric($id) && empty($forcebyname))
+        $folder = $dms->getFolder($id);
+    else {
+        $parentid = $app->request()->get('parentid');
+        $folder = $dms->getFolderByName($id, $parentid);
+    }
+    if($folder) {
+        if($folder->getAccessMode($userobj) >= M_READ) {
+            $app->response()->header('Content-Type', 'application/json');
+            $data = array(
+                'id'=>$folder->getID(),
+                'name'=>$folder->getName()
+            );
+            echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+        } else {
+            $app->response()->status(404);
+        }
+    } else {
+        $app->response()->status(404);
+    }
 } /* }}} */
 
 function getFolderParent($id) { /* {{{ */
-	global $app, $dms, $userobj;
-	if($id == 0) {
-		echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
-		return;
-	}
-	$root = $dms->getRootFolder();
-	if($root->getId() == $id) {
-		echo json_encode(array('success'=>true, 'message'=>'id is root folder', 'data'=>''));
-		return;
-	}
-	$folder = $dms->getFolder($id);
-	$parent = $folder->getParent();
-	if($parent) {
-		$rec = array('type'=>'folder', 'id'=>$parent->getId(), 'name'=>$parent->getName());
-		echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$rec));
-	} else {
-		echo json_encode(array('success'=>false, 'message'=>'', 'data'=>''));
-	}
+    global $app, $dms, $userobj;
+    if($id == 0) {
+        echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
+        return;
+    }
+    $root = $dms->getRootFolder();
+    if($root->getId() == $id) {
+        echo json_encode(array('success'=>true, 'message'=>'id is root folder', 'data'=>''));
+        return;
+    }
+    $folder = $dms->getFolder($id);
+    $parent = $folder->getParent();
+    if($parent) {
+        $rec = array('type'=>'folder', 'id'=>$parent->getId(), 'name'=>$parent->getName());
+        echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$rec));
+    } else {
+        echo json_encode(array('success'=>false, 'message'=>'', 'data'=>''));
+    }
 } /* }}} */
 
 function getFolderPath($id) { /* {{{ */
-	global $app, $dms, $userobj;
-	if($id == 0) {
-		echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
-		return;
-	}
-	$folder = $dms->getFolder($id);
+    global $app, $dms, $userobj;
+    if($id == 0) {
+        echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
+        return;
+    }
+    $folder = $dms->getFolder($id);
 
-	$path = $folder->getPath();
-	$data = array();
-	foreach($path as $element) {
-		$data[] = array('id'=>$element->getId(), 'name'=>htmlspecialchars($element->getName()));
-	}
-	echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+    $path = $folder->getPath();
+    $data = array();
+    foreach($path as $element) {
+        $data[] = array('id'=>$element->getId(), 'name'=>htmlspecialchars($element->getName()));
+    }
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
 } /* }}} */
 
 function getFolderAttributes($id) { /* {{{ */
-	global $app, $dms, $userobj;
-	$folder = $dms->getFolder($id);
+    global $app, $dms, $userobj;
+    $folder = $dms->getFolder($id);
 
-	if($folder) {
-		if ($folder->getAccessMode($userobj) >= M_READ) {
-			$recs = array();
-			$attributes = $folder->getAttributes();
-			foreach($attributes as $attribute) {
-				$recs[] = array(
-					'id'=>$attribute->getId(),
-					'value'=>$attribute->getValue(),
-					'name'=>$attribute->getAttributeDefinition()->getName(),
-				);
-			}
-			$app->response()->header('Content-Type', 'application/json');
-			echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
-		} else {
-			$app->response()->status(404);
-		}
-	}
+    if($folder) {
+        if ($folder->getAccessMode($userobj) >= M_READ) {
+            $recs = array();
+            $attributes = $folder->getAttributes();
+            foreach($attributes as $attribute) {
+                $recs[] = array(
+                    'id'=>$attribute->getId(),
+                    'value'=>$attribute->getValue(),
+                    'name'=>$attribute->getAttributeDefinition()->getName(),
+                );
+            }
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
+        } else {
+            $app->response()->status(404);
+        }
+    }
 } /* }}} */
 
 function getFolderChildren($id) { /* {{{ */
-	global $app, $dms, $userobj;
-	if($id == 0) {
-		$folder = $dms->getRootFolder();
-		$recs = array(array('type'=>'folder', 'id'=>$folder->getId(), 'name'=>$folder->getName()));
-		$app->response()->header('Content-Type', 'application/json');
-		echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
-	} else {
-		$folder = $dms->getFolder($id);
-		if($folder) {
-			if($folder->getAccessMode($userobj) >= M_READ) {
-				$recs = array();
-				$subfolders = $folder->getSubFolders();
-				$subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $userobj, M_READ);
-				foreach($subfolders as $subfolder) {
-					$recs[] = array(
-						'type'=>'folder',
-						'id'=>$subfolder->getId(),
-						'name'=>htmlspecialchars($subfolder->getName()),
-						'comment'=>$subfolder->getComment(),
-						'date'=>$subfolder->getDate(),
-					);
-				}
-				$documents = $folder->getDocuments();
-				$documents = SeedDMS_Core_DMS::filterAccess($documents, $userobj, M_READ);
-				foreach($documents as $document) {
-					$lc = $document->getLatestContent();
-					if($lc) {
-						$recs[] = array(
-							'type'=>'document',
-							'id'=>$document->getId(),
-							'date'=>$document->getDate(),
-							'name'=>htmlspecialchars($document->getName()),
-							'mimetype'=>$lc->getMimeType(),
-							'version'=>$lc->getVersion(),
-							'size'=>$lc->getFileSize(),
-							'comment'=>$document->getComment(),
-							'keywords'=>$document->getKeywords(),
-						);
-					}
-				}
-				$app->response()->header('Content-Type', 'application/json');
-				echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
-			} else {
-				$app->response()->header('Content-Type', 'application/json');
-				echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
-			}
-		} else {
-			$app->response()->status(404);
-		}
-	}
+    global $app, $dms, $userobj;
+    if($id == 0) {
+        $folder = $dms->getRootFolder();
+        $recs = array(array('type'=>'folder', 'id'=>$folder->getId(), 'name'=>$folder->getName()));
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
+    } else {
+        $folder = $dms->getFolder($id);
+        if($folder) {
+            if($folder->getAccessMode($userobj) >= M_READ) {
+                $recs = array();
+                $subfolders = $folder->getSubFolders();
+                $subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $userobj, M_READ);
+                foreach($subfolders as $subfolder) {
+                    $recs[] = array(
+                        'type'=>'folder',
+                        'id'=>$subfolder->getId(),
+                        'name'=>htmlspecialchars($subfolder->getName()),
+                        'comment'=>$subfolder->getComment(),
+                        'date'=>$subfolder->getDate(),
+                    );
+                }
+                $documents = $folder->getDocuments();
+                $documents = SeedDMS_Core_DMS::filterAccess($documents, $userobj, M_READ);
+                foreach($documents as $document) {
+                    $lc = $document->getLatestContent();
+                    if($lc) {
+                        $recs[] = array(
+                            'type'=>'document',
+                            'id'=>$document->getId(),
+                            'date'=>$document->getDate(),
+                            'name'=>htmlspecialchars($document->getName()),
+                            'mimetype'=>$lc->getMimeType(),
+                            'version'=>$lc->getVersion(),
+                            'size'=>$lc->getFileSize(),
+                            'comment'=>$document->getComment(),
+                            'keywords'=>$document->getKeywords(),
+                        );
+                    }
+                }
+                $app->response()->header('Content-Type', 'application/json');
+                echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
+            } else {
+                $app->response()->header('Content-Type', 'application/json');
+                echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
+            }
+        } else {
+            $app->response()->status(404);
+        }
+    }
 } /* }}} */
 
 function createFolder($id) { /* {{{ */
-	global $app, $dms, $userobj;
+    global $app, $dms, $userobj;
 
-	if(!$userobj) {
-		$app->response()->header('Content-Type', 'application/json');
-		echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
-	}
+    if(!$userobj) {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
+    }
 
-	if($id == 0) {
-		echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
-		return;
-	}
-	$parent = $dms->getFolder($id);
-	if($parent) {
-		if($name = $app->request()->post('name')) {
-			$comment = $app->request()->post('comment');
-			$attributes = $app->request()->post('attributes');
-			$newattrs = array();
-			if($attributes) {
-				foreach($attributes as $attrname=>$attrvalue) {
-					$attrdef = $dms->getAttributeDefinitionByName($attrname);
-					if($attrdef) {
-						$newattrs[$attrdef->getID()] = $attrvalue;
-					}
-				}
-			}
-			if($folder = $parent->addSubFolder($name, $comment, $userobj, 0, $newattrs)) {
+    if($id == 0) {
+        echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
+        return;
+    }
+    $parent = $dms->getFolder($id);
+    if($parent) {
+        if($name = $app->request()->post('name')) {
+            $comment = $app->request()->post('comment');
+            $attributes = $app->request()->post('attributes');
+            $newattrs = array();
+            if($attributes) {
+                foreach($attributes as $attrname=>$attrvalue) {
+                    $attrdef = $dms->getAttributeDefinitionByName($attrname);
+                    if($attrdef) {
+                        $newattrs[$attrdef->getID()] = $attrvalue;
+                    }
+                }
+            }
+            if($folder = $parent->addSubFolder($name, $comment, $userobj, 0, $newattrs)) {
 
-				$rec = array('id'=>$folder->getId(), 'name'=>$folder->getName(), 'comment'=>$folder->getComment());
-				echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$rec));
-			} else {
-				echo json_encode(array('success'=>false, 'message'=>'', 'data'=>''));
-			}
-		} else {
-			echo json_encode(array('success'=>false, 'message'=>'', 'data'=>''));
-		}
-	} else {
-		echo json_encode(array('success'=>false, 'message'=>'', 'data'=>''));
-	}
+                $rec = array('id'=>$folder->getId(), 'name'=>$folder->getName(), 'comment'=>$folder->getComment());
+                echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$rec));
+            } else {
+                echo json_encode(array('success'=>false, 'message'=>'', 'data'=>''));
+            }
+        } else {
+            echo json_encode(array('success'=>false, 'message'=>'', 'data'=>''));
+        }
+    } else {
+        echo json_encode(array('success'=>false, 'message'=>'', 'data'=>''));
+    }
 } /* }}} */
 
 function moveFolder($id) { /* {{{ */
-	global $app, $dms, $userobj;
+    global $app, $dms, $userobj;
 
-	if(!$userobj) {
-		$app->response()->header('Content-Type', 'application/json');
-		echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
-	}
+    if(!$userobj) {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
+    }
 
-	$mfolder = $dms->getFolder($id);
-	if($mfolder) {
-		if ($mfolder->getAccessMode($userobj) >= M_READ) {
-			$folderid = $app->request()->post('dest');
-			if($folder = $dms->getFolder($folderid)) {
-				if($folder->getAccessMode($userobj) >= M_READWRITE) {
-					if($mfolder->setParent($folder)) {
-						$app->response()->header('Content-Type', 'application/json');
-						echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
-					} else {
-						$app->response()->header('Content-Type', 'application/json');
-						echo json_encode(array('success'=>false, 'message'=>'Error moving folder', 'data'=>''));
-					}
-				} else {
-					$app->response()->header('Content-Type', 'application/json');
-					echo json_encode(array('success'=>false, 'message'=>'No access on destination folder', 'data'=>''));
-				}
-			} else {
-				$app->response()->header('Content-Type', 'application/json');
-				echo json_encode(array('success'=>false, 'message'=>'No destination folder', 'data'=>''));
-			}
-		} else {
-			$app->response()->header('Content-Type', 'application/json');
-			echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
-		}
-	} else {
-		$app->response()->header('Content-Type', 'application/json');
-		echo json_encode(array('success'=>false, 'message'=>'No folder', 'data'=>''));
-	}
+    $mfolder = $dms->getFolder($id);
+    if($mfolder) {
+        if ($mfolder->getAccessMode($userobj) >= M_READ) {
+            $folderid = $app->request()->post('dest');
+            if($folder = $dms->getFolder($folderid)) {
+                if($folder->getAccessMode($userobj) >= M_READWRITE) {
+                    if($mfolder->setParent($folder)) {
+                        $app->response()->header('Content-Type', 'application/json');
+                        echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
+                    } else {
+                        $app->response()->header('Content-Type', 'application/json');
+                        echo json_encode(array('success'=>false, 'message'=>'Error moving folder', 'data'=>''));
+                    }
+                } else {
+                    $app->response()->header('Content-Type', 'application/json');
+                    echo json_encode(array('success'=>false, 'message'=>'No access on destination folder', 'data'=>''));
+                }
+            } else {
+                $app->response()->header('Content-Type', 'application/json');
+                echo json_encode(array('success'=>false, 'message'=>'No destination folder', 'data'=>''));
+            }
+        } else {
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
+        }
+    } else {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'No folder', 'data'=>''));
+    }
 } /* }}} */
 
 function deleteFolder($id) { /* {{{ */
-	global $app, $dms, $userobj;
+    global $app, $dms, $userobj;
 
-	if(!$userobj) {
-		$app->response()->header('Content-Type', 'application/json');
-		echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
-	}
+    if(!$userobj) {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
+    }
 
-	if($id == 0) {
-		echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
-		return;
-	}
-	$mfolder = $dms->getFolder($id);
-	if($mfolder) {
-		if ($mfolder->getAccessMode($userobj) >= M_READWRITE) {
-			if($mfolder->remove()) {
-				$app->response()->header('Content-Type', 'application/json');
-				echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
-			} else {
-				$app->response()->header('Content-Type', 'application/json');
-				echo json_encode(array('success'=>false, 'message'=>'Error deleting folder', 'data'=>''));
-			}
-		} else {
-			$app->response()->header('Content-Type', 'application/json');
-			echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
-		}
-	} else {
-		$app->response()->header('Content-Type', 'application/json');
-		echo json_encode(array('success'=>false, 'message'=>'No folder', 'data'=>''));
-	}
+    if($id == 0) {
+        echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
+        return;
+    }
+    $mfolder = $dms->getFolder($id);
+    if($mfolder) {
+        if ($mfolder->getAccessMode($userobj) >= M_READWRITE) {
+            if($mfolder->remove()) {
+                $app->response()->header('Content-Type', 'application/json');
+                echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
+            } else {
+                $app->response()->header('Content-Type', 'application/json');
+                echo json_encode(array('success'=>false, 'message'=>'Error deleting folder', 'data'=>''));
+            }
+        } else {
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
+        }
+    } else {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'No folder', 'data'=>''));
+    }
 } /* }}} */
 
 function uploadDocument($id) { /* {{{ */
-	global $app, $dms, $userobj;
+    global $app, $dms, $userobj;
 
-	if(!$userobj) {
-		$app->response()->header('Content-Type', 'application/json');
-		echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
-	}
+    if(!$userobj) {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
+    }
 
-	if($id == 0) {
-		echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
-		return;
-	}
-	$mfolder = $dms->getFolder($id);
-	if($mfolder) {
-		if ($mfolder->getAccessMode($userobj) >= M_READWRITE) {
-			$docname = $app->request()->get('name');
-			$origfilename = $app->request()->get('origfilename');
-			$content = $app->getInstance()->request()->getBody();
-			$temp = tempnam('/tmp', 'lajflk');
-			$handle = fopen($temp, "w");
-			fwrite($handle, $content);
-			fclose($handle);
-			$finfo = finfo_open(FILEINFO_MIME_TYPE);
-			$userfiletype = finfo_file($finfo, $temp);
-			$fileType = ".".pathinfo($origfilename, PATHINFO_EXTENSION);
-			finfo_close($finfo);
-			$res = $mfolder->addDocument($docname, '', 0, $userobj, '', array(), $temp, $origfilename ? $origfilename : basename($temp), $fileType, $userfiletype, 0);
-			unlink($temp);
-			if($res) {
-				$doc = $res[0];
-				$rec = array('id'=>$doc->getId(), 'name'=>$doc->getName());
-				$app->response()->header('Content-Type', 'application/json');
-				echo json_encode(array('success'=>true, 'message'=>'Upload succeded', 'data'=>$rec));
-			} else {
-				$app->response()->header('Content-Type', 'application/json');
-				echo json_encode(array('success'=>false, 'message'=>'Upload failed', 'data'=>''));
-			}
-		} else {
-			$app->response()->header('Content-Type', 'application/json');
-			echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
-		}
-	} else {
-		$app->response()->header('Content-Type', 'application/json');
-		echo json_encode(array('success'=>false, 'message'=>'No folder', 'data'=>''));
-	}
+    if($id == 0) {
+        echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
+        return;
+    }
+    $mfolder = $dms->getFolder($id);
+    if($mfolder) {
+        if ($mfolder->getAccessMode($userobj) >= M_READWRITE) {
+            $docname = $app->request()->get('name');
+            $origfilename = $app->request()->get('origfilename');
+            $content = $app->getInstance()->request()->getBody();
+            $temp = tempnam('/tmp', 'lajflk');
+            $handle = fopen($temp, "w");
+            fwrite($handle, $content);
+            fclose($handle);
+            $finfo = finfo_open(FILEINFO_MIME_TYPE);
+            $userfiletype = finfo_file($finfo, $temp);
+            $fileType = ".".pathinfo($origfilename, PATHINFO_EXTENSION);
+            finfo_close($finfo);
+            $res = $mfolder->addDocument($docname, '', 0, $userobj, '', array(), $temp, $origfilename ? $origfilename : basename($temp), $fileType, $userfiletype, 0);
+            unlink($temp);
+            if($res) {
+                $doc = $res[0];
+                $rec = array('id'=>$doc->getId(), 'name'=>$doc->getName());
+                $app->response()->header('Content-Type', 'application/json');
+                echo json_encode(array('success'=>true, 'message'=>'Upload succeded', 'data'=>$rec));
+            } else {
+                $app->response()->header('Content-Type', 'application/json');
+                echo json_encode(array('success'=>false, 'message'=>'Upload failed', 'data'=>''));
+            }
+        } else {
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
+        }
+    } else {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'No folder', 'data'=>''));
+    }
 } /* }}} */
 
 function getDocument($id) { /* {{{ */
-	global $app, $dms, $userobj;
-	$document = $dms->getDocument($id);
-	if($document) {
-		if ($document->getAccessMode($userobj) >= M_READ) {
-			$lc = $document->getLatestContent();
-			$app->response()->header('Content-Type', 'application/json');
-			$data = array(
-				'id'=>$id,
-				'name'=>htmlspecialchars($document->getName()),
-				'comment'=>htmlspecialchars($document->getComment()),
-				'date'=>$document->getDate(),
-				'mimetype'=>$lc->getMimeType(),
-				'version'=>$lc->getVersion(),
-				'orig_filename'=>$lc->getOriginalFileName(),
-				'size'=>$lc->getFileSize(),
-				'keywords'=>$document->getKeywords(),
-			);
-			$app->response()->header('Content-Type', 'application/json');
-			echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
-		} else {
-			$app->response()->header('Content-Type', 'application/json');
-			echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
-		}
-	} else {
-		$app->response()->header('Content-Type', 'application/json');
-		echo json_encode(array('success'=>false, 'message'=>'No document', 'data'=>''));
-	}
+    global $app, $dms, $userobj;
+    $document = $dms->getDocument($id);
+    if($document) {
+        if ($document->getAccessMode($userobj) >= M_READ) {
+            $lc = $document->getLatestContent();
+            $app->response()->header('Content-Type', 'application/json');
+            $data = array(
+                'id'=>$id,
+                'name'=>htmlspecialchars($document->getName()),
+                'comment'=>htmlspecialchars($document->getComment()),
+                'date'=>$document->getDate(),
+                'mimetype'=>$lc->getMimeType(),
+                'version'=>$lc->getVersion(),
+                'orig_filename'=>$lc->getOriginalFileName(),
+                'size'=>$lc->getFileSize(),
+                'keywords'=>$document->getKeywords(),
+            );
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+        } else {
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
+        }
+    } else {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'No document', 'data'=>''));
+    }
 } /* }}} */
 
 function deleteDocument($id) { /* {{{ */
-	global $app, $dms, $userobj;
-	$document = $dms->getDocument($id);
-	if($document) {
-		if ($document->getAccessMode($userobj) >= M_READWRITE) {
-			if($document->remove()) {
-				$app->response()->header('Content-Type', 'application/json');
-				echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
-			} else {
-				$app->response()->header('Content-Type', 'application/json');
-				echo json_encode(array('success'=>false, 'message'=>'Error removing document', 'data'=>''));
-			}
-		} else {
-			$app->response()->header('Content-Type', 'application/json');
-			echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
-		}
-	} else {
-		$app->response()->header('Content-Type', 'application/json');
-		echo json_encode(array('success'=>false, 'message'=>'No document', 'data'=>''));
-	}
+    global $app, $dms, $userobj;
+    $document = $dms->getDocument($id);
+    if($document) {
+        if ($document->getAccessMode($userobj) >= M_READWRITE) {
+            if($document->remove()) {
+                $app->response()->header('Content-Type', 'application/json');
+                echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
+            } else {
+                $app->response()->header('Content-Type', 'application/json');
+                echo json_encode(array('success'=>false, 'message'=>'Error removing document', 'data'=>''));
+            }
+        } else {
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
+        }
+    } else {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'No document', 'data'=>''));
+    }
 } /* }}} */
 
 function moveDocument($id) { /* {{{ */
-	global $app, $dms, $userobj;
-	$document = $dms->getDocument($id);
-	if($document) {
-		if ($document->getAccessMode($userobj) >= M_READ) {
-			$folderid = $app->request()->post('dest');
-			if($folder = $dms->getFolder($folderid)) {
-				if($folder->getAccessMode($userobj) >= M_READWRITE) {
-					if($document->setFolder($folder)) {
-						$app->response()->header('Content-Type', 'application/json');
-						echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
-					} else {
-						$app->response()->header('Content-Type', 'application/json');
-						echo json_encode(array('success'=>false, 'message'=>'Error moving document', 'data'=>''));
-					}
-				} else {
-					$app->response()->header('Content-Type', 'application/json');
-					echo json_encode(array('success'=>false, 'message'=>'No access on destination folder', 'data'=>''));
-				}
-			} else {
-				$app->response()->header('Content-Type', 'application/json');
-				echo json_encode(array('success'=>false, 'message'=>'No destination folder', 'data'=>''));
-			}
-		} else {
-			$app->response()->header('Content-Type', 'application/json');
-			echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
-		}
-	} else {
-		$app->response()->header('Content-Type', 'application/json');
-		echo json_encode(array('success'=>false, 'message'=>'No document', 'data'=>''));
-	}
+    global $app, $dms, $userobj;
+    $document = $dms->getDocument($id);
+    if($document) {
+        if ($document->getAccessMode($userobj) >= M_READ) {
+            $folderid = $app->request()->post('dest');
+            if($folder = $dms->getFolder($folderid)) {
+                if($folder->getAccessMode($userobj) >= M_READWRITE) {
+                    if($document->setFolder($folder)) {
+                        $app->response()->header('Content-Type', 'application/json');
+                        echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
+                    } else {
+                        $app->response()->header('Content-Type', 'application/json');
+                        echo json_encode(array('success'=>false, 'message'=>'Error moving document', 'data'=>''));
+                    }
+                } else {
+                    $app->response()->header('Content-Type', 'application/json');
+                    echo json_encode(array('success'=>false, 'message'=>'No access on destination folder', 'data'=>''));
+                }
+            } else {
+                $app->response()->header('Content-Type', 'application/json');
+                echo json_encode(array('success'=>false, 'message'=>'No destination folder', 'data'=>''));
+            }
+        } else {
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
+        }
+    } else {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'No document', 'data'=>''));
+    }
 } /* }}} */
 
 function getDocumentContent($id) { /* {{{ */
-	global $app, $dms, $userobj;
-	$document = $dms->getDocument($id);
+    global $app, $dms, $userobj;
+    $document = $dms->getDocument($id);
 
-	if($document) {
-		if ($document->getAccessMode($userobj) >= M_READ) {
-			$lc = $document->getLatestContent();
-			$app->response()->header('Content-Type', $lc->getMimeType());
-			$app->response()->header("Content-Disposition: filename=\"" . $document->getName().$lc->getFileType() . "\"");
-			$app->response()->header("Content-Length", filesize($dms->contentDir . $lc->getPath()));
-			$app->response()->header("Expires", "0");
-			$app->response()->header("Cache-Control", "no-cache, must-revalidate");
-			$app->response()->header("Pragma", "no-cache");
+    if($document) {
+        if ($document->getAccessMode($userobj) >= M_READ) {
+            $lc = $document->getLatestContent();
+            $app->response()->header('Content-Type', $lc->getMimeType());
+            $app->response()->header("Content-Disposition: filename=\"" . $document->getName().$lc->getFileType() . "\"");
+            $app->response()->header("Content-Length", filesize($dms->contentDir . $lc->getPath()));
+            $app->response()->header("Expires", "0");
+            $app->response()->header("Cache-Control", "no-cache, must-revalidate");
+            $app->response()->header("Pragma", "no-cache");
 
-			readfile($dms->contentDir . $lc->getPath());
-		} else {
-			$app->response()->status(404);
-		}
-	}
+            readfile($dms->contentDir . $lc->getPath());
+        } else {
+            $app->response()->status(404);
+        }
+    }
 
 } /* }}} */
 
 function getDocumentVersions($id) { /* {{{ */
-	global $app, $dms, $userobj;
-	$document = $dms->getDocument($id);
+    global $app, $dms, $userobj;
+    $document = $dms->getDocument($id);
 
-	if($document) {
-		if ($document->getAccessMode($userobj) >= M_READ) {
-			$recs = array();
-			$lcs = $document->getContent();
-			foreach($lcs as $lc) {
-				$recs[] = array(
-					'version'=>$lc->getVersion(),
-					'date'=>$lc->getDate(),
-					'mimetype'=>$lc->getMimeType(),
-					'size'=>$lc->getFileSize(),
-					'comment'=>htmlspecialchars($lc->getComment()),
-				);
-			}
-			$app->response()->header('Content-Type', 'application/json');
-			echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
-		} else {
-			$app->response()->header('Content-Type', 'application/json');
-			echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
-		}
-	} else {
-		$app->response()->header('Content-Type', 'application/json');
-		echo json_encode(array('success'=>false, 'message'=>'No such document', 'data'=>''));
-	}
+    if($document) {
+        if ($document->getAccessMode($userobj) >= M_READ) {
+            $recs = array();
+            $lcs = $document->getContent();
+            foreach($lcs as $lc) {
+                $recs[] = array(
+                    'version'=>$lc->getVersion(),
+                    'date'=>$lc->getDate(),
+                    'mimetype'=>$lc->getMimeType(),
+                    'size'=>$lc->getFileSize(),
+                    'comment'=>htmlspecialchars($lc->getComment()),
+                );
+            }
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
+        } else {
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
+        }
+    } else {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'No such document', 'data'=>''));
+    }
 } /* }}} */
 
 function getDocumentVersion($id, $version) { /* {{{ */
-	global $app, $dms, $userobj;
-	$document = $dms->getDocument($id);
+    global $app, $dms, $userobj;
+    $document = $dms->getDocument($id);
 
-	if($document) {
-		if ($document->getAccessMode($userobj) >= M_READ) {
-			$lc = $document->getContentByVersion($version);
-			$app->response()->header('Content-Type', $lc->getMimeType());
-			$app->response()->header("Content-Disposition", "filename=\"" . $document->getName().$lc->getFileType() . "\"");
-			$app->response()->header("Content-Length", filesize($dms->contentDir . $lc->getPath()));
-			$app->response()->header("Expires", "0");
-			$app->response()->header("Cache-Control", "no-cache, must-revalidate");
-			$app->response()->header("Pragma", "no-cache");
+    if($document) {
+        if ($document->getAccessMode($userobj) >= M_READ) {
+            $lc = $document->getContentByVersion($version);
+            $app->response()->header('Content-Type', $lc->getMimeType());
+            $app->response()->header("Content-Disposition", "filename=\"" . $document->getName().$lc->getFileType() . "\"");
+            $app->response()->header("Content-Length", filesize($dms->contentDir . $lc->getPath()));
+            $app->response()->header("Expires", "0");
+            $app->response()->header("Cache-Control", "no-cache, must-revalidate");
+            $app->response()->header("Pragma", "no-cache");
 
-			readfile($dms->contentDir . $lc->getPath());
-		} else {
-			$app->response()->status(404);
-		}
-	}
+            readfile($dms->contentDir . $lc->getPath());
+        } else {
+            $app->response()->status(404);
+        }
+    }
 } /* }}} */
 
 function getDocumentFiles($id) { /* {{{ */
-	global $app, $dms, $userobj;
-	$document = $dms->getDocument($id);
+    global $app, $dms, $userobj;
+    $document = $dms->getDocument($id);
 
-	if($document) {
-		if ($document->getAccessMode($userobj) >= M_READ) {
-			$recs = array();
-			$files = $document->getDocumentFiles();
-			foreach($files as $file) {
-				$recs[] = array(
-					'id'=>$file->getId(),
-					'name'=>$file->getName(),
-					'date'=>$file->getDate(),
-					'mimetype'=>$file->getMimeType(),
-					'comment'=>$file->getComment(),
-				);
-			}
-			$app->response()->header('Content-Type', 'application/json');
-			echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
-		} else {
-			$app->response()->status(404);
-		}
-	}
+    if($document) {
+        if ($document->getAccessMode($userobj) >= M_READ) {
+            $recs = array();
+            $files = $document->getDocumentFiles();
+            foreach($files as $file) {
+                $recs[] = array(
+                    'id'=>$file->getId(),
+                    'name'=>$file->getName(),
+                    'date'=>$file->getDate(),
+                    'mimetype'=>$file->getMimeType(),
+                    'comment'=>$file->getComment(),
+                );
+            }
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
+        } else {
+            $app->response()->status(404);
+        }
+    }
 } /* }}} */
 
 function getDocumentFile($id, $fileid) { /* {{{ */
-	global $app, $dms, $userobj;
-	$document = $dms->getDocument($id);
+    global $app, $dms, $userobj;
+    $document = $dms->getDocument($id);
 
-	if($document) {
-		if ($document->getAccessMode($userobj) >= M_READ) {
-			$file = $document->getDocumentFile($fileid);
-			$app->response()->header('Content-Type', $file->getMimeType());
-			$app->response()->header("Content-Disposition", "filename=\"" . $document->getName().$file->getFileType() . "\"");
-			$app->response()->header("Content-Length", filesize($dms->contentDir . $file->getPath()));
-			$app->response()->header("Expires", "0");
-			$app->response()->header("Cache-Control", "no-cache, must-revalidate");
-			$app->response()->header("Pragma", "no-cache");
+    if($document) {
+        if ($document->getAccessMode($userobj) >= M_READ) {
+            $file = $document->getDocumentFile($fileid);
+            $app->response()->header('Content-Type', $file->getMimeType());
+            $app->response()->header("Content-Disposition", "filename=\"" . $document->getName().$file->getFileType() . "\"");
+            $app->response()->header("Content-Length", filesize($dms->contentDir . $file->getPath()));
+            $app->response()->header("Expires", "0");
+            $app->response()->header("Cache-Control", "no-cache, must-revalidate");
+            $app->response()->header("Pragma", "no-cache");
 
-			readfile($dms->contentDir . $file->getPath());
-		} else {
-			$app->response()->status(404);
-		}
-	}
+            readfile($dms->contentDir . $file->getPath());
+        } else {
+            $app->response()->status(404);
+        }
+    }
 } /* }}} */
 
 function getDocumentLinks($id) { /* {{{ */
-	global $app, $dms, $userobj;
-	$document = $dms->getDocument($id);
+    global $app, $dms, $userobj;
+    $document = $dms->getDocument($id);
 
-	if($document) {
-		if ($document->getAccessMode($userobj) >= M_READ) {
-			$recs = array();
-			$links = $document->getDocumentLinks();
-			foreach($links as $link) {
-				$recs[] = array(
-					'id'=>$link->getId(),
-					'target'=>$link->getTarget(),
-					'public'=>$link->isPublic(),
-				);
-			}
-			$app->response()->header('Content-Type', 'application/json');
-			echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
-		} else {
-			$app->response()->status(404);
-		}
-	}
+    if($document) {
+        if ($document->getAccessMode($userobj) >= M_READ) {
+            $recs = array();
+            $links = $document->getDocumentLinks();
+            foreach($links as $link) {
+                $recs[] = array(
+                    'id'=>$link->getId(),
+                    'target'=>$link->getTarget(),
+                    'public'=>$link->isPublic(),
+                );
+            }
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
+        } else {
+            $app->response()->status(404);
+        }
+    }
 } /* }}} */
 
 function getDocumentAttributes($id) { /* {{{ */
-	global $app, $dms, $userobj;
-	$document = $dms->getDocument($id);
+    global $app, $dms, $userobj;
+    $document = $dms->getDocument($id);
 
-	if($document) {
-		if ($document->getAccessMode($userobj) >= M_READ) {
-			$recs = array();
-			$attributes = $document->getAttributes();
-			foreach($attributes as $attribute) {
-				$recs[] = array(
-					'id'=>$attribute->getId(),
-					'value'=>$attribute->getValue(),
-					'name'=>$attribute->getAttributeDefinition()->getName(),
-				);
-			}
-			$app->response()->header('Content-Type', 'application/json');
-			echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
-		} else {
-			$app->response()->status(404);
-		}
-	}
+    if($document) {
+        if ($document->getAccessMode($userobj) >= M_READ) {
+            $recs = array();
+            $attributes = $document->getAttributes();
+            foreach($attributes as $attribute) {
+                $recs[] = array(
+                    'id'=>$attribute->getId(),
+                    'value'=>$attribute->getValue(),
+                    'name'=>$attribute->getAttributeDefinition()->getName(),
+                );
+            }
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
+        } else {
+            $app->response()->status(404);
+        }
+    }
 } /* }}} */
 
 function getDocumentPreview($id, $version=0, $width=0) { /* {{{ */
-	global $app, $dms, $userobj, $settings;
-	$document = $dms->getDocument($id);
+    global $app, $dms, $userobj, $settings;
+    $document = $dms->getDocument($id);
 
-	if($document) {
-		if ($document->getAccessMode($userobj) >= M_READ) {
-			if($version)
-				$object = $document->getContentByVersion($version);
-			else
-				$object = $document->getLatestContent();
-			if(!$object)
-				exit;
-			
-			if(!empty($width))
-				$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $width);
-			else
-				$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
-			if(!$previewer->hasPreview($object))
-				$previewer->createPreview($object);
-			$app->response()->header('Content-Type', 'image/png');
-			$app->response()->header("Content-Disposition", "filename=\"preview-" . $document->getID()."-".$object->getVersion()."-".$width.".png" . "\"");
-			$app->response()->header("Content-Length", $previewer->getFilesize($object));
-//			$app->response()->header("Expires", "0");
-//			$app->response()->header("Cache-Control", "no-cache, must-revalidate");
-//			$app->response()->header("Pragma", "no-cache");
+    if($document) {
+        if ($document->getAccessMode($userobj) >= M_READ) {
+            if($version)
+                $object = $document->getContentByVersion($version);
+            else
+                $object = $document->getLatestContent();
+            if(!$object)
+                exit;
+            
+            if(!empty($width))
+                $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $width);
+            else
+                $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
+            if(!$previewer->hasPreview($object))
+                $previewer->createPreview($object);
+            $app->response()->header('Content-Type', 'image/png');
+            $app->response()->header("Content-Disposition", "filename=\"preview-" . $document->getID()."-".$object->getVersion()."-".$width.".png" . "\"");
+            $app->response()->header("Content-Length", $previewer->getFilesize($object));
+//            $app->response()->header("Expires", "0");
+//            $app->response()->header("Cache-Control", "no-cache, must-revalidate");
+//            $app->response()->header("Pragma", "no-cache");
 
-			$previewer->getPreview($object);
-		} else {
-			$app->response()->status(404);
-		}
-	}
+            $previewer->getPreview($object);
+        } else {
+            $app->response()->status(404);
+        }
+    }
 } /* }}} */
 
 function getAccount() { /* {{{ */
-	global $app, $dms, $userobj;
-	if($userobj) {
-		$account = array();
-		$account['id'] = $userobj->getId();
-		$account['login'] = $userobj->getLogin();
-		$account['fullname'] = $userobj->getFullName();
-		$account['email'] = $userobj->getEmail();
-		$account['language'] = $userobj->getLanguage();
-		$account['theme'] = $userobj->getTheme();
-		$account['role'] = $userobj->getRole();
-		$account['comment'] = $userobj->getComment();
-		$account['isguest'] = $userobj->isGuest();
-		$account['isadmin'] = $userobj->isAdmin();
-		$app->response()->header('Content-Type', 'application/json');
-		echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$account));
-	} else {
-		$app->response()->header('Content-Type', 'application/json');
-		echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
-	}
+    global $app, $dms, $userobj;
+    if($userobj) {
+        $account = array();
+        $account['id'] = $userobj->getId();
+        $account['login'] = $userobj->getLogin();
+        $account['fullname'] = $userobj->getFullName();
+        $account['email'] = $userobj->getEmail();
+        $account['language'] = $userobj->getLanguage();
+        $account['theme'] = $userobj->getTheme();
+        $account['role'] = $userobj->getRole();
+        $account['comment'] = $userobj->getComment();
+        $account['isguest'] = $userobj->isGuest();
+        $account['isadmin'] = $userobj->isAdmin();
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$account));
+    } else {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
+    }
 } /* }}} */
 
 /**
@@ -766,104 +766,104 @@ function getAccount() { /* {{{ */
  * return a list of words only.
  */
 function doSearch() { /* {{{ */
-	global $app, $dms, $userobj;
+    global $app, $dms, $userobj;
 
-	$querystr = $app->request()->get('query');
-	$mode = $app->request()->get('mode');
-	if(!$limit = $app->request()->get('limit'))
-		$limit = 5;
-	$resArr = $dms->search($querystr);
-	$entries = array();
-	$count = 0;
-	if($resArr['folders']) {
-		foreach ($resArr['folders'] as $entry) {
-			if ($entry->getAccessMode($userobj) >= M_READ) {
-				$entries[] = $entry;
-				$count++;
-			}
-			if($count >= $limit)
-				break;
-		}
-	}
-	$count = 0;
-	if($resArr['docs']) {
-		foreach ($resArr['docs'] as $entry) {
-			$lc = $entry->getLatestContent();
-			if ($entry->getAccessMode($userobj) >= M_READ && $lc) {
-				$entries[] = $entry;
-				$count++;
-			}
-			if($count >= $limit)
-				break;
-		}
-	}
+    $querystr = $app->request()->get('query');
+    $mode = $app->request()->get('mode');
+    if(!$limit = $app->request()->get('limit'))
+        $limit = 5;
+    $resArr = $dms->search($querystr);
+    $entries = array();
+    $count = 0;
+    if($resArr['folders']) {
+        foreach ($resArr['folders'] as $entry) {
+            if ($entry->getAccessMode($userobj) >= M_READ) {
+                $entries[] = $entry;
+                $count++;
+            }
+            if($count >= $limit)
+                break;
+        }
+    }
+    $count = 0;
+    if($resArr['docs']) {
+        foreach ($resArr['docs'] as $entry) {
+            $lc = $entry->getLatestContent();
+            if ($entry->getAccessMode($userobj) >= M_READ && $lc) {
+                $entries[] = $entry;
+                $count++;
+            }
+            if($count >= $limit)
+                break;
+        }
+    }
 
-	switch($mode) {
-		case 'typeahead';
-			$recs = array();
-			foreach ($entries as $entry) {
-			/* Passing anything back but a string does not work, because
-			 * the process function of bootstrap.typeahead needs an array of
-			 * strings.
-			 *
-			 * As a quick solution to distingish folders from documents, the
-			 * name will be preceeded by a 'F' or 'D'
+    switch($mode) {
+        case 'typeahead';
+            $recs = array();
+            foreach ($entries as $entry) {
+            /* Passing anything back but a string does not work, because
+             * the process function of bootstrap.typeahead needs an array of
+             * strings.
+             *
+             * As a quick solution to distingish folders from documents, the
+             * name will be preceeded by a 'F' or 'D'
 
-				$tmp = array();
-				if(get_class($entry) == 'SeedDMS_Core_Document') {
-					$tmp['type'] = 'folder';
-				} else {
-					$tmp['type'] = 'document';
-				}
-				$tmp['id'] = $entry->getID();
-				$tmp['name'] = $entry->getName();
-				$tmp['comment'] = $entry->getComment();
-			 */
-				if(get_class($entry) == 'SeedDMS_Core_Document') {
-					$recs[] = 'D'.$entry->getName();
-				} else {
-					$recs[] = 'F'.$entry->getName();
-				}
-			}
-			if($recs)
-//				array_unshift($recs, array('type'=>'', 'id'=>0, 'name'=>$querystr, 'comment'=>''));
-				array_unshift($recs, ' '.$querystr);
-			$app->response()->header('Content-Type', 'application/json');
-			echo json_encode($recs);
-			//echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
-			break;
-		default:
-			$recs = array();
-			foreach ($entries as $entry) {
-				if(get_class($entry) == 'SeedDMS_Core_Document') {
-					$document = $entry;
-					$lc = $document->getLatestContent();
-					$recs[] = array(
-						'type'=>'document',
-						'id'=>$document->getId(),
-						'date'=>$document->getDate(),
-						'name'=>$document->getName(),
-						'mimetype'=>$lc->getMimeType(),
-						'version'=>$lc->getVersion(),
-						'size'=>$lc->getFileSize(),
-						'comment'=>$document->getComment(),
-						'keywords'=>$document->getKeywords(),
-					);
-				} elseif(get_class($entry) == 'SeedDMS_Core_Folder') {
-					$folder = $entry;
-					$recs[] = array(
-						'type'=>'folder',
-						'id'=>$folder->getId(),
-						'name'=>$folder->getName(),
-						'comment'=>$folder->getComment(),
-						'date'=>$folder->getDate(),
-					);
-				}
-			}
-			$app->response()->header('Content-Type', 'application/json');
-			echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
-			break;
-	}
+                $tmp = array();
+                if(get_class($entry) == 'SeedDMS_Core_Document') {
+                    $tmp['type'] = 'folder';
+                } else {
+                    $tmp['type'] = 'document';
+                }
+                $tmp['id'] = $entry->getID();
+                $tmp['name'] = $entry->getName();
+                $tmp['comment'] = $entry->getComment();
+             */
+                if(get_class($entry) == 'SeedDMS_Core_Document') {
+                    $recs[] = 'D'.$entry->getName();
+                } else {
+                    $recs[] = 'F'.$entry->getName();
+                }
+            }
+            if($recs)
+//                array_unshift($recs, array('type'=>'', 'id'=>0, 'name'=>$querystr, 'comment'=>''));
+                array_unshift($recs, ' '.$querystr);
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode($recs);
+            //echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
+            break;
+        default:
+            $recs = array();
+            foreach ($entries as $entry) {
+                if(get_class($entry) == 'SeedDMS_Core_Document') {
+                    $document = $entry;
+                    $lc = $document->getLatestContent();
+                    $recs[] = array(
+                        'type'=>'document',
+                        'id'=>$document->getId(),
+                        'date'=>$document->getDate(),
+                        'name'=>$document->getName(),
+                        'mimetype'=>$lc->getMimeType(),
+                        'version'=>$lc->getVersion(),
+                        'size'=>$lc->getFileSize(),
+                        'comment'=>$document->getComment(),
+                        'keywords'=>$document->getKeywords(),
+                    );
+                } elseif(get_class($entry) == 'SeedDMS_Core_Folder') {
+                    $folder = $entry;
+                    $recs[] = array(
+                        'type'=>'folder',
+                        'id'=>$folder->getId(),
+                        'name'=>$folder->getName(),
+                        'comment'=>$folder->getComment(),
+                        'date'=>$folder->getDate(),
+                    );
+                }
+            }
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
+            break;
+    }
 } /* }}} */
 
 /**
@@ -871,60 +871,60 @@ function doSearch() { /* {{{ */
  *
  */
 function doSearchByAttr() { /* {{{ */
-	global $app, $dms, $userobj;
+    global $app, $dms, $userobj;
 
-	$attrname = $app->request()->get('name');
-	$query = $app->request()->get('value');
-	if(!$limit = $app->request()->get('limit'))
-		$limit = 50;
-	$attrdef = $dms->getAttributeDefinitionByName($attrname);
-	$entries = array();
-	if($attrdef) {
-		$resArr = $attrdef->getObjects($query, $limit);
-		if($resArr['folders']) {
-			foreach ($resArr['folders'] as $entry) {
-				if ($entry->getAccessMode($userobj) >= M_READ) {
-					$entries[] = $entry;
-				}
-			}
-		}
-		if($resArr['docs']) {
-			foreach ($resArr['docs'] as $entry) {
-				if ($entry->getAccessMode($userobj) >= M_READ) {
-					$entries[] = $entry;
-				}
-			}
-		}
-	}
-	$recs = array();
-	foreach ($entries as $entry) {
-		if(get_class($entry) == 'SeedDMS_Core_Document') {
-			$document = $entry;
-			$lc = $document->getLatestContent();
-			$recs[] = array(
-				'type'=>'document',
-				'id'=>$document->getId(),
-				'date'=>$document->getDate(),
-				'name'=>$document->getName(),
-				'mimetype'=>$lc->getMimeType(),
-				'version'=>$lc->getVersion(),
-				'size'=>$lc->getFileSize(),
-				'comment'=>$document->getComment(),
-				'keywords'=>$document->getKeywords(),
-			);
-		} elseif(get_class($entry) == 'SeedDMS_Core_Folder') {
-			$folder = $entry;
-			$recs[] = array(
-				'type'=>'folder',
-				'id'=>$folder->getId(),
-				'name'=>$folder->getName(),
-				'comment'=>$folder->getComment(),
-				'date'=>$folder->getDate(),
-			);
-		}
-	}
-	$app->response()->header('Content-Type', 'application/json');
-	echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
+    $attrname = $app->request()->get('name');
+    $query = $app->request()->get('value');
+    if(!$limit = $app->request()->get('limit'))
+        $limit = 50;
+    $attrdef = $dms->getAttributeDefinitionByName($attrname);
+    $entries = array();
+    if($attrdef) {
+        $resArr = $attrdef->getObjects($query, $limit);
+        if($resArr['folders']) {
+            foreach ($resArr['folders'] as $entry) {
+                if ($entry->getAccessMode($userobj) >= M_READ) {
+                    $entries[] = $entry;
+                }
+            }
+        }
+        if($resArr['docs']) {
+            foreach ($resArr['docs'] as $entry) {
+                if ($entry->getAccessMode($userobj) >= M_READ) {
+                    $entries[] = $entry;
+                }
+            }
+        }
+    }
+    $recs = array();
+    foreach ($entries as $entry) {
+        if(get_class($entry) == 'SeedDMS_Core_Document') {
+            $document = $entry;
+            $lc = $document->getLatestContent();
+            $recs[] = array(
+                'type'=>'document',
+                'id'=>$document->getId(),
+                'date'=>$document->getDate(),
+                'name'=>$document->getName(),
+                'mimetype'=>$lc->getMimeType(),
+                'version'=>$lc->getVersion(),
+                'size'=>$lc->getFileSize(),
+                'comment'=>$document->getComment(),
+                'keywords'=>$document->getKeywords(),
+            );
+        } elseif(get_class($entry) == 'SeedDMS_Core_Folder') {
+            $folder = $entry;
+            $recs[] = array(
+                'type'=>'folder',
+                'id'=>$folder->getId(),
+                'name'=>$folder->getName(),
+                'comment'=>$folder->getComment(),
+                'date'=>$folder->getDate(),
+            );
+        }
+    }
+    $app->response()->header('Content-Type', 'application/json');
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
 } /* }}} */
 
 function checkIfAdmin() { /* {{{ */
@@ -955,8 +955,8 @@ function createAccount() { /* {{{ */
     $language = $app->request()->post('language');
     $theme = $app->request()->post('theme');
     $comment = $app->request()->post('comment');
-    
-    $newAccount = $dms->addUser($userName, $password, $fullname, $email, $language, $theme, $comment);  
+
+    $newAccount = $dms->addUser($userName, $password, $fullname, $email, $language, $theme, $comment);
     if ($newAccount === false)
     {
         $app->response()->header('Content-Type', 'application/json');
@@ -986,7 +986,7 @@ function changeAccountPassword($id) { /* {{{ */
     {
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'You must PUT a new password', 'data'=>''));
-        return; 
+        return;
     }
 
     $newPassword = $app->request()->put('password');
@@ -1001,16 +1001,16 @@ function changeAccountPassword($id) { /* {{{ */
      * User not found
      */
     if (!$account) {
-    	$app->response()->status(404);
-    	return;
+        $app->response()->status(404);
+        return;
     }
 
     $operation = $account->setPwd($newPassword);
 
     if (!$operation){
-		$app->response()->header('Content-Type', 'application/json');
-	    echo json_encode(array('success'=>false, 'message'=>'', 'data'=>'Could not change password.'));
-	    return;
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'', 'data'=>'Could not change password.'));
+        return;
     }
 
     $app->response()->header('Content-Type', 'application/json');
@@ -1055,22 +1055,22 @@ function setDisabledAccount($id) { /* {{{ */
     {
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'You must PUT a disabled state', 'data'=>''));
-        return; 
+        return;
     }
-    
+
     $isDisabled = false;
     $status = $app->request()->put('disable');
     if ($status == 'true' || $status == '1')
     {
         $isDisabled = true;
     }
-    
+
     if(is_numeric($id))
         $account = $dms->getUser($id);
     else {
         $account = $dms->getUserByLogin($id);
     }
-    
+
     if($account) {
         $account->setDisabled($isDisabled);
         $data = array();
@@ -1092,8 +1092,8 @@ function createGroup() { /* {{{ */
     checkIfAdmin();
     $groupName = $app->request()->post('name');
     $comment = $app->request()->post('comment');
-    
-    $newGroup = $dms->addGroup($groupName, $comment);   
+
+    $newGroup = $dms->addGroup($groupName, $comment);
     if ($newGroup === false)
     {
         $app->response()->header('Content-Type', 'application/json');
@@ -1136,18 +1136,18 @@ function getGroup($id) { /* {{{ */
 function changeGroupMembership($id, $operationType) { /* {{{ */
     global $app, $dms, $userobj;
     checkIfAdmin();
-    
+
     if(is_numeric($id))
         $group = $dms->getGroup($id);
     else {
         $group = $dms->getGroupByName($id);
     }
-    
+
     if ($app->request()->put('userid') == null)
     {
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Please PUT the userid', 'data'=>''));
-        return; 
+        return;
     }
     $userId = $app->request()->put('userid');
     if(is_numeric($userId))
@@ -1155,12 +1155,12 @@ function changeGroupMembership($id, $operationType) { /* {{{ */
     else {
         $user = $dms->getUserByLogin($userId);
     }
-    
+
     if (!($group && $user)) {
         $app->response()->status(404);
     }
 
-    $operationResult = false; 
+    $operationResult = false;
 
     if ($operationType == 'add')
     {
@@ -1170,7 +1170,7 @@ function changeGroupMembership($id, $operationType) { /* {{{ */
     {
         $operationResult = $group->removeUser($user);
     }
-    
+
     if ($operationResult === false)
     {
         $app->response()->header('Content-Type', 'application/json');
@@ -1200,7 +1200,7 @@ function addUserToGroup($id) { /* {{{ */
 } /* }}} */
 
 function removeUserFromGroup($id) { /* {{{ */
-    changeGroupMembership($id, 'remove');   
+    changeGroupMembership($id, 'remove');
 } /* }}} */
 
 function setFolderInheritsAccess($id) { /* {{{ */
@@ -1210,22 +1210,22 @@ function setFolderInheritsAccess($id) { /* {{{ */
     {
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'You must PUT an "enable" value', 'data'=>''));
-        return; 
+        return;
     }
-    
+
     $inherit = false;
     $status = $app->request()->put('enable');
     if ($status == 'true' || $status == '1')
     {
         $inherit = true;
     }
-    
+
     if(is_numeric($id))
         $folder = $dms->getFolder($id);
     else {
         $folder = $dms->getFolderByName($id);
     }
-    
+
     if($folder) {
         $folder->setInheritAccess($inherit);
         $folderId = $folder->getId();
@@ -1249,17 +1249,17 @@ function addGroupAccessToFolder($id) { /* {{{ */
 } /* }}} */
 
 function removeUserAccessFromFolder($id) { /* {{{ */
-    changeFolderAccess($id, 'remove', 'user');   
+    changeFolderAccess($id, 'remove', 'user');
 } /* }}} */
 
 function removeGroupAccessFromFolder($id) { /* {{{ */
-    changeFolderAccess($id, 'remove', 'group');   
+    changeFolderAccess($id, 'remove', 'group');
 } /* }}} */
 
 function changeFolderAccess($id, $operationType, $userOrGroup) { /* {{{ */
     global $app, $dms, $userobj;
     checkIfAdmin();
-    
+
     if(is_numeric($id))
         $folder = $dms->getfolder($id);
     else {
@@ -1269,66 +1269,66 @@ function changeFolderAccess($id, $operationType, $userOrGroup) { /* {{{ */
         $app->response()->status(404);
         return;
     }
-    
+
     $userOrGroupIdInput = $app->request()->put('id');
     if ($operationType == 'add')
     {
-	    if ($app->request()->put('id') == null)
-	    {
-	        $app->response()->header('Content-Type', 'application/json');
-	        echo json_encode(array('success'=>false, 'message'=>'Please PUT the user or group Id', 'data'=>''));
-	        return; 
-	    }
+        if ($app->request()->put('id') == null)
+        {
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>false, 'message'=>'Please PUT the user or group Id', 'data'=>''));
+            return;
+        }
 
-	    if ($app->request()->put('mode') == null)
-	    {
-	        $app->response()->header('Content-Type', 'application/json');
-	        echo json_encode(array('success'=>false, 'message'=>'Please PUT the access mode', 'data'=>''));
-	        return; 
-	    }
+        if ($app->request()->put('mode') == null)
+        {
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>false, 'message'=>'Please PUT the access mode', 'data'=>''));
+            return;
+        }
 
-	    $modeInput = $app->request()->put('mode');
+        $modeInput = $app->request()->put('mode');
 
-	    $mode = M_NONE;
-	    if ($modeInput == 'read')
-	    {
-	    	$mode = M_READ;
-	    }
-	    if ($modeInput == 'readwrite')
-	    {
-	    	$mode = M_READWRITE;
-	    }
-	    if ($modeInput == 'all')
-	    {
-	    	$mode = M_ALL;
-	    }
-	}
+        $mode = M_NONE;
+        if ($modeInput == 'read')
+        {
+            $mode = M_READ;
+        }
+        if ($modeInput == 'readwrite')
+        {
+            $mode = M_READWRITE;
+        }
+        if ($modeInput == 'all')
+        {
+            $mode = M_ALL;
+        }
+    }
 
 
     $userOrGroupId = $userOrGroupIdInput;
     if(!is_numeric($userOrGroupIdInput) && $userOrGroup == 'user')
     {
-    	$userOrGroupObj = $dms->getUserByLogin($userOrGroupIdInput);
+        $userOrGroupObj = $dms->getUserByLogin($userOrGroupIdInput);
     }
     if(!is_numeric($userOrGroupIdInput) && $userOrGroup == 'group')
     {
-    	$userOrGroupObj = $dms->getGroupByName($userOrGroupIdInput);
+        $userOrGroupObj = $dms->getGroupByName($userOrGroupIdInput);
     }
     if(is_numeric($userOrGroupIdInput) && $userOrGroup == 'user')
     {
-    	$userOrGroupObj = $dms->getUser($userOrGroupIdInput);
+        $userOrGroupObj = $dms->getUser($userOrGroupIdInput);
     }
     if(is_numeric($userOrGroupIdInput) && $userOrGroup == 'group')
     {
-    	$userOrGroupObj = $dms->getGroup($userOrGroupIdInput);
+        $userOrGroupObj = $dms->getGroup($userOrGroupIdInput);
     }
     if (!$userOrGroupObj) {
         $app->response()->status(404);
         return;
-    } 
-	$userOrGroupId = $userOrGroupObj->getId();
+    }
+    $userOrGroupId = $userOrGroupObj->getId();
 
-    $operationResult = false; 
+    $operationResult = false;
 
     if ($operationType == 'add' && $userOrGroup == 'user')
     {
@@ -1347,7 +1347,7 @@ function changeFolderAccess($id, $operationType, $userOrGroup) { /* {{{ */
     {
         $operationResult = $folder->removeAccess($userOrGroupId, false);
     }
-    
+
     if ($operationResult === false)
     {
         $app->response()->header('Content-Type', 'application/json');
@@ -1368,7 +1368,7 @@ function changeFolderAccess($id, $operationType, $userOrGroup) { /* {{{ */
 function clearFolderAccessList($id) { /* {{{ */
     global $app, $dms, $userobj;
     checkIfAdmin();
-        
+
     if(is_numeric($id))
         $folder = $dms->getFolder($id);
     else {
@@ -1376,15 +1376,15 @@ function clearFolderAccessList($id) { /* {{{ */
     }
     if (!$folder)
     {
-    	$app->response()->status(404);
-    	return;
+        $app->response()->status(404);
+        return;
     }
     $operationResult = $folder->clearAccessList();
     $data = array();
     $app->response()->header('Content-Type', 'application/json');
     if (!$operationResult)
     {
-    	echo json_encode(array('success'=>false, 'message'=>'Something went wrong. Could not clear access list for this folder.', 'data'=>$data));	
+        echo json_encode(array('success'=>false, 'message'=>'Something went wrong. Could not clear access list for this folder.', 'data'=>$data));    
     }
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
 } /* }}} */
@@ -1393,18 +1393,18 @@ function clearFolderAccessList($id) { /* {{{ */
 $app = new \Slim\Slim(array('mode'=>'development', '_session.handler'=>null));
 
 $app->configureMode('production', function () use ($app) {
-	$app->config(array(
-		'log.enable' => true,
-		'log.path' => '/tmp/',
-		'debug' => false
-	));
+    $app->config(array(
+        'log.enable' => true,
+        'log.path' => '/tmp/',
+        'debug' => false
+    ));
 });
 
 $app->configureMode('development', function () use ($app) {
-	$app->config(array(
-		'log.enable' => false,
-		'debug' => true
-	));
+    $app->config(array(
+        'log.enable' => false,
+        'debug' => true
+    ));
 });
 
 // use post for create operation
@@ -1448,10 +1448,10 @@ $app->get('/groups/:id', 'getGroup');
 $app->put('/groups/:id/addUser', 'addUserToGroup');
 $app->put('/groups/:id/removeUser', 'removeUserFromGroup');
 $app->put('/folder/:id/setInherit', 'setFolderInheritsAccess');
-$app->put('/folder/:id/access/group/add', 'addGroupAccessToFolder'); // 
-$app->put('/folder/:id/access/user/add', 'addUserAccessToFolder'); // 
-$app->put('/folder/:id/access/group/remove', 'removeGroupAccessFromFolder'); 
-$app->put('/folder/:id/access/user/remove', 'removeUserAccessFromFolder'); 
+$app->put('/folder/:id/access/group/add', 'addGroupAccessToFolder'); //
+$app->put('/folder/:id/access/user/add', 'addUserAccessToFolder'); //
+$app->put('/folder/:id/access/group/remove', 'removeGroupAccessFromFolder');
+$app->put('/folder/:id/access/user/remove', 'removeUserAccessFromFolder');
 $app->put('/folder/:id/access/clear', 'clearFolderAccessList');
 $app->run();
 

From b539921c2382cf51383f1c8b30513a310c03849e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Dec 2017 11:33:21 +0100
Subject: [PATCH 181/308] do not call htmlspecialchars() for json data

it doesn't do any harm and it's up to the application to encode the data
---
 restapi/index.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index 2e8b901d8..90d5ec9a2 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -215,7 +215,7 @@ function getFolderPath($id) { /* {{{ */
     $path = $folder->getPath();
     $data = array();
     foreach($path as $element) {
-        $data[] = array('id'=>$element->getId(), 'name'=>htmlspecialchars($element->getName()));
+        $data[] = array('id'=>$element->getId(), 'name'=>$element->getName());
     }
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
 } /* }}} */
@@ -261,7 +261,7 @@ function getFolderChildren($id) { /* {{{ */
                     $recs[] = array(
                         'type'=>'folder',
                         'id'=>$subfolder->getId(),
-                        'name'=>htmlspecialchars($subfolder->getName()),
+                        'name'=>$subfolder->getName(),
                         'comment'=>$subfolder->getComment(),
                         'date'=>$subfolder->getDate(),
                     );
@@ -275,7 +275,7 @@ function getFolderChildren($id) { /* {{{ */
                             'type'=>'document',
                             'id'=>$document->getId(),
                             'date'=>$document->getDate(),
-                            'name'=>htmlspecialchars($document->getName()),
+                            'name'=>$document->getName(),
                             'mimetype'=>$lc->getMimeType(),
                             'version'=>$lc->getVersion(),
                             'size'=>$lc->getFileSize(),
@@ -464,8 +464,8 @@ function getDocument($id) { /* {{{ */
             $app->response()->header('Content-Type', 'application/json');
             $data = array(
                 'id'=>$id,
-                'name'=>htmlspecialchars($document->getName()),
-                'comment'=>htmlspecialchars($document->getComment()),
+                'name'=>$document->getName(),
+                'comment'=>$document->getComment(),
                 'date'=>$document->getDate(),
                 'mimetype'=>$lc->getMimeType(),
                 'version'=>$lc->getVersion(),
@@ -576,7 +576,7 @@ function getDocumentVersions($id) { /* {{{ */
                     'date'=>$lc->getDate(),
                     'mimetype'=>$lc->getMimeType(),
                     'size'=>$lc->getFileSize(),
-                    'comment'=>htmlspecialchars($lc->getComment()),
+                    'comment'=>$lc->getComment(),
                 );
             }
             $app->response()->header('Content-Type', 'application/json');

From 83aa6fe02e8f049b9f70cf6cbd043baaa91a7fbb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Dec 2017 11:51:05 +0100
Subject: [PATCH 182/308] move retrieval of document data into function

---
 restapi/index.php | 92 ++++++++++++++++++-----------------------------
 1 file changed, 34 insertions(+), 58 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index 90d5ec9a2..693ffc91e 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -60,6 +60,21 @@ if(USE_PHP_SESSION) {
 require "vendor/autoload.php";
 #\Slim\Slim::registerAutoloader();
 
+function __getLatestVersionData($lc) { /* {{{ */
+    $document = $lc->getDocument();
+    return array(
+        'type'=>'document',
+        'id'=>$document->getId(),
+        'date'=>$document->getDate(),
+        'name'=>$document->getName(),
+        'mimetype'=>$lc->getMimeType(),
+        'version'=>$lc->getVersion(),
+        'size'=>$lc->getFileSize(),
+        'comment'=>$document->getComment(),
+        'keywords'=>$document->getKeywords(),
+    );
+} /* }}} */
+
 function doLogin() { /* {{{ */
     global $app, $dms, $userobj, $session, $settings;
 
@@ -136,19 +151,12 @@ function getLockedDocuments() { /* {{{ */
 
     if(false !== ($documents = $dms->getDocumentsLockedByUser($userobj))) {
         $documents = SeedDMS_Core_DMS::filterAccess($documents, $userobj, M_READ);
+        $recs = array();
         foreach($documents as $document) {
             $lc = $document->getLatestContent();
-            $recs[] = array(
-                'type'=>'document',
-                'id'=>$document->getId(),
-                'date'=>$document->getDate(),
-                'name'=>$document->getName(),
-                'mimetype'=>$lc->getMimeType(),
-                'version'=>$lc->getVersion(),
-                'size'=>$lc->getFileSize(),
-                'comment'=>$document->getComment(),
-                'keywords'=>$document->getKeywords(),
-            );
+            if($lc) {
+                $recs[] = __getLatestVersionData($lc);
+            }
         }
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
@@ -271,17 +279,7 @@ function getFolderChildren($id) { /* {{{ */
                 foreach($documents as $document) {
                     $lc = $document->getLatestContent();
                     if($lc) {
-                        $recs[] = array(
-                            'type'=>'document',
-                            'id'=>$document->getId(),
-                            'date'=>$document->getDate(),
-                            'name'=>$document->getName(),
-                            'mimetype'=>$lc->getMimeType(),
-                            'version'=>$lc->getVersion(),
-                            'size'=>$lc->getFileSize(),
-                            'comment'=>$document->getComment(),
-                            'keywords'=>$document->getKeywords(),
-                        );
+                        $recs[] = __getLatestVersionData($lc);
                     }
                 }
                 $app->response()->header('Content-Type', 'application/json');
@@ -461,20 +459,14 @@ function getDocument($id) { /* {{{ */
     if($document) {
         if ($document->getAccessMode($userobj) >= M_READ) {
             $lc = $document->getLatestContent();
-            $app->response()->header('Content-Type', 'application/json');
-            $data = array(
-                'id'=>$id,
-                'name'=>$document->getName(),
-                'comment'=>$document->getComment(),
-                'date'=>$document->getDate(),
-                'mimetype'=>$lc->getMimeType(),
-                'version'=>$lc->getVersion(),
-                'orig_filename'=>$lc->getOriginalFileName(),
-                'size'=>$lc->getFileSize(),
-                'keywords'=>$document->getKeywords(),
-            );
-            $app->response()->header('Content-Type', 'application/json');
-            echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+            if($lc) {
+                $data = __getLatestVersionData($lc);
+                $app->response()->header('Content-Type', 'application/json');
+                echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+            } else {
+                $app->response()->header('Content-Type', 'application/json');
+                echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
+            }
         } else {
             $app->response()->header('Content-Type', 'application/json');
             echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
@@ -838,17 +830,9 @@ function doSearch() { /* {{{ */
                 if(get_class($entry) == 'SeedDMS_Core_Document') {
                     $document = $entry;
                     $lc = $document->getLatestContent();
-                    $recs[] = array(
-                        'type'=>'document',
-                        'id'=>$document->getId(),
-                        'date'=>$document->getDate(),
-                        'name'=>$document->getName(),
-                        'mimetype'=>$lc->getMimeType(),
-                        'version'=>$lc->getVersion(),
-                        'size'=>$lc->getFileSize(),
-                        'comment'=>$document->getComment(),
-                        'keywords'=>$document->getKeywords(),
-                    );
+                    if($lc) {
+                        $recs[] = __getLatestVersionData($lc);
+                    }
                 } elseif(get_class($entry) == 'SeedDMS_Core_Folder') {
                     $folder = $entry;
                     $recs[] = array(
@@ -901,17 +885,9 @@ function doSearchByAttr() { /* {{{ */
         if(get_class($entry) == 'SeedDMS_Core_Document') {
             $document = $entry;
             $lc = $document->getLatestContent();
-            $recs[] = array(
-                'type'=>'document',
-                'id'=>$document->getId(),
-                'date'=>$document->getDate(),
-                'name'=>$document->getName(),
-                'mimetype'=>$lc->getMimeType(),
-                'version'=>$lc->getVersion(),
-                'size'=>$lc->getFileSize(),
-                'comment'=>$document->getComment(),
-                'keywords'=>$document->getKeywords(),
-            );
+            if($lc) {
+                $recs[] = __getLatestVersionData($lc);
+            }
         } elseif(get_class($entry) == 'SeedDMS_Core_Folder') {
             $folder = $entry;
             $recs[] = array(

From 041c7934bc045bcb6052ca756ed9034d8c86a093 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Dec 2017 12:16:12 +0100
Subject: [PATCH 183/308] do not add extension if it already exists
 (getDocumentContent())

---
 restapi/index.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/restapi/index.php b/restapi/index.php
index 693ffc91e..fba248258 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -539,8 +539,14 @@ function getDocumentContent($id) { /* {{{ */
     if($document) {
         if ($document->getAccessMode($userobj) >= M_READ) {
             $lc = $document->getLatestContent();
+
+            if (pathinfo($document->getName(), PATHINFO_EXTENSION) == $lc->getFileType())
+                $filename = $document->getName();
+            else
+                $filename = $document->getName().$lc->getFileType();
+
             $app->response()->header('Content-Type', $lc->getMimeType());
-            $app->response()->header("Content-Disposition: filename=\"" . $document->getName().$lc->getFileType() . "\"");
+            $app->response()->header("Content-Disposition: filename=\"" . $filename . "\"");
             $app->response()->header("Content-Length", filesize($dms->contentDir . $lc->getPath()));
             $app->response()->header("Expires", "0");
             $app->response()->header("Cache-Control", "no-cache, must-revalidate");

From 80c5934eb12507150c5e2519d124ae2914dd4d51 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Dec 2017 13:16:15 +0100
Subject: [PATCH 184/308] use new authentication mechanism, add ldap
 authentication

---
 restapi/index.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/restapi/index.php b/restapi/index.php
index fba248258..1dc20f8ae 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -82,7 +82,23 @@ function doLogin() { /* {{{ */
     $password = $app->request()->post('pass');
 
     $userobj = $dms->getUserByLogin($username);
-    if(!$userobj || md5($password) != $userobj->getPwd()) {
+    $user = null;
+
+    /* 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 {{{ */
+    if(!$user) {
+        require_once("../inc/inc.ClassDbAuthentication.php");
+        $authobj = new SeedDMS_DbAuthentication($dms, $settings);
+        $user = $authobj->authenticate($username, $password);
+    } /* }}} */
+
+    if(!$user) {
         if(USE_PHP_SESSION) {
             unset($_SESSION['userid']);
         } else {

From 1a9f6895f752cceebf17a67ec8f734813e8f8eca Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Dec 2017 13:18:07 +0100
Subject: [PATCH 185/308] calling /folder/ with an id will return the root
 folder

---
 restapi/index.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index 1dc20f8ae..329aaefa6 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -182,10 +182,13 @@ function getLockedDocuments() { /* {{{ */
     }
 } /* }}} */
 
-function getFolder($id) { /* {{{ */
-    global $app, $dms, $userobj;
+function getFolder($id = null) { /* {{{ */
+    global $app, $dms, $userobj, $settings;
     $forcebyname = $app->request()->get('forcebyname');
-    if(is_numeric($id) && empty($forcebyname))
+
+    if ($id === null)
+        $folder = $dms->getFolder($settings->_rootFolderID);
+    else if(is_numeric($id) && empty($forcebyname))
         $folder = $dms->getFolder($id);
     else {
         $parentid = $app->request()->get('parentid');
@@ -1414,6 +1417,7 @@ $app->get('/logout', 'doLogout');
 $app->get('/account', 'getAccount');
 $app->get('/search', 'doSearch');
 $app->get('/searchbyattr', 'doSearchByAttr');
+$app->get('/folder/', 'getFolder');
 $app->get('/folder/:id', 'getFolder');
 $app->post('/folder/:id/move', 'moveFolder');
 $app->delete('/folder/:id', 'deleteFolder');

From cbe184a637c2dc0c34e38a5e1605134761f65c74 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Dec 2017 13:19:41 +0100
Subject: [PATCH 186/308] return from uploadDocument() if user cannot be found

---
 restapi/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/restapi/index.php b/restapi/index.php
index 329aaefa6..1a6c6d3bd 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -431,6 +431,7 @@ function uploadDocument($id) { /* {{{ */
     if(!$userobj) {
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
+        return;
     }
 
     if($id == 0) {

From aaab438c169fd1d48b0678257684e6ec1f856623 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Dec 2017 13:27:33 +0100
Subject: [PATCH 187/308] return properly if user object doesn't exists

---
 restapi/index.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/restapi/index.php b/restapi/index.php
index 1a6c6d3bd..64fb76392 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -146,7 +146,9 @@ function setFullName() { /* {{{ */
     if(!$userobj) {
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
+        return;
     }
+
     $userobj->setFullName($app->request()->put('fullname'));
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$userobj->getFullName()));
 } /* }}} */
@@ -157,7 +159,9 @@ function setEmail($id) { /* {{{ */
     if(!$userobj) {
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
+        return;
     }
+
     $userobj->setEmail($app->request()->put('fullname'));
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$userid));
 } /* }}} */
@@ -319,6 +323,7 @@ function createFolder($id) { /* {{{ */
     if(!$userobj) {
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
+        return;
     }
 
     if($id == 0) {
@@ -360,6 +365,7 @@ function moveFolder($id) { /* {{{ */
     if(!$userobj) {
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
+        return;
     }
 
     $mfolder = $dms->getFolder($id);
@@ -399,6 +405,7 @@ function deleteFolder($id) { /* {{{ */
     if(!$userobj) {
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
+        return;
     }
 
     if($id == 0) {
@@ -931,6 +938,7 @@ function doSearchByAttr() { /* {{{ */
 
 function checkIfAdmin() { /* {{{ */
     global $app, $dms, $userobj;
+
     if(!$userobj) {
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));

From 0b054d0fb1534c2b800fd4a290cb25746a78d1aa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Dec 2017 13:35:23 +0100
Subject: [PATCH 188/308] add method uploadDocumentFile()

---
 restapi/index.php | 60 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/restapi/index.php b/restapi/index.php
index 64fb76392..d5ae2460a 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -480,6 +480,65 @@ function uploadDocument($id) { /* {{{ */
     }
 } /* }}} */
 
+function uploadDocumentFile($documentId) { /* {{{ */
+    global $app, $dms, $userobj;
+
+    if(!$userobj) {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
+        return;
+    }
+
+    if($documentId == 0) {
+        echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
+        return;
+    }
+    $document = $dms->getDocument($documentId);
+    if($document) {
+        if ($document->getAccessMode($userobj) >= M_READWRITE) {
+            $docname = $app->request()->params('name');
+            $keywords = $app->request()->params('keywords');
+            $origfilename = $app->request()->params('origfilename');
+            $comment = $app->request()->params('comment');
+            $version = $app->request()->params('version') == '' ? 0 : $app->request()->params('version');
+            $public = $app->request()->params('public') == '' ? 'false' : $app->request()->params('public');
+            if (count($_FILES) == 0)
+            {
+                $app->response()->header('Content-Type', 'application/json');
+                echo json_encode(array('success'=>false, 'message'=>'No file detected', 'data'=>''));
+                return;
+            }
+            $file_info = reset($_FILES);
+            if ($origfilename == null)
+                $origfilename = $file_info['name'];
+            if (trim($docname) == '')
+                $docname = $origfilename;
+            $temp = $file_info['tmp_name'];
+            $finfo = finfo_open(FILEINFO_MIME_TYPE);
+            $userfiletype = finfo_file($finfo, $temp);
+            $fileType = ".".pathinfo($origfilename, PATHINFO_EXTENSION);
+            finfo_close($finfo);
+            $res = $document->addDocumentFile($docname, $comment, $userobj, $temp,
+                        $origfilename ? $origfilename : utf8_basename($temp),
+                        $fileType, $userfiletype, $version, $public);
+            unlink($temp);
+            if($res) {
+                $app->response()->header('Content-Type', 'application/json');
+                echo json_encode(array('success'=>true, 'message'=>'Upload succeded', 'data'=>$res));
+            } else {
+                $app->response()->header('Content-Type', 'application/json');
+                echo json_encode(array('success'=>false, 'message'=>'Upload failed', 'data'=>''));
+            }
+        } else {
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
+        }
+    } else {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'No such document', 'data'=>''));
+    }
+} /* }}} */
+
 function getDocument($id) { /* {{{ */
     global $app, $dms, $userobj;
     $document = $dms->getDocument($id);
@@ -1437,6 +1496,7 @@ $app->get('/folder/:id/attributes', 'getFolderAttributes');
 $app->post('/folder/:id/createfolder', 'createFolder');
 $app->put('/folder/:id/document', 'uploadDocument');
 $app->get('/document/:id', 'getDocument');
+$app->post('/document/:id/attachment', 'uploadDocumentFile');
 $app->delete('/document/:id', 'deleteDocument');
 $app->post('/document/:id/move', 'moveDocument');
 $app->get('/document/:id/content', 'getDocumentContent');

From ff82caf818ece63cd293b9dd4d2f2053f32bf297 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Dec 2017 13:42:15 +0100
Subject: [PATCH 189/308] fix setting of header

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

diff --git a/restapi/index.php b/restapi/index.php
index d5ae2460a..b8e9042a9 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -632,7 +632,7 @@ function getDocumentContent($id) { /* {{{ */
                 $filename = $document->getName().$lc->getFileType();
 
             $app->response()->header('Content-Type', $lc->getMimeType());
-            $app->response()->header("Content-Disposition: filename=\"" . $filename . "\"");
+            $app->response()->header("Content-Disposition", "filename=\"" . $filename . "\"");
             $app->response()->header("Content-Length", filesize($dms->contentDir . $lc->getPath()));
             $app->response()->header("Expires", "0");
             $app->response()->header("Cache-Control", "no-cache, must-revalidate");
@@ -800,7 +800,7 @@ function getDocumentPreview($id, $version=0, $width=0) { /* {{{ */
                 $object = $document->getLatestContent();
             if(!$object)
                 exit;
-            
+
             if(!empty($width))
                 $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $width);
             else
@@ -1453,7 +1453,7 @@ function clearFolderAccessList($id) { /* {{{ */
     $app->response()->header('Content-Type', 'application/json');
     if (!$operationResult)
     {
-        echo json_encode(array('success'=>false, 'message'=>'Something went wrong. Could not clear access list for this folder.', 'data'=>$data));    
+        echo json_encode(array('success'=>false, 'message'=>'Something went wrong. Could not clear access list for this folder.', 'data'=>$data));
     }
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
 } /* }}} */

From efe9ff0e42a0efc62f2febc70b827c910a66cc7e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Dec 2017 13:46:38 +0100
Subject: [PATCH 190/308] do not pass folder in document move as 'dest' anymore

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

diff --git a/restapi/index.php b/restapi/index.php
index b8e9042a9..d134a8128 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -585,12 +585,11 @@ function deleteDocument($id) { /* {{{ */
     }
 } /* }}} */
 
-function moveDocument($id) { /* {{{ */
+function moveDocument($id, $folderid) { /* {{{ */
     global $app, $dms, $userobj;
     $document = $dms->getDocument($id);
     if($document) {
         if ($document->getAccessMode($userobj) >= M_READ) {
-            $folderid = $app->request()->post('dest');
             if($folder = $dms->getFolder($folderid)) {
                 if($folder->getAccessMode($userobj) >= M_READWRITE) {
                     if($document->setFolder($folder)) {
@@ -1498,7 +1497,7 @@ $app->put('/folder/:id/document', 'uploadDocument');
 $app->get('/document/:id', 'getDocument');
 $app->post('/document/:id/attachment', 'uploadDocumentFile');
 $app->delete('/document/:id', 'deleteDocument');
-$app->post('/document/:id/move', 'moveDocument');
+$app->post('/document/:id/move/:folderid', 'moveDocument');
 $app->get('/document/:id/content', 'getDocumentContent');
 $app->get('/document/:id/versions', 'getDocumentVersions');
 $app->get('/document/:id/version/:version', 'getDocumentVersion');

From f3daa6d0e240d7763e946db5efd357e1455fd366 Mon Sep 17 00:00:00 2001
From: Sebastian Bartus-Kunz <sbartus-kunz@nitton.de>
Date: Wed, 20 Dec 2017 15:40:20 +0100
Subject: [PATCH 191/308] Fixed wrong return object in getDocumentLink()

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

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 76e53d5fe..1fc7d35c4 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -284,7 +284,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 */
 	function getDir() { /* {{{ */
 		if($this->_dms->maxDirID) {
-			$dirid = (int) (($this->_id-1) / $this->_dms->maxDirID) + 1; 
+			$dirid = (int) (($this->_id-1) / $this->_dms->maxDirID) + 1;
 			return $dirid."/".$this->_id."/";
 		} else {
 			return $this->_id."/";
@@ -760,7 +760,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 * has no access list the returned array contains the two elements
 	 * 'users' and 'groups' which are than empty. The methode returns false
 	 * if the function fails.
-	 * 
+	 *
 	 * @param integer $mode access mode (defaults to M_ANY)
 	 * @param integer $op operation (defaults to O_EQ)
 	 * @return array multi dimensional array or false in case of an error
@@ -1825,7 +1825,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		$link = new SeedDMS_Core_DocumentLink($resArr["id"], $document, $target, $resArr["userID"], $resArr["public"]);
 		$user = $this->_dms->getLoggedInUser();
 		if($link->getAccessMode($user, $document, $target) >= M_READ)
-			return $file;
+			return $link;
 		return null;
 	} /* }}} */
 
@@ -1977,7 +1977,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			$queryStr = "SELECT * FROM `tblDocumentFiles` WHERE `document` = " . $this->_id;
 			if($version) {
 				$queryStr .= " AND (`version`=0 OR `version`=".(int) $version.")";
-			}	
+			}
 			$queryStr .= " ORDER BY ";
 			if($version) {
 				$queryStr .= "`version` DESC,";
@@ -2352,7 +2352,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 	/**
 	 * Calculate the disk space including all versions of the document
-	 * 
+	 *
 	 * This is done by using the internal database field storing the
 	 * filesize of a document version.
 	 *
@@ -2371,7 +2371,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 	/**
 	 * Returns a list of events happend during the life of the document
-	 * 
+	 *
 	 * This includes the creation of new versions, approval and reviews, etc.
 	 *
 	 * @return array list of events
@@ -2865,7 +2865,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 	/**
 	 * Rewrites the complete status log
-	 * 
+	 *
 	 * Attention: this function is highly dangerous.
 	 * It removes an existing status log and rewrites it.
 	 * This method was added for importing an xml dump.
@@ -2916,7 +2916,7 @@ 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 of the document 
+	 * 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/revision.
@@ -2926,7 +2926,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * 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. 
+	 * 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
@@ -3094,7 +3094,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 	/**
 	 * Rewrites the complete review log
-	 * 
+	 *
 	 * Attention: this function is highly dangerous.
 	 * It removes an existing review log and rewrites it.
 	 * This method was added for importing an xml dump.
@@ -3222,7 +3222,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 	/**
 	 * Rewrites the complete approval log
-	 * 
+	 *
 	 * Attention: this function is highly dangerous.
 	 * It removes an existing review log and rewrites it.
 	 * This method was added for importing an xml dump.
@@ -3890,7 +3890,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			$recs = $db->getResultArray($queryStr);
 			if (is_bool($recs) && !$recs)
 				return false;
-			$this->_workflowState = new SeedDMS_Core_Workflow_State($recs[0]['id'], $recs[0]['name'], $recs[0]['maxtime'], $recs[0]['precondfunc'], $recs[0]['documentstatus']); 
+			$this->_workflowState = new SeedDMS_Core_Workflow_State($recs[0]['id'], $recs[0]['name'], $recs[0]['maxtime'], $recs[0]['precondfunc'], $recs[0]['documentstatus']);
 			$this->_workflowState->setDMS($this->_document->_dms);
 		}
 		return $this->_workflowState;
@@ -3913,7 +3913,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				$db->rollbackTransaction();
 				return false;
 			}
-			$this->_workflow = $workflow;	
+			$this->_workflow = $workflow;
 			if(!$this->setStatus(S_IN_WORKFLOW, "Added workflow '".$workflow->getName()."'", $user)) {
 				$db->rollbackTransaction();
 				return false;
@@ -3947,7 +3947,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				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'])); 
+			$this->_workflow = new SeedDMS_Core_Workflow($recs[0]['id'], $recs[0]['name'], $this->_document->_dms->getWorkflowState($recs[0]['initstate']));
 			$this->_workflow->setDMS($this->_document->_dms);
 		}
 		return $this->_workflow;
@@ -3955,7 +3955,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 	/**
 	 * Rewrites the complete workflow log
-	 * 
+	 *
 	 * Attention: this function is highly dangerous.
 	 * It removes an existing workflow log and rewrites it.
 	 * This method was added for importing an xml dump.
@@ -4107,7 +4107,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 		if($recs[0]['parentworkflow'])
 			return $this->_document->_dms->getWorkflow($recs[0]['parentworkflow']);
-		
+
 		return false;
 	} /* }}} */
 
@@ -4134,7 +4134,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			if (!$db->getResult($queryStr)) {
 				return false;
 			}
-			$this->_workflow = $subworkflow;	
+			$this->_workflow = $subworkflow;
 			return true;
 		}
 		return true;
@@ -4181,7 +4181,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				return false;
 			}
 
-			$this->_workflow = $this->_document->_dms->getWorkflow($recs[0]['parentworkflow']); 
+			$this->_workflow = $this->_document->_dms->getWorkflow($recs[0]['parentworkflow']);
 			$this->_workflow->setDMS($this->_document->_dms);
 
 			if($transition) {
@@ -4390,7 +4390,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return $nextstate;
 		}
 		return true;
-		
+
 	} /* }}} */
 
 	/**

From d0a2ac51a4918b7e3e657a8f92da9a7008542f89 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Dec 2017 16:38:10 +0100
Subject: [PATCH 192/308] add methods to manage categories

---
 restapi/index.php | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/restapi/index.php b/restapi/index.php
index d134a8128..9bbb28b08 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -1433,6 +1433,48 @@ function changeFolderAccess($id, $operationType, $userOrGroup) { /* {{{ */
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
 } /* }}} */
 
+
+function getCategories() { /* {{{ */
+    global $app, $dms, $userobj;
+
+    $categories = $dms->getDocumentCategories();
+    foreach($categories as $category)
+        $data[] = ['id' => $category->getId(), 'name' => $category->getName()];
+
+    $app->response()->header('Content-Type', 'application/json');
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+}
+
+function addCategory() { /* {{{ */
+    global $app, $dms, $userobj;
+    checkIfAdmin();
+
+    $category = $app->request()->params("category");
+    if ($category == null)
+    {
+        echo json_encode(array('success'=>false, 'message'=>'Need a category.', 'data'=>''));
+        return;
+    }
+
+    $data = $dms->addDocumentCategory($category);
+
+    $app->response()->header('Content-Type', 'application/json');
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+}
+
+function deleteCategory($id)
+{
+    global $app, $dms, $userobj;
+    checkIfAdmin();
+
+    $categories = new SeedDMS_Core_DocumentCategory($id, null);
+    $result = $categories->remove();
+    $data = null;
+
+    $app->response()->header('Content-Type', 'application/json');
+    echo json_encode(array('success'=>$result, 'message'=>'', 'data'=>$data));
+}
+
 function clearFolderAccessList($id) { /* {{{ */
     global $app, $dms, $userobj;
     checkIfAdmin();
@@ -1523,6 +1565,9 @@ $app->put('/folder/:id/access/user/add', 'addUserAccessToFolder'); //
 $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->delete('/categories/:id', 'deleteCategory');
+$app->post('/categories', 'addCategory');
 $app->run();
 
 ?>

From e8bfbb5c9745a5646612582962952168fddb6948 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Dec 2017 17:58:24 +0100
Subject: [PATCH 193/308] add uploadDocument with POST, add changeCategoryName,
 moveFolder receives destination in url like moveDocument

---
 restapi/index.php | 137 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 120 insertions(+), 17 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index 9bbb28b08..24415cbdc 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -359,7 +359,7 @@ function createFolder($id) { /* {{{ */
     }
 } /* }}} */
 
-function moveFolder($id) { /* {{{ */
+function moveFolder($id, $folderid) { /* {{{ */
     global $app, $dms, $userobj;
 
     if(!$userobj) {
@@ -371,7 +371,6 @@ function moveFolder($id) { /* {{{ */
     $mfolder = $dms->getFolder($id);
     if($mfolder) {
         if ($mfolder->getAccessMode($userobj) >= M_READ) {
-            $folderid = $app->request()->post('dest');
             if($folder = $dms->getFolder($folderid)) {
                 if($folder->getAccessMode($userobj) >= M_READWRITE) {
                     if($mfolder->setParent($folder)) {
@@ -441,6 +440,70 @@ function uploadDocument($id) { /* {{{ */
         return;
     }
 
+    if($id == 0) {
+        echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
+        return;
+    }
+    $mfolder = $dms->getFolder($id);
+    if($mfolder) {
+        if ($mfolder->getAccessMode($userobj) >= M_READWRITE) {
+            $docname = $app->request()->params('name');
+            $keywords = $app->request()->params('keywords');
+//            $categories = $app->request()->params('categories') ? $app->request()->params('categories') : [];
+//            $attributes = $app->request()->params('attributes') ? $app->request()->params('attributes') : [];
+            $origfilename = $app->request()->params('origfilename');
+            if (count($_FILES) == 0)
+            {
+                $app->response()->header('Content-Type', 'application/json');
+                echo json_encode(array('success'=>false, 'message'=>'No file detected', 'data'=>''));
+                return;
+            }
+            $file_info = reset($_FILES);
+            if ($origfilename == null)
+                $origfilename = $file_info['name'];
+            if (trim($docname) == '')
+                $docname = $origfilename;
+            $temp = $file_info['tmp_name'];
+            $finfo = finfo_open(FILEINFO_MIME_TYPE);
+            $userfiletype = finfo_file($finfo, $temp);
+            $fileType = ".".pathinfo($origfilename, PATHINFO_EXTENSION);
+            finfo_close($finfo);
+            $res = $mfolder->addDocument($docname, '', 0, $userobj, $keywords, array(), $temp, $origfilename ? $origfilename : basename($temp), $fileType, $userfiletype, 0);
+//            addDocumentCategories($res, $categories);
+//            setDocumentAttributes($res, $attributes);
+
+            unlink($temp);
+            if($res) {
+                $doc = $res[0];
+                $rec = array('id'=>$doc->getId(), 'name'=>$doc->getName());
+                $app->response()->header('Content-Type', 'application/json');
+                echo json_encode(array('success'=>true, 'message'=>'Upload succeded', 'data'=>$rec));
+            } else {
+                $app->response()->header('Content-Type', 'application/json');
+                echo json_encode(array('success'=>false, 'message'=>'Upload failed', 'data'=>''));
+            }
+        } else {
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
+        }
+    } else {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'No folder', 'data'=>''));
+    }
+} /* }}} */
+
+/**
+ * Old upload method which uses put instead of post
+ */
+function uploadDocumentPut($id) { /* {{{ */
+    global $app, $dms, $userobj;
+
+    if(!$userobj) {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
+        return;
+    }
+
     if($id == 0) {
         echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
         return;
@@ -1443,7 +1506,7 @@ function getCategories() { /* {{{ */
 
     $app->response()->header('Content-Type', 'application/json');
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
-}
+} /* }}} */
 
 function addCategory() { /* {{{ */
     global $app, $dms, $userobj;
@@ -1460,10 +1523,9 @@ function addCategory() { /* {{{ */
 
     $app->response()->header('Content-Type', 'application/json');
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
-}
+} /* }}} */
 
-function deleteCategory($id)
-{
+function deleteCategory($id) { /* {{{ */
     global $app, $dms, $userobj;
     checkIfAdmin();
 
@@ -1473,7 +1535,50 @@ function deleteCategory($id)
 
     $app->response()->header('Content-Type', 'application/json');
     echo json_encode(array('success'=>$result, 'message'=>'', 'data'=>$data));
-}
+} /* }}} */
+
+/**
+ * Updates the name of an existing category
+ *
+ * @param      <type>  $id     The user name or numerical identifier
+ */
+function changeCategoryName($id) { /* {{{ */
+    global $app, $dms, $userobj;
+
+    checkIfAdmin();
+
+    if ($app->request()->put('name') == null)
+    {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'You must PUT a new name', 'data'=>''));
+        return;
+    }
+
+    $newname = $app->request()->put('name');
+
+		$category = null;
+    if(is_numeric($id))
+        $category = $dms->getDocumentCategory($id);
+
+    /**
+     * Category not found
+     */
+    if (!$category) {
+        $app->response()->status(404);
+        return;
+    }
+
+    if (!$category->setName($newname)) {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'', 'data'=>'Could not change name.'));
+        return;
+    }
+
+    $app->response()->header('Content-Type', 'application/json');
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
+
+    return;
+} /* }}} */
 
 function clearFolderAccessList($id) { /* {{{ */
     global $app, $dms, $userobj;
@@ -1484,19 +1589,15 @@ function clearFolderAccessList($id) { /* {{{ */
     else {
         $folder = $dms->getFolderByName($id);
     }
-    if (!$folder)
-    {
+    if (!$folder) {
         $app->response()->status(404);
         return;
     }
-    $operationResult = $folder->clearAccessList();
-    $data = array();
     $app->response()->header('Content-Type', 'application/json');
-    if (!$operationResult)
-    {
-        echo json_encode(array('success'=>false, 'message'=>'Something went wrong. Could not clear access list for this folder.', 'data'=>$data));
+    if (!$folder->clearAccessList()) {
+        echo json_encode(array('success'=>false, 'message'=>'Something went wrong. Could not clear access list for this folder.', 'data'=>''));
     }
-    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
 } /* }}} */
 
 //$app = new Slim(array('mode'=>'development', '_session.handler'=>null));
@@ -1528,14 +1629,15 @@ $app->get('/search', 'doSearch');
 $app->get('/searchbyattr', 'doSearchByAttr');
 $app->get('/folder/', 'getFolder');
 $app->get('/folder/:id', 'getFolder');
-$app->post('/folder/:id/move', 'moveFolder');
+$app->post('/folder/:id/move/:folderid', 'moveFolder');
 $app->delete('/folder/:id', 'deleteFolder');
 $app->get('/folder/:id/children', 'getFolderChildren');
 $app->get('/folder/:id/parent', 'getFolderParent');
 $app->get('/folder/:id/path', 'getFolderPath');
 $app->get('/folder/:id/attributes', 'getFolderAttributes');
 $app->post('/folder/:id/createfolder', 'createFolder');
-$app->put('/folder/:id/document', 'uploadDocument');
+$app->put('/folder/:id/document', 'uploadDocumentPut');
+$app->post('/folder/:id/document', 'uploadDocument');
 $app->get('/document/:id', 'getDocument');
 $app->post('/document/:id/attachment', 'uploadDocumentFile');
 $app->delete('/document/:id', 'deleteDocument');
@@ -1568,6 +1670,7 @@ $app->put('/folder/:id/access/clear', 'clearFolderAccessList');
 $app->get('/categories', 'getCategories');
 $app->delete('/categories/:id', 'deleteCategory');
 $app->post('/categories', 'addCategory');
+$app->put('/categories/:id/name', 'changeCategoryName');
 $app->run();
 
 ?>

From a534c3dd3f6907d65d5bf5e607886d911f97f342 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 21 Dec 2017 15:15:59 +0100
Subject: [PATCH 194/308] remove old code

---
 restapi/index.php | 197 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 145 insertions(+), 52 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index 24415cbdc..1b7d7c424 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -5,12 +5,6 @@ include("../inc/inc.Settings.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.DBInit.php");
-//require_once "SeedDMS/Core.php";
-require_once "SeedDMS/Preview.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 . "\"");
-//$dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
 
 if(USE_PHP_SESSION) {
     session_start();
@@ -55,24 +49,62 @@ if(USE_PHP_SESSION) {
     }
 }
 
-
-#require 'Slim/Slim.php';
 require "vendor/autoload.php";
-#\Slim\Slim::registerAutoloader();
 
 function __getLatestVersionData($lc) { /* {{{ */
     $document = $lc->getDocument();
-    return array(
+    $data = array(
         'type'=>'document',
-        'id'=>$document->getId(),
-        'date'=>$document->getDate(),
+        'id'=>(int)$document->getId(),
+        'date'=>date('Y-m-d H:i:s', $document->getDate()),
         'name'=>$document->getName(),
+        'comment'=>$document->getComment(),
+        'keywords'=>$document->getKeywords(),
         'mimetype'=>$lc->getMimeType(),
         'version'=>$lc->getVersion(),
         'size'=>$lc->getFileSize(),
-        'comment'=>$document->getComment(),
-        'keywords'=>$document->getKeywords(),
     );
+    $cats = $document->getCategories();
+    if($cats) {
+        $c = array();
+        foreach($cats as $cat) {
+            $c[] = array('id'=>(int)$cat->getID(), 'name'=>$cat->getName());
+        }
+        $data['categories'] = $c;
+    }
+    $attributes = $document->getAttributes();
+    if($attributes) {
+        $attrvalues = array();
+        foreach($attributes as $attrdefid=>$attribute)
+            $attrvalues[] = array('id'=>(int)$attrdefid, 'value'=>$attribute->getValue());
+        $data['attributes'] = $attrvalues;
+    }
+    $attributes = $lc->getAttributes();
+    if($attributes) {
+        $attrvalues = array();
+        foreach($attributes as $attrdefid=>$attribute)
+            $attrvalues[] = array('id'=>(int)$attrdefid, 'value'=>$attribute->getValue());
+        $data['version-attributes'] = $attrvalues;
+    }
+    return $data;
+} /* }}} */
+
+function __getFolderData($folder) { /* {{{ */
+    $data = array(
+        'type'=>'folder',
+        'id'=>$folder->getID(),
+        'name'=>$folder->getName(),
+        'comment'=>$folder->getComment(),
+        'date'=>date('Y-m-d H:i:s', $folder->getDate()),
+    );
+    $attributes = $folder->getAttributes();
+    if($attributes) {
+        $attrvalues = array();
+        foreach($attributes as $attrdefid=>$attribute)
+            $attrvalues[] = array('id'=>(int)$attrdefid, 'value'=>$attribute->getValue());
+        $data['attributes'] = $attrvalues;
+    }
+    return $data;
 } /* }}} */
 
 function doLogin() { /* {{{ */
@@ -150,6 +182,7 @@ function setFullName() { /* {{{ */
     }
 
     $userobj->setFullName($app->request()->put('fullname'));
+    $app->response()->header('Content-Type', 'application/json');
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$userobj->getFullName()));
 } /* }}} */
 
@@ -163,6 +196,7 @@ function setEmail($id) { /* {{{ */
     }
 
     $userobj->setEmail($app->request()->put('fullname'));
+    $app->response()->header('Content-Type', 'application/json');
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$userid));
 } /* }}} */
 
@@ -200,11 +234,8 @@ function getFolder($id = null) { /* {{{ */
     }
     if($folder) {
         if($folder->getAccessMode($userobj) >= M_READ) {
+            $data = __getFolderData($folder);
             $app->response()->header('Content-Type', 'application/json');
-            $data = array(
-                'id'=>$folder->getID(),
-                'name'=>$folder->getName()
-            );
             echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
         } else {
             $app->response()->status(404);
@@ -217,20 +248,24 @@ function getFolder($id = null) { /* {{{ */
 function getFolderParent($id) { /* {{{ */
     global $app, $dms, $userobj;
     if($id == 0) {
+        $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
         return;
     }
     $root = $dms->getRootFolder();
     if($root->getId() == $id) {
+        $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'id is root folder', 'data'=>''));
         return;
     }
     $folder = $dms->getFolder($id);
     $parent = $folder->getParent();
     if($parent) {
-        $rec = array('type'=>'folder', 'id'=>$parent->getId(), 'name'=>$parent->getName());
+        $rec = __getFolderData($parent);
+        $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$rec));
     } else {
+        $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'', 'data'=>''));
     }
 } /* }}} */
@@ -238,6 +273,7 @@ function getFolderParent($id) { /* {{{ */
 function getFolderPath($id) { /* {{{ */
     global $app, $dms, $userobj;
     if($id == 0) {
+        $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
         return;
     }
@@ -248,6 +284,7 @@ function getFolderPath($id) { /* {{{ */
     foreach($path as $element) {
         $data[] = array('id'=>$element->getId(), 'name'=>$element->getName());
     }
+    $app->response()->header('Content-Type', 'application/json');
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
 } /* }}} */
 
@@ -278,7 +315,7 @@ function getFolderChildren($id) { /* {{{ */
     global $app, $dms, $userobj;
     if($id == 0) {
         $folder = $dms->getRootFolder();
-        $recs = array(array('type'=>'folder', 'id'=>$folder->getId(), 'name'=>$folder->getName()));
+        $recs = array(__getFolderData($folder));
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
     } else {
@@ -289,13 +326,7 @@ function getFolderChildren($id) { /* {{{ */
                 $subfolders = $folder->getSubFolders();
                 $subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $userobj, M_READ);
                 foreach($subfolders as $subfolder) {
-                    $recs[] = array(
-                        'type'=>'folder',
-                        'id'=>$subfolder->getId(),
-                        'name'=>$subfolder->getName(),
-                        'comment'=>$subfolder->getComment(),
-                        'date'=>$subfolder->getDate(),
-                    );
+                    $recs[] = __getFolderData($subfolder);
                 }
                 $documents = $folder->getDocuments();
                 $documents = SeedDMS_Core_DMS::filterAccess($documents, $userobj, M_READ);
@@ -327,6 +358,7 @@ function createFolder($id) { /* {{{ */
     }
 
     if($id == 0) {
+        $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
         return;
     }
@@ -347,14 +379,18 @@ function createFolder($id) { /* {{{ */
             if($folder = $parent->addSubFolder($name, $comment, $userobj, 0, $newattrs)) {
 
                 $rec = array('id'=>$folder->getId(), 'name'=>$folder->getName(), 'comment'=>$folder->getComment());
+                $app->response()->header('Content-Type', 'application/json');
                 echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$rec));
             } else {
+                $app->response()->header('Content-Type', 'application/json');
                 echo json_encode(array('success'=>false, 'message'=>'', 'data'=>''));
             }
         } else {
+            $app->response()->header('Content-Type', 'application/json');
             echo json_encode(array('success'=>false, 'message'=>'', 'data'=>''));
         }
     } else {
+        $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'', 'data'=>''));
     }
 } /* }}} */
@@ -408,6 +444,7 @@ function deleteFolder($id) { /* {{{ */
     }
 
     if($id == 0) {
+        $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
         return;
     }
@@ -441,6 +478,7 @@ function uploadDocument($id) { /* {{{ */
     }
 
     if($id == 0) {
+        $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
         return;
     }
@@ -505,6 +543,7 @@ function uploadDocumentPut($id) { /* {{{ */
     }
 
     if($id == 0) {
+        $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
         return;
     }
@@ -553,6 +592,7 @@ function uploadDocumentFile($documentId) { /* {{{ */
     }
 
     if($documentId == 0) {
+        $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
         return;
     }
@@ -852,6 +892,7 @@ function getDocumentAttributes($id) { /* {{{ */
 
 function getDocumentPreview($id, $version=0, $width=0) { /* {{{ */
     global $app, $dms, $userobj, $settings;
+    require_once "SeedDMS/Preview.php";
     $document = $dms->getDocument($id);
 
     if($document) {
@@ -989,13 +1030,7 @@ function doSearch() { /* {{{ */
                     }
                 } elseif(get_class($entry) == 'SeedDMS_Core_Folder') {
                     $folder = $entry;
-                    $recs[] = array(
-                        'type'=>'folder',
-                        'id'=>$folder->getId(),
-                        'name'=>$folder->getName(),
-                        'comment'=>$folder->getComment(),
-                        'date'=>$folder->getDate(),
-                    );
+                    $recs[] = __getFolderData($folder);
                 }
             }
             $app->response()->header('Content-Type', 'application/json');
@@ -1044,13 +1079,7 @@ function doSearchByAttr() { /* {{{ */
             }
         } elseif(get_class($entry) == 'SeedDMS_Core_Folder') {
             $folder = $entry;
-            $recs[] = array(
-                'type'=>'folder',
-                'id'=>$folder->getId(),
-                'name'=>$folder->getName(),
-                'comment'=>$folder->getComment(),
-                'date'=>$folder->getDate(),
-            );
+            $recs[] = __getFolderData($folder);
         }
     }
     $app->response()->header('Content-Type', 'application/json');
@@ -1310,6 +1339,7 @@ function changeGroupMembership($id, $operationType) { /* {{{ */
         {
             $message = 'Could not remove user from group.';
         }
+        $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Something went wrong. ' . $message, 'data'=>''));
         return;
     }
@@ -1487,6 +1517,7 @@ function changeFolderAccess($id, $operationType, $userOrGroup) { /* {{{ */
         {
             $message = 'Could not remove user/group access from this folder.';
         }
+        $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Something went wrong. ' . $message, 'data'=>''));
         return;
     }
@@ -1496,11 +1527,11 @@ function changeFolderAccess($id, $operationType, $userOrGroup) { /* {{{ */
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
 } /* }}} */
 
-
 function getCategories() { /* {{{ */
     global $app, $dms, $userobj;
 
     $categories = $dms->getDocumentCategories();
+    $data = [];
     foreach($categories as $category)
         $data[] = ['id' => $category->getId(), 'name' => $category->getName()];
 
@@ -1513,16 +1544,22 @@ function addCategory() { /* {{{ */
     checkIfAdmin();
 
     $category = $app->request()->params("category");
-    if ($category == null)
-    {
+    if ($category == null) {
+        $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Need a category.', 'data'=>''));
         return;
     }
 
-    $data = $dms->addDocumentCategory($category);
+    $catobj = $dms->getDocumentCategoryByName($category);
+    if($catobj) {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'Category already exists', 'data'=>''));
+    } else {
+        $data = $dms->addDocumentCategory($category);
 
-    $app->response()->header('Content-Type', 'application/json');
-    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+    }
 } /* }}} */
 
 function deleteCategory($id) { /* {{{ */
@@ -1556,7 +1593,7 @@ function changeCategoryName($id) { /* {{{ */
 
     $newname = $app->request()->put('name');
 
-		$category = null;
+    $category = null;
     if(is_numeric($id))
         $category = $dms->getDocumentCategory($id);
 
@@ -1580,6 +1617,61 @@ function changeCategoryName($id) { /* {{{ */
     return;
 } /* }}} */
 
+function getAttributeDefinitions() { /* {{{ */
+    global $app, $dms, $userobj;
+
+    $attrdefs = $dms->getAllAttributeDefinitions();
+    $data = [];
+    foreach($attrdefs as $attrdef)
+        $data[] = ['id' => (int)$attrdef->getId(), 'name' => $attrdef->getName(), 'type'=>(int)$attrdef->getType(), 'objtype'=>(int)$attrdef->getObjType(), 'min'=>(int)$attrdef->getMinValues(), 'max'=>(int)$attrdef->getMaxValues(), 'multiple'=>$attrdef->getMultipleValues()?true:false, 'valueset'=>$attrdef->getValueSetAsArray()];
+
+    $app->response()->header('Content-Type', 'application/json');
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+} /* }}} */
+
+/**
+ * Updates the name of an existing attribute definition
+ *
+ * @param      <type>  $id     The user name or numerical identifier
+ */
+function changeAttributeDefinitionName($id) { /* {{{ */
+    global $app, $dms, $userobj;
+
+    checkIfAdmin();
+
+    if ($app->request()->put('name') == null)
+    {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'You must PUT a new name', 'data'=>''));
+        return;
+    }
+
+    $newname = $app->request()->put('name');
+
+    $attrdef = null;
+    if(is_numeric($id))
+        $attrdef = $dms->getAttributeDefinition($id);
+
+    /**
+     * Category not found
+     */
+    if (!$attrdef) {
+        $app->response()->status(404);
+        return;
+    }
+
+    if (!$attrdef->setName($newname)) {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'', 'data'=>'Could not change name.'));
+        return;
+    }
+
+    $app->response()->header('Content-Type', 'application/json');
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
+
+    return;
+} /* }}} */
+
 function clearFolderAccessList($id) { /* {{{ */
     global $app, $dms, $userobj;
     checkIfAdmin();
@@ -1601,19 +1693,18 @@ function clearFolderAccessList($id) { /* {{{ */
 } /* }}} */
 
 //$app = new Slim(array('mode'=>'development', '_session.handler'=>null));
-$app = new \Slim\Slim(array('mode'=>'development', '_session.handler'=>null));
+$app = new \Slim\Slim(array('mode'=>'production', '_session.handler'=>null));
 
 $app->configureMode('production', function () use ($app) {
     $app->config(array(
-        'log.enable' => true,
-        'log.path' => '/tmp/',
+        'log.enable' => false,
         'debug' => false
     ));
 });
 
 $app->configureMode('development', function () use ($app) {
     $app->config(array(
-        'log.enable' => false,
+        'log.enable' => true,
         'debug' => true
     ));
 });
@@ -1671,6 +1762,8 @@ $app->get('/categories', 'getCategories');
 $app->delete('/categories/:id', 'deleteCategory');
 $app->post('/categories', 'addCategory');
 $app->put('/categories/:id/name', 'changeCategoryName');
+$app->get('/attributedefinitions', 'getAttributeDefinitions');
+$app->put('/attributedefinitions/:id/name', 'changeAttributeDefinitionName');
 $app->run();
 
 ?>

From a047e8af618986c932aa37cd6282d6b503fc421f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 21 Dec 2017 15:23:59 +0100
Subject: [PATCH 195/308] major update of dutch

---
 languages/nl_NL/lang.inc | 580 ++++++++++++++++++++-------------------
 1 file changed, 299 insertions(+), 281 deletions(-)

diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index c6f3c40da..833995878 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -19,22 +19,22 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (745), gijsbertush (333), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (745), gijsbertush (610), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
-'2_factor_auth' => 'Twee-factor-authorisatie',
-'2_factor_auth_info' => 'Info 2-factor-authorisatie',
-'2_fact_auth_secret' => 'Toegangscode 2-factor-authorisatie',
-'accept' => 'Accept',
+'2_factor_auth' => '2-factor-authenticatie',
+'2_factor_auth_info' => 'Dit systeem werkt met 2-factor-authenticatie. U heeft de Google Authenticator nodig op uf mobiele telfoon. Hieronder staan 2 QR-codes. De rechter is uw huidige geheime code. Met de linker kunt u een nieuwe geheime code instellen. Denk erom de nieuwe code opnieuw te scannen met Googke Authenticator.',
+'2_fact_auth_secret' => 'Toegangscode 2-factor-authenticatie',
+'accept' => 'Accepteren',
 'access_control' => 'Toegangscontrole',
-'access_control_is_off' => 'Toegansgscontrole staat uit',
+'access_control_is_off' => 'Toegangscontrole staat uit',
 'access_denied' => 'Geen toegang.',
 'access_inheritance' => 'Toegang overgeërfd',
-'access_mode' => 'Toegang modus',
+'access_mode' => 'Toegangsmodus',
 'access_mode_all' => 'Alle machtigingen',
 'access_mode_none' => 'Geen toegang',
-'access_mode_read' => 'Lees rechten',
-'access_mode_readwrite' => 'Lees en Schrijf rechten',
+'access_mode_read' => 'Leesrechten',
+'access_mode_readwrite' => 'Lees- en Schrijf rechten',
 'access_permission_changed_email' => 'Machtigingen gewijzigd',
 'access_permission_changed_email_body' => 'Toestemming veranderd
 Document: [naam]
@@ -47,14 +47,14 @@ URL: [url]',
 'actions' => 'Acties',
 'action_approve' => 'Goedkeuren',
 'action_complete' => 'Compleet',
-'action_is_complete' => 'Is compleet',
-'action_is_not_complete' => 'Is niet compleet',
+'action_is_complete' => 'is compleet',
+'action_is_not_complete' => 'is niet compleet',
 'action_reject' => 'Geweigerd',
 'action_review' => 'Beoordelen',
-'action_revise' => 'Herzie',
+'action_revise' => 'Nog herzien',
 'add' => 'Toevoegen',
 'add_approval' => 'Verzend [Goedkeuring]',
-'add_attrdefgroup' => '',
+'add_attrdefgroup' => 'Voeg een nieuwe attribuutgroep toe',
 'add_document' => 'Document toevoegen',
 'add_document_link' => 'Link toevoegen',
 'add_document_notify' => 'Notificatie toekennen',
@@ -88,20 +88,20 @@ URL: [url]',
 'already_subscribed' => 'Al ingetekend',
 'and' => 'en',
 'apply' => 'Toepassen',
-'approvals_accepted' => '',
-'approvals_and_reviews_accepted' => '',
-'approvals_and_reviews_not_touched' => '',
-'approvals_and_reviews_rejected' => '',
-'approvals_not_touched' => '',
-'approvals_rejected' => '',
-'approvals_without_group' => '',
-'approvals_without_user' => '',
-'approval_deletion_email' => 'Goedkeuring verzoek verwijderd',
-'approval_deletion_email_body' => 'Vraag om goedkeuring verwijderd
+'approvals_accepted' => '[no_approvals] goedkeuringen',
+'approvals_and_reviews_accepted' => '[no_approvals] goedkeuringen en [no_reviews] geaccepteerde reviews',
+'approvals_and_reviews_not_touched' => '[no_approvals] goedkeuringen [no_reviews] reviews nog niet behandeld',
+'approvals_and_reviews_rejected' => '[no_approvals] goedkeuringen en [no_reviews] reviews afgekeurd',
+'approvals_not_touched' => '[no_approvals] goedkeuringen nog niet behandeld',
+'approvals_rejected' => '[no_approvals] goedkeuringen afgekeurd',
+'approvals_without_group' => 'Goedkeuringen zonder groep',
+'approvals_without_user' => 'Goedkeuringen zonder gebruiker',
+'approval_deletion_email' => 'Goedkeuringsverzoek verwijderd',
+'approval_deletion_email_body' => 'Approval request deleted
 Document: [name]
-Versie: [version]
-Map: [folder_path]
-Gebruiker: [username]
+Version: [version]
+Parent folder: [folder_path]
+User: [username]
 URL: [url]',
 'approval_deletion_email_subject' => '[sitename]: [name] - Verzoek om goedkeuring verwijderd',
 'approval_file' => 'Goedkeuring bestand',
@@ -131,12 +131,12 @@ URL: [url]',
 'assign_approvers' => 'Aangewezen [Goedkeurders]',
 'assign_reviewers' => 'Aangewezen [Controleurs]',
 'assign_user_property_to' => 'Wijs gebruikers machtigingen toe aan',
-'assumed_released' => 'aangenomen status: Gepubliceerd',
-'attrdefgroup_management' => '',
-'attrdefgrp_show_detail' => '',
-'attrdefgrp_show_list' => '',
-'attrdefgrp_show_search' => '',
-'attrdefgrp_show_searchlist' => '',
+'assumed_released' => 'vermoedelijke status: Gepubliceerd',
+'attrdefgroup_management' => 'Beheer attribuut-definiities',
+'attrdefgrp_show_detail' => 'Details Beheer attribuut-definiities',
+'attrdefgrp_show_list' => 'Lijst van attribuut-definiities',
+'attrdefgrp_show_search' => 'Zoeken naar attribuut-definiities',
+'attrdefgrp_show_searchlist' => 'Lijst van gezochte attribuut-definiities',
 'attrdef_exists' => 'Kenmerk definitie bestaat al',
 'attrdef_info' => 'Kenmerk info',
 'attrdef_in_use' => 'Kenmerk definitie nog in gebruikt',
@@ -171,18 +171,18 @@ URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: [name] - Attribuut gewijzigd',
 'attribute_count' => 'Aantal maal gebruikt',
 'attribute_value' => 'Waarde van het attribuut',
-'attribute_value_not_in_valueset' => '',
-'attr_malformed_boolean' => '',
-'attr_malformed_date' => '',
+'attribute_value_not_in_valueset' => 'Waarde van attribuut bestaat niet',
+'attr_malformed_boolean' => 'Foute vormgeving boolean',
+'attr_malformed_date' => 'Foute vormgeving datum',
 'attr_malformed_email' => 'Foute vormgeving email',
-'attr_malformed_float' => '',
-'attr_malformed_int' => '',
-'attr_malformed_url' => 'Foute url',
+'attr_malformed_float' => 'Foute vormgeving getal',
+'attr_malformed_int' => 'Foute vormgeving geheel getal',
+'attr_malformed_url' => 'Foute vormgeving url',
 'attr_max_values' => 'attribuut: maximale waarde',
 'attr_min_values' => 'attribuut: minimale waarde',
-'attr_not_in_valueset' => '',
+'attr_not_in_valueset' => 'Attribuut bestaat niet',
 'attr_no_regex_match' => 'De waarde van het attribuut komt niet overeen met de veelgebruikte uitdrukking (regular expression)',
-'attr_validation_error' => '',
+'attr_validation_error' => 'Attribuut niet geldig',
 'at_least_n_users_of_group' => 'Minimaal [number_of_users] gebruikers van [group]',
 'august' => 'augustus',
 'authentication' => 'Authentificatie',
@@ -235,11 +235,11 @@ URL: [url]',
 'checkedout_file_has_disappeared' => 'File is onvindbaar',
 'checkedout_file_is_unchanged' => 'Checkout-document ongewijzigd',
 'checkin_document' => 'Veranderd document',
-'checkoutpath_does_not_exist' => '',
+'checkoutpath_does_not_exist' => 'Checkout-pad bestaat niet',
 'checkout_document' => 'Checkout-document',
 'checkout_is_disabled' => 'Checkout is niet mogelijk',
-'choose_attrdef' => 'Selecteer een kenmerk definitie',
-'choose_attrdefgroup' => '',
+'choose_attrdef' => 'Kies een kenmerkdefinitie',
+'choose_attrdefgroup' => 'Kies een kenmerkdefinite-groep',
 'choose_category' => 'Selecteer a.u.b.',
 'choose_group' => 'Selecteer Groep',
 'choose_role' => 'Selecteer een rol',
@@ -251,17 +251,17 @@ URL: [url]',
 'choose_workflow' => 'Kies workflow',
 'choose_workflow_action' => 'Kies workflow actie',
 'choose_workflow_state' => 'kiest workflowstatus',
-'class_name' => '',
+'class_name' => 'naam vd Klasse',
 'clear_cache' => 'Cache leegmaken',
 'clear_clipboard' => 'Vrijgeven klembord',
-'clear_password' => '',
+'clear_password' => 'Verwijder het wachtwoord',
 'clipboard' => 'Klembord',
 'close' => 'Sluiten',
-'command' => '',
+'command' => 'Commando',
 'comment' => 'Commentaar',
 'comment_changed_email' => 'Gewijzigde email',
 'comment_for_current_version' => 'Versie van het commentaar',
-'confirm_clear_cache' => '',
+'confirm_clear_cache' => 'Ja, ik wil de cache opschonen!',
 'confirm_create_fulltext_index' => 'Ja, Ik wil de volledigetekst index opnieuw maken!',
 'confirm_move_document' => 'Bevestig verplaatsing van document',
 'confirm_move_folder' => 'Bevestig de verplaatsing van de map',
@@ -278,16 +278,16 @@ URL: [url]',
 'confirm_rm_transmittal' => 'Bestig de verwijdering van de verzending',
 'confirm_rm_transmittalitem' => 'Bevestig te verzenden item',
 '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_user_from_processes' => '',
+'confirm_rm_user_from_processes' => 'Weet U zeker dat U de Gebruiker "[username]" wilt verwijderen uit dit proces?<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_transfer_objects' => '',
+'confirm_transfer_objects' => 'Weet U zeker dat U de documenten, mappen etc. van gebruiker "[username]" wilt overzetten?<br>Let op: deze handeling kan niet ongedaan worden gemaakt.',
 'confirm_update_transmittalitem' => 'Bevestig verandering van te verzenden item',
 'content' => 'Welkomstpagina',
 'continue' => 'Doorgaan',
 'converter_new_cmd' => 'Wijziging: nieuw commando',
 'converter_new_mimetype' => 'Wijziging: nieuw mimetype',
 'copied_to_checkout_as' => 'Gekopieerd naar checkout als:',
-'create_download_link' => '',
+'create_download_link' => 'Maak een download-link',
 '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',
@@ -300,7 +300,7 @@ URL: [url]',
 'databasesearch' => 'Zoek in Database',
 'date' => 'Datum',
 'days' => 'Dagen',
-'debug' => '',
+'debug' => 'debug',
 'december' => 'december',
 'default_access' => 'Standaard toegang',
 'default_keywords' => 'Beschikbare sleutelwoorden',
@@ -311,10 +311,10 @@ URL: [url]',
 'de_DE' => 'Duits',
 'disclaimer' => 'Dit is een beveiligde omgeving. Gebruik is alleen toegestaan voor geautoriseerde leden. Ongeautoriseerde toegang kan worden bestraft overeenkomstig (inter)nationale wetgeving.',
 'discspace' => 'Schijfruimte',
-'docs_in_reception_no_access' => '',
-'docs_in_revision_no_access' => '',
+'docs_in_reception_no_access' => 'Documenten zonder toegang ontvanger',
+'docs_in_revision_no_access' => 'Documenten in revisie zonder toegang ontvanger',
 'document' => 'Document',
-'documentcontent' => '',
+'documentcontent' => 'Documentinhoud',
 'documents' => 'Documenten',
 'documents_checked_out_by_you' => 'Door u in behandeling genomen documenten',
 'documents_expired' => 'Verlopen documenten',
@@ -328,10 +328,10 @@ URL: [url]',
 'documents_to_review' => 'Documenten die wachten op uw controle',
 'documents_to_revise' => 'Te reviseren documenten',
 'documents_user_expiration' => '',
-'documents_user_reception' => '',
+'documents_user_reception' => 'Documenten wachten op bestemming',
 'documents_user_rejected' => 'documenten niet geaccepteerd door gebruiker',
 'documents_user_requiring_attention' => 'Eigen documenten die (nog) aandacht behoeven',
-'documents_with_notification' => '',
+'documents_with_notification' => 'Documenten met notificatie',
 'document_already_checkedout' => 'Al in behandeling genomen documenten',
 'document_already_locked' => 'Dit document is al geblokkeerd',
 'document_comment_changed_email' => 'Commentaar gewijzigd',
@@ -398,9 +398,16 @@ URL: [url]',
 'does_not_expire' => 'Verloopt niet',
 'does_not_inherit_access_msg' => 'Erft toegang',
 'download' => 'Download',
-'download_links' => '',
-'download_link_email_body' => '',
-'download_link_email_subject' => '',
+'download_links' => 'Download-links',
+'download_link_email_body' => 'Klik op de link hieronder, dan begint de download vanvversie [version] van het document
+\'[docname]\'.
+
+[url]
+
+De link is geldig tot [valid].
+
+[comment]',
+'download_link_email_subject' => 'Onderwerp',
 'do_object_repair' => 'Repareer alle mappen en documenten.',
 'do_object_setchecksum' => 'Set checksum',
 'do_object_setfilesize' => 'Voer bestandgrootte in',
@@ -409,16 +416,16 @@ URL: [url]',
 '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!',
-'dropfolderdir_missing' => '',
-'dropfolder_file' => 'Bestand van dropfolder',
-'dropfolder_folder' => 'Map van de drop-map',
+'dropfolderdir_missing' => 'Uw persoonlijke map om files te droppen (dropfolder) bestaat niet op de server! Vraag de administrator om deze aan te maken.',
+'dropfolder_file' => 'Bestand in  dropfolder',
+'dropfolder_folder' => 'Map in dropfolder',
 'dropupload' => 'Snel toevoegen',
-'drop_files_here' => 'Sleep bestanden hierheen!',
-'dump_creation' => 'DB dump aanmaken',
+'drop_files_here' => 'Sleep bestanden hierheen',
+'dump_creation' => 'DB-dump aanmaken',
 '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',
-'duplicates' => 'Duplicaat',
+'duplicates' => 'Dubbelen',
 'duplicate_content' => 'Dubbele inhoud',
 'edit' => 'Wijzigen',
 'edit_attributes' => 'Bewerk attributen',
@@ -429,10 +436,10 @@ URL: [url]',
 'edit_document_props' => 'Wijzig document',
 'edit_event' => 'Activiteit wijzigen',
 'edit_existing_access' => 'Wijzig toegangslijst',
-'edit_existing_attribute_groups' => '',
+'edit_existing_attribute_groups' => 'Bewerk attribuutgroepen',
 'edit_existing_notify' => 'Wijzig Notificatie lijst',
 'edit_folder_access' => 'Wijzig toegang',
-'edit_folder_attrdefgrp' => '',
+'edit_folder_attrdefgrp' => 'Bewerk de groep van attributen',
 'edit_folder_notify' => 'Map Notificatie Lijst',
 'edit_folder_props' => 'Wijzig Map eigenschappen',
 'edit_group' => 'Wijzig Groep',
@@ -440,14 +447,14 @@ URL: [url]',
 'edit_transmittal_props' => 'Opmerkingen bij verzending',
 'edit_user' => 'Wijzig gebruiker',
 'edit_user_details' => 'Wijzig gebruiker Details',
-'edit_version' => '',
-'el_GR' => 'Griek',
+'edit_version' => 'Bewerk versie',
+'el_GR' => 'Grieks',
 'email' => 'E-mail',
 'email_error_title' => 'Geen email ingevoerd',
 'email_footer' => 'U kunt altijd uw e-mail instellingen wijzigen via de \'Mijn Account\' opties',
 'email_header' => 'Dit is een automatisch gegenereerd bericht van de DMS server.',
 'email_not_given' => 'Voer aub een geldig email adres in.',
-'empty_attribute_group_list' => '',
+'empty_attribute_group_list' => 'Lege lijst van attributen',
 'empty_folder_list' => 'Geen documenten of mappen',
 'empty_notify_list' => 'Geen gegevens',
 'en_GB' => 'Engels (GB)',
@@ -455,33 +462,33 @@ URL: [url]',
 'error' => 'Fout',
 'error_add_aro' => 'Verzoek om toegang toegevoegd',
 'error_add_permission' => 'Voeg permissie toe',
-'error_cleared_cache' => '',
-'error_importfs' => '',
+'error_cleared_cache' => 'Fout bij het leegmaken van de cache',
+'error_importfs' => 'Fout bij het importeren van form file systeem',
 'error_no_document_selected' => 'Geen document geselecteerd',
 'error_no_folder_selected' => 'Geen map geselecteerd',
 'error_occured' => 'Er is een fout opgetreden',
-'error_remove_document' => '',
-'error_remove_folder' => '',
+'error_remove_document' => 'Fout bij het verwijderen van document',
+'error_remove_folder' => 'Fout bij het verwijderen van map',
 'error_remove_permission' => 'Verwijder permissie',
 'error_toogle_permission' => 'Wijzig permissie',
 'error_transfer_document' => '',
 'es_ES' => 'Spaans',
-'event_details' => 'Activiteit details',
-'exclude_items' => 'Sluit iems uit',
+'event_details' => 'Activiteit-details',
+'exclude_items' => 'Sluit iets uit',
 'expired' => 'Verlopen',
-'expired_at_date' => '',
+'expired_at_date' => 'Verloopdatum',
 'expired_documents' => '',
 'expires' => 'Verloopt',
 'expire_by_date' => 'Vervaldatum',
-'expire_in_1d' => '',
-'expire_in_1h' => '',
+'expire_in_1d' => 'Vervalt binnen 1 dag',
+'expire_in_1h' => 'Vervalt binnen 1 uur',
 'expire_in_1m' => 'Vervalt binnen 1 maand',
 'expire_in_1w' => 'Vervalt binnen 1 week',
 'expire_in_1y' => 'Vervalt binnen 1 jaar',
-'expire_in_2h' => '',
+'expire_in_2h' => 'Vervalt binnen 2 uur',
 'expire_in_2y' => 'Vervalt binnen 2 jaar',
-'expire_today' => '',
-'expire_tomorrow' => '',
+'expire_today' => 'Vervalt vandaag',
+'expire_tomorrow' => 'Vervalt morgen',
 'expiry_changed_email' => 'Verloopdatum gewijzigd',
 'expiry_changed_email_body' => 'Vervaldatum gewijzigd
 Document: [name]
@@ -503,7 +510,7 @@ URL: [url]',
 'folder' => 'Map',
 'folders' => 'Mappen',
 'folders_and_documents_statistic' => 'Inhoudsopgave',
-'folders_with_notification' => '',
+'folders_with_notification' => 'Mappen met notificatie',
 'folder_comment_changed_email' => 'Commentaar gewijzigd',
 'folder_comment_changed_email_body' => 'Commentaar gewijzigd
 Map: [name]
@@ -545,16 +552,16 @@ URL: [url]',
 'fr_FR' => 'Frans',
 'fullsearch' => 'Zoek in volledige tekst',
 'fullsearch_hint' => 'Volledige tekst index',
-'fulltextsearch_disabled' => '',
+'fulltextsearch_disabled' => 'Fulltext-zoeken uitgeschakeld',
 'fulltext_converters' => 'Index document conversie',
 'fulltext_info' => 'Volledige tekst index info',
-'global_attributedefinitiongroups' => '',
+'global_attributedefinitiongroups' => 'Kennmerk-definitie groepen',
 'global_attributedefinitions' => 'Kenmerk definities',
 'global_default_keywords' => 'Algemene sleutelwoorden',
-'global_document_categories' => 'Categorieen',
+'global_document_categories' => 'Categorieën',
 'global_workflows' => 'Workflows',
-'global_workflow_actions' => 'Workflow acties',
-'global_workflow_states' => 'Workflow status',
+'global_workflow_actions' => 'Workflow-acties',
+'global_workflow_states' => 'Workflow-status',
 'group' => 'Groep',
 'groups' => 'Groepen',
 'group_approval_summary' => 'Groep [Goedkeuring] samenvatting',
@@ -566,36 +573,36 @@ URL: [url]',
 'group_review_summary' => 'Groep Beoordeling samenvatting',
 'guest_login' => 'Login als Gast',
 'guest_login_disabled' => 'Gast login is uitgeschakeld.',
-'hash' => '',
+'hash' => 'Hashcode',
 'help' => 'Help',
 'home_folder' => 'Thuismap',
-'hook_name' => '',
+'hook_name' => 'Naam vd hook',
 'hourly' => 'Elk uur',
-'hours' => 'uren',
+'hours' => 'uur',
 'hr_HR' => 'Kroatisch',
-'human_readable' => 'Leesbaar Archief',
+'human_readable' => 'Leesbaar archief',
 'hu_HU' => 'Hongaars',
 'id' => 'ID',
 'identical_version' => 'Nieuwe versie is identiek aan de huidige versie',
 'import' => 'Importeer',
-'importfs' => '',
+'importfs' => 'Importeer van bestandssysteem',
 'import_fs' => 'Importeer van bestandssysteem',
-'import_fs_warning' => 'Dit werkt alleen voor mappen in de drop-map. Alle mappen en bestanden worden recursief geimporteerd. Bestanden worden onmiddelijk vrijgegeven.',
+'import_fs_warning' => 'Dit werkt alleen in de dropfolder. Mappen en bestanden worden recursief geïmporteerd. Bestanden worden direct ter beschikking gesteld.',
 'include_content' => 'inclusief inhoud',
 'include_documents' => 'Inclusief documenten',
 'include_subdirectories' => 'Inclusief submappen',
 'indexing_tasks_in_queue' => 'Indexerings taken in wachtrij',
-'index_done' => '',
-'index_error' => '',
+'index_done' => 'Indexering gereed',
+'index_error' => 'Fout bij indexering',
 'index_folder' => 'Inhoud',
-'index_pending' => '',
-'index_waiting' => '',
+'index_pending' => 'Indexering moet nog gebeuren',
+'index_waiting' => 'Indexering wacht',
 'individuals' => 'Individuen',
 'indivіduals_in_groups' => 'Individuen in groepen',
 'inherited' => 'overgeerfd',
 'inherits_access_copy_msg' => 'Kopie lijst overerfde toegang',
 'inherits_access_empty_msg' => 'Begin met lege toegangslijst',
-'inherits_access_msg' => 'Toegang is (over/ge)erfd..',
+'inherits_access_msg' => 'Toegang is (over/ge)erfd.',
 'internal_error' => 'Interne fout',
 'internal_error_exit' => 'Interne fout. Niet mogelijk om verzoek uit de voeren.',
 'invalid_access_mode' => 'Foutmelding: verkeerde toegangsmode',
@@ -604,7 +611,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Foutieve eind-datum voor het maken van een periode.',
 'invalid_create_date_start' => 'Foutieve begin-datum voor het maken van een periode.',
 'invalid_doc_id' => 'Foutief Document ID',
-'invalid_dropfolder_folder' => '',
+'invalid_dropfolder_folder' => 'Ongeldige dropfolder-map',
 'invalid_expiration_date_end' => 'Foute expiratiedatum',
 'invalid_expiration_date_start' => 'Foute startdatum',
 'invalid_file_id' => 'Foutief Bestand ID',
@@ -626,13 +633,13 @@ URL: [url]',
 'is_hidden' => 'Afschermen van Gebruikerslijst',
 'it_IT' => 'Italiaans',
 'january' => 'januari',
-'js_form_error' => '',
-'js_form_errors' => '',
-'js_invalid_email' => '',
+'js_form_error' => 'Fout in JavaScript',
+'js_form_errors' => 'Fouten in JavaScript',
+'js_invalid_email' => 'Ongeldige email',
 'js_no_approval_group' => 'Selecteer a.u.b. een Goedkeuring Groep',
 'js_no_approval_status' => 'Selecteer a.u.b. een Goedkeuring Status',
 'js_no_comment' => 'Er zijn geen commentaren',
-'js_no_currentpwd' => '',
+'js_no_currentpwd' => 'Geen geldig wachtwoord',
 'js_no_email' => 'Voer uw e-mail adres in',
 'js_no_file' => 'Selecteer een bestand',
 'js_no_keywords' => 'Specificeer een aantal sleutelwoorden',
@@ -646,8 +653,8 @@ URL: [url]',
 'js_pwd_not_conf' => 'Wachtwoord en bevestigingswachtwoord zijn niet identiek',
 'js_select_user' => 'Selecteer een Gebruiker',
 'js_select_user_or_group' => 'Selecteer tenminste een Gebruiker of Groep',
-'js_unequal_passwords' => '',
-'july' => 'july',
+'js_unequal_passwords' => 'Ongelijke wachtwoorden',
+'july' => 'juli',
 'june' => 'juni',
 'keep' => 'Behouden',
 'keep_doc_status' => 'Behoud status document',
@@ -662,14 +669,14 @@ URL: [url]',
 'librarydoc' => 'Bibliotheek',
 'linked_documents' => 'Gerelateerde Documenten',
 'linked_files' => 'Bijlagen',
-'linked_to_current_version' => '',
-'linked_to_document' => 'Gekoppeld aan document',
-'linked_to_this_version' => '',
+'linked_to_current_version' => 'Bijlagen bij huidige versie',
+'linked_to_document' => 'Bijlage(n) bij document',
+'linked_to_this_version' => 'Bijlage bij deze versie',
 'link_alt_updatedocument' => 'Als u bestanden wilt uploaden groter dan het huidige maximum, gebruik aub de alternatieve <a href="%s">upload pagina</a>.',
-'link_to_version' => '',
-'list_access_rights' => 'Oplijsten toegangsrechten',
-'list_contains_no_access_docs' => '',
-'list_hooks' => '',
+'link_to_version' => 'Bijlage(n) bij versie',
+'list_access_rights' => 'Toegangsrechten',
+'list_contains_no_access_docs' => 'Geen toegankelijke documenten',
+'list_hooks' => 'Hooks',
 'local_file' => 'Lokaal bestand',
 'locked_by' => 'In gebruik door',
 'lock_document' => 'Blokkeer',
@@ -697,30 +704,30 @@ URL: [url]',
 'march' => 'maart',
 'max_upload_size' => 'Maximale upload omvang voor ieder bestand',
 'may' => 'mei',
-'menu_dropfolder' => '',
+'menu_dropfolder' => 'Dropfolder',
 'mimetype' => 'MIME Type',
-'minutes' => 'Minuten',
+'minutes' => 'minuten',
 'misc' => 'Diversen',
 'missing_checksum' => 'Controlesom ontbreekt',
 'missing_file' => 'File ontbreekt',
 'missing_filesize' => 'Bestandsgrootte ontbreekt',
-'missing_reception' => '',
+'missing_reception' => 'Ontvanger ontbreekt',
 'missing_request_object' => 'Gevraagd object ontbreekt',
 'missing_transition_user_group' => 'Gebruiker / groep ontbreekt voor de overdracht',
-'monday' => 'Maandag',
-'monday_abbr' => 'Ma',
+'monday' => 'maandag',
+'monday_abbr' => 'ma',
 'monthly' => 'Maandelijks',
-'month_view' => 'Maand Overzicht',
+'month_view' => 'Maandoverzicht',
 'move' => 'Verplaats',
 'move_clipboard' => 'Verplaats klembord',
 'move_document' => 'Verplaats document',
-'move_folder' => 'Verplaats Map',
+'move_folder' => 'Map verplaatsen',
 'my_account' => 'Mijn Account',
 'my_documents' => 'Mijn Documenten',
 'my_transmittals' => 'Mijn zendingen',
 'name' => 'Naam',
 'needs_workflow_action' => 'Dit document vereist uw aandacht. Bekijk deze onder het tabblad workflows.',
-'network_drive' => '',
+'network_drive' => 'Networkdrive',
 'never' => 'Nooit',
 'new' => 'Nieuw',
 'new_attrdef' => 'Voeg kenmerk definitie toe',
@@ -780,7 +787,7 @@ URL: [url]',
 'no_default_keywords' => 'Geen Sleutelwoorden beschikbaar',
 'no_docs_checked_out' => 'Geen documenten in gebruik genomen',
 'no_docs_locked' => 'Geen documenten in gebruik.',
-'no_docs_rejected' => '',
+'no_docs_rejected' => 'Geen documenten geweigerd',
 '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' => 'Geen documenten te ontvangen',
@@ -802,8 +809,8 @@ URL: [url]',
 'no_version_modification' => 'Geen versiewijziging',
 'no_workflow_available' => 'Geen workflow beschikbaar',
 'objectcheck' => 'Map/Document controle',
-'object_check_critical' => '',
-'object_check_warning' => '',
+'object_check_critical' => 'Ernstige fouten',
+'object_check_warning' => 'Waarschuwingen',
 'obsolete' => 'verouderd',
 'october' => 'oktober',
 'old' => 'Oude',
@@ -850,36 +857,42 @@ Mocht u de komende minuten geen email ontvangen, probeer het dan nogmaals en con
 'password_wrong' => 'Verkeerd wachtwoord',
 'pdf_converters' => '',
 'pending_approvals' => 'Wachten op goedkeuring',
-'pending_receipt' => '',
+'pending_receipt' => 'Wachten op ontvangs',
 'pending_reviews' => 'Wachten op beoordeling',
-'pending_revision' => '',
+'pending_revision' => 'Wachten op herziening',
 'pending_workflows' => 'Wachten op workflow',
 'personal_default_keywords' => 'Persoonlijke sleutelwoorden',
-'pl_PL' => 'Polen',
+'pl_PL' => 'Pools',
 'possible_substitutes' => 'Mogelijke alternatieven',
-'preset_expires' => 'Standaard vervaltermijn',
+'preset_expires' => 'Preset verloopt',
 'preview' => 'Voorbeeld',
 'preview_converters' => 'Converters',
-'preview_images' => '',
+'preview_images' => 'Voorbeelden',
 'preview_markdown' => 'Voorbeeld in Markdown',
 'preview_pdf' => '',
 'preview_plain' => 'Voorbeeld in platte tekst',
 'previous_state' => 'Vorige staat',
 'previous_versions' => 'Vorige versies',
-'process' => '',
-'process_without_user_group' => '',
+'process' => 'Proces',
+'process_without_user_group' => 'Proces zonder gebruikersgroep',
 'pt_BR' => 'Portugees (BR)',
 'quota' => 'Quotum',
 'quota_exceeded' => 'Uw data quotum is overschreden met [bytes].',
 'quota_is_disabled' => 'Quota support is momenteel niet actief in de eigenschappen. Een user-quotum instellen zal geen effect hebben tot quota actief zijn',
 'quota_warning' => 'Uw maximale datagebruik is overschreden met [bytes]. Gelieve documenten of eerdere versies te verwijderen.',
-'receipts_accepted' => '',
-'receipts_not_touched' => '',
-'receipts_rejected' => '',
-'receipts_without_group' => '',
-'receipts_without_user' => '',
-'receipt_deletion_email_body' => '',
-'receipt_deletion_email_subject' => '',
+'receipts_accepted' => '[no_receipts] ontvangen en geaccepteerd',
+'receipts_not_touched' => '[no_receipts] ontvangen, nog niet behandeld',
+'receipts_rejected' => '[no_receipts] ontvangen, geweigerd',
+'receipts_without_group' => '[no_receipts] ontvangen, geen groep',
+'receipts_without_user' => '[no_receipts] ontvangen, geen gebruiker',
+'receipt_deletion_email_body' => 'Gebruiker is verwijderd uit de lijst van ontvangers
+Document: [name]
+Versie: [version]
+Bovenliggende map: [folder_path]
+Ontvanger: [recipient]
+Gebruiker: [username]
+URL: [url]',
+'receipt_deletion_email_subject' => '[sitename]: [name] - Ontvanger verwijderd',
 'receipt_log' => 'Log ontvangst',
 'receipt_request_email_body' => 'Verzoek ontvangen
 Document: [name]
@@ -890,13 +903,13 @@ URL: [url]',
 'receipt_request_email_subject' => '[sitename]: [name] – Verzoek ontvangen',
 'receipt_status' => 'Status ontvangst',
 'receipt_summary' => 'Samenvatting',
-'receipt_update_failed' => '',
-'reception' => '',
-'reception_acknowleged' => '',
-'reception_noaction' => '',
-'reception_rejected' => '',
+'receipt_update_failed' => 'Update ontvangst mislukt',
+'reception' => 'bestemming',
+'reception_acknowleged' => 'bestemming OK',
+'reception_noaction' => 'Geen actie',
+'reception_rejected' => 'bestemming geweigerd',
 'recipients' => 'Ontvangers',
-'redraw' => '',
+'redraw' => 'Nogmaals weergeven',
 'refresh' => 'Verversen',
 'rejected' => 'Afgewezen',
 'released' => 'Gepubliceerd',
@@ -917,7 +930,7 @@ Bovenliggende map: [folder_path]
 Gebruiker: [username]
 URL: [url]',
 'removed_workflow_email_subject' => '[sitename]: [name] - Workflow verwijderd van document versie',
-'removeFolderFromDropFolder' => 'Verwijder de map na de import',
+'removeFolderFromDropFolder' => 'Map verwijderen uit Dropfilder',
 'remove_marked_files' => 'Geselecteerde bestanden zijn verwijderd',
 'repaired' => 'Gerepareerd',
 'repairing_objects' => 'Documenten en mappen repareren.',
@@ -931,7 +944,7 @@ Gebruiker: [username]
 URL: [url]',
 'request_workflow_action_email_subject' => '[sitename]: [name] - Workflow – actie vereist',
 'reset_checkout' => 'Beëindig het gebruik van het document',
-'restrict_access' => '',
+'restrict_access' => 'Toegang beperken',
 'results_page' => 'Resultaten pagina',
 'return_from_subworkflow' => 'Terug uit subworkflow',
 'return_from_subworkflow_email_body' => 'Terug uit subworkflow
@@ -947,11 +960,11 @@ URL: [url]',
 'reviewers' => 'Beoordelaars',
 'reviewer_already_assigned' => 'is reeds aangewezen als beoordelaar',
 'reviewer_already_removed' => 'is reeds verwijderd uit het beoordelingsproces of heeft reeds een beoordeling uitgevoerd',
-'reviews_accepted' => '',
-'reviews_not_touched' => '',
-'reviews_rejected' => '',
-'reviews_without_group' => '',
-'reviews_without_user' => '',
+'reviews_accepted' => '[no_reviews] reviews geaccepteerd',
+'reviews_not_touched' => '[no_reviews] reviews niet geopend',
+'reviews_rejected' => '[no_reviews] reviews geweigerd',
+'reviews_without_group' => 'reviews zonder groep',
+'reviews_without_user' => 'reviews zonder gebruiker',
 'review_deletion_email' => 'Beoordelingsverzoek verwijderd',
 'review_deletion_email_body' => 'Beoordelingsverzoek verwijderd
 Document: [name]
@@ -985,12 +998,12 @@ URL: [url]',
 'review_update_failed' => 'Fout: bijwerken status beoordeling mislukt.',
 'revise_document' => 'Document herzien',
 'revise_document_on' => 'Volgende herziening van document op [date]',
-'revisions_accepted' => '',
-'revisions_not_touched' => '',
-'revisions_pending' => '',
-'revisions_rejected' => '',
-'revisions_without_group' => '',
-'revisions_without_user' => '',
+'revisions_accepted' => '[no_revisions] revisies geaccepteerd',
+'revisions_not_touched' => '[no_revisions] revisies geopend',
+'revisions_pending' => '[no_revisions] revisies in afwachting',
+'revisions_rejected' => '[no_revisions] revisies geweigerd',
+'revisions_without_group' => '[no_revisions] revisies zonder groep',
+'revisions_without_user' => '[no_revisions] revisies zonder gebruiker',
 'revision_date' => 'Datum revisie',
 'revision_log' => 'Log herziening',
 'revision_request_email_body' => 'Verzoek tot herziening
@@ -1016,12 +1029,12 @@ Gebruiker: [username]
 URL: [url]',
 'rewind_workflow_email_subject' => '[sitename]: [name] - Workflow is teruggezet',
 'rewind_workflow_warning' => 'Als u de workflow terugzet naar oorspronkelijke staat, dan wordt de workflow historie voor dit document verwijderd en onherstelbaar.',
-'rm_attrdef' => 'Verwijder kenmerk definitie',
-'rm_attrdefgroup' => '',
-'rm_default_keyword_category' => 'Verwijder Categorie',
-'rm_document' => 'Verwijder Document',
+'rm_attrdef' => 'Verwijder kenmerkdefinitie',
+'rm_attrdefgroup' => 'Verwijder kenmerkdefinitie-groep',
+'rm_default_keyword_category' => 'Verwijder categorie',
+'rm_document' => 'Verwijder document',
 'rm_document_category' => 'Verwijder categorie',
-'rm_event' => '',
+'rm_event' => 'Verwijder gebeurtenis',
 'rm_file' => 'Verwijder bestand',
 'rm_folder' => 'Verwijder map',
 'rm_from_clipboard' => 'Verwijder van klembord',
@@ -1030,7 +1043,7 @@ URL: [url]',
 'rm_transmittal' => 'Verwijder de verzending',
 'rm_transmittalitem' => 'Verwijder verzonden item',
 'rm_user' => 'Verwijder deze Gebruiker',
-'rm_user_from_processes' => '',
+'rm_user_from_processes' => 'Verwijder gebruiker uit het proces',
 'rm_version' => 'Verwijder versie',
 'rm_workflow' => 'Verwijder workflwo',
 'rm_workflow_action' => 'Verwijder workflow actie',
@@ -1041,8 +1054,8 @@ URL: [url]',
 'role_guest' => 'Gast',
 'role_info' => 'Informtie over de rol',
 'role_management' => 'Rol-management',
-'role_name' => 'Naam vd Rol',
-'role_type' => '',
+'role_name' => 'Naam vd rol',
+'role_type' => 'Type rol',
 'role_user' => 'Gebruiker',
 'ro_RO' => 'Roemeens',
 'run_subworkflow' => 'Voer sub workflow uit',
@@ -1068,7 +1081,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_report' => '[count] documenten en [foldercount] mappen gevonden in [searchtime] sec.',
+'search_report' => '[doccount] documenten en [foldercount] mappen gevonden in [searchtime] sec.',
 'search_report_fulltext' => '[doccount] documenten gevonden',
 'search_resultmode' => 'Zoek resultaat',
 'search_resultmode_both' => 'Documenten en mappen',
@@ -1077,14 +1090,14 @@ URL: [url]',
 'search_time' => 'Verstreken tijd: [time] sec.',
 'seconds' => 'seconden',
 'selection' => 'Selectie',
-'select_attrdefgrp_show' => '',
+'select_attrdefgrp_show' => 'Toon attribut definities-groep',
 'select_category' => 'klik om categorie te selecteren',
 'select_groups' => 'Klik om groep te selecteren',
 'select_grp_approvers' => 'Klik om beoordelaars te selecteren',
 'select_grp_ind_approvers' => 'Klik om beoordelaars te selecteren',
-'select_grp_ind_notification' => 'Klik om groep beoordelaar te selecteren',
-'select_grp_ind_recipients' => '',
-'select_grp_ind_reviewers' => 'Klik om groep beoordelaar te selecteren',
+'select_grp_ind_notification' => 'Selecteerd de groep',
+'select_grp_ind_recipients' => 'Selecteer de groep',
+'select_grp_ind_reviewers' => 'Selecteer de groep',
 'select_grp_ind_revisors' => '',
 'select_grp_notification' => 'Klik voor groepsnotificatiebeoordelaars',
 'select_grp_recipients' => 'Klik om groep beoordelaar te selecteren',
@@ -1098,10 +1111,15 @@ URL: [url]',
 'select_one' => 'Selecteer een',
 'select_users' => 'Klik om gebruikers te selecteren',
 'select_workflow' => 'Selecteer workflow',
-'send_email' => '',
-'send_login_data' => '',
-'send_login_data_body' => '',
-'send_login_data_subject' => '',
+'send_email' => 'Verstuur email',
+'send_login_data' => 'Verstuur Login-data',
+'send_login_data_body' => 'Login data
+
+Login: [login]
+Name: [username]
+
+[comment]',
+'send_login_data_subject' => 'Onderwerp',
 'send_test_mail' => 'Testmail versturen',
 'september' => 'september',
 'sequence' => 'Volgorde',
@@ -1109,15 +1127,15 @@ URL: [url]',
 'seq_end' => 'Op het einde',
 'seq_keep' => 'Behoud Positie',
 'seq_start' => 'Eerste positie',
-'sessions' => '',
+'sessions' => 'sessies',
 'settings' => 'Instellingen',
 'settings_activate_module' => 'Activeer module',
 '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_Advanced' => 'Uitgebreid',
-'settings_advancedAcl' => '',
-'settings_advancedAcl_desc' => '',
+'settings_advancedAcl' => 'Advanced Access control',
+'settings_advancedAcl_desc' => 'Advanced Access control staat het uit- en inschakelen van bepaalde modules toe. Het kan niet gebruikt worden voor het beheer van toegangsrechten van documenten en mappen.',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Authenticatie instellingen',
 'settings_autoLoginUser' => 'Automatische login',
@@ -1126,15 +1144,15 @@ URL: [url]',
  => ,
  => ,
  =>',
-'settings_available_languages' => 'Beschikbare talen',
-'settings_available_languages_desc' => '',
+'settings_available_languages' => 'Beschikbare vertalingen',
+'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 backupmap',
 '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',
-'settings_calendarDefaultView' => 'Kalender Standaard overzicht',
-'settings_calendarDefaultView_desc' => 'Kalender standaard overzicht',
+'settings_Calendar' => 'Instellingen van de agenda',
+'settings_calendarDefaultView' => 'Standaard overzicht agenda',
+'settings_calendarDefaultView_desc' => 'Pagina per dag/week/maand',
 'settings_cannot_disable' => 'Bestand ENABLE_INSTALL_TOOL kon niet verwijderd worden',
 'settings_checkOutDir' => 'Instellingen Checkoutmap',
 'settings_checkOutDir_desc' => 'Instellingen Checkoutmap',
@@ -1144,8 +1162,8 @@ URL: [url]',
 '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',
 'settings_contentOffsetDir_desc' => 'Om de beperkingen van het onderliggende bestandssysteem te omzeilen, is een nieuwe mappenstructuur bedacht dat binnen de inhoudsmap (Inhoudsmap) bestaat. Hiervoor is een map nodig als basis. Gebruikelijk is om dit de standaardwaarde te laten, 1048576, maar kan elke waarde of tekst bevatten dat nog niet bestaat binnen de (Inhoudsmap)',
-'settings_convertToPdf' => '',
-'settings_convertToPdf_desc' => '',
+'settings_convertToPdf' => 'Document converteren naar PDF',
+'settings_convertToPdf_desc' => 'Als een document niet geschikt is voor Preview, wordt het geconverteerd naar PDF.',
 'settings_cookieLifetime' => 'Cookie Life time',
 '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',
@@ -1167,12 +1185,12 @@ URL: [url]',
 'settings_dbUser' => 'Gebruikersnaam',
 'settings_dbUser_desc' => 'De gebruikersnaam voor toegang tot de datbase ingevoerd tijdens de installatie. Verander de waarde niet tenzij echt nodig, bijvoorbeeld bij verplaatsing van de database naar een ander systeem.',
 'settings_dbVersion' => 'Database schema te oud',
-'settings_defaultAccessDocs' => '',
-'settings_defaultAccessDocs_desc' => '',
-'settings_defaultSearchMethod' => 'Default zoekmethode',
-'settings_defaultSearchMethod_desc' => 'Default zoekmethode',
-'settings_defaultSearchMethod_valdatabase' => 'Default zoekmethode (database)',
-'settings_defaultSearchMethod_valfulltext' => 'Default fulltext-zoekmethode',
+'settings_defaultAccessDocs' => 'Standaard toegangsrechten voor nieuwe documenten',
+'settings_defaultAccessDocs_desc' => 'Als een nieuw document wordt gecreëerd, worden dit de nieuwe toegangsrechten.',
+'settings_defaultSearchMethod' => 'Standaard zoekmethode',
+'settings_defaultSearchMethod_desc' => 'Default zoekmethode = op documentnaam / fulltext-search',
+'settings_defaultSearchMethod_valdatabase' => 'Default zoekmethode (Documentnaam)',
+'settings_defaultSearchMethod_valfulltext' => 'Default fulltext-zoeken',
 'settings_delete_install_folder' => 'Om SeedDMS te kunnen gebruiken moet het bestand ENABLE_INSTALL_TOOL uit de configuratiemap verwijderd worden.',
 'settings_disableSelfEdit' => 'Uitschakelen Eigenprofiel wijzigen',
 'settings_disableSelfEdit_desc' => 'Indien aangevinkt kan de gebruiker zijn eigen profiel niet wijzigen.',
@@ -1181,59 +1199,59 @@ 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_editOnlineFileTypes' => 'Instellingen Filetypes',
-'settings_editOnlineFileTypes_desc' => 'Online zoekmethoden bewerken',
-'settings_enable2FactorAuthentication' => '',
-'settings_enable2FactorAuthentication_desc' => '',
+'settings_editOnlineFileTypes' => 'Online bewerken van de volgende filetypes',
+'settings_editOnlineFileTypes_desc' => 'Bestanden met één van de volgende extensies kunnen online bewerkt worden (ALLEEN KLEINE LETTERS GEBRUIKEN!)',
+'settings_enable2FactorAuthentication' => 'Schakel 2-factor-authenticatie in',
+'settings_enable2FactorAuthentication_desc' => 'In/Uitschakelen 2-factor-authenticatie. Gebruikers moeten Google Authenticator op hun mobile telefoon installeren.',
 'settings_enableAcknowledgeWorkflow' => 'Aanzetten Workflow-stappen',
 'settings_enableAcknowledgeWorkflow_desc' => 'Aanzetten workflow-stappen',
-'settings_enableAdminReceipt' => '',
-'settings_enableAdminReceipt_desc' => '',
+'settings_enableAdminReceipt' => 'Sta ontvangst van documenten door admins toe',
+'settings_enableAdminReceipt_desc' => 'Inschakelen als u admins documenten wilt laten ontvangen',
 'settings_enableAdminRevApp' => 'Inschakelen Beheer Contr/Beoord',
 'settings_enableAdminRevApp_desc' => 'Uitvinken om beheerder niet te tonen als controleerder/beoordeler',
-'settings_enableCalendar' => 'Inschakelen Kalendar',
-'settings_enableCalendar_desc' => 'Inschakelen/uitschakelen kalender',
+'settings_enableCalendar' => 'Agenda inschakelen',
+'settings_enableCalendar_desc' => 'Inschakelen/uitschakelen agenda',
 'settings_enableClipboard' => 'Activeer klembord',
 'settings_enableClipboard_desc' => 'Activeer/ blokkeer het klembord',
-'settings_enableConverting' => 'Inschakelen Conversie',
-'settings_enableConverting_desc' => 'Inschakelen/uitschakelen conversie van bestanden',
-'settings_enableDropFolderList' => '',
-'settings_enableDropFolderList_desc' => '',
+'settings_enableConverting' => 'Documenten converteren',
+'settings_enableConverting_desc' => 'Inschakelen/uitschakelen conversie van bestanden naar PDF',
+'settings_enableDropFolderList' => 'Inschakelen van de lijst van files in dropfolder.',
+'settings_enableDropFolderList_desc' => 'De lijst van files in Dropfolder zichtbaar maken in het menu',
 'settings_enableDropUpload' => 'Inschakelen Snelle Upload',
 'settings_enableDropUpload_desc' => 'Aanzetten DropUpload',
 'settings_enableDuplicateDocNames' => 'Sta duplicaten van documentnamen toe',
 'settings_enableDuplicateDocNames_desc' => 'Staat het toe om documentnamen te dupliceren in een folder.',
-'settings_enableEmail' => 'Inschakelen E-mail',
+'settings_enableEmail' => 'E-mail inschakelen',
 'settings_enableEmail_desc' => 'Inschakelen/uitschakelen automatische email notificatie',
-'settings_enableFolderTree' => 'Inschakelen Mappenstructuur',
+'settings_enableFolderTree' => 'Mappenstructuur tonen',
 'settings_enableFolderTree_desc' => 'Uitschakelen om de mappenstructuur niet te tonen',
-'settings_enableFullSearch' => 'Inschakelen volledigetekst zoekopdracht',
+'settings_enableFullSearch' => 'Volledige-tekst zoeken',
 'settings_enableFullSearch_desc' => 'Inschakelen zoeken in volledigetekst',
-'settings_enableGuestAutoLogin' => 'Gast login automatisch aanzetten',
+'settings_enableGuestAutoLogin' => 'Gastlogin automatisch aanzetten',
 'settings_enableGuestAutoLogin_desc' => 'Gastlogin automatisch aanzetten',
-'settings_enableGuestLogin' => 'Inschakelen Gast login',
+'settings_enableGuestLogin' => 'Inschakelen Gastlogin',
 'settings_enableGuestLogin_desc' => 'Als U iemand wilt laten inloggen als gast, schakel deze optie in. Opmerking: Gast login kan het beste alleen in een beveiligde omgeving ingeschakeld worden',
 'settings_enableHelp' => 'Hulp aanzetten',
 'settings_enableHelp_desc' => 'Hulp aanzetten',
-'settings_enableLanguageSelector' => 'Activeer Taal instellen',
+'settings_enableLanguageSelector' => 'Taal activerenen',
 'settings_enableLanguageSelector_desc' => 'Laat selector zien voor taalinterface, nadat gebruikers inloggen.',
-'settings_enableLargeFileUpload' => 'Inschakelen groot bestand upload',
+'settings_enableLargeFileUpload' => 'Grote bestanden uploaden',
 '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' => 'Menu-taken aanzetten',
 'settings_enableMenuTasks_desc' => 'Menu-taken aanzetten',
-'settings_enableMultiUpload' => '',
-'settings_enableMultiUpload_desc' => '',
-'settings_enableNotificationAppRev' => 'Inschakelen controleur/beoordeler notificatie',
+'settings_enableMultiUpload' => 'Multi-upload',
+'settings_enableMultiUpload_desc' => 'Bij multiupload kunnen tegelijkertijd verschillende bestanden worden geüpload. Ieder bestand wordt een nieuw document.',
+'settings_enableNotificationAppRev' => 'Notificeren controleur/beoordeler',
 'settings_enableNotificationAppRev_desc' => 'Vink aan om een notificatie te versturen naar de controleur/beoordeler als een nieuw document versie is toegevoegd.',
 'settings_enableNotificationWorkflow' => 'Workflow-notificatie aanzetten',
 'settings_enableNotificationWorkflow_desc' => 'Workflow-notificatie aanzetten',
-'settings_enableOwnerNotification' => 'Inschakelen eigenaarnotificatie standaard',
-'settings_enableOwnerNotification_desc' => 'Inschakelen van notificatie naar de eigenaar als een document is toegevoegd.',
-'settings_enableOwnerReceipt' => '',
-'settings_enableOwnerReceipt_desc' => '',
+'settings_enableOwnerNotification' => 'Standaard eigenaar notificeren',
+'settings_enableOwnerNotification_desc' => 'Inschakelen van notificatie naar de eigenaar als een document wordt toegevoegd.',
+'settings_enableOwnerReceipt' => 'Laten weten wat er met het document gebeurt aan eigenaar',
+'settings_enableOwnerReceipt_desc' => 'Inschakelen als u wilt dat de eigenaar van het document op de lijst van ontvangers komt.',
 'settings_enableOwnerRevApp' => 'Beoordeling / goedkeuring voor eigenaar toestaan',
 'settings_enableOwnerRevApp_desc' => 'Activeer dit als de eigenaar van een document genoteerd staat as beoordelaar/ goedkeurder en voor workflow overdrachten.',
-'settings_enablePasswordForgotten' => 'Inschakelen wachtwoord vergeten',
+'settings_enablePasswordForgotten' => '\'wachtwoord vergeten\' aanzetten',
 '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.',
@@ -1241,14 +1259,14 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => 'Herzieningsworkflow aanzetten',
 '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_enableSessionList' => '',
-'settings_enableSessionList_desc' => '',
-'settings_enableThemeSelector' => 'Selecteer thema',
+'settings_enableSessionList' => 'Lijst van gebruikers online',
+'settings_enableSessionList_desc' => 'Laat zien welke gebruikers online zijn',
+'settings_enableThemeSelector' => 'Thema selecteren',
 'settings_enableThemeSelector_desc' => 'Schakel thema selectie op de aanmeldpagina uit',
-'settings_enableUpdateReceipt' => '',
-'settings_enableUpdateReceipt_desc' => '',
-'settings_enableUpdateRevApp' => '',
-'settings_enableUpdateRevApp_desc' => '',
+'settings_enableUpdateReceipt' => 'Veranderen van bestaande bestemming toestaan',
+'settings_enableUpdateReceipt_desc' => 'Mag de gebruiker die een bestemming heeft opgesteld, zijn beslissing wijzigen?',
+'settings_enableUpdateRevApp' => 'Wijzig bestaande review/goedkeuring',
+'settings_enableUpdateRevApp_desc' => 'Mag de gebruiker die een review//goedkeuring heeft gegeven, zijn beslissing wijzigen (zolang de huidige stap in de workflow nog duurt)?',
 'settings_enableUserImage' => 'Inschakelen Gebruikersplaatjes',
 'settings_enableUserImage_desc' => 'Inschakelen Gebruikerplaatjes',
 'settings_enableUsersView' => 'Inschakelen Gebruikers overzicht',
@@ -1268,9 +1286,9 @@ URL: [url]',
 'settings_Extensions' => 'Uitbreidingen',
 'settings_extraPath' => 'Extra PHP include Path',
 'settings_extraPath_desc' => 'Pad naar extra software. Dit pad bevat bv. het adodb pad of de extra pear packages.',
-'settings_firstDayOfWeek' => 'Eerste weekdag',
-'settings_firstDayOfWeek_desc' => 'Eerste dag van de week',
-'settings_footNote' => 'Onderschrift',
+'settings_firstDayOfWeek' => 'Eerste dag van de week',
+'settings_firstDayOfWeek_desc' => 'Eerste dag van de (werk)week',
+'settings_footNote' => 'Subtitel',
 'settings_footNote_desc' => 'Bericht om onderop elke pagina te tonen',
 'settings_fullSearchEngine' => 'Instellingen Fulltextsearch',
 'settings_fullSearchEngine_desc' => 'Instellingen Fulltextsearch',
@@ -1294,8 +1312,8 @@ URL: [url]',
 'settings_install_welcome_text' => '<p>Wees er zeker van dat u een bestand, genaamd \'ENABLE_INSTALL_TOOL\', gemaakt heeft in de configuratiemap, voordat u de installatie van letDMS begint, anders zal de installatie niet werken. Op een Unix-Syteem kan dit makkelijk gedaan worden met \'touch conf/ENABLE_INSTALL_TOOL\'. Verwijder het bestand nadat de installatie afgerond is.</p><p>letoDMS heeft weinig installatievoorwaarden. U heeft een mysql database en een php-geschikte web server nodig. Voor de lucene volledige tekst zoekfunctie, moet Zend framework geinstalleerd zijn op schijf en gevonden worden door php. Vanaf versie 3.2.0 van letoDMS zal ADOdb geen deel meer uitmaken van de uitgave. Een kopie kan van <a href="http://adodb.sourceforge.net/">http://adodb.sourceforge.net</a> gehaald en geinstalleerd worden. Het pad kan later opgegeven worden tijdens de installatie.</p><p>Als u de database voor de installatie wilt aanmaken, dan kunt u het handmatig met uw favoriete gereedschap aanmaken. optioneel kan een database met gebruikerstoegang gemaakt worden en importeer een van de database dumps in de configuratiemap. Met het installatiescript kan dit ook, maar hiervoor is database toegang nodig met voldoende rechten om een database aan te maken.</p>',
 'settings_install_welcome_title' => 'Welkom bij de installatie van letoDMS',
 '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_language' => 'Standaardtaal',
+'settings_language_desc' => 'Standaardtaal (naam van de submap in map "languages")',
 'settings_libraryFolder' => 'Bibliotheekmap',
 'settings_libraryFolder_desc' => 'In deze map kunnen documenten worden opgeslagen. Hiermee worden nieuwe documenten gecreëerd.',
 'settings_logFileEnable' => 'Inschakelen Logbestand',
@@ -1316,10 +1334,10 @@ URL: [url]',
 'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Max. nummers of recursieve document/map telling',
 'settings_maxRecursiveCount_desc' => 'Dit is het maximum aantal documenten of mappen dat zal worden gecontroleerd voor toegangsrechten bij recursieve objecten telling. Als dit aantal is overschreden, zal het aantal documenten en mappen in de het map overzicht worden geschat.',
-'settings_maxSizeForFullText' => '',
-'settings_maxSizeForFullText_desc' => '',
-'settings_maxUploadSize' => '',
-'settings_maxUploadSize_desc' => '',
+'settings_maxSizeForFullText' => 'Maximum bestandsgrootte voor onmiddellijke indexering',
+'settings_maxSizeForFullText_desc' => 'Alle nieuwe documenten kleiner dan deze waarde worden direct na het uploaden geïndexeerd. In alle andere gevallen worden alleen de metadata geïndexeerd.',
+'settings_maxUploadSize' => 'Maximale omvang voor uploaden',
+'settings_maxUploadSize_desc' => 'Dit is de maximale omvang voor te uploaden bestanden. Dat geldt voor bestanden en bijlagen.',
 'settings_more_settings' => 'Meer instellingen. Standaard login: admin/admin',
 'settings_notfound' => 'Niet gevonden',
 'settings_Notification' => 'Notificatie instellingen',
@@ -1356,12 +1374,12 @@ URL: [url]',
 'settings_previewWidthList_desc' => 'Breedte van het voorbeeld weergegeven in lijsten',
 'settings_previewWidthMenuList' => '',
 'settings_previewWidthMenuList_desc' => '',
-'settings_printDisclaimer' => 'Print Vrijwaring',
-'settings_printDisclaimer_desc' => 'Indien ingeschakeld zal het vrijwarings bericht in de lang.inc bestanden worden getoond onderop de pagina',
+'settings_printDisclaimer' => 'Vrijwaring afdrukken',
+'settings_printDisclaimer_desc' => 'Indien ingeschakeld zal het vrijwaringsbericht bestanden worden getoond onderaan de pagina',
 'settings_quota' => 'Gebruikersquotum',
 'settings_quota_desc' => 'Het maximum aantal bytes een gebruiker op de schijf mag schrijven. Stel deze in op 0 voor een onbeperkte schijfruimte. Deze waarde kan worden overschreven voor elk gebruik in zijn profiel.',
 'settings_removeFromDropFolder' => 'Verwijder het bestand uit de dropfolder na een succesvolle upload',
-'settings_removeFromDropFolder_desc' => '',
+'settings_removeFromDropFolder_desc' => 'Verwijder het bestand uit de dropfolder na een succesvolle upload',
 'settings_restricted' => 'Beperkte toegang',
 'settings_restricted_desc' => 'Sta alleen gebruiker toe om in te loggen die in de database zijn opgenomen (ongeacht succesvolle authenticatie met LDAP)',
 'settings_rootDir' => 'Basismap',
@@ -1371,15 +1389,15 @@ URL: [url]',
 'settings_SaveError' => 'Opslagfout Configuratiebestand',
 'settings_Server' => 'Server instellingen',
 'settings_showFullPreview' => 'Toon volledige document',
-'settings_showFullPreview_desc' => '',
+'settings_showFullPreview_desc' => 'In/Uitschakelen preview van alle pagina\'s van het document.',
 'settings_showMissingTranslations' => 'Ontbrekende vertalingen weergeven',
 'settings_showMissingTranslations_desc' => 'Geef alle ontbrekende vertalingen onder aan de pagina weer. De gebruiker kan een verzoek tot vertaling indienen dat wordt opgeslagen als csv bestand. Let op! Zet deze functie niet aan in productieomgevingen!',
-'settings_showSingleSearchHit' => '',
-'settings_showSingleSearchHit_desc' => '',
+'settings_showSingleSearchHit' => 'Spring rechtstreeks naar het enkele zoekresultaat',
+'settings_showSingleSearchHit_desc' => 'Als er maar één zoekresultaat is, wordt dat in detail getoond.',
 'settings_Site' => 'Web Locatie',
-'settings_siteDefaultPage' => 'Locatie standaard pagina',
-'settings_siteDefaultPage_desc' => 'Standaard pagina bij inloggen. Indien leeg is out/out.ViewFolder.php de standaard',
-'settings_siteName' => 'Locatie Naam',
+'settings_siteDefaultPage' => 'Locatie standaardpagina',
+'settings_siteDefaultPage_desc' => 'Standaardpagina bij inloggen. Indien leeg is out/out.ViewFolder.php de standaard',
+'settings_siteName' => 'Naam van de site',
 'settings_siteName_desc' => 'Naam van de Locatie dat wordt gebruikt in de titel van de paginas. Standaard: letoDMS',
 'settings_SMTP' => 'SMTP Server instellingen',
 'settings_smtpPassword' => 'SMTP Server paswoord',
@@ -1406,8 +1424,8 @@ URL: [url]',
 'settings_start_install' => 'Begin installatie',
 'settings_stopWordsFile' => 'Pad naar bestand met nietindex woorden',
 'settings_stopWordsFile_desc' => 'Als volledigetekst zoekopdracht is ingeschakeld, bevat dit bestand woorden die niet geindexeerd zullen worden.',
-'settings_strictFormCheck' => 'Stricte Form Controle',
-'settings_strictFormCheck_desc' => 'Stricte formuleer controle. Indien ingeschakeld, worden alle velden in het formulier gecontroleer op een waarde. Indien uitgeschakeld, worden de meeste commentaar en invoervelden optioneel. Commentaren zijn altijd benodigd bij een review of modificatie van een documentstatus',
+'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_System' => 'Systeem',
 'settings_theme' => 'Standaard thema',
@@ -1423,7 +1441,7 @@ URL: [url]',
 'settings_versioningFileName' => 'Versieinformatie Bestandsnaam',
 'settings_versioningFileName_desc' => 'De naam van het versie informatie bestand gemaakt door het backupgereedschap',
 'settings_versiontolow' => 'Versie te laag',
-'settings_viewOnlineFileTypes' => 'Bekijk Online Bestandstypen',
+'settings_viewOnlineFileTypes' => 'De volgende bestandstypen online bekijken',
 'settings_viewOnlineFileTypes_desc' => 'Bestanden met een van de volgende extensies kunnen online bekeken worden (GEBRUIK ALLEEN KLEINE LETTERS)',
 'settings_workflowMode' => 'Workflow mode',
 'settings_workflowMode_desc' => 'De uitgebreide workflow maakt het mogelijk om uw eigen workflow op te geven voor documentversies.',
@@ -1448,53 +1466,53 @@ URL: [url]',
 'splash_add_group_member' => 'Nieuwe groepslid toegevoegd',
 'splash_add_role' => 'Nieuwe rol toegevoegd',
 'splash_add_to_transmittal' => 'Toevoegen aan verzending',
-'splash_add_transmittal' => '',
+'splash_add_transmittal' => 'Verzending toegevoegd',
 'splash_add_user' => 'Nieuwe gebruiker toegevoegd',
-'splash_cleared_cache' => '',
+'splash_cleared_cache' => 'Cache leeggemaakt',
 'splash_cleared_clipboard' => 'Klembord leeg gemaakt',
 'splash_document_added' => 'Nieuw document toegevoegd',
 'splash_document_checkedout' => 'Document in gebruik genomen',
 'splash_document_edited' => 'Document opgeslagen',
-'splash_document_indexed' => '',
+'splash_document_indexed' => 'Document geïndexeerd',
 'splash_document_locked' => 'Document vergrendeld',
 'splash_document_unlocked' => 'Document ontgrendeld',
 'splash_edit_attribute' => 'Attribuut opgeslagen',
-'splash_edit_event' => '',
+'splash_edit_event' => 'Gebeurtenis opgeslagen',
 'splash_edit_group' => 'Groep opgeslagen',
 'splash_edit_role' => 'Rol opgeslagen',
 'splash_edit_user' => 'Gebruiker opgeslagen',
 'splash_error_add_to_transmittal' => 'Fout: toevoeging aan verzending',
-'splash_error_rm_download_link' => '',
-'splash_error_send_download_link' => '',
+'splash_error_rm_download_link' => 'Fout bij verwijderen download-link',
+'splash_error_send_download_link' => 'Fout bij verzenden download-link',
 'splash_folder_edited' => 'Opslaan mapwijzigingen',
-'splash_importfs' => '',
+'splash_importfs' => 'Geïmporteerd: [docs] documenten en [folders] mappen',
 'splash_invalid_folder_id' => 'Ongeldige map ID',
 'splash_invalid_searchterm' => 'Ongeldige zoekterm',
 'splash_moved_clipboard' => 'Klembord verplaatst naar de huidige map',
 'splash_move_document' => 'Document verplaatst',
 'splash_move_folder' => 'Map verplaatst',
-'splash_receipt_update_success' => '',
+'splash_receipt_update_success' => 'Ontvangst succesvol toegevoegd',
 'splash_removed_from_clipboard' => 'Verwijderd van het klembord',
 'splash_rm_attribute' => 'Attribuut verwijderd',
 'splash_rm_document' => 'Document verwijderd',
-'splash_rm_download_link' => '',
+'splash_rm_download_link' => 'Download-link verwijderd',
 'splash_rm_folder' => 'Map verwijderd',
 'splash_rm_group' => 'Groep verwijderd',
 'splash_rm_group_member' => 'Lid van de groep verwijderd',
 'splash_rm_role' => 'Rol verwijderd',
 'splash_rm_transmittal' => 'Verzending verwijderd',
 'splash_rm_user' => 'Gebruiker verwijderd',
-'splash_rm_user_processes' => '',
-'splash_saved_file' => '',
-'splash_save_user_data' => '',
-'splash_send_download_link' => '',
-'splash_send_login_data' => '',
+'splash_rm_user_processes' => 'Gebruiker uit alle processen verwijderd',
+'splash_saved_file' => 'Bestand opgeslagen',
+'splash_save_user_data' => 'Gebruikersgegevens opgeslagen',
+'splash_send_download_link' => 'Download-link verzonden',
+'splash_send_login_data' => 'Login-gegevens verzonden',
 'splash_settings_saved' => 'Instellingen opgeslagen',
 'splash_substituted_user' => 'Invallers gebruiker',
 'splash_switched_back_user' => 'Teruggeschakeld naar de oorspronkelijke gebruiker',
 'splash_toogle_group_manager' => 'Group manager toogled',
 'splash_transfer_document' => '',
-'splash_transfer_objects' => '',
+'splash_transfer_objects' => 'Objecten overgedragen',
 'state_and_next_state' => 'staat/ volgende staat',
 'statistic' => 'Statistieken',
 'status' => 'Status',
@@ -1517,7 +1535,7 @@ URL: [url]',
 'status_revisor_removed' => 'Verwijderd',
 'status_unknown' => 'Onbekend',
 'storage_size' => 'Omvang opslag',
-'submit_2_fact_auth' => '',
+'submit_2_fact_auth' => '2-factor-authentificatie verstuurd',
 'submit_approval' => 'Verzend [Goedkeuring]',
 'submit_login' => 'Log in',
 'submit_password' => 'Nieuw wachtwoord instellen',
@@ -1526,7 +1544,7 @@ URL: [url]',
 'submit_review' => 'Verzend Beoordeling',
 'submit_revision' => 'Herziening verzenden',
 'submit_userinfo' => 'Wijzigingen opslaan',
-'subsribe_timelinefeed' => '',
+'subsribe_timelinefeed' => 'Subscribe to timeline feed',
 'substitute_to_user' => 'Switch naar \'[username]\'',
 'substitute_user' => 'Invaller/ vervanger Gebruiker',
 'success_add_aro' => 'Access request object added',
@@ -1537,13 +1555,13 @@ URL: [url]',
 'sunday_abbr' => 'zo',
 'sv_SE' => 'Zweeds',
 'switched_to' => 'Overgeschakeld naar',
-'takeOverAttributeValue' => '',
+'takeOverAttributeValue' => 'Onthoud de waarde van het attribuut',
 'takeOverGrpApprover' => 'Onthoud de laatste groep goedkeurders',
 'takeOverGrpReviewer' => 'Onthoud de laatste groep herzieners',
 'takeOverIndApprover' => 'Onthoud de laatste groep individuele goedkeurders',
 'takeOverIndReviewer' => 'Onthoud de laatste groep individuele herzieners',
 'tasks' => 'taken',
-'temp_jscode' => '',
+'temp_jscode' => 'Tijdelijke jscode',
 'testmail_body' => 'Deze mail dient enkel voor het testen van de mail configuratie van SeedDMS',
 'testmail_subject' => 'Test mail',
 'theme' => 'Thema',
@@ -1563,18 +1581,18 @@ URL: [url]',
 'timeline_skip_status_change_1' => 'wacht op goedkeuring',
 'timeline_skip_status_change_2' => 'gepubliceerd',
 'timeline_skip_status_change_3' => 'binnen de workflow',
-'timeline_skip_status_change_4' => '',
-'timeline_skip_status_change_5' => '',
+'timeline_skip_status_change_4' => 'in revisie',
+'timeline_skip_status_change_5' => 'concept',
 'timeline_status_change' => 'Versie [version]: [status]',
 'to' => 'aan',
 'toggle_manager' => 'Wijzig Beheerder',
-'toggle_qrcode' => '',
+'toggle_qrcode' => 'Tonen/Verbergen QR-code',
 'to_before_from' => 'De einddatum mag niet voor de startdatum liggen',
 'transfer_document' => 'Document overdragen',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',
-'transfer_objects' => '',
-'transfer_objects_to_user' => '',
+'transfer_objects' => 'Objecten overdragen',
+'transfer_objects_to_user' => 'Objecten overdragen aan gebruiker',
 'transfer_to_user' => '',
 'transition_triggered_email' => 'Workflow-overgang geactiveerd',
 'transition_triggered_email_body' => 'Workflow Overgang
@@ -1599,9 +1617,9 @@ URL: [url]',
 'tr_TR' => 'Turks',
 'tuesday' => 'dinsdag',
 'tuesday_abbr' => 'di',
-'type_of_hook' => '',
+'type_of_hook' => 'Soort hook',
 'type_to_search' => 'zoeken naar',
-'uk_UA' => 'Oekraïne',
+'uk_UA' => 'Oekraïens',
 'under_folder' => 'In map',
 'unknown_attrdef' => 'Onbekende attribuut definitie',
 'unknown_command' => 'Opdracht niet herkend.',
@@ -1634,12 +1652,12 @@ URL: [url]',
 'uploading_zerosize' => 'Uploaden van een leeg bestand. Upload wordt geannuleerd.',
 'used_discspace' => 'Gebruike schijf ruimte',
 'user' => 'Gebruiker',
-'userid_groupid' => 'Gebruiker id/Groep id',
+'userid_groupid' => 'GebruikerID / Groep ID',
 'users' => 'Gebruikers',
 'users_and_groups' => 'Gebruikers / Groepen',
 'users_done_work' => 'Uitgevoerd werk gebruikers',
 'user_exists' => 'Gebruiker bestaat reeds.',
-'user_group' => 'Gebruiker/Groep',
+'user_group' => 'Gebruiker / Groep',
 'user_group_management' => 'Gebruikers / Groepen beheer',
 'user_image' => 'Afbeelding',
 'user_info' => 'Gebruikers informatie',
@@ -1650,7 +1668,7 @@ URL: [url]',
 'use_comment_of_document' => 'Gebruik reactie van document',
 'use_default_categories' => 'Gebruik voorgedefinieerde categorieen',
 'use_default_keywords' => 'Gebruik bestaande sleutelwoorden',
-'valid_till' => '',
+'valid_till' => 'Geldig tot',
 'version' => 'Versie',
 'versioning_file_creation' => 'Aanmaken bestand versies',
 'versioning_file_creation_warning' => 'Met deze handeling maakt U een bestand aan die de versie voortgang informatie van een compleet DMS bevat. Na het aanmaken wordt ieder bestand opgeslagen in de document map.',
@@ -1673,23 +1691,23 @@ URL: [url]',
 'weeks' => 'Weken',
 'week_view' => 'Week Overzicht',
 'workflow' => 'Workflow',
-'workflows_involded' => '',
+'workflows_involded' => 'Betrokken bij workflows',
 'workflow_actions_management' => 'Workflow actiebeheer',
 'workflow_action_in_use' => 'Deze actie wordt momenteel gebruikt door een workflow',
 'workflow_action_name' => 'Naam',
 'workflow_editor' => 'Workflow editor',
 'workflow_group_summary' => 'Groepssamenvatting',
-'workflow_has_cycle' => '',
+'workflow_has_cycle' => 'Workflow heeft cyclus',
 'workflow_initstate' => 'Begin status',
 'workflow_in_use' => 'Deze workflow wordt momenteel gebruikt door documenten.',
-'workflow_layoutdata_saved' => '',
+'workflow_layoutdata_saved' => 'Sla de layout op',
 'workflow_management' => 'Workflow beheer',
 'workflow_name' => 'Naam',
-'workflow_no_doc_rejected_state' => '',
-'workflow_no_doc_released_state' => '',
-'workflow_no_initial_state' => '',
+'workflow_no_doc_rejected_state' => 'Het document ma in deze fase van de workflow niet geweigerd worden!',
+'workflow_no_doc_released_state' => 'Het document ma in deze fase van de workflow niet gesloten worden',
+'workflow_no_initial_state' => 'Gen enkele overdracht begint met de startfase van de workflow',
 'workflow_no_states' => 'U moet eerst workflow-statussen definiëren, voordat u een workflow toevoegt.',
-'workflow_save_layout' => '',
+'workflow_save_layout' => 'Sla de layout op',
 'workflow_state' => 'workflow_states_managementWorkflow status beheer',
 'workflow_states_management' => 'Workflow status beheer',
 'workflow_state_docstatus' => 'Document status',

From 81536cb2fe32261fb0f17577af994be59fd6d1f8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 22 Dec 2017 13:00:51 +0100
Subject: [PATCH 196/308] getInstance() returns null if document was not found
 in db

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

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 1fc7d35c4..622d7f271 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -247,6 +247,13 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		return $searchFields;
 	} /* }}} */
 
+	/**
+	 * Return an document by its id
+	 *
+	 * @param integer $id id of document
+	 * @return object/boolean instance of SeedDMS_Core_Document if document exists, null
+	 * if document does not exist, false in case of error
+	 */
 	public static function getInstance($id, $dms) { /* {{{ */
 		$db = $dms->getDB();
 
@@ -255,7 +262,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		if (is_bool($resArr) && $resArr == false)
 			return false;
 		if (count($resArr) != 1)
-			return false;
+			return null;
 		$resArr = $resArr[0];
 
 		// New Locking mechanism uses a separate table to track the lock.
@@ -403,6 +410,61 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		return true;
 	} /* }}} */
 
+	/**
+	 * Add a list of categories to the document
+	 * This function will add a list of new categories to the document.
+	 *
+	 * @param array $newCategories list of category objects
+	 */
+	function addCategories($newCategories) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		if(!$this->_categories)
+			self::getCategories();
+
+		$catids = array();
+		foreach($this->_categories as $cat)
+			$catids[] = $cat->getID();
+
+		$db->startTransaction();
+		$ncat = array(); // Array containing actually added new categories
+		foreach($newCategories as $cat) {
+			if(!in_array($cat->getID(), $catids)) {
+				$queryStr = "INSERT INTO `tblDocumentCategory` (`categoryID`, `documentID`) VALUES (". $cat->getId() .", ". $this->_id .")";
+				if (!$db->getResult($queryStr)) {
+					$db->rollbackTransaction();
+					return false;
+				}
+				$ncat[] = $cat;
+			}
+		}
+		$db->commitTransaction();
+		$this->_categories = array_merge($this->_categories, $ncat);
+		return true;
+	} /* }}} */
+
+	/**
+	 * Remove a list of categories from the document
+	 * This function will remove a list of assigned categories to the document.
+	 *
+	 * @param array $newCategories list of category objects
+	 */
+	function removeCategories($categories) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$catids = array();
+		foreach($categories as $cat)
+			$catids[] = $cat->getID();
+
+		$queryStr = "DELETE from `tblDocumentCategory` WHERE `documentID` = ". $this->_id ." AND `categoryID` IN (".implode(',', $catids).")";
+		if (!$db->getResult($queryStr)) {
+			return false;
+		}
+
+		$this->_categories = null;
+		return true;
+	} /* }}} */
+
 	/**
 	 * Return creation date of the document
 	 *

From 3330085f51dbe0702d053f0f2fb0aab615fa4daa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 22 Dec 2017 13:01:38 +0100
Subject: [PATCH 197/308] getInstance() returns null if folder was not found in
 db

---
 SeedDMS_Core/Core/inc.ClassFolder.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index 308d02bac..985208be9 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -125,6 +125,13 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		return $sql;
 	} /* }}} */
 
+	/**
+	 * Return a folder by its id
+	 *
+	 * @param integer $id id of folder
+	 * @return object/boolean instance of SeedDMS_Core_Folder if document exists, null
+	 * if document does not exist, false in case of error
+	 */
 	public static function getInstance($id, $dms) { /* {{{ */
 		$db = $dms->getDB();
 
@@ -133,7 +140,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		if (is_bool($resArr) && $resArr == false)
 			return false;
 		else if (count($resArr) != 1)
-			return false;
+			return null;
 
 		$resArr = $resArr[0];
 		$classname = $dms->getClassname('folder');

From 97946893eedc211cd7578b20249084c91c1b1c6b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 22 Dec 2017 13:02:14 +0100
Subject: [PATCH 198/308] getInstance() returns null if object was not found in
 database

---
 SeedDMS_Core/Core/inc.ClassGroup.php | 7 ++++---
 SeedDMS_Core/Core/inc.ClassUser.php  | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassGroup.php b/SeedDMS_Core/Core/inc.ClassGroup.php
index 7f7ab18f9..83dbd0d49 100644
--- a/SeedDMS_Core/Core/inc.ClassGroup.php
+++ b/SeedDMS_Core/Core/inc.ClassGroup.php
@@ -58,14 +58,15 @@ class SeedDMS_Core_Group { /* {{{ */
 	} /* }}} */
 
 	/**
-	 * Create an instance of a group object
+	 * Return an instance of a group object
 	 *
 	 * @param string|integer $id Id, name of group, depending
 	 * on the 3rd parameter.
 	 * @param object $dms instance of dms
 	 * @param string $by search by group name if set to 'name'. 
 	 * Search by Id of group if left empty.
-	 * @return object instance of class SeedDMS_Core_Group
+	 * @return object instance of class SeedDMS_Core_Group if group was found, null
+	 * if group was not found, false in case of error
 	 */
 	public static function getInstance($id, $dms, $by='') { /* {{{ */
 		$db = $dms->getDB();
@@ -82,7 +83,7 @@ class SeedDMS_Core_Group { /* {{{ */
 		if (is_bool($resArr) && $resArr == false)
 			return false;
 		else if (count($resArr) != 1) //wenn, dann wohl eher 0 als > 1 ;-)
-			return false;
+			return null;
 
 		$resArr = $resArr[0];
 
diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 25260c333..6e809e73b 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -163,7 +163,8 @@ class SeedDMS_Core_User { /* {{{ */
 	 * 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
+     * @return object instance of class SeedDMS_Core_User if user was found, null
+     * if user was not found, false in case of error
 	 */
 	public static function getInstance($id, $dms, $by='', $email='') { /* {{{ */
 		$db = $dms->getDB();
@@ -183,7 +184,7 @@ class SeedDMS_Core_User { /* {{{ */
 		$resArr = $db->getResultArray($queryStr);
 
 		if (is_bool($resArr) && $resArr == false) return false;
-		if (count($resArr) != 1) return false;
+		if (count($resArr) != 1) return null;
 
 		$resArr = $resArr[0];
 

From 987ea3d5fd80f73654d9df57ffec1000f8920e4a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 22 Dec 2017 13:04:08 +0100
Subject: [PATCH 199/308] new entries for 5.1.5

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

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index ea12c1730..7c7eb22d7 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -33,6 +33,9 @@
 - 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()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 63f9170671560a536c89c8ea80aa3a7251979bcf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 22 Dec 2017 13:04:26 +0100
Subject: [PATCH 200/308] another major overhaul

http status codes are set in case of error, better error checking, ...
---
 restapi/index.php | 567 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 419 insertions(+), 148 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index 1b7d7c424..eb2072b55 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -2,9 +2,9 @@
 define('USE_PHP_SESSION', 0);
 
 include("../inc/inc.Settings.php");
-include("../inc/inc.Extension.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.DBInit.php");
+include("../inc/inc.Extension.php");
 
 if(USE_PHP_SESSION) {
     session_start();
@@ -92,7 +92,7 @@ function __getLatestVersionData($lc) { /* {{{ */
 function __getFolderData($folder) { /* {{{ */
     $data = array(
         'type'=>'folder',
-        'id'=>$folder->getID(),
+        'id'=>(int)$folder->getID(),
         'name'=>$folder->getName(),
         'comment'=>$folder->getComment(),
         'date'=>date('Y-m-d H:i:s', $folder->getDate()),
@@ -107,6 +107,45 @@ function __getFolderData($folder) { /* {{{ */
     return $data;
 } /* }}} */
 
+function __getGroupData($u) { /* {{{ */
+    $data = array(
+        'type'=>'group',
+        'id'=>(int)$u->getID(),
+        'name'=>$u->getName(),
+        'comment'=>$u->getComment(),
+    );
+    return $data;
+} /* }}} */
+
+function __getUserData($u) { /* {{{ */
+    $data = array(
+        'type'=>'user',
+        'id'=>(int)$u->getID(),
+        'name'=>$u->getFullName(),
+        'comment'=>$u->getComment(),
+        'login'=>$u->getLogin(),
+        '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'),
+        'hidden'=>$u->isHidden() ? true : false,
+        'disabled'=>$u->isDisabled() ? true : false,
+        'isguest' => $u->isGuest() ? true : false,
+        'isadmin' => $u->isAdmin() ? true : false,
+    );
+    if($u->getHomeFolder())
+        $data['homefolder'] = (int)$u->getHomeFolder();
+
+    $groups = $u->getGroups();
+    if($groups) {
+        $tmp = [];
+        foreach($groups as $group)
+            $tmp[] = __getGroupData($group);
+        $data['groups'] = $tmp;
+    }
+    return $data;
+} /* }}} */
+
 function doLogin() { /* {{{ */
     global $app, $dms, $userobj, $session, $settings;
 
@@ -136,6 +175,7 @@ function doLogin() { /* {{{ */
         } else {
             setcookie("mydms_session", $session->getId(), time()-3600, $settings->_httpRoot);
         }
+        $app->response()->status(403);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Login failed', 'data'=>''));
     } else {
@@ -155,7 +195,7 @@ function doLogin() { /* {{{ */
             $dms->setUser($userobj);
         }
         $app->response()->header('Content-Type', 'application/json');
-        echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$userobj->getId()));
+        echo json_encode(array('success'=>true, 'message'=>'', 'data'=>__getUserData($userobj)));
     }
 } /* }}} */
 
@@ -176,6 +216,7 @@ function setFullName() { /* {{{ */
     global $app, $dms, $userobj;
 
     if(!$userobj) {
+        $app->response()->status(403);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
         return;
@@ -190,6 +231,7 @@ function setEmail($id) { /* {{{ */
     global $app, $dms, $userobj;
 
     if(!$userobj) {
+        $app->response()->status(403);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
         return;
@@ -215,6 +257,7 @@ function getLockedDocuments() { /* {{{ */
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
     } else {
+        $app->response()->status(500);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'', 'data'=>''));
     }
@@ -226,7 +269,7 @@ function getFolder($id = null) { /* {{{ */
 
     if ($id === null)
         $folder = $dms->getFolder($settings->_rootFolderID);
-    else if(is_numeric($id) && empty($forcebyname))
+    else if(ctype_digit($id) && empty($forcebyname))
         $folder = $dms->getFolder($id);
     else {
         $parentid = $app->request()->get('parentid');
@@ -265,6 +308,7 @@ function getFolderParent($id) { /* {{{ */
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$rec));
     } else {
+        $app->response()->status(500);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'', 'data'=>''));
     }
@@ -298,7 +342,7 @@ function getFolderAttributes($id) { /* {{{ */
             $attributes = $folder->getAttributes();
             foreach($attributes as $attribute) {
                 $recs[] = array(
-                    'id'=>$attribute->getId(),
+                    'id'=>(int)$attribute->getId(),
                     'value'=>$attribute->getValue(),
                     'name'=>$attribute->getAttributeDefinition()->getName(),
                 );
@@ -339,6 +383,7 @@ function getFolderChildren($id) { /* {{{ */
                 $app->response()->header('Content-Type', 'application/json');
                 echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
             } else {
+                $app->response()->status(403);
                 $app->response()->header('Content-Type', 'application/json');
                 echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
             }
@@ -352,44 +397,55 @@ function createFolder($id) { /* {{{ */
     global $app, $dms, $userobj;
 
     if(!$userobj) {
+        $app->response()->status(403);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
         return;
     }
 
-    if($id == 0) {
+    if(!ctype_digit($id) || $id == 0) {
+        $app->response()->status(400);
         $app->response()->header('Content-Type', 'application/json');
-        echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
+        echo json_encode(array('success'=>true, 'message'=>'No parent folder given', 'data'=>''));
         return;
     }
     $parent = $dms->getFolder($id);
     if($parent) {
-        if($name = $app->request()->post('name')) {
-            $comment = $app->request()->post('comment');
-            $attributes = $app->request()->post('attributes');
-            $newattrs = array();
-            if($attributes) {
-                foreach($attributes as $attrname=>$attrvalue) {
-                    $attrdef = $dms->getAttributeDefinitionByName($attrname);
-                    if($attrdef) {
-                        $newattrs[$attrdef->getID()] = $attrvalue;
+        if($parent->getAccessMode($userobj) >= M_READWRITE) {
+            if($name = $app->request()->post('name')) {
+                $comment = $app->request()->post('comment');
+                $attributes = $app->request()->post('attributes');
+                $newattrs = array();
+                if($attributes) {
+                    foreach($attributes as $attrname=>$attrvalue) {
+                        $attrdef = $dms->getAttributeDefinitionByName($attrname);
+                        if($attrdef) {
+                            $newattrs[$attrdef->getID()] = $attrvalue;
+                        }
                     }
                 }
-            }
-            if($folder = $parent->addSubFolder($name, $comment, $userobj, 0, $newattrs)) {
+                if($folder = $parent->addSubFolder($name, $comment, $userobj, 0, $newattrs)) {
 
-                $rec = array('id'=>$folder->getId(), 'name'=>$folder->getName(), 'comment'=>$folder->getComment());
-                $app->response()->header('Content-Type', 'application/json');
-                echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$rec));
+                    $rec = __getFolderData($folder);
+                    $app->response()->header('Content-Type', 'application/json');
+                    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$rec));
+                } else {
+                    $app->response()->status(500);
+                    $app->response()->header('Content-Type', 'application/json');
+                    echo json_encode(array('success'=>false, 'message'=>'', 'data'=>''));
+                }
             } else {
+                $app->response()->status(400);
                 $app->response()->header('Content-Type', 'application/json');
                 echo json_encode(array('success'=>false, 'message'=>'', 'data'=>''));
             }
         } else {
+            $app->response()->status(403);
             $app->response()->header('Content-Type', 'application/json');
-            echo json_encode(array('success'=>false, 'message'=>'', 'data'=>''));
+            echo json_encode(array('success'=>false, 'message'=>'No access on destination folder', 'data'=>''));
         }
     } else {
+        $app->response()->status(500);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'', 'data'=>''));
     }
@@ -399,11 +455,26 @@ function moveFolder($id, $folderid) { /* {{{ */
     global $app, $dms, $userobj;
 
     if(!$userobj) {
+        $app->response()->status(403);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
         return;
     }
 
+    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 source folder given', 'data'=>''));
+        return;
+    }
+
+    if(!ctype_digit($folderid) || $folderid == 0) {
+        $app->response()->status(400);
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>true, 'message'=>'No destination folder given', 'data'=>''));
+        return;
+    }
+
     $mfolder = $dms->getFolder($id);
     if($mfolder) {
         if ($mfolder->getAccessMode($userobj) >= M_READ) {
@@ -413,22 +484,33 @@ function moveFolder($id, $folderid) { /* {{{ */
                         $app->response()->header('Content-Type', 'application/json');
                         echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
                     } else {
+                        $app->response()->status(500);
                         $app->response()->header('Content-Type', 'application/json');
                         echo json_encode(array('success'=>false, 'message'=>'Error moving folder', 'data'=>''));
                     }
                 } else {
+                    $app->response()->status(403);
                     $app->response()->header('Content-Type', 'application/json');
                     echo json_encode(array('success'=>false, 'message'=>'No access on destination folder', 'data'=>''));
                 }
             } else {
+                if($folder === null)
+                    $app->response()->status(400);
+                else
+                    $app->response()->status(500);
                 $app->response()->header('Content-Type', 'application/json');
                 echo json_encode(array('success'=>false, 'message'=>'No destination folder', 'data'=>''));
             }
         } else {
+            $app->response()->status(403);
             $app->response()->header('Content-Type', 'application/json');
             echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
         }
     } else {
+        if($mfolder === null)
+            $app->response()->status(400);
+        else
+            $app->response()->status(500);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'No folder', 'data'=>''));
     }
@@ -438,12 +520,14 @@ function deleteFolder($id) { /* {{{ */
     global $app, $dms, $userobj;
 
     if(!$userobj) {
+        $app->response()->status(403);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
         return;
     }
 
-    if($id == 0) {
+    if(!ctype_digit($id) || $id == 0) {
+        $app->response()->status(400);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
         return;
@@ -455,14 +539,20 @@ function deleteFolder($id) { /* {{{ */
                 $app->response()->header('Content-Type', 'application/json');
                 echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
             } else {
+                $app->response()->status(500);
                 $app->response()->header('Content-Type', 'application/json');
                 echo json_encode(array('success'=>false, 'message'=>'Error deleting folder', 'data'=>''));
             }
         } else {
+            $app->response()->status(403);
             $app->response()->header('Content-Type', 'application/json');
             echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
         }
     } else {
+        if($mfolder === null)
+            $app->response()->status(400);
+        else
+            $app->response()->status(500);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'No folder', 'data'=>''));
     }
@@ -472,12 +562,14 @@ function uploadDocument($id) { /* {{{ */
     global $app, $dms, $userobj;
 
     if(!$userobj) {
+        $app->response()->status(403);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
         return;
     }
 
-    if($id == 0) {
+    if(!ctype_digit($id) || $id == 0) {
+        $app->response()->status(400);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
         return;
@@ -513,18 +605,24 @@ function uploadDocument($id) { /* {{{ */
             unlink($temp);
             if($res) {
                 $doc = $res[0];
-                $rec = array('id'=>$doc->getId(), 'name'=>$doc->getName());
+                $rec = array('id'=>(int)$doc->getId(), 'name'=>$doc->getName());
                 $app->response()->header('Content-Type', 'application/json');
                 echo json_encode(array('success'=>true, 'message'=>'Upload succeded', 'data'=>$rec));
             } else {
+                $app->response()->status(500);
                 $app->response()->header('Content-Type', 'application/json');
                 echo json_encode(array('success'=>false, 'message'=>'Upload failed', 'data'=>''));
             }
         } else {
+            $app->response()->status(403);
             $app->response()->header('Content-Type', 'application/json');
             echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
         }
     } else {
+        if($mfolder === null)
+            $app->response()->status(400);
+        else
+            $app->response()->status(500);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'No folder', 'data'=>''));
     }
@@ -537,12 +635,14 @@ function uploadDocumentPut($id) { /* {{{ */
     global $app, $dms, $userobj;
 
     if(!$userobj) {
+        $app->response()->status(403);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
         return;
     }
 
-    if($id == 0) {
+    if(!ctype_digit($id) || $id == 0) {
+        $app->response()->status(400);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
         return;
@@ -565,18 +665,24 @@ function uploadDocumentPut($id) { /* {{{ */
             unlink($temp);
             if($res) {
                 $doc = $res[0];
-                $rec = array('id'=>$doc->getId(), 'name'=>$doc->getName());
+                $rec = array('id'=>(int)$doc->getId(), 'name'=>$doc->getName());
                 $app->response()->header('Content-Type', 'application/json');
                 echo json_encode(array('success'=>true, 'message'=>'Upload succeded', 'data'=>$rec));
             } else {
+                $app->response()->status(500);
                 $app->response()->header('Content-Type', 'application/json');
                 echo json_encode(array('success'=>false, 'message'=>'Upload failed', 'data'=>''));
             }
         } else {
+            $app->response()->status(403);
             $app->response()->header('Content-Type', 'application/json');
             echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
         }
     } else {
+        if($mfolder === null)
+            $app->response()->status(400);
+        else
+            $app->response()->status(500);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'No folder', 'data'=>''));
     }
@@ -586,12 +692,13 @@ function uploadDocumentFile($documentId) { /* {{{ */
     global $app, $dms, $userobj;
 
     if(!$userobj) {
+        $app->response()->status(403);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
         return;
     }
 
-    if($documentId == 0) {
+    if(!ctype_digit($document) || $documentId == 0) {
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
         return;
@@ -653,14 +760,20 @@ function getDocument($id) { /* {{{ */
                 $app->response()->header('Content-Type', 'application/json');
                 echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
             } else {
+                $app->response()->status(403);
                 $app->response()->header('Content-Type', 'application/json');
                 echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
             }
         } else {
+            $app->response()->status(403);
             $app->response()->header('Content-Type', 'application/json');
             echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
         }
     } else {
+        if($document === null)
+            $app->response()->status(400);
+        else
+            $app->response()->status(500);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'No document', 'data'=>''));
     }
@@ -675,14 +788,20 @@ function deleteDocument($id) { /* {{{ */
                 $app->response()->header('Content-Type', 'application/json');
                 echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
             } else {
+                $app->response()->status(500);
                 $app->response()->header('Content-Type', 'application/json');
                 echo json_encode(array('success'=>false, 'message'=>'Error removing document', 'data'=>''));
             }
         } else {
+            $app->response()->status(403);
             $app->response()->header('Content-Type', 'application/json');
             echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
         }
     } else {
+        if($document === null)
+            $app->response()->status(400);
+        else
+            $app->response()->status(500);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'No document', 'data'=>''));
     }
@@ -699,22 +818,33 @@ function moveDocument($id, $folderid) { /* {{{ */
                         $app->response()->header('Content-Type', 'application/json');
                         echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
                     } else {
+                        $app->response()->status(500);
                         $app->response()->header('Content-Type', 'application/json');
                         echo json_encode(array('success'=>false, 'message'=>'Error moving document', 'data'=>''));
                     }
                 } else {
+                    $app->response()->status(403);
                     $app->response()->header('Content-Type', 'application/json');
                     echo json_encode(array('success'=>false, 'message'=>'No access on destination folder', 'data'=>''));
                 }
             } else {
+              if($folder === null)
+                  $app->response()->status(400);
+              else
+                  $app->response()->status(500);
                 $app->response()->header('Content-Type', 'application/json');
                 echo json_encode(array('success'=>false, 'message'=>'No destination folder', 'data'=>''));
             }
         } else {
+            $app->response()->status(403);
             $app->response()->header('Content-Type', 'application/json');
             echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
         }
     } else {
+        if($document === null)
+            $app->response()->status(400);
+        else
+            $app->response()->status(500);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'No document', 'data'=>''));
     }
@@ -727,23 +857,37 @@ function getDocumentContent($id) { /* {{{ */
     if($document) {
         if ($document->getAccessMode($userobj) >= M_READ) {
             $lc = $document->getLatestContent();
+            if($lc) {
+              if (pathinfo($document->getName(), PATHINFO_EXTENSION) == $lc->getFileType())
+                  $filename = $document->getName();
+              else
+                  $filename = $document->getName().$lc->getFileType();
 
-            if (pathinfo($document->getName(), PATHINFO_EXTENSION) == $lc->getFileType())
-                $filename = $document->getName();
-            else
-                $filename = $document->getName().$lc->getFileType();
+              $app->response()->header('Content-Type', $lc->getMimeType());
+              $app->response()->header("Content-Disposition", "filename=\"" . $filename . "\"");
+              $app->response()->header("Content-Length", filesize($dms->contentDir . $lc->getPath()));
+              $app->response()->header("Expires", "0");
+              $app->response()->header("Cache-Control", "no-cache, must-revalidate");
+              $app->response()->header("Pragma", "no-cache");
 
-            $app->response()->header('Content-Type', $lc->getMimeType());
-            $app->response()->header("Content-Disposition", "filename=\"" . $filename . "\"");
-            $app->response()->header("Content-Length", filesize($dms->contentDir . $lc->getPath()));
-            $app->response()->header("Expires", "0");
-            $app->response()->header("Cache-Control", "no-cache, must-revalidate");
-            $app->response()->header("Pragma", "no-cache");
-
-            readfile($dms->contentDir . $lc->getPath());
+              readfile($dms->contentDir . $lc->getPath());
+            } else {
+              $app->response()->status(403);
+              $app->response()->header('Content-Type', 'application/json');
+              echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
+            }
         } else {
-            $app->response()->status(404);
+            $app->response()->status(403);
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
         }
+    } else {
+        if($document === null)
+            $app->response()->status(400);
+        else
+            $app->response()->status(500);
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'No document', 'data'=>''));
     }
 
 } /* }}} */
@@ -768,12 +912,17 @@ function getDocumentVersions($id) { /* {{{ */
             $app->response()->header('Content-Type', 'application/json');
             echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
         } else {
+            $app->response()->status(403);
             $app->response()->header('Content-Type', 'application/json');
             echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
         }
     } else {
+        if($document === null)
+            $app->response()->status(400);
+        else
+            $app->response()->status(500);
         $app->response()->header('Content-Type', 'application/json');
-        echo json_encode(array('success'=>false, 'message'=>'No such document', 'data'=>''));
+        echo json_encode(array('success'=>false, 'message'=>'No document', 'data'=>''));
     }
 } /* }}} */
 
@@ -784,17 +933,36 @@ function getDocumentVersion($id, $version) { /* {{{ */
     if($document) {
         if ($document->getAccessMode($userobj) >= M_READ) {
             $lc = $document->getContentByVersion($version);
-            $app->response()->header('Content-Type', $lc->getMimeType());
-            $app->response()->header("Content-Disposition", "filename=\"" . $document->getName().$lc->getFileType() . "\"");
-            $app->response()->header("Content-Length", filesize($dms->contentDir . $lc->getPath()));
-            $app->response()->header("Expires", "0");
-            $app->response()->header("Cache-Control", "no-cache, must-revalidate");
-            $app->response()->header("Pragma", "no-cache");
+            if($lc) {
+              if (pathinfo($document->getName(), PATHINFO_EXTENSION) == $lc->getFileType())
+                  $filename = $document->getName();
+              else
+                  $filename = $document->getName().$lc->getFileType();
+              $app->response()->header('Content-Type', $lc->getMimeType());
+              $app->response()->header("Content-Disposition", "filename=\"" . $filename . "\"");
+              $app->response()->header("Content-Length", filesize($dms->contentDir . $lc->getPath()));
+              $app->response()->header("Expires", "0");
+              $app->response()->header("Cache-Control", "no-cache, must-revalidate");
+              $app->response()->header("Pragma", "no-cache");
 
-            readfile($dms->contentDir . $lc->getPath());
+              readfile($dms->contentDir . $lc->getPath());
+            } else {
+              $app->response()->status(403);
+              $app->response()->header('Content-Type', 'application/json');
+              echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
+            }
         } else {
-            $app->response()->status(404);
+            $app->response()->status(403);
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
         }
+    } else {
+        if($document === null)
+            $app->response()->status(400);
+        else
+            $app->response()->status(500);
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'No document', 'data'=>''));
     }
 } /* }}} */
 
@@ -808,7 +976,7 @@ function getDocumentFiles($id) { /* {{{ */
             $files = $document->getDocumentFiles();
             foreach($files as $file) {
                 $recs[] = array(
-                    'id'=>$file->getId(),
+                    'id'=>(int)$file->getId(),
                     'name'=>$file->getName(),
                     'date'=>$file->getDate(),
                     'mimetype'=>$file->getMimeType(),
@@ -818,8 +986,17 @@ function getDocumentFiles($id) { /* {{{ */
             $app->response()->header('Content-Type', 'application/json');
             echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
         } else {
-            $app->response()->status(404);
+            $app->response()->status(403);
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
         }
+    } else {
+        if($document === null)
+            $app->response()->status(400);
+        else
+            $app->response()->status(500);
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'No document', 'data'=>''));
     }
 } /* }}} */
 
@@ -839,8 +1016,17 @@ function getDocumentFile($id, $fileid) { /* {{{ */
 
             readfile($dms->contentDir . $file->getPath());
         } else {
-            $app->response()->status(404);
+            $app->response()->status(403);
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
         }
+    } else {
+        if($document === null)
+            $app->response()->status(400);
+        else
+            $app->response()->status(500);
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'No document', 'data'=>''));
     }
 } /* }}} */
 
@@ -854,7 +1040,7 @@ function getDocumentLinks($id) { /* {{{ */
             $links = $document->getDocumentLinks();
             foreach($links as $link) {
                 $recs[] = array(
-                    'id'=>$link->getId(),
+                    'id'=>(int)$link->getId(),
                     'target'=>$link->getTarget(),
                     'public'=>$link->isPublic(),
                 );
@@ -862,8 +1048,17 @@ function getDocumentLinks($id) { /* {{{ */
             $app->response()->header('Content-Type', 'application/json');
             echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
         } else {
-            $app->response()->status(404);
+            $app->response()->status(403);
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
         }
+    } else {
+        if($document === null)
+            $app->response()->status(400);
+        else
+            $app->response()->status(500);
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'No document', 'data'=>''));
     }
 } /* }}} */
 
@@ -877,7 +1072,7 @@ function getDocumentAttributes($id) { /* {{{ */
             $attributes = $document->getAttributes();
             foreach($attributes as $attribute) {
                 $recs[] = array(
-                    'id'=>$attribute->getId(),
+                    'id'=>(int)$attribute->getId(),
                     'value'=>$attribute->getValue(),
                     'name'=>$attribute->getAttributeDefinition()->getName(),
                 );
@@ -885,8 +1080,17 @@ function getDocumentAttributes($id) { /* {{{ */
             $app->response()->header('Content-Type', 'application/json');
             echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
         } else {
-            $app->response()->status(404);
+            $app->response()->status(403);
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
         }
+    } else {
+        if($document === null)
+            $app->response()->status(400);
+        else
+            $app->response()->status(500);
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'No document', 'data'=>''));
     }
 } /* }}} */
 
@@ -919,28 +1123,82 @@ function getDocumentPreview($id, $version=0, $width=0) { /* {{{ */
 
             $previewer->getPreview($object);
         } else {
-            $app->response()->status(404);
+            $app->response()->status(403);
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
         }
+    } else {
+        if($document === null)
+            $app->response()->status(400);
+        else
+            $app->response()->status(500);
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'No document', 'data'=>''));
+    }
+} /* }}} */
+
+function removeDocumentCategory($id, $categoryId) { /* {{{ */
+    global $app, $dms, $userobj;
+    $document = $dms->getDocument($id);
+    $category = $dms->getDocumentCategory($categoryId);
+
+    if($document && $category) {
+        if ($document->getAccessMode($userobj) >= M_READWRITE) {
+            $ret = $document->removeCategories(array($category));
+
+            $app->response()->header('Content-Type', 'application/json');
+            if ($ret)
+                echo json_encode(array('success'=>true, 'message'=>'Deleted category successfully.', 'data'=>''));
+            else
+                echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
+        } else {
+            $app->response()->status(403);
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
+        }
+    } else {
+        if($document === null || $category === null)
+            $app->response()->status(400);
+        else
+            $app->response()->status(500);
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'No such document', 'data'=>''));
+    }
+} /* }}} */
+
+function removeDocumentCategories($id) { /* {{{ */
+    global $app, $dms, $userobj;
+    $document = $dms->getDocument($id);
+
+    if($document) {
+        if ($document->getAccessMode($userobj) >= M_READWRITE) {
+            $app->response()->header('Content-Type', 'application/json');
+            if($document->setCategories(array()))
+                echo json_encode(array('success'=>true, 'message'=>'Deleted categories successfully.', 'data'=>''));
+            else
+                echo json_encode(array('success'=>false, 'message'=>'', 'data'=>''));
+        } else {
+            $app->response()->status(403);
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
+        }
+    } else {
+        if($document === null)
+            $app->response()->status(400);
+        else
+            $app->response()->status(500);
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'No such document', 'data'=>''));
     }
 } /* }}} */
 
 function getAccount() { /* {{{ */
     global $app, $dms, $userobj;
     if($userobj) {
-        $account = array();
-        $account['id'] = $userobj->getId();
-        $account['login'] = $userobj->getLogin();
-        $account['fullname'] = $userobj->getFullName();
-        $account['email'] = $userobj->getEmail();
-        $account['language'] = $userobj->getLanguage();
-        $account['theme'] = $userobj->getTheme();
-        $account['role'] = $userobj->getRole();
-        $account['comment'] = $userobj->getComment();
-        $account['isguest'] = $userobj->isGuest();
-        $account['isadmin'] = $userobj->isAdmin();
         $app->response()->header('Content-Type', 'application/json');
-        echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$account));
+        echo json_encode(array('success'=>true, 'message'=>'', 'data'=>__getUserData($userobj)));
     } else {
+        $app->response()->status(403);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
     }
@@ -1103,7 +1361,21 @@ function checkIfAdmin() { /* {{{ */
     return true;
 } /* }}} */
 
-function createAccount() { /* {{{ */
+function getUsers() { /* {{{ */
+    global $app, $dms, $userobj;
+
+    checkIfAdmin();
+
+    $users = $dms->getAllUsers();
+    $data = [];
+    foreach($users as $u)
+	    $data[] = __getUserData($u);
+
+    $app->response()->header('Content-Type', 'application/json');
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+} /* }}} */
+
+function createUser() { /* {{{ */
     global $app, $dms, $userobj;
 
     checkIfAdmin();
@@ -1115,18 +1387,17 @@ function createAccount() { /* {{{ */
     $language = $app->request()->post('language');
     $theme = $app->request()->post('theme');
     $comment = $app->request()->post('comment');
+    $role = $app->request()->post('role');
+    $roleid = $role == 'admin' ? SeedDMS_Core_User::role_admin : ($role == 'guest' ? SeedDMS_Core_User::role_guest : SeedDMS_Core_User::role_user);
 
-    $newAccount = $dms->addUser($userName, $password, $fullname, $email, $language, $theme, $comment);
-    if ($newAccount === false)
-    {
+    $newAccount = $dms->addUser($userName, $password, $fullname, $email, $language, $theme, $comment, $roleid);
+    if ($newAccount === false) {
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Account could not be created, maybe it already exists', 'data'=>''));
         return;
     }
 
-    $result = array(
-                'id'=>$newAccount->getID()
-                );
+    $result = __getUserData($newAccount);
     $app->response()->header('Content-Type', 'application/json');
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$result));
     return;
@@ -1137,7 +1408,7 @@ function createAccount() { /* {{{ */
  *
  * @param      <type>  $id     The user name or numerical identifier
  */
-function changeAccountPassword($id) { /* {{{ */
+function changeUserPassword($id) { /* {{{ */
     global $app, $dms, $userobj;
 
     checkIfAdmin();
@@ -1145,13 +1416,13 @@ function changeAccountPassword($id) { /* {{{ */
     if ($app->request()->put('password') == null)
     {
         $app->response()->header('Content-Type', 'application/json');
-        echo json_encode(array('success'=>false, 'message'=>'You must PUT a new password', 'data'=>''));
+        echo json_encode(array('success'=>false, 'message'=>'You must supply a new password', 'data'=>''));
         return;
     }
 
     $newPassword = $app->request()->put('password');
 
-    if(is_numeric($id))
+    if(ctype_digit($id))
         $account = $dms->getUser($id);
     else {
         $account = $dms->getUserByLogin($id);
@@ -1179,17 +1450,17 @@ function changeAccountPassword($id) { /* {{{ */
     return;
 } /* }}} */
 
-function getAccountById($id) { /* {{{ */
+function getUserById($id) { /* {{{ */
     global $app, $dms, $userobj;
     checkIfAdmin();
-    if(is_numeric($id))
+    if(ctype_digit($id))
         $account = $dms->getUser($id);
     else {
         $account = $dms->getUserByLogin($id);
     }
     if($account) {
         $data = array();
-        $data['id'] = $account->getId();
+        $data['id'] = (int)$account->getId();
         $data['login'] = $account->getLogin();
         $data['fullname'] = $account->getFullName();
         $data['email'] = $account->getEmail();
@@ -1197,10 +1468,9 @@ function getAccountById($id) { /* {{{ */
         $data['theme'] = $account->getTheme();
         $data['role'] = $account->getRole();
         $data['comment'] = $account->getComment();
-        $outputDisabled = ($account->isDisabled() === true || $account->isDisabled() === '1');
-        $data['isdisabled'] = $outputDisabled;
-        $data['isguest'] = $account->isGuest();
-        $data['isadmin'] = $account->isAdmin();
+        $data['isdisabled'] = $account->isDisabled() ? true : false;
+        $data['isguest'] = $account->isGuest() ? true : false;
+        $data['isadmin'] = $account->isAdmin() ? true : false;
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
     } else {
@@ -1208,24 +1478,23 @@ function getAccountById($id) { /* {{{ */
     }
 } /* }}} */
 
-function setDisabledAccount($id) { /* {{{ */
+function setDisabledUser($id) { /* {{{ */
     global $app, $dms, $userobj;
     checkIfAdmin();
-    if ($app->request()->put('disable') == null)
-    {
+    if ($app->request()->put('disable') == null) {
+        $app->response()->status(400);
         $app->response()->header('Content-Type', 'application/json');
-        echo json_encode(array('success'=>false, 'message'=>'You must PUT a disabled state', 'data'=>''));
+        echo json_encode(array('success'=>false, 'message'=>'You must supply a disabled state', 'data'=>''));
         return;
     }
 
     $isDisabled = false;
     $status = $app->request()->put('disable');
-    if ($status == 'true' || $status == '1')
-    {
+    if ($status == 'true' || $status == '1') {
         $isDisabled = true;
     }
 
-    if(is_numeric($id))
+    if(ctype_digit($id))
         $account = $dms->getUser($id);
     else {
         $account = $dms->getUserByLogin($id);
@@ -1233,13 +1502,7 @@ function setDisabledAccount($id) { /* {{{ */
 
     if($account) {
         $account->setDisabled($isDisabled);
-        $data = array();
-        $data['id'] = $account->getId();
-        $data['login'] = $account->getLogin();
-        $data['fullname'] = $account->getFullName();
-        $data['email'] = $account->getEmail();
-        $outputDisabled = ($account->isDisabled() === true || $account->isDisabled() === '1');
-        $data['isdisabled'] = $outputDisabled;
+        $data = __getUserData($account);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
     } else {
@@ -1254,16 +1517,13 @@ function createGroup() { /* {{{ */
     $comment = $app->request()->post('comment');
 
     $newGroup = $dms->addGroup($groupName, $comment);
-    if ($newGroup === false)
-    {
+    if ($newGroup === false) {
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Group could not be created, maybe it already exists', 'data'=>''));
         return;
     }
 
-    $result = array(
-                'id'=>$newGroup->getID()
-                );
+    $result = array('id'=>(int)$newGroup->getID());
     $app->response()->header('Content-Type', 'application/json');
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$result));
     return;
@@ -1272,19 +1532,16 @@ function createGroup() { /* {{{ */
 function getGroup($id) { /* {{{ */
     global $app, $dms, $userobj;
     checkIfAdmin();
-    if(is_numeric($id))
+    if(ctype_digit($id))
         $group = $dms->getGroup($id);
     else {
         $group = $dms->getGroupByName($id);
     }
     if($group) {
-        $data = array();
-        $data['id'] = $group->getId();
-        $data['name'] = $group->getName();
-        $data['comment'] = $group->getComment();
+        $data = __getGroupData($group);
         $data['users'] = array();
         foreach ($group->getUsers() as $user) {
-            $data['users'][] =  array('id' => $user->getID(), 'login' => $user->getLogin());
+            $data['users'][] =  array('id' => (int)$user->getID(), 'login' => $user->getLogin());
         }
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
@@ -1297,7 +1554,7 @@ function changeGroupMembership($id, $operationType) { /* {{{ */
     global $app, $dms, $userobj;
     checkIfAdmin();
 
-    if(is_numeric($id))
+    if(ctype_digit($id))
         $group = $dms->getGroup($id);
     else {
         $group = $dms->getGroupByName($id);
@@ -1310,7 +1567,7 @@ function changeGroupMembership($id, $operationType) { /* {{{ */
         return;
     }
     $userId = $app->request()->put('userid');
-    if(is_numeric($userId))
+    if(ctype_digit($userId))
         $user = $dms->getUser($userId);
     else {
         $user = $dms->getUserByLogin($userId);
@@ -1344,13 +1601,10 @@ function changeGroupMembership($id, $operationType) { /* {{{ */
         return;
     }
 
-    $data = array();
-    $data['id'] = $group->getId();
-    $data['name'] = $group->getName();
-    $data['comment'] = $group->getComment();
+    $data = __getGroupData($group);
     $data['users'] = array();
     foreach ($group->getUsers() as $userObj) {
-        $data['users'][] =  array('id' => $userObj->getID(), 'login' => $userObj->getLogin());
+        $data['users'][] =  array('id' => (int)$userObj->getID(), 'login' => $userObj->getLogin());
     }
     $app->response()->header('Content-Type', 'application/json');
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
@@ -1370,7 +1624,7 @@ function setFolderInheritsAccess($id) { /* {{{ */
     if ($app->request()->put('enable') == null)
     {
         $app->response()->header('Content-Type', 'application/json');
-        echo json_encode(array('success'=>false, 'message'=>'You must PUT an "enable" value', 'data'=>''));
+        echo json_encode(array('success'=>false, 'message'=>'You must supply an "enable" value', 'data'=>''));
         return;
     }
 
@@ -1381,7 +1635,7 @@ function setFolderInheritsAccess($id) { /* {{{ */
         $inherit = true;
     }
 
-    if(is_numeric($id))
+    if(ctype_digit($id))
         $folder = $dms->getFolder($id);
     else {
         $folder = $dms->getFolderByName($id);
@@ -1421,7 +1675,7 @@ function changeFolderAccess($id, $operationType, $userOrGroup) { /* {{{ */
     global $app, $dms, $userobj;
     checkIfAdmin();
 
-    if(is_numeric($id))
+    if(ctype_digit($id))
         $folder = $dms->getfolder($id);
     else {
         $folder = $dms->getfolderByName($id);
@@ -1467,19 +1721,19 @@ function changeFolderAccess($id, $operationType, $userOrGroup) { /* {{{ */
 
 
     $userOrGroupId = $userOrGroupIdInput;
-    if(!is_numeric($userOrGroupIdInput) && $userOrGroup == 'user')
+    if(!ctype_digit($userOrGroupIdInput) && $userOrGroup == 'user')
     {
         $userOrGroupObj = $dms->getUserByLogin($userOrGroupIdInput);
     }
-    if(!is_numeric($userOrGroupIdInput) && $userOrGroup == 'group')
+    if(!ctype_digit($userOrGroupIdInput) && $userOrGroup == 'group')
     {
         $userOrGroupObj = $dms->getGroupByName($userOrGroupIdInput);
     }
-    if(is_numeric($userOrGroupIdInput) && $userOrGroup == 'user')
+    if(ctype_digit($userOrGroupIdInput) && $userOrGroup == 'user')
     {
         $userOrGroupObj = $dms->getUser($userOrGroupIdInput);
     }
-    if(is_numeric($userOrGroupIdInput) && $userOrGroup == 'group')
+    if(ctype_digit($userOrGroupIdInput) && $userOrGroup == 'group')
     {
         $userOrGroupObj = $dms->getGroup($userOrGroupIdInput);
     }
@@ -1533,13 +1787,13 @@ function getCategories() { /* {{{ */
     $categories = $dms->getDocumentCategories();
     $data = [];
     foreach($categories as $category)
-        $data[] = ['id' => $category->getId(), 'name' => $category->getName()];
+        $data[] = ['id' => (int)$category->getId(), 'name' => $category->getName()];
 
     $app->response()->header('Content-Type', 'application/json');
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
 } /* }}} */
 
-function addCategory() { /* {{{ */
+function createCategory() { /* {{{ */
     global $app, $dms, $userobj;
     checkIfAdmin();
 
@@ -1555,10 +1809,13 @@ function addCategory() { /* {{{ */
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Category already exists', 'data'=>''));
     } else {
-        $data = $dms->addDocumentCategory($category);
-
-        $app->response()->header('Content-Type', 'application/json');
-        echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+        if($data = $dms->addDocumentCategory($category)) {
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>true, 'message'=>'', 'data'=>array('id'=>(int)$data->getID())));
+        } else {
+            $app->response()->header('Content-Type', 'application/json');
+            echo json_encode(array('success'=>false, 'message'=>'Could not add category', 'data'=>''));
+        }
     }
 } /* }}} */
 
@@ -1566,12 +1823,15 @@ function deleteCategory($id) { /* {{{ */
     global $app, $dms, $userobj;
     checkIfAdmin();
 
-    $categories = new SeedDMS_Core_DocumentCategory($id, null);
-    $result = $categories->remove();
-    $data = null;
-
     $app->response()->header('Content-Type', 'application/json');
-    echo json_encode(array('success'=>$result, 'message'=>'', 'data'=>$data));
+    if($category = $dms->getDocumentCategory($id)) {
+        if($result = $category->remove())
+            echo json_encode(array('success'=>$result, 'message'=>'', 'data'=>''));
+        else
+            echo json_encode(array('success'=>$result, 'message'=>'Could not delete category', 'data'=>''));
+    } else {
+        echo json_encode(array('success'=>false, 'message'=>'No such category', 'data'=>''));
+    }
 } /* }}} */
 
 /**
@@ -1587,14 +1847,14 @@ function changeCategoryName($id) { /* {{{ */
     if ($app->request()->put('name') == null)
     {
         $app->response()->header('Content-Type', 'application/json');
-        echo json_encode(array('success'=>false, 'message'=>'You must PUT a new name', 'data'=>''));
+        echo json_encode(array('success'=>false, 'message'=>'You must supply a new name', 'data'=>''));
         return;
     }
 
     $newname = $app->request()->put('name');
 
     $category = null;
-    if(is_numeric($id))
+    if(ctype_digit($id))
         $category = $dms->getDocumentCategory($id);
 
     /**
@@ -1642,14 +1902,14 @@ function changeAttributeDefinitionName($id) { /* {{{ */
     if ($app->request()->put('name') == null)
     {
         $app->response()->header('Content-Type', 'application/json');
-        echo json_encode(array('success'=>false, 'message'=>'You must PUT a new name', 'data'=>''));
+        echo json_encode(array('success'=>false, 'message'=>'You must supply a new name', 'data'=>''));
         return;
     }
 
     $newname = $app->request()->put('name');
 
     $attrdef = null;
-    if(is_numeric($id))
+    if(ctype_digit($id))
         $attrdef = $dms->getAttributeDefinition($id);
 
     /**
@@ -1676,7 +1936,7 @@ function clearFolderAccessList($id) { /* {{{ */
     global $app, $dms, $userobj;
     checkIfAdmin();
 
-    if(is_numeric($id))
+    if(ctype_digit($id))
         $folder = $dms->getFolder($id);
     else {
         $folder = $dms->getFolderByName($id);
@@ -1692,6 +1952,13 @@ function clearFolderAccessList($id) { /* {{{ */
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
 } /* }}} */
 
+function echoData() { /* {{{ */
+    global $app;
+
+    print_r($app->request->put());
+    echo $app->request->getBody();
+} /* }}} */
+
 //$app = new Slim(array('mode'=>'development', '_session.handler'=>null));
 $app = new \Slim\Slim(array('mode'=>'production', '_session.handler'=>null));
 
@@ -1741,13 +2008,16 @@ $app->get('/document/:id/file/:fileid', 'getDocumentFile');
 $app->get('/document/:id/links', 'getDocumentLinks');
 $app->get('/document/:id/attributes', 'getDocumentAttributes');
 $app->get('/document/:id/preview/:version/:width', 'getDocumentPreview');
+$app->delete('/document/:id/categories', 'removeDocumentCategories');
+$app->delete('/document/:id/category/:categoryId', 'removeDocumentCategory');
 $app->put('/account/fullname', 'setFullName');
 $app->put('/account/email', 'setEmail');
-$app->get('/account/locked', 'getLockedDocuments');
-$app->post('/accounts', 'createAccount');
-$app->get('/accounts/:id', 'getAccountById');
-$app->put('/accounts/:id/disable', 'setDisabledAccount');
-$app->put('/accounts/:id/password', 'changeAccountPassword');
+$app->get('/account/documents/locked', 'getLockedDocuments');
+$app->get('/users', 'getUsers');
+$app->post('/users', 'createUser');
+$app->get('/users/:id', 'getUserById');
+$app->put('/users/:id/disable', 'setDisabledUser');
+$app->put('/users/:id/password', 'changeUserPassword');
 $app->post('/groups', 'createGroup');
 $app->get('/groups/:id', 'getGroup');
 $app->put('/groups/:id/addUser', 'addUserToGroup');
@@ -1760,10 +2030,11 @@ $app->put('/folder/:id/access/user/remove', 'removeUserAccessFromFolder');
 $app->put('/folder/:id/access/clear', 'clearFolderAccessList');
 $app->get('/categories', 'getCategories');
 $app->delete('/categories/:id', 'deleteCategory');
-$app->post('/categories', 'addCategory');
+$app->post('/categories', 'createCategory');
 $app->put('/categories/:id/name', 'changeCategoryName');
 $app->get('/attributedefinitions', 'getAttributeDefinitions');
 $app->put('/attributedefinitions/:id/name', 'changeAttributeDefinitionName');
+$app->any('/echo', 'echoData');
 $app->run();
 
 ?>

From 21518adecc83e9916a4152c111b09a86b4f0b72e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 22 Dec 2017 13:05:35 +0100
Subject: [PATCH 201/308] call hooks

---
 utils/indexer.php | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/utils/indexer.php b/utils/indexer.php
index 05d0d6a37..699eeffee 100644
--- a/utils/indexer.php
+++ b/utils/indexer.php
@@ -1,5 +1,7 @@
 <?php
-require_once("../inc/inc.ClassSettings.php");
+#require_once("../inc/inc.ClassSettings.php");
+include("../inc/inc.Settings.php");
+include("../inc/inc.Extension.php");
 
 function usage() { /* {{{ */
 	echo "Usage:\n";
@@ -15,7 +17,7 @@ function usage() { /* {{{ */
 	echo "  --config: set alternative config file.\n";
 } /* }}} */
 
-$version = "0.0.1";
+$version = "0.0.2";
 $shortoptions = "hvc";
 $longoptions = array('help', 'version', 'config:');
 if(false === ($options = getopt($shortoptions, $longoptions))) {
@@ -83,7 +85,16 @@ function tree($dms, $index, $indexconf, $folder, $indent='') { /* {{{ */
 		$lucenesearch = new $indexconf['Search']($index);
 		if(!($hit = $lucenesearch->getDocument($document->getId()))) {
 			try {
-				$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false, $settings->_cmdTimeout));
+#				$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false, $settings->_cmdTimeout));
+				$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false, $settings->_cmdTimeout);
+                                if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) {
+                                	foreach($GLOBALS['SEEDDMS_HOOKS']['indexDocument'] as $hookObj) {
+                                        	if (method_exists($hookObj, 'preIndexDocument')) {
+                                                	$hookObj->preIndexDocument(null, $document, $idoc);
+                                                }
+                           		}
+                		}
+                                $index->addDocument($idoc);
 				echo " (Document added)\n";
 			} catch(Exception $e) {
 				echo " (Timeout)\n";
@@ -100,7 +111,17 @@ function tree($dms, $index, $indexconf, $folder, $indent='') { /* {{{ */
 			} else {
 				$index->delete($hit->id);
 				try {
-					$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false, $settings->_cmdTimeout));
+#					$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false, $settings->_cmdTimeout));
+                                        $idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false, $settings->_cmdTimeout);
+						if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) {
+                                                	foreach($GLOBALS['SEEDDMS_HOOKS']['indexDocument'] as $hookObj) {
+                                                        	if (method_exists($hookObj, 'preIndexDocument')) {
+                                                                	$hookObj->preIndexDocument(null, $document, $idoc);
+                                                                }
+                                                        }
+                                                }
+                                        $index->addDocument($idoc);
+
 					echo " (Document updated)\n";
 				} catch(Exception $e) {
 					echo " (Timeout)\n";

From d1ea6394312d9ecd2b7497e01aa536f979049c48 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 22 Dec 2017 13:36:01 +0100
Subject: [PATCH 202/308] add more response codes

---
 restapi/index.php | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index eb2072b55..c8a0eb676 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -427,6 +427,7 @@ function createFolder($id) { /* {{{ */
                 if($folder = $parent->addSubFolder($name, $comment, $userobj, 0, $newattrs)) {
 
                     $rec = __getFolderData($folder);
+										$app->response()->status(201);
                     $app->response()->header('Content-Type', 'application/json');
                     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$rec));
                 } else {
@@ -582,8 +583,8 @@ function uploadDocument($id) { /* {{{ */
 //            $categories = $app->request()->params('categories') ? $app->request()->params('categories') : [];
 //            $attributes = $app->request()->params('attributes') ? $app->request()->params('attributes') : [];
             $origfilename = $app->request()->params('origfilename');
-            if (count($_FILES) == 0)
-            {
+            if (count($_FILES) == 0) {
+                $app->response()->status(400);
                 $app->response()->header('Content-Type', 'application/json');
                 echo json_encode(array('success'=>false, 'message'=>'No file detected', 'data'=>''));
                 return;
@@ -712,8 +713,8 @@ function uploadDocumentFile($documentId) { /* {{{ */
             $comment = $app->request()->params('comment');
             $version = $app->request()->params('version') == '' ? 0 : $app->request()->params('version');
             $public = $app->request()->params('public') == '' ? 'false' : $app->request()->params('public');
-            if (count($_FILES) == 0)
-            {
+            if (count($_FILES) == 0) {
+                $app->response()->status(400);
                 $app->response()->header('Content-Type', 'application/json');
                 echo json_encode(array('success'=>false, 'message'=>'No file detected', 'data'=>''));
                 return;
@@ -733,17 +734,24 @@ function uploadDocumentFile($documentId) { /* {{{ */
                         $fileType, $userfiletype, $version, $public);
             unlink($temp);
             if($res) {
+                $app->response()->status(201);
                 $app->response()->header('Content-Type', 'application/json');
                 echo json_encode(array('success'=>true, 'message'=>'Upload succeded', 'data'=>$res));
             } else {
+                $app->response()->status(500);
                 $app->response()->header('Content-Type', 'application/json');
                 echo json_encode(array('success'=>false, 'message'=>'Upload failed', 'data'=>''));
             }
         } else {
+            $app->response()->status(403);
             $app->response()->header('Content-Type', 'application/json');
             echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
         }
-    } else {
+		} else {
+			  if($document === null)
+            $app->response()->status(400);
+				else
+            $app->response()->status(500);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'No such document', 'data'=>''));
     }
@@ -1392,12 +1400,14 @@ function createUser() { /* {{{ */
 
     $newAccount = $dms->addUser($userName, $password, $fullname, $email, $language, $theme, $comment, $roleid);
     if ($newAccount === false) {
+        $app->response()->status(500);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Account could not be created, maybe it already exists', 'data'=>''));
         return;
     }
 
     $result = __getUserData($newAccount);
+    $app->response()->status(201);
     $app->response()->header('Content-Type', 'application/json');
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$result));
     return;
@@ -1518,12 +1528,14 @@ function createGroup() { /* {{{ */
 
     $newGroup = $dms->addGroup($groupName, $comment);
     if ($newGroup === false) {
+        $app->response()->status(500);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Group could not be created, maybe it already exists', 'data'=>''));
         return;
     }
 
     $result = array('id'=>(int)$newGroup->getID());
+    $app->response()->status(201);
     $app->response()->header('Content-Type', 'application/json');
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$result));
     return;
@@ -1799,6 +1811,7 @@ function createCategory() { /* {{{ */
 
     $category = $app->request()->params("category");
     if ($category == null) {
+        $app->response()->status(400);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Need a category.', 'data'=>''));
         return;
@@ -1806,13 +1819,16 @@ function createCategory() { /* {{{ */
 
     $catobj = $dms->getDocumentCategoryByName($category);
     if($catobj) {
+        $app->response()->status(409);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>false, 'message'=>'Category already exists', 'data'=>''));
     } else {
         if($data = $dms->addDocumentCategory($category)) {
+            $app->response()->status(201);
             $app->response()->header('Content-Type', 'application/json');
             echo json_encode(array('success'=>true, 'message'=>'', 'data'=>array('id'=>(int)$data->getID())));
         } else {
+            $app->response()->status(500);
             $app->response()->header('Content-Type', 'application/json');
             echo json_encode(array('success'=>false, 'message'=>'Could not add category', 'data'=>''));
         }

From 4f95d58c4b61cdab3b1d41d0fce834f8c0dae7b1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 30 Dec 2017 12:39:49 +0100
Subject: [PATCH 203/308] fix doLogin function, which uses the wrong user
 variable

---
 restapi/index.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index c8a0eb676..e7f077978 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -152,24 +152,24 @@ function doLogin() { /* {{{ */
     $username = $app->request()->post('user');
     $password = $app->request()->post('pass');
 
-    $userobj = $dms->getUserByLogin($username);
-    $user = null;
+//    $userobj = $dms->getUserByLogin($username);
+    $userobj = null;
 
     /* Authenticate against LDAP server {{{ */
-    if (!$user && isset($settings->_ldapHost) && strlen($settings->_ldapHost)>0) {
+    if (!$userobj && isset($settings->_ldapHost) && strlen($settings->_ldapHost)>0) {
         require_once("../inc/inc.ClassLdapAuthentication.php");
         $authobj = new SeedDMS_LdapAuthentication($dms, $settings);
-        $user = $authobj->authenticate($username, $password);
+        $userobj = $authobj->authenticate($username, $password);
     } /* }}} */
 
     /* Authenticate against SeedDMS database {{{ */
-    if(!$user) {
+    if(!$userobj) {
         require_once("../inc/inc.ClassDbAuthentication.php");
         $authobj = new SeedDMS_DbAuthentication($dms, $settings);
-        $user = $authobj->authenticate($username, $password);
+        $userobj = $authobj->authenticate($username, $password);
     } /* }}} */
 
-    if(!$user) {
+    if(!$userobj) {
         if(USE_PHP_SESSION) {
             unset($_SESSION['userid']);
         } else {

From 2ab62605b03812af32bef8993827f00863cdf6ab Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 30 Dec 2017 12:41:07 +0100
Subject: [PATCH 204/308] use microtime for session id

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

diff --git a/inc/inc.ClassSession.php b/inc/inc.ClassSession.php
index 30e8d6496..9b15723f6 100644
--- a/inc/inc.ClassSession.php
+++ b/inc/inc.ClassSession.php
@@ -94,7 +94,7 @@ class SeedDMS_Session {
 	 * @return string/boolean id of session of false in case of an error
 	 */
 	function create($data) { /* {{{ */
-		$id = "" . rand() . time() . rand() . "";
+		$id = "" . rand() . '-'.microtime() . '-'.rand() . "";
 		$id = md5($id);
 		$lastaccess = time();
 		$queryStr = "INSERT INTO `tblSessions` (`id`, `userID`, `lastAccess`, `theme`, `language`, `su`) ".

From 0f5284df30bbf0d61ee91a2fd00cd17917b7c7ed Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 1 Jan 2018 08:59:48 +0100
Subject: [PATCH 205/308] take out printf

---
 restapi/index.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/restapi/index.php b/restapi/index.php
index e7f077978..a9ca1dd2d 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -1971,7 +1971,6 @@ function clearFolderAccessList($id) { /* {{{ */
 function echoData() { /* {{{ */
     global $app;
 
-    print_r($app->request->put());
     echo $app->request->getBody();
 } /* }}} */
 

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 206/308] 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 a7b0a6e00088651f8098881363832582cbbbffe6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 3 Jan 2018 08:07:42 +0100
Subject: [PATCH 207/308] 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 5ee711059785aabf8703519d012460e5c2b32801 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 3 Jan 2018 09:29:34 +0100
Subject: [PATCH 208/308] started new version 5.1.6

---
 CHANGELOG                          |  4 +++
 Makefile                           |  2 +-
 SeedDMS_Core/Core/inc.ClassDMS.php |  2 +-
 SeedDMS_Core/package.xml           | 45 ++++++++++++++++++++----------
 inc/inc.Version.php                |  2 +-
 install/install.php                |  2 +-
 6 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ded6bb2f8..04e575712 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.6
+--------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
                      Changes in version 5.1.5
 --------------------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 0805e195a..5287b1aa9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=5.1.5
+VERSION=5.1.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 7c4e91b28..49a769aa0 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -371,7 +371,7 @@ class SeedDMS_Core_DMS {
 		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '5.1.5';
+			$this->version = '5.1.6';
 	} /* }}} */
 
 	/**
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 7c7eb22d7..eb9e076a8 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>2018-01-07</date>
  <time>09:19:24</time>
  <version>
-  <release>5.1.5</release>
-  <api>5.1.5</api>
+  <release>5.1.6</release>
+  <api>5.1.6</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,18 +24,6 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- 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()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1545,5 +1533,32 @@ returns just users which are not disabled
 - all changes from 5.0.14 merged
    </notes>
   </release>
+  <release>
+   <date>2017-11-07</date>
+   <time>09:19:24</time>
+   <version>
+    <release>5.1.5</release>
+    <api>5.1.5</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- 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()
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index 3fcc1c88b..ddf140bb2 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "5.1.5";
+	public $_number = "5.1.6";
 	private $_string = "SeedDMS";
 
 	function __construct() {
diff --git a/install/install.php b/install/install.php
index ecf7d5870..643b8f190 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", "5.1.5");
+define("SEEDDMS_VERSION", "5.1.6");
 
 require_once('../inc/inc.ClassSettings.php');
 

From d2ccd5d5adecf785c0c49778b7c3556e2afd2265 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Jan 2018 10:49:36 +0100
Subject: [PATCH 209/308] better check in mayReview() and mayApprove()

mayReview() will only return true anymore, if the status is S_DRAFT_REV.
mayApprove() will only return true anymore, if the status is S_DRAFT_APP.
---
 inc/inc.ClassAccessOperation.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index bfbe66010..d4877ef69 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -236,15 +236,15 @@ class SeedDMS_AccessOperation {
 	/**
 	 * Check if document content may be reviewed
 	 *
-	 * Reviewing a document content is only allowed if the document was not
-	 * obsoleted. There are other requirements which are not taken into
+	 * Reviewing a document content is only allowed if the document is in
+	 * review. 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();
 			$status = $latestContent->getStatus();
-			if ($status["status"]!=S_OBSOLETE) {
+			if ($status["status"]==S_DRAFT_REV) {
 				return true;
 			}
 		}
@@ -269,8 +269,9 @@ class SeedDMS_AccessOperation {
 	/**
 	 * Check if document content may be approved
 	 *
-	 * Approving a document content is only allowed if the document was not
-	 * obsoleted and the document is not in review status.
+	 * Approving a document content is only allowed if the document is either
+	 * in approval status or released. In the second case the approval can be
+	 * edited.
 	 * There are other requirements which are not taken into
 	 * account here.
 	 */
@@ -278,7 +279,7 @@ class SeedDMS_AccessOperation {
 		if(get_class($this->obj) == $this->dms->getClassname('document')) {
 			$latestContent = $this->obj->getLatestContent();
 			$status = $latestContent->getStatus();
-			if ($status["status"]!=S_OBSOLETE && $status["status"]!=S_DRAFT_REV && $status["status"]!=S_REJECTED) {
+			if ($status["status"]==S_DRAFT_APP) {
 				return true;
 			}
 		}

From 6c5608d96d61ec9e864501f3f5c148bf3f138684 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Jan 2018 10:51:08 +0100
Subject: [PATCH 210/308] fix wrong variable name (part of ticket #373)

---
 restapi/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/restapi/index.php b/restapi/index.php
index 2dd729fcb..1aca291b6 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -699,7 +699,7 @@ function uploadDocumentFile($documentId) { /* {{{ */
         return;
     }
 
-    if(!ctype_digit($document) || $documentId == 0) {
+    if(!ctype_digit($documentId) || $documentId == 0) {
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
         return;

From f99d860d6d4c4ae47193f344da6c4b0352b21ca5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Jan 2018 10:52:46 +0100
Subject: [PATCH 211/308] add entries for 5.1.6

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 04e575712..c8eae2d38 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 --------------------------------------------------------------------------------
                      Changes in version 5.1.6
 --------------------------------------------------------------------------------
+- fix wrong check in restapi (part of #373)
+- mayApprove() and mayReview() require the status to be S_DRAFT_APP resp. S_DRAFT_REV
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.5

From a20c2167c9c25261dc93ecadc10d9604bb50b879 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Jan 2018 10:54:02 +0100
Subject: [PATCH 212/308] add video/webm to list of mimetypes which are
 previewed

---
 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 45023aebf..69a3ea203 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -356,6 +356,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			</audio>
 	<?php
 				break;
+			case 'video/webm':
 			case 'video/mp4':
 				$this->contentHeading(getMLText("preview"));
 	?>

From ca1b5ba5cc0cd0ec1efa7f31b96d9c5ac3fbeac7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Jan 2018 10:57:05 +0100
Subject: [PATCH 213/308] - add entry to 5.1.6

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

diff --git a/CHANGELOG b/CHANGELOG
index c8eae2d38..9c93f6742 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 --------------------------------------------------------------------------------
 - fix wrong check in restapi (part of #373)
 - mayApprove() and mayReview() require the status to be S_DRAFT_APP resp. S_DRAFT_REV
+- add preview for webm videos (Closes #374)
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.5

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 214/308] 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 215/308] 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 216/308] 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 217/308] 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 09c7c0fc2a97fea361a2194758f44e6e2c32822f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Jan 2018 15:32:08 +0100
Subject: [PATCH 218/308] prevent php warning if converters are not set

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

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index a5d48b20e..8bd40e5af 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -747,14 +747,16 @@ if(!is_writeable($settings->_configFilePath)) {
 ?>
       <tr><td><b><?php printMLText($target."_converters");?></b></td></tr>
 <?php
-	foreach($settings->_converters[$target] as $mimetype=>$cmd) {
+		if(!empty($settings->_converters[$target])) {
+			foreach($settings->_converters[$target] as $mimetype=>$cmd) {
 ?>
       <tr title="<?php echo $mimetype;?>">
         <td><?php echo $mimetype;?>:</td>
         <td><?php $this->showTextField("converters[".$target."][".$mimetype."]", htmlspecialchars($cmd)); ?></td>
       </tr>
 <?php
-	}
+			}
+		}
 ?>
       <tr title="">
         <td><?php $this->showTextField("converters[".$target."][newmimetype]", "", '', getMLText('converter_new_mimetype')); ?>:</td>

From fd3cef54072ccf67b09e71dd6dc3bc83538bd00b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Jan 2018 15:35:08 +0100
Subject: [PATCH 219/308] fix text for error msgs

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

diff --git a/out/out.TransferObjects.php b/out/out.TransferObjects.php
index 7b45fe4a9..5831d6807 100644
--- a/out/out.TransferObjects.php
+++ b/out/out.TransferObjects.php
@@ -31,16 +31,16 @@ if (!$user->isAdmin()) {
 }
 
 if (!isset($_GET["userid"]) || !is_numeric($_GET["userid"]) || intval($_GET["userid"])<1) {
-	UI::exitError(getMLText("rm_user"),getMLText("invalid_user_id"));
+	UI::exitError(getMLText("transfer_objects"),getMLText("invalid_user_id"));
 }
 
 $rmuser = $dms->getUser(intval($_GET["userid"]));
 if (!is_object($rmuser)) {
-	UI::exitError(getMLText("rm_user"),getMLText("invalid_user_id"));
+	UI::exitError(getMLText("transfer_objects"),getMLText("invalid_user_id"));
 }
 
 if ($rmuser->getID()==$user->getID()) {
-	UI::exitError(getMLText("rm_user"),getMLText("cannot_delete_yourself"));
+	UI::exitError(getMLText("transfer_objects"),getMLText("cannot_delete_yourself"));
 }
 
 $allusers = $dms->getAllUsers($settings->_sortUsersInList);

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 220/308] 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 221/308] 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 222/308] 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 223/308] 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 224/308] 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 225/308] 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 226/308] 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 227/308] 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 228/308] 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 229/308] 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 5c7c1b0b26fada4b1240b681d3b61e35b999fbcc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Jan 2018 07:07:20 +0100
Subject: [PATCH 230/308] add installation instructions for xsendfile

---
 doc/README.xsendfile | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 doc/README.xsendfile

diff --git a/doc/README.xsendfile b/doc/README.xsendfile
new file mode 100644
index 000000000..1ee738953
--- /dev/null
+++ b/doc/README.xsendfile
@@ -0,0 +1,26 @@
+Howto configure mod_xsendfile
+==============================
+
+Downloading large files from SeedDMS can be slow, because they are delivered
+by the PHP download script. This is a common problem not specific to SeedDMS
+but to PHP scripts of this kind in general. Granting direct access on the
+download file is not a option as it circumvents the access restrictions of
+SeedDMS.
+
+The Apache module xsendfile is just for this kind of controlled downloads. If
+is installed and configured, SeedDMS will hand over the download to the web
+server which does a much better job than the PHP script. In order to make it
+work, mod_xsendfile must be installed, turned on and the path to the download
+files must be set to the directory containing the document files. If your document
+root ist /var/www and you extracted the quickstart archive into that directory,
+then the document content directory will be at
+/var/www/seeddms51x/data/1048576/ . Add the following to your apache configuration,
+either globally or within a virtual host configuration. Setting the path in
+an .htaccess file will not work.
+
+XSendFile on
+XSendFilePath /var/www/seeddms51x/data/1048576/
+
+If the XSendFilePath is not set propperly, you will notice an error message
+in your apache log file, probably telling you that the download file could not
+be found.

From bcef2d3d634d4b75205d436c9eea5e25b6a35bd2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Jan 2018 07:07:39 +0100
Subject: [PATCH 231/308] add instructions on how to install from quickstart
 archive

---
 doc/README.Install.md | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/doc/README.Install.md b/doc/README.Install.md
index 1dfe92bb8..3b26e176c 100644
--- a/doc/README.Install.md
+++ b/doc/README.Install.md
@@ -42,8 +42,9 @@ all language and country codes.
 REQUIREMENTS
 ============
 
-SeedDMS is a web-based application written in PHP. It uses the MySQL RDBMS
-or sqlite3 to manage the documents that were uploaded into the application.
+SeedDMS is a web-based application written in PHP. It uses MySQL,
+sqlite3 or postgresql to manage the documents that were uploaded into
+the application. Be aware that postgresql is not very well tested.
 
 Make sure you have PHP 5.3 and MySQL 5 or higher installed. SeedDMS
 will work with PHP running in CGI-mode as well as running as module under
@@ -67,8 +68,33 @@ Here is a detailed list of requirements:
 9. SLIM RestApi
 10. FeedWriter from https://github.com/mibe/FeedWriter
 
+It is highly recommended to use the quickstart archive (seeddms-quickstart-x.y.z.tar.gz)
+because it includes all software packages for running SeedDMS, though you still need
+a working web server with PHP.
 
-BEFORE YOU START
+QUICKSTART
+===========
+
+The fastes way to get SeedDMS running is by unpacking the archive
+`seeddms-quickstart-x.y.z.tar.gz` into your webservers document root.
+It will create a new directory `seeddms51x` containing everything you
+need to run SeedDMS with sqlite3. Make sure that the subdіrectory
+`seeddms51x/data`
+and the configuration file `seeddms51/www/conf/settings.xml` is writeable
+by your web server. All other directories must just be readable by your
+web server. In the next step you need to adjust
+the configuration file in `seeddms51/www/conf/settings.xml`. If you
+are not afraid of xml files, then open it in your favorite text editor
+and search for `/home/wwww-data`. Replace that part in any path found
+with your document root. Alternatively, you can open the installer
+with a browser at http://your-domain/seeddms51x/install/
+It will first ask to unlock the installer by creating a file
+`ENABLE_INSTALL_TOOL` in the diretory `seeddms51/www/conf/`. Change all
+paths by replacing `/home/wwww-data` with your document root. Once done,
+save it, remove the file `ENABLE_INSTALL_TOOL` and point your browser to
+http://your-domain/seeddms51x/.
+
+THE LONG STORY
 ================
 
 SeedDMS has changed its installation process with version 3.0.0. This gives

From a28d12161052dc5a9e006e13732e57a359525d61 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Jan 2018 08:45:34 +0100
Subject: [PATCH 232/308] add SeedDMS_Preview_Base::sendfile() which uses
 xsendfile if available

---
 SeedDMS_Preview/Preview/Base.php         | 19 +++++++++++++++++++
 SeedDMS_Preview/Preview/PdfPreviewer.php |  4 ++--
 SeedDMS_Preview/Preview/Previewer.php    |  4 ++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Preview/Preview/Base.php b/SeedDMS_Preview/Preview/Base.php
index 897c54d4a..fe1ea8903 100644
--- a/SeedDMS_Preview/Preview/Base.php
+++ b/SeedDMS_Preview/Preview/Base.php
@@ -129,5 +129,24 @@ class SeedDMS_Preview_Base {
 		return array_key_exists($mimetype, $this->converters) && $this->converters[$mimetype];
 	} /* }}} */
 
+/**
+ * Send a file from disk to the browser
+ *
+ * This function uses either readfile() or the xѕendfile apache module if
+ * it is installed.
+ *
+ * @param string $filename
+ */
+	protected function sendFile($filename) { /* {{{ */
+		if(function_exists('apache_get_modules') && in_array('mod_xsendfile',apache_get_modules())) {
+			header("X-Sendfile: ".$filename);
+		} else {
+			/* Make sure output buffering is off */
+			if (ob_get_level()) {
+				ob_end_clean();
+			}
+			readfile($filename);
+		}
+	} /* }}} */
 }
 
diff --git a/SeedDMS_Preview/Preview/PdfPreviewer.php b/SeedDMS_Preview/Preview/PdfPreviewer.php
index 3b563b334..6833a7ae8 100644
--- a/SeedDMS_Preview/Preview/PdfPreviewer.php
+++ b/SeedDMS_Preview/Preview/PdfPreviewer.php
@@ -196,7 +196,7 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base {
 
 		$target = $this->previewDir.$dir.md5($infile);
 		if($target && file_exists($target.'.pdf')) {
-			readfile($target.'.pdf');
+			$this->sendFile($target.'.pdf');
 		}
 	} /* }}} */
 
@@ -215,7 +215,7 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base {
 
 		$target = $this->getFileName($object);
 		if($target && file_exists($target.'.pdf')) {
-			readfile($target.'.pdf');
+			$this->sendFile($target.'.pdf');
 		}
 	} /* }}} */
 
diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index 519307dc5..68efc0f4e 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -247,7 +247,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
 
 		$target = $this->previewDir.$dir.md5($infile).'-'.$width;
 		if($target && file_exists($target.'.png')) {
-			readfile($target.'.png');
+			$this->sendFile($target.'.png');
 		}
 	} /* }}} */
 
@@ -271,7 +271,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
 
 		$target = $this->getFileName($object, $width);
 		if($target && file_exists($target.'.png')) {
-			readfile($target.'.png');
+			$this->sendFile($target.'.png');
 		}
 	} /* }}} */
 

From 380f69a95a7caa7f26dd5aefd717bb506c6a6a08 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Jan 2018 08:47:50 +0100
Subject: [PATCH 233/308] new version 1.2.7

---
 SeedDMS_Preview/package.xml | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index 3d99daa0b..410ab1ef4 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>2017-12-04</date>
+ <date>2018-01-18</date>
  <time>10:59:39</time>
  <version>
-  <release>1.2.6</release>
+  <release>1.2.7</release>
   <api>1.2.0</api>
  </version>
  <stability>
@@ -23,8 +23,8 @@
  </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.
+add SeedDMS_Preview_Base::sendFile() as a replacement for readfile() which uses
+mod_xsendfile if available
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -336,5 +336,22 @@ fix typo in converter for tar.gz files
 SeedDMS_Preview_Base::hasConverter() returns only try if command is set
    </notes>
   </release>
+  <release>
+   <date>2017-12-04</date>
+   <time>10:59:39</time>
+   <version>
+    <release>1.2.6</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>
+SeedDMS_Preview_Base::setConverters() overrides existing converters.
+New method SeedDMS_Preview_Base::addConverters() merges new converters with old ones.
+   </notes>
+  </release>
  </changelog>
 </package>

From f71aab592110b1fda50de6da57e3ebd7b316ebd1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Jan 2018 08:48:12 +0100
Subject: [PATCH 234/308] fix some typos minor errors

---
 doc/README.xsendfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/README.xsendfile b/doc/README.xsendfile
index 1ee738953..96ec5653b 100644
--- a/doc/README.xsendfile
+++ b/doc/README.xsendfile
@@ -12,14 +12,14 @@ is installed and configured, SeedDMS will hand over the download to the web
 server which does a much better job than the PHP script. In order to make it
 work, mod_xsendfile must be installed, turned on and the path to the download
 files must be set to the directory containing the document files. If your document
-root ist /var/www and you extracted the quickstart archive into that directory,
+root is /var/www and you extracted the quickstart archive into that directory,
 then the document content directory will be at
-/var/www/seeddms51x/data/1048576/ . Add the following to your apache configuration,
+/var/www/seeddms51x/data/ . Add the following to your apache configuration,
 either globally or within a virtual host configuration. Setting the path in
 an .htaccess file will not work.
 
 XSendFile on
-XSendFilePath /var/www/seeddms51x/data/1048576/
+XSendFilePath /var/www/seeddms51x/data/
 
 If the XSendFilePath is not set propperly, you will notice an error message
 in your apache log file, probably telling you that the download file could not

From ccb56e827ca887829f7a929e5e2f718df576c197 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Jan 2018 08:48:32 +0100
Subject: [PATCH 235/308] add function sendFile()

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

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 327cdbf3f..1532ea793 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -586,4 +586,24 @@ function addDirSep($str) { /* {{{ */
 	else
 		return trim($str);
 } /* }}} */
+
+/**
+ * Send a file from disk to the browser
+ *
+ * This function uses either readfile() or the xѕendfile apache module if
+ * it is installed.
+ *
+ * @param string $filename
+ */
+function sendFile($filename) { /* {{{ */
+	if(function_exists('apache_get_modules') && in_array('mod_xsendfile',apache_get_modules())) {
+		header("X-Sendfile: ".$filename);
+	} else {
+		/* Make sure output buffering is off */
+		if (ob_get_level()) {
+			ob_end_clean();
+		}
+		readfile($filename);
+	}
+} /* }}} */
 ?>

From 97ff9abee57ab6943e084fdbda9a32f79c8e2ffc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Jan 2018 08:49:00 +0100
Subject: [PATCH 236/308] use sendFile() instead of readfile()

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

diff --git a/restapi/index.php b/restapi/index.php
index 1aca291b6..5013842d5 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -878,7 +878,7 @@ function getDocumentContent($id) { /* {{{ */
               $app->response()->header("Cache-Control", "no-cache, must-revalidate");
               $app->response()->header("Pragma", "no-cache");
 
-              readfile($dms->contentDir . $lc->getPath());
+              sendFile($dms->contentDir . $lc->getPath());
             } else {
               $app->response()->status(403);
               $app->response()->header('Content-Type', 'application/json');
@@ -953,7 +953,7 @@ function getDocumentVersion($id, $version) { /* {{{ */
               $app->response()->header("Cache-Control", "no-cache, must-revalidate");
               $app->response()->header("Pragma", "no-cache");
 
-              readfile($dms->contentDir . $lc->getPath());
+              sendFile($dms->contentDir . $lc->getPath());
             } else {
               $app->response()->status(403);
               $app->response()->header('Content-Type', 'application/json');
@@ -1022,7 +1022,7 @@ function getDocumentFile($id, $fileid) { /* {{{ */
             $app->response()->header("Cache-Control", "no-cache, must-revalidate");
             $app->response()->header("Pragma", "no-cache");
 
-            readfile($dms->contentDir . $file->getPath());
+            sendFile($dms->contentDir . $file->getPath());
         } else {
             $app->response()->status(403);
             $app->response()->header('Content-Type', 'application/json');

From 4cfd9f222eec5e588f0aa2f06ba43caabca0e08d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Jan 2018 08:49:17 +0100
Subject: [PATCH 237/308] use sendFile() instead of readfile(), clean up code

---
 op/op.Download.php | 54 +++++++++++++---------------------------------
 1 file changed, 15 insertions(+), 39 deletions(-)

diff --git a/op/op.Download.php b/op/op.Download.php
index 742c210c9..0c1bf4db1 100644
--- a/op/op.Download.php
+++ b/op/op.Download.php
@@ -105,19 +105,14 @@ elseif (isset($_GET["file"])) { /* {{{ */
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("missing_file"));
 	}
 
-	header("Content-Type: application/force-download; name=\"" . $file->getOriginalFileName() . "\"");
 	header("Content-Transfer-Encoding: binary");
 	header("Content-Length: " . filesize($dms->contentDir . $file->getPath() ));
 	$efilename = rawurlencode($file->getOriginalFileName());
 	header("Content-Disposition: attachment; filename=\"" . $efilename . "\"; filename*=UTF-8''".$efilename);
-	//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());
+	sendFile($dms->contentDir . $file->getPath());
 
 } elseif (isset($_GET["arkname"])) {
 	$filename = basename($_GET["arkname"]);
@@ -137,22 +132,14 @@ elseif (isset($_GET["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");	
+	header("Cache-Control: must-revalidate");
 	
-	ob_clean();
-	readfile($settings->_contentDir .$filename );
+	sendFile($settings->_contentDir .$filename );
 	
 } elseif (isset($_GET["logname"])) {
 	$filename = basename($_GET["logname"]);
@@ -171,15 +158,14 @@ elseif (isset($_GET["file"])) { /* {{{ */
 		UI::exitError(getMLText("admin_tools"),getMLText("missing_file"));
 	}
 
-	header("Content-Type: text/plain; name=\"" . $filename . "\"");
+	header("Content-Type: text/plain");
 	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");
 
-	ob_clean();
-	readfile($settings->_contentDir .$filename );
+	sendFile($settings->_contentDir .$filename );
 	
 } elseif (isset($_GET["vfile"])) {
 
@@ -196,20 +182,14 @@ elseif (isset($_GET["file"])) { /* {{{ */
 	// update infos
 	createVersionigFile($document);
 	
-	header("Content-Type: text/plain; name=\"" . $settings->_versioningFileName . "\"");
-	//header("Content-Type: application/force-download; name=\"" . $settings->_versioningFileName . "\"");
+	header("Content-Type: text/plain");
 	header("Content-Transfer-Encoding: binary");
 	header("Content-Length: " . filesize($dms->contentDir.$document->getDir().$settings->_versioningFileName )."\"");
 	$efilename = rawurlencode($settings->_versioningFileName);
 	header("Content-Disposition: attachment; filename=\"". $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($dms->contentDir . $document->getDir() .$settings->_versioningFileName);
+	sendFile($dms->contentDir . $document->getDir() .$settings->_versioningFileName);
 	
 } elseif (isset($_GET["dumpname"])) {
 	$filename = basename($_GET["dumpname"]);
@@ -228,20 +208,14 @@ elseif (isset($_GET["file"])) { /* {{{ */
 		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-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("Pragma: no-cache");	
 	
-	ob_clean();
-	readfile($settings->_contentDir .$filename );
+	sendFile($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"));
@@ -269,12 +243,13 @@ elseif (isset($_GET["file"])) { /* {{{ */
 	$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);
 
 } elseif (isset($_GET["approvelogid"])) {
 	if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
@@ -303,12 +278,13 @@ elseif (isset($_GET["file"])) { /* {{{ */
 	$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);
 }
 
 add_log_line();

From d4af7b5c9a5bc264d2d32b5c9298b1b7bdb0f5c1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Jan 2018 08:49:44 +0100
Subject: [PATCH 238/308] use sendFile() instead of readfile()

---
 controllers/class.Download.php   | 2 +-
 controllers/class.ViewOnline.php | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/controllers/class.Download.php b/controllers/class.Download.php
index 9c0df6a5c..ba9288167 100644
--- a/controllers/class.Download.php
+++ b/controllers/class.Download.php
@@ -39,7 +39,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());
 					}
 				}
 				break;
diff --git a/controllers/class.ViewOnline.php b/controllers/class.ViewOnline.php
index 65d5a8d44..df072f6bb 100644
--- a/controllers/class.ViewOnline.php
+++ b/controllers/class.ViewOnline.php
@@ -40,12 +40,9 @@ class SeedDMS_Controller_ViewOnline extends SeedDMS_Controller_Common {
 						header("Content-Disposition: filename=\"" . $efilename . "\"; filename*=UTF-8''".$efilename);
 					}
 					header("Content-Length: " . filesize($dms->contentDir . $content->getPath()));
-					header("Expires: 0");
-					header("Cache-Control: no-cache, must-revalidate");
-					header("Pragma: no-cache");
+					header("Cache-Control:  must-revalidate");
 
-					ob_clean();
-					readfile($dms->contentDir . $content->getPath());
+					sendFile($dms->contentDir.$content->getPath());
 				}
 				break;
 		}

From 09a78ed37781448c5a48a453b5d84f5bd166c27f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Jan 2018 09:12:31 +0100
Subject: [PATCH 239/308] ???

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

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index eb9e076a8..830725d33 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>
+just version bump up
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From f9d70aa04ae56fb0c172b428a9c2a6177d2dca57 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Jan 2018 09:51:02 +0100
Subject: [PATCH 240/308] add items for 5.1.6

---
 CHANGELOG | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9c93f6742..f0ef4294a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,8 +2,10 @@
                      Changes in version 5.1.6
 --------------------------------------------------------------------------------
 - fix wrong check in restapi (part of #373)
-- mayApprove() and mayReview() require the status to be S_DRAFT_APP resp. S_DRAFT_REV
+- mayApprove() and mayReview() require the status of the document to be
+  S_DRAFT_APP resp. S_DRAFT_REV
 - add preview for webm videos (Closes #374)
+- add support for apache mod_xsendfile, minor optimization of file download
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.5

From a36087e405be4647404d159265337272671fe881 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Jan 2018 10:48:09 +0100
Subject: [PATCH 241/308] add chzn-select for 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 50712bbf8..dcb5ee104 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1227,7 +1227,7 @@ $(document).ready(function() {
 				} else {
 					echo "\"";
 				}
-				echo "".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '').">";
+				echo "".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '')." class=\"chzn-select\">";
 				if(!$attrdef->getMultipleValues()) {
 					echo "<option value=\"\"></option>";
 				}

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 242/308] 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 243/308] 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 244/308] 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 245/308] 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 5d43d0cd84d2ef9db06de4a93048299a4aedd69b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Jan 2018 17:37:28 +0100
Subject: [PATCH 246/308] various new phrases

---
 languages/ar_EG/lang.inc |  10 +
 languages/bg_BG/lang.inc |  10 +
 languages/ca_ES/lang.inc |  10 +
 languages/cs_CZ/lang.inc |  18 +-
 languages/de_DE/lang.inc |  12 +-
 languages/el_GR/lang.inc |  10 +
 languages/en_GB/lang.inc |  12 +-
 languages/es_ES/lang.inc |  28 +-
 languages/fr_FR/lang.inc |  18 +-
 languages/hr_HR/lang.inc |  10 +
 languages/hu_HU/lang.inc |  10 +
 languages/it_IT/lang.inc |  16 +-
 languages/ko_KR/lang.inc |  10 +
 languages/nl_NL/lang.inc | 590 ++++++++++++++++++++-------------------
 languages/pl_PL/lang.inc |  10 +
 languages/pt_BR/lang.inc |  16 +-
 languages/ro_RO/lang.inc |  10 +
 languages/ru_RU/lang.inc |  16 +-
 languages/sk_SK/lang.inc |  18 +-
 languages/sv_SE/lang.inc |  10 +
 languages/tr_TR/lang.inc |  10 +
 languages/uk_UA/lang.inc |  10 +
 languages/zh_CN/lang.inc |  18 +-
 languages/zh_TW/lang.inc |  10 +
 24 files changed, 575 insertions(+), 317 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 51147fcb9..a909de2fb 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -124,6 +124,7 @@ URL: [url]',
 'archive_creation_warning' => 'من خلال العملية التالية يمكنك انشاء ارشيف يحتوي على كل ملفات النظام. بعد انشاء الارشيف سيتم حفظه في ملف البيانات على السيرفر.<br>تحذير: الارشيف الذي تم انشاؤه ليكون مقروء بواسطة المستخدم لن يكون نافعا كملف نسخ احتياطي للسيرفر',
 'ar_EG' => 'العربية',
 'assign_approvers' => 'تخصيص موافقون',
+'assign_recipients' => '',
 'assign_reviewers' => 'تخصيص مراجعون',
 'assign_user_property_to' => 'تخصيص خصائص المستخدم الى',
 'assumed_released' => 'يعتبر تم نشره',
@@ -323,6 +324,7 @@ URL: [url]',
 'documents_to_review' => 'مستندات في انتظار المراجعة',
 'documents_to_revise' => '',
 'documents_user_expiration' => '',
+'documents_user_no_reception' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'مستندات ملكك تستلزم انتباهك',
@@ -587,6 +589,7 @@ URL: [url]',
 'index_waiting' => '',
 'individuals' => 'افراد',
 'indivіduals_in_groups' => '',
+'info_recipients_tab_not_released' => '',
 'inherited' => 'موروث',
 'inherits_access_copy_msg' => 'نسخ قائمة صلاحيات موروثة.',
 'inherits_access_empty_msg' => 'ابدأ بقائمة صلاحيات فارغة',
@@ -1163,6 +1166,8 @@ URL: [url]',
 'settings_enableDuplicateDocNames_desc' => 'Allows to have duplicate document names in a folder.',
 'settings_enableEmail' => '',
 'settings_enableEmail_desc' => 'Enable/disable automatic email notification',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => '',
 'settings_enableFolderTree_desc' => '',
 'settings_enableFullSearch' => 'تفعيل البحث بالنص الكامل',
@@ -1197,6 +1202,8 @@ URL: [url]',
 'settings_enableRecursiveCount_desc' => '',
 'settings_enableRevisionWorkflow' => '',
 'settings_enableRevisionWorkflow_desc' => '',
+'settings_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
 'settings_enableSessionList' => '',
@@ -1512,9 +1519,12 @@ URL: [url]',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => '',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
 'timeline_skip_status_change_0' => '',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index e31367d48..8da4ea086 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -115,6 +115,7 @@ $text = array(
 'archive_creation_warning' => 'Тази операция ще създаде архив, съдържащ всички папки. След създаването архивът ще бъде съхранен в папката с данни на сървъра.<br>ВНИМАНИЕ: Архивът създаден като понятен за  човек, ще бъде непригоден за бекъп!',
 'ar_EG' => 'Арабски',
 'assign_approvers' => 'Назначи утвърждаващи',
+'assign_recipients' => '',
 'assign_reviewers' => 'Назначи рецензенти',
 'assign_user_property_to' => 'Назначи свойства на потребителя',
 'assumed_released' => 'Утверден',
@@ -308,6 +309,7 @@ $text = array(
 'documents_to_review' => 'Документы, чакащи Вашата рецензия',
 'documents_to_revise' => '',
 'documents_user_expiration' => '',
+'documents_user_no_reception' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Ваши документи, изискващи внимание',
@@ -518,6 +520,7 @@ $text = array(
 'index_waiting' => '',
 'individuals' => 'Личности',
 'indivіduals_in_groups' => '',
+'info_recipients_tab_not_released' => '',
 'inherited' => 'наследен',
 'inherits_access_copy_msg' => 'Изкопирай наследения список',
 'inherits_access_empty_msg' => 'Започни с празен списък за достъп',
@@ -1028,6 +1031,8 @@ $text = array(
 'settings_enableDuplicateDocNames_desc' => 'Разрешава да има еднакви имена на документи в папката.',
 'settings_enableEmail' => 'Включи E-mail',
 'settings_enableEmail_desc' => 'Включване/изключване автоматично уведомяване по email',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => 'Включи дървото с папките',
 'settings_enableFolderTree_desc' => 'Изключено - не показвй дървото с папките',
 'settings_enableFullSearch' => 'Включи полнотекстово търсене',
@@ -1062,6 +1067,8 @@ $text = array(
 'settings_enableRecursiveCount_desc' => '',
 'settings_enableRevisionWorkflow' => '',
 'settings_enableRevisionWorkflow_desc' => '',
+'settings_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
 'settings_enableSessionList' => '',
@@ -1377,9 +1384,12 @@ $text = array(
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => '',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
 'timeline_skip_status_change_0' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 0464bd0c9..3257f4eab 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -120,6 +120,7 @@ URL: [url]',
 '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.',
 'ar_EG' => 'Àrab',
 'assign_approvers' => 'Assignar aprovadors',
+'assign_recipients' => '',
 'assign_reviewers' => 'Assignar revisors',
 'assign_user_property_to' => 'Assignar propietats d\'usuari a',
 'assumed_released' => 'Se suposa com a publicat',
@@ -313,6 +314,7 @@ URL: [url]',
 'documents_to_review' => 'Documents en espera de revisió d\'usuaris',
 'documents_to_revise' => '',
 'documents_user_expiration' => '',
+'documents_user_no_reception' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documents de la seva propietat que requereixen atenció',
@@ -523,6 +525,7 @@ URL: [url]',
 'index_waiting' => '',
 'individuals' => 'Individuals',
 'indivіduals_in_groups' => '',
+'info_recipients_tab_not_released' => '',
 'inherited' => '',
 'inherits_access_copy_msg' => 'Copiar llista d\'accés heretat',
 'inherits_access_empty_msg' => 'Començar amb una llista d\'accés buida',
@@ -1033,6 +1036,8 @@ URL: [url]',
 'settings_enableDuplicateDocNames_desc' => '',
 'settings_enableEmail' => 'Enable E-mail',
 'settings_enableEmail_desc' => '',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => 'Enable Folder Tree',
 'settings_enableFolderTree_desc' => 'False to don\'t show the folder tree',
 'settings_enableFullSearch' => 'Enable Full text search',
@@ -1067,6 +1072,8 @@ URL: [url]',
 'settings_enableRecursiveCount_desc' => '',
 'settings_enableRevisionWorkflow' => '',
 'settings_enableRevisionWorkflow_desc' => '',
+'settings_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
 'settings_enableSessionList' => '',
@@ -1382,9 +1389,12 @@ URL: [url]',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => '',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
 'timeline_skip_status_change_0' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 1554384a8..bbc418052 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 (732), kreml (455)
+//    Translators: Admin (735), kreml (455)
 
 $text = array(
 '2_factor_auth' => '',
@@ -131,6 +131,7 @@ URL: [url]',
 '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.',
 'ar_EG' => 'Arabština',
 'assign_approvers' => 'Přiřazení schvalující',
+'assign_recipients' => '',
 'assign_reviewers' => 'Přiřazení kontroloři',
 'assign_user_property_to' => 'Přiřazení uživatelských vlastností',
 'assumed_released' => 'Pokládá se za zveřejněné',
@@ -330,6 +331,7 @@ URL: [url]',
 'documents_to_review' => 'Dokumenty čekající na kontrolu uživatele',
 'documents_to_revise' => '',
 'documents_user_expiration' => '',
+'documents_user_no_reception' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dokumenty, které uživatel vlastní a vyžadují pozornost',
@@ -420,8 +422,8 @@ 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',
-'duplicates' => '',
-'duplicate_content' => '',
+'duplicates' => 'Duplikáty',
+'duplicate_content' => 'Duplicitní obsah',
 'edit' => 'upravit',
 'edit_attributes' => 'Editovat atributy',
 'edit_comment' => 'Upravit komentář',
@@ -594,6 +596,7 @@ URL: [url]',
 'index_waiting' => '',
 'individuals' => 'Jednotlivci',
 'indivіduals_in_groups' => '',
+'info_recipients_tab_not_released' => '',
 'inherited' => 'Zděděno',
 'inherits_access_copy_msg' => 'Zkopírovat zděděný seznam řízení přístupu',
 'inherits_access_empty_msg' => 'Založit nový seznam řízení přístupu',
@@ -1172,6 +1175,8 @@ URL: [url]',
 'settings_enableDuplicateDocNames_desc' => 'Povolit duplicitu názvů dokumentů ve složce',
 'settings_enableEmail' => 'Enable E-mail',
 'settings_enableEmail_desc' => 'Enable/disable automatic email notification',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => 'Enable Folder Tree',
 'settings_enableFolderTree_desc' => 'False to don\'t show the folder tree',
 'settings_enableFullSearch' => 'Enable Full text search',
@@ -1206,6 +1211,8 @@ URL: [url]',
 '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_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_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_enableSessionList' => '',
@@ -1521,9 +1528,12 @@ URL: [url]',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => '',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
 'timeline_skip_status_change_0' => '',
@@ -1606,7 +1616,7 @@ URL: [url]',
 'users_and_groups' => 'Uživatelé/Skupiny',
 'users_done_work' => 'Uživatel ukončil práci',
 'user_exists' => 'Uživatel už existuje.',
-'user_group' => '',
+'user_group' => 'Uživatel/Skupina',
 'user_group_management' => 'Správa uživatelů/skupin',
 'user_image' => 'Obrázek',
 'user_info' => 'Informace o uživateli',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 2de2fc537..33dbc26a7 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 (2506), dgrutsch (22)
+//    Translators: Admin (2518), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -136,6 +136,7 @@ URL: [url]',
 '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.',
 'ar_EG' => 'Arabisch',
 'assign_approvers' => 'Freigebende zuweisen',
+'assign_recipients' => 'Empfänger zuweisen',
 'assign_reviewers' => 'Prüfer zuweisen',
 'assign_user_property_to' => 'Dokumente einem anderen Benutzer zuweisen',
 'assumed_released' => 'Angenommen, freigegeben',
@@ -335,6 +336,7 @@ URL: [url]',
 'documents_to_review' => 'Prüfung erforderlich',
 'documents_to_revise' => 'Erneute Prüfung erforderlich',
 'documents_user_expiration' => 'Abgelaufende Dokumente',
+'documents_user_no_reception' => 'Dokumente ohne Empfangsbestätigung',
 'documents_user_reception' => 'Dokumente mit Empfangsbestätigung',
 'documents_user_rejected' => 'Abgelehnte Dokumente',
 'documents_user_requiring_attention' => 'Diese Dokumente sollte ich mal nachsehen',
@@ -610,6 +612,7 @@ URL: [url]',
 'index_waiting' => 'Warte',
 'individuals' => 'Einzelpersonen',
 'indivіduals_in_groups' => 'Mitglieder einer Gruppe',
+'info_recipients_tab_not_released' => 'Die Bestätigung des Empfangs für diese Dokumentenversion ist nicht möglich, weil die Version nicht freigegeben ist.',
 'inherited' => 'geerbt',
 'inherits_access_copy_msg' => 'Berechtigungen kopieren',
 'inherits_access_empty_msg' => 'Leere Zugriffsliste',
@@ -1238,6 +1241,8 @@ Name: [username]
 'settings_enableDuplicateDocNames_desc' => 'Erlaube doppelte Dokumentennamen in einem Ordner.',
 'settings_enableEmail' => 'E-mail aktivieren',
 'settings_enableEmail_desc' => 'Automatische E-Mail-Benachrichtigung ein-/ausschalten',
+'settings_enableFilterReceipt' => 'Besitzer, Prüfer, ... aus Empfängerliste filtern',
+'settings_enableFilterReceipt_desc' => 'Anwählen, um einige Empfänger aus der Liste zu entfernen, wenn diese als Mitglieder einer Gruppe eingetragen werden.',
 'settings_enableFolderTree' => 'Verzeichnisbaum einschalten',
 'settings_enableFolderTree_desc' => 'Schaltet den Verzeichnisbaum auf der \'View Folder\' Seite ein oder aus',
 'settings_enableFullSearch' => 'Volltextsuche einschalten',
@@ -1272,6 +1277,8 @@ Name: [username]
 '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_enableSelfReceipt' => 'Erlaube Empfangsbestätigung durch angemeldeten Benutzer',
+'settings_enableSelfReceipt_desc' => 'Anwählen, um den aktuell angemeldeten Benutzer in der Liste der Empfänger eines Dokuments auswählbar zu machen.',
 '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_enableSessionList' => 'Liste angemeldeter Benutzer im Menü',
@@ -1587,9 +1594,12 @@ Name: [username]
 'timeline_add_version' => 'Neue Version [version]',
 'timeline_full_add_file' => '[document]<br />Neuer Anhang',
 'timeline_full_add_version' => '[document]<br />Neue Version [version]',
+'timeline_full_scheduled_revision' => '[document]<br />Wiederholungsprüfung von Version [version]',
 'timeline_full_status_change' => '[document]<br />Version [version]: [status]',
+'timeline_scheduled_revision' => 'Wiederholungsprüfung von Version [version]',
 'timeline_selected_item' => 'Ausgewähltes Dokument',
 'timeline_skip_add_file' => 'Anhang hinzugefügt',
+'timeline_skip_scheduled_revision' => 'Geplante Wiederholungsprüfung',
 'timeline_skip_status_change_-1' => 'abgelehnt',
 'timeline_skip_status_change_-3' => 'abgelaufen',
 'timeline_skip_status_change_0' => 'bevorstehende Prüfung',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index e4af1b8ba..cf819995a 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -115,6 +115,7 @@ $text = array(
 'archive_creation_warning' => '',
 'ar_EG' => 'Arabic/Αραβικά',
 'assign_approvers' => '',
+'assign_recipients' => '',
 'assign_reviewers' => '',
 'assign_user_property_to' => '',
 'assumed_released' => '',
@@ -308,6 +309,7 @@ $text = array(
 'documents_to_review' => '',
 'documents_to_revise' => '',
 'documents_user_expiration' => '',
+'documents_user_no_reception' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => '',
@@ -518,6 +520,7 @@ $text = array(
 'index_waiting' => '',
 'individuals' => 'Άτομα',
 'indivіduals_in_groups' => '',
+'info_recipients_tab_not_released' => '',
 'inherited' => '',
 'inherits_access_copy_msg' => '',
 'inherits_access_empty_msg' => '',
@@ -1039,6 +1042,8 @@ URL: [url]',
 'settings_enableDuplicateDocNames_desc' => '',
 'settings_enableEmail' => '',
 'settings_enableEmail_desc' => '',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => '',
 'settings_enableFolderTree_desc' => '',
 'settings_enableFullSearch' => '',
@@ -1073,6 +1078,8 @@ URL: [url]',
 'settings_enableRecursiveCount_desc' => '',
 'settings_enableRevisionWorkflow' => '',
 'settings_enableRevisionWorkflow_desc' => '',
+'settings_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
 'settings_enableSessionList' => '',
@@ -1388,9 +1395,12 @@ URL: [url]',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => '',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
 'timeline_skip_status_change_0' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 05d76b3af..51d5b1629 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 (1633), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1643), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -136,6 +136,7 @@ URL: [url]',
 '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.',
 'ar_EG' => 'Arabic',
 'assign_approvers' => 'Assign Approvers',
+'assign_recipients' => 'Assign Recipients',
 'assign_reviewers' => 'Assign Reviewers',
 'assign_user_property_to' => 'Assign user\'s properties to',
 'assumed_released' => 'Assumed released',
@@ -335,6 +336,7 @@ URL: [url]',
 'documents_to_review' => 'Documents awaiting your review',
 'documents_to_revise' => 'Documents awaiting your revision',
 'documents_user_expiration' => 'Expired documents',
+'documents_user_no_reception' => 'Documents without reception',
 'documents_user_reception' => 'Documents awaiting reception',
 'documents_user_rejected' => 'Rejected documents',
 'documents_user_requiring_attention' => 'Documents owned by you that require attention',
@@ -611,6 +613,7 @@ URL: [url]',
 'index_waiting' => 'Waiting',
 'individuals' => 'Individuals',
 'indivіduals_in_groups' => 'Members of a group',
+'info_recipients_tab_not_released' => 'Acknowledgement of reception for this document version is not possible, because the version is not released.',
 'inherited' => 'inherited',
 'inherits_access_copy_msg' => 'Copy inherited access list',
 'inherits_access_empty_msg' => 'Start with empty access list',
@@ -1233,6 +1236,8 @@ Name: [username]
 'settings_enableDuplicateDocNames_desc' => 'Allows to have duplicate document names in a folder.',
 'settings_enableEmail' => 'Enable E-mail',
 'settings_enableEmail_desc' => 'Enable/disable automatic email notification',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => 'Enable Folder Tree',
 'settings_enableFolderTree_desc' => 'Enable/Disable the folder tree on the \'View Folder\' page',
 'settings_enableFullSearch' => 'Enable Full text search',
@@ -1267,6 +1272,8 @@ Name: [username]
 '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_enableSelfReceipt' => 'Allow reception for logged in user',
+'settings_enableSelfReceipt_desc' => 'Enable this if you want the currently logged in user to be listed as recipient for a document.',
 '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_enableSessionList' => 'Enable list of users online in menu',
@@ -1582,9 +1589,12 @@ Name: [username]
 'timeline_add_version' => 'New version [version]',
 'timeline_full_add_file' => '[document]<br />New Attachment',
 'timeline_full_add_version' => '[document]<br />New version [version]',
+'timeline_full_scheduled_revision' => '[document]<br />Revision of version [version]',
 'timeline_full_status_change' => '[document]<br />Version [version]: [status]',
+'timeline_scheduled_revision' => 'Revision of version [version]',
 'timeline_selected_item' => 'Selected document',
 'timeline_skip_add_file' => 'attachment added',
+'timeline_skip_scheduled_revision' => 'Scheduled revision',
 'timeline_skip_status_change_-1' => 'rejected',
 'timeline_skip_status_change_-3' => 'expired',
 'timeline_skip_status_change_0' => 'pending review',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 7c6fbd882..f1aeb8e05 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 (1044), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1052), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -131,6 +131,7 @@ URL: [url]',
 '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.',
 'ar_EG' => 'Arabe',
 'assign_approvers' => 'Asignar aprobadores',
+'assign_recipients' => '',
 'assign_reviewers' => 'Asignar revisores',
 'assign_user_property_to' => 'Asignar propiedades de usuario a',
 'assumed_released' => 'Supuestamente publicado',
@@ -287,7 +288,7 @@ URL: [url]',
 'content' => 'Contenido',
 'continue' => 'Continuar',
 'converter_new_cmd' => 'Comando',
-'converter_new_mimetype' => '',
+'converter_new_mimetype' => 'Nuevo mime type',
 'copied_to_checkout_as' => '',
 'create_download_link' => '',
 'create_fulltext_index' => 'Crear índice de texto completo',
@@ -330,8 +331,9 @@ URL: [url]',
 'documents_to_review' => 'Documentos en espera de revisión de usuarios',
 'documents_to_revise' => '',
 'documents_user_expiration' => '',
+'documents_user_no_reception' => '',
 'documents_user_reception' => '',
-'documents_user_rejected' => '',
+'documents_user_rejected' => 'Documentos rechazados',
 'documents_user_requiring_attention' => 'Documentos de su propiedad que requieren atención',
 'documents_with_notification' => '',
 'document_already_checkedout' => '',
@@ -594,6 +596,7 @@ URL: [url]',
 'index_waiting' => '',
 'individuals' => 'Individuales',
 'indivіduals_in_groups' => '',
+'info_recipients_tab_not_released' => '',
 'inherited' => 'heredado',
 'inherits_access_copy_msg' => 'Copiar lista de acceso heredado',
 'inherits_access_empty_msg' => 'Empezar con una lista de acceso vacía',
@@ -850,7 +853,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado
 'password_strength' => 'Fortaleza de la contraseña',
 'password_strength_insuffient' => 'Insuficiente Seguridad de la contraseña',
 'password_wrong' => 'Contraseña incorrecta',
-'pdf_converters' => '',
+'pdf_converters' => 'Convertidores a PDF',
 'pending_approvals' => '',
 'pending_receipt' => '',
 'pending_reviews' => '',
@@ -861,7 +864,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado
 'possible_substitutes' => '',
 'preset_expires' => 'Establece caducidad',
 'preview' => '',
-'preview_converters' => '',
+'preview_converters' => 'Vista previa del documento convertido',
 'preview_images' => '',
 'preview_markdown' => '',
 'preview_pdf' => '',
@@ -1101,7 +1104,7 @@ URL: [url]',
 'settings_autoLoginUser_desc' => '',
 'settings_available_languages' => 'Idiomas disponibles',
 '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' => '',
+'settings_backupDir' => 'Directorio de copia de seguridad',
 'settings_backupDir_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)',
@@ -1178,6 +1181,8 @@ URL: [url]',
 'settings_enableDuplicateDocNames_desc' => 'Permite tener un nombre de documento duplicado en una carpeta.',
 'settings_enableEmail' => 'Habilitar E-mail',
 'settings_enableEmail_desc' => 'Habilitar/Deshabilitar notificación automática por correo electrónico',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => 'Habilitar árbol de carpetas',
 'settings_enableFolderTree_desc' => 'Falso para no mostrar el árbol de carpetas',
 'settings_enableFullSearch' => 'Habilitar búsqueda de texto completo',
@@ -1192,7 +1197,7 @@ 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' => 'Activar en el menú la lista de tareas',
 'settings_enableMenuTasks_desc' => '',
 'settings_enableMultiUpload' => 'Permitir subir múltiples archivos',
 'settings_enableMultiUpload_desc' => '',
@@ -1212,9 +1217,11 @@ URL: [url]',
 '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_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_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_enableSessionList' => '',
+'settings_enableSessionList' => 'Activar en el menú la lista de usuarios conectados',
 'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => 'Selección de temas (skins)',
 'settings_enableThemeSelector_desc' => 'Habilitar/deshabilitar la selección de temas en la página de login',
@@ -1291,7 +1298,7 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => 'Este es el número máximo de documentos o carpetas que pueden ser revisados con derechos de acceso, contando objetos recursivos. Si este número es excedido , el número de carpetas y documentos en la vista de carpeta será estimado.',
 'settings_maxSizeForFullText' => 'Tamaño máximo del fichero para el indexado inmediato',
 'settings_maxSizeForFullText_desc' => 'Todo documento nuevo menor que el tamaño configurado será indexado completamente después de su subida. En los demás casos se indexarán solo los metadatos.',
-'settings_maxUploadSize' => '',
+'settings_maxUploadSize' => 'Tamaño máximo de subida archivos',
 'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => 'Configure más parámetros. Acceso por defecto: admin/admin',
 'settings_notfound' => 'No encontrado',
@@ -1527,9 +1534,12 @@ URL: [url]',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '[document<br />nuevo anexo',
 'timeline_full_add_version' => '',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => '[document]<br />Versión [version]: [status]',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => '',
 'timeline_skip_add_file' => 'anexos agregados',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'rechazado',
 'timeline_skip_status_change_-3' => 'expirado',
 'timeline_skip_status_change_0' => 'revisiones pendientes',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 995d31ea9..a409989c1 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 (1068), jeromerobert (50), lonnnew (9), Oudiceval (475)
+//    Translators: Admin (1069), jeromerobert (50), lonnnew (9), Oudiceval (477)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -136,6 +136,7 @@ URL : [url]',
 '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.',
 'ar_EG' => 'Arabe – Égypte',
 'assign_approvers' => 'Approbateurs désignés',
+'assign_recipients' => '',
 'assign_reviewers' => 'Examinateurs désignés',
 'assign_user_property_to' => 'Assigner les propriétés de l\'utilisateur à',
 'assumed_released' => 'Supposé publié',
@@ -335,6 +336,7 @@ URL: [url]',
 'documents_to_review' => 'Documents en attente de vérification',
 'documents_to_revise' => '',
 'documents_user_expiration' => '',
+'documents_user_no_reception' => '',
 'documents_user_reception' => 'Documents en attente de réception',
 'documents_user_rejected' => 'Documents rejetés',
 'documents_user_requiring_attention' => 'Documents à surveiller',
@@ -606,6 +608,7 @@ URL: [url]',
 'index_waiting' => 'Chargement…',
 'individuals' => 'Individuels',
 'indivіduals_in_groups' => 'Membres d’un groupe',
+'info_recipients_tab_not_released' => '',
 'inherited' => 'hérité',
 'inherits_access_copy_msg' => 'Copier la liste des accès hérités',
 'inherits_access_empty_msg' => 'Commencer avec une liste d\'accès vide',
@@ -813,7 +816,7 @@ URL: [url]',
 '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' => 'La vérification de l\'existence d\'une nouvelle version de SeedDMS a échouée ! Ceci est peut être lié au paramétre allow_url_fopen positionné à 0 dans votre configuration PHP.',
+'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_workflow_available' => 'Aucun workflow disponible',
 'objectcheck' => 'Vérification des dossiers et documents',
@@ -860,7 +863,7 @@ En cas de problème persistant, veuillez contacter votre administrateur.',
 'password_strength' => 'Fiabilité du mot de passe',
 'password_strength_insuffient' => 'Mot de passe trop faible',
 'password_wrong' => 'Mauvais mot de passe',
-'pdf_converters' => '',
+'pdf_converters' => 'Convertisseurs PDF',
 'pending_approvals' => 'Approbations en attente',
 'pending_receipt' => 'Réceptions en attente',
 'pending_reviews' => 'Vérifications en attente',
@@ -1200,6 +1203,8 @@ Nom : [username]
 'settings_enableDuplicateDocNames_desc' => 'Autorise plusieurs documents de même nom dans un même dossier.',
 'settings_enableEmail' => 'E-mails',
 'settings_enableEmail_desc' => 'Activer/désactiver la notification automatique par E-mail',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => 'Activer l\'arborescence des dossiers',
 'settings_enableFolderTree_desc' => 'False pour ne pas montrer l\'arborescence des dossiers',
 'settings_enableFullSearch' => 'Activer la recherche plein texte',
@@ -1234,6 +1239,8 @@ Nom : [username]
 '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_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_desc' => '',
 'settings_enableSelfRevApp' => 'Autoriser vérification/approbation par l’utilisateur actuel',
 'settings_enableSelfRevApp_desc' => 'Activer cette option pour ajouter l’utilisateur actuel à la liste des examinateurs/approbateurs et pour les transitions de workflow.',
 'settings_enableSessionList' => 'Activer la liste des utilisateurs en ligne',
@@ -1549,9 +1556,12 @@ Nom : [username]
 'timeline_add_version' => 'Nouvelle version ([version])',
 'timeline_full_add_file' => '[document]<br />Nouveau fichier attaché',
 'timeline_full_add_version' => '[document]<br />Nouvelle version ([version])',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => '[document]<br />Version [version] : [status]',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => 'Document sélectionné',
 'timeline_skip_add_file' => 'avec fichiers attachés',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'rejetés',
 'timeline_skip_status_change_-3' => 'expirés',
 'timeline_skip_status_change_0' => 'en attente de revue',
@@ -1693,7 +1703,7 @@ URL: [url]',
 'workflow_summary' => 'Vue d’ensemble du workflow',
 'workflow_transition_without_user_group' => 'Au moins une transition a ni utilisateur, ni groupe !',
 'workflow_user_summary' => 'Vue d’ensemble de l’utilisateur',
-'x_more_objects' => '',
+'x_more_objects' => 'éléments supplémentaires',
 'year_view' => 'Vue annuelle',
 'yes' => 'Oui',
 'zh_CN' => 'Chinois (CN)',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index d63979c46..838c1e1fd 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -136,6 +136,7 @@ Internet poveznica: [url]',
 'archive_creation_warning' => 'Ovom radnjom možete izraditi arhivu koja sadrži datoteke cijele DMS mape. Nakon izrade arhiva će biti pohranjena u podatkovnu mapu vašer servera.<br>UPOZORENJE: arhiva izrađena na način da je čitljiva ljudima, bit će bezkorisna kao sigurnosna kopija servera.',
 'ar_EG' => 'Arapski',
 'assign_approvers' => 'Dodijeli validatore',
+'assign_recipients' => '',
 'assign_reviewers' => 'Dodijeli recezente',
 'assign_user_property_to' => 'Dodijeli svojstva korisnika za',
 'assumed_released' => 'Podrazumijevano obrađeno',
@@ -335,6 +336,7 @@ Internet poveznica: [url]',
 'documents_to_review' => 'Dokumenti koji čekaju vaš pregled',
 'documents_to_revise' => 'Dokumenti za reviziju',
 'documents_user_expiration' => '',
+'documents_user_no_reception' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Odbijeni dokumenti',
 'documents_user_requiring_attention' => 'Dokumenti u vašem vlasništvu koji zahtjevaju pažnju',
@@ -599,6 +601,7 @@ Internet poveznica: [url]',
 'index_waiting' => '',
 'individuals' => 'Pojedinci',
 'indivіduals_in_groups' => '',
+'info_recipients_tab_not_released' => '',
 'inherited' => 'naslijeđeno',
 'inherits_access_copy_msg' => 'Kopiraj listu naslijeđenih prava pristupa',
 'inherits_access_empty_msg' => 'Započnite s praznim popisom pristupa',
@@ -1199,6 +1202,8 @@ Internet poveznica: [url]',
 'settings_enableDuplicateDocNames_desc' => 'Omogućuje da u mapi imate dvostruke nazive dokumenata.',
 'settings_enableEmail' => 'Omogući E-mail',
 'settings_enableEmail_desc' => 'Omogući/onemogući automatsku email obavijest',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => 'Omogući stablo mape',
 'settings_enableFolderTree_desc' => 'Omogući/onemogući stablo mape na \'Vidi mapu\' stranici',
 'settings_enableFullSearch' => 'Omogući pretraživanje cijelog teksta',
@@ -1233,6 +1238,8 @@ Internet poveznica: [url]',
 'settings_enableRecursiveCount_desc' => 'Ako je uključeno, broj dokumenata i mapa u pregledu mape će biti određen brojanjem svih objekata rekurzivnom obradom mapa i brojanjem tih dokumenata i mapa kojima je korisniku omogućen pristup.',
 'settings_enableRevisionWorkflow' => 'Omogućavanje revizije dokumenata',
 'settings_enableRevisionWorkflow_desc' => 'Omogućite kako bi se mogao pokrenuti tok rada za revidiranje dokumenta nakon zadanog vremenskog perioda.',
+'settings_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_desc' => '',
 'settings_enableSelfRevApp' => 'Omogući pregled/ovjeru za prijavljenog korisnika',
 'settings_enableSelfRevApp_desc' => 'Omogući ovo ako želite da trenutno prijavljeni korisnik bude naveden kao recezent/validator i za promjenu toka rada.',
 'settings_enableSessionList' => '',
@@ -1548,9 +1555,12 @@ Internet poveznica: [url]',
 'timeline_add_version' => 'Nova verzija [version]',
 'timeline_full_add_file' => '[document]<br />Novi prilog',
 'timeline_full_add_version' => '[document]<br />Nova verzija [version]',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => '[document]<br />Verzija [version]: [status]',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => 'Odabrani dokument',
 'timeline_skip_add_file' => 'dodan prilog',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'odbijeno',
 'timeline_skip_status_change_-3' => 'isteklo',
 'timeline_skip_status_change_0' => 'na čekanju za pregled',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 59e2fe732..7998c7f78 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -131,6 +131,7 @@ URL: [url]',
 '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.',
 'ar_EG' => 'Arab',
 'assign_approvers' => 'Jóváhagyók hozzárendelése',
+'assign_recipients' => '',
 'assign_reviewers' => 'Felülvizsgálók hozzárendelése',
 'assign_user_property_to' => 'Felhasználói tulajdonságok hozzárendelése',
 'assumed_released' => 'Feltételesen kiadott',
@@ -330,6 +331,7 @@ URL: [url]',
 'documents_to_review' => 'Felülvizsgálatára váró dokumentumok',
 'documents_to_revise' => '',
 'documents_user_expiration' => '',
+'documents_user_no_reception' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Az Ön tulajdonában álló dokumentumok, amelyekre figyelmet kell fordítani',
@@ -594,6 +596,7 @@ URL: [url]',
 'index_waiting' => '',
 'individuals' => 'Egyedek',
 'indivіduals_in_groups' => '',
+'info_recipients_tab_not_released' => '',
 'inherited' => 'örökölt',
 'inherits_access_copy_msg' => 'Örökített hozzáférési lista másolása',
 'inherits_access_empty_msg' => 'Indulás üres hozzáférési listával',
@@ -1177,6 +1180,8 @@ URL: [url]',
 'settings_enableDuplicateDocNames_desc' => 'Engedélyezi az azonos dokumentum neveket egy mappában.',
 'settings_enableEmail' => 'Email engedélyezése',
 'settings_enableEmail_desc' => 'Engedélyezi/tiltja az automatikus email értesítést',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => 'Mappa fastruktúra engedélyezése',
 'settings_enableFolderTree_desc' => 'Hamis hogy ne jelenjen meg a mappa fastruktúra',
 'settings_enableFullSearch' => 'Teljes szöveg keresés engedélyezése',
@@ -1211,6 +1216,8 @@ URL: [url]',
 '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_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_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_enableSessionList' => '',
@@ -1526,9 +1533,12 @@ URL: [url]',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => '',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => '',
 'timeline_skip_add_file' => 'melléklet hozzáadva',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'visszautasítva',
 'timeline_skip_status_change_-3' => 'lejárt',
 'timeline_skip_status_change_0' => 'felülvizsgálatra vár',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 9f218ba32..dd383cb9d 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 (1572), rickr (144), s.pnt (26)
+//    Translators: Admin (1574), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -136,6 +136,7 @@ URL: [url]',
 '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_recipients' => '',
 'assign_reviewers' => 'Assegna Revisori',
 'assign_user_property_to' => 'Assegna le proprietà dell\'utente a',
 'assumed_released' => 'Rilascio acquisito',
@@ -336,6 +337,7 @@ URL: [url]',
 'documents_to_review' => 'Documenti in attesa della tua revisione',
 'documents_to_revise' => 'Documenti da revisionare.',
 'documents_user_expiration' => '',
+'documents_user_no_reception' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Documenti rifiutati',
 'documents_user_requiring_attention' => 'Tuoi documenti in attesa di revisione o approvazione',
@@ -600,6 +602,7 @@ URL: [url]',
 'index_waiting' => '',
 'individuals' => 'Singoli',
 'indivіduals_in_groups' => 'I membri de la gruppo',
+'info_recipients_tab_not_released' => '',
 'inherited' => 'ereditato',
 'inherits_access_copy_msg' => 'Copia la lista degli accessi ereditati',
 'inherits_access_empty_msg' => 'Reimposta una lista di permessi vuota',
@@ -856,7 +859,7 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di
 'password_strength' => 'Sicurezza password',
 'password_strength_insuffient' => 'Efficacia della password insufficiente',
 'password_wrong' => 'Password errata',
-'pdf_converters' => '',
+'pdf_converters' => 'Convertitore a PDF',
 'pending_approvals' => 'Approvazioni in sospeso',
 'pending_receipt' => '',
 'pending_reviews' => 'In attesa di recensioni',
@@ -1211,6 +1214,8 @@ URL: [url]',
 'settings_enableDuplicateDocNames_desc' => 'Permetti documenti con lo stesso nome nella stessa cartella',
 'settings_enableEmail' => 'Abilita l\'email',
 'settings_enableEmail_desc' => 'Abilita/disabilita la notifica automatica via email',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => 'Visualizza la struttura ad albero',
 'settings_enableFolderTree_desc' => 'Abilita/disabilita la visualizzaione della struttura ad albero nella pagina \'Vista cartella\'',
 'settings_enableFullSearch' => 'Abilita ricerca fulltext',
@@ -1245,6 +1250,8 @@ URL: [url]',
 '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' => 'Abilita revisione documenti',
 'settings_enableRevisionWorkflow_desc' => 'Abilita per attivare workflow su revisione documenti dopo scadenza.',
+'settings_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_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_enableSessionList' => '',
@@ -1560,9 +1567,12 @@ URL: [url]',
 'timeline_add_version' => 'Nuova versione [version]',
 'timeline_full_add_file' => '[document]<br />Nuovo attacco',
 'timeline_full_add_version' => '[document]<br />Nuovo versione [version]',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => '[document]<br />Versione [version]: [status]',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => 'Documento selezionato',
 'timeline_skip_add_file' => 'allegato aggiunto',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'respinto',
 'timeline_skip_status_change_-3' => 'scaduto',
 'timeline_skip_status_change_0' => 'in attesa di revisione',
@@ -1704,7 +1714,7 @@ URL: [url]',
 'workflow_summary' => 'Riepilogo flusso di lavoro',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Riepilogo utenti',
-'x_more_objects' => '',
+'x_more_objects' => '[number] altri oggetti',
 'year_view' => 'Vista anno',
 'yes' => 'Sì',
 'zh_CN' => 'Cinese (CN)',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 2cc63819c..fcb380e14 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -136,6 +136,7 @@ URL: [url]',
 'archive_creation_warning' => '본 작업은 전체 DMS 폴더 내의 파일 모두에 아카이브를 만듭니다. 생성한 아카이브는 서버의 데이터 폴더에 저장됩니다.<br>경고 : 이렇게 만들어진 자료는 서버의 백업과 같이 가독성이 저하 됩니다.',
 'ar_EG' => '아랍어',
 'assign_approvers' => '승인자 지정',
+'assign_recipients' => '',
 'assign_reviewers' => '검토자 배정',
 'assign_user_property_to' => '사용자 속성에 할당',
 'assumed_released' => 'Assumed released',
@@ -338,6 +339,7 @@ URL: [url]',
 'documents_to_review' => '당신의 검토를 기다리는 문서',
 'documents_to_revise' => '문서 정정',
 'documents_user_expiration' => '',
+'documents_user_no_reception' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '거부된 문서',
 'documents_user_requiring_attention' => '주의가 필요한 당신 소유의 문서',
@@ -600,6 +602,7 @@ URL: [url]',
 'index_waiting' => '기다리는 중',
 'individuals' => '개인',
 'indivіduals_in_groups' => '개별 그룹',
+'info_recipients_tab_not_released' => '',
 'inherited' => '상속',
 'inherits_access_copy_msg' => '상속 액세스 목록 복사',
 'inherits_access_empty_msg' => '빈 액세스 목록으로 시작',
@@ -1193,6 +1196,8 @@ URL : [url]',
 'settings_enableDuplicateDocNames_desc' => '이 폴더에 중복 된 문서명을 가질 수 있습니다.',
 'settings_enableEmail' => '전자 메일 사용',
 'settings_enableEmail_desc' => '자동화 전자우편 알림 활성화/비활성화',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => '폴더 트리 사용',
 'settings_enableFolderTree_desc' => '\'View Folder\'에 폴더 트리 표시 활성 / 비활성',
 'settings_enableFullSearch' => '전체 텍스트 검색 사용',
@@ -1227,6 +1232,8 @@ URL : [url]',
 '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_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_desc' => '',
 'settings_enableSelfRevApp' => '로그인 한 사용자에 대한 검토 / 승인을 허용',
 'settings_enableSelfRevApp_desc' => '검토 / 승인자로 워크 플로우 전환을 위해 나열되어있는 것이 현재 로그인 한 사용자가 필요한 경우이를 활성화합니다.',
 'settings_enableSessionList' => '메뉴에 온라인 사용자 목록 활성화',
@@ -1542,9 +1549,12 @@ URL : [url]',
 'timeline_add_version' => '새버전',
 'timeline_full_add_file' => '[document]<br />새 첨부',
 'timeline_full_add_version' => '[document]<br />새버전 [version]',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => '[document]<br />버전[version]: [status]',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => '선택된 타임라인 항목',
 'timeline_skip_add_file' => '첨부 파일 이 추가 되었습니다',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => '거부',
 'timeline_skip_status_change_-3' => '만료',
 'timeline_skip_status_change_0' => '보류된 검토',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index c6f3c40da..fea2ee847 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -19,22 +19,22 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (745), gijsbertush (333), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (745), gijsbertush (610), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
-'2_factor_auth' => 'Twee-factor-authorisatie',
-'2_factor_auth_info' => 'Info 2-factor-authorisatie',
-'2_fact_auth_secret' => 'Toegangscode 2-factor-authorisatie',
-'accept' => 'Accept',
+'2_factor_auth' => '2-factor-authenticatie',
+'2_factor_auth_info' => 'Dit systeem werkt met 2-factor-authenticatie. U heeft de Google Authenticator nodig op uf mobiele telfoon. Hieronder staan 2 QR-codes. De rechter is uw huidige geheime code. Met de linker kunt u een nieuwe geheime code instellen. Denk erom de nieuwe code opnieuw te scannen met Googke Authenticator.',
+'2_fact_auth_secret' => 'Toegangscode 2-factor-authenticatie',
+'accept' => 'Accepteren',
 'access_control' => 'Toegangscontrole',
-'access_control_is_off' => 'Toegansgscontrole staat uit',
+'access_control_is_off' => 'Toegangscontrole staat uit',
 'access_denied' => 'Geen toegang.',
 'access_inheritance' => 'Toegang overgeërfd',
-'access_mode' => 'Toegang modus',
+'access_mode' => 'Toegangsmodus',
 'access_mode_all' => 'Alle machtigingen',
 'access_mode_none' => 'Geen toegang',
-'access_mode_read' => 'Lees rechten',
-'access_mode_readwrite' => 'Lees en Schrijf rechten',
+'access_mode_read' => 'Leesrechten',
+'access_mode_readwrite' => 'Lees- en Schrijf rechten',
 'access_permission_changed_email' => 'Machtigingen gewijzigd',
 'access_permission_changed_email_body' => 'Toestemming veranderd
 Document: [naam]
@@ -47,14 +47,14 @@ URL: [url]',
 'actions' => 'Acties',
 'action_approve' => 'Goedkeuren',
 'action_complete' => 'Compleet',
-'action_is_complete' => 'Is compleet',
-'action_is_not_complete' => 'Is niet compleet',
+'action_is_complete' => 'is compleet',
+'action_is_not_complete' => 'is niet compleet',
 'action_reject' => 'Geweigerd',
 'action_review' => 'Beoordelen',
-'action_revise' => 'Herzie',
+'action_revise' => 'Nog herzien',
 'add' => 'Toevoegen',
 'add_approval' => 'Verzend [Goedkeuring]',
-'add_attrdefgroup' => '',
+'add_attrdefgroup' => 'Voeg een nieuwe attribuutgroep toe',
 'add_document' => 'Document toevoegen',
 'add_document_link' => 'Link toevoegen',
 'add_document_notify' => 'Notificatie toekennen',
@@ -88,20 +88,20 @@ URL: [url]',
 'already_subscribed' => 'Al ingetekend',
 'and' => 'en',
 'apply' => 'Toepassen',
-'approvals_accepted' => '',
-'approvals_and_reviews_accepted' => '',
-'approvals_and_reviews_not_touched' => '',
-'approvals_and_reviews_rejected' => '',
-'approvals_not_touched' => '',
-'approvals_rejected' => '',
-'approvals_without_group' => '',
-'approvals_without_user' => '',
-'approval_deletion_email' => 'Goedkeuring verzoek verwijderd',
-'approval_deletion_email_body' => 'Vraag om goedkeuring verwijderd
+'approvals_accepted' => '[no_approvals] goedkeuringen',
+'approvals_and_reviews_accepted' => '[no_approvals] goedkeuringen en [no_reviews] geaccepteerde reviews',
+'approvals_and_reviews_not_touched' => '[no_approvals] goedkeuringen [no_reviews] reviews nog niet behandeld',
+'approvals_and_reviews_rejected' => '[no_approvals] goedkeuringen en [no_reviews] reviews afgekeurd',
+'approvals_not_touched' => '[no_approvals] goedkeuringen nog niet behandeld',
+'approvals_rejected' => '[no_approvals] goedkeuringen afgekeurd',
+'approvals_without_group' => 'Goedkeuringen zonder groep',
+'approvals_without_user' => 'Goedkeuringen zonder gebruiker',
+'approval_deletion_email' => 'Goedkeuringsverzoek verwijderd',
+'approval_deletion_email_body' => 'Approval request deleted
 Document: [name]
-Versie: [version]
-Map: [folder_path]
-Gebruiker: [username]
+Version: [version]
+Parent folder: [folder_path]
+User: [username]
 URL: [url]',
 'approval_deletion_email_subject' => '[sitename]: [name] - Verzoek om goedkeuring verwijderd',
 'approval_file' => 'Goedkeuring bestand',
@@ -129,14 +129,15 @@ URL: [url]',
 '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.',
 'ar_EG' => 'Arabisch',
 'assign_approvers' => 'Aangewezen [Goedkeurders]',
+'assign_recipients' => '',
 'assign_reviewers' => 'Aangewezen [Controleurs]',
 'assign_user_property_to' => 'Wijs gebruikers machtigingen toe aan',
-'assumed_released' => 'aangenomen status: Gepubliceerd',
-'attrdefgroup_management' => '',
-'attrdefgrp_show_detail' => '',
-'attrdefgrp_show_list' => '',
-'attrdefgrp_show_search' => '',
-'attrdefgrp_show_searchlist' => '',
+'assumed_released' => 'vermoedelijke status: Gepubliceerd',
+'attrdefgroup_management' => 'Beheer attribuut-definiities',
+'attrdefgrp_show_detail' => 'Details Beheer attribuut-definiities',
+'attrdefgrp_show_list' => 'Lijst van attribuut-definiities',
+'attrdefgrp_show_search' => 'Zoeken naar attribuut-definiities',
+'attrdefgrp_show_searchlist' => 'Lijst van gezochte attribuut-definiities',
 'attrdef_exists' => 'Kenmerk definitie bestaat al',
 'attrdef_info' => 'Kenmerk info',
 'attrdef_in_use' => 'Kenmerk definitie nog in gebruikt',
@@ -171,18 +172,18 @@ URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: [name] - Attribuut gewijzigd',
 'attribute_count' => 'Aantal maal gebruikt',
 'attribute_value' => 'Waarde van het attribuut',
-'attribute_value_not_in_valueset' => '',
-'attr_malformed_boolean' => '',
-'attr_malformed_date' => '',
+'attribute_value_not_in_valueset' => 'Waarde van attribuut bestaat niet',
+'attr_malformed_boolean' => 'Foute vormgeving boolean',
+'attr_malformed_date' => 'Foute vormgeving datum',
 'attr_malformed_email' => 'Foute vormgeving email',
-'attr_malformed_float' => '',
-'attr_malformed_int' => '',
-'attr_malformed_url' => 'Foute url',
+'attr_malformed_float' => 'Foute vormgeving getal',
+'attr_malformed_int' => 'Foute vormgeving geheel getal',
+'attr_malformed_url' => 'Foute vormgeving url',
 'attr_max_values' => 'attribuut: maximale waarde',
 'attr_min_values' => 'attribuut: minimale waarde',
-'attr_not_in_valueset' => '',
+'attr_not_in_valueset' => 'Attribuut bestaat niet',
 'attr_no_regex_match' => 'De waarde van het attribuut komt niet overeen met de veelgebruikte uitdrukking (regular expression)',
-'attr_validation_error' => '',
+'attr_validation_error' => 'Attribuut niet geldig',
 'at_least_n_users_of_group' => 'Minimaal [number_of_users] gebruikers van [group]',
 'august' => 'augustus',
 'authentication' => 'Authentificatie',
@@ -235,11 +236,11 @@ URL: [url]',
 'checkedout_file_has_disappeared' => 'File is onvindbaar',
 'checkedout_file_is_unchanged' => 'Checkout-document ongewijzigd',
 'checkin_document' => 'Veranderd document',
-'checkoutpath_does_not_exist' => '',
+'checkoutpath_does_not_exist' => 'Checkout-pad bestaat niet',
 'checkout_document' => 'Checkout-document',
 'checkout_is_disabled' => 'Checkout is niet mogelijk',
-'choose_attrdef' => 'Selecteer een kenmerk definitie',
-'choose_attrdefgroup' => '',
+'choose_attrdef' => 'Kies een kenmerkdefinitie',
+'choose_attrdefgroup' => 'Kies een kenmerkdefinite-groep',
 'choose_category' => 'Selecteer a.u.b.',
 'choose_group' => 'Selecteer Groep',
 'choose_role' => 'Selecteer een rol',
@@ -251,17 +252,17 @@ URL: [url]',
 'choose_workflow' => 'Kies workflow',
 'choose_workflow_action' => 'Kies workflow actie',
 'choose_workflow_state' => 'kiest workflowstatus',
-'class_name' => '',
+'class_name' => 'naam vd Klasse',
 'clear_cache' => 'Cache leegmaken',
 'clear_clipboard' => 'Vrijgeven klembord',
-'clear_password' => '',
+'clear_password' => 'Verwijder het wachtwoord',
 'clipboard' => 'Klembord',
 'close' => 'Sluiten',
-'command' => '',
+'command' => 'Commando',
 'comment' => 'Commentaar',
 'comment_changed_email' => 'Gewijzigde email',
 'comment_for_current_version' => 'Versie van het commentaar',
-'confirm_clear_cache' => '',
+'confirm_clear_cache' => 'Ja, ik wil de cache opschonen!',
 'confirm_create_fulltext_index' => 'Ja, Ik wil de volledigetekst index opnieuw maken!',
 'confirm_move_document' => 'Bevestig verplaatsing van document',
 'confirm_move_folder' => 'Bevestig de verplaatsing van de map',
@@ -278,16 +279,16 @@ URL: [url]',
 'confirm_rm_transmittal' => 'Bestig de verwijdering van de verzending',
 'confirm_rm_transmittalitem' => 'Bevestig te verzenden item',
 '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_user_from_processes' => '',
+'confirm_rm_user_from_processes' => 'Weet U zeker dat U de Gebruiker "[username]" wilt verwijderen uit dit proces?<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_transfer_objects' => '',
+'confirm_transfer_objects' => 'Weet U zeker dat U de documenten, mappen etc. van gebruiker "[username]" wilt overzetten?<br>Let op: deze handeling kan niet ongedaan worden gemaakt.',
 'confirm_update_transmittalitem' => 'Bevestig verandering van te verzenden item',
 'content' => 'Welkomstpagina',
 'continue' => 'Doorgaan',
 'converter_new_cmd' => 'Wijziging: nieuw commando',
 'converter_new_mimetype' => 'Wijziging: nieuw mimetype',
 'copied_to_checkout_as' => 'Gekopieerd naar checkout als:',
-'create_download_link' => '',
+'create_download_link' => 'Maak een download-link',
 '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',
@@ -300,7 +301,7 @@ URL: [url]',
 'databasesearch' => 'Zoek in Database',
 'date' => 'Datum',
 'days' => 'Dagen',
-'debug' => '',
+'debug' => 'debug',
 'december' => 'december',
 'default_access' => 'Standaard toegang',
 'default_keywords' => 'Beschikbare sleutelwoorden',
@@ -311,10 +312,10 @@ URL: [url]',
 'de_DE' => 'Duits',
 'disclaimer' => 'Dit is een beveiligde omgeving. Gebruik is alleen toegestaan voor geautoriseerde leden. Ongeautoriseerde toegang kan worden bestraft overeenkomstig (inter)nationale wetgeving.',
 'discspace' => 'Schijfruimte',
-'docs_in_reception_no_access' => '',
-'docs_in_revision_no_access' => '',
+'docs_in_reception_no_access' => 'Documenten zonder toegang ontvanger',
+'docs_in_revision_no_access' => 'Documenten in revisie zonder toegang ontvanger',
 'document' => 'Document',
-'documentcontent' => '',
+'documentcontent' => 'Documentinhoud',
 'documents' => 'Documenten',
 'documents_checked_out_by_you' => 'Door u in behandeling genomen documenten',
 'documents_expired' => 'Verlopen documenten',
@@ -328,10 +329,11 @@ URL: [url]',
 'documents_to_review' => 'Documenten die wachten op uw controle',
 'documents_to_revise' => 'Te reviseren documenten',
 'documents_user_expiration' => '',
-'documents_user_reception' => '',
+'documents_user_no_reception' => '',
+'documents_user_reception' => 'Documenten wachten op bestemming',
 'documents_user_rejected' => 'documenten niet geaccepteerd door gebruiker',
 'documents_user_requiring_attention' => 'Eigen documenten die (nog) aandacht behoeven',
-'documents_with_notification' => '',
+'documents_with_notification' => 'Documenten met notificatie',
 'document_already_checkedout' => 'Al in behandeling genomen documenten',
 'document_already_locked' => 'Dit document is al geblokkeerd',
 'document_comment_changed_email' => 'Commentaar gewijzigd',
@@ -398,9 +400,16 @@ URL: [url]',
 'does_not_expire' => 'Verloopt niet',
 'does_not_inherit_access_msg' => 'Erft toegang',
 'download' => 'Download',
-'download_links' => '',
-'download_link_email_body' => '',
-'download_link_email_subject' => '',
+'download_links' => 'Download-links',
+'download_link_email_body' => 'Klik op de link hieronder, dan begint de download vanvversie [version] van het document
+\'[docname]\'.
+
+[url]
+
+De link is geldig tot [valid].
+
+[comment]',
+'download_link_email_subject' => 'Onderwerp',
 'do_object_repair' => 'Repareer alle mappen en documenten.',
 'do_object_setchecksum' => 'Set checksum',
 'do_object_setfilesize' => 'Voer bestandgrootte in',
@@ -409,16 +418,16 @@ URL: [url]',
 '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!',
-'dropfolderdir_missing' => '',
-'dropfolder_file' => 'Bestand van dropfolder',
-'dropfolder_folder' => 'Map van de drop-map',
+'dropfolderdir_missing' => 'Uw persoonlijke map om files te droppen (dropfolder) bestaat niet op de server! Vraag de administrator om deze aan te maken.',
+'dropfolder_file' => 'Bestand in  dropfolder',
+'dropfolder_folder' => 'Map in dropfolder',
 'dropupload' => 'Snel toevoegen',
-'drop_files_here' => 'Sleep bestanden hierheen!',
-'dump_creation' => 'DB dump aanmaken',
+'drop_files_here' => 'Sleep bestanden hierheen',
+'dump_creation' => 'DB-dump aanmaken',
 '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',
-'duplicates' => 'Duplicaat',
+'duplicates' => 'Dubbelen',
 'duplicate_content' => 'Dubbele inhoud',
 'edit' => 'Wijzigen',
 'edit_attributes' => 'Bewerk attributen',
@@ -429,10 +438,10 @@ URL: [url]',
 'edit_document_props' => 'Wijzig document',
 'edit_event' => 'Activiteit wijzigen',
 'edit_existing_access' => 'Wijzig toegangslijst',
-'edit_existing_attribute_groups' => '',
+'edit_existing_attribute_groups' => 'Bewerk attribuutgroepen',
 'edit_existing_notify' => 'Wijzig Notificatie lijst',
 'edit_folder_access' => 'Wijzig toegang',
-'edit_folder_attrdefgrp' => '',
+'edit_folder_attrdefgrp' => 'Bewerk de groep van attributen',
 'edit_folder_notify' => 'Map Notificatie Lijst',
 'edit_folder_props' => 'Wijzig Map eigenschappen',
 'edit_group' => 'Wijzig Groep',
@@ -440,14 +449,14 @@ URL: [url]',
 'edit_transmittal_props' => 'Opmerkingen bij verzending',
 'edit_user' => 'Wijzig gebruiker',
 'edit_user_details' => 'Wijzig gebruiker Details',
-'edit_version' => '',
-'el_GR' => 'Griek',
+'edit_version' => 'Bewerk versie',
+'el_GR' => 'Grieks',
 'email' => 'E-mail',
 'email_error_title' => 'Geen email ingevoerd',
 'email_footer' => 'U kunt altijd uw e-mail instellingen wijzigen via de \'Mijn Account\' opties',
 'email_header' => 'Dit is een automatisch gegenereerd bericht van de DMS server.',
 'email_not_given' => 'Voer aub een geldig email adres in.',
-'empty_attribute_group_list' => '',
+'empty_attribute_group_list' => 'Lege lijst van attributen',
 'empty_folder_list' => 'Geen documenten of mappen',
 'empty_notify_list' => 'Geen gegevens',
 'en_GB' => 'Engels (GB)',
@@ -455,33 +464,33 @@ URL: [url]',
 'error' => 'Fout',
 'error_add_aro' => 'Verzoek om toegang toegevoegd',
 'error_add_permission' => 'Voeg permissie toe',
-'error_cleared_cache' => '',
-'error_importfs' => '',
+'error_cleared_cache' => 'Fout bij het leegmaken van de cache',
+'error_importfs' => 'Fout bij het importeren van form file systeem',
 'error_no_document_selected' => 'Geen document geselecteerd',
 'error_no_folder_selected' => 'Geen map geselecteerd',
 'error_occured' => 'Er is een fout opgetreden',
-'error_remove_document' => '',
-'error_remove_folder' => '',
+'error_remove_document' => 'Fout bij het verwijderen van document',
+'error_remove_folder' => 'Fout bij het verwijderen van map',
 'error_remove_permission' => 'Verwijder permissie',
 'error_toogle_permission' => 'Wijzig permissie',
 'error_transfer_document' => '',
 'es_ES' => 'Spaans',
-'event_details' => 'Activiteit details',
-'exclude_items' => 'Sluit iems uit',
+'event_details' => 'Activiteit-details',
+'exclude_items' => 'Sluit iets uit',
 'expired' => 'Verlopen',
-'expired_at_date' => '',
+'expired_at_date' => 'Verloopdatum',
 'expired_documents' => '',
 'expires' => 'Verloopt',
 'expire_by_date' => 'Vervaldatum',
-'expire_in_1d' => '',
-'expire_in_1h' => '',
+'expire_in_1d' => 'Vervalt binnen 1 dag',
+'expire_in_1h' => 'Vervalt binnen 1 uur',
 'expire_in_1m' => 'Vervalt binnen 1 maand',
 'expire_in_1w' => 'Vervalt binnen 1 week',
 'expire_in_1y' => 'Vervalt binnen 1 jaar',
-'expire_in_2h' => '',
+'expire_in_2h' => 'Vervalt binnen 2 uur',
 'expire_in_2y' => 'Vervalt binnen 2 jaar',
-'expire_today' => '',
-'expire_tomorrow' => '',
+'expire_today' => 'Vervalt vandaag',
+'expire_tomorrow' => 'Vervalt morgen',
 'expiry_changed_email' => 'Verloopdatum gewijzigd',
 'expiry_changed_email_body' => 'Vervaldatum gewijzigd
 Document: [name]
@@ -503,7 +512,7 @@ URL: [url]',
 'folder' => 'Map',
 'folders' => 'Mappen',
 'folders_and_documents_statistic' => 'Inhoudsopgave',
-'folders_with_notification' => '',
+'folders_with_notification' => 'Mappen met notificatie',
 'folder_comment_changed_email' => 'Commentaar gewijzigd',
 'folder_comment_changed_email_body' => 'Commentaar gewijzigd
 Map: [name]
@@ -545,16 +554,16 @@ URL: [url]',
 'fr_FR' => 'Frans',
 'fullsearch' => 'Zoek in volledige tekst',
 'fullsearch_hint' => 'Volledige tekst index',
-'fulltextsearch_disabled' => '',
+'fulltextsearch_disabled' => 'Fulltext-zoeken uitgeschakeld',
 'fulltext_converters' => 'Index document conversie',
 'fulltext_info' => 'Volledige tekst index info',
-'global_attributedefinitiongroups' => '',
+'global_attributedefinitiongroups' => 'Kennmerk-definitie groepen',
 'global_attributedefinitions' => 'Kenmerk definities',
 'global_default_keywords' => 'Algemene sleutelwoorden',
-'global_document_categories' => 'Categorieen',
+'global_document_categories' => 'Categorieën',
 'global_workflows' => 'Workflows',
-'global_workflow_actions' => 'Workflow acties',
-'global_workflow_states' => 'Workflow status',
+'global_workflow_actions' => 'Workflow-acties',
+'global_workflow_states' => 'Workflow-status',
 'group' => 'Groep',
 'groups' => 'Groepen',
 'group_approval_summary' => 'Groep [Goedkeuring] samenvatting',
@@ -566,36 +575,37 @@ URL: [url]',
 'group_review_summary' => 'Groep Beoordeling samenvatting',
 'guest_login' => 'Login als Gast',
 'guest_login_disabled' => 'Gast login is uitgeschakeld.',
-'hash' => '',
+'hash' => 'Hashcode',
 'help' => 'Help',
 'home_folder' => 'Thuismap',
-'hook_name' => '',
+'hook_name' => 'Naam vd hook',
 'hourly' => 'Elk uur',
-'hours' => 'uren',
+'hours' => 'uur',
 'hr_HR' => 'Kroatisch',
-'human_readable' => 'Leesbaar Archief',
+'human_readable' => 'Leesbaar archief',
 'hu_HU' => 'Hongaars',
 'id' => 'ID',
 'identical_version' => 'Nieuwe versie is identiek aan de huidige versie',
 'import' => 'Importeer',
-'importfs' => '',
+'importfs' => 'Importeer van bestandssysteem',
 'import_fs' => 'Importeer van bestandssysteem',
-'import_fs_warning' => 'Dit werkt alleen voor mappen in de drop-map. Alle mappen en bestanden worden recursief geimporteerd. Bestanden worden onmiddelijk vrijgegeven.',
+'import_fs_warning' => 'Dit werkt alleen in de dropfolder. Mappen en bestanden worden recursief geïmporteerd. Bestanden worden direct ter beschikking gesteld.',
 'include_content' => 'inclusief inhoud',
 'include_documents' => 'Inclusief documenten',
 'include_subdirectories' => 'Inclusief submappen',
 'indexing_tasks_in_queue' => 'Indexerings taken in wachtrij',
-'index_done' => '',
-'index_error' => '',
+'index_done' => 'Indexering gereed',
+'index_error' => 'Fout bij indexering',
 'index_folder' => 'Inhoud',
-'index_pending' => '',
-'index_waiting' => '',
+'index_pending' => 'Indexering moet nog gebeuren',
+'index_waiting' => 'Indexering wacht',
 'individuals' => 'Individuen',
 'indivіduals_in_groups' => 'Individuen in groepen',
+'info_recipients_tab_not_released' => '',
 'inherited' => 'overgeerfd',
 'inherits_access_copy_msg' => 'Kopie lijst overerfde toegang',
 'inherits_access_empty_msg' => 'Begin met lege toegangslijst',
-'inherits_access_msg' => 'Toegang is (over/ge)erfd..',
+'inherits_access_msg' => 'Toegang is (over/ge)erfd.',
 'internal_error' => 'Interne fout',
 'internal_error_exit' => 'Interne fout. Niet mogelijk om verzoek uit de voeren.',
 'invalid_access_mode' => 'Foutmelding: verkeerde toegangsmode',
@@ -604,7 +614,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Foutieve eind-datum voor het maken van een periode.',
 'invalid_create_date_start' => 'Foutieve begin-datum voor het maken van een periode.',
 'invalid_doc_id' => 'Foutief Document ID',
-'invalid_dropfolder_folder' => '',
+'invalid_dropfolder_folder' => 'Ongeldige dropfolder-map',
 'invalid_expiration_date_end' => 'Foute expiratiedatum',
 'invalid_expiration_date_start' => 'Foute startdatum',
 'invalid_file_id' => 'Foutief Bestand ID',
@@ -626,13 +636,13 @@ URL: [url]',
 'is_hidden' => 'Afschermen van Gebruikerslijst',
 'it_IT' => 'Italiaans',
 'january' => 'januari',
-'js_form_error' => '',
-'js_form_errors' => '',
-'js_invalid_email' => '',
+'js_form_error' => 'Fout in JavaScript',
+'js_form_errors' => 'Fouten in JavaScript',
+'js_invalid_email' => 'Ongeldige email',
 'js_no_approval_group' => 'Selecteer a.u.b. een Goedkeuring Groep',
 'js_no_approval_status' => 'Selecteer a.u.b. een Goedkeuring Status',
 'js_no_comment' => 'Er zijn geen commentaren',
-'js_no_currentpwd' => '',
+'js_no_currentpwd' => 'Geen geldig wachtwoord',
 'js_no_email' => 'Voer uw e-mail adres in',
 'js_no_file' => 'Selecteer een bestand',
 'js_no_keywords' => 'Specificeer een aantal sleutelwoorden',
@@ -646,8 +656,8 @@ URL: [url]',
 'js_pwd_not_conf' => 'Wachtwoord en bevestigingswachtwoord zijn niet identiek',
 'js_select_user' => 'Selecteer een Gebruiker',
 'js_select_user_or_group' => 'Selecteer tenminste een Gebruiker of Groep',
-'js_unequal_passwords' => '',
-'july' => 'july',
+'js_unequal_passwords' => 'Ongelijke wachtwoorden',
+'july' => 'juli',
 'june' => 'juni',
 'keep' => 'Behouden',
 'keep_doc_status' => 'Behoud status document',
@@ -662,14 +672,14 @@ URL: [url]',
 'librarydoc' => 'Bibliotheek',
 'linked_documents' => 'Gerelateerde Documenten',
 'linked_files' => 'Bijlagen',
-'linked_to_current_version' => '',
-'linked_to_document' => 'Gekoppeld aan document',
-'linked_to_this_version' => '',
+'linked_to_current_version' => 'Bijlagen bij huidige versie',
+'linked_to_document' => 'Bijlage(n) bij document',
+'linked_to_this_version' => 'Bijlage bij deze versie',
 'link_alt_updatedocument' => 'Als u bestanden wilt uploaden groter dan het huidige maximum, gebruik aub de alternatieve <a href="%s">upload pagina</a>.',
-'link_to_version' => '',
-'list_access_rights' => 'Oplijsten toegangsrechten',
-'list_contains_no_access_docs' => '',
-'list_hooks' => '',
+'link_to_version' => 'Bijlage(n) bij versie',
+'list_access_rights' => 'Toegangsrechten',
+'list_contains_no_access_docs' => 'Geen toegankelijke documenten',
+'list_hooks' => 'Hooks',
 'local_file' => 'Lokaal bestand',
 'locked_by' => 'In gebruik door',
 'lock_document' => 'Blokkeer',
@@ -697,30 +707,30 @@ URL: [url]',
 'march' => 'maart',
 'max_upload_size' => 'Maximale upload omvang voor ieder bestand',
 'may' => 'mei',
-'menu_dropfolder' => '',
+'menu_dropfolder' => 'Dropfolder',
 'mimetype' => 'MIME Type',
-'minutes' => 'Minuten',
+'minutes' => 'minuten',
 'misc' => 'Diversen',
 'missing_checksum' => 'Controlesom ontbreekt',
 'missing_file' => 'File ontbreekt',
 'missing_filesize' => 'Bestandsgrootte ontbreekt',
-'missing_reception' => '',
+'missing_reception' => 'Ontvanger ontbreekt',
 'missing_request_object' => 'Gevraagd object ontbreekt',
 'missing_transition_user_group' => 'Gebruiker / groep ontbreekt voor de overdracht',
-'monday' => 'Maandag',
-'monday_abbr' => 'Ma',
+'monday' => 'maandag',
+'monday_abbr' => 'ma',
 'monthly' => 'Maandelijks',
-'month_view' => 'Maand Overzicht',
+'month_view' => 'Maandoverzicht',
 'move' => 'Verplaats',
 'move_clipboard' => 'Verplaats klembord',
 'move_document' => 'Verplaats document',
-'move_folder' => 'Verplaats Map',
+'move_folder' => 'Map verplaatsen',
 'my_account' => 'Mijn Account',
 'my_documents' => 'Mijn Documenten',
 'my_transmittals' => 'Mijn zendingen',
 'name' => 'Naam',
 'needs_workflow_action' => 'Dit document vereist uw aandacht. Bekijk deze onder het tabblad workflows.',
-'network_drive' => '',
+'network_drive' => 'Networkdrive',
 'never' => 'Nooit',
 'new' => 'Nieuw',
 'new_attrdef' => 'Voeg kenmerk definitie toe',
@@ -780,7 +790,7 @@ URL: [url]',
 'no_default_keywords' => 'Geen Sleutelwoorden beschikbaar',
 'no_docs_checked_out' => 'Geen documenten in gebruik genomen',
 'no_docs_locked' => 'Geen documenten in gebruik.',
-'no_docs_rejected' => '',
+'no_docs_rejected' => 'Geen documenten geweigerd',
 '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' => 'Geen documenten te ontvangen',
@@ -802,8 +812,8 @@ URL: [url]',
 'no_version_modification' => 'Geen versiewijziging',
 'no_workflow_available' => 'Geen workflow beschikbaar',
 'objectcheck' => 'Map/Document controle',
-'object_check_critical' => '',
-'object_check_warning' => '',
+'object_check_critical' => 'Ernstige fouten',
+'object_check_warning' => 'Waarschuwingen',
 'obsolete' => 'verouderd',
 'october' => 'oktober',
 'old' => 'Oude',
@@ -850,36 +860,42 @@ Mocht u de komende minuten geen email ontvangen, probeer het dan nogmaals en con
 'password_wrong' => 'Verkeerd wachtwoord',
 'pdf_converters' => '',
 'pending_approvals' => 'Wachten op goedkeuring',
-'pending_receipt' => '',
+'pending_receipt' => 'Wachten op ontvangs',
 'pending_reviews' => 'Wachten op beoordeling',
-'pending_revision' => '',
+'pending_revision' => 'Wachten op herziening',
 'pending_workflows' => 'Wachten op workflow',
 'personal_default_keywords' => 'Persoonlijke sleutelwoorden',
-'pl_PL' => 'Polen',
+'pl_PL' => 'Pools',
 'possible_substitutes' => 'Mogelijke alternatieven',
-'preset_expires' => 'Standaard vervaltermijn',
+'preset_expires' => 'Preset verloopt',
 'preview' => 'Voorbeeld',
 'preview_converters' => 'Converters',
-'preview_images' => '',
+'preview_images' => 'Voorbeelden',
 'preview_markdown' => 'Voorbeeld in Markdown',
 'preview_pdf' => '',
 'preview_plain' => 'Voorbeeld in platte tekst',
 'previous_state' => 'Vorige staat',
 'previous_versions' => 'Vorige versies',
-'process' => '',
-'process_without_user_group' => '',
+'process' => 'Proces',
+'process_without_user_group' => 'Proces zonder gebruikersgroep',
 'pt_BR' => 'Portugees (BR)',
 'quota' => 'Quotum',
 'quota_exceeded' => 'Uw data quotum is overschreden met [bytes].',
 'quota_is_disabled' => 'Quota support is momenteel niet actief in de eigenschappen. Een user-quotum instellen zal geen effect hebben tot quota actief zijn',
 'quota_warning' => 'Uw maximale datagebruik is overschreden met [bytes]. Gelieve documenten of eerdere versies te verwijderen.',
-'receipts_accepted' => '',
-'receipts_not_touched' => '',
-'receipts_rejected' => '',
-'receipts_without_group' => '',
-'receipts_without_user' => '',
-'receipt_deletion_email_body' => '',
-'receipt_deletion_email_subject' => '',
+'receipts_accepted' => '[no_receipts] ontvangen en geaccepteerd',
+'receipts_not_touched' => '[no_receipts] ontvangen, nog niet behandeld',
+'receipts_rejected' => '[no_receipts] ontvangen, geweigerd',
+'receipts_without_group' => '[no_receipts] ontvangen, geen groep',
+'receipts_without_user' => '[no_receipts] ontvangen, geen gebruiker',
+'receipt_deletion_email_body' => 'Gebruiker is verwijderd uit de lijst van ontvangers
+Document: [name]
+Versie: [version]
+Bovenliggende map: [folder_path]
+Ontvanger: [recipient]
+Gebruiker: [username]
+URL: [url]',
+'receipt_deletion_email_subject' => '[sitename]: [name] - Ontvanger verwijderd',
 'receipt_log' => 'Log ontvangst',
 'receipt_request_email_body' => 'Verzoek ontvangen
 Document: [name]
@@ -890,13 +906,13 @@ URL: [url]',
 'receipt_request_email_subject' => '[sitename]: [name] – Verzoek ontvangen',
 'receipt_status' => 'Status ontvangst',
 'receipt_summary' => 'Samenvatting',
-'receipt_update_failed' => '',
-'reception' => '',
-'reception_acknowleged' => '',
-'reception_noaction' => '',
-'reception_rejected' => '',
+'receipt_update_failed' => 'Update ontvangst mislukt',
+'reception' => 'bestemming',
+'reception_acknowleged' => 'bestemming OK',
+'reception_noaction' => 'Geen actie',
+'reception_rejected' => 'bestemming geweigerd',
 'recipients' => 'Ontvangers',
-'redraw' => '',
+'redraw' => 'Nogmaals weergeven',
 'refresh' => 'Verversen',
 'rejected' => 'Afgewezen',
 'released' => 'Gepubliceerd',
@@ -917,7 +933,7 @@ Bovenliggende map: [folder_path]
 Gebruiker: [username]
 URL: [url]',
 'removed_workflow_email_subject' => '[sitename]: [name] - Workflow verwijderd van document versie',
-'removeFolderFromDropFolder' => 'Verwijder de map na de import',
+'removeFolderFromDropFolder' => 'Map verwijderen uit Dropfilder',
 'remove_marked_files' => 'Geselecteerde bestanden zijn verwijderd',
 'repaired' => 'Gerepareerd',
 'repairing_objects' => 'Documenten en mappen repareren.',
@@ -931,7 +947,7 @@ Gebruiker: [username]
 URL: [url]',
 'request_workflow_action_email_subject' => '[sitename]: [name] - Workflow – actie vereist',
 'reset_checkout' => 'Beëindig het gebruik van het document',
-'restrict_access' => '',
+'restrict_access' => 'Toegang beperken',
 'results_page' => 'Resultaten pagina',
 'return_from_subworkflow' => 'Terug uit subworkflow',
 'return_from_subworkflow_email_body' => 'Terug uit subworkflow
@@ -947,11 +963,11 @@ URL: [url]',
 'reviewers' => 'Beoordelaars',
 'reviewer_already_assigned' => 'is reeds aangewezen als beoordelaar',
 'reviewer_already_removed' => 'is reeds verwijderd uit het beoordelingsproces of heeft reeds een beoordeling uitgevoerd',
-'reviews_accepted' => '',
-'reviews_not_touched' => '',
-'reviews_rejected' => '',
-'reviews_without_group' => '',
-'reviews_without_user' => '',
+'reviews_accepted' => '[no_reviews] reviews geaccepteerd',
+'reviews_not_touched' => '[no_reviews] reviews niet geopend',
+'reviews_rejected' => '[no_reviews] reviews geweigerd',
+'reviews_without_group' => 'reviews zonder groep',
+'reviews_without_user' => 'reviews zonder gebruiker',
 'review_deletion_email' => 'Beoordelingsverzoek verwijderd',
 'review_deletion_email_body' => 'Beoordelingsverzoek verwijderd
 Document: [name]
@@ -985,12 +1001,12 @@ URL: [url]',
 'review_update_failed' => 'Fout: bijwerken status beoordeling mislukt.',
 'revise_document' => 'Document herzien',
 'revise_document_on' => 'Volgende herziening van document op [date]',
-'revisions_accepted' => '',
-'revisions_not_touched' => '',
-'revisions_pending' => '',
-'revisions_rejected' => '',
-'revisions_without_group' => '',
-'revisions_without_user' => '',
+'revisions_accepted' => '[no_revisions] revisies geaccepteerd',
+'revisions_not_touched' => '[no_revisions] revisies geopend',
+'revisions_pending' => '[no_revisions] revisies in afwachting',
+'revisions_rejected' => '[no_revisions] revisies geweigerd',
+'revisions_without_group' => '[no_revisions] revisies zonder groep',
+'revisions_without_user' => '[no_revisions] revisies zonder gebruiker',
 'revision_date' => 'Datum revisie',
 'revision_log' => 'Log herziening',
 'revision_request_email_body' => 'Verzoek tot herziening
@@ -1016,12 +1032,12 @@ Gebruiker: [username]
 URL: [url]',
 'rewind_workflow_email_subject' => '[sitename]: [name] - Workflow is teruggezet',
 'rewind_workflow_warning' => 'Als u de workflow terugzet naar oorspronkelijke staat, dan wordt de workflow historie voor dit document verwijderd en onherstelbaar.',
-'rm_attrdef' => 'Verwijder kenmerk definitie',
-'rm_attrdefgroup' => '',
-'rm_default_keyword_category' => 'Verwijder Categorie',
-'rm_document' => 'Verwijder Document',
+'rm_attrdef' => 'Verwijder kenmerkdefinitie',
+'rm_attrdefgroup' => 'Verwijder kenmerkdefinitie-groep',
+'rm_default_keyword_category' => 'Verwijder categorie',
+'rm_document' => 'Verwijder document',
 'rm_document_category' => 'Verwijder categorie',
-'rm_event' => '',
+'rm_event' => 'Verwijder gebeurtenis',
 'rm_file' => 'Verwijder bestand',
 'rm_folder' => 'Verwijder map',
 'rm_from_clipboard' => 'Verwijder van klembord',
@@ -1030,7 +1046,7 @@ URL: [url]',
 'rm_transmittal' => 'Verwijder de verzending',
 'rm_transmittalitem' => 'Verwijder verzonden item',
 'rm_user' => 'Verwijder deze Gebruiker',
-'rm_user_from_processes' => '',
+'rm_user_from_processes' => 'Verwijder gebruiker uit het proces',
 'rm_version' => 'Verwijder versie',
 'rm_workflow' => 'Verwijder workflwo',
 'rm_workflow_action' => 'Verwijder workflow actie',
@@ -1041,8 +1057,8 @@ URL: [url]',
 'role_guest' => 'Gast',
 'role_info' => 'Informtie over de rol',
 'role_management' => 'Rol-management',
-'role_name' => 'Naam vd Rol',
-'role_type' => '',
+'role_name' => 'Naam vd rol',
+'role_type' => 'Type rol',
 'role_user' => 'Gebruiker',
 'ro_RO' => 'Roemeens',
 'run_subworkflow' => 'Voer sub workflow uit',
@@ -1068,7 +1084,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_report' => '[count] documenten en [foldercount] mappen gevonden in [searchtime] sec.',
+'search_report' => '[doccount] documenten en [foldercount] mappen gevonden in [searchtime] sec.',
 'search_report_fulltext' => '[doccount] documenten gevonden',
 'search_resultmode' => 'Zoek resultaat',
 'search_resultmode_both' => 'Documenten en mappen',
@@ -1077,14 +1093,14 @@ URL: [url]',
 'search_time' => 'Verstreken tijd: [time] sec.',
 'seconds' => 'seconden',
 'selection' => 'Selectie',
-'select_attrdefgrp_show' => '',
+'select_attrdefgrp_show' => 'Toon attribut definities-groep',
 'select_category' => 'klik om categorie te selecteren',
 'select_groups' => 'Klik om groep te selecteren',
 'select_grp_approvers' => 'Klik om beoordelaars te selecteren',
 'select_grp_ind_approvers' => 'Klik om beoordelaars te selecteren',
-'select_grp_ind_notification' => 'Klik om groep beoordelaar te selecteren',
-'select_grp_ind_recipients' => '',
-'select_grp_ind_reviewers' => 'Klik om groep beoordelaar te selecteren',
+'select_grp_ind_notification' => 'Selecteerd de groep',
+'select_grp_ind_recipients' => 'Selecteer de groep',
+'select_grp_ind_reviewers' => 'Selecteer de groep',
 'select_grp_ind_revisors' => '',
 'select_grp_notification' => 'Klik voor groepsnotificatiebeoordelaars',
 'select_grp_recipients' => 'Klik om groep beoordelaar te selecteren',
@@ -1098,10 +1114,15 @@ URL: [url]',
 'select_one' => 'Selecteer een',
 'select_users' => 'Klik om gebruikers te selecteren',
 'select_workflow' => 'Selecteer workflow',
-'send_email' => '',
-'send_login_data' => '',
-'send_login_data_body' => '',
-'send_login_data_subject' => '',
+'send_email' => 'Verstuur email',
+'send_login_data' => 'Verstuur Login-data',
+'send_login_data_body' => 'Login data
+
+Login: [login]
+Name: [username]
+
+[comment]',
+'send_login_data_subject' => 'Onderwerp',
 'send_test_mail' => 'Testmail versturen',
 'september' => 'september',
 'sequence' => 'Volgorde',
@@ -1109,15 +1130,15 @@ URL: [url]',
 'seq_end' => 'Op het einde',
 'seq_keep' => 'Behoud Positie',
 'seq_start' => 'Eerste positie',
-'sessions' => '',
+'sessions' => 'sessies',
 'settings' => 'Instellingen',
 'settings_activate_module' => 'Activeer module',
 '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_Advanced' => 'Uitgebreid',
-'settings_advancedAcl' => '',
-'settings_advancedAcl_desc' => '',
+'settings_advancedAcl' => 'Advanced Access control',
+'settings_advancedAcl_desc' => 'Advanced Access control staat het uit- en inschakelen van bepaalde modules toe. Het kan niet gebruikt worden voor het beheer van toegangsrechten van documenten en mappen.',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Authenticatie instellingen',
 'settings_autoLoginUser' => 'Automatische login',
@@ -1126,15 +1147,15 @@ URL: [url]',
  => ,
  => ,
  =>',
-'settings_available_languages' => 'Beschikbare talen',
-'settings_available_languages_desc' => '',
+'settings_available_languages' => 'Beschikbare vertalingen',
+'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 backupmap',
 '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',
-'settings_calendarDefaultView' => 'Kalender Standaard overzicht',
-'settings_calendarDefaultView_desc' => 'Kalender standaard overzicht',
+'settings_Calendar' => 'Instellingen van de agenda',
+'settings_calendarDefaultView' => 'Standaard overzicht agenda',
+'settings_calendarDefaultView_desc' => 'Pagina per dag/week/maand',
 'settings_cannot_disable' => 'Bestand ENABLE_INSTALL_TOOL kon niet verwijderd worden',
 'settings_checkOutDir' => 'Instellingen Checkoutmap',
 'settings_checkOutDir_desc' => 'Instellingen Checkoutmap',
@@ -1144,8 +1165,8 @@ URL: [url]',
 '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',
 'settings_contentOffsetDir_desc' => 'Om de beperkingen van het onderliggende bestandssysteem te omzeilen, is een nieuwe mappenstructuur bedacht dat binnen de inhoudsmap (Inhoudsmap) bestaat. Hiervoor is een map nodig als basis. Gebruikelijk is om dit de standaardwaarde te laten, 1048576, maar kan elke waarde of tekst bevatten dat nog niet bestaat binnen de (Inhoudsmap)',
-'settings_convertToPdf' => '',
-'settings_convertToPdf_desc' => '',
+'settings_convertToPdf' => 'Document converteren naar PDF',
+'settings_convertToPdf_desc' => 'Als een document niet geschikt is voor Preview, wordt het geconverteerd naar PDF.',
 'settings_cookieLifetime' => 'Cookie Life time',
 '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',
@@ -1167,12 +1188,12 @@ URL: [url]',
 'settings_dbUser' => 'Gebruikersnaam',
 'settings_dbUser_desc' => 'De gebruikersnaam voor toegang tot de datbase ingevoerd tijdens de installatie. Verander de waarde niet tenzij echt nodig, bijvoorbeeld bij verplaatsing van de database naar een ander systeem.',
 'settings_dbVersion' => 'Database schema te oud',
-'settings_defaultAccessDocs' => '',
-'settings_defaultAccessDocs_desc' => '',
-'settings_defaultSearchMethod' => 'Default zoekmethode',
-'settings_defaultSearchMethod_desc' => 'Default zoekmethode',
-'settings_defaultSearchMethod_valdatabase' => 'Default zoekmethode (database)',
-'settings_defaultSearchMethod_valfulltext' => 'Default fulltext-zoekmethode',
+'settings_defaultAccessDocs' => 'Standaard toegangsrechten voor nieuwe documenten',
+'settings_defaultAccessDocs_desc' => 'Als een nieuw document wordt gecreëerd, worden dit de nieuwe toegangsrechten.',
+'settings_defaultSearchMethod' => 'Standaard zoekmethode',
+'settings_defaultSearchMethod_desc' => 'Default zoekmethode = op documentnaam / fulltext-search',
+'settings_defaultSearchMethod_valdatabase' => 'Default zoekmethode (Documentnaam)',
+'settings_defaultSearchMethod_valfulltext' => 'Default fulltext-zoeken',
 'settings_delete_install_folder' => 'Om SeedDMS te kunnen gebruiken moet het bestand ENABLE_INSTALL_TOOL uit de configuratiemap verwijderd worden.',
 'settings_disableSelfEdit' => 'Uitschakelen Eigenprofiel wijzigen',
 'settings_disableSelfEdit_desc' => 'Indien aangevinkt kan de gebruiker zijn eigen profiel niet wijzigen.',
@@ -1181,74 +1202,78 @@ 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_editOnlineFileTypes' => 'Instellingen Filetypes',
-'settings_editOnlineFileTypes_desc' => 'Online zoekmethoden bewerken',
-'settings_enable2FactorAuthentication' => '',
-'settings_enable2FactorAuthentication_desc' => '',
+'settings_editOnlineFileTypes' => 'Online bewerken van de volgende filetypes',
+'settings_editOnlineFileTypes_desc' => 'Bestanden met één van de volgende extensies kunnen online bewerkt worden (ALLEEN KLEINE LETTERS GEBRUIKEN!)',
+'settings_enable2FactorAuthentication' => 'Schakel 2-factor-authenticatie in',
+'settings_enable2FactorAuthentication_desc' => 'In/Uitschakelen 2-factor-authenticatie. Gebruikers moeten Google Authenticator op hun mobile telefoon installeren.',
 'settings_enableAcknowledgeWorkflow' => 'Aanzetten Workflow-stappen',
 'settings_enableAcknowledgeWorkflow_desc' => 'Aanzetten workflow-stappen',
-'settings_enableAdminReceipt' => '',
-'settings_enableAdminReceipt_desc' => '',
+'settings_enableAdminReceipt' => 'Sta ontvangst van documenten door admins toe',
+'settings_enableAdminReceipt_desc' => 'Inschakelen als u admins documenten wilt laten ontvangen',
 'settings_enableAdminRevApp' => 'Inschakelen Beheer Contr/Beoord',
 'settings_enableAdminRevApp_desc' => 'Uitvinken om beheerder niet te tonen als controleerder/beoordeler',
-'settings_enableCalendar' => 'Inschakelen Kalendar',
-'settings_enableCalendar_desc' => 'Inschakelen/uitschakelen kalender',
+'settings_enableCalendar' => 'Agenda inschakelen',
+'settings_enableCalendar_desc' => 'Inschakelen/uitschakelen agenda',
 'settings_enableClipboard' => 'Activeer klembord',
 'settings_enableClipboard_desc' => 'Activeer/ blokkeer het klembord',
-'settings_enableConverting' => 'Inschakelen Conversie',
-'settings_enableConverting_desc' => 'Inschakelen/uitschakelen conversie van bestanden',
-'settings_enableDropFolderList' => '',
-'settings_enableDropFolderList_desc' => '',
+'settings_enableConverting' => 'Documenten converteren',
+'settings_enableConverting_desc' => 'Inschakelen/uitschakelen conversie van bestanden naar PDF',
+'settings_enableDropFolderList' => 'Inschakelen van de lijst van files in dropfolder.',
+'settings_enableDropFolderList_desc' => 'De lijst van files in Dropfolder zichtbaar maken in het menu',
 'settings_enableDropUpload' => 'Inschakelen Snelle Upload',
 'settings_enableDropUpload_desc' => 'Aanzetten DropUpload',
 'settings_enableDuplicateDocNames' => 'Sta duplicaten van documentnamen toe',
 'settings_enableDuplicateDocNames_desc' => 'Staat het toe om documentnamen te dupliceren in een folder.',
-'settings_enableEmail' => 'Inschakelen E-mail',
+'settings_enableEmail' => 'E-mail inschakelen',
 'settings_enableEmail_desc' => 'Inschakelen/uitschakelen automatische email notificatie',
-'settings_enableFolderTree' => 'Inschakelen Mappenstructuur',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
+'settings_enableFolderTree' => 'Mappenstructuur tonen',
 'settings_enableFolderTree_desc' => 'Uitschakelen om de mappenstructuur niet te tonen',
-'settings_enableFullSearch' => 'Inschakelen volledigetekst zoekopdracht',
+'settings_enableFullSearch' => 'Volledige-tekst zoeken',
 'settings_enableFullSearch_desc' => 'Inschakelen zoeken in volledigetekst',
-'settings_enableGuestAutoLogin' => 'Gast login automatisch aanzetten',
+'settings_enableGuestAutoLogin' => 'Gastlogin automatisch aanzetten',
 'settings_enableGuestAutoLogin_desc' => 'Gastlogin automatisch aanzetten',
-'settings_enableGuestLogin' => 'Inschakelen Gast login',
+'settings_enableGuestLogin' => 'Inschakelen Gastlogin',
 'settings_enableGuestLogin_desc' => 'Als U iemand wilt laten inloggen als gast, schakel deze optie in. Opmerking: Gast login kan het beste alleen in een beveiligde omgeving ingeschakeld worden',
 'settings_enableHelp' => 'Hulp aanzetten',
 'settings_enableHelp_desc' => 'Hulp aanzetten',
-'settings_enableLanguageSelector' => 'Activeer Taal instellen',
+'settings_enableLanguageSelector' => 'Taal activerenen',
 'settings_enableLanguageSelector_desc' => 'Laat selector zien voor taalinterface, nadat gebruikers inloggen.',
-'settings_enableLargeFileUpload' => 'Inschakelen groot bestand upload',
+'settings_enableLargeFileUpload' => 'Grote bestanden uploaden',
 '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' => 'Menu-taken aanzetten',
 'settings_enableMenuTasks_desc' => 'Menu-taken aanzetten',
-'settings_enableMultiUpload' => '',
-'settings_enableMultiUpload_desc' => '',
-'settings_enableNotificationAppRev' => 'Inschakelen controleur/beoordeler notificatie',
+'settings_enableMultiUpload' => 'Multi-upload',
+'settings_enableMultiUpload_desc' => 'Bij multiupload kunnen tegelijkertijd verschillende bestanden worden geüpload. Ieder bestand wordt een nieuw document.',
+'settings_enableNotificationAppRev' => 'Notificeren controleur/beoordeler',
 'settings_enableNotificationAppRev_desc' => 'Vink aan om een notificatie te versturen naar de controleur/beoordeler als een nieuw document versie is toegevoegd.',
 'settings_enableNotificationWorkflow' => 'Workflow-notificatie aanzetten',
 'settings_enableNotificationWorkflow_desc' => 'Workflow-notificatie aanzetten',
-'settings_enableOwnerNotification' => 'Inschakelen eigenaarnotificatie standaard',
-'settings_enableOwnerNotification_desc' => 'Inschakelen van notificatie naar de eigenaar als een document is toegevoegd.',
-'settings_enableOwnerReceipt' => '',
-'settings_enableOwnerReceipt_desc' => '',
+'settings_enableOwnerNotification' => 'Standaard eigenaar notificeren',
+'settings_enableOwnerNotification_desc' => 'Inschakelen van notificatie naar de eigenaar als een document wordt toegevoegd.',
+'settings_enableOwnerReceipt' => 'Laten weten wat er met het document gebeurt aan eigenaar',
+'settings_enableOwnerReceipt_desc' => 'Inschakelen als u wilt dat de eigenaar van het document op de lijst van ontvangers komt.',
 'settings_enableOwnerRevApp' => 'Beoordeling / goedkeuring voor eigenaar toestaan',
 'settings_enableOwnerRevApp_desc' => 'Activeer dit als de eigenaar van een document genoteerd staat as beoordelaar/ goedkeurder en voor workflow overdrachten.',
-'settings_enablePasswordForgotten' => 'Inschakelen wachtwoord vergeten',
+'settings_enablePasswordForgotten' => '\'wachtwoord vergeten\' aanzetten',
 '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' => 'Herzieningsworkflow aanzetten',
 'settings_enableRevisionWorkflow_desc' => 'Herzieningsworkflow aanzetten',
+'settings_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_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_enableSessionList' => '',
-'settings_enableSessionList_desc' => '',
-'settings_enableThemeSelector' => 'Selecteer thema',
+'settings_enableSessionList' => 'Lijst van gebruikers online',
+'settings_enableSessionList_desc' => 'Laat zien welke gebruikers online zijn',
+'settings_enableThemeSelector' => 'Thema selecteren',
 'settings_enableThemeSelector_desc' => 'Schakel thema selectie op de aanmeldpagina uit',
-'settings_enableUpdateReceipt' => '',
-'settings_enableUpdateReceipt_desc' => '',
-'settings_enableUpdateRevApp' => '',
-'settings_enableUpdateRevApp_desc' => '',
+'settings_enableUpdateReceipt' => 'Veranderen van bestaande bestemming toestaan',
+'settings_enableUpdateReceipt_desc' => 'Mag de gebruiker die een bestemming heeft opgesteld, zijn beslissing wijzigen?',
+'settings_enableUpdateRevApp' => 'Wijzig bestaande review/goedkeuring',
+'settings_enableUpdateRevApp_desc' => 'Mag de gebruiker die een review//goedkeuring heeft gegeven, zijn beslissing wijzigen (zolang de huidige stap in de workflow nog duurt)?',
 'settings_enableUserImage' => 'Inschakelen Gebruikersplaatjes',
 'settings_enableUserImage_desc' => 'Inschakelen Gebruikerplaatjes',
 'settings_enableUsersView' => 'Inschakelen Gebruikers overzicht',
@@ -1268,9 +1293,9 @@ URL: [url]',
 'settings_Extensions' => 'Uitbreidingen',
 'settings_extraPath' => 'Extra PHP include Path',
 'settings_extraPath_desc' => 'Pad naar extra software. Dit pad bevat bv. het adodb pad of de extra pear packages.',
-'settings_firstDayOfWeek' => 'Eerste weekdag',
-'settings_firstDayOfWeek_desc' => 'Eerste dag van de week',
-'settings_footNote' => 'Onderschrift',
+'settings_firstDayOfWeek' => 'Eerste dag van de week',
+'settings_firstDayOfWeek_desc' => 'Eerste dag van de (werk)week',
+'settings_footNote' => 'Subtitel',
 'settings_footNote_desc' => 'Bericht om onderop elke pagina te tonen',
 'settings_fullSearchEngine' => 'Instellingen Fulltextsearch',
 'settings_fullSearchEngine_desc' => 'Instellingen Fulltextsearch',
@@ -1294,8 +1319,8 @@ URL: [url]',
 'settings_install_welcome_text' => '<p>Wees er zeker van dat u een bestand, genaamd \'ENABLE_INSTALL_TOOL\', gemaakt heeft in de configuratiemap, voordat u de installatie van letDMS begint, anders zal de installatie niet werken. Op een Unix-Syteem kan dit makkelijk gedaan worden met \'touch conf/ENABLE_INSTALL_TOOL\'. Verwijder het bestand nadat de installatie afgerond is.</p><p>letoDMS heeft weinig installatievoorwaarden. U heeft een mysql database en een php-geschikte web server nodig. Voor de lucene volledige tekst zoekfunctie, moet Zend framework geinstalleerd zijn op schijf en gevonden worden door php. Vanaf versie 3.2.0 van letoDMS zal ADOdb geen deel meer uitmaken van de uitgave. Een kopie kan van <a href="http://adodb.sourceforge.net/">http://adodb.sourceforge.net</a> gehaald en geinstalleerd worden. Het pad kan later opgegeven worden tijdens de installatie.</p><p>Als u de database voor de installatie wilt aanmaken, dan kunt u het handmatig met uw favoriete gereedschap aanmaken. optioneel kan een database met gebruikerstoegang gemaakt worden en importeer een van de database dumps in de configuratiemap. Met het installatiescript kan dit ook, maar hiervoor is database toegang nodig met voldoende rechten om een database aan te maken.</p>',
 'settings_install_welcome_title' => 'Welkom bij de installatie van letoDMS',
 '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_language' => 'Standaardtaal',
+'settings_language_desc' => 'Standaardtaal (naam van de submap in map "languages")',
 'settings_libraryFolder' => 'Bibliotheekmap',
 'settings_libraryFolder_desc' => 'In deze map kunnen documenten worden opgeslagen. Hiermee worden nieuwe documenten gecreëerd.',
 'settings_logFileEnable' => 'Inschakelen Logbestand',
@@ -1316,10 +1341,10 @@ URL: [url]',
 'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Max. nummers of recursieve document/map telling',
 'settings_maxRecursiveCount_desc' => 'Dit is het maximum aantal documenten of mappen dat zal worden gecontroleerd voor toegangsrechten bij recursieve objecten telling. Als dit aantal is overschreden, zal het aantal documenten en mappen in de het map overzicht worden geschat.',
-'settings_maxSizeForFullText' => '',
-'settings_maxSizeForFullText_desc' => '',
-'settings_maxUploadSize' => '',
-'settings_maxUploadSize_desc' => '',
+'settings_maxSizeForFullText' => 'Maximum bestandsgrootte voor onmiddellijke indexering',
+'settings_maxSizeForFullText_desc' => 'Alle nieuwe documenten kleiner dan deze waarde worden direct na het uploaden geïndexeerd. In alle andere gevallen worden alleen de metadata geïndexeerd.',
+'settings_maxUploadSize' => 'Maximale omvang voor uploaden',
+'settings_maxUploadSize_desc' => 'Dit is de maximale omvang voor te uploaden bestanden. Dat geldt voor bestanden en bijlagen.',
 'settings_more_settings' => 'Meer instellingen. Standaard login: admin/admin',
 'settings_notfound' => 'Niet gevonden',
 'settings_Notification' => 'Notificatie instellingen',
@@ -1356,12 +1381,12 @@ URL: [url]',
 'settings_previewWidthList_desc' => 'Breedte van het voorbeeld weergegeven in lijsten',
 'settings_previewWidthMenuList' => '',
 'settings_previewWidthMenuList_desc' => '',
-'settings_printDisclaimer' => 'Print Vrijwaring',
-'settings_printDisclaimer_desc' => 'Indien ingeschakeld zal het vrijwarings bericht in de lang.inc bestanden worden getoond onderop de pagina',
+'settings_printDisclaimer' => 'Vrijwaring afdrukken',
+'settings_printDisclaimer_desc' => 'Indien ingeschakeld zal het vrijwaringsbericht bestanden worden getoond onderaan de pagina',
 'settings_quota' => 'Gebruikersquotum',
 'settings_quota_desc' => 'Het maximum aantal bytes een gebruiker op de schijf mag schrijven. Stel deze in op 0 voor een onbeperkte schijfruimte. Deze waarde kan worden overschreven voor elk gebruik in zijn profiel.',
 'settings_removeFromDropFolder' => 'Verwijder het bestand uit de dropfolder na een succesvolle upload',
-'settings_removeFromDropFolder_desc' => '',
+'settings_removeFromDropFolder_desc' => 'Verwijder het bestand uit de dropfolder na een succesvolle upload',
 'settings_restricted' => 'Beperkte toegang',
 'settings_restricted_desc' => 'Sta alleen gebruiker toe om in te loggen die in de database zijn opgenomen (ongeacht succesvolle authenticatie met LDAP)',
 'settings_rootDir' => 'Basismap',
@@ -1371,15 +1396,15 @@ URL: [url]',
 'settings_SaveError' => 'Opslagfout Configuratiebestand',
 'settings_Server' => 'Server instellingen',
 'settings_showFullPreview' => 'Toon volledige document',
-'settings_showFullPreview_desc' => '',
+'settings_showFullPreview_desc' => 'In/Uitschakelen preview van alle pagina\'s van het document.',
 'settings_showMissingTranslations' => 'Ontbrekende vertalingen weergeven',
 'settings_showMissingTranslations_desc' => 'Geef alle ontbrekende vertalingen onder aan de pagina weer. De gebruiker kan een verzoek tot vertaling indienen dat wordt opgeslagen als csv bestand. Let op! Zet deze functie niet aan in productieomgevingen!',
-'settings_showSingleSearchHit' => '',
-'settings_showSingleSearchHit_desc' => '',
+'settings_showSingleSearchHit' => 'Spring rechtstreeks naar het enkele zoekresultaat',
+'settings_showSingleSearchHit_desc' => 'Als er maar één zoekresultaat is, wordt dat in detail getoond.',
 'settings_Site' => 'Web Locatie',
-'settings_siteDefaultPage' => 'Locatie standaard pagina',
-'settings_siteDefaultPage_desc' => 'Standaard pagina bij inloggen. Indien leeg is out/out.ViewFolder.php de standaard',
-'settings_siteName' => 'Locatie Naam',
+'settings_siteDefaultPage' => 'Locatie standaardpagina',
+'settings_siteDefaultPage_desc' => 'Standaardpagina bij inloggen. Indien leeg is out/out.ViewFolder.php de standaard',
+'settings_siteName' => 'Naam van de site',
 'settings_siteName_desc' => 'Naam van de Locatie dat wordt gebruikt in de titel van de paginas. Standaard: letoDMS',
 'settings_SMTP' => 'SMTP Server instellingen',
 'settings_smtpPassword' => 'SMTP Server paswoord',
@@ -1406,8 +1431,8 @@ URL: [url]',
 'settings_start_install' => 'Begin installatie',
 'settings_stopWordsFile' => 'Pad naar bestand met nietindex woorden',
 'settings_stopWordsFile_desc' => 'Als volledigetekst zoekopdracht is ingeschakeld, bevat dit bestand woorden die niet geindexeerd zullen worden.',
-'settings_strictFormCheck' => 'Stricte Form Controle',
-'settings_strictFormCheck_desc' => 'Stricte formuleer controle. Indien ingeschakeld, worden alle velden in het formulier gecontroleer op een waarde. Indien uitgeschakeld, worden de meeste commentaar en invoervelden optioneel. Commentaren zijn altijd benodigd bij een review of modificatie van een documentstatus',
+'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_System' => 'Systeem',
 'settings_theme' => 'Standaard thema',
@@ -1423,7 +1448,7 @@ URL: [url]',
 'settings_versioningFileName' => 'Versieinformatie Bestandsnaam',
 'settings_versioningFileName_desc' => 'De naam van het versie informatie bestand gemaakt door het backupgereedschap',
 'settings_versiontolow' => 'Versie te laag',
-'settings_viewOnlineFileTypes' => 'Bekijk Online Bestandstypen',
+'settings_viewOnlineFileTypes' => 'De volgende bestandstypen online bekijken',
 'settings_viewOnlineFileTypes_desc' => 'Bestanden met een van de volgende extensies kunnen online bekeken worden (GEBRUIK ALLEEN KLEINE LETTERS)',
 'settings_workflowMode' => 'Workflow mode',
 'settings_workflowMode_desc' => 'De uitgebreide workflow maakt het mogelijk om uw eigen workflow op te geven voor documentversies.',
@@ -1448,53 +1473,53 @@ URL: [url]',
 'splash_add_group_member' => 'Nieuwe groepslid toegevoegd',
 'splash_add_role' => 'Nieuwe rol toegevoegd',
 'splash_add_to_transmittal' => 'Toevoegen aan verzending',
-'splash_add_transmittal' => '',
+'splash_add_transmittal' => 'Verzending toegevoegd',
 'splash_add_user' => 'Nieuwe gebruiker toegevoegd',
-'splash_cleared_cache' => '',
+'splash_cleared_cache' => 'Cache leeggemaakt',
 'splash_cleared_clipboard' => 'Klembord leeg gemaakt',
 'splash_document_added' => 'Nieuw document toegevoegd',
 'splash_document_checkedout' => 'Document in gebruik genomen',
 'splash_document_edited' => 'Document opgeslagen',
-'splash_document_indexed' => '',
+'splash_document_indexed' => 'Document geïndexeerd',
 'splash_document_locked' => 'Document vergrendeld',
 'splash_document_unlocked' => 'Document ontgrendeld',
 'splash_edit_attribute' => 'Attribuut opgeslagen',
-'splash_edit_event' => '',
+'splash_edit_event' => 'Gebeurtenis opgeslagen',
 'splash_edit_group' => 'Groep opgeslagen',
 'splash_edit_role' => 'Rol opgeslagen',
 'splash_edit_user' => 'Gebruiker opgeslagen',
 'splash_error_add_to_transmittal' => 'Fout: toevoeging aan verzending',
-'splash_error_rm_download_link' => '',
-'splash_error_send_download_link' => '',
+'splash_error_rm_download_link' => 'Fout bij verwijderen download-link',
+'splash_error_send_download_link' => 'Fout bij verzenden download-link',
 'splash_folder_edited' => 'Opslaan mapwijzigingen',
-'splash_importfs' => '',
+'splash_importfs' => 'Geïmporteerd: [docs] documenten en [folders] mappen',
 'splash_invalid_folder_id' => 'Ongeldige map ID',
 'splash_invalid_searchterm' => 'Ongeldige zoekterm',
 'splash_moved_clipboard' => 'Klembord verplaatst naar de huidige map',
 'splash_move_document' => 'Document verplaatst',
 'splash_move_folder' => 'Map verplaatst',
-'splash_receipt_update_success' => '',
+'splash_receipt_update_success' => 'Ontvangst succesvol toegevoegd',
 'splash_removed_from_clipboard' => 'Verwijderd van het klembord',
 'splash_rm_attribute' => 'Attribuut verwijderd',
 'splash_rm_document' => 'Document verwijderd',
-'splash_rm_download_link' => '',
+'splash_rm_download_link' => 'Download-link verwijderd',
 'splash_rm_folder' => 'Map verwijderd',
 'splash_rm_group' => 'Groep verwijderd',
 'splash_rm_group_member' => 'Lid van de groep verwijderd',
 'splash_rm_role' => 'Rol verwijderd',
 'splash_rm_transmittal' => 'Verzending verwijderd',
 'splash_rm_user' => 'Gebruiker verwijderd',
-'splash_rm_user_processes' => '',
-'splash_saved_file' => '',
-'splash_save_user_data' => '',
-'splash_send_download_link' => '',
-'splash_send_login_data' => '',
+'splash_rm_user_processes' => 'Gebruiker uit alle processen verwijderd',
+'splash_saved_file' => 'Bestand opgeslagen',
+'splash_save_user_data' => 'Gebruikersgegevens opgeslagen',
+'splash_send_download_link' => 'Download-link verzonden',
+'splash_send_login_data' => 'Login-gegevens verzonden',
 'splash_settings_saved' => 'Instellingen opgeslagen',
 'splash_substituted_user' => 'Invallers gebruiker',
 'splash_switched_back_user' => 'Teruggeschakeld naar de oorspronkelijke gebruiker',
 'splash_toogle_group_manager' => 'Group manager toogled',
 'splash_transfer_document' => '',
-'splash_transfer_objects' => '',
+'splash_transfer_objects' => 'Objecten overgedragen',
 'state_and_next_state' => 'staat/ volgende staat',
 'statistic' => 'Statistieken',
 'status' => 'Status',
@@ -1517,7 +1542,7 @@ URL: [url]',
 'status_revisor_removed' => 'Verwijderd',
 'status_unknown' => 'Onbekend',
 'storage_size' => 'Omvang opslag',
-'submit_2_fact_auth' => '',
+'submit_2_fact_auth' => '2-factor-authentificatie verstuurd',
 'submit_approval' => 'Verzend [Goedkeuring]',
 'submit_login' => 'Log in',
 'submit_password' => 'Nieuw wachtwoord instellen',
@@ -1526,7 +1551,7 @@ URL: [url]',
 'submit_review' => 'Verzend Beoordeling',
 'submit_revision' => 'Herziening verzenden',
 'submit_userinfo' => 'Wijzigingen opslaan',
-'subsribe_timelinefeed' => '',
+'subsribe_timelinefeed' => 'Subscribe to timeline feed',
 'substitute_to_user' => 'Switch naar \'[username]\'',
 'substitute_user' => 'Invaller/ vervanger Gebruiker',
 'success_add_aro' => 'Access request object added',
@@ -1537,13 +1562,13 @@ URL: [url]',
 'sunday_abbr' => 'zo',
 'sv_SE' => 'Zweeds',
 'switched_to' => 'Overgeschakeld naar',
-'takeOverAttributeValue' => '',
+'takeOverAttributeValue' => 'Onthoud de waarde van het attribuut',
 'takeOverGrpApprover' => 'Onthoud de laatste groep goedkeurders',
 'takeOverGrpReviewer' => 'Onthoud de laatste groep herzieners',
 'takeOverIndApprover' => 'Onthoud de laatste groep individuele goedkeurders',
 'takeOverIndReviewer' => 'Onthoud de laatste groep individuele herzieners',
 'tasks' => 'taken',
-'temp_jscode' => '',
+'temp_jscode' => 'Tijdelijke jscode',
 'testmail_body' => 'Deze mail dient enkel voor het testen van de mail configuratie van SeedDMS',
 'testmail_subject' => 'Test mail',
 'theme' => 'Thema',
@@ -1554,27 +1579,30 @@ URL: [url]',
 'timeline_add_version' => 'Nieuwe versie',
 'timeline_full_add_file' => 'Nieuwe file',
 'timeline_full_add_version' => 'Nieuwe versie',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => 'Status veranderd',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => 'Document geselecteerd',
 'timeline_skip_add_file' => 'Bijlage toegevoegd',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'verworpen',
 'timeline_skip_status_change_-3' => 'verlopen',
 'timeline_skip_status_change_0' => 'wacht op beoordeling',
 'timeline_skip_status_change_1' => 'wacht op goedkeuring',
 'timeline_skip_status_change_2' => 'gepubliceerd',
 'timeline_skip_status_change_3' => 'binnen de workflow',
-'timeline_skip_status_change_4' => '',
-'timeline_skip_status_change_5' => '',
+'timeline_skip_status_change_4' => 'in revisie',
+'timeline_skip_status_change_5' => 'concept',
 'timeline_status_change' => 'Versie [version]: [status]',
 'to' => 'aan',
 'toggle_manager' => 'Wijzig Beheerder',
-'toggle_qrcode' => '',
+'toggle_qrcode' => 'Tonen/Verbergen QR-code',
 'to_before_from' => 'De einddatum mag niet voor de startdatum liggen',
 'transfer_document' => 'Document overdragen',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',
-'transfer_objects' => '',
-'transfer_objects_to_user' => '',
+'transfer_objects' => 'Objecten overdragen',
+'transfer_objects_to_user' => 'Objecten overdragen aan gebruiker',
 'transfer_to_user' => '',
 'transition_triggered_email' => 'Workflow-overgang geactiveerd',
 'transition_triggered_email_body' => 'Workflow Overgang
@@ -1599,9 +1627,9 @@ URL: [url]',
 'tr_TR' => 'Turks',
 'tuesday' => 'dinsdag',
 'tuesday_abbr' => 'di',
-'type_of_hook' => '',
+'type_of_hook' => 'Soort hook',
 'type_to_search' => 'zoeken naar',
-'uk_UA' => 'Oekraïne',
+'uk_UA' => 'Oekraïens',
 'under_folder' => 'In map',
 'unknown_attrdef' => 'Onbekende attribuut definitie',
 'unknown_command' => 'Opdracht niet herkend.',
@@ -1634,12 +1662,12 @@ URL: [url]',
 'uploading_zerosize' => 'Uploaden van een leeg bestand. Upload wordt geannuleerd.',
 'used_discspace' => 'Gebruike schijf ruimte',
 'user' => 'Gebruiker',
-'userid_groupid' => 'Gebruiker id/Groep id',
+'userid_groupid' => 'GebruikerID / Groep ID',
 'users' => 'Gebruikers',
 'users_and_groups' => 'Gebruikers / Groepen',
 'users_done_work' => 'Uitgevoerd werk gebruikers',
 'user_exists' => 'Gebruiker bestaat reeds.',
-'user_group' => 'Gebruiker/Groep',
+'user_group' => 'Gebruiker / Groep',
 'user_group_management' => 'Gebruikers / Groepen beheer',
 'user_image' => 'Afbeelding',
 'user_info' => 'Gebruikers informatie',
@@ -1650,7 +1678,7 @@ URL: [url]',
 'use_comment_of_document' => 'Gebruik reactie van document',
 'use_default_categories' => 'Gebruik voorgedefinieerde categorieen',
 'use_default_keywords' => 'Gebruik bestaande sleutelwoorden',
-'valid_till' => '',
+'valid_till' => 'Geldig tot',
 'version' => 'Versie',
 'versioning_file_creation' => 'Aanmaken bestand versies',
 'versioning_file_creation_warning' => 'Met deze handeling maakt U een bestand aan die de versie voortgang informatie van een compleet DMS bevat. Na het aanmaken wordt ieder bestand opgeslagen in de document map.',
@@ -1673,23 +1701,23 @@ URL: [url]',
 'weeks' => 'Weken',
 'week_view' => 'Week Overzicht',
 'workflow' => 'Workflow',
-'workflows_involded' => '',
+'workflows_involded' => 'Betrokken bij workflows',
 'workflow_actions_management' => 'Workflow actiebeheer',
 'workflow_action_in_use' => 'Deze actie wordt momenteel gebruikt door een workflow',
 'workflow_action_name' => 'Naam',
 'workflow_editor' => 'Workflow editor',
 'workflow_group_summary' => 'Groepssamenvatting',
-'workflow_has_cycle' => '',
+'workflow_has_cycle' => 'Workflow heeft cyclus',
 'workflow_initstate' => 'Begin status',
 'workflow_in_use' => 'Deze workflow wordt momenteel gebruikt door documenten.',
-'workflow_layoutdata_saved' => '',
+'workflow_layoutdata_saved' => 'Sla de layout op',
 'workflow_management' => 'Workflow beheer',
 'workflow_name' => 'Naam',
-'workflow_no_doc_rejected_state' => '',
-'workflow_no_doc_released_state' => '',
-'workflow_no_initial_state' => '',
+'workflow_no_doc_rejected_state' => 'Het document ma in deze fase van de workflow niet geweigerd worden!',
+'workflow_no_doc_released_state' => 'Het document ma in deze fase van de workflow niet gesloten worden',
+'workflow_no_initial_state' => 'Gen enkele overdracht begint met de startfase van de workflow',
 'workflow_no_states' => 'U moet eerst workflow-statussen definiëren, voordat u een workflow toevoegt.',
-'workflow_save_layout' => '',
+'workflow_save_layout' => 'Sla de layout op',
 'workflow_state' => 'workflow_states_managementWorkflow status beheer',
 'workflow_states_management' => 'Workflow status beheer',
 'workflow_state_docstatus' => 'Document status',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 8ad6dbacb..7bf9a49d3 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -124,6 +124,7 @@ URL: [url]',
 '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.',
 'ar_EG' => 'Arabski',
 'assign_approvers' => 'Przypisz osoby akceptujące',
+'assign_recipients' => '',
 'assign_reviewers' => 'Przypisz recenzentów',
 'assign_user_property_to' => 'Przypisz właściwości użytkownika do',
 'assumed_released' => 'Assumed released',
@@ -323,6 +324,7 @@ URL: [url]',
 'documents_to_review' => 'Dokumenty oczekujące na Twoją recenzję',
 'documents_to_revise' => '',
 'documents_user_expiration' => '',
+'documents_user_no_reception' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dokumenty należące do Ciebie, które wymagają uwagi',
@@ -587,6 +589,7 @@ URL: [url]',
 'index_waiting' => '',
 'individuals' => 'Indywidualni',
 'indivіduals_in_groups' => '',
+'info_recipients_tab_not_released' => '',
 'inherited' => 'dziedziczony',
 'inherits_access_copy_msg' => 'Kopiuj odziedziczoną listę dostępu',
 'inherits_access_empty_msg' => 'Rozpocznij z pustą listą dostępu',
@@ -1157,6 +1160,8 @@ URL: [url]',
 'settings_enableDuplicateDocNames_desc' => 'Zezwala na tworzenie w folderze dokumentów o tej samej nazwie.',
 'settings_enableEmail' => 'Włącz powiadomienia e-mail',
 'settings_enableEmail_desc' => 'Włącz/Wyłącz automatyczne powiadomienia drogą mailową',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => 'Pokaż drzewo katalogów',
 'settings_enableFolderTree_desc' => 'Odznacz aby nie pokazywać drzewa katalogów',
 'settings_enableFullSearch' => 'Włącz przeszukiwanie pełnotekstowe',
@@ -1191,6 +1196,8 @@ URL: [url]',
 '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_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_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_enableSessionList' => '',
@@ -1506,9 +1513,12 @@ URL: [url]',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => '',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => '',
 'timeline_skip_add_file' => 'dodano załącznik',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'odrzucony',
 'timeline_skip_status_change_-3' => 'przedawniony',
 'timeline_skip_status_change_0' => 'oczekuje na opinię',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 5b8b107a3..8af195753 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 (965), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (967), flaviove (627), lfcristofoli (352)
 
 $text = array(
 '2_factor_auth' => '',
@@ -131,6 +131,7 @@ URL: [url]',
 '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.',
 'ar_EG' => 'Árabe',
 'assign_approvers' => 'Assign Approvers',
+'assign_recipients' => '',
 'assign_reviewers' => 'Assign Reviewers',
 'assign_user_property_to' => 'Assign user\'s properties to',
 'assumed_released' => 'Assumed released',
@@ -330,6 +331,7 @@ URL: [url]',
 'documents_to_review' => 'Documents Awaiting User\'s Review',
 'documents_to_revise' => '',
 'documents_user_expiration' => '',
+'documents_user_no_reception' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Documentos rejeitados',
 'documents_user_requiring_attention' => 'Documents Owned by User That Require Attention',
@@ -593,6 +595,7 @@ URL: [url]',
 'index_waiting' => '',
 'individuals' => 'Individuals',
 'indivіduals_in_groups' => '',
+'info_recipients_tab_not_released' => '',
 'inherited' => 'herdado',
 'inherits_access_copy_msg' => 'Copy inherited access list',
 'inherits_access_empty_msg' => 'Inicie com a lista de acesso vazia',
@@ -1175,6 +1178,8 @@ URL: [url]',
 'settings_enableDuplicateDocNames_desc' => 'Permite ter nomes de documentos duplicados em uma pasta.',
 'settings_enableEmail' => 'Ativar E-mail',
 'settings_enableEmail_desc' => 'Ativar/desativar a notificação de e-mail automático',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => 'Ativar Árvore de Pasta',
 'settings_enableFolderTree_desc' => 'Falso para não mostrar a árvore de pastas',
 'settings_enableFullSearch' => 'Ativar Pesquisa de texto completo',
@@ -1209,6 +1214,8 @@ URL: [url]',
 '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_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_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_enableSessionList' => '',
@@ -1473,7 +1480,7 @@ URL: [url]',
 'status_approver_removed' => 'Approver removed from proceá',
 'status_not_approved' => 'Not approved',
 'status_not_receipted' => '',
-'status_not_reviewed' => '',
+'status_not_reviewed' => 'Não revisado',
 'status_not_revised' => '',
 'status_receipted' => '',
 'status_receipt_rejected' => '',
@@ -1524,9 +1531,12 @@ URL: [url]',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => '',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => '',
 'timeline_skip_add_file' => 'anexo adicionado',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'rejeitado',
 'timeline_skip_status_change_-3' => 'expirado',
 'timeline_skip_status_change_0' => 'revisão pendente',
@@ -1540,7 +1550,7 @@ URL: [url]',
 'toggle_manager' => 'Toggle manager',
 'toggle_qrcode' => '',
 'to_before_from' => 'A data de término não pode ser anterior a data de início',
-'transfer_document' => '',
+'transfer_document' => 'Transferir documento',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',
 'transfer_objects' => '',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 27152ba47..1a3da5da3 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -136,6 +136,7 @@ URL: [url]',
 '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.',
 'ar_EG' => 'Arabă',
 'assign_approvers' => 'Atribuire aprobatori',
+'assign_recipients' => '',
 'assign_reviewers' => 'Atribuire revizuitori(reviwers)',
 'assign_user_property_to' => 'Atribuire proprietati utilizator la',
 'assumed_released' => 'Assumed released',
@@ -335,6 +336,7 @@ URL: [url]',
 'documents_to_review' => 'Documente care așteaptă revizuirea dumneavoastră',
 'documents_to_revise' => 'Documente de revizut',
 'documents_user_expiration' => '',
+'documents_user_no_reception' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documente deținute de tine care necesită atenție',
@@ -599,6 +601,7 @@ URL: [url]',
 'index_waiting' => '',
 'individuals' => 'Individuals',
 'indivіduals_in_groups' => '',
+'info_recipients_tab_not_released' => '',
 'inherited' => 'moștenit',
 'inherits_access_copy_msg' => 'Copie lista de acces moștenită',
 'inherits_access_empty_msg' => 'Începeți cu lista de acces goală',
@@ -1200,6 +1203,8 @@ URL: [url]',
 'settings_enableDuplicateDocNames_desc' => 'Permiteți sa existe nume de documente duplicate într-un fisier.',
 'settings_enableEmail' => 'Activare E-mail',
 'settings_enableEmail_desc' => 'Activare/dezactivare notificari automare prin e-mail',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => 'Activare Folder Ierarhic',
 'settings_enableFolderTree_desc' => 'Activare/dezactivare folder ierarhic în pagina \'Vizualizare Folder\'',
 'settings_enableFullSearch' => 'Activare căutare in tot textul',
@@ -1234,6 +1239,8 @@ URL: [url]',
 '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_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_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_enableSessionList' => '',
@@ -1549,9 +1556,12 @@ URL: [url]',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '[document]<br />Adaugă atașament',
 'timeline_full_add_version' => '',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => '[document] Versiune [version]: [status]',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => '',
 'timeline_skip_add_file' => 'atașament adăugat',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'rejectat',
 'timeline_skip_status_change_-3' => 'expirat',
 'timeline_skip_status_change_0' => 'așteaptă revizuire',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index fdc0f3bc1..6ba5d115a 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 (1659)
+//    Translators: Admin (1661)
 
 $text = array(
 '2_factor_auth' => 'Двухфакторная аутентификация',
@@ -136,6 +136,7 @@ URL: [url]',
 'archive_creation_warning' => 'Эта операция создаст архив, содержащий все каталоги. После создания архив будет сохранен в каталоге данных сервера.<br><b>Внимание:</b> архив созданный как понятный человеку, будет непригоден в качестве резервной копии для восстановления!',
 'ar_EG' => 'Arabic',
 'assign_approvers' => 'Назначить утверждающих',
+'assign_recipients' => '',
 'assign_reviewers' => 'Назначить рецензентов',
 'assign_user_property_to' => 'Назначить свойства пользователя',
 'assumed_released' => 'Утверждён',
@@ -324,7 +325,7 @@ URL: [url]',
 'documentcontent' => 'Содержание документа',
 'documents' => 'док.',
 'documents_checked_out_by_you' => 'Документ проверен вами',
-'documents_expired' => '',
+'documents_expired' => 'Просроченные документы',
 'documents_in_process' => 'Документы в работе',
 'documents_locked' => 'Заблокированные документы',
 'documents_locked_by_you' => 'Документы, заблокированные вами',
@@ -335,6 +336,7 @@ URL: [url]',
 'documents_to_review' => 'Документы, ожидающие вашей рецензии',
 'documents_to_revise' => 'Документы на ревизии',
 'documents_user_expiration' => '',
+'documents_user_no_reception' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Отклоненные документы',
 'documents_user_requiring_attention' => 'Ваши документы, требующие внимания',
@@ -599,6 +601,7 @@ URL: [url]',
 'index_waiting' => 'Ожидание',
 'individuals' => 'Пользователи',
 'indivіduals_in_groups' => 'Пользователи группы',
+'info_recipients_tab_not_released' => '',
 'inherited' => 'унаследованный',
 'inherits_access_copy_msg' => 'Скопировать наследованный список',
 'inherits_access_empty_msg' => 'Начать с пустого списка доступа',
@@ -1207,6 +1210,8 @@ URL: [url]',
 'settings_enableDuplicateDocNames_desc' => 'Разрешить документы с одинаковым названием в каталоге.',
 'settings_enableEmail' => 'Включить e-mail',
 'settings_enableEmail_desc' => 'Включить/отключить автоматическое уведомление по e-mail.',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => 'Включить дерево каталогов',
 'settings_enableFolderTree_desc' => 'Если отключено, не будет показано дерево каталогов.',
 'settings_enableFullSearch' => 'Включить полнотекстовый поиск',
@@ -1241,6 +1246,8 @@ URL: [url]',
 'settings_enableRecursiveCount_desc' => 'Если включено, количество документов и каталогов в виде каталога будет определятся рекурсивным подсчётом всех документов и каталогов разрешённых для доступа пользователя.',
 'settings_enableRevisionWorkflow' => 'Включить процесс ревизии',
 'settings_enableRevisionWorkflow_desc' => 'Включить для активации функции ревизии документа по истечении определенного периода времени.',
+'settings_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_desc' => '',
 'settings_enableSelfRevApp' => 'Разрешить рецензию/утверждение<br/>пользователями вошедшими в систему',
 'settings_enableSelfRevApp_desc' => 'Включите для того, чтобы пользователи, в настоящее время выполнившие вход в систему, были в списке рецензентов/утверждающих и в изменении процесса.',
 'settings_enableSessionList' => '',
@@ -1556,9 +1563,12 @@ URL: [url]',
 'timeline_add_version' => 'Новая версия [version]',
 'timeline_full_add_file' => '[document]<br />Новое вложение',
 'timeline_full_add_version' => '[document]<br />Новая версия [version]',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => '[document]<br />Версия [version]: [status]',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => 'Выбранный документ',
 'timeline_skip_add_file' => 'вложение добавлено',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'отклонён',
 'timeline_skip_status_change_-3' => 'срок действия вышел',
 'timeline_skip_status_change_0' => 'ожидает рецензии',
@@ -1572,7 +1582,7 @@ URL: [url]',
 'toggle_manager' => 'Изменить как менеджера',
 'toggle_qrcode' => '',
 'to_before_from' => 'Конечная дата не может быть меньше начальной даты',
-'transfer_document' => '',
+'transfer_document' => 'Передать документ',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',
 'transfer_objects' => '',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index f53906a66..9aab03d18 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 (553), destinqo (19), pS2017 (508)
+//    Translators: Admin (556), destinqo (19), pS2017 (508)
 
 $text = array(
 '2_factor_auth' => '2-faktorové overovanie',
@@ -119,6 +119,7 @@ URL: [url]',
 '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.',
 'ar_EG' => 'Arabština',
 'assign_approvers' => 'Určiť schvaľovateľov',
+'assign_recipients' => '',
 'assign_reviewers' => 'Určiť recenzentov',
 'assign_user_property_to' => 'Assign user\'s properties to',
 'assumed_released' => 'Pokladá sa za zverejnené',
@@ -312,6 +313,7 @@ URL: [url]',
 'documents_to_review' => 'Dokumenty čakajúce na kontrolu používateľa',
 'documents_to_revise' => 'Dokumenty čakajúce na vašu revíziu',
 'documents_user_expiration' => '',
+'documents_user_no_reception' => '',
 'documents_user_reception' => 'Dokumenty čakajúce na prijatie',
 'documents_user_rejected' => 'Zamietnuté dokumenty',
 'documents_user_requiring_attention' => 'Dokumenty, ktoré používateľ vlastní a vyžadujú pozornosť',
@@ -522,6 +524,7 @@ URL: [url]',
 'index_waiting' => 'Čakajte',
 'individuals' => 'Jednotlivci',
 'indivіduals_in_groups' => 'Členovia skupiny',
+'info_recipients_tab_not_released' => '',
 'inherited' => 'zdedené',
 'inherits_access_copy_msg' => 'Skopírovať zdedený zoznam riadenia prístupu',
 'inherits_access_empty_msg' => 'Založiť nový zoznam riadenia prístupu',
@@ -1032,6 +1035,8 @@ URL: [url]',
 'settings_enableDuplicateDocNames_desc' => 'Povoliť duplicitné názvy dokumentov v zložke.',
 'settings_enableEmail' => 'Povoliť e-mail',
 'settings_enableEmail_desc' => 'Povoliť/zakázať automatické emailové upozornenie',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => 'Aktivovať strom priečinkov',
 'settings_enableFolderTree_desc' => '',
 'settings_enableFullSearch' => 'Povoliť Fulltextové vyhľadávanie',
@@ -1066,6 +1071,8 @@ URL: [url]',
 'settings_enableRecursiveCount_desc' => '',
 'settings_enableRevisionWorkflow' => 'Povoliť revíziu dokumentov',
 'settings_enableRevisionWorkflow_desc' => '',
+'settings_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
 'settings_enableSessionList' => '',
@@ -1381,15 +1388,18 @@ URL: [url]',
 'timeline_add_version' => 'Nová verzia [version]',
 'timeline_full_add_file' => '[document]<br/>Nová príloha',
 'timeline_full_add_version' => '[document]<br/>Nová verzia [version]',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => '[document]<br/>Verzia [version]: [status]',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => 'Vybraný dokument',
 'timeline_skip_add_file' => 'príloha bola pridaná',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'odmietnuté',
 'timeline_skip_status_change_-3' => 'expirovaný',
-'timeline_skip_status_change_0' => '',
-'timeline_skip_status_change_1' => '',
+'timeline_skip_status_change_0' => 'čaká na revíziu',
+'timeline_skip_status_change_1' => 'čaká na potvrdenie',
 'timeline_skip_status_change_2' => 'uvoľnený',
-'timeline_skip_status_change_3' => '',
+'timeline_skip_status_change_3' => 'v spracovaní',
 'timeline_skip_status_change_4' => '',
 'timeline_skip_status_change_5' => 'návrh',
 'timeline_status_change' => 'Verzia [version]: [status]',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 1168981d2..e5e5ae82d 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -137,6 +137,7 @@ URL: [url]',
 '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.',
 'ar_EG' => 'arabiska',
 'assign_approvers' => 'Ge uppdrag till personer/grupper att godkänna dokumentet',
+'assign_recipients' => '',
 'assign_reviewers' => 'Ge uppdrag till personer/grupper att granska dokumentet',
 'assign_user_property_to' => 'Sätt användarens egenskaper till',
 'assumed_released' => 'Antas klart för användning',
@@ -336,6 +337,7 @@ URL: [url]',
 'documents_to_review' => 'Dokument som du behöver granska',
 'documents_to_revise' => 'Dokument som väntar på din granskning',
 'documents_user_expiration' => 'Utgångna dokument',
+'documents_user_no_reception' => '',
 'documents_user_reception' => 'Dokument som väntar på mottagande',
 'documents_user_rejected' => 'Avvisade dokument',
 'documents_user_requiring_attention' => 'Dokument som du behöver granska/godkänna',
@@ -612,6 +614,7 @@ URL: [url]',
 'index_waiting' => 'Väntar',
 'individuals' => 'Personer',
 'indivіduals_in_groups' => 'Medlemmar i en grupp',
+'info_recipients_tab_not_released' => '',
 'inherited' => 'ärvd',
 'inherits_access_copy_msg' => 'Kopiera lista för behörighetsarv',
 'inherits_access_empty_msg' => 'Börja med tom behörighetslista',
@@ -1220,6 +1223,8 @@ Kommentar: [comment]',
 'settings_enableDuplicateDocNames_desc' => 'Tillåter att det finns dokument med samma namn i en mapp.',
 'settings_enableEmail' => 'Använd e-postmeddelanden',
 'settings_enableEmail_desc' => 'Aktivera/Inaktivera automatiska e-postmeddelanden',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => 'Visa katalogers trädstruktur',
 'settings_enableFolderTree_desc' => 'Av för att inte visa katalogernas trädstruktur',
 'settings_enableFullSearch' => 'Aktivera fulltext-sökning',
@@ -1254,6 +1259,8 @@ Kommentar: [comment]',
 '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' => 'Aktivera revidering av dokument',
 'settings_enableRevisionWorkflow_desc' => 'Aktivera för att kunna köra arbetsflöde för revidering av dokument efter en specifik tidsperiod.',
+'settings_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_desc' => '',
 'settings_enableSelfRevApp' => 'Tillåt granskning/godkännande 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_enableSessionList' => 'Aktivera visning av användare online i menyn',
@@ -1569,9 +1576,12 @@ Kommentar: [comment]',
 'timeline_add_version' => 'Ny version [version]',
 'timeline_full_add_file' => '[document]<br />Ny bilaga',
 'timeline_full_add_version' => '[document]<br />Ny version [version]',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => '[document]<br />Version [version]: [status]',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => 'Valt dokument',
 'timeline_skip_add_file' => 'Bilaga tillagd',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'avvisad',
 'timeline_skip_status_change_-3' => 'utgånget',
 'timeline_skip_status_change_0' => 'väntar på granskning',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index af76dd730..7d0773a07 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -130,6 +130,7 @@ URL: [url]',
 '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.',
 'ar_EG' => 'Arapça',
 'assign_approvers' => 'Onaylayıcı Tanımla',
+'assign_recipients' => '',
 'assign_reviewers' => 'Kontrol Eden Tanımla',
 'assign_user_property_to' => 'Kullanıcının özelliklerini ata',
 'assumed_released' => 'Yayınlandı kabul edilmekte',
@@ -329,6 +330,7 @@ URL: [url]',
 'documents_to_review' => 'Kontrol etmenizi bekleyen dokümanlar',
 'documents_to_revise' => '',
 'documents_user_expiration' => '',
+'documents_user_no_reception' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dikkatinizi gerektiren size ait dokümanlar',
@@ -593,6 +595,7 @@ URL: [url]',
 'index_waiting' => '',
 'individuals' => 'Bireysel',
 'indivіduals_in_groups' => '',
+'info_recipients_tab_not_released' => '',
 'inherited' => 'devralındı',
 'inherits_access_copy_msg' => 'Devralınan erişim listesini kopyala',
 'inherits_access_empty_msg' => 'Boş erişim listesiyle başla',
@@ -1179,6 +1182,8 @@ URL: [url]',
 'settings_enableDuplicateDocNames_desc' => 'Bir klasör içinde aynı isimli dosyalara izin verir.',
 'settings_enableEmail' => 'E-Postayı Etkinleştir',
 'settings_enableEmail_desc' => 'Otomatik e-posta bildirimlerini etkinleştir/devre dışı bırak',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => 'Klasör Ağaç Yapısını Etkinleştir',
 'settings_enableFolderTree_desc' => '\'View Folder\' sayfasında klasör ağaç yapısını etkinleştir/devredışı bırak',
 'settings_enableFullSearch' => 'Tam metin aramayı etkinleştir',
@@ -1213,6 +1218,8 @@ URL: [url]',
 '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_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_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_enableSessionList' => '',
@@ -1528,9 +1535,12 @@ URL: [url]',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => '',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => '',
 'timeline_skip_add_file' => 'ek eklendi',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
 'timeline_skip_status_change_0' => '',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 51216e7e7..7e3b90572 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -136,6 +136,7 @@ URL: [url]',
 'archive_creation_warning' => 'Ця операція створить архів, який містить всі каталоги. Після створення архів буде збережений в каталозі даних сервера.<br><b>Увага:</b> архів, який створено в читабельному вигляді, буде непридатний в якості резервної копії для відновлення!',
 'ar_EG' => 'Arabic',
 'assign_approvers' => 'Призначити затверджувачів',
+'assign_recipients' => '',
 'assign_reviewers' => 'Призначити рецензентів',
 'assign_user_property_to' => 'Призначити властивості користувача',
 'assumed_released' => 'Затверджено',
@@ -335,6 +336,7 @@ URL: [url]',
 'documents_to_review' => 'Документи, які чекають вашої рецензії',
 'documents_to_revise' => 'Документи для повторного розгляду',
 'documents_user_expiration' => '',
+'documents_user_no_reception' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Документи, які відхилили',
 'documents_user_requiring_attention' => 'Ваші документи, які потребують уваги',
@@ -599,6 +601,7 @@ URL: [url]',
 'index_waiting' => '',
 'individuals' => 'Користувачі',
 'indivіduals_in_groups' => 'Користувачі групи',
+'info_recipients_tab_not_released' => '',
 'inherited' => 'успадкований',
 'inherits_access_copy_msg' => 'Скопіювати успадкований список',
 'inherits_access_empty_msg' => 'Почати з порожнього списку доступу',
@@ -1200,6 +1203,8 @@ URL: [url]',
 'settings_enableDuplicateDocNames_desc' => 'Дозволити документи з однаковими назвами в каталозі.',
 'settings_enableEmail' => 'Увімкнути e-mail',
 'settings_enableEmail_desc' => 'Увімкнути/вимкнути автоматичне сповіщення по e-mail.',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => 'Увімкнути дерево каталогів',
 'settings_enableFolderTree_desc' => 'Якщо відключено, дерево каталогів не буде відображене',
 'settings_enableFullSearch' => 'Увімкнути повнотекстовий пошук',
@@ -1234,6 +1239,8 @@ URL: [url]',
 'settings_enableRecursiveCount_desc' => 'Якщо увімкнено, кількість документів і каталогів при перегляді каталогу буде підраховано рекурсивно для всіх документів до яких користувач має доступ.',
 'settings_enableRevisionWorkflow' => 'Увімкнути процес ревізії',
 'settings_enableRevisionWorkflow_desc' => 'Увімкніть для актвації функції ревізії документа через певний час',
+'settings_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_desc' => '',
 'settings_enableSelfRevApp' => 'Дозволити рецензію/затвердження<br/>користувачами, авторизованими у системі',
 'settings_enableSelfRevApp_desc' => 'Увімкніть для того, щоб користувачі, в даний момент авторизовані у системі, були в списку рецензентів/затверджувачів і в зміні процесу.',
 'settings_enableSessionList' => '',
@@ -1549,9 +1556,12 @@ URL: [url]',
 'timeline_add_version' => 'Нова версія [version]',
 'timeline_full_add_file' => '[document]<br />Новий Додаток',
 'timeline_full_add_version' => '[document]<br />Нова версія [version]',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => '[document]<br />Версія [version]: [status]',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => 'Обраний документ',
 'timeline_skip_add_file' => 'додаток додано',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'відхилений',
 'timeline_skip_status_change_-3' => 'термін виконання вийшов',
 'timeline_skip_status_change_0' => 'очікує рецензії',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 37ea45582..040eba262 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 (733), archonwang (469), fengjohn (5)
+//    Translators: Admin (736), archonwang (469), fengjohn (5)
 
 $text = array(
 '2_factor_auth' => '双重认证',
@@ -136,6 +136,7 @@ URL: [url]',
 'archive_creation_warning' => '通过此操作您可以创建一个包含这个DMS(文档管理系统)的数据文件夹。之后，所有文档都将保存到您服务器的数据文件夹中.<br>警告:如果所创建文档名为非数字的，那么将在服务器备份中不可用',
 'ar_EG' => '阿拉伯语',
 'assign_approvers' => '指派审核人',
+'assign_recipients' => '',
 'assign_reviewers' => '指派校对人',
 'assign_user_property_to' => '分配用户属性给',
 'assumed_released' => '假定发布',
@@ -331,6 +332,7 @@ URL: [url]',
 'documents_to_review' => '待您校对的文档',
 'documents_to_revise' => '',
 'documents_user_expiration' => '',
+'documents_user_no_reception' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '已拒绝的文档',
 'documents_user_requiring_attention' => '需您关注的文档',
@@ -597,6 +599,7 @@ URL: [url]',
 'index_waiting' => '',
 'individuals' => '个人',
 'indivіduals_in_groups' => '组成员',
+'info_recipients_tab_not_released' => '',
 'inherited' => '继承',
 'inherits_access_copy_msg' => '复制继承访问权限列表',
 'inherits_access_empty_msg' => '从访问权限空列表开始',
@@ -1183,6 +1186,8 @@ URL: [url]',
 'settings_enableDuplicateDocNames_desc' => '',
 'settings_enableEmail' => '开启邮件',
 'settings_enableEmail_desc' => '开启/关闭邮件自动提醒',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => '开启目录树',
 'settings_enableFolderTree_desc' => '在【查看文件夹】页面上，启用/禁用文件夹树',
 'settings_enableFullSearch' => '允许全文搜索',
@@ -1217,6 +1222,8 @@ URL: [url]',
 'settings_enableRecursiveCount_desc' => '',
 'settings_enableRevisionWorkflow' => '启用文档修订记录',
 'settings_enableRevisionWorkflow_desc' => '',
+'settings_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
 'settings_enableSessionList' => '在菜单中启用在线用户列表',
@@ -1532,9 +1539,12 @@ URL: [url]',
 'timeline_add_version' => '新建版本 [version]',
 'timeline_full_add_file' => '[document]<br />新建附件',
 'timeline_full_add_version' => '[document]<br /> 新建版本 [version]',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => '[document]<br />版本[version]: [status]',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => '已选择文档',
 'timeline_skip_add_file' => '添加附件',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => '拒绝',
 'timeline_skip_status_change_-3' => '过期',
 'timeline_skip_status_change_0' => '待审核',
@@ -1548,12 +1558,12 @@ URL: [url]',
 'toggle_manager' => '角色切换',
 'toggle_qrcode' => '显示/隐藏 QR 码',
 'to_before_from' => '结束日期不能早于开始日期',
-'transfer_document' => '',
+'transfer_document' => '共享文档',
 'transfer_no_read_access' => '',
-'transfer_no_write_access' => '',
+'transfer_no_write_access' => '当前用户没有文件夹写入权限',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
-'transfer_to_user' => '',
+'transfer_to_user' => '共享给其他用户',
 'transition_triggered_email' => '',
 'transition_triggered_email_body' => '',
 'transition_triggered_email_subject' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 40f9cc810..5caff7143 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -119,6 +119,7 @@ URL: [url]',
 'archive_creation_warning' => '通過此操作您可以創建一個包含這個DMS(文檔管理系統)的資料檔案夾。之後，所有文檔都將保存到您伺服器的資料檔案夾中.<br>警告:如果所創建文檔名為非數字的，那麼將在伺服器備份中不可用',
 'ar_EG' => '阿拉伯語',
 'assign_approvers' => '指派審核人',
+'assign_recipients' => '',
 'assign_reviewers' => '指派校對人',
 'assign_user_property_to' => '分配使用者屬性給',
 'assumed_released' => '假定發佈',
@@ -312,6 +313,7 @@ URL: [url]',
 'documents_to_review' => '待您校對的文檔',
 'documents_to_revise' => '',
 'documents_user_expiration' => '',
+'documents_user_no_reception' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => '需您關注的文檔',
@@ -522,6 +524,7 @@ URL: [url]',
 'index_waiting' => '',
 'individuals' => '個人',
 'indivіduals_in_groups' => '',
+'info_recipients_tab_not_released' => '',
 'inherited' => '繼承',
 'inherits_access_copy_msg' => '複製繼承存取權限列表',
 'inherits_access_empty_msg' => '從存取權限空列表開始',
@@ -1032,6 +1035,8 @@ URL: [url]',
 'settings_enableDuplicateDocNames_desc' => '',
 'settings_enableEmail' => '',
 'settings_enableEmail_desc' => '',
+'settings_enableFilterReceipt' => '',
+'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => '',
 'settings_enableFolderTree_desc' => '',
 'settings_enableFullSearch' => '',
@@ -1066,6 +1071,8 @@ URL: [url]',
 'settings_enableRecursiveCount_desc' => '',
 'settings_enableRevisionWorkflow' => '',
 'settings_enableRevisionWorkflow_desc' => '',
+'settings_enableSelfReceipt' => '',
+'settings_enableSelfReceipt_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
 'settings_enableSessionList' => '',
@@ -1381,9 +1388,12 @@ URL: [url]',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
+'timeline_full_scheduled_revision' => '',
 'timeline_full_status_change' => '',
+'timeline_scheduled_revision' => '',
 'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
+'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
 'timeline_skip_status_change_0' => '',

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 247/308] 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 12dddf698c8c94abd9006b086ba43774c7a03eae Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Jan 2018 10:43:51 +0100
Subject: [PATCH 248/308] animate button to load more objects

---
 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 0e0bce9fd..70e899051 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -99,6 +99,8 @@ function folderSelected(id, name) {
 function loadMoreObjects(element, limit) {
 	if(!$(element).is(":visible"))
 		return;
+	element.text('<?= getMLText('more_objects_loading') ?>');
+	element.prop("disabled",true);
 	var folder = element.data('folder')
 	var offset = element.data('offset')
 //	var limit = element.data('limit')
@@ -115,6 +117,7 @@ function loadMoreObjects(element, limit) {
 				var str = '<?= getMLText('x_more_objects') ?>';
 				element.text(str.replace('[number]', data.count));
 				element.data('offset', offset+limit);
+				element.prop("disabled",false);
 			}
 		}
 	});

From 8612e4aebd672bbec73a8e8a33601ac037ed659e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Jan 2018 10:44:29 +0100
Subject: [PATCH 249/308] some updates

---
 languages/ar_EG/lang.inc |  1 +
 languages/bg_BG/lang.inc |  1 +
 languages/ca_ES/lang.inc |  1 +
 languages/cs_CZ/lang.inc |  7 ++++---
 languages/de_DE/lang.inc |  3 ++-
 languages/el_GR/lang.inc |  1 +
 languages/en_GB/lang.inc |  3 ++-
 languages/es_ES/lang.inc |  5 +++--
 languages/fr_FR/lang.inc |  5 +++--
 languages/hr_HR/lang.inc |  1 +
 languages/hu_HU/lang.inc |  1 +
 languages/it_IT/lang.inc | 29 +++++++++++++++--------------
 languages/ko_KR/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 |  1 +
 languages/sk_SK/lang.inc |  1 +
 languages/sv_SE/lang.inc |  1 +
 languages/tr_TR/lang.inc |  1 +
 languages/uk_UA/lang.inc |  1 +
 languages/zh_CN/lang.inc |  5 +++--
 languages/zh_TW/lang.inc |  1 +
 24 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index a909de2fb..bd329f754 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -709,6 +709,7 @@ URL: [url]',
 'monday_abbr' => 'ن',
 'monthly' => 'شهريا',
 'month_view' => 'عرض الشهر',
+'more_objects_loading' => '',
 'move' => 'تحريك',
 'move_clipboard' => '',
 'move_document' => 'تحريك مستند',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 8da4ea086..8c5ba855a 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -640,6 +640,7 @@ $text = array(
 'monday_abbr' => '',
 'monthly' => 'Ежемесечно',
 'month_view' => 'Месечен изглед',
+'more_objects_loading' => '',
 'move' => 'Премести',
 'move_clipboard' => '',
 'move_document' => 'Премести документ',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 3257f4eab..0fc5651fb 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -645,6 +645,7 @@ URL: [url]',
 'monday_abbr' => '',
 'monthly' => 'Monthly',
 'month_view' => 'Vista de mes',
+'more_objects_loading' => '',
 'move' => 'Moure',
 'move_clipboard' => '',
 'move_document' => 'Moure document',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index bbc418052..4773d08be 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 (735), kreml (455)
+//    Translators: Admin (737), kreml (455)
 
 $text = array(
 '2_factor_auth' => '',
@@ -716,6 +716,7 @@ URL: [url]',
 'monday_abbr' => 'Po',
 'monthly' => 'Měsíčně',
 'month_view' => 'Zobrazení měsíce',
+'more_objects_loading' => '',
 'move' => 'Přesunout',
 'move_clipboard' => 'Přesun schránky',
 'move_document' => 'Přesunout dokument',
@@ -867,7 +868,7 @@ Pokud budete mít problém s přihlášením i po změně hesla, kontaktujte Adm
 'preview_plain' => '',
 'previous_state' => 'Předchozí stav',
 'previous_versions' => 'Předešlé verze',
-'process' => '',
+'process' => 'Proces',
 'process_without_user_group' => '',
 'pt_BR' => 'Portugalština (BR)',
 'quota' => 'Kvóta',
@@ -1611,7 +1612,7 @@ URL: [url]',
 'uploading_zerosize' => 'Nahrávání prázdného souboru. Nahrání zrušeno.',
 'used_discspace' => 'Použité místo na disku',
 'user' => 'Uživatel',
-'userid_groupid' => '',
+'userid_groupid' => 'ID uživatel/ID skupiny',
 'users' => 'Uživatel',
 'users_and_groups' => 'Uživatelé/Skupiny',
 'users_done_work' => 'Uživatel ukončil práci',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 33dbc26a7..b34267d87 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 (2518), dgrutsch (22)
+//    Translators: Admin (2519), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -732,6 +732,7 @@ URL: [url]',
 'monday_abbr' => 'Mo',
 'monthly' => 'monatlich',
 'month_view' => 'Monatsansicht',
+'more_objects_loading' => 'Weitere Objekte werden geladen ...',
 'move' => 'Verschieben',
 'move_clipboard' => 'Zwischenablage in Ordner verschieben',
 'move_document' => 'Verschieben',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index cf819995a..8ba49be74 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -640,6 +640,7 @@ $text = array(
 'monday_abbr' => 'Δε',
 'monthly' => 'Μηνιαία',
 'month_view' => '',
+'more_objects_loading' => '',
 'move' => 'Μετακίνηση',
 'move_clipboard' => '',
 'move_document' => 'Μετακίνηση εγγράφου',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 51d5b1629..01960ede1 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 (1643), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1644), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -733,6 +733,7 @@ URL: [url]',
 'monday_abbr' => 'Mo',
 'monthly' => 'Monthly',
 'month_view' => 'Month view',
+'more_objects_loading' => 'More objects loading ...',
 'move' => 'Move',
 'move_clipboard' => 'Move clipboard',
 'move_document' => 'Move document',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index f1aeb8e05..536bb5f54 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 (1052), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1053), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -716,6 +716,7 @@ URL: [url]',
 'monday_abbr' => 'L',
 'monthly' => 'Mensual',
 'month_view' => 'Vista del Mes',
+'more_objects_loading' => '',
 'move' => 'Mover',
 'move_clipboard' => 'Mover portapaprles',
 'move_document' => 'Mover documento',
@@ -1681,7 +1682,7 @@ URL: [url]',
 'workflow_summary' => 'Resumen Flujo de Trabajo',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Resumen Usuario',
-'x_more_objects' => '',
+'x_more_objects' => '[number] más objetos',
 'year_view' => 'Vista del año',
 'yes' => 'Sí',
 'zh_CN' => 'Chino (CN)',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index a409989c1..3eb0f2879 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 (1069), jeromerobert (50), lonnnew (9), Oudiceval (477)
+//    Translators: Admin (1070), jeromerobert (50), lonnnew (9), Oudiceval (477)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -728,6 +728,7 @@ URL: [url]',
 'monday_abbr' => 'Lun.',
 'monthly' => 'Mensuel',
 'month_view' => 'Vue par mois',
+'more_objects_loading' => '',
 'move' => 'Déplacer',
 'move_clipboard' => 'Déplacer le contenu du presse-papier',
 'move_document' => 'Déplacer le document',
@@ -1703,7 +1704,7 @@ URL: [url]',
 'workflow_summary' => 'Vue d’ensemble du workflow',
 'workflow_transition_without_user_group' => 'Au moins une transition a ni utilisateur, ni groupe !',
 'workflow_user_summary' => 'Vue d’ensemble de l’utilisateur',
-'x_more_objects' => 'éléments supplémentaires',
+'x_more_objects' => '[number] objets supplémentaires',
 'year_view' => 'Vue annuelle',
 'yes' => 'Oui',
 'zh_CN' => 'Chinois (CN)',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 838c1e1fd..1596dadaa 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -721,6 +721,7 @@ Internet poveznica: [url]',
 'monday_abbr' => 'Po',
 'monthly' => 'Mjesečno',
 'month_view' => 'Pregled po mjesecu',
+'more_objects_loading' => '',
 'move' => 'Premjesti',
 'move_clipboard' => 'Premjesti međuspremnik',
 'move_document' => 'Premjesti dokument',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 7998c7f78..a9ddfe7f8 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -716,6 +716,7 @@ URL: [url]',
 'monday_abbr' => 'Hé',
 'monthly' => 'Havi',
 'month_view' => 'Havi nézet',
+'more_objects_loading' => '',
 'move' => 'Áthelyez',
 'move_clipboard' => 'Vágólapra helyez',
 'move_document' => 'Dokumentum áthelyezése',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index dd383cb9d..cbf60d1bf 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 (1574), rickr (144), s.pnt (26)
+//    Translators: Admin (1587), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -480,7 +480,7 @@ URL: [url]',
 'exclude_items' => 'Escludi Elementi',
 'expired' => 'Scaduto',
 'expired_at_date' => '',
-'expired_documents' => '',
+'expired_documents' => 'Documenti scaduti',
 'expires' => 'Scadenza',
 'expire_by_date' => 'Scadenza per Data',
 'expire_in_1d' => '',
@@ -722,6 +722,7 @@ URL: [url]',
 'monday_abbr' => 'Lun',
 'monthly' => 'Mensile',
 'month_view' => 'Vista mensile',
+'more_objects_loading' => '',
 'move' => 'Sposta',
 'move_clipboard' => 'Sposta appunti',
 'move_document' => 'Sposta documento',
@@ -871,7 +872,7 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di
 'preset_expires' => 'Scadenza preimpostata',
 'preview' => 'Anteprima',
 'preview_converters' => 'Anteprima convesione documento',
-'preview_images' => '',
+'preview_images' => 'Immagini di anteprima',
 'preview_markdown' => 'Riduione ribasso',
 'preview_pdf' => '',
 'preview_plain' => 'Testo',
@@ -1233,7 +1234,7 @@ URL: [url]',
 'settings_enableMenuTasks' => 'Abilita compito delle attività nel menù',
 'settings_enableMenuTasks_desc' => 'Abilita / Disabilita la voce di menu che contiene tutte le attività degli utenti. Questo conterrà i documenti che devono essere rivisti, approvati, etc.',
 'settings_enableMultiUpload' => 'Consenti il caricamento di più files',
-'settings_enableMultiUpload_desc' => '',
+'settings_enableMultiUpload_desc' => 'Quando viene creato un nuovo documento, possono essere caricati più files. Ogniuno di essi genera un nuovo documento.',
 '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',
@@ -1254,7 +1255,7 @@ URL: [url]',
 'settings_enableSelfReceipt_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_enableSessionList' => '',
+'settings_enableSessionList' => 'Abilita lista utenti online nel menu',
 'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => 'Selezione tema grafico',
 'settings_enableThemeSelector_desc' => 'Abilita/disabilita il selettore di tema grafico nella finestra di login',
@@ -1293,8 +1294,8 @@ 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_incItemsPerPage' => '',
-'settings_incItemsPerPage_desc' => '',
+'settings_incItemsPerPage' => 'Numero di inserimenti caricati a fine pagina',
+'settings_incItemsPerPage_desc' => 'Se il numero di cartelle e documenti è stato limitato, questo imposterà il numero di ulteriori oggetti caricati allo scorrimento della pagina verso il basso nella pagina di visualizzazione. Impostare 0 significa caricare lo stesso numero di oggetti caricati inizialmente.',
 'settings_initialDocumentStatus' => 'Stato iniziale documento',
 'settings_initialDocumentStatus_desc' => 'Stato assegnato quando si aggiunge documento',
 'settings_initialDocumentStatus_draft' => 'Bozza',
@@ -1325,8 +1326,8 @@ URL: [url]',
 'settings_maxDirID_desc' => 'Numero massimo di sottocartelle contenibili in una cartella. Default: 0.',
 'settings_maxExecutionTime' => 'Tempo Max di esecuzione (s)',
 'settings_maxExecutionTime_desc' => 'Imposta il tempo limite per l\'esecuzione di uno script prima che il parser lo termini.',
-'settings_maxItemsPerPage' => '',
-'settings_maxItemsPerPage_desc' => '',
+'settings_maxItemsPerPage' => 'Numero massimo di inserimenti per pagina',
+'settings_maxItemsPerPage_desc' => 'Riduce numero di cartelle e documenti mostrati nell pagina di visualizzazione cartelle. Altri oggetti saranno caricati allo scorrimento verso la fine della pagina. Impostare 0 per visualizzare tutti gli elementi.',
 'settings_maxRecursiveCount' => 'Conteggio ricursivo Max di files e cartelle',
 'settings_maxRecursiveCount_desc' => 'Numero massimo di documenti e cartelle considerati dal conteggio ricursivo per il controllo dei diritti d\'accesso. Se tale valore dovesse essere superato, il risultato del conteggio sarà stimato.',
 'settings_maxSizeForFullText' => 'La lungeza massima del file per l\'indicizzazione istantanea',
@@ -1363,12 +1364,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => 'Tutti i nuovi documenti caricati avranno la data di scadenza impostata su questo valore. La data inserita può essere specificata nel formato accettato dalla funzione strtotime() di PHP, ad esempio +5 settimane.',
 'settings_previewWidthDetail' => 'Larghezza immagini di anteprima (dettagli)',
 'settings_previewWidthDetail_desc' => 'Larghezza delle immagini di anteprima mostrate nella pagina dei dettagli',
-'settings_previewWidthDropFolderList' => '',
-'settings_previewWidthDropFolderList_desc' => '',
+'settings_previewWidthDropFolderList' => 'Larghezza immagine di anteprima (lista cartella rilascio)',
+'settings_previewWidthDropFolderList_desc' => 'Larghezza immagine di anteprima mostrata nella lista, quando selezionato un file dalla cartella di rilascio',
 'settings_previewWidthList' => 'Larghezza delle immagini di anteprima (lista)',
 'settings_previewWidthList_desc' => 'Larghezza delle immagini di anteprima mostrate nella lista',
-'settings_previewWidthMenuList' => '',
-'settings_previewWidthMenuList_desc' => '',
+'settings_previewWidthMenuList' => 'Larghezza immagine di anteprima (lista menu)',
+'settings_previewWidthMenuList_desc' => 'Larghezza immagine di anteprima mostrata come articolo nel menu cartella di rilascio.',
 'settings_printDisclaimer' => 'Mostra disclaimer',
 'settings_printDisclaimer_desc' => 'Se abilitato il messaggio circa i termini e le condizioni d\'uso verrà mostrato nel pié di pagina.',
 'settings_quota' => 'Quota utente',
@@ -1556,7 +1557,7 @@ URL: [url]',
 'takeOverIndApprover' => 'Riprendi l\'approvatore dall\'ultima versione.',
 'takeOverIndReviewer' => 'Riprendi il revisore dall\'ultima versione.',
 'tasks' => 'Compiti',
-'temp_jscode' => '',
+'temp_jscode' => 'Codice javascript temporaneo',
 'testmail_body' => 'Questo messaggio di posta elettronica è solo un test per verificare la configurazione del repository',
 'testmail_subject' => 'Messaggio di test',
 'theme' => 'Tema',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index fcb380e14..d83f01ec1 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -722,6 +722,7 @@ URL: [url]',
 'monday_abbr' => '월',
 'monthly' => '월간',
 'month_view' => '월간 단위로 보기',
+'more_objects_loading' => '',
 'move' => '이동',
 'move_clipboard' => '이동 클립 보드',
 'move_document' => '문서 옮기기',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index fea2ee847..695ca44a5 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -721,6 +721,7 @@ URL: [url]',
 'monday_abbr' => 'ma',
 'monthly' => 'Maandelijks',
 'month_view' => 'Maandoverzicht',
+'more_objects_loading' => '',
 'move' => 'Verplaats',
 'move_clipboard' => 'Verplaats klembord',
 'move_document' => 'Verplaats document',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 7bf9a49d3..7358144b0 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -709,6 +709,7 @@ URL: [url]',
 'monday_abbr' => 'Pn.',
 'monthly' => 'Miesięcznie',
 'month_view' => 'Widok miesięczny',
+'more_objects_loading' => '',
 'move' => 'Przenieś',
 'move_clipboard' => 'Przenieś schowek',
 'move_document' => 'Przenieś dokument',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 8af195753..7909705d8 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -715,6 +715,7 @@ URL: [url]',
 'monday_abbr' => 'Mo',
 'monthly' => 'Mensal',
 'month_view' => 'Month view',
+'more_objects_loading' => '',
 'move' => 'Move',
 'move_clipboard' => 'Mover para memória auxiliar',
 'move_document' => 'Mover documento',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 1a3da5da3..24b134a9c 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -721,6 +721,7 @@ URL: [url]',
 'monday_abbr' => 'Lu',
 'monthly' => 'Lunar',
 'month_view' => 'Vizualizare lună',
+'more_objects_loading' => '',
 'move' => 'Mută',
 'move_clipboard' => 'Mută clipboard',
 'move_document' => 'Mută document',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 6ba5d115a..5c9798e06 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -721,6 +721,7 @@ URL: [url]',
 'monday_abbr' => 'Пн',
 'monthly' => 'Ежемесячно',
 'month_view' => 'Месяц',
+'more_objects_loading' => '',
 'move' => 'Переместить',
 'move_clipboard' => 'Переместить буфер обмена',
 'move_document' => 'Переместить документ',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 9aab03d18..979da1044 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -644,6 +644,7 @@ URL: [url]',
 'monday_abbr' => 'Po',
 'monthly' => 'Mesačne',
 'month_view' => 'Mesiac',
+'more_objects_loading' => '',
 'move' => 'Presunúť',
 'move_clipboard' => 'Presunúť schránku',
 'move_document' => 'Presunúť dokument',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index e5e5ae82d..0178bd49b 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -734,6 +734,7 @@ URL: [url]',
 'monday_abbr' => 'Må',
 'monthly' => 'Månadsvis',
 'month_view' => 'Månadsvy',
+'more_objects_loading' => '',
 'move' => 'Flytta',
 'move_clipboard' => 'Flytta urklipp',
 'move_document' => 'Flytta dokument',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 7d0773a07..01ddca0b2 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -715,6 +715,7 @@ URL: [url]',
 'monday_abbr' => 'Pzt',
 'monthly' => 'Aylık',
 'month_view' => 'Aylık görünüm',
+'more_objects_loading' => '',
 'move' => 'Taşı',
 'move_clipboard' => 'Panoyu taşı',
 'move_document' => 'Dokümanı taşı',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 7e3b90572..6c0947628 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -721,6 +721,7 @@ URL: [url]',
 'monday_abbr' => 'Пн',
 'monthly' => 'Щомісяця',
 'month_view' => 'Місяць',
+'more_objects_loading' => '',
 'move' => 'Перемістити',
 'move_clipboard' => 'Перемістити буфер обміну',
 'move_document' => 'Перемістити документ',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 040eba262..00e23ce94 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 (736), archonwang (469), fengjohn (5)
+//    Translators: Admin (737), archonwang (469), fengjohn (5)
 
 $text = array(
 '2_factor_auth' => '双重认证',
@@ -719,6 +719,7 @@ URL: [url]',
 'monday_abbr' => '',
 'monthly' => '月',
 'month_view' => '月视图',
+'more_objects_loading' => '',
 'move' => '移动',
 'move_clipboard' => '移动剪切板',
 'move_document' => '移动文档',
@@ -1677,7 +1678,7 @@ URL: [url]',
 'workflow_summary' => '工作流概述',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => '用户概述',
-'x_more_objects' => '',
+'x_more_objects' => '浏览更多',
 'year_view' => '年视图',
 'yes' => '是',
 'zh_CN' => '中文简体',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 5caff7143..617d8b06e 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -644,6 +644,7 @@ URL: [url]',
 'monday_abbr' => '',
 'monthly' => '',
 'month_view' => '月視圖',
+'more_objects_loading' => '',
 'move' => '移動',
 'move_clipboard' => '移動剪貼簿',
 'move_document' => '移動文檔',

From 996e0824f056687676be086bbe4bcd054b5dfe4b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Jan 2018 13:54:30 +0100
Subject: [PATCH 250/308] add item for 5.1.6

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

diff --git a/CHANGELOG b/CHANGELOG
index f0ef4294a..fdb66adef 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
   S_DRAFT_APP resp. S_DRAFT_REV
 - add preview for webm videos (Closes #374)
 - add support for apache mod_xsendfile, minor optimization of file download
+- animate button to download more objects in folder list which loading is active
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.5

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 251/308] 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 252/308] 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 253/308] 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 bd7c2eeddfe3e9a1b34b4f1294aa6e03b11cf53a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Jan 2018 19:09:01 +0100
Subject: [PATCH 254/308] no longer needed

---
 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 930a8b48f136279b3f9c44c1a1ff937dbdba87fa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Jan 2018 19:09:32 +0100
Subject: [PATCH 255/308] old changes file

---
 styles/changes.txt | 470 ---------------------------------------------
 1 file changed, 470 deletions(-)
 delete mode 100644 styles/changes.txt

diff --git a/styles/changes.txt b/styles/changes.txt
deleted file mode 100644
index 460c590f3..000000000
--- a/styles/changes.txt
+++ /dev/null
@@ -1,470 +0,0 @@
--------------------------------------------------------------------
-                     Changes in version 1.7.2
--------------------------------------------------------------------
-
-- Style Sheet modifications to improve IE6 compatibility, contributed by
-	Juan Lago (thanks Juan!). This fixes some placement issues with elements
-	that have the position attribute set to "absolute".
-
-- The div elements that are used to clear floats have been fixed so that they
-	have zero height in IE6. It is not enough to specify "height: 0"; one must
-	also set "font-size:0" otherwise IE6 will set the height of the element to
-	match the standard font size.
-
-- UI layout improvements. Various changes to the user interface to improve
-	the page flow and allow for further expansion in the future. The context
-	menu bar has been separated from the page heading into its own container
-	underneath the title. It's a more logical place to present the menu, and
-	will allow for the easy addition of further sub-headings in the future
-	without compromising the page flow.
-
-- The last dependency on the original theme system has been eliminated with
-	the introduction of updated chooser dialogues for selecting files and
-	folders. These dialogues have the new themes and the code has been revamped,
-	replacing the old table structures with unordered lists.
-
-- LDAP update. A minor change to the LDAP authentication code to allow for
-	the use of URIs to identify the server name (e.g. ldaps://host.com).
-	Also, the LDAP version is set to 3 in order to support secure connections.
-
-- New language translations for Czech and Slovak. Contributed by SF user
-	helix84 (thanks!).
-
-
--------------------------------------------------------------------
-                     Changes in version 1.7.1
--------------------------------------------------------------------
-
-- Re-vamped Notification system allows users to receive an email when a
-  document or folder is changed. This is a new, event-based mechanism that
-  notifies the user as soon as the change has been made and replaces the
-  cron mechanism originally developed. Any user that has read access to a
-  document or folder can subscribe to be notified of changes. Users that
-  have been assigned as reviewers or approvers for a document are
-  automatically added to the notification system for that document.
-
-  A new page has been created for users to assist with the management of
-  their notification subscriptions. This can be found in the "My Account"
-  section under "Notification List".
-
-- The test used to identify HTTPS connections has been improved so that it
-  correctly identifies IIS servers that have ISAPI enabled but are not
-  using HTTPS protocol.
-
-
--------------------------------------------------------------------
-                     Changes in version 1.7.0
--------------------------------------------------------------------
-
-- Fixes to CSS display bugs. Minor updates to the display.
-
-- Improved handling of character escape sequences.
-
-- Review / Approve dates added to folder views and search results.
-
-- New file system directory management code to accommodate limitations in the
-  underlying filesystem which restrict the number of files that MyDMS can
-  store. MyDMS now uses a nested directory structure to store files, rather
-  than a flat one. However, note that individual files are still stored one
-  per directory in order to preserve compatibility with older versions of
-  MyDMS.
-
-  For details of the problem and the solution implemented, please refer to:
-
-    http://mydms.sf.net/2007/08/15/new-file-system-storage-structure/
-
-- Hungarian translation.
-
-- And as a bonus, there is a Drupal theme compatible with MyDMS.
-
-
--------------------------------------------------------------------
-                     Changes in version 1.6.1
--------------------------------------------------------------------
-
-- Theme and language choice are now saved as user attributes between
-	sessions. Read update-1.6.1.txt for changes to database schema.
-
-- Link to document review / approval page from out.ViewDocument.php.
-
-- French translation.
-
-- Brazilian Portuguese translation.
-
-- Traditional Chinese translation.
-
-- Relaxation of criteria for selecting reviewers / approvers. Users now only
-	require read access to be eligible reviewers or approvers.
-
-- Documents are now displayed in the correct sequence in the folder view.
-
-- Documents can be downloaded directly from the folder view by clicking their
-	icon.
-
-- Document icons in the folder view now reflect the document type.
-
-- Empty passwords are not accepted, even when JS is disabled in the browser.
-
-- New restricted access mode rejects login from users who are not entered
-	into the internal database, even if LDAP authentication was successful.
-
-
--------------------------------------------------------------------
-                     Changes in version 1.6.0
--------------------------------------------------------------------		     
-
-- Introduction of a document workflow system that manages the life-cycle of a
-  document, including review and approval stages.
-
-	Details:
-
-	Document Class:
-		Created new methods:
-			Document::addIndReviewer()
-			Document::addGrpReviewer()
-			Document::addIndApprover()
-			Document::addGrpApprover()
-
-		Changes to:
-			Document::addContent()
-
-	New Class: Email.
-
-	out.AddDocument.php
-	op.AddDocument.php
-		Changes to allow selection of reviewers and approvers.
-
-	Group Class:
-		Changes to:
-			Group::getUsers() -- query optimised
-		New Methods:
-			Group::getReviewStatus()
-			Group::getApprovalStatus()
-
-	User Class:
-		New Methods:
-			User::getReviewStatus()
-			User::getApprovalStatus()
-
-	Class Folder:
-		Changes to:
-			Folder::addDocument() -- accept reviewers, approvers as parameters.
-
-	New Class: AddContentResultSet.
-
-	Database:
-		Document version field changed from TINYINT to unsigned SMALLINT throughout
-		database.
-		`tblGroupMembers`:
-			`id` field removed as it is unnecessary.
-			Created a primary of `groupID`, `userID`.
-
-	DocumentContent Class:
-		Created new methods:
-			DocumentContent::getStatus()
-			DocumentContent::getReviewStatus()
-			DocumentContent::getApprovalStatus()
-			DocumentContent::delIndReviewer()
-			DocumentContent::delGrpReviewer()
-			DocumentContent::delIndApprover()
-			DocumentContent::delGrpApprover()
-
-	out.ViewDocument.php
-	op.ViewDocument.php
-		Changes to incorporate display of workflow status.
-		Links to allow user to change status of a document revision.
-
-	out.UpdateDocument.php
-	op.UpdateDocument.php
-		Changes to allow selection of reviewers and approvers.
-
-	out.Login.php
-	op.Login.php
-		redirect user to originally requested URL upon successful login.
-
-	out.ReviewDocument.php
-	op.ReviewDocument.php
-	out.ApproveDocument.php
-	op.ApproveDocument.php
-		Created to enable users to review and approve documents.
-
-	out.OverrideContentStatus.php
-	op.OverrideContentStatus.php
-		Allows document owner or site administrator to override the status of a
-		document.
-
-	out.SetReviewersApprovers.php
-	op.SetReviewersApprovers.php
-		Allows document owner or site administrator to re-assign reviewers and
-		approvers to a document revision that is pending review or approval.
-
-	out.ActionSummary.php
-		Lists all the documents owned by current user that are pending review or
-		approval. Lists all documents that are awaiting review or approval by the
-		user.
-
-	Search page now allows user to search for documents pending review or
-	approval. Search results display overall document status.
-
-- Admin user cannot be deleted, and admin privilege cannot be removed from
-	the admin user. Previously, both actions were possible.
-
-- Users can be assigned administrative privileges in the User Manager.
-
-- Deleting document revisions or the document itself notifies all affected
-	users by email, deletes entries from all status logs.
-
-
--------------------------------------------------------------------
-                     Changes in version 1.5.1
--------------------------------------------------------------------		     
-
-- Fixed a bug in the keyword editing code which was preventing users from
-  adding default keywords into global keyword categories.
-
--------------------------------------------------------------------
-                     Changes in version 1.5.0
--------------------------------------------------------------------		     
-
-- Optimised search. Improved the performance of the search function by
-  placing more of the work on the database and by applying indexes to some of
-  the tables. Sub-folder searches are also dramatically improved due to the
-  incorporation of a folderList field in the tblDocuments table.
-
-- Optimised display. New compact theme significantly reduces the page load
-  times. This is the default theme. The original is still available as a
-  selection.
-
-- Changed file download headers such that downloading works with IE over SSL.
-
-- Changed all instances of $HTTP_COOKIES_VARS, which has been deprecated, to
-  $_COOKIE.
-
-- Replaced all short open tags (<?) with <?php tags, including <?= tags.
-
-- Removed the dependency upon register_globals.
-
-- Database: removed the id column from tblDocumentContent. Changed the
-  primary key to be (document, version) with the auto_increment on the
-  version field. This enables the database to automatically assign the next
-  appropriate version number to any new row inserted into the table without
-  having to explicitly look up the existing version value, increment the
-  result and store that as part of the insert statement. It guarantees that
-  there will be no conflicts or duplication of version numbers by
-  simultaneous inserts. The id field was not required as it was not used
-  anywhere except as a convenient identifier. It was easily replaced by
-  (document id, version).
-
-- Database: Moved the lock field into a separate table for managing locks.
-  Fixes a problem where it was possible, although unlikely, for two people to
-  simultaneously request a lock on a document.
-
-- The settings file, inc/inc.Settings.php, is renamed in the distribution to
-  inc/inc.Settings-sample.php. This is to avoid any existing settings being
-  deleted during an upgrade. To use MyDMS for the first time, users must now
-  copy (or move) this file to inc/inc.Settings.php and edit before
-  using MyDMS.
-
-
--------------------------------------------------------------------
-                     Changes in version 1.4.4
--------------------------------------------------------------------		     
-
-- All files released as GPL as license recommends.
-
-
--------------------------------------------------------------------
-                     Changes in Version 1.4.3
--------------------------------------------------------------------
-
-- Downloading document: fixed security bug 
-
--------------------------------------------------------------------
-                     Changes in Version 1.4.2
--------------------------------------------------------------------
-
-- SQL injection bug fixed
-
-
--------------------------------------------------------------------
-                     Changes in Version 1.4.1
--------------------------------------------------------------------
-
-- Security Bug fixed that allowed unauthorized users to view
-  documents
-
-
--------------------------------------------------------------------
-                     Changes in Version 1.4
--------------------------------------------------------------------
-
-- New interface for user- and group-administration
-
-- Delete old revisions
-
-- Folder- and document-chooser now show a collapsed tree by default
-
-- You can now prepare both personal and global lists of keywords and
-  insert them easily for your documents
-
-
--------------------------------------------------------------------
-                     Changes in Version 1.3.1
--------------------------------------------------------------------
-
-- Choose language and theme
-  Users can now choose their preferred language and theme on the
-  login-screen.
-
-- Split of language file
-  inc.Language.php has been splitted so that every language is
-  provided in its own file.
-
-- Added ADOdb
-  Due to ADOdb MyDMS is no longer limited to MySQL. Every database
-  that is supported by ADOdb can be used together with MyDMS
-
-- Admin-Tool: Overview of folders and documents
-  A tool that shows a list of all folders and documents together 
-  with the ACLs has been added. The section "admin-tools" will
-  become bigger in the next versions (import files etc).
-
-
--------------------------------------------------------------------
-                     Changes in Version 1.3.0
--------------------------------------------------------------------
-
-- New feature: Auto-Conversion to HTML
-  When uploading files they are now converted to HTML automatically.
-  So you can now even view Winword-files online with your favourite
-  browser.
-
-- Integrated themes
-  Themes (again: thanks to Marcel van Groenigen), which were only
-  available by a seperate download so far, are now fully integrated
-  into MyDMS.
-  I'm looking forward to MacOS X Themes :-)
-
-- Fixed bug: Search function
-  An error occured if no folder had been chosen. This has been fixed.
-
-
--------------------------------------------------------------------
-                     Changes in Version 1.2.1
--------------------------------------------------------------------
-
-- Improved searching functionality
-  MyDMS now offers you a lot more options to help you find exactly
-  what you were looking for.
-  This is only the first stop of improvement: Look forward to an
-  even more powerful search engine in the next versions :-)
-
-- Security-Bug: Session-ID
-  One could guess the session-id very easily, since it was only a
-  two digit number. This has been corrected so that it should now
-  be impossible to get illegal access this way.
-  Tip: Empty tblSessions once a day (by a cron-job for example).
-
-
--------------------------------------------------------------------
-                     Changes in Version 1.2.0
--------------------------------------------------------------------
-- Move documents and folders
-  If you have put folders or documents to the wrong place or just
-  want to re-organize the structure you can now easily move
-  documents and folders.
-
-- New languages
-  A Russian (thanks to Dmitri) and a Durch version (thanks to Andr�
-  Koot) are now available, too.
-
-- Upload-Bug
-  With certain configurations moving the temporary file of on upload
-  caused problems. MyDMS now uses the built-in move_uploaded_file()
-  function to prevent this error.
-
-
--------------------------------------------------------------------
-                         Changes in Version 1.1.2
--------------------------------------------------------------------
-
-- Sequence of Documents and Folders
-  One of the most wanted features has been realized: The user has
-  now full control of the sequence in which documents and folders
-  appear in the system.
-
-- Related Documents
-  Every documents now has a list of link to related documents.
-  There are two kinds of links: public and private ones; public
-  links can be seen by anyone, while private ones are only visible
-  to the user that created them.
-  Users with read-only access can only add private links, while
-  users with at least read-write access can decide which type of
-  link they want to add.
-  Private links can only be deleted by the user that has created
-  them while public links - no matter who created them - can be
-  deleted by all users with read-write access.
-
-- Fixed Bug: Delete documents
-  When deleting documents they were removed only from the database.
-  The files in the content-directory were kept.
-
-- Fixed Bug: View and download documents.
-  Very ling filenames (more than 70 characters) caused problems
-  with viewing and downloading of documents. By runnning the
-  db-update filenames with up to 150 characters are now possible.
-
-
--------------------------------------------------------------------
-                         Changes in Version 1.1.1
--------------------------------------------------------------------
-
-- Spanish translation
-  Eugenio Ramajo has completely translated MyDMS to Spanish
-
-- Disable guest-login
-  You can now disable the guest-login introduced in Version 1.1.0
-  by setting $_enableGuestLogin to false.
-
-- Confirmation for deletion
-  When deleting documents or folders you now have to confirm this
-  action to prevent you from accidentaly deleting important data.
-
-- Security improved
-  By manually changing the folder-ID in the URL it was possible to
-  "illegaly" show folders or documents (but downloading or viewing
-  the actual content was not possible).
-
-
--------------------------------------------------------------------
-                         Changes in Version 1.1.0
--------------------------------------------------------------------
-
-- Guest-Login
-  You can now choose to log-in as guest so that you can access your
-  documents more quickly. The guest user cannot be added to the ACLs.
-  So take care that the default access is at least "read" if you wish
-  to have access with the guest-user.
-  You cannot edit the guest-users's account.
-
-- Download documents more quickly
-  If you want to download the current version (or view it online) there
-  is no more need to scroll to the end of the document's page: Now there
-  is a button just on top of the site for downloading the current version.
-
-- Icons for Mime-Types
-  According to the document's MIME-type an additional icon is show.
-  (Icons from KDE3).
-
-- Correct filename when downloading
-  When downloading a file it was named data.[extension] up to know. This has
-  been replaced by the original filename.
-
-
--------------------------------------------------------------------
-                        Changes in Version 1.0.1
--------------------------------------------------------------------
-
-- if you had the GNU test-package installed on your machine, the function
-  getText() caused a fatal error. The problem was solved by renaming the
-  function.

From 24b3d4489112435139d7d6a234c3e9fe096c410f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Jan 2018 19:10:37 +0100
Subject: [PATCH 256/308] remove old print style

---
 styles/print.css | 339 -----------------------------------------------
 1 file changed, 339 deletions(-)
 delete mode 100644 styles/print.css

diff --git a/styles/print.css b/styles/print.css
deleted file mode 100644
index dc417e2b9..000000000
--- a/styles/print.css
+++ /dev/null
@@ -1,339 +0,0 @@
-/*    Copyright (C) 2010 Matteo Lucarelli
-*/
-
-body {
-	font-size: 72%;
-	font-family: sans-serif;	
-	background: #fff;
-}
-body.login {
-	width: 50%;
-	margin-left: auto;
-	margin-right: auto;
-}
-.headingContainer {
-	background:  #fff; 
-	position: relative;
-}
-/* IE6 Hack */
-* html .headingContainer {
-  position: relative;
-}
-.localNavContainer {
-	display:none;
-}
-
-.mimeicon{
-display:none;
-}
-
-.disclaimer{
-display:none;
-}
-
-.actions{
-display:none;
-}
-
-a{
-	color: #000;
-	text-decoration: none;
-}
-
-.mainHeading {
-	padding: 2px 4px 0px 4px;
-	font-size: 1.5em;
-	font-weight: bold;
-	color: black;
-	position: absolute;
-	bottom: 0px;
-	margin-left: 55px;
-}
-/* IE6 Hack */
-* html .mainHeading {
-  position: relative;
-}
-.contentHeading {
-	color: white;
-	padding: 2px 4px 2px 4px;
-	margin-top: 10px;
-	font-size: 1.2em;
-	font-weight: bold;
-	background: #555;
-}
-.contentSubHeading {
-	/*display:none;*/
-}
-.contentSubHeading#first {
-	margin-top: 0;
-	margin-bottom: 2px;
-}
-.siteName {
-	display: none;
-}
-.globalBox {
-	position: relative;
-	height: 4em;
-}
-
-/* IE6 Hack */
-* html .globalBox {
-  position: relative;
-}
-
-.globalBox#noNav {
-	height: 4em;
-}
-.globalBox div#signatory {
-	display:none;
-}
-
-/* IE6 Hack */
-* html .globalBox div#signatory {
-  position: relative;
-}
-
-.globalNav {
-	display:none;
-}
-
-.tree {
-	display:none;
-}
-
-/* IE6 Hack */
-* html .globalNav {
-  position: relative;
-}
-
-.globalNav li {
-	display: inline;
-	padding: 0px 4px 0px 4px;
-	border-left: 1px solid;
- }
-.globalNav li#first {
-	border-left: none;
-	padding: 0px 4px 0px 0px;
-}
-
-form{
-	display: none;
-}
-
-.globalNav li form {
-	display: none;
-}
-.globalNav li input {
-	font-size: 0.8em;
-	border: 1px solid;
-	padding: 1px;
-}
-.globalNav li input#searchButton {
-	border-left:0;
-	padding: 0px;
-}
-.localNav {
-	padding:1px;
-	margin: 0px;
-	margin-top: 3px;
-	text-align: left;
-	list-style-type: none;
-	color: white;
-	text-transform: uppercase;
-}
-.localNav li {
-	font-size: 0.8em;
-	display: inline;
-	padding: 2px 4px 2px 4px;
-	border: 1px solid #fff;
-}
-
-.globalTR {
-	float: right;
-	width: 8px;
-	height: 8px;
-}
-.smallText {
-	font-size: 0.8em;
-}
-.contentContainer {
-	padding: 0px;
-	width: 100%;
-	margin: auto;
-}
-.content {
-	background-color: white;
-	padding: 0;
-	border-top: 1px solid #e0e0e0;
-}
-.content-l {
-}
-.content-r {
-}
-.content-br {
-}
-.content-bl {
-	padding: 0.6em 1em;
-}
-.content input, .content select {
-	font-size: 0.8em;
-}
-
-.content textarea {
-	border: 1px solid;
-	font-family: sans-serif;
-	font-size: 1.0em;
-}
-td {
-	vertical-align: top;
-}
-table.folderView {
-	border-collapse: collapse;
-	width: 100%;
-}
-table.folderView thead tr {
-	border-bottom: 1px solid rgb(189, 190, 192);
-}
-table.folderView th, table.folderView td {
-	padding: 0.1em 0.4em;
-}
-table.folderView th {
-	text-align: left;
-}
-table.folderView td {
-	border-bottom: 1px solid rgb(224, 224, 224);
-}
-table.folderView td.center {
-	text-align: center;
-}
-table.folderView tr.folder {
-	border-bottom: 1px solid rgb(224, 224, 224);
-}
-table.defaultView {
-	border-collapse: collapse;
-}
-table.defaultView thead tr {
-	border-bottom: 1px solid rgb(189, 190, 192);
-}
-table.defaultView th, table.defaultView td {
-	padding: 0.1em 0.4em;
-}
-table.defaultView th {
-	text-align: left;
-}
-table.defaultView td {
-	border-bottom: 1px solid rgb(224, 224, 224);
-}
-table.defaultView td.center {
-	text-align: center;
-}
-table.defaultView tr.folder {
-	border-bottom: 1px solid rgb(224, 224, 224);
-}
-td#userImage {
-	border: 1px solid rgb(189, 190, 192);
-}
-img.userImage {
-	height: 72px;
-}
-img.mimeicon {
-	height: 18px;
-	vertical-align: middle;
-	border: none;
-}
-img.treeicon {
-	border: none;
-	padding-right: 0.1em;
-}
-input.mimeicon {
-	height: 18px;
-	vertical-align: middle;
-	border: none;
-}
-ul.reviewer {
-	padding: 0;
-	margin: 0;
-}
-ul.reviewer li {
-	list-style: none;
-	padding: 0.1em 0em;
-	border-top: 1px solid rgb(163, 184, 203);
-}
-ul.reviewer li.first {
-	border-top: none;
-}
-ul.actions {
-	padding: 0;
-	margin: 0;
-}
-ul.actions li {
-	list-style: none;
-	padding: 0 0 0.1em 0;
-}
-ul.actions li.first {
-	border-top: none;
-}
-ul.documentDetail {
-	margin: 0;
-	padding:0;
-	font-size: 0.8em;
-	list-style:none;
-}
-
-.cbSelectTitle {
-	float:left;
-	width: 6em;
-}
-.cbSelectContainer {
-	overflow:auto;
-	height: 8em;
-	border: 1px solid;
-	padding: 0.2em 0;
-	margin: 0.2em 0;
-}
-.cbSelectContainer.empty {
-	height: 1em;
-}
-.cbSelectList {
-	padding: 0.1em;
-}
-.cbSelectItem {
-	list-style-type: none;
-}
-ul.pageList {
-	list-style-type: none;
-	padding: 0px;
-	margin: 1.5em 0 0 0;
-	text-align: center;
-}
-ul.pageList li {
-	display:inline;
-	margin: 0 0.2em;
-	font-weight: bold;
-}
-ul.pageList li#first {
-	margin-left: 0;
-	font-weight: normal;
-}
-/*
- * I rather foolishly decided to have the title of the page exist at the
- * bottom of the containing DIV element. This means using absolute
- * positioning in order to get the desired effect in a way that is consistent.
- * However, this causes problems when the fonts are scaled as overlap can
- * occur with other elements, leading to unclean layout (since absolute
- * positioning removes the element from the document flow). My solution is to
- * place an empty element in the page directly before the title that remains
- * in the document flow. This fakes a margin around the title.
- * I've also applied this to the login form in the global navigation section.
- */
-span.absSpacerNorm {
-  display: none;
-}
-
-span.absSpacerTitle {
-  display: none;
-}
-
-.footNote {
-	display:none;
-}

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 257/308] 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 258/308] 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 1ae8f580551c33e711787f4a1603c5b66e7d9415 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Jan 2018 09:06:48 +0100
Subject: [PATCH 259/308] set converters as set in configuration (Closes #389)

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

diff --git a/op/op.Preview.php b/op/op.Preview.php
index 76eba3781..488555945 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)) {
 	if(!$previewer->createPreview($object)) {
 	}

From 483272e32bf95aa6aae8b579ae5e3523f35e0da8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Jan 2018 09:08:40 +0100
Subject: [PATCH 260/308] add item for 5.1.6

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

diff --git a/CHANGELOG b/CHANGELOG
index fdb66adef..8e416023d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@
 - add preview for webm videos (Closes #374)
 - add support for apache mod_xsendfile, minor optimization of file download
 - animate button to download more objects in folder list which loading is active
+- use converters for creating preview images as configured in settings (Closes #389)
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.5

From beb29ca34e92a5bf7afd586169b28dabf0dd0955 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Jan 2018 09:18:24 +0100
Subject: [PATCH 261/308] propperly check if user exists in database (Closes
 #388)

---
 inc/inc.ClassLdapAuthentication.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassLdapAuthentication.php b/inc/inc.ClassLdapAuthentication.php
index 93d5d6169..cd301ec2a 100644
--- a/inc/inc.ClassLdapAuthentication.php
+++ b/inc/inc.ClassLdapAuthentication.php
@@ -125,11 +125,15 @@ class SeedDMS_LdapAuthentication extends SeedDMS_Authentication {
 			/* No do the actual authentication of the user */
 			$bind = @ldap_bind($ds, $dn, $password);
 			$user = $dms->getUserByLogin($username);
+			if($user === false) {
+				ldap_close($ds);
+				return false;
+			}
 			if ($bind) {
 				// Successfully authenticated. Now check to see if the user exists within
 				// the database. If not, add them in if _restricted is not set,
 				// but do not add their password.
-				if (is_bool($user) && !$settings->_restricted) {
+				if (is_null($user) && !$settings->_restricted) {
 					// Retrieve the user's LDAP information.
 					if (isset($settings->_ldapFilter) && strlen($settings->_ldapFilter) > 0) {
 						$search = ldap_search($ds, $settings->_ldapBaseDN, "(&(".$ldapSearchAttribut.$username.")".$settings->_ldapFilter.")");

From 11ae4f1d79c5d34d2c89fa91d128db2c575852e5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Jan 2018 09:25:49 +0100
Subject: [PATCH 262/308] add item for 5.1.6

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

diff --git a/CHANGELOG b/CHANGELOG
index 8e416023d..96cf1f921 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@
 - add support for apache mod_xsendfile, minor optimization of file download
 - animate button to download more objects in folder list which loading is active
 - use converters for creating preview images as configured in settings (Closes #389)
+- propperly check if user is already in database when doing ldap auth (Closes #388)
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.5

From 6dc4611f04f8bfbfbea8e2c9a5df96d0e83c219e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Jan 2018 16:26:28 +0100
Subject: [PATCH 263/308] add x-msvideo as previewable video

---
 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 69a3ea203..74c93d11a 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -358,6 +358,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				break;
 			case 'video/webm':
 			case 'video/mp4':
+			case 'video/x-msvideo':
 				$this->contentHeading(getMLText("preview"));
 	?>
 			<video controls style="width: 100%;">

From 07dc8b01182cad6d2a873390ecfbafc37e64abb2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 26 Jan 2018 18:51:59 +0100
Subject: [PATCH 264/308] list linked documents in the same way as in regular
 document list

---
 views/bootstrap/class.ViewDocument.php | 101 +++++++++++--------------
 1 file changed, 43 insertions(+), 58 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 74c93d11a..787cf2900 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -189,6 +189,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			$this->printTimelineJs('out.ViewDocument.php?action=timelinedata&documentid='.$document->getID(), 300, '', date('Y-m-d'));
 		}
 		$this->printDocumentChooserJs("form1");
+		$this->printDeleteDocumentButtonJs();
 	} /* }}} */
 
 	function documentInfos() { /* {{{ */
@@ -422,6 +423,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 		$versions = $document->getContent();
 
+		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
 		$this->htmlAddHeader('<link href="../styles/'.$this->theme.'/timeline/timeline.css" rel="stylesheet">'."\n", 'css');
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/timeline/timeline-min.js"></script>'."\n", 'js');
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/timeline/timeline-locales.js"></script>'."\n", 'js');
@@ -1322,39 +1324,33 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		  </div>
 		  <div class="tab-pane <?php if($currenttab == 'links') echo 'active'; ?>" id="links">
 <?php
-		$this->contentContainerStart();
 		if (count($links) > 0) {
 
-			print "<table class=\"table table-condensed\">";
+			print "<table id=\"viewfolder-table\" class=\"table table-condensed table-hover\">";
 			print "<thead>\n<tr>\n";
-			print "<th></th>\n";
-			print "<th></th>\n";
-			print "<th>".getMLText("comment")."</th>\n";
-			print "<th></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 "<th></th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
 
 			foreach($links as $link) {
 				$responsibleUser = $link->getUser();
 				$targetDoc = $link->getTarget();
-				$targetlc = $targetDoc->getLatestContent();
 
-				$previewer->createPreview($targetlc, $previewwidthlist);
-				print "<tr>";
-				print "<td><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())."\">";
-				} else {
-					print "<img class=\"mimeicon\" width=\"".$previewwidthlist."\" src=\"".$this->getMimeIcon($targetlc->getFileType())."\" title=\"".htmlspecialchars($targetlc->getMimeType())."\">";
+				echo "<tr id=\"table-row-document-".$targetDoc->getId()."\" class=\"table-row-document\" rel=\"document_".$targetDoc->getId()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+				$targetDoc->verifyLastestContentExpriry();
+				$txt = $this->callHook('documentListItem', $targetDoc, $previewer, 'reverselinks');
+				if(is_string($txt))
+					echo $txt;
+				else {
+					echo $this->documentListRow($targetDoc, $previewer, true);
 				}
-				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());
+				print "<td><span class=\"actions\">";
+				print 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>";
@@ -1365,74 +1361,63 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		else printMLText("no_linked_files");
 
 		if (!$user->isGuest()){
+			$this->contentContainerStart();
 ?>
 			<br>
-			<form action="../op/op.AddDocumentLink.php" name="form1">
+			<form action="../op/op.AddDocumentLink.php" name="form1" class="form-inline">
 			<input type="hidden" name="documentid" value="<?php print $documentid;?>">
-			<table class="table-condensed">
-			<tr>
-			<td><?php printMLText("add_document_link");?>:</td>
-			<td><?php $this->printDocumentChooserHtml("form1");?></td>
-			</tr>
+			<?php printMLText("add_document_link");?>:
+			<?php $this->printDocumentChooserHtml("form1");?>
 			<?php
 			if ($document->getAccessMode($user) >= M_READWRITE) {
-				print "<tr><td>".getMLText("document_link_public")."</td>";
-				print "<td>";
+				print "<label class=\"checkbox\">";
 				print "<input type=\"checkbox\" name=\"public\" value=\"true\" checked />";
-				print "</td></tr>";
+				print getMLText("document_link_public");
+				print "</label>";
 			}
 ?>
-			<tr>
-			<td></td>
-			<td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button></td>
-			</tr>
-			</table>
+			<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
 			</form>
 <?php
+			$this->contentContainerEnd();
 		}
-		$this->contentContainerEnd();
 
 		if (count($reverselinks) > 0) {
 			$this->contentHeading(getMLText("reverse_links"));
-			$this->contentContainerStart();
+//			$this->contentContainerStart();
 
-			print "<table class=\"table table-condensed\">";
+			print "<table id=\"viewfolder-table\" class=\"table table-condensed table-hover\">";
 			print "<thead>\n<tr>\n";
-			print "<th></th>\n";
-			print "<th></th>\n";
-			print "<th>".getMLText("comment")."</th>\n";
-			print "<th></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 "<th></th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
 
 			foreach($reverselinks as $link) {
 				$responsibleUser = $link->getUser();
 				$sourceDoc = $link->getDocument();
-				$sourcelc = $sourceDoc->getLatestContent();
 
-				$previewer->createPreview($sourcelc, $previewwidthlist);
-				print "<tr>";
-				print "<td><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())."\">";
+				echo "<tr id=\"table-row-document-".$sourceDoc->getId()."\" class=\"table-row-document\" rel=\"document_".$sourceDoc->getId()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+				$sourceDoc->verifyLastestContentExpriry();
+				$txt = $this->callHook('documentListItem', $sourceDoc, $previewer, 'reverselinks');
+				if(is_string($txt))
+					echo $txt;
+				else {
+					echo $this->documentListRow($sourceDoc, $previewer, true);
 				}
-				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 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=\"".$sourceDoc->getId()."\" /><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();
+//			$this->contentContainerEnd();
 		}
 ?>
 			</div>

From 4a5a4e8196c429067b1eff8c5593b945f32fc0fe Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 26 Jan 2018 18:52:32 +0100
Subject: [PATCH 265/308] add item for 5.1.6

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

diff --git a/CHANGELOG b/CHANGELOG
index 96cf1f921..2816a7e7e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@
 - animate button to download more objects in folder list which loading is active
 - use converters for creating preview images as configured in settings (Closes #389)
 - propperly check if user is already in database when doing ldap auth (Closes #388)
+- list linked documents on the ViewDocument page in the way as in other document lists
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.5

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 266/308] 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 267/308] 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 268/308] 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 269/308] 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 270/308] 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 271/308] 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 272/308] 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 273/308] 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 0c5a1e2776f0ad4f0a94fa69574b6dcac9c7eb5f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 29 Jan 2018 11:42:10 +0100
Subject: [PATCH 274/308] fix wrong documentation in example extension (Closes
 #390)

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

diff --git a/ext/example/class.example.php b/ext/example/class.example.php
index d7d5bd42c..fce09e0b0 100644
--- a/ext/example/class.example.php
+++ b/ext/example/class.example.php
@@ -38,7 +38,7 @@ class SeedDMS_ExtExample extends SeedDMS_ExtBase {
 	 * Use this method to do some initialization like setting up the hooks
 	 * You have access to the following global variables:
 	 * $GLOBALS['settings'] : current global configuration
-	 * $GLOBALS['settings']['_extensions']['example'] : configuration of this extension
+	 * $GLOBALS['settings']->_extensions['example'] : configuration of this extension
 	 * $GLOBALS['LANG'] : the language array with translations for all languages
 	 * $GLOBALS['SEEDDMS_HOOKS'] : all hooks added so far
 	 */

From a47300be26ed3ad27bffa9df32b48ecccbf18c9d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jan 2018 06:26:54 +0100
Subject: [PATCH 275/308] execWithTimeout() also reads data from stderr

currently not evaluated but could be used to find errors when a
converter is called
---
 SeedDMS_Preview/Preview/Base.php      | 18 ++++++++++++------
 SeedDMS_Preview/Preview/Previewer.php | 21 ---------------------
 SeedDMS_Preview/package.xml           |  1 +
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/SeedDMS_Preview/Preview/Base.php b/SeedDMS_Preview/Preview/Base.php
index fe1ea8903..4d6b9cf1f 100644
--- a/SeedDMS_Preview/Preview/Base.php
+++ b/SeedDMS_Preview/Preview/Base.php
@@ -70,18 +70,24 @@ class SeedDMS_Preview_Base {
 		if (!is_resource($process)) {
 			throw new Exception("proc_open failed on: " . $cmd);
 		}
+		stream_set_blocking($pipes[1], 0);
+		stream_set_blocking($pipes[2], 0);
 
-		$output = '';
+		$output = $error = '';
 		$timeleft = $timeout - time();
-		$read = array($pipes[1]);
+		$read = array($pipes[1], $pipes[2]);
 		$write = NULL;
 		$exeptions = NULL;
 		do {
-			stream_select($read, $write, $exeptions, $timeleft, 200000);
+			$num_changed_streams = stream_select($read, $write, $exeptions, $timeleft, 200000);
 
-			if (!empty($read)) {
+			if ($num_changed_streams === false) {
+				proc_terminate($process);
+				throw new Exception("stream select failed on: " . $cmd);
+			} elseif ($num_changed_streams > 0) {
 				$output .= fread($pipes[1], 8192);
-													}
+				$error .= fread($pipes[2], 8192);
+			}
 			$timeleft = $timeout - time();
 		} while (!feof($pipes[1]) && $timeleft > 0);
 
@@ -89,7 +95,7 @@ class SeedDMS_Preview_Base {
 			proc_terminate($process);
 			throw new Exception("command timeout on: " . $cmd);
 		} else {
-			return $output;
+			return array('stdout'=>$output, 'stderr'=>$error);
 		}
 	} /* }}} */
 
diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index 68efc0f4e..b9ed617ac 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -115,27 +115,6 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
 				$cmd = str_replace(array('%w', '%f', '%o', '%m'), array($width, $infile, $target.'.png', $mimetype), $this->converters['*']);
 			}
 
-			/*
-			switch($mimetype) {
-				case "image/png":
-				case "image/gif":
-				case "image/jpeg":
-				case "image/jpg":
-				case "image/svg+xml":
-					$cmd = 'convert -resize '.$width.'x '.$infile.' '.$target.'.png';
-					break;
-				case "application/pdf":
-				case "application/postscript":
-					$cmd = 'convert -density 100 -resize '.$width.'x '.$infile.'[0] '.$target.'.png';
-					break;
-				case "text/plain":
-					$cmd = 'convert -resize '.$width.'x '.$infile.'[0] '.$target.'.png';
-					break;
-				case "application/x-compressed-tar":
-					$cmd = 'tar tzvf '.$infile.' | convert -density 100 -resize '.$width.'x text:-[0] '.$target.'.png';
-					break;
-			}
-			 */
 			if($cmd) {
 				try {
 					self::execWithTimeout($cmd, $this->timeout);
diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index 410ab1ef4..e446eaf34 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -25,6 +25,7 @@
  <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
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 3d168e427aa6a9bcc3af412f6a6a10ccf4afe586 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jan 2018 06:28:19 +0100
Subject: [PATCH 276/308] execWithTimeout() returns stderr, which is saved in
 error msg

---
 SeedDMS_Lucene/Lucene/IndexedDocument.php     | 38 +++++++++++++------
 .../SQLiteFTS/IndexedDocument.php             | 38 +++++++++++++------
 2 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/SeedDMS_Lucene/Lucene/IndexedDocument.php b/SeedDMS_Lucene/Lucene/IndexedDocument.php
index 32720007a..6e890cbed 100644
--- a/SeedDMS_Lucene/Lucene/IndexedDocument.php
+++ b/SeedDMS_Lucene/Lucene/IndexedDocument.php
@@ -24,6 +24,8 @@
  */
 class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 
+	protected $errormsg;
+
 	static function execWithTimeout($cmd, $timeout=2) { /* {{{ */
 		$descriptorspec = array(
 			0 => array("pipe", "r"),
@@ -37,17 +39,23 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 		if (!is_resource($process)) {
 			throw new Exception("proc_open failed on: " . $cmd);
 		}
+		stream_set_blocking($pipes[1], 0);
+		stream_set_blocking($pipes[2], 0);
 			 
-		$output = '';
+		$output = $error = '';
 		$timeleft = $timeout - time();
-		$read = array($pipes[1]);
+		$read = array($pipes[1], $pipes[2]);
 		$write = NULL;
 		$exeptions = NULL;
 		do {
-			stream_select($read, $write, $exeptions, $timeleft, 200000);
-					 
-			if (!empty($read)) {
+			$num_changed_streams = stream_select($read, $write, $exeptions, $timeleft, 200000);
+
+			if ($num_changed_streams === false) {
+				proc_terminate($process);
+				throw new Exception("stream select failed on: " . $cmd);
+			} elseif ($num_changed_streams > 0) {
 				$output .= fread($pipes[1], 8192);
+				$error .= fread($pipes[2], 8192);
 			}
 			$timeleft = $timeout - time();
 		} while (!feof($pipes[1]) && $timeleft > 0);
@@ -56,7 +64,7 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 			proc_terminate($process);
 			throw new Exception("command timeout on: " . $cmd);
 		} else {
-			return $output;
+			return array('stdout'=>$output, 'stderr'=>$error);
 		}
 	} /* }}} */
 
@@ -64,7 +72,8 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 	 * Constructor. Creates our indexable document and adds all
 	 * necessary fields to it using the passed in document
 	 */
-	public function __construct($dms, $document, $convcmd=null, $nocontent=false, $timeout=5) {
+	public function __construct($dms, $document, $convcmd=null, $nocontent=false, $timeout=5) { /* {{{ */
+		$this->errormsg = '';
 		$_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\'',
@@ -137,13 +146,20 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 			if($cmd) {
 				try {
 					$content = self::execWithTimeout($cmd, $timeout);
-					if($content) {
-						$this->addField(Zend_Search_Lucene_Field::UnStored('content', $content, 'utf-8'));
+					if($content['stdout']) {
+						$this->addField(Zend_Search_Lucene_Field::UnStored('content', $content['stdout'], 'utf-8'));
+					}
+					if($content['stderr']) {
+						$this->errormsg = $content['stderr'];
 					}
 				} catch (Exception $e) {
 				}
 			}
-		}
-	}
+		} 
+	} /* }}} */
+
+	public function getErrorMsg() { /* {{{ */
+		return $this->errormsg;
+	} /* }}} */
 }
 ?>
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
index 5a8e1cbfc..cf40b4a95 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
@@ -29,6 +29,8 @@ require_once('Document.php');
  */
 class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 
+	protected $errormsg;
+
 	static function execWithTimeout($cmd, $timeout=2) { /* {{{ */
 		$descriptorspec = array(
 			0 => array("pipe", "r"),
@@ -36,23 +38,29 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 			2 => array("pipe", "w")
 		);
 		$pipes = array();
-	 
+
 		$timeout += time();
 		$process = proc_open($cmd, $descriptorspec, $pipes);
 		if (!is_resource($process)) {
 			throw new Exception("proc_open failed on: " . $cmd);
 		}
+		stream_set_blocking($pipes[1], 0);
+		stream_set_blocking($pipes[2], 0);
 			 
-		$output = '';
+		$output = $error = '';
 		$timeleft = $timeout - time();
-		$read = array($pipes[1]);
+		$read = array($pipes[1], $pipes[2]);
 		$write = NULL;
 		$exeptions = NULL;
 		do {
-			stream_select($read, $write, $exeptions, $timeleft, 200000);
-					 
-			if (!empty($read)) {
+			$num_changed_streams = stream_select($read, $write, $exeptions, $timeleft, 200000);
+
+			if ($num_changed_streams === false) {
+				proc_terminate($process);
+				throw new Exception("stream select failed on: " . $cmd);
+			} elseif ($num_changed_streams > 0) {
 				$output .= fread($pipes[1], 8192);
+				$error .= fread($pipes[2], 8192);
 			}
 			$timeleft = $timeout - time();
 		} while (!feof($pipes[1]) && $timeleft > 0);
@@ -61,7 +69,7 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 			proc_terminate($process);
 			throw new Exception("command timeout on: " . $cmd);
 		} else {
-			return $output;
+			return array('stdout'=>$output, 'stderr'=>$error);
 		}
 	} /* }}} */
 
@@ -69,7 +77,8 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 	 * Constructor. Creates our indexable document and adds all
 	 * necessary fields to it using the passed in document
 	 */
-	public function __construct($dms, $document, $convcmd=null, $nocontent=false, $timeout=5) {
+	public function __construct($dms, $document, $convcmd=null, $nocontent=false, $timeout=5) { /* {{{ */
+		$this->errormsg = '';
 		$_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\'',
@@ -142,13 +151,20 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 			if($cmd) {
 				try {
 					$content = self::execWithTimeout($cmd, $timeout);
-					if($content) {
-						$this->addField('content', $content, 'unstored');
+					if($content['stdout']) {
+						$this->addField('content', $content['stdout'], 'unstored');
+					}
+					if($content['stderr']) {
+						$this->errormsg = $content['stderr'];
 					}
 				} catch (Exception $e) {
 				}
 			}
 		}
-	}
+	} /* }}} */
+
+	public function getErrorMsg() { /* {{{ */
+		return $this->errormsg;
+	} /* }}} */
 }
 ?>

From b03e4b23d25fe4941b03826eaf493d8f4944557c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jan 2018 06:29:22 +0100
Subject: [PATCH 277/308] new version 1.1.12

---
 SeedDMS_Lucene/package.xml | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Lucene/package.xml b/SeedDMS_Lucene/package.xml
index 4d1d826ca..f0dd0f558 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>2017-12-04</date>
+ <date>2018-01-30</date>
  <time>10:58:13</time>
  <version>
-  <release>1.1.11</release>
-  <api>1.1.11</api>
+  <release>1.1.12</release>
+  <api>1.1.12</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-allow conversion commands for mimetypes with wildcards
+execWithTimeout() reads data from stderr and saves it into error msg
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -267,5 +267,21 @@ make all functions in Indexer.php static
 catch exception in execWithTimeout()
    </notes>
   </release>
+  <release>
+   <date>2017-12-04</date>
+   <time>10:58:13</time>
+   <version>
+    <release>1.1.11</release>
+    <api>1.1.11</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+allow conversion commands for mimetypes with wildcards
+   </notes>
+  </release>
  </changelog>
 </package>

From a24b5617030d4aa9b043aad9c27e083c84fa75f2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jan 2018 06:29:38 +0100
Subject: [PATCH 278/308] new version 1.0.9

---
 SeedDMS_SQLiteFTS/package.xml | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml
index 89c93b4f4..f83232424 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>2017-12-04</date>
+ <date>2018-01-30</date>
  <time>11:00:40</time>
  <version>
-  <release>1.0.8</release>
-  <api>1.0.8</api>
+  <release>1.0.9</release>
+  <api>1.0.9</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-allow conversion commands for mimetypes with wildcards
+execWithTimeout() reads data from stderr and saves it into error msg
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -194,5 +194,21 @@ fix calculation of timeout (see bug #269)
 catch exception in execWithTimeout()
    </notes>
   </release>
+  <release>
+   <date>2017-12-04</date>
+   <time>11:00:40</time>
+   <version>
+    <release>1.0.8</release>
+    <api>1.0.8</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+allow conversion commands for mimetypes with wildcards
+   </notes>
+  </release>
  </changelog>
 </package>

From b147cfd6dc43e70277bddb27f66163635d1a6e87 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jan 2018 06:31:42 +0100
Subject: [PATCH 279/308] set timeout for error msg to 5000

---
 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 78e6bf93a..9c850df45 100644
--- a/views/bootstrap/class.Indexer.php
+++ b/views/bootstrap/class.Indexer.php
@@ -71,7 +71,7 @@ function check_queue() {
 					dismissQueue: true,
 					layout: 'topRight',
 					theme: 'defaultTheme',
-					timeout: 1500,
+					timeout: 5000,
 				});
 			},
 			success: function(data) {

From 94efc33ec5a9c253734461cb04f41325f3434372 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jan 2018 06:32:22 +0100
Subject: [PATCH 280/308] send error msg if indexing failed

the error is taken from stderr of the converter
---
 op/op.Ajax.php | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 61209da3c..f4ba8d96c 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -788,16 +788,22 @@ switch($command) {
 						if($index) {
 							$indexconf['Indexer']::init($settings->_stopWordsFile);
 							$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false, $settings->_cmdTimeout);
-							if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) {
-								foreach($GLOBALS['SEEDDMS_HOOKS']['indexDocument'] as $hookObj) {
-									if (method_exists($hookObj, 'preIndexDocument')) {
-										$hookObj->preIndexDocument(null, $document, $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, $document, $idoc);
+										}
 									}
 								}
+								$index->addDocument($idoc);
+								header('Content-Type: application/json');
+								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()));
 							}
-							$index->addDocument($idoc);
-							header('Content-Type: application/json');
-							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'=>getMLText('error_occured'), 'data'=>$document->getID()));

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 281/308] 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 282/308] 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 59dd1a915538a0747c27b1ddb8f384a8c8bf453a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jan 2018 07:21:26 +0100
Subject: [PATCH 283/308] minor corrections of form

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

diff --git a/views/bootstrap/class.ReviewDocument.php b/views/bootstrap/class.ReviewDocument.php
index ee7bce1ca..11c6ea31a 100644
--- a/views/bootstrap/class.ReviewDocument.php
+++ b/views/bootstrap/class.ReviewDocument.php
@@ -124,7 +124,7 @@ $(document).ready(function() {
 				print "<td>".htmlspecialchars($reviewStatus["comment"])."</td>";
 				$indUser = $dms->getUser($reviewStatus["userID"]);
 				print "<td>".$reviewStatus["date"]." - ". htmlspecialchars($indUser->getFullname()) ."</td>";
-				print "</tr></tbody></table><br>";
+				print "</tr></tbody></table><br>\n";
 			}
 ?>
 	<form method="post" action="../op/op.ReviewDocument.php" id="form1" name="form1" enctype="multipart/form-data">
@@ -143,7 +143,7 @@ $(document).ready(function() {
 			</td>
 		</tr>
 		<tr>
-			<td><?php printMLText("review_status")?></td>
+			<td><?php printMLText("review_status")?>:</td>
 			<td>
 				<select name="reviewStatus">
 <?php if($reviewStatus['status'] != 1) { ?>
@@ -165,9 +165,7 @@ $(document).ready(function() {
 	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
 	</form>
 <?php
-		}
-		else if ($reviewStatus['type'] == 1) {
-
+		} elseif ($reviewStatus['type'] == 1) {
 			if($reviewStatus["status"]!=0) {
 
 				print "<table class=\"folderView\"><thead><tr>";
@@ -183,7 +181,6 @@ $(document).ready(function() {
 				print "<td>".$reviewStatus["date"]." - ". htmlspecialchars($indUser->getFullname()) ."</td>";
 				print "</tr></tbody></table><br>\n";
 			}
-
 ?>
 	<form method="post" action="../op/op.ReviewDocument.php" id="form2" name="form2" enctype="multipart/form-data">
 	<?php echo createHiddenFieldWithKey('reviewdocument'); ?>

From 1a9c7c213d11d461386fbbc7ca46bc4b5c2c86b8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jan 2018 07:59:15 +0100
Subject: [PATCH 284/308] use same form for ind and grp

The two forms differ in just minor things which can easily be set by
a parameter
---
 views/bootstrap/class.ApproveDocument.php | 106 ++++---------
 views/bootstrap/class.ReviewDocument.php  | 183 ++++++++--------------
 2 files changed, 93 insertions(+), 196 deletions(-)

diff --git a/views/bootstrap/class.ApproveDocument.php b/views/bootstrap/class.ApproveDocument.php
index c55f06024..d9c739257 100644
--- a/views/bootstrap/class.ApproveDocument.php
+++ b/views/bootstrap/class.ApproveDocument.php
@@ -37,8 +37,8 @@ class SeedDMS_View_ApproveDocument extends SeedDMS_Bootstrap_Style {
 function checkIndForm()
 {
 	msg = new Array();
-	if (document.form1.approvalStatus.value == "") msg.push("<?php printMLText("js_no_approval_status");?>");
-	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
+	if (document.formind.approvalStatus.value == "") msg.push("<?php printMLText("js_no_approval_status");?>");
+	if (document.formind.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
 	if (msg != "") {
   	noty({
   		text: msg.join('<br />'),
@@ -56,9 +56,9 @@ function checkIndForm()
 function checkGrpForm()
 {
 	msg = new Array();
-//	if (document.form2.approvalGroup.value == "") msg.push("<?php printMLText("js_no_approval_group");?>");
-	if (document.form2.approvalStatus.value == "") msg.push("<?php printMLText("js_no_approval_status");?>");
-	if (document.form2.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
+//	if (document.formgrp.approvalGroup.value == "") msg.push("<?php printMLText("js_no_approval_group");?>");
+	if (document.formgrp.approvalStatus.value == "") msg.push("<?php printMLText("js_no_approval_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;
 		ev.preventDefault();
 	});
-	$('body').on('submit', '#form2', function(ev){
+	$('body').on('submit', '#formgrp', function(ev){
 		if(checkGrpForm()) return;
 		ev.preventDefault();
 	});
@@ -112,24 +112,24 @@ $(document).ready(function() {
 		$this->contentContainerStart();
 
 		// Display the Approval form.
-		if ($approvalStatus['type'] == 0) {
-			if($approvalStatus["status"]!=0) {
+		$approvaltype = ($approvalStatus['type'] == 0) ? 'ind' : 'grp';
+		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";
-			}
+			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" id="form1" name="form1" enctype="multipart/form-data">
+	<form method="POST" action="../op/op.ApproveDocument.php" id="form<?= $approvaltype ?>" name="form<?= $approvaltype ?>" enctype="multipart/form-data">
 	<?php echo createHiddenFieldWithKey('approvedocument'); ?>
 	<table>
 		<tr>
@@ -141,57 +141,6 @@ $(document).ready(function() {
 			<td>
 <?php
 	$this->printFileChooser('approvalfile', false);
-?>
-			</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' class="btn" 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" id="form2" name="form2" enctype="multipart/form-data">
-	<?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_file")?>:</td>
-			<td>
-<?php
-	$this->printFileChooser('approvalfile', false);
 ?>
 			</td>
 		</tr>
@@ -207,15 +156,16 @@ $(document).ready(function() {
 	</select>
 	</td></tr>
 	<tr><td></td><td>
+	<input type='submit' class="btn" name='<?= $approvaltype ?>Approval' value='<?php printMLText("submit_approval")?>'/></td></tr>
+	</table>
+	<input type='hidden' name='approvalType' value='<?= $approvaltype ?>'/>
+	<?php if($approvaltype == 'grp'): ?>
 	<input type='hidden' name='approvalGroup' value="<?php echo $approvalStatus['required']; ?>" />
-	<input type='hidden' name='approvalType' value='grp'/>
+	<?php endif; ?>
 	<input type='hidden' name='documentid' value='<?php echo $document->getId() ?>'/>
 	<input type='hidden' name='version' value='<?php echo $latestContent->getVersion(); ?>'/>
-	<input type='submit' class="btn" name='groupApproval' value='<?php printMLText("submit_approval")?>'/></td></tr>
-	</table>
 	</form>
 <?php
-		}
 
 		$this->contentContainerEnd();
 		$this->contentEnd();
diff --git a/views/bootstrap/class.ReviewDocument.php b/views/bootstrap/class.ReviewDocument.php
index 11c6ea31a..51dee6311 100644
--- a/views/bootstrap/class.ReviewDocument.php
+++ b/views/bootstrap/class.ReviewDocument.php
@@ -37,8 +37,8 @@ class SeedDMS_View_ReviewDocument extends SeedDMS_Bootstrap_Style {
 function checkIndForm()
 {
 	msg = new Array();
-	if (document.form1.reviewStatus.value == "") msg.push("<?php printMLText("js_no_review_status");?>");
-	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
+	if (document.formind.reviewStatus.value == "") msg.push("<?php printMLText("js_no_review_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_review_group");?>\n";
-	if (document.form2.reviewStatus.value == "") msg += "<?php printMLText("js_no_review_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_review_group");?>");
+	if (document.formgrp.reviewStatus.value == "") msg.push("<?php printMLText("js_no_review_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;
 		ev.preventDefault();
 	});
-	$('body').on('submit', '#form2', function(ev){
+	$('body').on('submit', '#formgrp', function(ev){
 		if(checkGrpForm()) return;
 		ev.preventDefault();
 	});
@@ -110,118 +110,65 @@ $(document).ready(function() {
 		$this->contentContainerStart();
 
 		// Display the Review form.
-		if ($reviewStatus['type'] == 0) {
-			if($reviewStatus["status"]!=0) {
+		$reviewtype = ($reviewStatus['type'] == 0) ? 'ind' : 'grp';
+		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" id="form1" name="form1" enctype="multipart/form-data">
-	<?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>
-				<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='submit' class="btn" name='indReview' value='<?php printMLText("submit_review")?>'/></td>
-		</tr>
-	</table>
-	<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() ?>'/>
-	</form>
-<?php
-		} elseif ($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" id="form2" name="form2" enctype="multipart/form-data">
-	<?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>
-				<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='submit' class="btn" name='groupReview' value='<?php printMLText("submit_review")?>'/></td>
-		</tr>
-	</table>
-	<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() ?>'/>
-	</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>";
+			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" id="form<?= $reviewtype ?>" name="form<?= $reviewtype ?>" enctype="multipart/form-data">
+	<?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>
+				<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='submit' class="btn" name='<?= $reviewtype ?>Review' value='<?php printMLText("submit_review")?>'/></td>
+		</tr>
+	</table>
+	<input type='hidden' name='reviewType' value='<?= $reviewtype ?>'/>
+	<?php if($reviewtype == 'grp'): ?>
+	<input type='hidden' name='reviewGroup' value='<?php echo $reviewStatus['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 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 285/308] 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 286/308] 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 287/308] 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 288/308] 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 289/308] 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 290/308] 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 291/308] 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 292/308] 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 293/308] 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 294/308] 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 295/308] 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 296/308] 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 297/308] 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 298/308] 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 299/308] 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 5a5cc99e68929a90d5c9f7b481338f8adf69b3ab Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 31 Jan 2018 21:20:13 +0100
Subject: [PATCH 300/308] 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 | 15 +++++++++------
 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/it_IT/lang.inc |  7 +++++--
 languages/ko_KR/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 |  7 +++++--
 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 +++
 24 files changed, 89 insertions(+), 17 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index bd329f754..10a6423fd 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -323,8 +323,10 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'مستندات في انتظار المراجعة',
 'documents_to_revise' => '',
+'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'مستندات ملكك تستلزم انتباهك',
@@ -1467,6 +1469,7 @@ URL: [url]',
 'status_approval_rejected' => 'مسودة مرفوضة',
 'status_approved' => 'تمت الموافقة',
 'status_approver_removed' => 'تم ازالة موافق من العملية',
+'status_needs_correction' => '',
 'status_not_approved' => 'لم تتم الموافقة بعد',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'لم تتم مراجعته بعد',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 8c5ba855a..ff4548ed8 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -308,8 +308,10 @@ $text = array(
 'documents_to_receipt' => '',
 'documents_to_review' => 'Документы, чакащи Вашата рецензия',
 'documents_to_revise' => '',
+'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Ваши документи, изискващи внимание',
@@ -1332,6 +1334,7 @@ $text = array(
 'status_approval_rejected' => 'Чернова отказана',
 'status_approved' => 'Утвърден',
 'status_approver_removed' => 'Утвърждаващия премахнат от процеса',
+'status_needs_correction' => '',
 'status_not_approved' => 'Не утвърден',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Не рецензиран',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 0fc5651fb..f17a097b0 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -313,8 +313,10 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents en espera de revisió d\'usuaris',
 'documents_to_revise' => '',
+'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documents de la seva propietat que requereixen atenció',
@@ -1337,6 +1339,7 @@ URL: [url]',
 'status_approval_rejected' => 'Esborrany rebutjat',
 'status_approved' => 'Aprovat',
 'status_approver_removed' => 'Aprovador eliminat del procés',
+'status_needs_correction' => '',
 'status_not_approved' => 'Sense aprovar',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Sense revisar',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 4773d08be..86089a1d2 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -330,8 +330,10 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čekající na kontrolu uživatele',
 'documents_to_revise' => '',
+'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dokumenty, které uživatel vlastní a vyžadují pozornost',
@@ -1476,6 +1478,7 @@ URL: [url]',
 'status_approval_rejected' => 'Návrh zamítnut',
 'status_approved' => 'Schválen',
 'status_approver_removed' => 'Schvalovatel odstraněn z procesu',
+'status_needs_correction' => '',
 'status_not_approved' => 'Neschválený',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Nezkontrolovaný',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index b34267d87..5069171c2 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 (2519), dgrutsch (22)
+//    Translators: Admin (2527), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -335,8 +335,10 @@ URL: [url]',
 'documents_to_receipt' => 'Empfangsbestätigung erforderlich',
 'documents_to_review' => 'Prüfung erforderlich',
 'documents_to_revise' => 'Erneute Prüfung erforderlich',
+'documents_user_draft' => 'Entwürfe',
 'documents_user_expiration' => 'Abgelaufende Dokumente',
 'documents_user_no_reception' => 'Dokumente ohne Empfangsbestätigung',
+'documents_user_obsolete' => 'Veraltete Dokumente',
 'documents_user_reception' => 'Dokumente mit Empfangsbestätigung',
 'documents_user_rejected' => 'Abgelehnte Dokumente',
 'documents_user_requiring_attention' => 'Diese Dokumente sollte ich mal nachsehen',
@@ -999,7 +1001,7 @@ Elternordner: [folder_path]
 Benutzer: [username]
 URL: [url]',
 'review_request_email_subject' => '[sitename]: [name] - Aufforderung zur Prüfung',
-'review_status' => 'Status:',
+'review_status' => 'Status',
 'review_submit_email' => 'Prüfung ausgeführt',
 'review_submit_email_body' => 'Prüfung ausgeführt
 Dokument: [name]
@@ -1391,12 +1393,12 @@ Name: [username]
 'settings_presetExpirationDate_desc' => 'Alle neu hochgeladenen Dokumente bekommen das eingegebene Datum als Ablaufdatum. Das Datum muss der Form entsprechen, wie es von der PHP-Funktion strtotime() verstanden wird, z.B. +5 weeks.',
 'settings_previewWidthDetail' => 'Breite der Vorschaubilder (Detail)',
 'settings_previewWidthDetail_desc' => 'Breite des Vorschaubildes, das auf der Detailseite angezeigt wird',
-'settings_previewWidthDropFolderList' => '',
-'settings_previewWidthDropFolderList_desc' => '',
+'settings_previewWidthDropFolderList' => 'Breite der Vorschaubilder (Ablageordner)',
+'settings_previewWidthDropFolderList_desc' => 'Setzt die Breite der Vorschaubilder in der Auswahlliste für die Dateien des Ablageordners.',
 'settings_previewWidthList' => 'Breite der Vorschaubilder (Liste)',
 'settings_previewWidthList_desc' => 'Breite der Vorschaubilder, die in Listen angezeigt werden',
-'settings_previewWidthMenuList' => '',
-'settings_previewWidthMenuList_desc' => '',
+'settings_previewWidthMenuList' => 'Breite der Vorschaubilder (Menu)',
+'settings_previewWidthMenuList_desc' => 'Setzt die Breite der Bilder im Menu der Dateien im Ablageordner.',
 'settings_printDisclaimer' => 'Rechtliche Hinweise',
 'settings_printDisclaimer_desc' => 'Anwählen, um die rechtlichen Hinweise am Ende jeder Seite anzuzeigen.',
 'settings_quota' => 'User\'s quota',
@@ -1542,6 +1544,7 @@ Name: [username]
 'status_approval_rejected' => 'Entwurf abgelehnt',
 'status_approved' => 'freigegeben',
 'status_approver_removed' => 'Freigebender wurde vom Prozess ausgeschlossen',
+'status_needs_correction' => 'Korrektur erforderlich',
 'status_not_approved' => 'keine Freigabe',
 'status_not_receipted' => 'Empfang noch nicht bestätigt',
 'status_not_reviewed' => 'nicht geprüft',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 8ba49be74..b45f9d108 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -308,8 +308,10 @@ $text = array(
 'documents_to_receipt' => '',
 'documents_to_review' => '',
 'documents_to_revise' => '',
+'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => '',
@@ -1343,6 +1345,7 @@ URL: [url]',
 'status_approval_rejected' => '',
 'status_approved' => '',
 'status_approver_removed' => '',
+'status_needs_correction' => '',
 'status_not_approved' => '',
 'status_not_receipted' => '',
 'status_not_reviewed' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 01960ede1..26298536e 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 (1644), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1649), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -67,7 +67,7 @@ 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_revision' => 'Add revision',
 'add_role' => 'Add new role',
 'add_subfolder' => 'Add subfolder',
 'add_to_clipboard' => 'Add to clipboard',
@@ -335,8 +335,10 @@ URL: [url]',
 'documents_to_receipt' => 'Documents awaiting to confirm the receipt',
 'documents_to_review' => 'Documents awaiting your review',
 'documents_to_revise' => 'Documents awaiting your revision',
+'documents_user_draft' => 'Drafts',
 'documents_user_expiration' => 'Expired documents',
 'documents_user_no_reception' => 'Documents without reception',
+'documents_user_obsolete' => 'Obsolete documents',
 'documents_user_reception' => 'Documents awaiting reception',
 'documents_user_rejected' => 'Rejected documents',
 'documents_user_requiring_attention' => 'Documents owned by you that require attention',
@@ -1001,7 +1003,7 @@ Parent folder: [folder_path]
 User: [username]
 URL: [url]',
 'review_request_email_subject' => '[sitename]: [name] - Review request',
-'review_status' => 'Review status:',
+'review_status' => 'Review status',
 'review_submit_email' => 'Submitted review',
 'review_submit_email_body' => 'Submitted review
 Document: [name]
@@ -1537,6 +1539,7 @@ Name: [username]
 'status_approval_rejected' => 'Draft rejected',
 'status_approved' => 'Approved',
 'status_approver_removed' => 'Approver removed from process',
+'status_needs_correction' => 'Needs correction',
 'status_not_approved' => 'Not approved',
 'status_not_receipted' => 'Not receipted yet',
 'status_not_reviewed' => 'Not reviewed',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 536bb5f54..a6c71fc06 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -330,8 +330,10 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documentos en espera de revisión de usuarios',
 'documents_to_revise' => '',
+'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Documentos rechazados',
 'documents_user_requiring_attention' => 'Documentos de su propiedad que requieren atención',
@@ -1482,6 +1484,7 @@ URL: [url]',
 'status_approval_rejected' => 'Borrador rechazado',
 'status_approved' => 'Aprobado',
 'status_approver_removed' => 'Aprobador eliminado del proceso',
+'status_needs_correction' => '',
 'status_not_approved' => 'Sin aprobar',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Sin revisar',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 3eb0f2879..44d2316fb 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -335,8 +335,10 @@ URL: [url]',
 'documents_to_receipt' => 'Documents en attente de confirmation de réception',
 'documents_to_review' => 'Documents en attente de vérification',
 'documents_to_revise' => '',
+'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => 'Documents en attente de réception',
 'documents_user_rejected' => 'Documents rejetés',
 'documents_user_requiring_attention' => 'Documents à surveiller',
@@ -1504,6 +1506,7 @@ Nom : [username]
 'status_approval_rejected' => 'Ébauche rejetée',
 'status_approved' => 'Approuvé',
 'status_approver_removed' => 'Approbateur retiré du processus',
+'status_needs_correction' => '',
 'status_not_approved' => 'Non approuvé',
 'status_not_receipted' => 'Pas encore réceptionné',
 'status_not_reviewed' => 'Non vérifié',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 1596dadaa..fa32b80df 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 (1196), marbanas (16)
+//    Translators: Admin (1197), marbanas (16)
 
 $text = array(
 '2_factor_auth' => '',
@@ -335,8 +335,10 @@ Internet poveznica: [url]',
 'documents_to_receipt' => 'Dokumenti koji čekaju potvrdu primitka',
 'documents_to_review' => 'Dokumenti koji čekaju vaš pregled',
 'documents_to_revise' => 'Dokumenti za reviziju',
+'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Odbijeni dokumenti',
 'documents_user_requiring_attention' => 'Dokumenti u vašem vlasništvu koji zahtjevaju pažnju',
@@ -977,7 +979,7 @@ Glavna mapa: [folder_path]
 Korisnik: [username]
 URL: [url]',
 'review_request_email_subject' => '[sitename]: [name] - Zahtjev za pregled',
-'review_status' => 'Status pregleda:',
+'review_status' => 'Status pregleda',
 'review_submit_email' => 'Predani pregled',
 'review_submit_email_body' => 'Postavljen pregled
 Dokument: [name]
@@ -1503,6 +1505,7 @@ Internet poveznica: [url]',
 'status_approval_rejected' => 'Skica odbijena',
 'status_approved' => 'Odobreno',
 'status_approver_removed' => 'Validator uklonjen iz postupka',
+'status_needs_correction' => '',
 'status_not_approved' => 'Nije odobreno',
 'status_not_receipted' => 'Još nije primljeno',
 'status_not_reviewed' => 'Nije pregledano',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index a9ddfe7f8..46dc9cd74 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -330,8 +330,10 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Felülvizsgálatára váró dokumentumok',
 'documents_to_revise' => '',
+'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Az Ön tulajdonában álló dokumentumok, amelyekre figyelmet kell fordítani',
@@ -1481,6 +1483,7 @@ URL: [url]',
 'status_approval_rejected' => 'Piszkozat elutasítva',
 'status_approved' => 'Jóváhagyott',
 'status_approver_removed' => 'Jóváhagyó eltávolítva a folyamatból',
+'status_needs_correction' => '',
 'status_not_approved' => 'Nem jóváhagyott',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Nem felülvizsgált',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index cbf60d1bf..b7fd9c86a 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 (1587), rickr (144), s.pnt (26)
+//    Translators: Admin (1588), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -336,8 +336,10 @@ URL: [url]',
 'documents_to_receipt' => 'Documenti in attesa di conferma ricezione',
 'documents_to_review' => 'Documenti in attesa della tua revisione',
 'documents_to_revise' => 'Documenti da revisionare.',
+'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Documenti rifiutati',
 'documents_user_requiring_attention' => 'Tuoi documenti in attesa di revisione o approvazione',
@@ -984,7 +986,7 @@ Cartella: [folder_path]
 Utente: [username]
 URL: [url]',
 'review_request_email_subject' => '[sitename]: [name] - Richiesta di revisione',
-'review_status' => 'Stato revisioni:',
+'review_status' => 'Stato revisioni',
 'review_submit_email' => 'Sottoposta revisione',
 'review_submit_email_body' => 'Sottoposta revisione
 Documento: [name]
@@ -1515,6 +1517,7 @@ URL: [url]',
 'status_approval_rejected' => 'Bozza rifiutata',
 'status_approved' => 'Approvato',
 'status_approver_removed' => 'Approvatore rimosso dal processo',
+'status_needs_correction' => '',
 'status_not_approved' => 'Non ancora approvato',
 'status_not_receipted' => 'Non ancora ricevuto',
 'status_not_reviewed' => 'Non ancora revisionato',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index d83f01ec1..1f8bfd641 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -338,8 +338,10 @@ URL: [url]',
 'documents_to_receipt' => '당신의 접수확인을 기다리는 문서들',
 'documents_to_review' => '당신의 검토를 기다리는 문서',
 'documents_to_revise' => '문서 정정',
+'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '거부된 문서',
 'documents_user_requiring_attention' => '주의가 필요한 당신 소유의 문서',
@@ -1497,6 +1499,7 @@ URL : [url]',
 'status_approval_rejected' => '거부된 초안',
 'status_approved' => '승인',
 'status_approver_removed' => '승인 과정에서 제거',
+'status_needs_correction' => '',
 'status_not_approved' => '승인되지 않음​​',
 'status_not_receipted' => '아직 접수 않된',
 'status_not_reviewed' => '검토되지 않음',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 695ca44a5..5bcf86c3b 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -328,8 +328,10 @@ URL: [url]',
 'documents_to_receipt' => 'documenten te ontvangen',
 'documents_to_review' => 'Documenten die wachten op uw controle',
 'documents_to_revise' => 'Te reviseren documenten',
+'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => 'Documenten wachten op bestemming',
 'documents_user_rejected' => 'documenten niet geaccepteerd door gebruiker',
 'documents_user_requiring_attention' => 'Eigen documenten die (nog) aandacht behoeven',
@@ -1527,6 +1529,7 @@ Name: [username]
 'status_approval_rejected' => 'Klad Goedkeuring [Afgewezen]',
 'status_approved' => 'Goedgekeurd',
 'status_approver_removed' => 'Goedkeurder verwijderd',
+'status_needs_correction' => '',
 'status_not_approved' => 'Niet goedgekeurd',
 'status_not_receipted' => 'Niet ontvangen',
 'status_not_reviewed' => 'Niet gecontroleerd',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 7358144b0..1dfcea71d 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 (785), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (786), netixw (84), romi (93), uGn (112)
 
 $text = array(
 '2_factor_auth' => '',
@@ -323,8 +323,10 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty oczekujące na Twoją recenzję',
 'documents_to_revise' => '',
+'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dokumenty należące do Ciebie, które wymagają uwagi',
@@ -1461,6 +1463,7 @@ URL: [url]',
 'status_approval_rejected' => 'Szkic odrzucony',
 'status_approved' => 'Zatwierdzone',
 'status_approver_removed' => 'Osoba zatwierdzająca usunięta z procesu',
+'status_needs_correction' => '',
 'status_not_approved' => 'Nie zatwierdzone',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Nie zrecenzowane',
@@ -1533,7 +1536,7 @@ URL: [url]',
 'toggle_manager' => 'Przełączanie zarządcy',
 'toggle_qrcode' => '',
 'to_before_from' => '',
-'transfer_document' => '',
+'transfer_document' => 'Transfer dokumentu',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',
 'transfer_objects' => '',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 7909705d8..79f43c963 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -330,8 +330,10 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents Awaiting User\'s Review',
 'documents_to_revise' => '',
+'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Documentos rejeitados',
 'documents_user_requiring_attention' => 'Documents Owned by User That Require Attention',
@@ -1479,6 +1481,7 @@ URL: [url]',
 'status_approval_rejected' => '',
 'status_approved' => 'Approved',
 'status_approver_removed' => 'Approver removed from proceá',
+'status_needs_correction' => '',
 'status_not_approved' => 'Not approved',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Não revisado',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 24b134a9c..af06f732b 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 (1067), balan (87)
+//    Translators: Admin (1068), balan (87)
 
 $text = array(
 '2_factor_auth' => '',
@@ -335,8 +335,10 @@ 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_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documente deținute de tine care necesită atenție',
@@ -978,7 +980,7 @@ Folder parinte: [folder_path]
 Utilizator: [username]
 URL: [url]',
 'review_request_email_subject' => '[sitename]: [name] - Cerere de revizuire',
-'review_status' => 'Status revizuire:',
+'review_status' => 'Status revizuire',
 'review_submit_email' => 'Revizuire trimisă',
 'review_submit_email_body' => 'Revizuire trimisă
 Document: [name]
@@ -1504,6 +1506,7 @@ URL: [url]',
 'status_approval_rejected' => 'Proiect respins',
 'status_approved' => 'Aprobat',
 'status_approver_removed' => 'Aprobator eliminat din proces',
+'status_needs_correction' => '',
 'status_not_approved' => 'Neaprobat',
 'status_not_receipted' => 'Neprimit inca',
 'status_not_reviewed' => 'Nerevizuit',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 5c9798e06..ff71dd4b4 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -335,8 +335,10 @@ URL: [url]',
 'documents_to_receipt' => 'Документы, которые ожидают подтверждение получения',
 'documents_to_review' => 'Документы, ожидающие вашей рецензии',
 'documents_to_revise' => 'Документы на ревизии',
+'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Отклоненные документы',
 'documents_user_requiring_attention' => 'Ваши документы, требующие внимания',
@@ -1511,6 +1513,7 @@ URL: [url]',
 'status_approval_rejected' => 'Черновик отклонён',
 'status_approved' => 'Утверждён',
 'status_approver_removed' => 'Утверждающий удалён из процесса',
+'status_needs_correction' => '',
 'status_not_approved' => 'Не утверждён',
 'status_not_receipted' => 'Получение не подтверждено',
 'status_not_reviewed' => 'Не рецензирован',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 979da1044..9a13bc5dc 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -312,8 +312,10 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čakajúce na kontrolu používateľa',
 'documents_to_revise' => 'Dokumenty čakajúce na vašu revíziu',
+'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => 'Dokumenty čakajúce na prijatie',
 'documents_user_rejected' => 'Zamietnuté dokumenty',
 'documents_user_requiring_attention' => 'Dokumenty, ktoré používateľ vlastní a vyžadujú pozornosť',
@@ -1336,6 +1338,7 @@ URL: [url]',
 'status_approval_rejected' => 'Návrh zamietnutý',
 'status_approved' => 'Schválený',
 'status_approver_removed' => 'Schvaľovateľ odstránený z procesu',
+'status_needs_correction' => '',
 'status_not_approved' => 'Neschválený',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Neskontrolovaný',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 0178bd49b..57407a4a6 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -336,8 +336,10 @@ URL: [url]',
 'documents_to_receipt' => 'Dokument som väntar på bekräftad mottagning',
 'documents_to_review' => 'Dokument som du behöver granska',
 'documents_to_revise' => 'Dokument som väntar på din granskning',
+'documents_user_draft' => '',
 'documents_user_expiration' => 'Utgångna dokument',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => 'Dokument som väntar på mottagande',
 'documents_user_rejected' => 'Avvisade dokument',
 'documents_user_requiring_attention' => 'Dokument som du behöver granska/godkänna',
@@ -1524,6 +1526,7 @@ Kommentar: [comment]',
 'status_approval_rejected' => 'Utkast avvisat',
 'status_approved' => 'Godkänt',
 'status_approver_removed' => 'Godkännare har tagits bort från processen',
+'status_needs_correction' => '',
 'status_not_approved' => 'Ej godkänt',
 'status_not_receipted' => 'Ej mottaget ännu',
 'status_not_reviewed' => 'Ej granskat',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 01ddca0b2..dddd3b2f4 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -329,8 +329,10 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Kontrol etmenizi bekleyen dokümanlar',
 'documents_to_revise' => '',
+'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dikkatinizi gerektiren size ait dokümanlar',
@@ -1483,6 +1485,7 @@ URL: [url]',
 'status_approval_rejected' => 'Taslak reddedildi',
 'status_approved' => 'Onaylandı',
 'status_approver_removed' => 'Onaylayan süreci sildi',
+'status_needs_correction' => '',
 'status_not_approved' => 'Onaylanmadı',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Kontrol edilmedi',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 6c0947628..e2bb6622a 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -335,8 +335,10 @@ URL: [url]',
 'documents_to_receipt' => 'Документи, які чекають підтвердження отримання',
 'documents_to_review' => 'Документи, які чекають вашої рецензії',
 'documents_to_revise' => 'Документи для повторного розгляду',
+'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Документи, які відхилили',
 'documents_user_requiring_attention' => 'Ваші документи, які потребують уваги',
@@ -1504,6 +1506,7 @@ URL: [url]',
 'status_approval_rejected' => 'Чернетку відхилено',
 'status_approved' => 'Затверджено',
 'status_approver_removed' => 'Затверджувач видалений з процесу',
+'status_needs_correction' => '',
 'status_not_approved' => 'Не затверджено',
 'status_not_receipted' => 'Отримання не підтверджено',
 'status_not_reviewed' => 'Не рецензовано',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 00e23ce94..9da551533 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -331,8 +331,10 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校对的文档',
 'documents_to_revise' => '',
+'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '已拒绝的文档',
 'documents_user_requiring_attention' => '需您关注的文档',
@@ -1487,6 +1489,7 @@ URL: [url]',
 'status_approval_rejected' => '拟拒绝',
 'status_approved' => '批准',
 'status_approver_removed' => '从审核队列中删除',
+'status_needs_correction' => '',
 'status_not_approved' => '未批准',
 'status_not_receipted' => '',
 'status_not_reviewed' => '未校对',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 617d8b06e..20974996f 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -312,8 +312,10 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校對的文檔',
 'documents_to_revise' => '',
+'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_no_reception' => '',
+'documents_user_obsolete' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => '需您關注的文檔',
@@ -1336,6 +1338,7 @@ URL: [url]',
 'status_approval_rejected' => '擬拒絕',
 'status_approved' => '批准',
 'status_approver_removed' => '從審核佇列中刪除',
+'status_needs_correction' => '',
 'status_not_approved' => '未批准',
 'status_not_receipted' => '',
 'status_not_reviewed' => '未校對',

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 301/308] 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 302/308] 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 303/308] 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 304/308] 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 1532ea313baf90ae49ded424cb0b4b1cb39f17f7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 1 Feb 2018 08:32:09 +0100
Subject: [PATCH 305/308] add phrase needs_correction

---
 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 | 3 ++-
 languages/el_GR/lang.inc | 1 +
 languages/en_GB/lang.inc | 3 ++-
 languages/es_ES/lang.inc | 1 +
 languages/fr_FR/lang.inc | 1 +
 languages/hr_HR/lang.inc | 1 +
 languages/hu_HU/lang.inc | 1 +
 languages/it_IT/lang.inc | 1 +
 languages/ko_KR/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 | 1 +
 languages/sk_SK/lang.inc | 1 +
 languages/sv_SE/lang.inc | 1 +
 languages/tr_TR/lang.inc | 1 +
 languages/uk_UA/lang.inc | 1 +
 languages/zh_CN/lang.inc | 1 +
 languages/zh_TW/lang.inc | 1 +
 24 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 10a6423fd..7327f0dc8 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -720,6 +720,7 @@ URL: [url]',
 'my_documents' => 'مستنداتي',
 'my_transmittals' => '',
 'name' => 'اسم',
+'needs_correction' => '',
 'needs_workflow_action' => 'هذا المستند يتطلب انتباهك . من فضلك تفقد زر مسار العمل',
 'network_drive' => '',
 'never' => '',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index ff4548ed8..aef877897 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -651,6 +651,7 @@ $text = array(
 'my_documents' => 'Моите документи',
 'my_transmittals' => '',
 'name' => 'Име',
+'needs_correction' => '',
 'needs_workflow_action' => '',
 'network_drive' => '',
 'never' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index f17a097b0..14bcbd126 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -656,6 +656,7 @@ URL: [url]',
 'my_documents' => 'Els meus documents',
 'my_transmittals' => '',
 'name' => 'Nom',
+'needs_correction' => '',
 'needs_workflow_action' => '',
 'network_drive' => '',
 'never' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 86089a1d2..a1c9eab6d 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -727,6 +727,7 @@ URL: [url]',
 'my_documents' => 'Moje dokumenty',
 'my_transmittals' => '',
 'name' => 'Název',
+'needs_correction' => '',
 'needs_workflow_action' => 'Tento dokument vyžaduje Vaši pozornost. Prosím zkontrolujte záložku pracovního postupu.',
 'network_drive' => '',
 'never' => 'nikdy',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 5069171c2..a46d654cd 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 (2527), dgrutsch (22)
+//    Translators: Admin (2528), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -743,6 +743,7 @@ URL: [url]',
 'my_documents' => 'Meine Dokumente',
 'my_transmittals' => 'Meine Dokumentenlisten',
 'name' => 'Name',
+'needs_correction' => 'Korrektur erforderlich',
 'needs_workflow_action' => 'Dieses Dokument erfordert eine Aktion. Bitte schauen Sie auf den Workflow-Reiter.',
 'network_drive' => 'Netzwerklaufwerk',
 'never' => 'nie',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index b45f9d108..f6ea6c15e 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -651,6 +651,7 @@ $text = array(
 'my_documents' => 'Τα έγγραφα μου',
 'my_transmittals' => '',
 'name' => 'Όνομα',
+'needs_correction' => '',
 'needs_workflow_action' => '',
 'network_drive' => '',
 'never' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 26298536e..260dbef72 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 (1649), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1650), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -744,6 +744,7 @@ URL: [url]',
 'my_documents' => 'My Documents',
 'my_transmittals' => 'My Transmittals',
 'name' => 'Name',
+'needs_correction' => 'Needs correction',
 'needs_workflow_action' => 'This document requires your attention. Please check the workflow tab.',
 'network_drive' => 'Network drive',
 'never' => 'never',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index a6c71fc06..0629aeb3d 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -727,6 +727,7 @@ URL: [url]',
 'my_documents' => 'Mis documentos',
 'my_transmittals' => '',
 'name' => 'Nombre',
+'needs_correction' => '',
 'needs_workflow_action' => 'Este documento requiere su atención. Por favor chequee la pestaña de flujo de trabajo.',
 'network_drive' => '',
 'never' => 'nunca',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 44d2316fb..5a6a3e432 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -739,6 +739,7 @@ URL: [url]',
 'my_documents' => 'Mes documents',
 'my_transmittals' => '',
 'name' => 'Nom',
+'needs_correction' => '',
 'needs_workflow_action' => 'Ce document requiert votre attention. Consultez l\'onglet workflow.',
 'network_drive' => '',
 'never' => 'Jamais',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index fa32b80df..2a42a34eb 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -732,6 +732,7 @@ Internet poveznica: [url]',
 'my_documents' => 'Moji dokumenti',
 'my_transmittals' => 'Moja proslijeđivanja',
 'name' => 'Naziv',
+'needs_correction' => '',
 'needs_workflow_action' => 'Ovaj dokument zahtjeva vašu pažnju. Molimo provjerite karticu toka rada.',
 'network_drive' => '',
 'never' => 'nikada',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 46dc9cd74..ecfab761c 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -727,6 +727,7 @@ URL: [url]',
 'my_documents' => 'Saját dokumentumok',
 'my_transmittals' => '',
 'name' => 'Név',
+'needs_correction' => '',
 'needs_workflow_action' => 'Ez a dokumentum az Ön beavatkozására vár. Ellenőrizze a munkafolyamat fület.',
 'network_drive' => '',
 'never' => 'soha',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index b7fd9c86a..741e39778 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -733,6 +733,7 @@ URL: [url]',
 'my_documents' => 'Documenti personali',
 'my_transmittals' => 'Mie trasmissioni',
 'name' => 'Nome',
+'needs_correction' => '',
 'needs_workflow_action' => 'Il documento richiede attenzione. Prego controllare il flusso di lavoro.',
 'network_drive' => 'Network drive',
 'never' => 'Mai',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 1f8bfd641..8477d1f1d 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -733,6 +733,7 @@ URL: [url]',
 'my_documents' => '내 문서',
 'my_transmittals' => '내 송부',
 'name' => '이름',
+'needs_correction' => '',
 'needs_workflow_action' => '이 문서는 당신의주의가 필요합니다. 워크플로우 탭을 확인하시기 바랍니다.',
 'network_drive' => '네트워크 드라이브',
 'never' => '불가',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 5bcf86c3b..e2bda3251 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -732,6 +732,7 @@ URL: [url]',
 'my_documents' => 'Mijn Documenten',
 'my_transmittals' => 'Mijn zendingen',
 'name' => 'Naam',
+'needs_correction' => '',
 'needs_workflow_action' => 'Dit document vereist uw aandacht. Bekijk deze onder het tabblad workflows.',
 'network_drive' => 'Networkdrive',
 'never' => 'Nooit',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 1dfcea71d..8a775a784 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -720,6 +720,7 @@ URL: [url]',
 'my_documents' => 'Moje dokumenty',
 'my_transmittals' => '',
 'name' => 'Nazwa',
+'needs_correction' => '',
 'needs_workflow_action' => 'Dokument wymaga uwagi. Proszę sprawdzić kartę workflow.',
 'network_drive' => '',
 'never' => '',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 79f43c963..96f9fa444 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -726,6 +726,7 @@ URL: [url]',
 'my_documents' => 'Meus Documentos',
 'my_transmittals' => '',
 'name' => 'Nome',
+'needs_correction' => '',
 'needs_workflow_action' => 'Este documento requer sua atenção. Por favor, verifique a guia de fluxo de trabalho.',
 'network_drive' => '',
 'never' => '',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index af06f732b..c65c0c945 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -732,6 +732,7 @@ URL: [url]',
 'my_documents' => 'Documentele Mele',
 'my_transmittals' => 'Trimiterile mele',
 'name' => 'Nume',
+'needs_correction' => '',
 'needs_workflow_action' => 'Acest document necesită atenția dumneavoastră. Vă rugăm să verificați tab-ul workflow.',
 'network_drive' => '',
 'never' => 'niciodată',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index ff71dd4b4..9578a544d 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -732,6 +732,7 @@ URL: [url]',
 'my_documents' => 'Мои документы',
 'my_transmittals' => 'Мои пересылки',
 'name' => 'Имя',
+'needs_correction' => '',
 'needs_workflow_action' => 'Этот документ требует вашего внимания. См. вкладку «Процесс».',
 'network_drive' => 'Сетевой диск',
 'never' => 'никогда',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 9a13bc5dc..129cf401b 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -655,6 +655,7 @@ URL: [url]',
 'my_documents' => 'Moje dokumenty',
 'my_transmittals' => '',
 'name' => 'Meno',
+'needs_correction' => '',
 'needs_workflow_action' => 'Tento dokument si vyžaduje vašu pozornosť. Skontrolujte kartu pracovného postupu.',
 'network_drive' => 'Sieťová jednotka',
 'never' => 'nikdy',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 57407a4a6..493be90ea 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -745,6 +745,7 @@ URL: [url]',
 'my_documents' => 'Mina dokument',
 'my_transmittals' => 'Mina överföringar',
 'name' => 'Namn',
+'needs_correction' => '',
 'needs_workflow_action' => 'Detta dokument behöver din uppmärksamhet. Kontrollera inställningarna för arbetsflödet.',
 'network_drive' => 'Nätverkslagring',
 'never' => 'aldrig',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index dddd3b2f4..c5b34bb4e 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -726,6 +726,7 @@ URL: [url]',
 'my_documents' => 'Dokümanlarım',
 'my_transmittals' => '',
 'name' => 'İsim',
+'needs_correction' => '',
 'needs_workflow_action' => 'Bu doküman dikkatinizi gerektiriyor. Lütfen iş akış sekmesini kontrol ediniz.',
 'network_drive' => '',
 'never' => 'asla',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index e2bb6622a..ad2e5a4bb 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -732,6 +732,7 @@ URL: [url]',
 'my_documents' => 'Мої документи',
 'my_transmittals' => 'Мої перенесення',
 'name' => 'Назва',
+'needs_correction' => '',
 'needs_workflow_action' => 'Цей документ потребує вашої уваги. Див. вкладку «Процес».',
 'network_drive' => '',
 'never' => 'ніколи',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 9da551533..55f53ce28 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -730,6 +730,7 @@ URL: [url]',
 'my_documents' => '我的文档',
 'my_transmittals' => '',
 'name' => '名称',
+'needs_correction' => '',
 'needs_workflow_action' => '',
 'network_drive' => '网络驱动器',
 'never' => '从不',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 20974996f..def797df0 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -655,6 +655,7 @@ URL: [url]',
 'my_documents' => '我的文件',
 'my_transmittals' => '',
 'name' => '名稱',
+'needs_correction' => '',
 'needs_workflow_action' => '',
 'network_drive' => '',
 'never' => '',

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 306/308] 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 307/308] 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 7892498d979232e931ae11fad8d73981ec2e34d7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 1 Feb 2018 14:42:30 +0100
Subject: [PATCH 308/308] create view at beginning of file

---
 out/out.EditComment.php           | 16 ++++++++--------
 out/out.SetReviewersApprovers.php | 16 ++++++----------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/out/out.EditComment.php b/out/out.EditComment.php
index 23dac5b2b..ff7884d2b 100644
--- a/out/out.EditComment.php
+++ b/out/out.EditComment.php
@@ -30,6 +30,9 @@ 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));
+
 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 +41,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, $document, $user, $settings);
+if(!$accessop->mayEditComment()) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+}
+
 if($document->isLocked()) {
 	$lockingUser = $document->getLockingUser();
 	if (($lockingUser->getID() != $user->getID()) && ($document->getAccessMode($user) != M_ALL)) {
@@ -52,14 +60,6 @@ if (!is_object($version)) {
 
 $folder = $document->getFolder();
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
-if(!$accessop->mayEditComment()) {
-	UI::exitError(getMLText("document_title", array("documentname" => $document->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('document', $document);
diff --git a/out/out.SetReviewersApprovers.php b/out/out.SetReviewersApprovers.php
index ef8adba90..ceca25a3c 100644
--- a/out/out.SetReviewersApprovers.php
+++ b/out/out.SetReviewersApprovers.php
@@ -30,6 +30,9 @@ 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));
+
 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,8 +42,9 @@ 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"));
+$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+if(!$accessop->maySetReviewersApprovers()) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("no_version_modification"));
 }
 
 if (!isset($_GET["version"]) || !is_numeric($_GET["version"]) || intval($_GET["version"]<1)) {
@@ -54,14 +58,6 @@ if (!is_object($content)) {
 
 $folder = $document->getFolder();
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
-if(!$accessop->maySetReviewersApprovers()) {
-	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("no_version_modification"));
-}
-
-$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);