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

CHANGELOG

@@ -45,6 +45,13 @@
 --------------------------------------------------------------------------------
 - 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
+- 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
+- hide pager on search page when all folders/documents are listed
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.3
@@ -92,6 +99,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
@@ -196,6 +204,7 @@
                      Changes in version 4.3.37
 --------------------------------------------------------------------------------
 - fix label in password forgotten form (Closes #346)
+- translation updates
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.36

SeedDMS_Core/Core/inc.ClassDMS.php

@@ -669,6 +669,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
 	 *

SeedDMS_Core/Core/inc.ClassDocument.php

@@ -1217,6 +1217,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
 	 */
@@ -2171,6 +2177,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;
 	} /* }}} */
@@ -2225,7 +2244,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;
 	} /* }}} */
 
 	/**
@@ -2260,9 +2283,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;
@@ -2306,7 +2332,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;
@@ -2336,6 +2364,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();
 
@@ -2346,9 +2380,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();
@@ -2367,8 +2410,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;
@@ -3300,6 +3346,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;
 
@@ -5935,6 +5992,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;
+	} /* }}} */
+
 } /* }}} */
 
 /**
@@ -6058,6 +6141,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;
+	} /* }}} */
+
 } /* }}} */
 
 //

SeedDMS_Core/package.xml

@@ -1556,7 +1556,7 @@ returns just users which are not disabled
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-- all changes from 5.1.1 merged
+- all changes from 5.0.14 merged
 - SeedDMS_Core_User::getReceiptStatus() and SeedDMS_Core_User::getReviewStatus()
 only return entries of the latest document version if not specific document and
 version is passed
@@ -1569,6 +1569,9 @@ SeedDMS_Core_DMS::getDocumentsInRevision()
 log entry first
 - add roles
 - use classname from SeedDMS_Core_DMS::_classnames for SeedDMS_Core_DocumentContent
+- add virtual access mode for document links and attachments plus callbacks to
+  check access mode in a hook
+- add new method SeedDMS_Core_DMS::getDocumentsExpired()
    </notes>
   </release>
  </changelog>

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'",
 		);
 	} /* }}} */
 

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);
 	} /* }}} */

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>

controllers/class.AddDocument.php

@@ -23,13 +23,17 @@
 class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 
 	public function run() { /* {{{ */
-		$name = $this->getParam('name');
+		$dms = $this->params['dms'];
-		$comment = $this->getParam('comment');
+		$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');

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;
+	} /* }}} */
+}
+

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;
+	}
+}

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;
+	}
+}

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 */
+		if(false === $this->callHook('preEditFolder')) {
-		$foldername = $folder->getName();
+			if(empty($this->errormsg))
-		$folderid = $folder->getID();
+				$this->errormsg = 'hook_preEditFolder_failed';
-
+			return null;
-		if(!$this->callHook('preEditFolder')) {
 		}
 
 		$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 {

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);

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);

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 (1284)
 
 $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' => 'المستندات محمية من التعديل بواسطتك',
@@ -452,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' => 'الإسبانية',
@@ -460,15 +461,16 @@ URL: [url]',
 'exclude_items' => '',
 'expired' => 'انتهى صلاحيته',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'تنتهى صلاحيته',
-'expire_by_date' => '',
+'expire_by_date' => 'ﻲﻨﺘﻫﻯ ﻑﻯ ﺕﺍﺮﻴﺧ',
 'expire_in_1d' => '',
 'expire_in_1h' => '',
-'expire_in_1m' => '',
+'expire_in_1m' => 'ﻲﻨﺘﻫﻯ ﻑﻯ 1 ﺶﻫﺭ',
-'expire_in_1w' => '',
+'expire_in_1w' => 'ﻲﻨﺘﻫﻯ ﻑﻯ 1 ﺎﺴﺑﻮﻋ',
-'expire_in_1y' => '',
+'expire_in_1y' => 'ﻲﻨﺘﻫﻯ ﻑﻯ 1 ﺲﻧﺓ',
 'expire_in_2h' => '',
-'expire_in_2y' => '',
+'expire_in_2y' => 'ﻲﻨﺘﻫﻯ ﻑﻯ 2 ﺲﻧﺓ',
 'expire_today' => '',
 'expire_tomorrow' => '',
 'expiry_changed_email' => 'تم تغيير تاريخ الصلاحية',
@@ -837,7 +839,7 @@ URL: [url]',
 'personal_default_keywords' => 'قوائم الكلمات البحثية الشخصية',
 'pl_PL' => 'ﺎﻠﺑﻮﻠﻧﺪﻳﺓ',
 'possible_substitutes' => '',
-'preset_expires' => '',
+'preset_expires' => 'ﺕﺍﺮﻴﺧ ﺍﻼﻨﺘﻫﺍﺀ',
 'preview' => '',
 'preview_converters' => '',
 'preview_images' => '',
@@ -1295,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' => '',

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' => 'Тази операция шъ създаде дамп на базата данни. След създаването, файлът ще бъде съхранен в папката с данни на сървъра.',
@@ -415,6 +416,7 @@ $text = array(
 'exclude_items' => '',
 'expired' => 'Изтекъл',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Изтича',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1160,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' => 'Квота за потребител',
@@ -1248,7 +1254,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 +1269,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 +1290,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' => '',

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,6 +302,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Documents',
 'documents_checked_out_by_you' => '',
+'documents_expired' => 'Documents caducats',
 'documents_in_process' => 'Documents en procés',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Documents bloquejats per vostè',
@@ -362,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',
@@ -420,6 +421,7 @@ URL: [url]',
 'exclude_items' => '',
 'expired' => 'Caducat',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Caduca',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -441,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',
@@ -501,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',
@@ -703,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',
@@ -789,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' => '',
@@ -1165,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' => '',
@@ -1437,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',

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 (732), 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' => 'Expirované dokumenty',
 'documents_in_process' => 'Zpracovávané dokumenty',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Vámi uzamčené dokumenty',
@@ -467,15 +468,16 @@ URL: [url]',
 'exclude_items' => '',
 'expired' => 'Platnost vypršela',
 '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',
-'expire_in_1w' => '',
+'expire_in_1w' => 'Expiruje za týden',
-'expire_in_1y' => '',
+'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',
@@ -492,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',
@@ -1304,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',

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 (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',
@@ -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',
@@ -432,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',
@@ -478,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',
@@ -659,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',
@@ -1217,7 +1219,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',
@@ -1365,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',

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' => '',
@@ -415,6 +416,7 @@ $text = array(
 'exclude_items' => '',
 'expired' => 'Έχει λήξει',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Λήγει',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1171,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' => '',

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 (1615), 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',
@@ -479,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',
@@ -1056,7 +1058,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 +1214,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',
@@ -1360,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',

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 (1040), 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',
@@ -467,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' => '',
@@ -579,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' => '',
@@ -807,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
@@ -1310,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',
@@ -1327,7 +1333,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' => '',

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 (1065), 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_approval' => 'Confirmer l’approbation',
-'add_attrdefgroup' => '',
+'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_receipt' => 'Confirmer la réception',
-'add_review' => 'Soumettre la correction',
+'add_review' => 'Confirmer la vérification',
-'add_revision' => '',
+'add_revision' => 'Confirmer l’approbation',
-'add_role' => '',
+'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_accepted' => '[no_approvals] approbations déjà confirmées',
-'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_accepted' => '[no_approvals] approbations et [no_reviews] vérifications déjà confirmées',
-'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_not_touched' => '[no_approvals] approbations et [no_reviews] vérifications non amorcées',
-'approvals_and_reviews_rejected' => '',
+'approvals_and_reviews_rejected' => '[no_approvals] approbations et [no_reviews] vérifications déjà rejetées',
-'approvals_not_touched' => '',
+'approvals_not_touched' => '[no_approvals] approbations non amorcées',
-'approvals_rejected' => '',
+'approvals_rejected' => '[no_approvals] approbations déjà rejetées',
-'approvals_without_group' => '',
+'approvals_without_group' => 'Approbations sans groupe',
-'approvals_without_user' => '',
+'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_docspermonth_title' => 'Nouveaux documents par mois',
-'chart_docsperstatus_title' => 'Documents par status',
+'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 périmés',
 '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_receipt' => 'Documents en attente de confirmation de réception',
-'documents_to_review' => 'Documents en attente de correction',
+'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_approval' => 'Ébauche - en attente d’approbation',
-'draft_pending_review' => 'Ebauche - En cours de correction',
+'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',
@@ -479,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',
@@ -564,13 +566,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_receipt_summary' => 'Vue d’ensemble groupe réception',
-'group_review_summary' => 'Résumé groupe correcteur',
+'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 +594,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 +622,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 +651,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_group' => 'Veuillez sélectionner un groupe d’examinateurs',
-'js_no_review_status' => 'Veuillez sélectionner le statut de correction',
+'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 +672,9 @@ URL: [url]',
 'librarydoc' => '',
 'linked_documents' => 'Documents liés',
 'linked_files' => 'Fichiers attachés',
-'linked_to_current_version' => '',
+'linked_to_current_version' => 'Lié à la version actuelle',
-'linked_to_document' => '',
+'linked_to_document' => 'Lié au document',
-'linked_to_this_version' => '',
+'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 +693,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 +791,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_receipt' => 'Aucune confirmation de réception de document n’est requise',
-'no_docs_to_review' => 'Aucun document en attente de correction',
+'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 +803,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_receipt_needed' => 'Il n’y a actuellement aucun document nécessitant une confirmation de réception.',
-'no_review_needed' => 'Aucune correction en attente',
+'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 +856,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_approvals' => 'Approbations en attente',
-'pending_receipt' => '',
+'pending_receipt' => 'Réceptions en attente',
-'pending_reviews' => '',
+'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 +872,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' => 'Processus',
-'process_without_user_group' => '',
+'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_accepted' => '[no_receipts] réceptions déjà confirmées',
-'receipts_not_touched' => '',
+'receipts_not_touched' => '[no_receipts] réceptions non amorcées',
-'receipts_rejected' => '',
+'receipts_rejected' => '[no_receipts] réceptions déjà rejetées',
-'receipts_without_group' => '',
+'receipts_without_group' => 'Réceptions sans groupe',
-'receipts_without_user' => '',
+'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 +892,21 @@ Destinataire : [recipient]
 Utilisateur : [username]
 URL : [url]',
 'receipt_deletion_email_subject' => '[sitename] : [name] - Destinataire supprimé',
-'receipt_log' => '',
+'receipt_log' => 'Journal des réceptions',
-'receipt_request_email_body' => '',
+'receipt_request_email_body' => 'Demande de réception
-'receipt_request_email_subject' => '',
+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_summary' => 'Vue d’ensemble réception',
-'receipt_update_failed' => '',
+'receipt_update_failed' => 'La confirmation de réception a échoué',
-'reception' => '',
+'reception' => 'Réception',
-'reception_acknowleged' => '',
+'reception_acknowleged' => 'Réception confirmée',
-'reception_noaction' => '',
+'reception_noaction' => 'Aucune action',
-'reception_rejected' => '',
+'reception_rejected' => 'Réception rejetée',
 'recipients' => 'Destinataires',
 'redraw' => 'Redessiner',
 'refresh' => 'Actualiser',
@@ -913,7 +920,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,26 +942,36 @@ URL: [url]',
 'return_from_subworkflow_email_body' => '',
 'return_from_subworkflow_email_subject' => '',
 'reverse_links' => 'Documents liés au document courant',
-'reviewers' => 'Correcteurs',
+'reviewers' => 'Examinateurs',
-'reviewer_already_assigned' => 'est déjà déclaré en tant que correcteur',
+'reviewer_already_assigned' => 'est déjà déclaré en tant qu’examinateur',
-'reviewer_already_removed' => 'a déjà été retiré du processus de correction ou a déjà soumis une correction',
+'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' => '',
+'reviews_accepted' => '[no_reviews] vérifications déjà confirmées',
-'reviews_not_touched' => '',
+'reviews_not_touched' => '[no_reviews] vérifications non amorcées',
-'reviews_rejected' => '',
+'reviews_rejected' => '[no_reviews] vérifications déjà rejetées',
-'reviews_without_group' => '',
+'reviews_without_group' => 'Vérifications sans groupe',
-'reviews_without_user' => '',
+'reviews_without_user' => 'Vérifications sans utilisateur',
-'review_deletion_email' => 'Demande de correction supprimée',
+'review_deletion_email' => 'Demande de vérification supprimée',
-'review_deletion_email_body' => '',
+'review_deletion_email_body' => 'Demande de vérification supprimée
-'review_deletion_email_subject' => '',
+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' => 'Demande de vérification',
-'review_request_email_body' => '',
+'review_request_email_body' => 'Demande de vérification
-'review_request_email_subject' => '',
+Document : [name]
-'review_status' => 'Statut de correction',
+Version : [version]
-'review_submit_email' => 'Correction soumise',
+Dossier parent : [folder_path]
-'review_submit_email_body' => 'Correction soumise
+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]
@@ -962,19 +979,19 @@ Commentaire: [comment]
 Dossier parent : [folder_path]
 Utilisateur : [username]
 URL : [url]',
-'review_submit_email_subject' => '[sitename]: [name] - Correction soumise',
+'review_submit_email_subject' => '[sitename] : [name] - Vérification faite',
-'review_summary' => 'Sommaire de correction',
+'review_summary' => 'Vue d’ensemble vérification',
-'review_update_failed' => 'Erreur lors de la mise à jour de la correction. Echec de la mise à jour.',
+'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_pending' => '[no_revisions] révisions à venir en attente',
-'revisions_rejected' => '',
+'revisions_rejected' => '[no_revisions] révisions déjà rejetées',
-'revisions_without_group' => '',
+'revisions_without_group' => 'Approbations sans groupe',
-'revisions_without_user' => '',
+'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 +1005,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 +1018,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 +1028,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 +1072,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 +1098,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 +1116,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' => 'Répertoire de sauvegarde',
-'settings_backupDir_desc' => '',
+'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 +1173,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' => 'Activer la réception de document',
-'settings_enableAcknowledgeWorkflow_desc' => '',
+'settings_enableAcknowledgeWorkflow_desc' => 'Activer cette option pour permettre de confirmer la réception de document dans le workflow.',
-'settings_enableAdminReceipt' => '',
+'settings_enableAdminReceipt' => 'Réception de document autorisée par l’administrateur',
-'settings_enableAdminReceipt_desc' => '',
+'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 +1211,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' => 'Notification examinateur/approbateur',
-'settings_enableNotificationAppRev_desc' => 'Cochez pour envoyer une notification au correcteur/approbateur quand une nouvelle version du document est ajoutée',
+'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' => 'Réception de document autorisée par le propriétaire',
-'settings_enableOwnerReceipt_desc' => '',
+'settings_enableOwnerReceipt_desc' => 'Activer cette option pour permettre au propriétaire du document d’être listé en tant que destinataire.',
-'settings_enableOwnerRevApp' => 'Autoriser correction/approbbation pour le propriétaire',
+'settings_enableOwnerRevApp' => 'Autoriser vérification/approbation par 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_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' => 'Autoriser vérification/approbation par 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_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' => 'Réception de document modifiable',
-'settings_enableUpdateReceipt_desc' => '',
+'settings_enableUpdateReceipt_desc' => 'Activer cette option pour permettre à l’utilisateur qui a accusé une réception de modifier sa décision.',
-'settings_enableUpdateRevApp' => 'Autorise la modification de révisions et approbations existantes',
+'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 +1268,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' => 'État initial d’un document',
-'settings_initialDocumentStatus_desc' => '',
+'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 +1288,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',
@@ -1310,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',
@@ -1363,7 +1391,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 +1402,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 +1430,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 +1444,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_group' => 'Groupe modifié',
-'splash_edit_role' => '',
+'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 +1457,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 +1465,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 +1481,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_receipted' => 'Pas encore réceptionné',
-'status_not_reviewed' => 'Non corrigé',
+'status_not_reviewed' => 'Non vérifié',
 'status_not_revised' => '',
-'status_receipted' => '',
+'status_receipted' => 'Réceptionné',
-'status_receipt_rejected' => '',
+'status_receipt_rejected' => 'Rejeté',
-'status_recipient_removed' => '',
+'status_recipient_removed' => 'Destinataire retiré de la liste',
-'status_reviewed' => 'Corrigé',
+'status_reviewed' => 'Vérifié',
-'status_reviewer_rejected' => 'Correction rejetée',
+'status_reviewer_rejected' => 'Ébauche rejetée',
-'status_reviewer_removed' => 'Correcteur retiré du processus',
+'status_reviewer_removed' => 'Examinateur retiré du processus',
 'status_revised' => '',
 'status_revision_rejected' => 'Rejeté',
 'status_revision_sleeping' => '',
@@ -1475,14 +1503,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_receipt' => 'Confirmer la réception',
-'submit_review' => 'Soumettre la correction',
+'submit_review' => 'Soumettre la vérification',
 'submit_revision' => '',
 'submit_userinfo' => 'Soumettre info',
-'subsribe_timelinefeed' => '',
+'subsribe_timelinefeed' => 'S’abonner au flux RSS',
-'substitute_to_user' => '',
+'substitute_to_user' => 'Basculer sur \'[username]\'',
 'substitute_user' => 'Utilisateur de substitution',
 'success_add_aro' => '',
 'success_add_permission' => 'Permission ajoutée',
@@ -1519,12 +1547,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 +1566,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 +1582,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 +1598,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_recipients' => 'Mettre à jour la liste des destinataires',
-'update_reviewers' => 'Mise à jour de la liste de correcteurs',
+'update_reviewers' => 'Mettre à jour la liste des examinateurs',
 'update_revisors' => '',
 'update_transmittalitem' => '',
 'uploaded_by' => 'Déposé par',
@@ -1591,12 +1619,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 +1653,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_state' => 'État de workflow',
-'workflow_states_management' => 'Gestion d\'états 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_summary' => 'Vue d’ensemble du workflow',
-'workflow_transition_without_user_group' => '',
+'workflow_transition_without_user_group' => 'Au moins une transition a ni utilisateur, ni groupe !',
-'workflow_user_summary' => 'Résumé d\'utilisateur',
+'workflow_user_summary' => 'Vue d’ensemble de l’utilisateur',
 'year_view' => 'Vue annuelle',
 'yes' => 'Oui',
 'zh_CN' => 'Chinois (CN)',

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',
@@ -472,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' => '',
@@ -1331,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',

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,6 +319,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Dokumentumok',
 'documents_checked_out_by_you' => '',
+'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',
@@ -467,15 +468,16 @@ URL: [url]',
 'exclude_items' => 'Kizárt elemek',
 'expired' => 'Lejárt',
 'expired_at_date' => '',
+'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_1m' => 'Érvényesség egy hónapon belül',
-'expire_in_1w' => '',
+'expire_in_1w' => 'Érvényesség egy héten belül',
-'expire_in_1y' => '',
+'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',
@@ -572,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' => '',
@@ -852,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' => '',
@@ -860,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',
@@ -1309,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',
@@ -1584,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ó',

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 (1571), 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' => 'Documenti scaduti',
 'documents_in_process' => 'Documenti in lavorazione',
 'documents_locked' => 'Documenti bloccati',
 'documents_locked_by_you' => 'Documenti bloccati da te',
@@ -473,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' => '',
@@ -858,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' => '',
@@ -866,8 +868,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' => 'Processi',
-'process_without_user_group' => '',
+'process_without_user_group' => 'Processi senza Utente/Gruppo',
 'pt_BR' => 'Portoghese (BR)',
 'quota' => 'Quota',
 'quota_exceeded' => 'La quota-disco è stata superata di [bytes].',
@@ -1218,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.',
@@ -1343,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',
@@ -1618,12 +1624,12 @@ 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',
 'user_exists' => 'Utente già esistente',
-'user_group' => '',
+'user_group' => 'Utente/Gruppo',
 'user_group_management' => 'Gestione Utenti/Gruppi',
 'user_image' => 'Immagine',
 'user_info' => 'Informazioni utente',

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' => '당신에 의해 잠긴 문서',
@@ -473,6 +474,7 @@ URL: [url]',
 'exclude_items' => '항목 제외',
 'expired' => '만료됨',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => '만료하기',
 'expire_by_date' => '지정일에 만료',
 'expire_in_1d' => '1일 후 만료',
@@ -1325,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' => '사용자의 할당량',

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 (739), 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' => 'Verlopen documenten',
 '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',
@@ -465,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' => '',
@@ -850,7 +852,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' => '',
@@ -1337,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',
@@ -1612,12 +1618,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',

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 (785), 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' => 'Wygasłe dokumenty',
 'documents_in_process' => 'Dokumenty procesowane',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Dokumenty zablokowane przez Ciebie',
@@ -460,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' => '',
@@ -845,7 +847,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 +1051,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 +1069,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 +1154,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.',
@@ -1289,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',
@@ -1327,11 +1333,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_name' => 'po nazwie',
-'settings_sortFoldersDefault_val_sequence' => '',
+'settings_sortFoldersDefault_val_sequence' => 'po sekwencji',
-'settings_sortFoldersDefault_val_unsorted' => '',
+'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',

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 (963), 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' => 'Documentos Expirados',
 'documents_in_process' => 'Documentos em Processo',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Documentos bloqueados por você',
@@ -466,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' => '',
@@ -658,7 +660,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' => '',
@@ -1142,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' => '',
@@ -1307,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',

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',
@@ -472,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' => '',
@@ -664,7 +666,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' => '',
@@ -1332,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',

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' => 'Документы, заблокированные вами',
@@ -472,6 +473,7 @@ URL: [url]',
 'exclude_items' => 'Не показывать события:',
 'expired' => 'Срок действия вышел',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Срок действия',
 'expire_by_date' => 'дата',
 'expire_in_1d' => '',
@@ -1339,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' => 'Квота пользователя',

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',
@@ -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',
@@ -419,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' => '',
@@ -776,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.',
@@ -1164,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' => '',

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',
@@ -460,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' => '',
@@ -656,7 +658,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 +820,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 +1100,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' => 'Konvertera till PDF för förhandsgranskning',
-'settings_convertToPdf_desc' => '',
+'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 +1169,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 +1177,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',
@@ -1295,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',
@@ -1312,7 +1323,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' => '',

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',
@@ -466,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' => '',
@@ -1311,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ı',

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' => 'Документи, які ви заблокували',
@@ -472,6 +473,7 @@ URL: [url]',
 'exclude_items' => 'Виключені елементи',
 'expired' => 'Термін виконання вийшов',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Термін виконання виходить',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1332,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' => 'Квота користувача',

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' => '被您鎖定的文檔',
@@ -419,6 +420,7 @@ URL: [url]',
 'exclude_items' => '',
 'expired' => '過期',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => '有效限期',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1164,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' => '',

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);

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,23 +116,36 @@ if (isset($_GET["groupid"])) {
 	}
 }
 
-// Change owner -----------------------------------------------------------
+$newowner = null;
-if ($action == "setowner") {
+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) {
+	if (empty($_GET["ownerid"])) {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_user"));	
+		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)) {
+$controller->setParam('document', $document);
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_user"));	
+$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"));
 }
-	$oldOwner = $document->getOwner();
+
-	if($document->setOwner($newOwner)) {
+// Change owner -----------------------------------------------------------
-		// Send notification to subscribers.
+if ($action == "setowner") {
+	if($oldowner->getID() != $newowner->getID()) {
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();
@@ -135,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['old_owner'] = $oldowner->getFullName();
-			$params['new_owner'] = $newOwner->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;
@@ -144,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);
-
 		}
 	}
 }
@@ -153,8 +172,6 @@ if ($action == "setowner") {
 // Change to not inherit ---------------------------------------------------
 else if ($action == "notinherit") {
 
-	$defAccess = $document->getDefaultAccess();
-	if($document->setInheritAccess(false)) {
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();
@@ -174,40 +191,9 @@ else if ($action == "notinherit") {
 
 		}
 }
-	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);
-	}
-}
 
 // Change to inherit-----------------------------------------------------
 else if ($action == "inherit") {
-	if($document->clearAccessList() && $document->setInheritAccess(true)) {
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();
@@ -224,14 +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($document->setDefaultAccess($mode)) {
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();
@@ -248,38 +231,6 @@ 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);
 		}
 }
 

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()) {
+$oldname = $document->getName();
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
+$oldcomment = $document->getComment();
-		foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
+$oldcategories = $document->getCategories();
-			if (method_exists($hookObj, 'preSetExpires')) {
+$oldkeywords = $document->getKeywords();
-				$hookObj->preSetExpires(null, array('document'=>$document, 'expires'=>&$expires));
+$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,136 +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 ($oldkeywords != $keywords) {
-
-	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"));
-	}
 }
 
 $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_document_edited')));

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;
+}
+
+?>

out/out.Search.php

@@ -399,10 +399,13 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 			}
 		}
 	}
-
+	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;
 // }}}
 }
 

out/out.ViewDocument.php

@@ -45,7 +45,7 @@ if (!is_object($document)) {
 
 $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"));
 }
 

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 = new SeedDMS_Core_DatabaseAccess($settings->_dbDriver, $settings->_dbHostname, $settings->_dbUser, $settings->_dbPass, $settings->_dbDatabase);
-$db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostname . "\"");
+//$db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostname . "\"");
-$dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
+//$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++;
 			}
@@ -966,6 +970,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();
@@ -1389,6 +1440,7 @@ $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->post('/groups', 'createGroup');
 $app->get('/groups/:id', 'getGroup');
 $app->put('/groups/:id/addUser', 'addUserToGroup');

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')) {
@@ -796,6 +801,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "      <li><a href=\"../out/out.Timeline.php\">".getMLText("timeline")."</a></li>\n";
 		if ($this->check_access('ObjectCheck'))
 		echo "      <li><a href=\"../out/out.ObjectCheck.php\">".getMLText("objectcheck")."</a></li>\n";
+		if ($this->check_access('ExpiredDocuments'))
+		echo "      <li><a href=\"../out/out.ExpiredDocuments.php\">".getMLText("documents_expired")."</a></li>\n";
 		if ($this->check_access('ExtensionMgr'))
 		echo "      <li><a href=\"../out/out.ExtensionMgr.php\">".getMLText("extension_manager")."</a></li>\n";
 		if ($this->check_access('ClearCache'))
@@ -998,6 +1005,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";

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:
@@ -98,7 +98,6 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		$previewconverters = $this->params['previewconverters'];
 		$timeout = $this->params['timeout'];
 
-		$latestContent = $document->getLatestContent();
 		$status = $version->getStatus();
 		$reviewStatus = $version->getReviewStatus();
 		$approvalStatus = $version->getApprovalStatus();
@@ -259,7 +258,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>";
 		}

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>

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("expired_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();
+	} /* }}} */
+}
+?>

views/bootstrap/class.Settings.php

@@ -850,7 +850,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>";
 									}

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, 'viewitem');
 				if(is_string($txt))
 					$content = $txt;
 				else 
@@ -449,7 +449,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);
@@ -462,8 +462,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 {