Merge branch 'seeddms-5.1.x'

CHANGELOG

@@ -1,12 +1,36 @@
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.12
+--------------------------------------------------------------------------------
+- fix for CVE-2019-12932 (Persistent or Stored XSS), excaping the search
+  result in the autocompletion search form placed in the header
+- fix more XSS problems on ViewDocument page
+- folder/document list can be sorted by name, date, sequence (ascending or descending)
+- search result can be sorted by name, date (ascending or descending)
+- do not check for Log.php during installation anymore, it's part of the
+  vendor directory anyway
+- fix uploading documents from drop folder
+- replace placeholders in email body header and footer
+- SeedDMS_EmailNotify::toIndividual() can send attachments
+- fix for searching a document with the same name, which sometimes found a duplicate
+  name even if it didn't exist
+- add config option for checking of duplicate subfolder names in the same folder
+- rest api also checks for duplicate folder/document names if turned on
+- before moving a document/folder the target folder is checked for an object with
+  the same name, if this is turned on in the configuration
+- new controller EmptyFolder (currently not used)
+- check for duplicate mails to the same group when a workflow was triggered
+- new hook to output clipboard items
+- turn on load on demand again in the folder tree
+
 --------------------------------------------------------------------------------
                      Changes in version 5.1.11
 --------------------------------------------------------------------------------
 - fix for CVE-2019-12744 (Remote Command Execution through unvalidated
   file upload), add .htaccess file to data directory, better documentation
-	for installing seeddms
+       for installing seeddms
 - fix for CVE-2019-12745 (Persistent or Stored XSS in UsrMgr) and
   CVE-2019-12801 (Persistent or Stored XSS in GroupMgr), propperly escape
-	strings used in Select2 js library used by UsrMgr and GroupMgr
+       strings used in Select2 js library used by UsrMgr and GroupMgr
 - do not show attributes in search results in extra column anymore
 - fix setting language during login (Closes #437)
 - fix indexing documents even if no preIndexDocument hook is set (Closes #437)
@@ -61,7 +85,7 @@
 - catch error when updating a document fails (Closes #410)
 - use always 'Send from' address as Return-Path when set, only if not set the
   logged in user's email will be used (Closes #418)
-- show the debug output when sending a test mail
+- show the debug output when sendind a test mail
 - add hooks add hooks folderListPreContent and folderListPostContent in
   class.ViewFolder.php
 - do not redirect to ForcePassword page if out.Logout.php was opened. This

Makefile

@@ -7,7 +7,8 @@ NODISTFILES=utils/importmail.php utils/seedddms-importmail utils/remote-email-up
 EXTENSIONS := \
 	dynamic_content.tar.gz\
 	login_action.tar.gz\
-	example.tar.gz
+	example.tar.gz\
+	tbs_template.tar.gz
 
 PHPDOC=~/Downloads/phpDocumentor-2.8.1/bin/phpdoc
 
@@ -39,10 +40,12 @@ webapp:
 repository:
 	mkdir -p tmp/seeddms-repository-$(VERSION)
 	cp -a repository/www repository/utils repository/doc tmp/seeddms-repository-$(VERSION)
+	rm -f tmp/seeddms-repository/utils/update-repository.log
 	mkdir -p tmp/seeddms-repository-$(VERSION)/files
 	mkdir -p tmp/seeddms-repository-$(VERSION)/accounts
 	cp -a repository/files/.htaccess tmp/seeddms-repository-$(VERSION)/files
 	cp -a repository/accounts/.htaccess tmp/seeddms-repository-$(VERSION)/accounts
+	cp inc/inc.ClassExtensionMgr.php tmp/seeddms-repository-$(VERSION)/utils
 	(cd tmp; tar --exclude=.svn -czvf ../seeddms-repository-$(VERSION).tar.gz seeddms-repository-$(VERSION))
 	rm -rf tmp
 
@@ -55,6 +58,9 @@ example.tar.gz: ext/example
 login_action.tar.gz: ext/login_action
 	tar czvf login_action.tar.gz ext/login_action
 
+tbs_template.tar.gz: ext/tbs_template
+	tar czvf tbs_template.tar.gz ext/tbs_template
+
 extensions: $(EXTENSIONS)
 
 doc:

SeedDMS_Core/Core/inc.ClassDMS.php

@@ -376,7 +376,7 @@ class SeedDMS_Core_DMS {
 		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '5.1.11';
+			$this->version = '5.1.12';
 	} /* }}} */
 
 	/**
@@ -1307,6 +1307,14 @@ class SeedDMS_Core_DMS {
 	 * @return array|bool
 	 */
 	function search($query, $limit=0, $offset=0, $logicalmode='AND', $searchin=array(), $startFolder=null, $owner=null, $status = array(), $creationstartdate=array(), $creationenddate=array(), $modificationstartdate=array(), $modificationenddate=array(), $categories=array(), $attributes=array(), $mode=0x3, $expirationstartdate=array(), $expirationenddate=array()) { /* {{{ */
+		$orderby = '';
+		if(is_array($query)) {
+			foreach(array('limit', 'offset', 'logicalmode', 'searchin', 'startFolder', 'owner', 'status', 'creationstartdate', 'creationenddate', 'modificationstartdate', 'modificationenddate', 'categories', 'attributes', 'mode', 'expirationstartdate', 'expirationenddate') as $paramname)
+				${$paramname} = isset($query[$paramname]) ? $query[$paramname] : ${$paramname};
+			foreach(array('orderby') as $paramname)
+				${$paramname} = isset($query[$paramname]) ? $query[$paramname] : '';
+			$query = isset($query['query']) ? $query['query'] : '';
+		}
 		// Split the search string into constituent keywords.
 		$tkeys=array();
 		if (strlen($query)>0) {
@@ -1433,6 +1441,23 @@ class SeedDMS_Core_DMS {
 					// Prepare the complete search query, including the LIMIT clause.
 					$searchQuery = "SELECT DISTINCT `tblFolders`.`id` ".$searchQuery." GROUP BY `tblFolders`.`id`";
 
+					switch($orderby) {
+					case 'dd':
+						$searchQuery .= " ORDER BY `tblFolders`.`date` DESC";
+						break;
+					case 'da':
+					case 'd':
+						$searchQuery .= " ORDER BY `tblFolders`.`date`";
+						break;
+					case 'nd':
+						$searchQuery .= " ORDER BY `tblFolders`.`name` DESC";
+						break;
+					case 'na':
+					default:
+						$searchQuery .= " ORDER BY `tblFolders`.`name`";
+						break;
+                    }
+
 					if($limit) {
 						$searchQuery .= " LIMIT ".$limit." OFFSET ".$offset;
 					}
@@ -1663,6 +1688,23 @@ class SeedDMS_Core_DMS {
 					"`tblDocumentContent`.`version`, ".
 					"`tblDocumentStatusLog`.`status`, `tblDocumentLocks`.`userID` as `lockUser` ".$searchQuery;
 
+				switch($orderby) {
+				case 'dd':
+					$orderbyQuery = " ORDER BY `tblDocuments`.`date` DESC";
+					break;
+				case 'da':
+				case 'd':
+					$orderbyQuery = " ORDER BY `tblDocuments`.`date`";
+					break;
+				case 'nd':
+					$orderbyQuery = " ORDER BY `tblDocuments`.`name` DESC";
+					break;
+				case 'na':
+				default:
+					$orderbyQuery = " ORDER BY `tblDocuments`.`name`";
+					break;
+				}
+
 				// calculate the remaining entrїes of the current page
 				// If page is not full yet, get remaining entries
 				if($limit) {
@@ -1672,6 +1714,9 @@ class SeedDMS_Core_DMS {
 							$offset -= $totalFolders;
 						else
 							$offset = 0;
+
+						$searchQuery .= $orderbyQuery;
+
 						if($limit)
 							$searchQuery .= " LIMIT ".$limit." OFFSET ".$offset;
 
@@ -1683,11 +1728,13 @@ class SeedDMS_Core_DMS {
 						$resArr = array();
 					}
 				} else {
+					$searchQuery .= $orderbyQuery;
+
 					// Send the complete search query to the database.
 					$resArr = $this->db->getResultArray($searchQuery);
 					if($resArr === false)
 						return false;
-					}
+				}
 
 				// ------------------- Ausgabe der Ergebnisse ----------------------------
 				$numResults = count($resArr);

SeedDMS_Core/Core/inc.ClassDocument.php

@@ -519,6 +519,24 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		return true;
 	} /* }}} */
 
+	/**
+	 * Check, if this document is below of a given folder
+	 *
+	 * @param object $folder parent folder
+	 * @return boolean true if folder is a subfolder
+	 */
+	function isDescendant($folder) { /* {{{ */
+		/* First check if the parent folder is folder looking for */
+		if ($this->getFolder()->getID() == $folder->getID())
+			return true;
+		/* Second, check for the parent folder of this document to be
+		 * below the given folder
+		 */
+		if($this->getFolder()->isDescendant($folder))
+			return true;
+		return false;
+	} /* }}} */
+
 	/**
 	 * Return the parent folder of the document
 	 *
@@ -1795,7 +1813,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		$status = $version->getStatus();
 		$stID = $status["statusID"];
 
-		$queryStr = "DELETE FROM `tblDocumentContent` WHERE `document` = " . $this->getID() .	" AND `version` = " . $version->_version;
+		$queryStr = "DELETE FROM `tblDocumentContent` WHERE `document` = " . $this->getID() .	" AND `version` = " . $version->getVersion();
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
 			return false;
@@ -1813,7 +1831,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 		}
 
-		$queryStr = "DELETE FROM `tblDocumentStatus` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
+		$queryStr = "DELETE FROM `tblDocumentStatus` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->getVersion()."'";
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
 			return false;
@@ -1843,7 +1861,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 				return false;
 			}
 		}
-		$queryStr = "DELETE FROM `tblDocumentReviewers` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
+		$queryStr = "DELETE FROM `tblDocumentReviewers` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->getVersion()."'";
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
 			return false;
@@ -1872,26 +1890,26 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 				return false;
 			}
 		}
-		$queryStr = "DELETE FROM `tblDocumentApprovers` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
+		$queryStr = "DELETE FROM `tblDocumentApprovers` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->getVersion()."'";
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
 			return false;
 		}
 
-		$queryStr = "DELETE FROM `tblWorkflowDocumentContent` WHERE `document` = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
+		$queryStr = "DELETE FROM `tblWorkflowDocumentContent` WHERE `document` = '". $this->getID() ."' AND `version` = '" . $version->getVersion()."'";
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
 			return false;
 		}
 
-		$queryStr = "DELETE FROM `tblWorkflowLog` WHERE `document` = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
+		$queryStr = "DELETE FROM `tblWorkflowLog` WHERE `document` = '". $this->getID() ."' AND `version` = '" . $version->getVersion()."'";
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
 			return false;
 		}
 
 		// remove document files attached to version
-		$res = $this->getDocumentFiles($version->_version);
+		$res = $this->getDocumentFiles($version->getVersion());
 		if (is_bool($res) && !$res) {
 			$db->rollbackTransaction();
 			return false;
@@ -2635,6 +2653,70 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
  * @version    Release: @package_version@
  */
 class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
+	/**
+	 * @var object document
+	 */
+	protected $_document;
+
+	/**
+	 * @var integer version
+	 */
+	protected $_version;
+
+	/**
+	 * @var string comment
+	 */
+	protected $_comment;
+
+	/**
+	 * @var string date
+	 */
+	protected $_date;
+
+	/**
+	 * @var integer userID
+	 */
+	protected $_userID;
+
+	/**
+	 * @var string dir on disk (deprecated)
+	 */
+	protected $_dir;
+
+	/**
+	 * @var string original file name
+	 */
+	protected $_orgFileName;
+
+	/**
+	 * @var string file type (actually the extension without the leading dot)
+	 */
+	protected $_fileType;
+
+	/**
+	 * @var string mime type
+	 */
+	protected $_mimeType;
+
+	/**
+	 * @var string checksum of content
+	 */
+	protected $_checksum;
+
+	/**
+	 * @var object workflow
+	 */
+	protected $_workflow;
+
+	/**
+	 * @var object workflow state
+	 */
+	protected $_workflowState;
+
+	/**
+	 * @var object dms
+	 */
+	public $_dms;
 
 	/**
 	 * Recalculate the status of a document
@@ -2727,7 +2809,10 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	function getOriginalFileName() { return $this->_orgFileName; }
 	function getFileType() { return $this->_fileType; }
 	function getFileName(){ return $this->_version . $this->_fileType; }
-	function getDir() { return $this->_dir; }
+	/**
+	 * getDir and the corresponding database table field are deprecated
+	 */
+	function __getDir() { return $this->_dir; }
 	function getMimeType() { return $this->_mimeType; }
 	function getDocument() { return $this->_document; }
 

SeedDMS_Core/Core/inc.ClassFolder.php

@@ -520,6 +520,26 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		return $resArr[0]['c'];
 	} /* }}} */
 
+	/**
+	 * Check if folder has as subfolder with given name
+	 *
+	 * @param string $name
+	 * @return bool true if subfolder exists, false if not or in case
+	 * of an error
+	 */
+	function hasSubFolderByName($name) { /* {{{ */
+		$db = $this->_dms->getDB();
+		/* Always check the database instead of iterating over $this->_documents, because
+		 * it is probably not slower
+		 */
+		$queryStr = "SELECT count(*) as c FROM `tblFolders` WHERE `parent` = " . $this->_id . " AND `name` = ".$db->qstr($name);
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && !$resArr)
+			return false;
+
+		return ($resArr[0]['c'] > 0);
+	} /* }}} */
+
 	/**
 	 * Returns a list of subfolders
 	 * This function does not check for access rights. Use
@@ -539,9 +559,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		if (!isset($this->_subFolders)) {
 			$queryStr = "SELECT * FROM `tblFolders` WHERE `parent` = " . $this->_id;
 
-			if ($orderby=="n") $queryStr .= " ORDER BY `name`";
+			if ($orderby && $orderby[0]=="n") $queryStr .= " ORDER BY `name`";
-			elseif ($orderby=="s") $queryStr .= " ORDER BY `sequence`";
+			elseif ($orderby && $orderby[0]=="s") $queryStr .= " ORDER BY `sequence`";
-			elseif ($orderby=="d") $queryStr .= " ORDER BY `date`";
+			elseif ($orderby && $orderby[0]=="d") $queryStr .= " ORDER BY `date`";
 			if($dir == 'desc')
 				$queryStr .= " DESC";
 			if(is_int($limit) && $limit > 0) {
@@ -672,15 +692,11 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 	 * @return boolean true if folder is a subfolder
 	 */
 	function isDescendant($folder) { /* {{{ */
-		if ($this->_parentID == $folder->getID())
+		if(!$this->getParent())
-			return true;
-		elseif (isset($this->_parentID)) {
-			$res = $this->getParent();
-			if (!$res) return false;
-
-			return $this->_parent->isDescendant($folder);
-		} else
 			return false;
+		if($this->getParent()->getID() == $folder->getID())
+			return true;
+		return $this->getParent()->isDescendant($folder);
 	} /* }}} */
 
 	/**
@@ -713,10 +729,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 	 */
 	function hasDocumentByName($name) { /* {{{ */
 		$db = $this->_dms->getDB();
-		if (isset($this->_documents)) {
+		/* Always check the database instead of iterating over $this->_documents, because
-			/** @noinspection PhpUndefinedFieldInspection */ /** @todo not $this->_documents? */
+		 * it is probably not slower
-			return count($this->documents);
+		 */
-		}
 		$queryStr = "SELECT count(*) as c FROM `tblDocuments` WHERE `folder` = " . $this->_id . " AND `name` = ".$db->qstr($name);
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && !$resArr)
@@ -743,9 +758,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 
 		if (!isset($this->_documents)) {
 			$queryStr = "SELECT * FROM `tblDocuments` WHERE `folder` = " . $this->_id;
-			if ($orderby=="n") $queryStr .= " ORDER BY `name`";
+			if ($orderby && $orderby[0]=="n") $queryStr .= " ORDER BY `name`";
-			elseif($orderby=="s") $queryStr .= " ORDER BY `sequence`";
+			elseif($orderby && $orderby[0]=="s") $queryStr .= " ORDER BY `sequence`";
-			elseif($orderby=="d") $queryStr .= " ORDER BY `date`";
+			elseif($orderby && $orderby[0]=="d") $queryStr .= " ORDER BY `date`";
 			if($dir == 'desc')
 				$queryStr .= " DESC";
 			if(is_int($limit) && $limit > 0) {
@@ -1023,6 +1038,12 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 	 * Remove recursively a folder
 	 *
 	 * Removes a folder, all its subfolders and documents
+	 * This method triggers the callbacks onPreRemoveFolder and onPostRemoveFolder.
+	 * If onPreRemoveFolder returns a boolean then this method will return
+	 * imediately with the value returned by the callback. Otherwise the
+	 * regular removal is executed, which in turn
+	 * triggers further onPreRemoveFolder and onPostRemoveFolder callbacks
+	 * and its counterparts for documents (onPreRemoveDocument, onPostRemoveDocument).
 	 *
 	 * @return boolean true on success, false in case of an error
 	 */
@@ -1078,6 +1099,62 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		return $ret;
 	} /* }}} */
 
+	/**
+	 * Empty recursively a folder
+	 *
+	 * Removes all subfolders and documents of a folder but not the folder itself
+	 * This method will call remove() on all its children.
+	 * This method triggers the callbacks onPreEmptyFolder and onPostEmptyFolder.
+	 * If onPreEmptyFolder returns a boolean then this method will return
+	 * imediately.
+	 * Be aware that the recursive calls of remove() will trigger the callbacks
+	 * onPreRemoveFolder, onPostRemoveFolder, onPreRemoveDocument and onPostRemoveDocument.
+	 *
+	 * @return boolean true on success, false in case of an error
+	 */
+	function emptyFolder() { /* {{{ */
+		/** @noinspection PhpUnusedLocalVariableInspection */
+		$db = $this->_dms->getDB();
+
+		/* Check if 'onPreEmptyFolder' callback is set */
+		if(isset($this->_dms->callbacks['onPreEmptyFolder'])) {
+			foreach($this->_dms->callbacks['onPreEmptyFolder'] as $callback) {
+				$ret = call_user_func($callback[0], $callback[1], $this);
+				if(is_bool($ret))
+					return $ret;
+			}
+		}
+
+		//Entfernen der Unterordner und Dateien
+		$res = $this->getSubFolders();
+		if (is_bool($res) && !$res) return false;
+		$res = $this->getDocuments();
+		if (is_bool($res) && !$res) return false;
+
+		foreach ($this->_subFolders as $subFolder) {
+			$res = $subFolder->remove();
+			if (!$res) {
+				return false;
+			}
+		}
+
+		foreach ($this->_documents as $document) {
+			$res = $document->remove();
+			if (!$res) {
+				return false;
+			}
+		}
+
+		/* Check if 'onPostEmptyFolder' callback is set */
+		if(isset($this->_dms->callbacks['onPostEmptyFolder'])) {
+			foreach($this->_dms->callbacks['onPostEmptyFolder'] as $callback) {
+				call_user_func($callback[0], $callback[1], $this);
+			}
+		}
+
+		return true;
+	} /* }}} */
+
 	/**
 	 * Returns a list of access privileges
 	 *

SeedDMS_Core/package.xml

@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2019-05-03</date>
+ <date>2019-07-01</date>
  <time>07:31:17</time>
  <version>
-  <release>5.1.11</release>
+  <release>5.1.12</release>
-  <api>5.1.11</api>
+  <api>5.1.12</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,7 +24,12 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-???
+- parameter $orderby passed to SeedDMS_Core_Folder::getDocuments() and SeedDMS_Core_Folder::getSubFolders() can be a string, but only the first char is evaluated
+- SeedDMS_Core_DMS::search() excepts parameters as array, added orderby
+- add SeedDMS_Core_Folder::hasSubFolderByName()
+- fix SeedDMS_Core_Folder::hasDocumentByName() which returned an int > 0 if documents
+  has been loaded before and even if the document searching for was not among them.
+- add new method SeedDMS_Core_Folder::empty()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1651,5 +1656,21 @@ fix php warning if workflow state doesn' have next transition
 add method SeedDMS_Core_DatabaseAccess::setLogFp()
    </notes>
   </release>
+  <release>
+   <date>2019-05-03</date>
+   <time>07:31:17</time>
+   <version>
+    <release>5.1.11</release>
+    <api>5.1.11</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+???
+   </notes>
+  </release>
  </changelog>
 </package>

conf/settings.xml.template

@@ -248,6 +248,7 @@
        - enableVersionDeletion: allow to delete versions after approval
        - enableVersionModification: allow to modify versions after approval
        - enableDuplicateDocNames: allow duplicate names in a folder
+       - enableDuplicateSubFolderNames: allow duplicate names in a folder
        - enableOwnerRevApp: XXX
        - enableSelfRevApp: XXX
        - presetExpirationDate: XXX
@@ -260,6 +261,7 @@
       enableVersionDeletion = "true"
       enableVersionModification = "true"
       enableDuplicateDocNames = "true"
+      enableDuplicateSubFolderNames = "true"
       enableOwnerRevApp = "false"
       enableSelfRevApp = "false"
       presetExpirationDate = ""

controllers/class.Download.php

@@ -28,25 +28,29 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 
 		switch($type) {
 			case "version":
-				$version = $this->params['version'];
+				if(empty($this->params['content'])) {
-				$document = $this->params['document'];
+					$version = $this->params['version'];
-				if($version < 1) {
+					$document = $this->params['document'];
-					$content = $this->callHook('documentLatestContent', $document);
+					if($version < 1) {
-					if($content === null)
+						$content = $this->callHook('documentLatestContent', $document);
-						$content = $document->getLatestContent();
+						if($content === null)
+							$content = $document->getLatestContent();
+					} else {
+						$content = $this->callHook('documentContent', $document, $version);
+						if($content === null)
+							$content = $document->getContentByVersion($version);
+					}
+					if (!is_object($content)) {
+						$this->errormsg = 'invalid_version';
+						return false;
+					}
+					/* set params['content'] for compatiblity with older extensions which
+					 * expect the content in the controller
+					 */
+					$this->params['content'] = $content;
 				} else {
-					$content = $this->callHook('documentContent', $document, $version);
+					$content = $this->params['content'];
-					if($content === null)
-						$content = $document->getContentByVersion($version);
 				}
-				if (!is_object($content)) {
-					$this->errormsg = 'invalid_version';
-					return false;
-				}
-				/* set params['content'] for compatiblity with older extensions which
-				 * expect the content in the controller
-				 */
-				$this->params['content'] = $content;
 				if(null === $this->callHook('version')) {
 					if(file_exists($dms->contentDir . $content->getPath())) {
 						header("Content-Transfer-Encoding: binary");

controllers/class.EmptyFolder.php

@@ -0,0 +1,76 @@
+<?php
+/**
+ * Implementation of EmptyFolder 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_EmptyFolder extends SeedDMS_Controller_Common {
+
+	public function run() {
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$settings = $this->params['settings'];
+		$folder = $this->params['folder'];
+		$index = $this->params['index'];
+		$indexconf = $this->params['indexconf'];
+
+		/* Get the document id and name before removing the document */
+		$foldername = $folder->getName();
+		$folderid = $folder->getID();
+
+		if(false === $this->callHook('preEmptyFolder')) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_preEmptyFolder_failed';
+			return null;
+		}
+
+		$result = $this->callHook('emptyFolder', $folder);
+		if($result === null) {
+			/* Register a callback which removes each document from the fulltext index
+			 * The callback must return null other the removal will be canceled.
+			 */
+			function removeFromIndex($arr, $document) {
+				$index = $arr[0];
+				$indexconf = $arr[1];
+				$lucenesearch = new $indexconf['Search']($index);
+				if($hit = $lucenesearch->getDocument($document->getID())) {
+					$index->delete($hit->id);
+					$index->commit();
+				}
+				return null;
+			}
+			if($index)
+				$dms->setCallback('onPreEmptyDocument', 'removeFromIndex', array($index, $indexconf));
+
+			if (!$folder->emptyFolder()) {
+				$this->errormsg = 'error_occured';
+				return false;
+			}
+		} elseif($result === false) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_emptyFolder_failed';
+			return false;
+		}
+
+		if(!$this->callHook('postEmptyFolder')) {
+		}
+
+		return true;
+	}
+}

inc/inc.ClassEmailNotify.php

@@ -76,9 +76,10 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 	 * @param string $message key of string containing the body of the mail
 	 * @param array $params list of parameters which replaces placeholder in
 	 *        the subject and body
+	 * @param array $attachments list of attachments
 	 * @return false or -1 in case of error, otherwise true
 	 */
-	function toIndividual($sender, $recipient, $subject, $message, $params=array()) { /* {{{ */
+	function toIndividual($sender, $recipient, $subject, $message, $params=array(), $attachments=array()) { /* {{{ */
 		if(is_object($recipient) && !strcasecmp(get_class($recipient), $this->_dms->getClassname('user')) && !$recipient->isDisabled() && $recipient->getEmail()!="") {
 			$to = $recipient->getEmail();
 			$lang = $recipient->getLanguage();
@@ -106,8 +107,34 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 		}
 
 
-		$message = getMLText("email_header", array(), "", $lang)."\r\n\r\n".getMLText($message, $params, "", $lang);
+		$message = getMLText("email_header", $params, "", $lang)."\r\n\r\n".getMLText($message, $params, "", $lang);
-		$message .= "\r\n\r\n".getMLText("email_footer", array(), "", $lang);
+		$message .= "\r\n\r\n".getMLText("email_footer", $params, "", $lang);
+
+		$mime = new Mail_mime(array('eol' => "\n"));
+
+		$mime->setTXTBody($message);
+//		$mime->setHTMLBody($bodyhtml);
+
+		if($attachments) {
+			foreach($attachments as $attachment) {
+				if(!$mime->addAttachment(
+					$attachment['file'],
+					$attachment['mimetype'],
+					isset($attachment['name']) ? $attachment['name'] : '',
+					isset($attachment['isfile']) ? $attachment['isfile'] : true
+				)) {
+					return false;
+				}
+			}
+		}
+
+		$message = $mime->get(array(
+			'text_encoding'=>'8bit',
+			'html_encoding'=>'8bit',
+			'head_charset'=>'utf-8',
+			'text_charset'=>'utf-8',
+			'html_charset'=>'utf-8'
+		));
 
 		$headers = array ();
 		$headers['From'] = $from;
@@ -119,7 +146,9 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 		$headers['Subject'] = substr($encoded_subject, strlen('Subject: '));
 		$headers['Date'] = date('r', time());
 		$headers['MIME-Version'] = "1.0";
-		$headers['Content-type'] = "text/plain; charset=utf-8";
+//		$headers['Content-type'] = "text/plain; charset=utf-8";
+
+		$hdrs = $mime->headers($headers);
 
 		$mail_params = array();
 		if($this->smtp_server) {
@@ -146,13 +175,13 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 		if (isset($GLOBALS['SEEDDMS_HOOKS']['mailqueue'])) {
 			foreach($GLOBALS['SEEDDMS_HOOKS']['mailqueue'] as $queueService) {
         if(method_exists($queueService, 'queueMailJob')) {
-					$ret = $queueService->queueMailJob($mail_params, $to, $headers, getMLText($subject, $params, "", $lang), $message);
+					$ret = $queueService->queueMailJob($mail_params, $to, $hdrs, getMLText($subject, $params, "", $lang), $message);
 					if($ret !== null)
 						return $ret;
         }
 			}
 		}
-		$result = $mail->send($to, $headers, $message);
+		$result = $mail->send($to, $hdrs, $message);
 		if (PEAR::isError($result)) {
 			return false;
 		} else {

inc/inc.ClassSettings.php

@@ -147,6 +147,8 @@ class Settings { /* {{{ */
 	var $_enableVersionModification = false;
 	// enable/disable duplicate names of a document in a folder
 	var $_enableDuplicateDocNames = true;
+	// enable/disable duplicate names of a subfolder in a folder
+	var $_enableDuplicateSubFolderNames = true;
 	// override mimetype set by browser when uploading a file
 	var $_overrideMimeType = false;
 	// enable/disable notification when added as a reviewer/approver
@@ -652,6 +654,7 @@ class Settings { /* {{{ */
 			$this->_enableVersionDeletion = Settings::boolval($tab["enableVersionDeletion"]);
 			$this->_enableVersionModification = Settings::boolval($tab["enableVersionModification"]);
 			$this->_enableDuplicateDocNames = Settings::boolval($tab["enableDuplicateDocNames"]);
+			$this->_enableDuplicateSubFolderNames = Settings::boolval($tab["enableDuplicateSubFolderNames"]);
 			$this->_overrideMimeType = Settings::boolval($tab["overrideMimeType"]);
 			$this->_removeFromDropFolder = Settings::boolval($tab["removeFromDropFolder"]);
 		}
@@ -965,6 +968,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableVersionDeletion", $this->_enableVersionDeletion);
     $this->setXMLAttributValue($node, "enableVersionModification", $this->_enableVersionModification);
     $this->setXMLAttributValue($node, "enableDuplicateDocNames", $this->_enableDuplicateDocNames);
+    $this->setXMLAttributValue($node, "enableDuplicateSubFolderNames", $this->_enableDuplicateSubFolderNames);
     $this->setXMLAttributValue($node, "overrideMimeType", $this->_overrideMimeType);
     $this->setXMLAttributValue($node, "removeFromDropFolder", $this->_removeFromDropFolder);
 
@@ -1413,7 +1417,7 @@ class Settings { /* {{{ */
 		}
 
 		// Check PHP version
-		if (version_compare(PHP_VERSION, '5.2.0') < 0) {
+		if (version_compare(PHP_VERSION, '5.6.38') < 0) {
 			$result["php_version"] = array(
 				"status" => "versiontolow",
 				"type" => "error",
@@ -1452,6 +1456,8 @@ class Settings { /* {{{ */
 		}
 
 		// Check for Log.php
+		// Do not check for Log anymore, because it is in the vendor directory
+		/*
 		if (!Settings::findInIncPath('Log.php')) {
 			$result["pear_log"] = array(
 				"status" => "notfound",
@@ -1459,6 +1465,7 @@ class Settings { /* {{{ */
 				"suggestion" => "install_pear_package_log"
 			);
 		}
+		 */
 
 		// Check for HTTP/WebDAV/Server.php
 		if (!Settings::findInIncPath('HTTP/WebDAV/Server.php')) {

inc/inc.Utils.php

@@ -480,21 +480,35 @@ function checkQuota($user) { /* {{{ */
 	return ($quota - $user->getUsedDiskSpace());
 } /* }}} */
 
-function encryptData($key, $value){
+/**
+ * Encrypt any data with a key
+ *
+ * @param string $key
+ * @param string $value plain text data
+ * @return string encrypted data
+ */
+function encryptData($key, $value) { /* {{{ */
   $text = $value;
   $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
   $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
   $crypttext = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $key, $text, MCRYPT_MODE_ECB, $iv);
   return $crypttext;
-}
+} /* }}} */
 
-function decryptData($key, $value){
+/**
+ * Decrypt data previously encrypted by encrypt
+ *
+ * @param string $key
+ * @param string $value encrypted data
+ * @return string plain text data
+ */
+function decryptData($key, $value) { /* {{{ */
   $crypttext = $value;
   $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
   $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
   $decrypttext = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, $crypttext, MCRYPT_MODE_ECB, $iv);
   return trim($decrypttext);
-}
+} /* }}} */
 
 /**
  * Return file extension for a give mimetype
@@ -574,4 +588,56 @@ function sendFile($filename) { /* {{{ */
 		readfile($filename);
 	}
 } /* }}} */
+
+class SeedDMS_CSRF {
+
+	protected $secret;
+
+	public function __construct($secret) {
+		$this->secret = $secret;
+	}
+
+	public function create_api_key() {
+		return base64_encode($this->encrypt(time().'|'.$_SERVER['REMOTE_ADDR'])); // !change if you dont want IP check
+	}
+
+	public function check_api_key($key, $timeout = 5) {
+		if (empty($key)) exit('Invalid Key');
+
+		$keys = explode('|', $this->decrypt(base64_decode($key)));
+
+		return (
+			isset($key, $keys[0], $keys[1]) && 
+			$keys[0] >= (time() - $timeout) && 
+			$keys[1] == $_SERVER['REMOTE_ADDR'] // !change if you dont want IP check
+		);
+	}
+
+	public function encrypt($string, $key = 'PrivateKey', $method = 'AES-256-CBC') {
+		// hash
+		$key = hash('sha256', $key);
+		// create iv - encrypt method AES-256-CBC expects 16 bytes
+		$iv = substr(hash('sha256', $this->secret), 0, 16);
+		// encrypt
+		$output = openssl_encrypt($string, $method, $key, 0, $iv);
+		// encode
+		return base64_encode($output);
+	}
+
+	public function decrypt($string, $key = 'PrivateKey', $method = 'AES-256-CBC') {
+		// hash
+		$key = hash('sha256', $key);
+		// create iv - encrypt method AES-256-CBC expects 16 bytes
+		$iv = substr(hash('sha256', $this->secret), 0, 16);
+		// decode
+		$string = base64_decode($string);
+		// decrypt
+		return openssl_decrypt($string, $method, $key, 0, $iv);
+	}
+}
+
+//$CSRF = new SeedDMS_CSRF($settings->_encryptionKey);
+//$kkk = $CSRF->create_api_key();
+//echo $kkk;
+//echo $CSRF->check_api_key($kkk) ? 'valid' : 'invalid';
 ?>

inc/inc.Version.php

@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "5.1.11";
+	public $_number = "5.1.12";
 	private $_string = "SeedDMS";
 
 	function __construct() {

languages/ar_EG/lang.inc

@@ -283,6 +283,7 @@ URL: [url]',
 'confirm_rm_user' => 'هل تود حقا ازالة المستخدم "[username]"?<br>كن حذرا: هذا الاجراء لايمكن التراجع فيه',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'هل تود حقا ازالة الاصدار [version] الخاص بالمستند "[documentname]"?<br>كن حذرا: هذا الاجراء لايمكن التراجع فيه',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '',
 'content' => 'المحتوى',
@@ -702,6 +703,7 @@ URL: [url]',
 'linked_to_document' => 'ﺮﺒﻃ ﺐﻤﻠﻓ ﺄﺧﺭ',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'اذا كنت تود تحميل ملفات اكبر من حجم الملفات المتاحة حاليا, من فضلك استخدم البديل <a href="%s">صفحة التحميل</a>.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'ﻉﺮﺿ ﻚﻟ ﺎﻠﺻﻼﺤﻳﺎﺗ',
 'list_contains_no_access_docs' => '',
@@ -922,6 +924,7 @@ URL: [url]',
 'receipt_status' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1231,6 +1234,8 @@ URL: [url]',
 'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => '',
 'settings_enableDuplicateDocNames_desc' => 'Allows to have duplicate document names in a folder.',
+'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames_desc' => '',
 'settings_enableEmail' => '',
 'settings_enableEmail_desc' => 'Enable/disable automatic email notification',
 'settings_enableFilterReceipt' => '',
@@ -1498,6 +1503,9 @@ URL: [url]',
 'sign_out' => 'تسجيل الخروج',
 'sign_out_user' => 'تسجيل خروج مستخدم',
 'sk_SK' => 'السلوفاكية',
+'sort_by_date' => '',
+'sort_by_name' => '',
+'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'المساحة المستخدمة لمجلد البيانات',
 'splash_added_to_clipboard' => 'ﺖﻣ ﺎﻠﻨﺴﺧ ﻒﻳ ﺎﻠﺣﺎﻔﻇﺓ',
 'splash_add_access' => '',
@@ -1536,6 +1544,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
+'splash_link_document' => '',
 'splash_moved_clipboard' => '',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1566,6 +1575,7 @@ URL: [url]',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1592,6 +1602,7 @@ URL: [url]',
 'status_revisor_removed' => '',
 'status_unknown' => 'مجهول',
 'storage_size' => 'حجم التخزين',
+'subfolder_duplicate_name' => '',
 'submit_2_fact_auth' => '',
 'submit_approval' => 'ادخال موافقة',
 'submit_login' => 'تسجيل الدخول',
@@ -1654,6 +1665,7 @@ URL: [url]',
 'toggle_manager' => 'رجح مدير',
 'toggle_qrcode' => '',
 'to_before_from' => '',
+'transfer_content' => '',
 'transfer_document' => 'ﺕﺮﺠﻣ ﺎﻠﻤﻠﻓ',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',

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 (858)
+//    Translators: Admin (861)
 
 $text = array(
 '2_factor_auth' => '',
@@ -266,6 +266,7 @@ $text = array(
 'confirm_rm_user' => 'Изтрий потребител "[username]"?<br>Действието е перманентно',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Изтрий версия на [version] документ "[documentname]"?<br>Действието е перманентно',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '',
 'content' => 'Съдържание',
@@ -631,6 +632,7 @@ $text = array(
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Ако искате да качите файлове над текущия лимит, използвайте друг <a href="%s">начин</a>.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Списък на права',
 'list_contains_no_access_docs' => '',
@@ -821,6 +823,7 @@ $text = array(
 'receipt_status' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1094,6 +1097,8 @@ $text = array(
 'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => 'Разреши еднакви имена на документи',
 'settings_enableDuplicateDocNames_desc' => 'Разрешава да има еднакви имена на документи в папката.',
+'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames_desc' => '',
 'settings_enableEmail' => 'Включи E-mail',
 'settings_enableEmail_desc' => 'Включване/изключване автоматично уведомяване по email',
 'settings_enableFilterReceipt' => '',
@@ -1361,6 +1366,9 @@ $text = array(
 'sign_out' => 'изход',
 'sign_out_user' => '',
 'sk_SK' => 'Словашки',
+'sort_by_date' => 'Сортирай по дата"',
+'sort_by_name' => 'Сортирай по име',
+'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'Размер на каталога с данните',
 'splash_added_to_clipboard' => 'Добавено към клипборда',
 'splash_add_access' => '',
@@ -1399,6 +1407,7 @@ $text = array(
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
+'splash_link_document' => '',
 'splash_moved_clipboard' => '',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1429,6 +1438,7 @@ $text = array(
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1455,6 +1465,7 @@ $text = array(
 'status_revisor_removed' => '',
 'status_unknown' => 'Неизвестен',
 'storage_size' => 'Размер на хранилището',
+'subfolder_duplicate_name' => '',
 'submit_2_fact_auth' => '',
 'submit_approval' => 'Утвърди',
 'submit_login' => 'Влез',
@@ -1517,6 +1528,7 @@ $text = array(
 'toggle_manager' => 'Превключи мениджър',
 'toggle_qrcode' => '',
 'to_before_from' => '',
+'transfer_content' => '',
 'transfer_document' => 'Прехвърли документ',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',
@@ -1631,7 +1643,7 @@ $text = array(
 'workflow_summary' => 'Резюме за процес',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Резюме за потребител',
-'x_more_objects' => '',
+'x_more_objects' => 'още [number] документа',
 'year_view' => 'годишен изглед',
 'yes' => 'Да',
 'zh_CN' => 'Китайски (Китай)',

languages/ca_ES/lang.inc

@@ -271,6 +271,7 @@ URL: [url]',
 'confirm_rm_user' => '¿Vol realment eliminar l\'usuari "[username]"?<br />Atenció: aquesta acció no es pot desfer.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '¿Vol realment eliminar la versió [version] del document "[documentname]"?<br />Atenció: aquesta acció no es pot desfer.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '',
 'content' => 'Contingut',
@@ -636,6 +637,7 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => '',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Llista tots els tipus d\'accés...',
 'list_contains_no_access_docs' => '',
@@ -826,6 +828,7 @@ URL: [url]',
 'receipt_status' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1099,6 +1102,8 @@ URL: [url]',
 'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => '',
 'settings_enableDuplicateDocNames_desc' => '',
+'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames_desc' => '',
 'settings_enableEmail' => 'Enable E-mail',
 'settings_enableEmail_desc' => '',
 'settings_enableFilterReceipt' => '',
@@ -1366,6 +1371,9 @@ URL: [url]',
 'sign_out' => 'desconnectar',
 'sign_out_user' => '',
 'sk_SK' => 'Eslovac',
+'sort_by_date' => '',
+'sort_by_name' => '',
+'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'Espai utilitzat a la carpeta de dades',
 'splash_added_to_clipboard' => 'Emmagatzemat al portapapers',
 'splash_add_access' => '',
@@ -1404,6 +1412,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
+'splash_link_document' => '',
 'splash_moved_clipboard' => '',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1434,6 +1443,7 @@ URL: [url]',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1460,6 +1470,7 @@ URL: [url]',
 'status_revisor_removed' => '',
 'status_unknown' => 'Desconegut',
 'storage_size' => 'Storage size',
+'subfolder_duplicate_name' => '',
 'submit_2_fact_auth' => '',
 'submit_approval' => 'Enviar aprovació',
 'submit_login' => 'Connectat',
@@ -1522,6 +1533,7 @@ URL: [url]',
 'toggle_manager' => 'Intercanviar manager',
 'toggle_qrcode' => '',
 'to_before_from' => '',
+'transfer_content' => '',
 'transfer_document' => 'transferir document',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => 'transferir sense poder escriure',

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 (1523), kreml (579)
+//    Translators: Admin (1525), kreml (579)
 
 $text = array(
 '2_factor_auth' => 'dvoufaktorové ověření',
@@ -295,6 +295,7 @@ URL: [url]',
 'confirm_rm_user' => 'Opravdu chcete odstranit uživatele "[username]"?<br>Pozor: Akce je nevratná.',
 'confirm_rm_user_from_processes' => 'Opravdu chcete odstranit uživatele "[username]" ze všech procesů? <br> Pozor: Tato akce může vést k uvolnění dokumentů, pokud byl uživatel jediným nebo posledním schvalujícím.',
 'confirm_rm_version' => 'Opravdu chcete odstranit verzi [version] dokumentu "[documentname]"?<br>Buďte opatrní: Tuto činnost není možné vrátit zpět.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => 'Opravdu chcete přenést dokumenty, složky atd. Uživatele "[username]"? <br> Pozor: Tuto akci nelze vrátit zpět.',
 'confirm_update_transmittalitem' => 'Potvrďte aktualizaci',
 'content' => 'Domů',
@@ -740,6 +741,7 @@ URL: [url]',
 'linked_to_document' => 'Provázáno s dokumentem',
 'linked_to_this_version' => 'Provázáno odkazem s touto verzí',
 'link_alt_updatedocument' => 'Chcete-li nahrát soubory větší než je maximální velikost pro nahrávání, použijte prosím <a href="%s">alternativní stránku</a>.',
+'link_document' => '',
 'link_to_version' => 'Provázat k verzi',
 'list_access_rights' => 'Seznam všech přístupových práv ...',
 'list_contains_no_access_docs' => 'Seznam obsahuje více dokumentů, ke kterým nemáte přístup a které se nezobrazují.',
@@ -975,6 +977,7 @@ URL: [url]',
 'receipt_status' => 'Status',
 'receipt_summary' => 'Souhrn přijetí',
 'receipt_update_failed' => 'Potvrzení že přijetí se nezdařilo',
+'recent_uploads' => '',
 'reception' => 'Přijetí',
 'reception_acknowleged' => 'Přijetí potvrzeno',
 'reception_noaction' => 'Žádná akce',
@@ -1310,6 +1313,8 @@ Jméno: [username]
 'settings_enableDropUpload_desc' => 'Povolit / zakázat pokládácí prostor na stránce \'Zobrazení složek\' pro upload souborů pomocí Drag&Drop.',
 'settings_enableDuplicateDocNames' => 'Povolit duplicitu názvů dokumentů',
 'settings_enableDuplicateDocNames_desc' => 'Povolit duplicitu názvů dokumentů ve složce',
+'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames_desc' => '',
 'settings_enableEmail' => 'Zapnout E-mail',
 'settings_enableEmail_desc' => 'Zapne / Vypne automatická e-mailová upozornění',
 'settings_enableFilterReceipt' => 'Filtrování vlastníka, recenzenta, ... ze seznamu přijetí',
@@ -1552,7 +1557,7 @@ Jméno: [username]
 'settings_updateDatabase' => 'Spustit skripty pro aktualizaci schématu databáze',
 'settings_updateNotifyTime' => 'Update Notify Time',
 'settings_updateNotifyTime_desc' => 'Uživatelé jsou informováni o změnách dokumentů, ke kterým došlo v posledních sekundách \'Aktualizace upozornění\'',
-'settings_upgrade_php' => 'Aktualizujte PHP alespoň na verzi 5.2.0',
+'settings_upgrade_php' => 'Aktualizujte PHP alespoň na verzi 5.6.38',
 'settings_versioningFileName' => 'Verzování názvu souboru',
 'settings_versioningFileName_desc' => 'Název souboru s informacemi o verzích vytvořeném nástrojem pro zálohování',
 'settings_versiontolow' => 'Příliš nízká verze',
@@ -1577,6 +1582,9 @@ Jméno: [username]
 'sign_out' => 'Odhlásit',
 'sign_out_user' => 'Odhlášení uživatele',
 'sk_SK' => 'Slovenština',
+'sort_by_date' => '',
+'sort_by_name' => 'Třídit podle jména',
+'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'Použité místo pro data složky',
 'splash_added_to_clipboard' => 'Přidáno do schránky',
 'splash_add_access' => 'Přidáno Přístupové právo',
@@ -1615,6 +1623,7 @@ Jméno: [username]
 'splash_inherit_access' => 'Přístupové právo bude zděděno',
 'splash_invalid_folder_id' => 'Neplatné ID složky',
 'splash_invalid_searchterm' => 'Neplatný vyhledávací dotaz',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Schránka přenesena do aktuální složky',
 'splash_move_document' => 'Dokument přesunut',
 'splash_move_folder' => 'Složka přesunuta',
@@ -1645,6 +1654,7 @@ Jméno: [username]
 'splash_substituted_user' => 'Zaměněný uživatel',
 'splash_switched_back_user' => 'Přepnuto zpět na původního uživatele',
 'splash_toogle_group_manager' => 'Manažer skupiny přepnut',
+'splash_transfer_content' => '',
 'splash_transfer_document' => 'Dokument přenesen',
 'splash_transfer_objects' => 'Objekt přenesen',
 'splash_trigger_workflow' => 'Spuštěn přechod workflow',
@@ -1671,6 +1681,7 @@ Jméno: [username]
 'status_revisor_removed' => 'Kontrolor odstraněn ze seznamu',
 'status_unknown' => 'Neznámý',
 'storage_size' => 'Velikost úložiště',
+'subfolder_duplicate_name' => '',
 'submit_2_fact_auth' => 'Poslán tajný kód',
 'submit_approval' => 'Poslat ke schválení',
 'submit_login' => 'Přihlásit se',
@@ -1733,6 +1744,7 @@ Jméno: [username]
 'toggle_manager' => 'Přepnout správce',
 'toggle_qrcode' => 'Zobrazit / skrýt QR kód',
 'to_before_from' => 'Datum ukončení nesmí být před datem zahájení',
+'transfer_content' => '',
 'transfer_document' => 'Přenést dokument',
 'transfer_no_read_access' => 'Uživatel nemá přístup ke čtení ve složce',
 'transfer_no_write_access' => 'Uživatel nemá přístup k zápisu do složky',

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 (2654), dgrutsch (22)
+//    Translators: Admin (2695), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -48,7 +48,7 @@ URL: [url]',
 'action_approve' => 'Freigeben',
 'action_complete' => 'Komplett',
 'action_is_complete' => 'Ist komplett',
-'action_is_not_complete' => 'Ist Nicht komplett',
+'action_is_not_complete' => 'Ist nicht komplett',
 'action_reject' => 'Ablehnen',
 'action_review' => 'Prüfen',
 'action_revise' => 'Erneut prüfen',
@@ -86,12 +86,12 @@ URL: [url]',
 'all_documents' => 'Alle Dokumente',
 'all_pages' => 'Alle',
 'all_users' => 'Alle Benutzer',
-'already_subscribed' => 'Bereits aboniert',
+'already_subscribed' => 'Bereits abonniert',
 'and' => 'und',
 'apply' => 'Anwenden',
 'approvals_accepted' => '[no_approvals] Freigaben',
 'approvals_and_reviews_accepted' => '[no_approvals] Freigaben und [no_reviews] Prüfungen',
-'approvals_and_reviews_not_touched' => '[no_approvals] offene Freigaben und [no_reviews] offenen Prüfungen',
+'approvals_and_reviews_not_touched' => '[no_approvals] offene Freigaben und [no_reviews] offene Prüfungen',
 'approvals_and_reviews_rejected' => '[no_approvals] abgelehnte Freigaben und [no_reviews] abgelehnte Prüfungen',
 'approvals_not_touched' => '[no_approvals] offene Freigaben',
 'approvals_rejected' => '[no_approvals] abgelehnte Freigaben',
@@ -131,7 +131,7 @@ URL: [url]',
 'approval_update_failed' => 'Störung bei der Aktualisierung des Berechtigungsstatus. Aktualisierung gescheitert',
 'approvers' => 'Freigebender',
 'approver_already_assigned' => 'Freigeber bereits zugewiesen',
-'approver_already_removed' => 'Freigeber wurde bereits aus dem Freigabevorgang         entfernt oder hat die Freigabe bereits abgeschlossen',
+'approver_already_removed' => 'Freigeber wurde bereits aus dem Freigabevorgang entfernt oder hat die Freigabe bereits abgeschlossen',
 'april' => 'April',
 'archive' => 'Archiv',
 'archive_creation' => 'Archiv erzeugen',
@@ -255,7 +255,7 @@ URL: [url]',
 'choose_attrdefgroup' => 'Attributgruppe wählen',
 'choose_category' => 'Kategorie wählen',
 'choose_group' => 'Gruppe wählen',
-'choose_role' => 'Role wählen',
+'choose_role' => 'Rolle wählen',
 'choose_target_category' => 'Kategorie wählen',
 'choose_target_document' => 'Dokument wählen',
 'choose_target_file' => 'Datei wählen',
@@ -276,7 +276,7 @@ URL: [url]',
 'comment_for_current_version' => 'Kommentar zur aktuellen Version',
 'configure_extension' => 'Erweiterung konfigurieren',
 'confirm_clear_cache' => 'Wollen Sie wirklich den Cache löschen? Dies entfernt alle vorberechneten Vorschaubilder.',
-'confirm_create_fulltext_index' => 'Ja, Ich möchte den Volltextindex neu erzeugen!.',
+'confirm_create_fulltext_index' => 'Ja, Ich möchte den Volltext-Index neu erzeugen!.',
 'confirm_move_document' => 'Dokument wirklich verschieben?',
 'confirm_move_folder' => 'Ordner wirklich verschieben?',
 'confirm_pwd' => 'Passwort-Bestätigung',
@@ -290,11 +290,12 @@ URL: [url]',
 'confirm_rm_folder_files' => 'Möchten Sie wirklich alle Dateien und Unterordner des Ordner "[foldername]" löschen?<br>Vorsicht: Diese Operation kann nicht rückgängig gemacht werden.',
 'confirm_rm_group' => 'Möchten Sie wirklich die Gruppe "[groupname]" löschen?<br />Beachten Sie, dass diese Operation nicht rückgängig gemacht werden kann.',
 'confirm_rm_log' => 'Möchten Sie wirklich die Log-Datei "[logname]" löschen?<br />Beachten Sie, dass diese Operation nicht rückgängig gemacht werden kann.',
-'confirm_rm_transmittal' => 'Bitte bestätigen Sie as Löschen der Dokumentenliste.',
+'confirm_rm_transmittal' => 'Bitte bestätigen Sie das Löschen der Dokumentenliste.',
 'confirm_rm_transmittalitem' => 'Löschen bestätigen',
 'confirm_rm_user' => 'Möchten Sie wirklich den Benutzer "[username]" löschen?<br />Beachten Sie, dass diese Operation nicht rückgängig gemacht werden kann.',
 'confirm_rm_user_from_processes' => 'Möchten Sie wirklich den Benutzer "[username]" aus allen Prozessen löschen?<br />Beachten Sie, dass dies möglicherweise in der Freigabe von Dokumenten resultiert, wenn der Benutzer der einzige oder letzte Prüfer ist.',
 'confirm_rm_version' => 'Wollen Sie die Version [version] des Dokumentes "[documentname]" wirklich löschen?<br>Achtung: Dieser Vorgang kann nicht rückgängig gemacht werden.',
+'confirm_transfer_link_document' => 'Möchten Sie das Dokument verlinken oder dessen Inhalt auf das Zieldokument als neue Version übertragen. Der Inhalt kann nur übertragen werden, wenn das Ursprungsdokument lediglich eine Version hat. Das Ursprungsdokument wird danach gelöscht.',
 'confirm_transfer_objects' => 'Möchten Sie wirklich die Dokumente, Ordner, etc. des Benutzer "[username]" übertragen?<br />Beachten Sie, dass diese Operation nicht rückgängig gemacht werden kann.',
 'confirm_update_transmittalitem' => 'Aktualisierung bestätigen',
 'content' => 'Inhalt',
@@ -303,8 +304,8 @@ URL: [url]',
 'converter_new_mimetype' => 'Neuer Mime-Type',
 'copied_to_checkout_as' => 'Datei am [date] in den Checkout-Space als \'[filename]\' kopiert.',
 'create_download_link' => 'Erzeuge Download Link',
-'create_fulltext_index' => 'Erzeuge Volltextindex',
+'create_fulltext_index' => 'Erzeuge Volltext-Index',
-'create_fulltext_index_warning' => 'Sie möchten den Volltextindex neu erzeugen. Dies kann beträchtlich Zeit in Anspruch nehmen und Gesamtleistung Ihres System beeinträchtigen. Bestätigen Sie bitte diese Operation.',
+'create_fulltext_index_warning' => 'Sie möchten den Volltext-Index neu erzeugen. Dies kann beträchtlich Zeit in Anspruch nehmen und Gesamtleistung Ihres System beeinträchtigen. Bestätigen Sie bitte diese Operation.',
 'creation_date' => 'Erstellt am',
 'cs_CZ' => 'Tschechisch',
 'current_password' => 'Aktuelles Passwort',
@@ -332,7 +333,7 @@ URL: [url]',
 'documentcontent' => 'Dokumentenversion',
 'documents' => 'Dokumente',
 'documents_checked_out_by_you' => 'Von mir ausgecheckte Dokumente',
-'documents_expired' => 'Abgelaufende Dokumente',
+'documents_expired' => 'Abgelaufene Dokumente',
 'documents_in_process' => 'Dokumente in Bearbeitung',
 'documents_locked' => 'Gesperrte Dokumente',
 'documents_locked_by_you' => 'Von mir gesperrte Dokumente',
@@ -345,7 +346,7 @@ URL: [url]',
 'documents_to_revise' => 'Erneute Prüfung erforderlich',
 'documents_to_trigger_workflow' => 'Dokumente im Workflow',
 'documents_user_draft' => 'Entwürfe',
-'documents_user_expiration' => 'Abgelaufende Dokumente',
+'documents_user_expiration' => 'Abgelaufene Dokumente',
 'documents_user_needs_correction' => 'Dokumente, die korrigiert werden müssen',
 'documents_user_no_reception' => 'Dokumente ohne Empfangsbestätigung',
 'documents_user_obsolete' => 'Veraltete Dokumente',
@@ -497,7 +498,7 @@ Der Link ist bis zum [valid] gültig.
 'en_GB' => 'Englisch (GB)',
 'equal_transition_states' => 'Start- und Endstatus ѕind gleich',
 'error' => 'Fehler',
-'error_add_aro' => 'Fehler beim Hinzufügen des Zugriffsobjekt',
+'error_add_aro' => 'Fehler beim Hinzufügen des Zugriffsobjekts',
 'error_add_permission' => 'Fehler beim Hinzufügen der Berechtigung',
 'error_cleared_cache' => 'Fehler beim Löschen des Cache',
 'error_edit_task' => 'Fehler beim Speichern der Task',
@@ -522,7 +523,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',
+'expired_documents' => 'Abgelaufene Dokumente',
 'expires' => 'Ablaufdatum',
 'expire_by_date' => 'Ablauf nach Datum',
 'expire_in_1d' => 'Ablauf in 1 Tag',
@@ -613,7 +614,7 @@ URL: [url]',
 'from' => 'von',
 'fr_FR' => 'Französisch',
 'fullsearch' => 'Volltext',
-'fullsearch_hint' => 'Volltextindex benutzen',
+'fullsearch_hint' => 'Volltext-Index benutzen',
 'fulltextsearch_disabled' => 'Volltext-Index ist ausgeschaltet',
 'fulltext_converters' => 'Index Dokumentenumwandlung',
 'fulltext_info' => 'Volltext-Index Info',
@@ -739,6 +740,7 @@ URL: [url]',
 'linked_to_document' => 'Mit dem Dokument verknüpft',
 'linked_to_this_version' => 'Mit dieser Version verknüpft',
 'link_alt_updatedocument' => 'Wenn Sie ein Dokument hochladen möchten, das größer als die maximale Dateigröße ist, dann benutzen Sie bitte die alternative <a href="%s">Upload-Seite</a>.',
+'link_document' => 'Dokument verlinken',
 'link_to_version' => 'An Version hängen',
 'list_access_rights' => 'Alle Zugriffsrechte auflisten ...',
 'list_contains_no_access_docs' => 'Die Liste enthält weitere Dokumente auf die Sie keinen Zugriff haben und deshalb nicht angezeigt werden.',
@@ -835,7 +837,7 @@ URL: [url]',
 'new_subfolder_email_subject' => '[sitename]: [folder_name] - Neuer Ordner',
 'new_user_image' => 'Neues Bild',
 'next_state' => 'Neuer Status',
-'nl_NL' => 'Holländisch',
+'nl_NL' => 'Niederländisch',
 'no' => 'Nein',
 'notify_added_email' => 'Benachrichtigung per Mail wurde eingerichtet',
 'notify_added_email_body' => 'Added to notification list
@@ -909,22 +911,22 @@ URL: [url]',
 'password_expired' => 'Passwort ist abgelaufen',
 'password_expires_in_days' => 'Passwort läuft in %s Tagen ab.',
 'password_forgotten' => 'Passwort vergessen',
-'password_forgotten_email_body' => 'Sehr geehrter Anwender von SeedDMS,
+'password_forgotten_email_body' => 'Sehr geehrter Anwender von SeedDMS,
-
+
-wir haben einen Anfrage zum Zurücksetzen Ihres Passworts erhalten.
+wir haben einen Anfrage zum Zurücksetzen Ihres Passworts erhalten.
-
+
-Dies kann durch den folgenden Link erfolgen:
+Dies kann durch den folgenden Link erfolgen:
-
+
-[url_prefix]out/out.ChangePassword.php?hash=[hash]
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
-
+
-Sollen Sie danach immer noch Problem bei der Anmeldung haben, dann kontaktieren Sie bitte Ihren Adminstrator',
+Sollen Sie danach immer noch Probleme bei der Anmeldung haben, dann kontaktieren Sie bitte Ihren Adminstrator',
 'password_forgotten_email_subject' => '[sitename]: Passwort vergessen',
 'password_forgotten_send_hash' => 'Anweisungen zum weiteren Vorgehen wurden an die E-Mail Adresse des Benutzers versandt',
 'password_forgotten_text' => 'Füllen Sie bitte untenstehendes Formular aus. Weitere Anweisungen erhalten Sie dann in einer E-Mail die an Sie gesandt wird',
 'password_forgotten_title' => 'Passwort gesendet',
 'password_repeat' => 'Passwort wiederholen',
 'password_send' => 'Passwort verschickt',
-'password_send_text' => 'Ihr neues Passwort wurde an die angegebene E-Mail-Adresse versandt, wenn ein Benutzer mit diesem Login und dieser E-Mail-Adresse exitiert. Sollten Sie innerhalb der nächsten Minuten keine E-Mail bekommen, dann überprüfen Sie nochmal die Angaben und wiederholen Sie den Vorgang.',
+'password_send_text' => 'Ihr neues Passwort wurde an die angegebene E-Mail-Adresse versandt, wenn ein Benutzer mit diesem Login und dieser E-Mail-Adresse existiert. Sollten Sie innerhalb der nächsten Minuten keine E-Mail bekommen, dann überprüfen Sie nochmal die Angaben und wiederholen Sie den Vorgang.',
 'password_strength' => 'Passwortstärke',
 'password_strength_insuffient' => 'Ungenügend starkes Passwort',
 'password_wrong' => 'Falsches Passwort',
@@ -977,6 +979,7 @@ URL: [url]',
 'receipt_status' => 'Status',
 'receipt_summary' => 'Übersicht Bestätigungen',
 'receipt_update_failed' => 'Setzen der Empfangsbestätigung fehlgeschlagen',
+'recent_uploads' => 'Letzte Uploads',
 'reception' => 'Empfangsbestätigung',
 'reception_acknowleged' => 'Empfang bestätigt',
 'reception_noaction' => 'Keine Aktion',
@@ -1167,7 +1170,7 @@ URL: [url]',
 'search_mode_and' => 'alle Begriffe',
 'search_mode_documents' => 'Nur Dokumente',
 'search_mode_folders' => 'Nur Ordner',
-'search_mode_or' => 'min. ein Begriff',
+'search_mode_or' => 'mind. ein Begriff',
 'search_no_results' => 'Die Suche lieferte leider keine Treffer.',
 'search_query' => 'Suchbegriffe',
 'search_report' => 'Die Suche lieferte [doccount] Dokumente und [foldercount] Ordner in [searchtime] Sek.',
@@ -1213,7 +1216,7 @@ Name: [username]
 
 [comment]',
 'send_login_data_subject' => '[sitename]: [login] - Ihre Login-Daten',
-'send_test_mail' => 'Sende Test-Email',
+'send_test_mail' => 'Sende Test-E-mail',
 'september' => 'September',
 'sequence' => 'Reihenfolge',
 'seq_after' => 'Nach "[prevname]"',
@@ -1252,7 +1255,7 @@ Name: [username]
 'settings_checkOutDir' => 'Verzeichnis für ausgecheckte Dokumente',
 'settings_checkOutDir_desc' => 'Dies ist das Verzeichnis, in das Dokumenteninhalte bei einem Check out kopiert werden. Wenn dieses Verzeichnis für die Benutzer erreichbar ist, können die Dateien editiert und dann wieder eingecheckt werden.',
 'settings_cmdTimeout' => 'Timeout für externe Programme',
-'settings_cmdTimeout_desc' => 'Diese Zeit in Sekunden legt fest, wann ein externes Programm (z.B. für die Erstellung des Volltextindex) beendet wird.',
+'settings_cmdTimeout_desc' => 'Diese Zeit in Sekunden legt fest, wann ein externes Programm (z.B. für die Erstellung des Volltext-Index) beendet wird.',
 'settings_contentDir' => 'Content-Verzeichnis',
 'settings_contentDir_desc' => 'Verzeichnis, in dem die Dokumente gespeichert werden. Sie sollten ein Verzeichnis wählen, das nicht durch den Web-Server erreichbar ist.',
 'settings_contentOffsetDir' => 'Content Offset Directory',
@@ -1320,7 +1323,9 @@ Name: [username]
 'settings_enableDropUpload_desc' => 'Ein/Ausschalten des Bereichs auf der \'View Folder\' Seite zum Hochladen von Dateien per Drag&Drop.',
 'settings_enableDuplicateDocNames' => 'Erlaube doppelte Dokumentennamen',
 'settings_enableDuplicateDocNames_desc' => 'Erlaube doppelte Dokumentennamen in einem Ordner.',
-'settings_enableEmail' => 'E-mail aktivieren',
+'settings_enableDuplicateSubFolderNames' => 'Erlaube doppelte Namen von Unterordnern',
+'settings_enableDuplicateSubFolderNames_desc' => 'Erlaube doppelte Namen von Unterordnern in einem Ordner.',
+'settings_enableEmail' => 'E-Mail aktivieren',
 'settings_enableEmail_desc' => 'Automatische E-Mail-Benachrichtigung ein-/ausschalten',
 'settings_enableFilterReceipt' => 'Besitzer, Prüfer, ... aus Empfängerliste filtern',
 'settings_enableFilterReceipt_desc' => 'Anwählen, um einige Empfänger aus der Liste zu entfernen, wenn diese als Mitglieder einer Gruppe eingetragen werden.',
@@ -1437,7 +1442,7 @@ Name: [username]
 'settings_loginFailure_desc' => 'Konto nach n Anmeldefehlversuchen sperren.',
 'settings_luceneClassDir' => 'Lucene SeedDMS Verzeichnis',
 'settings_luceneClassDir_desc' => 'Pfad zum PEAR-Paket SeedDMS_Lucene (optional). Lassen Sie diese Einstellung leer, wenn SeedDMS_Lucene ohnehin von PHP gefunden wird, weil es beispielweise im \'Extra PHP Include-Path\' installiert ist.',
-'settings_luceneDir' => 'Verzeichnis für Volltextindex',
+'settings_luceneDir' => 'Verzeichnis für Volltext-Index',
 'settings_luceneDir_desc' => 'Verzeichnis in dem der Lucene-Index abgelegt wird.',
 'settings_maxDirID' => 'Max. Anzahl Unterverzeichnisse',
 'settings_maxDirID_desc' => 'Maximale Anzahl der Unterverzeichnisse in einem Verzeichnis. Ändern Sie diesen Wert nur, wenn Sie genau wissen was Sie tun! Voreingestellt ist 0.',
@@ -1520,9 +1525,9 @@ Name: [username]
 'settings_smtpPort' => 'SMTP Server Port',
 'settings_smtpPort_desc' => 'SMTP Server Port, voreingestellt ist 25',
 'settings_smtpSendFrom' => 'Absenderadresse',
-'settings_smtpSendFrom_desc' => 'Absenderadresse für herausgehende Mails',
+'settings_smtpSendFrom_desc' => 'Absenderadresse für herausgehende E-Mails',
-'settings_smtpSendTestMail' => 'Sende Testmail',
+'settings_smtpSendTestMail' => 'Sende Test-E-Mail',
-'settings_smtpSendTestMail_desc' => 'Verschickte eine Testmail, um die akuelle Konfiguration zu testen.',
+'settings_smtpSendTestMail_desc' => 'Verschickte eine Test-E-Mail, um die akuelle Konfiguration zu testen.',
 'settings_smtpServer' => 'SMTP Server-Hostname',
 'settings_smtpServer_desc' => 'SMTP Server-Hostname',
 'settings_smtpUser' => 'SMTP Server User',
@@ -1562,7 +1567,7 @@ Name: [username]
 'settings_updateDatabase' => 'Datenbank-Update-Skript ausführen',
 'settings_updateNotifyTime' => 'Update Notify Time',
 'settings_updateNotifyTime_desc' => 'Users are notified about document-changes that took place within the last \'Update Notify Time\' seconds',
-'settings_upgrade_php' => 'Aktualisiere PHP auf mindestens version 5.2.0',
+'settings_upgrade_php' => 'Aktualisiere PHP auf mindestens version 5.6.38',
 'settings_versioningFileName' => 'Versionsinfo-Datei',
 'settings_versioningFileName_desc' => 'Der Name der Datei mit Versionsinformationen, wie sie durch das Backup-Tool erzeugt werden.',
 'settings_versiontolow' => 'Version zu gering',
@@ -1587,6 +1592,9 @@ Name: [username]
 'sign_out' => 'Abmelden',
 'sign_out_user' => 'Benutzer abmelden',
 'sk_SK' => 'Slovakisch',
+'sort_by_date' => 'Nach Datum sortieren',
+'sort_by_name' => 'Nach Name sortieren',
+'sort_by_sequence' => 'Nach Reihenfolge sortieren',
 'space_used_on_data_folder' => 'Benutzter Plattenplatz',
 'splash_added_to_clipboard' => 'Der Zwischenablage hinzugefügt',
 'splash_add_access' => 'Zugriffsrecht hinzugefügt',
@@ -1625,6 +1633,7 @@ Name: [username]
 'splash_inherit_access' => 'Zugriffsrechte werden geerbt',
 'splash_invalid_folder_id' => 'Ungültige Ordner-ID',
 'splash_invalid_searchterm' => 'Ungültiger Suchbegriff',
+'splash_link_document' => 'Link hinzugefügt',
 'splash_moved_clipboard' => 'Inhalt der Zwischenablage in aktuellen Ordner verschoben',
 'splash_move_document' => 'Dokument verschoben',
 'splash_move_folder' => 'Ordner verschoben',
@@ -1655,6 +1664,7 @@ Name: [username]
 'splash_substituted_user' => 'Benutzer gewechselt',
 'splash_switched_back_user' => 'Zum ursprünglichen Benutzer zurückgekehrt',
 'splash_toogle_group_manager' => 'Gruppenverwalter gewechselt',
+'splash_transfer_content' => 'Dokumenteninhalt übertragen',
 'splash_transfer_document' => 'Dokument übertragen',
 'splash_transfer_objects' => 'Objekte übertragen',
 'splash_trigger_workflow' => '',
@@ -1681,6 +1691,7 @@ Name: [username]
 'status_revisor_removed' => 'Wiederholungsprüfer von Liste entfernt',
 'status_unknown' => 'unbekannt',
 'storage_size' => 'Speicherverbrauch',
+'subfolder_duplicate_name' => 'Doppelter Unterordnername',
 'submit_2_fact_auth' => 'Schlüssel speichern',
 'submit_approval' => 'Freigabe hinzufügen',
 'submit_login' => 'Anmelden',
@@ -1714,7 +1725,7 @@ Name: [username]
 'task_name' => 'Name',
 'task_next_run' => 'Nächste Ausführung',
 'temp_jscode' => 'Temporärer Javascript-Code',
-'testmail_body' => 'Diese Mail ist lediglich zum Test der Mail-Konfiguration von SeedDMS',
+'testmail_body' => 'Diese Mail ist lediglich zum Test der E-Mail-Konfiguration von SeedDMS',
 'testmail_subject' => 'Test Mail',
 'theme' => 'Aussehen',
 'thursday' => 'Donnerstag',
@@ -1743,6 +1754,7 @@ Name: [username]
 'toggle_manager' => 'Managerstatus wechseln',
 'toggle_qrcode' => 'Zeige/verberge QR-Code',
 'to_before_from' => 'Endedatum darf nicht vor dem Startdatum liegen',
+'transfer_content' => 'Inhalt übertragen',
 'transfer_document' => 'Dokument übertragen',
 'transfer_no_read_access' => 'Der Benutzer hat in dem Ordner keine Schreibrechte',
 'transfer_no_write_access' => 'Der Benutzer hat in dem Ordner keine Schreibrechte',
@@ -1794,7 +1806,7 @@ URL: [url]',
 'update' => 'Aktualisieren',
 'update_approvers' => 'Liste der Freigebenden aktualisieren',
 'update_document' => 'Aktualisieren',
-'update_fulltext_index' => 'Aktualisiere Volltextindex',
+'update_fulltext_index' => 'Aktualisiere Volltext-Index',
 'update_info' => 'Informationen zur Aktualisierung',
 'update_locked_msg' => 'Dieses Dokument wurde gesperrt<p>Die Sperrung wurde von <a href="mailto:[email]">[username]</a> eingerichtet.<br>',
 'update_recipients' => 'Liste der Empfänger aktualisieren',

languages/el_GR/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (280)
+//    Translators: Admin (281)
 
 $text = array(
 '2_factor_auth' => '',
@@ -266,6 +266,7 @@ $text = array(
 'confirm_rm_user' => '',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '',
 'content' => 'Περιεχόμενο',
@@ -631,6 +632,7 @@ $text = array(
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => '',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
@@ -832,6 +834,7 @@ URL: [url]',
 'receipt_status' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1105,6 +1108,8 @@ URL: [url]',
 'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => '',
 'settings_enableDuplicateDocNames_desc' => '',
+'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames_desc' => '',
 'settings_enableEmail' => '',
 'settings_enableEmail_desc' => '',
 'settings_enableFilterReceipt' => '',
@@ -1372,8 +1377,11 @@ URL: [url]',
 'sign_out' => 'Αποσύνδεση',
 'sign_out_user' => 'Αποσύνδεση χρήστη',
 'sk_SK' => 'Σλοβάκικα',
+'sort_by_date' => '',
+'sort_by_name' => '',
+'sort_by_sequence' => '',
 'space_used_on_data_folder' => '',
-'splash_added_to_clipboard' => '',
+'splash_added_to_clipboard' => 'Προστέθηκε στο clipboard',
 'splash_add_access' => '',
 'splash_add_attribute' => '',
 'splash_add_group' => '',
@@ -1410,6 +1418,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
+'splash_link_document' => '',
 'splash_moved_clipboard' => '',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1440,6 +1449,7 @@ URL: [url]',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1466,6 +1476,7 @@ URL: [url]',
 'status_revisor_removed' => '',
 'status_unknown' => '',
 'storage_size' => '',
+'subfolder_duplicate_name' => '',
 'submit_2_fact_auth' => '',
 'submit_approval' => '',
 'submit_login' => '',
@@ -1528,6 +1539,7 @@ URL: [url]',
 'toggle_manager' => '',
 'toggle_qrcode' => '',
 'to_before_from' => '',
+'transfer_content' => '',
 'transfer_document' => '',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',

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 (1773), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1787), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -295,6 +295,7 @@ URL: [url]',
 'confirm_rm_user' => 'Do you really want to remove the user "[username]"?<br>Be careful: This action cannot be undone.',
 'confirm_rm_user_from_processes' => 'Do you really want to remove the user "[username]" from all processes?<br>Be careful: This action can lead to the release of documents if the user was the only or last approver.',
 'confirm_rm_version' => 'Do you really want to remove version [version] of document "[documentname]"?<br>Be careful: This action cannot be undone.',
+'confirm_transfer_link_document' => 'Select if you like to link the dragged document or transfer its content to the target document as a new version. Only documents with one version can be transferred. The dragged document will be removed afterwards.',
 'confirm_transfer_objects' => 'Do you really want to transfer the documents, folders, etc. of the user "[username]"?<br>Be careful: This action cannot be undone.',
 'confirm_update_transmittalitem' => 'Confirm update',
 'content' => 'Content',
@@ -740,6 +741,7 @@ URL: [url]',
 'linked_to_document' => 'Linked to document',
 'linked_to_this_version' => 'Linked to this version',
 'link_alt_updatedocument' => 'If you would like to upload files bigger than the current maximum upload size, please use the alternative <a href="%s">upload page</a>.',
+'link_document' => 'Link document',
 'link_to_version' => 'Attach to version',
 'list_access_rights' => 'List all access rights ...',
 'list_contains_no_access_docs' => 'The list contains more documents you have no access to and are not displayed.',
@@ -979,6 +981,7 @@ URL: [url]',
 'receipt_status' => 'Status',
 'receipt_summary' => 'Receipt summary',
 'receipt_update_failed' => 'Acknowledging reception failed',
+'recent_uploads' => 'Recent Uploads',
 'reception' => 'Reception',
 'reception_acknowleged' => 'Reception acknowledged',
 'reception_noaction' => 'No action',
@@ -1315,6 +1318,8 @@ Name: [username]
 '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',
 'settings_enableDuplicateDocNames_desc' => 'Allows to have duplicate document names in a folder.',
+'settings_enableDuplicateSubFolderNames' => 'Allow duplicat subfolder names',
+'settings_enableDuplicateSubFolderNames_desc' => 'Allows to have duplicate subfolder names in a folder.',
 'settings_enableEmail' => 'Enable E-mail',
 'settings_enableEmail_desc' => 'Enable/disable automatic email notification',
 'settings_enableFilterReceipt' => 'Filter out owner, reviewer, ... from reception list',
@@ -1557,7 +1562,7 @@ Name: [username]
 'settings_updateDatabase' => 'Run schema update scripts on database',
 'settings_updateNotifyTime' => 'Update Notify Time',
 'settings_updateNotifyTime_desc' => 'Users are notified about document-changes that took place within the last \'Update Notify Time\' seconds',
-'settings_upgrade_php' => 'Upgrade PHP to at least version 5.2.0',
+'settings_upgrade_php' => 'Upgrade PHP to at least version 5.6.38',
 'settings_versioningFileName' => 'Versioning FileName',
 'settings_versioningFileName_desc' => 'The name of the versioning info file created by the backup tool',
 'settings_versiontolow' => 'Version to low',
@@ -1582,6 +1587,9 @@ Name: [username]
 'sign_out' => 'Sign out',
 'sign_out_user' => 'Sign out user',
 'sk_SK' => 'Slovak',
+'sort_by_date' => 'Sort by date',
+'sort_by_name' => 'Sort by name',
+'sort_by_sequence' => 'Sort by sequence',
 'space_used_on_data_folder' => 'Space used on data folder',
 'splash_added_to_clipboard' => 'Added to clipboard',
 'splash_add_access' => 'Access right added',
@@ -1620,6 +1628,7 @@ Name: [username]
 'splash_inherit_access' => 'Access right will be inherited',
 'splash_invalid_folder_id' => 'Invalid folder ID',
 'splash_invalid_searchterm' => 'Invalid search term',
+'splash_link_document' => 'Link added',
 'splash_moved_clipboard' => 'Clipboard moved into current folder',
 'splash_move_document' => 'Document moved',
 'splash_move_folder' => 'Folder moved',
@@ -1650,6 +1659,7 @@ Name: [username]
 'splash_substituted_user' => 'Substituted user',
 'splash_switched_back_user' => 'Switched back to original user',
 'splash_toogle_group_manager' => 'Group manager toogled',
+'splash_transfer_content' => 'Content transfered',
 'splash_transfer_document' => 'Document transfered',
 'splash_transfer_objects' => 'Objects transfered',
 'splash_trigger_workflow' => 'Triggered transition of workflow',
@@ -1676,6 +1686,7 @@ Name: [username]
 'status_revisor_removed' => 'Revisor removed from list',
 'status_unknown' => 'Unknown',
 'storage_size' => 'Storage size',
+'subfolder_duplicate_name' => 'Duplicate subfolder name',
 'submit_2_fact_auth' => 'Save secret',
 'submit_approval' => 'Submit approval',
 'submit_login' => 'Sign in',
@@ -1738,6 +1749,7 @@ Name: [username]
 'toggle_manager' => 'Toggle manager',
 'toggle_qrcode' => 'Show/hide QR code',
 'to_before_from' => 'End date may not be before start date',
+'transfer_content' => 'Transfer content',
 'transfer_document' => 'Transfer document',
 'transfer_no_read_access' => 'The user does not have read access in the folder',
 'transfer_no_write_access' => 'The user does not have write access in the folder',

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 (1111), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1118), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -290,6 +290,7 @@ URL: [url]',
 'confirm_rm_user' => '¿Desea realmente eliminar el usuario "[username]"?<br />Atención: Esta acción no se puede deshacer.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '¿Desea realmente eliminar la versión [version] del documento "[documentname]"?<br />Atención: esta acción no se puede deshacer.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '',
 'content' => 'Contenido',
@@ -709,6 +710,7 @@ URL: [url]',
 'linked_to_document' => 'Enlazado al documento',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Si desea subir archivos mayores que el tamaño máximo actualmente permitido, por favor, utilice la <a href="%s">página de subida</a> alternativa.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Listar los derechos de acceso',
 'list_contains_no_access_docs' => '',
@@ -937,6 +939,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado
 'receipt_status' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1246,6 +1249,8 @@ URL: [url]',
 'settings_enableDropUpload_desc' => 'Habilite/Deshabilite el área de drop en la pagina \'\'Ver folder\' para subir archivos por Drag&Drop',
 'settings_enableDuplicateDocNames' => 'Permite tener nombres de documento duplicados',
 'settings_enableDuplicateDocNames_desc' => 'Permite tener un nombre de documento duplicado en una carpeta.',
+'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames_desc' => '',
 'settings_enableEmail' => 'Habilitar E-mail',
 'settings_enableEmail_desc' => 'Habilitar/Deshabilitar notificación automática por correo electrónico',
 'settings_enableFilterReceipt' => '',
@@ -1312,8 +1317,8 @@ URL: [url]',
 'settings_enableVersionModification_desc' => 'Habilitar/Deshabilitar la modificación de versiones de documentos por parte de usuarios después de añadir una nueva versión. El administrador siempre podrá modificar la versión después de añadida.',
 'settings_enableWebdavReplaceDoc' => 'Reemplaza documento al guardar',
 'settings_enableWebdavReplaceDoc_desc' => 'Si se habilita, al guardar una nueva versión de un documento reemplaza al viejo documento en lugar de crear un nueva versión. Esto solo aplica si el usuario mimetype Yelp nombre del archivo son iguales a la última versión. Esto es útil cuando la aplicación guarda automáticamente un documento a intervalos fijos.',
-'settings_enableXsendfile' => '',
+'settings_enableXsendfile' => 'Usar el módulo xsendfile de apache',
-'settings_enableXsendfile_desc' => '',
+'settings_enableXsendfile_desc' => 'Si está opción esta activa y el módulo de apache xsendfile está instalado, se usará para la entrega de imagenes',
 'settings_encryptionKey' => 'Clave de cifrado',
 'settings_encryptionKey_desc' => 'Esta cadena se utiliza para crear un identificador único añadido como campo oculto a formularios para prevenir ataques CSRF.',
 'settings_error' => 'Error',
@@ -1488,7 +1493,7 @@ URL: [url]',
 'settings_updateDatabase' => 'Lanzar scripts de actualización de esquema en la base de datos',
 'settings_updateNotifyTime' => 'Tiempo de notificación de actualización',
 'settings_updateNotifyTime_desc' => 'Se notificará a los usuarios sobre los cambios en documentos que tengan lugar en los próximos segundos de «Tiempo de notificación de actualización»',
-'settings_upgrade_php' => 'Actualice PHP a una versión igual o mayor a 5.2.0',
+'settings_upgrade_php' => 'Actualice PHP a una versión igual o mayor a 5.6.38',
 'settings_versioningFileName' => 'Archivo de versionado',
 'settings_versioningFileName_desc' => 'Nombre de archivo de información de versionado creado por la herramienta de copia de respaldo',
 'settings_versiontolow' => 'Versión antigua',
@@ -1513,6 +1518,9 @@ URL: [url]',
 'sign_out' => 'Salir',
 'sign_out_user' => 'Desconectar usuario',
 'sk_SK' => 'Slovaco',
+'sort_by_date' => 'Ordenar por Fecha',
+'sort_by_name' => 'Ordenar por Nombre',
+'sort_by_sequence' => 'Ordenar por Secuencia',
 'space_used_on_data_folder' => 'Espacio usado en la carpeta de datos',
 'splash_added_to_clipboard' => 'Agregado al portapapeles',
 'splash_add_access' => '',
@@ -1551,6 +1559,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'ID de carpeta inválido',
 'splash_invalid_searchterm' => 'Término de búsqueda inválido',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Portapapeles movido a la carpeta actual',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1581,6 +1590,7 @@ URL: [url]',
 'splash_substituted_user' => 'Usuario sustituido',
 'splash_switched_back_user' => 'Cambió de nuevo al usuario original',
 'splash_toogle_group_manager' => 'Administrador de grupo activado',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1607,6 +1617,7 @@ URL: [url]',
 'status_revisor_removed' => '',
 'status_unknown' => 'Desconocido',
 'storage_size' => 'Tamaño de almacenamiento',
+'subfolder_duplicate_name' => '',
 'submit_2_fact_auth' => '',
 'submit_approval' => 'Enviar aprobación',
 'submit_login' => 'Conectar',
@@ -1669,6 +1680,7 @@ URL: [url]',
 'toggle_manager' => 'Intercambiar mánager',
 'toggle_qrcode' => '',
 'to_before_from' => 'La fecha de finalización no debe ser anterior a la de inicio',
+'transfer_content' => '',
 'transfer_document' => 'Transferir documento',
 'transfer_no_read_access' => 'El usuario no tiene acceso de lectura en la carpeta',
 'transfer_no_write_access' => 'El usuario no tiene acceso de escritura en la carpeta',

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 (1091), jeromerobert (50), lonnnew (9), Oudiceval (739)
+//    Translators: Admin (1091), jeromerobert (50), lonnnew (9), Oudiceval (755)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -295,6 +295,7 @@ URL: [url]',
 'confirm_rm_user' => 'Voulez-vous vraiment supprimer l’utilisateur « [username] » ?<br>Attention : Cette action est irréversible.',
 '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 vraiment supprimer la version [version] du document « [documentname] » ?<br>Attention : Cette action est irréversible.',
+'confirm_transfer_link_document' => '',
 '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' => 'Confirmer la mise à jour',
 'content' => 'Contenu',
@@ -501,7 +502,7 @@ Le lien est valide jusqu’au [valid].
 'error_add_aro' => '',
 'error_add_permission' => 'Erreur lors de l’ajout de permission',
 'error_cleared_cache' => 'Erreur lors du vidage du cache',
-'error_edit_task' => '',
+'error_edit_task' => 'Erreur lors de la modification de la tâche',
 'error_extension_getlist' => 'Erreur lors de l’obtention de la liste des extensions depuis le dépôt',
 'error_importfs' => 'Erreur lors de l’import depuis le système de fichiers',
 'error_no_document_selected' => 'Aucun document sélectionné',
@@ -687,7 +688,7 @@ URL: [url]',
 'invalid_link_id' => 'Identifiant de lien invalide',
 'invalid_request_token' => 'Jeton de demande incorrect',
 'invalid_review_status' => 'Statut de vérification invalide',
-'invalid_sequence' => 'Valeur de séquence invalide',
+'invalid_sequence' => 'Position invalide',
 'invalid_status' => 'Statut de document invalide',
 'invalid_target_doc_id' => 'Identifiant de document cible invalide',
 'invalid_target_folder' => 'Identifiant de dossier cible invalide',
@@ -740,6 +741,7 @@ URL: [url]',
 'linked_to_document' => 'Lié au document',
 'linked_to_this_version' => 'Lié à cette version',
 'link_alt_updatedocument' => 'Pour déposer des fichiers de taille supérieure, utilisez la <a href="%s">page d\'ajout multiple</a>.',
+'link_document' => '',
 'link_to_version' => 'Version',
 'list_access_rights' => 'Liste des droits d’accès…',
 'list_contains_no_access_docs' => 'La liste contient des documents auxquels vous n’avez pas accès et qui ne sont donc pas affichés.',
@@ -761,7 +763,7 @@ URL: [url]',
 'logout' => 'Déconnexion',
 'log_management' => 'Gestion des fichiers journaux',
 'lo_LA' => 'Laotien',
-'malformed_expiration_date' => '',
+'malformed_expiration_date' => 'Format de date d’expiration invalide',
 'manager' => 'Responsable',
 'manager_of_group' => 'Vous êtes le gestionnaire de ce groupe',
 'mandatory_approvergroups' => 'Obligatoire : groupes de valideurs',
@@ -891,7 +893,7 @@ URL: [url]',
 'october' => 'Octobre',
 'old' => 'Ancien',
 'only_jpg_user_images' => 'Images d\'utilisateur au format .jpg seulement',
-'order_by_sequence_off' => 'Le tri par séquence est désactivé dans les préférences. Si vous souhaitez que ce paramètre prenne effet, vous devez l\'activer.',
+'order_by_sequence_off' => 'Le tri par position est désactivé dans les préférences. Si vous souhaitez que ce paramètre prenne effet, vous devez l’activer.',
 'original_filename' => 'Nom de fichier original',
 'overall_indexing_progress' => 'Progression globale de l’indexation',
 'owner' => 'Propriétaire',
@@ -977,12 +979,13 @@ URL : [url]',
 'receipt_status' => 'Statut',
 'receipt_summary' => 'Vue d’ensemble réception',
 'receipt_update_failed' => 'La confirmation de réception a échoué',
+'recent_uploads' => '',
 'reception' => 'Réception',
 'reception_acknowleged' => 'Réception confirmée',
 'reception_noaction' => 'Aucune action',
 'reception_rejected' => 'Réception rejetée',
 'recipients' => 'Destinataires',
-'recipient_already_removed' => '',
+'recipient_already_removed' => 'Le destinataire a déjà été supprimé ou a accusé réception.',
 'redraw' => 'Redessiner',
 'refresh' => 'Actualiser',
 'rejected' => 'Rejeté',
@@ -1299,6 +1302,8 @@ Nom : [username]
 'settings_enableDropUpload_desc' => 'Active/désactive la zone de glisser-déposer sur la page d’un dossier afin d’y déposer des fichiers.',
 'settings_enableDuplicateDocNames' => 'Autoriser plusieurs documents de même nom',
 'settings_enableDuplicateDocNames_desc' => 'Autorise plusieurs documents de même nom dans un même dossier.',
+'settings_enableDuplicateSubFolderNames' => 'Autoriser les sous-dossiers de même nom',
+'settings_enableDuplicateSubFolderNames_desc' => 'Autorise plusieurs sous-dossiers de même nom dans un dossier.',
 'settings_enableEmail' => 'E-mails',
 'settings_enableEmail_desc' => 'Active/désactive la notification automatique par e-mail',
 'settings_enableFilterReceipt' => '',
@@ -1333,8 +1338,8 @@ Nom : [username]
 '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_enableReceiptReject' => '',
+'settings_enableReceiptReject' => 'Activer le rejet de réceptions',
-'settings_enableReceiptReject_desc' => '',
+'settings_enableReceiptReject_desc' => 'Activer cette option pour permettre de rejeter des réceptions.',
 'settings_enableReceiptWorkflow' => 'Activer la réception de document',
 'settings_enableReceiptWorkflow_desc' => 'Activer cette option pour permettre de confirmer la réception de document dans le workflow.',
 'settings_enableRecursiveCount' => 'Décompte récursif des documents/dossiers',
@@ -1509,7 +1514,7 @@ Nom : [username]
 'settings_sortFoldersDefault' => 'Méthode de tri par défaut des dossiers',
 'settings_sortFoldersDefault_desc' => 'Ceci définit les méthodes de tri pour les dossiers et documents dans la vue du dossier.',
 'settings_sortFoldersDefault_val_name' => 'Par nom',
-'settings_sortFoldersDefault_val_sequence' => 'Par séquence',
+'settings_sortFoldersDefault_val_sequence' => 'Par position',
 'settings_sortFoldersDefault_val_unsorted' => 'Non trié',
 'settings_sortUsersInList' => 'Tri des utilisateurs',
 'settings_sortUsersInList_desc' => 'Définit si les utilisateurs dans les menus de sélection sont triés par identifiant ou par nom complet',
@@ -1541,10 +1546,10 @@ Nom : [username]
 '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' => '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_upgrade_php' => 'Mettez à jour PHP vers une version au moins égale à 5.6.38',
 'settings_versioningFileName' => 'Nom des fichiers de versionnage',
 'settings_versioningFileName_desc' => 'Nom des fichiers textes d’information créés depuis les outils de sauvegarde',
-'settings_versiontolow' => '',
+'settings_versiontolow' => 'Version trop ancienne',
 'settings_viewOnlineFileTypes' => 'Aperçu en ligne des fichiers',
 'settings_viewOnlineFileTypes_desc' => 'Extensions des fichiers pouvant être visionnés en ligne (en lettres minuscules uniquement).',
 'settings_webdav' => 'WebDAV',
@@ -1566,6 +1571,9 @@ Nom : [username]
 'sign_out' => 'Déconnexion',
 'sign_out_user' => 'Déconnecter l\'utilisateur',
 'sk_SK' => 'Slovaque',
+'sort_by_date' => 'Trier par date',
+'sort_by_name' => 'Trier par nom',
+'sort_by_sequence' => 'Trier par position',
 'space_used_on_data_folder' => 'Espace utilisé dans le répertoire de données',
 'splash_added_to_clipboard' => 'Ajouté au presse-papier',
 'splash_add_access' => 'Droits d’accès ajoutés',
@@ -1604,6 +1612,7 @@ Nom : [username]
 'splash_inherit_access' => 'Droits d’accès hérités',
 'splash_invalid_folder_id' => 'Identifiant de répertoire invalide',
 'splash_invalid_searchterm' => 'Recherche invalide',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Contenu du presse-papier déplacé vers le dossier courant',
 'splash_move_document' => 'Document déplacé',
 'splash_move_folder' => 'Dossier déplacé',
@@ -1634,6 +1643,7 @@ Nom : [username]
 'splash_substituted_user' => 'Utilisateur de substitution',
 'splash_switched_back_user' => 'Revenu à l\'utilisateur initial',
 'splash_toogle_group_manager' => 'Responsable de groupe changé',
+'splash_transfer_content' => '',
 'splash_transfer_document' => 'Document transféré',
 'splash_transfer_objects' => 'Objets transférés',
 'splash_trigger_workflow' => 'Transition de workflow déclenchée',
@@ -1660,6 +1670,7 @@ Nom : [username]
 'status_revisor_removed' => 'Réviseur retiré de la liste',
 'status_unknown' => 'Inconnu',
 'storage_size' => 'Taille occupée',
+'subfolder_duplicate_name' => 'Un sous-dossier porte déjà ce nom !',
 'submit_2_fact_auth' => 'Enregistrer la clé secrète',
 'submit_approval' => 'Soumettre approbation',
 'submit_login' => 'Connexion',
@@ -1722,6 +1733,7 @@ Nom : [username]
 'toggle_manager' => 'Basculer \'Responsable\'',
 'toggle_qrcode' => 'Afficher/masquer le QR code',
 'to_before_from' => 'La date de fin ne peut pas être avant la date de début.',
+'transfer_content' => '',
 'transfer_document' => 'Transférer le document',
 'transfer_no_read_access' => 'L’utilisateur n’a pas le droit de lecture dans ce dossier',
 'transfer_no_write_access' => 'L’utilisateur n’a pas le droit d’écriture dans ce dossier',

languages/hr_HR/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1221), marbanas (16)
+//    Translators: Admin (1222), marbanas (16)
 
 $text = array(
 '2_factor_auth' => '',
@@ -295,6 +295,7 @@ Internet poveznica: [url]',
 'confirm_rm_user' => 'Da li zaista želite ukloniti korisnika "[username]"?<br>Oprez: ova radnja nije povratna.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Da li zaista želite ukloniti verziju [version] dokumenta "[documentname]"?<br>Oprez: ova radnja nije povratna.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => 'Potvrdi izmjenu',
 'content' => 'Sadržaj',
@@ -714,6 +715,7 @@ Internet poveznica: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Ako želite prenijeti datoteke veće od trenutne maksimalne veličine prijenosa, molimo koristite alternativu <a href="%s">upload page</a>.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Izlistaj sve dozvole pristupa',
 'list_contains_no_access_docs' => '',
@@ -941,6 +943,7 @@ Ako i dalje imate problema s prijavom, molimo kontaktirajte Vašeg administrator
 'receipt_status' => '',
 'receipt_summary' => 'Sažetak prijema',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1267,6 +1270,8 @@ Internet poveznica: [url]',
 'settings_enableDropUpload_desc' => 'Omogući/onemogući prostor za ubacivanje na \'Vidi mapu\' stranici za učitavanje datoteka "Povuci i ispusti" postupkom.',
 'settings_enableDuplicateDocNames' => 'Omogući dvostruke nazive dokumenata',
 'settings_enableDuplicateDocNames_desc' => 'Omogućuje da u mapi imate dvostruke nazive dokumenata.',
+'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames_desc' => '',
 'settings_enableEmail' => 'Omogući E-mail',
 'settings_enableEmail_desc' => 'Omogući/onemogući automatsku email obavijest',
 'settings_enableFilterReceipt' => '',
@@ -1509,7 +1514,7 @@ Internet poveznica: [url]',
 'settings_updateDatabase' => 'Pokreni shemu ažuriranja skripti na bazi podataka',
 'settings_updateNotifyTime' => 'Ažuriraj vrijeme obavijesti',
 'settings_updateNotifyTime_desc' => 'Korisnici se obavještavaju o promjenama dokumenta koje su se dogodile unutar zadnjih \'Update Notify Time\' sekundi',
-'settings_upgrade_php' => 'Ažuriraj PHP najmanje na verziju 5.2.0',
+'settings_upgrade_php' => 'Ažuriraj PHP najmanje na verziju 5.6.38',
 'settings_versioningFileName' => 'Naziv datoteke verzije dokumenta',
 'settings_versioningFileName_desc' => 'Naziv datoteke s informacijom o verziji kreirane alatom za stvaranje sigurnosne kopije',
 'settings_versiontolow' => 'Na nižu verziju',
@@ -1534,6 +1539,9 @@ Internet poveznica: [url]',
 'sign_out' => 'Odjava',
 'sign_out_user' => 'Odjavi korisnika',
 'sk_SK' => 'Slovački',
+'sort_by_date' => '',
+'sort_by_name' => '',
+'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'Prostor iskorišten na podatkovnoj mapi',
 'splash_added_to_clipboard' => 'Dodano u međuspremnik',
 'splash_add_access' => '',
@@ -1572,6 +1580,7 @@ Internet poveznica: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'Nevažeći ID mape',
 'splash_invalid_searchterm' => 'Nevažeći traženi pojam',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Međuspremnik je premješten u trenutnu mapu',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1602,6 +1611,7 @@ Internet poveznica: [url]',
 'splash_substituted_user' => 'Zamjenski korisnik',
 'splash_switched_back_user' => 'Prebačeno nazad na izvornog korisnika',
 'splash_toogle_group_manager' => 'Zamjenjen upravitelj grupe',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1628,6 +1638,7 @@ Internet poveznica: [url]',
 'status_revisor_removed' => 'Revizor uklonjen s liste',
 'status_unknown' => 'Nepoznato',
 'storage_size' => 'Veličina pohrane',
+'subfolder_duplicate_name' => '',
 'submit_2_fact_auth' => '',
 'submit_approval' => 'Pošaljite odobrenje',
 'submit_login' => 'PRIJAVI SE',
@@ -1690,6 +1701,7 @@ Internet poveznica: [url]',
 'toggle_manager' => 'Zamjeni upravitelja',
 'toggle_qrcode' => '',
 'to_before_from' => 'Datum završetka ne može biti prije datuma početka',
+'transfer_content' => '',
 'transfer_document' => 'Prijenos dokumenta',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',

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 (631), ribaz (1036)
+//    Translators: Admin (633), ribaz (1036)
 
 $text = array(
 '2_factor_auth' => 'Kétfaktoros azonosítás',
@@ -290,6 +290,7 @@ URL: [url]',
 'confirm_rm_user' => 'Biztosan el kívánja távolítani ezt a felhasználót "[username]"?<br>Legyen óvatos: Ez a művelet nem vonható vissza.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Biztosan el kívánaj távolítani a dokumentum "[documentname]" [version] verzióját?<br>Legyen óvatos: Ez a művelet nem vonható vissza.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '',
 'content' => 'Tartalom',
@@ -709,6 +710,7 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Ha a jelenlegi maximális feltöltési méretnél nagyobb állományokat szeretne feltölteni, akkor használja az alternatív <a href="%s">feltöltő oldalt</a>.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Összes jogosultság felsorolása...',
 'list_contains_no_access_docs' => '',
@@ -937,6 +939,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'receipt_status' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1245,6 +1248,8 @@ URL: [url]',
 'settings_enableDropUpload_desc' => 'Be/Ki kapcsolja a \'Mappa nézet\' oldalon a fogd és vidd feltöltéshez tartozó területetet',
 'settings_enableDuplicateDocNames' => 'Azonos dokumentum név engedélyezése',
 'settings_enableDuplicateDocNames_desc' => 'Engedélyezi az azonos dokumentum neveket egy mappában.',
+'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames_desc' => '',
 'settings_enableEmail' => 'Email engedélyezése',
 'settings_enableEmail_desc' => 'Engedélyezi/tiltja az automatikus email értesítést',
 'settings_enableFilterReceipt' => '',
@@ -1487,7 +1492,7 @@ URL: [url]',
 'settings_updateDatabase' => 'Adatbázis séma frissítő szkript futtatása',
 'settings_updateNotifyTime' => 'Értesítési idő frissítése',
 'settings_updateNotifyTime_desc' => 'Felhasználók értesítést kapnak az \'Értesítés frissítési idő\' által meghatározott másodperc alatt történt dokumentum változásokról',
-'settings_upgrade_php' => 'Frissítse a PHP-t legalább 5.2.0 verzióra',
+'settings_upgrade_php' => 'Frissítse a PHP-t legalább 5.6.38 verzióra',
 'settings_versioningFileName' => 'Változatkezelő állománynév',
 'settings_versioningFileName_desc' => 'A változáskezelő információs állomány neve létrehozva a mentő eszközzel',
 'settings_versiontolow' => 'túl alacsony verzió',
@@ -1512,6 +1517,9 @@ URL: [url]',
 'sign_out' => 'Kijelentkezés',
 'sign_out_user' => 'Kijelentkezés',
 'sk_SK' => 'Szlovák',
+'sort_by_date' => '',
+'sort_by_name' => '',
+'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'Használt terület az adat mappában',
 'splash_added_to_clipboard' => 'Vágólaphoz hozzáadva',
 'splash_add_access' => '',
@@ -1550,6 +1558,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'Érvénytelen mappa azonosító',
 'splash_invalid_searchterm' => 'Érvénytelen keresési feltétel',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Vágólap tartalom áthelyezve az aktuális mappába',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1580,6 +1589,7 @@ URL: [url]',
 'splash_substituted_user' => 'Helyettesített felhasználó',
 'splash_switched_back_user' => 'Visszaváltva az eredeti felhasználóra',
 'splash_toogle_group_manager' => 'Csoport kezelő kiválasztva',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1606,6 +1616,7 @@ URL: [url]',
 'status_revisor_removed' => '',
 'status_unknown' => 'Ismeretlen',
 'storage_size' => 'Tároló mérete',
+'subfolder_duplicate_name' => '',
 'submit_2_fact_auth' => '',
 'submit_approval' => 'Jóváhagyás küldése',
 'submit_login' => 'Bejelentkezés',
@@ -1668,7 +1679,8 @@ URL: [url]',
 'toggle_manager' => 'Kulcs kezelő',
 'toggle_qrcode' => '',
 'to_before_from' => 'A lejárati dátum nem előzheti meg a kezdési dátumot',
-'transfer_document' => '',
+'transfer_content' => '',
+'transfer_document' => 'Tulajdonos váltás',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',
 'transfer_objects' => 'Adatok átadása',

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 (1624), rickr (144), s.pnt (26)
+//    Translators: Admin (1628), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -296,6 +296,7 @@ URL: [url]',
 'confirm_rm_user' => 'Vuoi davvero rimuovere l\'utente "[username]"? Attenzione: questa operazione non può essere annullata.',
 '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_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => 'Conferma aggiornamento',
 'content' => 'Contenuto',
@@ -715,6 +716,7 @@ URL: [url]',
 'linked_to_document' => 'Collegato al documento',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Se vuoi caricare file più grandi del limite massimo attuale, usa la <a href="%s">pagina alternativa di upload</a>.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Elenca tutti i diritti di accesso...',
 'list_contains_no_access_docs' => '',
@@ -948,6 +950,7 @@ URL: [url]',
 'receipt_status' => 'Status',
 'receipt_summary' => 'Sommario ricezione',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1279,6 +1282,8 @@ URL: [url]',
 'settings_enableDropUpload_desc' => 'Abilita/disabilita l\'area di rilascio nella pagina \'Vista cartella\' per caricare i files con drag&drop (trascina e rilascia).',
 'settings_enableDuplicateDocNames' => 'Permetti documenti con lo stesso nome',
 'settings_enableDuplicateDocNames_desc' => 'Permetti documenti con lo stesso nome nella stessa cartella',
+'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames_desc' => '',
 'settings_enableEmail' => 'Abilita l\'email',
 'settings_enableEmail_desc' => 'Abilita/disabilita la notifica automatica via email',
 'settings_enableFilterReceipt' => '',
@@ -1521,7 +1526,7 @@ URL: [url]',
 'settings_updateDatabase' => 'Esegui gli script di aggiornamento schema sul database',
 'settings_updateNotifyTime' => 'Intervallo notifica di aggiornamento',
 'settings_updateNotifyTime_desc' => 'Intervallo di tempo in secondi durante il quale ogni modifica ad un documento verrà notificata agli utenti',
-'settings_upgrade_php' => 'Aggiornare PHP alla versione 5.2.0 o superiori',
+'settings_upgrade_php' => 'Aggiornare PHP alla versione 5.6.38 o superiori',
 'settings_versioningFileName' => 'Nome file di versione',
 'settings_versioningFileName_desc' => 'Nome attribuito al file di versione creato dallo strumento di backup.',
 'settings_versiontolow' => 'Versione obsoleta',
@@ -1546,6 +1551,9 @@ URL: [url]',
 'sign_out' => 'Disconnettiti',
 'sign_out_user' => 'Disconnetti l\'utente',
 'sk_SK' => 'Slovacco',
+'sort_by_date' => 'Ordina per Data',
+'sort_by_name' => 'Ordina per Nom',
+'sort_by_sequence' => 'Ordina per Sequenza',
 'space_used_on_data_folder' => 'Spazio utilizzato dai dati',
 'splash_added_to_clipboard' => 'Aggiunto agli appunti',
 'splash_add_access' => '',
@@ -1584,6 +1592,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'ID cartella non valido',
 'splash_invalid_searchterm' => 'Termine di ricerca non valido',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Appunti trasferiti nella cartella corrente',
 'splash_move_document' => 'Documento spostato',
 'splash_move_folder' => 'Cartella spostato',
@@ -1614,6 +1623,7 @@ URL: [url]',
 'splash_substituted_user' => 'Utente sostituito',
 'splash_switched_back_user' => 'Ritorno all\'utente originale',
 'splash_toogle_group_manager' => 'Amministratore di gruppo invertito',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1640,6 +1650,7 @@ URL: [url]',
 'status_revisor_removed' => 'Revisore rimosso dalla lista',
 'status_unknown' => 'Sconosciuto',
 'storage_size' => 'Spazio di archiviazione',
+'subfolder_duplicate_name' => '',
 'submit_2_fact_auth' => 'Salva segreto',
 'submit_approval' => 'Invio approvazione',
 'submit_login' => 'Accedi',
@@ -1702,6 +1713,7 @@ URL: [url]',
 'toggle_manager' => 'Gestore',
 'toggle_qrcode' => 'Mostri / nascondi codice QR',
 'to_before_from' => 'La data di fine non può essere antecedente a quella di inizio',
+'transfer_content' => '',
 'transfer_document' => 'Trasferisci Documento',
 'transfer_no_read_access' => 'L`utente non ha i permessi in lettura per la cartella',
 'transfer_no_write_access' => 'L`utente non ha i permessi in scrittura per la cartella',

languages/ko_KR/lang.inc

@@ -298,6 +298,7 @@ URL: [url]',
 'confirm_rm_user' => '사용자 "[username]"을 정말 삭제 하시겠습니까?<br>주의: 취소가 불가능 합니다.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '문서 "[documentname]"의 버젼 [version]을 정말 삭제 하시겠습니까?<br>주의: 취소가 불가능 합니다.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '업데이트 확인',
 'content' => '콘텐츠',
@@ -715,6 +716,7 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => '최대 업로드 크기보다 큰 파일을 업로드하려는 경우, 대체 업로드 페이지를 <a href="%s">upload page</a> 사용하십시오.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => '모든 접근 권한 나열',
 'list_contains_no_access_docs' => '',
@@ -935,6 +937,7 @@ URL : [url]',
 'receipt_status' => '',
 'receipt_summary' => '접수증 요약',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1261,6 +1264,8 @@ URL : [url]',
 'settings_enableDropUpload_desc' => 'Drag&Drop하여 파일을 업로드할 \'View_Folder\' 페이지의 드롭 영역을 활성/비활설 한다.',
 'settings_enableDuplicateDocNames' => '중복 된 문서명 허용',
 'settings_enableDuplicateDocNames_desc' => '이 폴더에 중복 된 문서명을 가질 수 있습니다.',
+'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames_desc' => '',
 'settings_enableEmail' => '전자 메일 사용',
 'settings_enableEmail_desc' => '자동화 전자우편 알림 활성화/비활성화',
 'settings_enableFilterReceipt' => '',
@@ -1528,6 +1533,9 @@ URL : [url]',
 'sign_out' => '로그 아웃',
 'sign_out_user' => '사용자가 로그 아웃',
 'sk_SK' => '슬로바키아어',
+'sort_by_date' => '',
+'sort_by_name' => '',
+'sort_by_sequence' => '',
 'space_used_on_data_folder' => '데이터 폴더에 사용되는 공간',
 'splash_added_to_clipboard' => '클립 보드에 추가',
 'splash_add_access' => '',
@@ -1566,6 +1574,7 @@ URL : [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => '잘못된 폴더 ID',
 'splash_invalid_searchterm' => '잘못된 검색 범위',
+'splash_link_document' => '',
 'splash_moved_clipboard' => '클립 보드가 현재 폴더로 이동',
 'splash_move_document' => '문서 옮겨짐',
 'splash_move_folder' => '폴더 옮겨짐',
@@ -1596,6 +1605,7 @@ URL : [url]',
 'splash_substituted_user' => '전환된 사용자',
 'splash_switched_back_user' => '원래 사용자로 전환',
 'splash_toogle_group_manager' => '그룹 관리자 전환',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1622,6 +1632,7 @@ URL : [url]',
 'status_revisor_removed' => '감사자 목록에서 제거',
 'status_unknown' => '알 수없는',
 'storage_size' => '저장 크기',
+'subfolder_duplicate_name' => '',
 'submit_2_fact_auth' => '',
 'submit_approval' => '승인 제출',
 'submit_login' => '로그인',
@@ -1684,6 +1695,7 @@ URL : [url]',
 'toggle_manager' => '전환 매니저',
 'toggle_qrcode' => 'QR code 보이기/숨기기',
 'to_before_from' => '종료일은 시작일 전이 될수 없습니다',
+'transfer_content' => '',
 'transfer_document' => '',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',

languages/lo_LA/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 (1468)
+//    Translators: Admin (1469)
 
 $text = array(
 '2_factor_auth' => 'ການກວດສອບແບບ 2 ປັດໃຈ',
@@ -293,6 +293,7 @@ URL: [url]',
 'confirm_rm_user' => 'ເຈົ້າຄ້ອງການລົບຜູ້ໄຊ້ "[username]"? <br>  ລະວັງ: ການກະທຳນີ້ບໍ່ສາມາດຍົກເລີກໄດ້',
 'confirm_rm_user_from_processes' => 'ເຈົ້າຕ້ອງການລົບຜູ້ໄຊ້ "[username] ອອກຈາກກະບວນການທັງຫມົດຫຼືບໍ <br> ກະລຸນາໄຊ້ຄວາມລະມັດລະວັງ: ການດຳເນີນການນີ້ສາມາດນຳໄປສູ້ການເຜີຍແຜ່ເອກະສານໄດ້ຫາກຜູ້ໄຊ້ເປັນຜູ້ອະນຸມັດຜູ້ດຽວຫຼືເປັນຄົນສຸດທ້າຍເທົ່ານັ້ນ',
 'confirm_rm_version' => 'ເຈົ້າຕ້ອງການລົບເອກະສານ [version] ເວີຊັນ [documentname] ລະວັງ: ເຈົ້າາບໍ່ສາມາດຍົກເລີກການດຳເນີນການນີ້ໄດ້',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => 'ເຈົ້າຕ້ອງການໂອນເອກະສານໂຟລເດີ ແລະອື່ນໆ ຂອງຜູ້ໄຊ້ "[username]"? <br>  ລະວັງ ການກະທໍານີ້ບໍ່ສາມາດຍົກເລີກໄດ້',
 'confirm_update_transmittalitem' => 'ຢືນຢັນການອັບເດດ',
 'content' => 'ເນື້ອຫາ',
@@ -719,6 +720,7 @@ URL: [url]',
 'linked_to_document' => 'ເຊື່ອມໂຍງກັລເອກະສານ',
 'linked_to_this_version' => 'ເຊື່ອມໂຍງກັບເວີຊັນນີ້ແລ້ວ',
 'link_alt_updatedocument' => 'ຖ້າເຈົ້າຕ້ອງການອັບໂຫລດໄຟລທີ່ໄຫ່ຍກວ່າຂະໜາດອັບໂຫລດສູງສຸດໃນປັດຈຸບັນກະລຸນາໄຊ້ <a href="%s"> ອັບໂຫລດຢູ່ຫ້າເຟສ </a>',
+'link_document' => '',
 'link_to_version' => 'ແນບໄປພ້ອມກັບເວີຊັນ',
 'list_access_rights' => 'ສະແດງສິດທິການເຂົ້າເຖິງທັງໝົດ ...',
 'list_contains_no_access_docs' => 'ລິດລາຍການປະກອບດ້ວຍເອກະສານເພີ່ມເຕີມທີ່ເຈົ້າບໍ່ສາມາດເຂົ້າເຖິງໄດ້ ແລະບໍ່ສະແດງ',
@@ -958,6 +960,7 @@ URL: [url]',
 'receipt_status' => 'ສະຖານະ',
 'receipt_summary' => 'ສະຫຼູບໃບບິນ',
 'receipt_update_failed' => 'ການຍອມຮັບສັນຍານບໍ່ສຳເລັດ',
+'recent_uploads' => '',
 'reception' => 'ພະແນກຕ້ອນຮັບ',
 'reception_acknowleged' => 'ຄວາມຮັບຮູ້ກ່ຽວກັບການຕ້ອນຮັບ',
 'reception_noaction' => 'ບໍ່ມີການຕອບສະຫນອງ',
@@ -1294,6 +1297,8 @@ URL: [url]',
 'settings_enableDropUpload_desc' => 'ເປີດ/ປິດ ໄຊ້ໜ້າຕ່າງພື້ນທີ່ວ່າງ ວິວໂຟລເດີ ເພື່ອອັບໂຫລດໄຟລໂດຍລາກ ແລະວາງ',
 'settings_enableDuplicateDocNames' => 'ອະນຸຍາດໃຫ້ໄຊ້ເອກະສານຊໍ້າກັນ',
 'settings_enableDuplicateDocNames_desc' => 'ອະນຸຍາດໃຫ້ມີເອກະສານຊໍ້າໃນໂຟລເດີ',
+'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames_desc' => '',
 'settings_enableEmail' => 'ເປີດໄຊ້ອີເມວ',
 'settings_enableEmail_desc' => 'ເປີດ/ປິດໄຊ້ງານການແຈ້ງເຕືອນທາງອີເມວໂດຍອັດຕະໂນມັດ',
 'settings_enableFilterReceipt' => '',
@@ -1536,7 +1541,7 @@ URL: [url]',
 'settings_updateDatabase' => 'ຮຽກໄຊ້ສະຄິບການປັບປຸງສະຄິບໃນຖານຂໍ້ມູນ',
 'settings_updateNotifyTime' => 'ອັບເດດເວລາການແຈ້ງເຕືອນ',
 'settings_updateNotifyTime_desc' => 'ຜູ້ໄຊ້ຈະໄດ້ຮັບການແຈ້ງກ່ຽວກັບການປ່ຽນແປງເອກະສານທີ່ເກີດຂື້ນພາຍໃນວິນາທີສຸດທ້າຍ  "ແຈ້ງເຕືອນເວລາ   "',
-'settings_upgrade_php' => 'ອັບເກດ PHP ຢ່າງນ້ອຍຕ້ອງເປັນເວີຊັ້ນ 5.2.0',
+'settings_upgrade_php' => 'ອັບເກດ PHP ຢ່າງນ້ອຍຕ້ອງເປັນເວີຊັ້ນ 5.6.38',
 'settings_versioningFileName' => 'ການກຳນົດຊື່ໄຟລ',
 'settings_versioningFileName_desc' => 'ຊື່ຂອງແຟ້ມຂໍ້ມູນການກຳນົດເວີຊັນທີ່ສ້າງໂດຍເຄື່ອງມືສຳຮອງຂໍ້ມູນ',
 'settings_versiontolow' => 'ເວີຊັນເກົ່າ',
@@ -1561,6 +1566,9 @@ URL: [url]',
 'sign_out' => 'ອອກຈາກລະບົບ',
 'sign_out_user' => 'ອອກຈາກລະບົບຜູ້ໄຊ້',
 'sk_SK' => 'ສະໂລວາເກຍ',
+'sort_by_date' => '',
+'sort_by_name' => '',
+'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'ຟື້ນທີທີ່ໄຊ້ໃນໂຟລເດີຂໍ້ມູນ',
 'splash_added_to_clipboard' => 'ເພີ່ມລົງໃນຄິບບອດ',
 'splash_add_access' => '',
@@ -1599,6 +1607,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'ID ໂຟລເດີບໍ່ຖືກຕ້ອງ',
 'splash_invalid_searchterm' => 'ຄຳຄົນຫາບໍ່ຖືກຕ້ອງ',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'ຍ້າຍຄິບບອດໄປທີ່ໂຟລເດີປັດຈຸບັນແລ້ວ',
 'splash_move_document' => 'ຍ້າຍເອກະສານແລ້ວ',
 'splash_move_folder' => 'ຍ້າຍໂຟລເດີແລ້ວ',
@@ -1629,6 +1638,7 @@ URL: [url]',
 'splash_substituted_user' => 'ຜູ້ນຳໄຊ້ທີຖືກແທນທີ',
 'splash_switched_back_user' => 'ປ່ຽນກັບໄປເປັນຜູ້ໄຊ້ເດີມ',
 'splash_toogle_group_manager' => 'ການດູແລກຸ່ມ',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => 'ຖ່າຍໂອນວັດຖຸຮຽບຮ້ອຍແລ້ວ',
 'splash_trigger_workflow' => '',
@@ -1655,6 +1665,7 @@ URL: [url]',
 'status_revisor_removed' => 'ແກ້ໄຂຄຳອະທິບາຍອອກຈາກລາຍການ',
 'status_unknown' => 'ບໍ່ຮູ້',
 'storage_size' => 'ຂະໜາດພື້ນທີ່ເກັບຂໍ້ມູນ',
+'subfolder_duplicate_name' => '',
 'submit_2_fact_auth' => 'ເກັບຄວາມລັບໄວ້',
 'submit_approval' => 'ສະເໜີການອະນຸມັດ',
 'submit_login' => 'ລົງຊື່ເຂົາໄຊ້',
@@ -1717,6 +1728,7 @@ URL: [url]',
 'toggle_manager' => 'ສຳລັບຜູ້ຈັດການ',
 'toggle_qrcode' => 'ສະແດງ/ ຊ້ອນລະຫັດ QR',
 'to_before_from' => 'ວັນເລີ້ມຕົ້ນຈະບໍ່ຄືກັບວັນສຸດທ້າຍ',
+'transfer_content' => '',
 'transfer_document' => '',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',

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 (766), gijsbertush (651), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (770), gijsbertush (651), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 '2_factor_auth' => '2-factor-authenticatie',
@@ -288,6 +288,7 @@ URL: [url]',
 'confirm_rm_user' => 'Weet U zeker dat U de Gebruiker "[username]" wilt verwijderen?<br>Let op: deze handeling kan niet ongedaan worden gemaakt.',
 'confirm_rm_user_from_processes' => 'Weet U zeker dat U de Gebruiker "[username]" wilt verwijderen uit dit proces?<br>Let op: deze handeling kan niet ongedaan worden gemaakt.',
 'confirm_rm_version' => 'Weet U zeker dat U deze versie van het document "[documentname]" wilt verwijderen?<br>Pas op: deze handeling kan niet ongedaan worden gemaakt.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => 'Weet U zeker dat U de documenten, mappen etc. van gebruiker "[username]" wilt overzetten?<br>Let op: deze handeling kan niet ongedaan worden gemaakt.',
 'confirm_update_transmittalitem' => 'Bevestig verandering van te verzenden item',
 'content' => 'Welkomstpagina',
@@ -714,6 +715,7 @@ URL: [url]',
 'linked_to_document' => 'Bijlage(n) bij document',
 'linked_to_this_version' => 'Bijlage bij deze versie',
 'link_alt_updatedocument' => 'Als u bestanden wilt uploaden groter dan het huidige maximum, gebruik aub de alternatieve <a href="%s">upload pagina</a>.',
+'link_document' => '',
 'link_to_version' => 'Bijlage(n) bij versie',
 'list_access_rights' => 'Toegangsrechten',
 'list_contains_no_access_docs' => 'Geen toegankelijke documenten',
@@ -953,6 +955,7 @@ URL: [url]',
 'receipt_status' => 'Status ontvangst',
 'receipt_summary' => 'Samenvatting',
 'receipt_update_failed' => 'Update ontvangst mislukt',
+'recent_uploads' => '',
 'reception' => 'bestemming',
 'reception_acknowleged' => 'bestemming OK',
 'reception_noaction' => 'Geen actie',
@@ -1291,6 +1294,8 @@ Name: [username]
 'settings_enableDropUpload_desc' => 'Aanzetten DropUpload',
 'settings_enableDuplicateDocNames' => 'Sta duplicaten van documentnamen toe',
 'settings_enableDuplicateDocNames_desc' => 'Staat het toe om documentnamen te dupliceren in een folder.',
+'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames_desc' => '',
 'settings_enableEmail' => 'E-mail inschakelen',
 'settings_enableEmail_desc' => 'Inschakelen/uitschakelen automatische email notificatie',
 'settings_enableFilterReceipt' => '',
@@ -1533,7 +1538,7 @@ Name: [username]
 'settings_updateDatabase' => 'Voer schema update scripts uit op database',
 'settings_updateNotifyTime' => 'Update Notificatie Tijd',
 'settings_updateNotifyTime_desc' => 'Gebruikers worden niet genotificeerd over documentwijzigingen die plaats vinden binnen de laatste \'Update Notificatie Tijd\' seconden',
-'settings_upgrade_php' => 'Upgrade PHP minimaal naar versie 5.2.0',
+'settings_upgrade_php' => 'Upgrade PHP minimaal naar versie 5.6.38',
 'settings_versioningFileName' => 'Versie-informatie Bestandsnaam',
 'settings_versioningFileName_desc' => 'De naam van het versie informatie bestand gemaakt door het backupgereedschap',
 'settings_versiontolow' => 'Versie te laag',
@@ -1558,6 +1563,9 @@ Name: [username]
 'sign_out' => 'Log uit',
 'sign_out_user' => 'Log gebruiker uit',
 'sk_SK' => 'Slowaaks',
+'sort_by_date' => 'Sorteren op datum',
+'sort_by_name' => 'Sorteren op naam',
+'sort_by_sequence' => 'Sorteer op volgorde',
 'space_used_on_data_folder' => 'Gebruikte diskomvang in data map',
 'splash_added_to_clipboard' => 'Toegevoegd aan klembord',
 'splash_add_access' => '',
@@ -1596,6 +1604,7 @@ Name: [username]
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'Ongeldige map ID',
 'splash_invalid_searchterm' => 'Ongeldige zoekterm',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Klembord verplaatst naar de huidige map',
 'splash_move_document' => 'Document verplaatst',
 'splash_move_folder' => 'Map verplaatst',
@@ -1626,6 +1635,7 @@ Name: [username]
 'splash_substituted_user' => 'Invallers gebruiker',
 'splash_switched_back_user' => 'Teruggeschakeld naar de oorspronkelijke gebruiker',
 'splash_toogle_group_manager' => 'Group manager toogled',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => 'Objecten overgedragen',
 'splash_trigger_workflow' => '',
@@ -1652,6 +1662,7 @@ Name: [username]
 'status_revisor_removed' => 'Verwijderd',
 'status_unknown' => 'Onbekend',
 'storage_size' => 'Omvang opslag',
+'subfolder_duplicate_name' => '',
 'submit_2_fact_auth' => '2-factor-authentificatie verstuurd',
 'submit_approval' => 'Verzend [Goedkeuring]',
 'submit_login' => 'Log in',
@@ -1714,6 +1725,7 @@ Name: [username]
 'toggle_manager' => 'Wijzig Beheerder',
 'toggle_qrcode' => 'Tonen/Verbergen QR-code',
 'to_before_from' => 'De einddatum mag niet voor de startdatum liggen',
+'transfer_content' => '',
 'transfer_document' => 'Document overdragen',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => 'De gebruiker heeft geen schrijfrechten in deze map',

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 (830), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (831), netixw (84), romi (93), uGn (112)
 
 $text = array(
 '2_factor_auth' => '',
@@ -283,6 +283,7 @@ URL: [url]',
 'confirm_rm_user' => 'Czy rzeczywiście chcesz usunąć użytkownika "[username]"?<br>Ostrożnie: Ta operacja nie może być cofnięta.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Czy rzeczywiście chcesz usunąć wersję [version] dokumentu "[documentname]"?<br>Ostrożnie: Ta operacja nie może być cofnięta.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '',
 'content' => 'Zawartość',
@@ -702,6 +703,7 @@ URL: [url]',
 'linked_to_document' => 'Połączony z dokumentem',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Jeśli chcesz wczytać pliki większe niż bieżące maksimum, użyj alternatywnej <a href="%s">strony wczytywania</a>.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Pokaż uprawnienia dostępu',
 'list_contains_no_access_docs' => '',
@@ -930,6 +932,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem
 'receipt_status' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1225,6 +1228,8 @@ URL: [url]',
 'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => 'Zezwalaj na zduplikowane nazwy dokumentów',
 'settings_enableDuplicateDocNames_desc' => 'Zezwala na tworzenie w folderze dokumentów o tej samej nazwie.',
+'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames_desc' => '',
 'settings_enableEmail' => 'Włącz powiadomienia e-mail',
 'settings_enableEmail_desc' => 'Włącz/Wyłącz automatyczne powiadomienia drogą mailową',
 'settings_enableFilterReceipt' => '',
@@ -1467,7 +1472,7 @@ URL: [url]',
 'settings_updateDatabase' => 'Uruchom skrytoy aktualizujące shemat bazy danych',
 'settings_updateNotifyTime' => 'Okres powiadamiania o zmianach',
 'settings_updateNotifyTime_desc' => 'Użytkownicy są powiadamiani o zmianach w dokumentach, które miały miejsce w ciągu ostatnich \'Update Notify Time\' sekund',
-'settings_upgrade_php' => 'Uaktualnij PHP do wersji przynajmniej 5.2.0',
+'settings_upgrade_php' => 'Uaktualnij PHP do wersji przynajmniej 5.6.38',
 'settings_versioningFileName' => 'Nazwa pliku z wersjonowaniem',
 'settings_versioningFileName_desc' => 'Nazwa pliku, zawierającego informacje o wersjonowaniu, utworzonego przez narzędzie kopii zapasowej.',
 'settings_versiontolow' => 'Za niska wersja',
@@ -1492,6 +1497,9 @@ URL: [url]',
 'sign_out' => 'Wyloguj',
 'sign_out_user' => 'Wyloguj użytkownika',
 'sk_SK' => 'słowacki',
+'sort_by_date' => '',
+'sort_by_name' => '',
+'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'Przestrzeń zajęta przez folder danych',
 'splash_added_to_clipboard' => 'Dodano do schowka',
 'splash_add_access' => '',
@@ -1530,6 +1538,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'Nieprawidłowy identyfikator folderu',
 'splash_invalid_searchterm' => 'Nieprawidłowa wartość wyszukiwania',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Schowek został przeniesiony do bieżącego folderu',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1560,6 +1569,7 @@ URL: [url]',
 'splash_substituted_user' => 'Zmieniono użytkownika',
 'splash_switched_back_user' => 'Przełączono z powrotem do oryginalnego użytkownika',
 'splash_toogle_group_manager' => 'Przełączono grupę menadżerów',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1586,6 +1596,7 @@ URL: [url]',
 'status_revisor_removed' => '',
 'status_unknown' => 'Nieznany',
 'storage_size' => 'Zajętość dysku',
+'subfolder_duplicate_name' => '',
 'submit_2_fact_auth' => '',
 'submit_approval' => 'Zaakceptuj',
 'submit_login' => 'Zaloguj się',
@@ -1648,6 +1659,7 @@ URL: [url]',
 'toggle_manager' => 'Przełączanie zarządcy',
 'toggle_qrcode' => '',
 'to_before_from' => '',
+'transfer_content' => '',
 'transfer_document' => 'Transfer dokumentu',
 'transfer_no_read_access' => 'Użytkownik nie ma prawa do odczytu w tym folderze',
 'transfer_no_write_access' => 'Użytkownik nie ma prawa do zapisu w tym folderze',

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 (1085), balan (87)
+//    Translators: Admin (1086), balan (87)
 
 $text = array(
 '2_factor_auth' => '',
@@ -295,6 +295,7 @@ URL: [url]',
 'confirm_rm_user' => 'Sigur doriți să eliminați utilizatorul "[username]"?<br>Fiți atenți: Această acțiune nu poate fi anulată.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Sigur doriți să eliminați versiunea [version] a documentului "[documentname]"?<br>Fiți atenți: Această acțiune nu poate fi anulată.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '',
 'content' => 'Conținut',
@@ -714,6 +715,7 @@ URL: [url]',
 '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_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Listeaza toate drepturile de acces',
 'list_contains_no_access_docs' => '',
@@ -942,6 +944,7 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț
 'receipt_status' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1268,6 +1271,8 @@ URL: [url]',
 'settings_enableDropUpload_desc' => 'Activare/dezactivare zona de plasare (drop area) în pagina \'Vizualizare Folder\' pentru încarcarea fisierelor folosind Drag&Drop.',
 'settings_enableDuplicateDocNames' => 'Permiteți nume de documente duplicate',
 'settings_enableDuplicateDocNames_desc' => 'Permiteți sa existe nume de documente duplicate într-un fisier.',
+'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames_desc' => '',
 'settings_enableEmail' => 'Activare E-mail',
 'settings_enableEmail_desc' => 'Activare/dezactivare notificari automare prin e-mail',
 'settings_enableFilterReceipt' => '',
@@ -1510,7 +1515,7 @@ URL: [url]',
 'settings_updateDatabase' => 'Rulați script-urile de actualizare a schemei bazei de date',
 'settings_updateNotifyTime' => 'Timpul de actualizare a notificarilor',
 'settings_updateNotifyTime_desc' => 'Utilizatorii sunt notificați cu privire la schimbările suferite de un documentul în ultima perioadă a \'Timpul de actualizare a notificarilor\' în secunde',
-'settings_upgrade_php' => 'Upgrade PHP cel puțin la versiunea 5.2.0',
+'settings_upgrade_php' => 'Upgrade PHP cel puțin la versiunea 5.6.38',
 'settings_versioningFileName' => 'Nume Fișier versionare',
 'settings_versioningFileName_desc' => 'Numele fișierului cu informatii ale versiunilor creat de către instrumentul de backup',
 'settings_versiontolow' => 'Versiunea e prea mică(veche)',
@@ -1535,6 +1540,9 @@ URL: [url]',
 'sign_out' => 'Sign out',
 'sign_out_user' => 'Sign out utilizator',
 'sk_SK' => 'Slovacă',
+'sort_by_date' => '',
+'sort_by_name' => '',
+'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'Spatiu folosit în folderul de date',
 'splash_added_to_clipboard' => 'Adăugat la clipboard',
 'splash_add_access' => '',
@@ -1573,6 +1581,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'ID folder invalid',
 'splash_invalid_searchterm' => 'Termen de căutare invalid',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Clipboard mutat în folderul curent',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1603,6 +1612,7 @@ URL: [url]',
 'splash_substituted_user' => 'Utilizator substituit',
 'splash_switched_back_user' => 'Comutat înapoi la utilizatorul original',
 'splash_toogle_group_manager' => 'Comută Managerul de grup',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1629,6 +1639,7 @@ URL: [url]',
 'status_revisor_removed' => 'Revizuitor eliminat din lista',
 'status_unknown' => 'Necunoscut',
 'storage_size' => 'Dimensiunea de stocare',
+'subfolder_duplicate_name' => '',
 'submit_2_fact_auth' => '',
 'submit_approval' => 'Trimite aprobare',
 'submit_login' => 'Sign in',
@@ -1691,6 +1702,7 @@ URL: [url]',
 'toggle_manager' => 'Comută Manager',
 'toggle_qrcode' => '',
 'to_before_from' => 'Data de încheiere nu poate fi înainte de data de începere',
+'transfer_content' => '',
 'transfer_document' => 'Transfer document',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => 'Utilizatorul nu are drepturi de scriere pe acest dosar',

languages/ru_RU/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1667)
+//    Translators: Admin (1669)
 
 $text = array(
 '2_factor_auth' => 'Двухфакторная аутентификация',
@@ -295,6 +295,7 @@ URL: [url]',
 'confirm_rm_user' => 'Удалить пользователя «[username]»?<br>Действие <b>необратимо</b>',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Удалить версию [version] документа «[documentname]»?<br>Действие <b>необратимо</b>',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => 'Подтвердите обновление',
 'content' => 'Содержимое',
@@ -711,9 +712,10 @@ URL: [url]',
 'linked_documents' => 'Связанные документы',
 'linked_files' => 'Приложения',
 'linked_to_current_version' => '',
-'linked_to_document' => '',
+'linked_to_document' => 'Связан с документом',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Для загрузки файлов, превышающих ограничение размера, используйте <a href="%s">другой способ</a>.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Показать все права доступа',
 'list_contains_no_access_docs' => '',
@@ -944,6 +946,7 @@ URL: [url]',
 'receipt_status' => '',
 'receipt_summary' => 'Сводка по получению',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1275,6 +1278,8 @@ URL: [url]',
 'settings_enableDropUpload_desc' => 'Включить/отключить область в "Просмотр папки" для загрузки при помощи Drag&Drop.',
 'settings_enableDuplicateDocNames' => 'Разрешить документы<br/>с одинаковым названием',
 'settings_enableDuplicateDocNames_desc' => 'Разрешить документы с одинаковым названием в каталоге.',
+'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames_desc' => '',
 'settings_enableEmail' => 'Включить e-mail',
 'settings_enableEmail_desc' => 'Включить/отключить автоматическое уведомление по e-mail.',
 'settings_enableFilterReceipt' => '',
@@ -1517,7 +1522,7 @@ URL: [url]',
 'settings_updateDatabase' => 'Запустить обновление схемы БД',
 'settings_updateNotifyTime' => 'Период уведомлений об изменениях',
 'settings_updateNotifyTime_desc' => 'Пользователи уведомляются об изменениях документов за указанные последние секунды.',
-'settings_upgrade_php' => 'Обновите PHP до версии не ниже 5.2.0',
+'settings_upgrade_php' => 'Обновите PHP до версии не ниже 5.6.38',
 'settings_versioningFileName' => 'Название файла версий',
 'settings_versioningFileName_desc' => 'Названия файла версий, создаваемого инструментом резервного копирования.',
 'settings_versiontolow' => 'Слишком старая версия',
@@ -1542,6 +1547,9 @@ URL: [url]',
 'sign_out' => 'Выйти',
 'sign_out_user' => 'Пользовательский выход',
 'sk_SK' => 'Slovak',
+'sort_by_date' => '',
+'sort_by_name' => '',
+'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'Размер каталога данных',
 'splash_added_to_clipboard' => 'Добавлено в буфер обмена',
 'splash_add_access' => '',
@@ -1580,6 +1588,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'Неверный идентификатор каталога',
 'splash_invalid_searchterm' => 'Неверный поисковый запрос',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Буфер обмена перенесён в текущий каталог',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1610,6 +1619,7 @@ URL: [url]',
 'splash_substituted_user' => 'Пользователь переключён',
 'splash_switched_back_user' => 'Переключён на исходного пользователя',
 'splash_toogle_group_manager' => 'Изменён менеджер группы',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1636,6 +1646,7 @@ URL: [url]',
 'status_revisor_removed' => 'Ревизор удален из списка',
 'status_unknown' => 'Неизвестный',
 'storage_size' => 'Размер хранилища',
+'subfolder_duplicate_name' => '',
 'submit_2_fact_auth' => '',
 'submit_approval' => 'Утвердить',
 'submit_login' => 'Войти',
@@ -1698,6 +1709,7 @@ URL: [url]',
 'toggle_manager' => 'Изменить как менеджера',
 'toggle_qrcode' => '',
 'to_before_from' => 'Конечная дата не может быть меньше начальной даты',
+'transfer_content' => '',
 'transfer_document' => 'Передать документ',
 'transfer_no_read_access' => 'Пользователь не имеет доступа на чтение в этой папке',
 'transfer_no_write_access' => 'Пользователь не имеет доступа на запись в этой папке',

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 (1224), destinqo (19), pS2017 (508), ssebech (4)
+//    Translators: Admin (1225), destinqo (19), pS2017 (508), ssebech (4)
 
 $text = array(
 '2_factor_auth' => '2-faktorové overovanie',
@@ -295,6 +295,7 @@ URL: [url]',
 'confirm_rm_user' => 'Skutočne si prajete odstrániť používateľa "[username]"?<br>Buďte opatrní, táto akcia je nezvratná.',
 'confirm_rm_user_from_processes' => 'Do you really want to remove the user "[username]" from all processes?<br>Be careful: This action can lead to the release of documents if the user was the only or last approver.',
 'confirm_rm_version' => 'Naozaj chcete odstrániť verziu [version] dokumentu "[documentname]"?<br>Buďte opatrní: Túto operáciu nemožno vrátiť späť.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => 'Do you really want to transfer the documents, folders, etc. of the user "[username]"?<br>Be careful: This action cannot be undone.',
 'confirm_update_transmittalitem' => 'Potvrdiť aktualizáciu',
 'content' => 'Obsah',
@@ -740,6 +741,7 @@ URL: [url]',
 'linked_to_document' => 'Prepojené s dokumentom',
 'linked_to_this_version' => 'Prepojené s touto verziou',
 'link_alt_updatedocument' => 'If you would like to upload files bigger than the current maximum upload size, please use the alternative <a href="%s">upload page</a>.',
+'link_document' => '',
 'link_to_version' => 'Pripojiť k verzii',
 'list_access_rights' => 'Zobraziť všetky prístupové práva',
 'list_contains_no_access_docs' => 'Zoznam obsahuje viac dokumentov, ku ktorým nemáte prístup a nie sú zobrazené.',
@@ -979,6 +981,7 @@ URL: [url]',
 'receipt_status' => 'Stav',
 'receipt_summary' => 'Receipt summary',
 'receipt_update_failed' => 'Acknowledging reception failed',
+'recent_uploads' => '',
 'reception' => 'Reception',
 'reception_acknowleged' => 'Reception acknowledged',
 'reception_noaction' => 'Žiadna akcia',
@@ -1315,6 +1318,8 @@ Meno: [username]
 'settings_enableDropUpload_desc' => 'Enable/Disable the drop area on the \'View Folder\' page for uploading files by Drag&Drop.',
 'settings_enableDuplicateDocNames' => 'Povoliť duplicitné názvy dokumentov',
 'settings_enableDuplicateDocNames_desc' => 'Povoliť duplicitné názvy dokumentov v zložke.',
+'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames_desc' => '',
 'settings_enableEmail' => 'Povoliť e-mail',
 'settings_enableEmail_desc' => 'Povoliť/zakázať automatickú emailovú notifikáciu',
 'settings_enableFilterReceipt' => 'Filter out owner, reviewer, ... from reception list',
@@ -1557,7 +1562,7 @@ Meno: [username]
 'settings_updateDatabase' => 'Run schema update scripts on database',
 'settings_updateNotifyTime' => 'Aktualizovať čas notifikácie',
 'settings_updateNotifyTime_desc' => 'Users are notified about document-changes that took place within the last \'Update Notify Time\' seconds',
-'settings_upgrade_php' => 'Upgrade PHP to at least version 5.2.0',
+'settings_upgrade_php' => 'Upgrade PHP to at least version 5.6.38',
 'settings_versioningFileName' => 'Versioning FileName',
 'settings_versioningFileName_desc' => 'The name of the versioning info file created by the backup tool',
 'settings_versiontolow' => 'Verzia je nízka',
@@ -1582,6 +1587,9 @@ Meno: [username]
 'sign_out' => 'odhlásiť',
 'sign_out_user' => 'Odhlásiť používateľa',
 'sk_SK' => 'Slovenčina',
+'sort_by_date' => '',
+'sort_by_name' => '',
+'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'Space used on data folder',
 'splash_added_to_clipboard' => 'Pridané do schránky',
 'splash_add_access' => 'Prístupové právo pridané',
@@ -1620,6 +1628,7 @@ Meno: [username]
 'splash_inherit_access' => 'Access right will be inherited',
 'splash_invalid_folder_id' => 'Neplatné ID zložky',
 'splash_invalid_searchterm' => 'Invalid search term',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Schránka sa presunula do aktuálnej zložky',
 'splash_move_document' => 'Dokument bol presunutý',
 'splash_move_folder' => 'Zložka bola presunutá',
@@ -1650,6 +1659,7 @@ Meno: [username]
 'splash_substituted_user' => 'Substituted user',
 'splash_switched_back_user' => 'Switched back to original user',
 'splash_toogle_group_manager' => 'Group manager toogled',
+'splash_transfer_content' => '',
 'splash_transfer_document' => 'Document transfered',
 'splash_transfer_objects' => 'Objects transfered',
 'splash_trigger_workflow' => '',
@@ -1676,6 +1686,7 @@ Meno: [username]
 'status_revisor_removed' => 'Revisor removed from list',
 'status_unknown' => 'Neznámy',
 'storage_size' => 'Objem dát',
+'subfolder_duplicate_name' => '',
 'submit_2_fact_auth' => 'Save secret',
 'submit_approval' => 'Poslať schválenie',
 'submit_login' => 'Prihlásiť sa',
@@ -1738,6 +1749,7 @@ Meno: [username]
 'toggle_manager' => 'Prepnúť stav manager',
 'toggle_qrcode' => 'Ukázať/skryť QR kód',
 'to_before_from' => 'End date may not be before start date',
+'transfer_content' => '',
 'transfer_document' => 'Zmeniť vlastníka',
 'transfer_no_read_access' => 'Používateľ nemá práva na čítanie v adresári',
 'transfer_no_write_access' => 'Používateľ nemá práva na zapisovanie v adresári',

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 (1159), MagnusI (649), tmichelfelder (106)
+//    Translators: Admin (1160), MagnusI (649), tmichelfelder (106)
 
 $text = array(
 '2_factor_auth' => '2-faktors autentisering',
@@ -296,6 +296,7 @@ URL: [url]',
 'confirm_rm_user' => 'Vill du verkligen ta bort användaren "[username]"?<br>OBS! Åtgärden kan inte ångras!',
 'confirm_rm_user_from_processes' => 'Vill du verkligen ta bort användaren "[username]" från alla arbetsflöden?<br>Var försiktig! Denna åtgärd kan innebära oönskad publicering om användaren är den sista eller enda godkännaren i ett arbetsflöde.',
 'confirm_rm_version' => 'Vill du verkligen ta bort versionen [version] av dokumentet "[documentname]"?<br>OBS! Åtgärden kan inte ångras!',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => 'Vill du verkligen flytta dokument, kataloger m m tillhörande användaren "[username]"? OBS! Åtgärden kan inte ångras!',
 'confirm_update_transmittalitem' => 'Bekräfta uppdatering',
 'content' => 'Innehåll',
@@ -727,6 +728,7 @@ URL: [url]',
 'linked_to_document' => 'Länkad till dokument',
 'linked_to_this_version' => 'Länkad till denna version',
 'link_alt_updatedocument' => 'Om du vill ladda upp filer som är större än den aktuella största tillåtna storleken, använd dig av den alternativa metoden att ladda upp filer <a href="%s">Alternativ uppladdning</a>.',
+'link_document' => '',
 'link_to_version' => 'Kopppla till version',
 'list_access_rights' => 'Lista alla rättigheter...',
 'list_contains_no_access_docs' => 'Listan innehåller fler dokument som inte visas då du saknar rättigheter till dessa.',
@@ -952,6 +954,7 @@ Om du fortfarande har problem med inloggningen, kontakta administratören.',
 'receipt_status' => 'Status',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => 'Ingen åtgärd',
@@ -1288,6 +1291,8 @@ Kommentar: [comment]',
 'settings_enableDropUpload_desc' => 'Aktivera / avaktivera droppområdet på "Visa mapp" sidan för att ladda upp filer genom att dra och släppa.',
 'settings_enableDuplicateDocNames' => 'Tillåter dubletter av dokumentnamn',
 'settings_enableDuplicateDocNames_desc' => 'Tillåter att det finns dokument med samma namn i en mapp.',
+'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames_desc' => '',
 'settings_enableEmail' => 'Använd e-postmeddelanden',
 'settings_enableEmail_desc' => 'Aktivera/Inaktivera automatiska e-postmeddelanden',
 'settings_enableFilterReceipt' => '',
@@ -1530,7 +1535,7 @@ Kommentar: [comment]',
 'settings_updateDatabase' => 'Kör schemauppdateringsskript på databasen',
 'settings_updateNotifyTime' => 'Tid för uppdateringsmeddelande',
 'settings_updateNotifyTime_desc' => 'Användare meddelas om att ändringar i dokumentet har genomförts inom de senaste \'Tid för uppdateringsmeddelande\' sekunder.',
-'settings_upgrade_php' => 'Uppdatera PHP till åtminstone version 5.2.0',
+'settings_upgrade_php' => 'Uppdatera PHP till åtminstone version 5.6.38',
 'settings_versioningFileName' => 'Versionsinfo-filnamn',
 'settings_versioningFileName_desc' => 'Namnet på versionsinfo-fil som skapas med backup-verktyget',
 'settings_versiontolow' => 'Version för låg',
@@ -1555,6 +1560,9 @@ Kommentar: [comment]',
 'sign_out' => 'Logga ut',
 'sign_out_user' => 'Logga ut användare',
 'sk_SK' => 'Slovakiska',
+'sort_by_date' => '',
+'sort_by_name' => '',
+'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'Utrymme använt i datakatalogen',
 'splash_added_to_clipboard' => 'Tillagt till urklipp',
 'splash_add_access' => '',
@@ -1593,6 +1601,7 @@ Kommentar: [comment]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'Ogiltigt katalog-ID',
 'splash_invalid_searchterm' => 'Ogiltigt sökord',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Urklipp flyttades till aktuell katalog',
 'splash_move_document' => 'Dokumentet flyttat',
 'splash_move_folder' => 'Katalogen flyttad',
@@ -1623,6 +1632,7 @@ Kommentar: [comment]',
 'splash_substituted_user' => 'Bytt användare',
 'splash_switched_back_user' => 'Byt tillbaka till original användare',
 'splash_toogle_group_manager' => 'Gruppmanager har ändrats',
+'splash_transfer_content' => '',
 'splash_transfer_document' => 'Dokument överfört',
 'splash_transfer_objects' => 'Objekt överförda',
 'splash_trigger_workflow' => '',
@@ -1649,6 +1659,7 @@ Kommentar: [comment]',
 'status_revisor_removed' => 'Reviderare borttagen från listan',
 'status_unknown' => 'Okänd',
 'storage_size' => 'Lagringsstorlek',
+'subfolder_duplicate_name' => '',
 'submit_2_fact_auth' => 'Spara hemlighet',
 'submit_approval' => 'Skicka godkännande',
 'submit_login' => 'Logga in',
@@ -1711,6 +1722,7 @@ Kommentar: [comment]',
 'toggle_manager' => 'Byt manager',
 'toggle_qrcode' => 'Visa/göm QR-kod',
 'to_before_from' => 'Slutdatum får inte vara innan startdatum',
+'transfer_content' => '',
 'transfer_document' => 'Överför dokument',
 'transfer_no_read_access' => 'Användaren har inte läsrättigheter i katalogen',
 'transfer_no_write_access' => 'Användaren har inte skrivrättigheter i katalogen',

languages/tr_TR/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1082), aydin (83)
+//    Translators: Admin (1087), aydin (83)
 
 $text = array(
 '2_factor_auth' => '',
@@ -289,6 +289,7 @@ URL: [url]',
 'confirm_rm_user' => '"[username]" kullanıcısını silmeyi onaylıyor musunuz?<br>Dikkatli olun: Bu eylemin geri dönüşü yoktur.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '"[documentname]" dokümanının [version] versiyonunu silmek istiyor musunuz?<br>Dikkatli olun: Bu eylemin geri dönüşü yoktur.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '',
 'content' => 'İçerik',
@@ -708,6 +709,7 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Mevcut maksimum yükleme boyutundan daha büyük dosya yüklemek istiyorsanız <a href="%s">alternatif yükleme sayfası için tıklayın</a>.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Tüm erişim haklarini listele',
 'list_contains_no_access_docs' => '',
@@ -918,7 +920,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
 'preview_plain' => '',
 'previous_state' => 'Önceki durum',
 'previous_versions' => 'Önceki versiyonlar',
-'process' => '',
+'process' => 'İşlem',
 'process_without_user_group' => '',
 'pt_BR' => 'Portekizce',
 'quota' => 'Kota',
@@ -938,6 +940,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
 'receipt_status' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1247,6 +1250,8 @@ URL: [url]',
 'settings_enableDropUpload_desc' => '\'Klasör Görüntüle\' alanında dosyaları Sürükle&Bırak yöntemiyle yüklemek için sürükleme alanını etkinleştir/devredışı bırak',
 'settings_enableDuplicateDocNames' => 'Mükerrer doküman isimlerine izin ver',
 'settings_enableDuplicateDocNames_desc' => 'Bir klasör içinde aynı isimli dosyalara izin verir.',
+'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames_desc' => '',
 'settings_enableEmail' => 'E-Postayı Etkinleştir',
 'settings_enableEmail_desc' => 'Otomatik e-posta bildirimlerini etkinleştir/devre dışı bırak',
 'settings_enableFilterReceipt' => '',
@@ -1489,7 +1494,7 @@ URL: [url]',
 'settings_updateDatabase' => 'Veritabanında schema update betik çalıştır',
 'settings_updateNotifyTime' => 'Güncelleme Bildirim Zamanı',
 'settings_updateNotifyTime_desc' => 'Kullanıcılara doküman güncellemelerinin \'Update Notify Time\' saniyede gerçekleştiği bildirilir.',
-'settings_upgrade_php' => 'PHP versiyonu en az 5.2.0 olmalıdır',
+'settings_upgrade_php' => 'PHP versiyonu en az 5.6.38 olmalıdır',
 'settings_versioningFileName' => 'Versiyonlama DosyaAdı',
 'settings_versioningFileName_desc' => 'Yedekleme aracı tarafından oluşturulan versiyon bilgisi dosyasının adı',
 'settings_versiontolow' => 'Versiyon düşük',
@@ -1514,6 +1519,9 @@ URL: [url]',
 'sign_out' => 'Çıkış',
 'sign_out_user' => 'Kullanıcı hesabından çıkış',
 'sk_SK' => 'Slovakça',
+'sort_by_date' => 'Tarihe göre sırala',
+'sort_by_name' => 'Ada göre sırala',
+'sort_by_sequence' => 'Eklenme sırasına göre sırala',
 'space_used_on_data_folder' => 'Data klasörü kullanılan alan',
 'splash_added_to_clipboard' => 'Panoya eklendi',
 'splash_add_access' => '',
@@ -1552,6 +1560,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'Hatalı klasör ID',
 'splash_invalid_searchterm' => 'Hatalı arama terimi',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Pano mevcut klasöre taşındı',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1582,6 +1591,7 @@ URL: [url]',
 'splash_substituted_user' => 'Yerine geçilen kullanıcı',
 'splash_switched_back_user' => 'Orijinal kullanıcıya geri dönüldü',
 'splash_toogle_group_manager' => 'Grup yöneticisi değişti',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1608,6 +1618,7 @@ URL: [url]',
 'status_revisor_removed' => '',
 'status_unknown' => 'Bilinmeyen',
 'storage_size' => 'Depo boyutu',
+'subfolder_duplicate_name' => '',
 'submit_2_fact_auth' => '',
 'submit_approval' => 'Onay ver',
 'submit_login' => 'Giriş',
@@ -1670,6 +1681,7 @@ URL: [url]',
 'toggle_manager' => 'Değişim yönetimi',
 'toggle_qrcode' => '',
 'to_before_from' => 'Bitiş tarihi başlama tarihinden önce olamaz',
+'transfer_content' => '',
 'transfer_document' => 'Dokumanı gönder',
 'transfer_no_read_access' => 'Kullanıcının klasörde okuma erişimi yok.',
 'transfer_no_write_access' => 'Kullanıcının klasör üzerinde yazma hakkı yok',

languages/uk_UA/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 (1334)
+//    Translators: Admin (1338)
 
 $text = array(
 '2_factor_auth' => '',
@@ -295,6 +295,7 @@ URL: [url]',
 'confirm_rm_user' => 'Видалити користувача «[username]»?<br>Дія <b>незворотня</b>',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Видалити версію [version] документа «[documentname]»?<br>Дія <b>незворотня</b>',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => 'Підтвердити оновлення',
 'content' => 'Вміст',
@@ -332,7 +333,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'док.',
 'documents_checked_out_by_you' => 'Документи на Опрацюванні у вас',
-'documents_expired' => '',
+'documents_expired' => 'Застарілі документи',
 'documents_in_process' => 'Документи в роботі',
 'documents_locked' => 'Заблоковані документи',
 'documents_locked_by_you' => 'Документи, які ви заблокували',
@@ -714,6 +715,7 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Для завантаження файлів, які перевищують обмеження розміру, використовуйте <a href="%s">інший метод</a>.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Повний список прав...',
 'list_contains_no_access_docs' => '',
@@ -866,7 +868,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Дозволені лише .jpg-зображення',
 'order_by_sequence_off' => 'Можливість ручного сортування відключена в налаштуваннях. Якщо ви хочете використовувати цю функцію, ви повинні знову її включити.',
 'original_filename' => 'Початкова назва файлу',
-'overall_indexing_progress' => '',
+'overall_indexing_progress' => 'Загальне просування індексації"',
 'owner' => 'Власник',
 'ownership_changed_email' => 'Власника змінено',
 'ownership_changed_email_body' => 'Змінено власника
@@ -944,6 +946,7 @@ URL: [url]',
 'receipt_status' => '',
 'receipt_summary' => 'Підсумки отримання',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1268,6 +1271,8 @@ URL: [url]',
 'settings_enableDropUpload_desc' => 'Увімкнути/вимкнути область в "Перегляді каталогу" для завантаження за допомогою Drag&Drop.',
 'settings_enableDuplicateDocNames' => 'Дозволити документи<br/>з однаковою назвою',
 'settings_enableDuplicateDocNames_desc' => 'Дозволити документи з однаковими назвами в каталозі.',
+'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames_desc' => '',
 'settings_enableEmail' => 'Увімкнути e-mail',
 'settings_enableEmail_desc' => 'Увімкнути/вимкнути автоматичне сповіщення по e-mail.',
 'settings_enableFilterReceipt' => '',
@@ -1510,7 +1515,7 @@ URL: [url]',
 'settings_updateDatabase' => 'Запустити оновлення схеми БД',
 'settings_updateNotifyTime' => 'Період сповіщень про зміни',
 'settings_updateNotifyTime_desc' => 'Користувачі отримують сповіщення за вказані останні секунди.',
-'settings_upgrade_php' => 'Оновіть PHP до версії не нижче 5.2.0',
+'settings_upgrade_php' => 'Оновіть PHP до версії не нижче 5.6.38',
 'settings_versioningFileName' => 'Назва файлу версій',
 'settings_versioningFileName_desc' => 'Назва файлу версій, створеного інструментами резервного копіювання.',
 'settings_versiontolow' => 'Надто стара версія',
@@ -1535,6 +1540,9 @@ URL: [url]',
 'sign_out' => 'Вийти',
 'sign_out_user' => 'Вихід користувача',
 'sk_SK' => 'Slovak',
+'sort_by_date' => '',
+'sort_by_name' => '',
+'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'Розмір каталогу даних',
 'splash_added_to_clipboard' => 'Додано до буферу обміну',
 'splash_add_access' => '',
@@ -1573,6 +1581,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'Невірний ідентифікатор каталогу',
 'splash_invalid_searchterm' => 'Невірний пошуковий запит',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Буфер обміну перенесено в поточний каталог',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1603,6 +1612,7 @@ URL: [url]',
 'splash_substituted_user' => 'Користувача переключено',
 'splash_switched_back_user' => 'Переключено на початкового користувача',
 'splash_toogle_group_manager' => 'Змінено менеджера групи',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1629,6 +1639,7 @@ URL: [url]',
 'status_revisor_removed' => 'Ревізора видалено зі списку',
 'status_unknown' => 'Невідомий',
 'storage_size' => 'Розмір сховища',
+'subfolder_duplicate_name' => '',
 'submit_2_fact_auth' => '',
 'submit_approval' => 'Затвердити',
 'submit_login' => 'Увійти',
@@ -1691,6 +1702,7 @@ URL: [url]',
 'toggle_manager' => 'Змінити ознаку менеджера',
 'toggle_qrcode' => '',
 'to_before_from' => 'Кінцева дата не може бути меншою початкової дати',
+'transfer_content' => '',
 'transfer_document' => '',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',
@@ -1819,7 +1831,7 @@ URL: [url]',
 'workflow_summary' => 'Підсумки по процесу',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Підсумки по користувачу',
-'x_more_objects' => '',
+'x_more_objects' => '[number] більше об\'єктів',
 'year_view' => 'Рік',
 'yes' => 'Так',
 'zh_CN' => 'Chinese (CN)',

languages/zh_CN/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (760), archonwang (469), fengjohn (5), yang86 (1)
+//    Translators: Admin (765), archonwang (469), fengjohn (5), yang86 (1)
 
 $text = array(
 '2_factor_auth' => '双重认证',
@@ -287,6 +287,7 @@ URL: [url]',
 'confirm_rm_user' => '您确定要删除"[username]"用户?<br>请注意：此动作执行后不能撤销.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '您确定要删除"[documentname]文档的[version]版本文件?<br>请注意：此动作执行后不能撤销.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '确认更新',
 'content' => '内容',
@@ -710,6 +711,7 @@ URL: [url]',
 'linked_to_document' => '链接到文档',
 'linked_to_this_version' => '链接到版本',
 'link_alt_updatedocument' => '超过20M大文件，请选择<a href="%s">上传大文件</a>.',
+'link_document' => '',
 'link_to_version' => '附加到版本',
 'list_access_rights' => '列出所有的访问权限',
 'list_contains_no_access_docs' => '',
@@ -943,6 +945,7 @@ URL: [url]',
 'receipt_status' => '状态',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1249,6 +1252,8 @@ URL: [url]',
 'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => '允许重复的文件名',
 'settings_enableDuplicateDocNames_desc' => '',
+'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames_desc' => '',
 'settings_enableEmail' => '开启邮件',
 'settings_enableEmail_desc' => '开启/关闭邮件自动提醒',
 'settings_enableFilterReceipt' => '',
@@ -1410,7 +1415,7 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => '缩略图宽度（详情页中)',
 'settings_previewWidthDetail_desc' => '详情页面中缩略图的宽度',
-'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList' => '预览图像的宽度',
 'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => '缩略图宽度(列表中)',
 'settings_previewWidthList_desc' => '列表中缩略图的宽度',
@@ -1516,6 +1521,9 @@ URL: [url]',
 'sign_out' => '登出',
 'sign_out_user' => '退出登录',
 'sk_SK' => '斯洛伐克语',
+'sort_by_date' => '日期排序',
+'sort_by_name' => '文件名排序',
+'sort_by_sequence' => '顺序排列',
 'space_used_on_data_folder' => '数据文件夹使用空间',
 'splash_added_to_clipboard' => '已复制',
 'splash_add_access' => '',
@@ -1554,6 +1562,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => '非法的文件夹 ID',
 'splash_invalid_searchterm' => '无效的搜索项',
+'splash_link_document' => '',
 'splash_moved_clipboard' => '',
 'splash_move_document' => '文档已迁移',
 'splash_move_folder' => '文件夹已迁移',
@@ -1584,6 +1593,7 @@ URL: [url]',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1610,6 +1620,7 @@ URL: [url]',
 'status_revisor_removed' => '',
 'status_unknown' => '未知',
 'storage_size' => '存储大小',
+'subfolder_duplicate_name' => '',
 'submit_2_fact_auth' => '',
 'submit_approval' => '提交审核',
 'submit_login' => '登录',
@@ -1672,6 +1683,7 @@ URL: [url]',
 'toggle_manager' => '角色切换',
 'toggle_qrcode' => '显示/隐藏 QR 码',
 'to_before_from' => '结束日期不能早于开始日期',
+'transfer_content' => '',
 'transfer_document' => '共享文档',
 'transfer_no_read_access' => '用户没有该文件夹的读权限',
 'transfer_no_write_access' => '当前用户没有文件夹写入权限',

languages/zh_TW/lang.inc

@@ -270,6 +270,7 @@ URL: [url]',
 'confirm_rm_user' => '您確定要刪除"[username]"用戶?<br>請注意：此動作執行後不能撤銷.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '您確定要刪除"[documentname]文檔的[version]版本檔?<br>請注意：此動作執行後不能撤銷.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '',
 'content' => '內容',
@@ -635,6 +636,7 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => '超過20M大檔，請選擇<a href="%s">上傳大檔</a>.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => '列出權限',
 'list_contains_no_access_docs' => '',
@@ -825,6 +827,7 @@ URL: [url]',
 'receipt_status' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1098,6 +1101,8 @@ URL: [url]',
 'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => '允許重複的檔案名',
 'settings_enableDuplicateDocNames_desc' => '',
+'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames_desc' => '',
 'settings_enableEmail' => '',
 'settings_enableEmail_desc' => '',
 'settings_enableFilterReceipt' => '',
@@ -1365,6 +1370,9 @@ URL: [url]',
 'sign_out' => '登出',
 'sign_out_user' => '',
 'sk_SK' => '斯洛伐克語',
+'sort_by_date' => '',
+'sort_by_name' => '',
+'sort_by_sequence' => '',
 'space_used_on_data_folder' => '資料檔案夾使用空間',
 'splash_added_to_clipboard' => '已複製',
 'splash_add_access' => '',
@@ -1403,6 +1411,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
+'splash_link_document' => '',
 'splash_moved_clipboard' => '',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1433,6 +1442,7 @@ URL: [url]',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1459,6 +1469,7 @@ URL: [url]',
 'status_revisor_removed' => '',
 'status_unknown' => '未知',
 'storage_size' => '存儲大小',
+'subfolder_duplicate_name' => '',
 'submit_2_fact_auth' => '',
 'submit_approval' => '提交審核',
 'submit_login' => '登錄',
@@ -1521,6 +1532,7 @@ URL: [url]',
 'toggle_manager' => '角色切換',
 'toggle_qrcode' => '',
 'to_before_from' => '',
+'transfer_content' => '',
 'transfer_document' => '',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',

op/op.AddDocument.php

@@ -262,7 +262,7 @@ $docsource = 'upload';
 
 if($settings->_dropFolderDir) {
 	if(isset($_POST["dropfolderfileform1"]) && $_POST["dropfolderfileform1"]) {
-		$fullfile = $settings->_dropFolderDir.'/'.$user->getLogin().'/'.$folder->getID().'/'.$_POST["dropfolderfileform1"];
+		$fullfile = $settings->_dropFolderDir.'/'.$user->getLogin().'/'.$_POST["dropfolderfileform1"];
 		if(file_exists($fullfile)) {
 			$docsource = 'dropfolder';
 			/* Check if a local file is uploaded as well */

op/op.AddSubFolder.php

@@ -99,6 +99,13 @@ if(!empty($_POST['notification_groups'])) {
 	}
 }
 
+/* Check if name already exists in the folder */
+if(!$settings->_enableDuplicateSubFolderNames) {
+	if($folder->hasSubFolderByName($name)) {
+		UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("subfolder_duplicate_name"));
+	}
+}
+
 $controller->setParam('folder', $folder);
 $controller->setParam('name', $name);
 $controller->setParam('comment', $comment);

op/op.Ajax.php

@@ -265,7 +265,7 @@ switch($command) {
 
 	case 'movefolder': /* {{{ */
 		if($user) {
-			if(!checkFormKey('movefolder', 'GET')) {
+			if(!checkFormKey('', 'GET')) {
 				header('Content-Type: application/json');
 				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
 			} else {
@@ -304,7 +304,7 @@ switch($command) {
 
 	case 'movedocument': /* {{{ */
 		if($user) {
-			if(!checkFormKey('movedocument', 'GET')) {
+			if(!checkFormKey('', 'GET')) {
 				header('Content-Type: application/json');
 				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
 			} else {
@@ -341,6 +341,96 @@ switch($command) {
 		}
 		break; /* }}} */
 
+	case 'transfercontent': /* {{{ */
+		if($user) {
+			if(!checkFormKey('', 'GET')) {
+				header('Content-Type: application/json');
+				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
+			} else {
+				$mdocument = $dms->getDocument($_REQUEST['docid']);
+				if($mdocument) {
+					if ($mdocument->getAccessMode($user, 'transferContent') >= M_READWRITE) {
+						/* Check if source document has more than one version */
+						$versions = $mdocument->getContent();
+						if(count($versions) == 1) {
+							if($targetdoc = $dms->getDocument($_REQUEST['targetdocumentid'])) {
+								if($targetdoc->getAccessMode($user, 'transferContent') >= M_READWRITE) {
+									if($targetdoc->addContent($versions[0]->getComment(), $versions[0]->getUser(), $dms->contentDir . $versions[0]->getPath(), $versions[0]->getOriginalFileName(), $versions[0]->getFileType(), $versions[0]->getMimeType())) { //, $reviewers=array(), $approvers=array(), $version=0, $attributes=array(), $workflow=null) {
+										if($mdocument->remove()) {
+											header('Content-Type: application/json');
+											echo json_encode(array('success'=>true, 'message'=>getMLText('splash_transfer_content'), 'data'=>''));
+											add_log_line();
+										} else {
+											header('Content-Type: application/json');
+											echo json_encode(array('success'=>false, 'message'=>'Error removing source document', 'data'=>''));
+										}
+									} else {
+										header('Content-Type: application/json');
+										echo json_encode(array('success'=>false, 'message'=>'Error transfering content', 'data'=>''));
+									}
+								} else {
+									header('Content-Type: application/json');
+									echo json_encode(array('success'=>false, 'message'=>getMLText('access_denied'), 'data'=>''));
+								}
+							} else {
+								header('Content-Type: application/json');
+								echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id'), 'data'=>''));
+							}
+						} else {
+							header('Content-Type: application/json');
+							echo json_encode(array('success'=>false, 'message'=>getMLText('splash_source_doc_has_versions'), 'data'=>''));
+						}
+					} else {
+						header('Content-Type: application/json');
+						echo json_encode(array('success'=>false, 'message'=>getMLText('access_denied'), 'data'=>''));
+					}
+				} else {
+					header('Content-Type: application/json');
+					echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id'), 'data'=>''));
+				}
+			}
+		}
+		break; /* }}} */
+
+	case 'linkdocument': /* {{{ */
+		if($user) {
+			if(!checkFormKey('', 'GET')) {
+				header('Content-Type: application/json');
+				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
+			} else {
+				$mdocument = $dms->getDocument($_REQUEST['docid']);
+				if($mdocument) {
+					if ($mdocument->getAccessMode($user, 'linkDocument') >= M_READ) {
+						if($targetdoc = $dms->getDocument($_REQUEST['targetdocumentid'])) {
+							if($targetdoc->getAccessMode($user, 'linkDocument') >= M_READWRITE) {
+								if($targetdoc->addDocumentLink($mdocument->getID(), $user->getID(), false)) {
+									header('Content-Type: application/json');
+									echo json_encode(array('success'=>true, 'message'=>getMLText('splash_link_document'), 'data'=>''));
+									add_log_line();
+								} else {
+									header('Content-Type: application/json');
+									echo json_encode(array('success'=>false, 'message'=>'Error linking document', 'data'=>''));
+								}
+							} else {
+								header('Content-Type: application/json');
+								echo json_encode(array('success'=>false, 'message'=>getMLText('access_denied'), 'data'=>''));
+							}
+						} else {
+							header('Content-Type: application/json');
+							echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id'), 'data'=>''));
+						}
+					} else {
+						header('Content-Type: application/json');
+						echo json_encode(array('success'=>false, 'message'=>getMLText('access_denied'), 'data'=>''));
+					}
+				} else {
+					header('Content-Type: application/json');
+					echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id'), 'data'=>''));
+				}
+			}
+		}
+		break; /* }}} */
+
 	case 'deletefolder': /* {{{ */
 		if($user) {
 			if(!checkFormKey('removefolder', 'GET')) {
@@ -517,7 +607,7 @@ switch($command) {
 
 	case 'uploaddocument': /* {{{ */
 		if($user) {
-			if(checkFormKey('adddocument')) {
+			if(checkFormKey('')) {
 				if (!isset($_POST["folderid"]) || !is_numeric($_POST["folderid"]) || intval($_POST["folderid"])<1) {
 					header('Content-Type: application/json');
 					echo json_encode(array('success'=>false, 'message'=>getMLText("invalid_folder_id")));

op/op.EditFolder.php

@@ -70,6 +70,7 @@ $oldcomment = $folder->getComment();
  * will just update the old attribute object in array attributes[] and hence
  * also update the old value
  */
+$oldattributes = array();
 foreach($folder->getAttributes() as $ai=>$aa)
 	$oldattributes[$ai] = clone $aa;
 

op/op.MoveDocument.php

@@ -62,6 +62,13 @@ if($document->isLocked()) {
 	}
 }
 
+/* Check if name already exists in the folder */
+if(!$settings->_enableDuplicateDocNames) {
+	if($targetFolder->hasDocumentByName($document->getName())) {
+		UI::exitError(getMLText("folder_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("document_duplicate_name"));
+	}
+}
+
 if ($targetid != $oldFolder->getID()) {
 	if ($document->setFolder($targetFolder)) {
 		// Send notification to subscribers.

op/op.MoveFolder.php

@@ -60,6 +60,13 @@ if ($folder->getAccessMode($user, 'moveFolder') < M_READWRITE || $targetFolder->
 	UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("access_denied"));
 }
 
+/* Check if name already exists in the folder */
+if(!$settings->_enableDuplicateSubFolderNames) {
+	if($targetFolder->hasSubFolderByName($folder->getName())) {
+		UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("subfolder_duplicate_name"));
+	}
+}
+
 $oldFolder = $folder->getParent();
 if ($folder->setParent($targetFolder)) {
 	// Send notification to subscribers.

op/op.Settings.php

@@ -186,6 +186,7 @@ if ($action == "saveSettings")
   $settings->_enableVersionDeletion = getBoolValue("enableVersionDeletion");
   $settings->_enableVersionModification = getBoolValue("enableVersionModification");
   $settings->_enableDuplicateDocNames = getBoolValue("enableDuplicateDocNames");
+  $settings->_enableDuplicateSubFolderNames = getBoolValue("enableDuplicateSubFolderNames");
   $settings->_overrideMimeType = getBoolValue("overrideMimeType");
   $settings->_removeFromDropFolder = getBoolValue("removeFromDropFolder");
 

op/op.TriggerWorkflow.php

@@ -117,6 +117,7 @@ if($version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) {
 			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 
 			$usersinformed = array();
+			$groupsinformed = array();
 			foreach($workflow->getNextTransitions($transition->getNextState()) as $ntransition) {
 				foreach($ntransition->getUsers() as $tuser) {
 					if(!in_array($tuser->getUser()->getID(), $usersinformed)) {
@@ -125,7 +126,10 @@ if($version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) {
 					}
 				}
 				foreach($ntransition->getGroups() as $tuser) {
-					$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params);
+					if(!in_array($tuser->getUser()->getID(), $groupsinformed)) {
+						$groupsinformed[] = $tuser->getGroup()->getID();
+						$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params);
+					}
 				}
 			}
 		}

out/out.ChangePassword.php

@@ -22,14 +22,17 @@ if(!isset($settings))
 	require_once("../inc/inc.Settings.php");
 require_once("inc/inc.LogInit.php");
 require_once("inc/inc.Language.php");
+require_once("inc/inc.Init.php");
+require_once("inc/inc.Extension.php");
+require_once("inc/inc.DBInit.php");
 require_once("inc/inc.ClassUI.php");
 
 include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc";
 
 if (isset($_REQUEST["referuri"]) && strlen($_REQUEST["referuri"])>0)
-	$referui = $_REQUEST["referuri"];
+	$referuri = $_REQUEST["referuri"];
 else
-	$referui = '';
+	$referuri = '';
 
 if (isset($_REQUEST["hash"]) && strlen($_REQUEST["hash"])>0) {
 	$hash = $_REQUEST["hash"];
@@ -39,10 +42,8 @@ if (isset($_REQUEST["hash"]) && strlen($_REQUEST["hash"])>0) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'referui'=>$referui, 'hash'=>$hash, 'passwordstrength'=>$settings->_passwordStrength));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'referuri'=>$referuri, 'hash'=>$hash, 'passwordstrength'=>$settings->_passwordStrength));
 if($view) {
 	$view($_GET);
 	exit;
 }
-
-?>

out/out.Charts.php

@@ -41,13 +41,14 @@ $type = 'docsperuser';
 if(!empty($_GET['type'])) {
 	$type = $_GET['type'];
 }
-$data = $dms->getStatisticalData($type);
+if($data = $dms->getStatisticalData($type)) {
-switch($type) {
+	switch($type) {
-	case 'docsperstatus':
+		case 'docsperstatus':
-		foreach($data as &$rec) {
+			foreach($data as &$rec) {
-			$rec['key'] = getOverallStatusText((int) $rec['key']);
+				$rec['key'] = getOverallStatusText((int) $rec['key']);
-		}
+			}
-		break;
+			break;
+	}
 }
 
 if($view) {

out/out.Search.php

@@ -171,6 +171,13 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 		$query = "";
 	}
 
+	if (isset($_GET["orderby"]) && is_string($_GET["orderby"])) {
+		$orderby = $_GET["orderby"];
+	}
+	else {
+		$orderby = "";
+	}
+
 	/* Select if only documents (0x01), only folders (0x02) or both (0x03)
 	 * are found
 	 */
@@ -360,7 +367,26 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 
 	// ---------------- Start searching -----------------------------------------
 	$startTime = getTime();
-	$resArr = $dms->search($query, 0, 0 /*$limit, ($pageNumber-1)*$limit*/, $mode, $searchin, $startFolder, $owner, $status, $creationdate ? $startdate : array(), $creationdate ? $stopdate : array(), array(), array(), $categories, $attributes, $resultmode, $expirationdate ? $expstartdate : array(), $expirationdate ? $expstopdate : array());
+	$resArr = $dms->search(array(
+		'query'=>$query,
+		'limit'=>0,
+		'offset'=>0 /*$limit, ($pageNumber-1)*$limit*/,
+		'logicalmode'=>$mode,
+		'searchin'=>$searchin,
+		'startFolder'=>$startFolder,
+		'owner'=>$owner,
+		'status'=>$status,
+		'creationstartdate'=>$creationdate ? $startdate : array(),
+		'creationenddate'=>$creationdate ? $stopdate : array(),
+		'modificationstartdate'=>array(),
+		'modificationenddate'=>array(),
+		'categories'=>$categories,
+		'attributes'=>$attributes,
+		'mode'=>$resultmode,
+		'expirationstartdate'=>$expirationdate ? $expstartdate : array(),
+		'expirationenddate'=>$expirationdate ? $expstopdate : array(),
+		'orderby'=>$orderby
+	));
 	$searchTime = getTime() - $startTime;
 	$searchTime = round($searchTime, 2);
 
@@ -409,10 +435,14 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
 	$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 	$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'query'=>$query, 'searchhits'=>$entries, 'totalpages'=>$totalPages, 'pagenumber'=>$pageNumber, 'searchtime'=>$searchTime, 'urlparams'=>$_GET, 'cachedir'=>$settings->_cacheDir));
 	if($view) {
+		$view->setParam('showtree', showtree());
+		$view->setParam('enableRecursiveCount', $settings->_enableRecursiveCount);
+		$view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount);
 		$view->setParam('totaldocs', $dcount /*resArr['totalDocs']*/);
 		$view->setParam('totalfolders', $fcount /*resArr['totalFolders']*/);
 		$view->setParam('fullsearch', (isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSearch) ? true : false);
 		$view->setParam('mode', isset($mode) ? $mode : '');
+		$view->setParam('orderby', isset($orderby) ? $orderby : '');
 		$view->setParam('defaultsearchmethod', $settings->_defaultSearchMethod);
 		$view->setParam('resultmode', isset($resultmode) ? $resultmode : '');
 		$view->setParam('searchin', isset($searchin) ? $searchin : array());

out/out.ViewFolder.php

@@ -45,7 +45,7 @@ if (!is_object($folder)) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))), getMLText("invalid_folder_id"));
 }
 
-if (isset($_GET["orderby"]) && strlen($_GET["orderby"])==1 ) {
+if (isset($_GET["orderby"]) && strlen($_GET["orderby"])>0 ) {
 	$orderby=$_GET["orderby"];
 } else $orderby=$settings->_sortFoldersDefault;
 

restapi/index.php

@@ -374,7 +374,7 @@ function getFolderChildren($request, $response, $args) { /* {{{ */
 } /* }}} */
 
 function createFolder($request, $response, $args) { /* {{{ */
-    global $dms, $userobj;
+    global $dms, $userobj, $settings;
 
     if(!$userobj) {
         return $response->withJson(array('success'=>false, 'message'=>'Not logged in', 'data'=>''), 403);
@@ -390,17 +390,17 @@ function createFolder($request, $response, $args) { /* {{{ */
             $params = $request->getParsedBody();
             if(!empty($params['name'])) {
                 $comment = isset($params['comment']) ? $params['comment'] : '';
-								if(isset($params['sequence'])) {
+                if(isset($params['sequence'])) {
-										$sequence = str_replace(',', '.', $params["sequence"]);
+                    $sequence = str_replace(',', '.', $params["sequence"]);
-										if (!is_numeric($sequence))
+                    if (!is_numeric($sequence))
-												return $response->withJson(array('success'=>false, 'message'=>getMLText("invalid_sequence"), 'data'=>''), 400);
+                        return $response->withJson(array('success'=>false, 'message'=>getMLText("invalid_sequence"), 'data'=>''), 400);
-								} else {
+                } else {
-										$dd = $parent->getSubFolders('s');
+                    $dd = $parent->getSubFolders('s');
-										if(count($dd) > 1)
+                    if(count($dd) > 1)
-												$sequence = $dd[count($dd)-1]->getSequence() + 1;
+                        $sequence = $dd[count($dd)-1]->getSequence() + 1;
-										else
+                    else
-												$sequence = 1.0;
+                        $sequence = 1.0;
-								}
+                }
                 $newattrs = array();
                 if(!empty($params['attributes'])) {
                     foreach($params['attributes'] as $attrname=>$attrvalue) {
@@ -410,6 +410,12 @@ function createFolder($request, $response, $args) { /* {{{ */
                         }
                     }
                 }
+                /* Check if name already exists in the folder */
+                if(!$settings->_enableDuplicateSubFolderNames) {
+                    if($folder->hasSubFolderByName($params['name'])) {
+                        return $response->withJson(array('success'=>false, 'message'=>getMLText("subfolder_duplicate_name"), 'data'=>''), 400);
+                    }
+                }
                 if($folder = $parent->addSubFolder($params['name'], $comment, $userobj, $sequence, $newattrs)) {
 
                     $rec = __getFolderData($folder);
@@ -506,7 +512,7 @@ function deleteFolder($request, $response, $args) { /* {{{ */
 } /* }}} */
 
 function uploadDocument($request, $response, $args) { /* {{{ */
-    global $dms, $userobj;
+    global $dms, $userobj, $settings;
 
     if(!$userobj) {
         return $response->withJson(array('success'=>false, 'message'=>'Not logged in', 'data'=>''), 403);
@@ -571,6 +577,12 @@ function uploadDocument($request, $response, $args) { /* {{{ */
                 $origfilename = $file_info->getClientFilename();
             if (trim($docname) == '')
                 $docname = $origfilename;
+            /* Check if name already exists in the folder */
+            if(!$settings->_enableDuplicateDocNames) {
+                if($mfolder->hasDocumentByName($docname)) {
+                    return $response->withJson(array('success'=>false, 'message'=>getMLText("document_duplicate_name"), 'data'=>''), 400);
+                }
+            }
             $temp = $file_info->file;
             $finfo = finfo_open(FILEINFO_MIME_TYPE);
             $userfiletype = finfo_file($finfo, $temp);
@@ -662,7 +674,7 @@ function updateDocument($request, $response, $args) { /* {{{ */
  * Old upload method which uses put instead of post
  */
 function uploadDocumentPut($request, $response, $args) { /* {{{ */
-    global $dms, $userobj;
+    global $dms, $userobj, $settings;
 
     if(!$userobj) {
         return $response->withJson(array('success'=>false, 'message'=>'Not logged in', 'data'=>''), 403);
@@ -687,6 +699,12 @@ function uploadDocumentPut($request, $response, $args) { /* {{{ */
             $userfiletype = finfo_file($finfo, $temp);
             $fileType = ".".pathinfo($origfilename, PATHINFO_EXTENSION);
             finfo_close($finfo);
+            /* Check if name already exists in the folder */
+            if(!$settings->_enableDuplicateDocNames) {
+                if($mfolder->hasDocumentByName($docname)) {
+                return $response->withJson(array('success'=>false, 'message'=>getMLText("document_duplicate_name"), 'data'=>''), 400);
+                }
+            }
             $res = $mfolder->addDocument($docname, '', 0, $userobj, '', array(), $temp, $origfilename ? $origfilename : basename($temp), $fileType, $userfiletype, 0);
             unlink($temp);
             if($res) {
@@ -778,13 +796,13 @@ function addDocumentLink($request, $response, $args) { /* {{{ */
     $targetdoc = $dms->getDocument($args['documentid']);
     if($sourcedoc && $targetdoc) {
         if($sourcedoc->getAccessMode($userobj, 'addDocumentLink') >= M_READ) {
-					$params = $request->getParsedBody();
+            $params = $request->getParsedBody();
-					  $public = !isset($params['public']) ? true : false;
+              $public = !isset($params['public']) ? true : false;
-						if ($sourcedoc->addDocumentLink($targetdoc->getId(), $userobj->getID(), $public)){
+                if ($sourcedoc->addDocumentLink($targetdoc->getId(), $userobj->getID(), $public)){
                 return $response->withJson(array('success'=>true, 'message'=>'', 'data'=>''), 201);
-						} else {
+                } else {
-								return $response->withJson(array('success'=>false, 'message'=>'Could not create document link', 'data'=>''), 500);
+                        return $response->withJson(array('success'=>false, 'message'=>'Could not create document link', 'data'=>''), 500);
-						}
+            }
         } else {
             return $response->withJson(array('success'=>false, 'message'=>'No access on source document', 'data'=>''), 403);
         }

styles/bootstrap/application.css

@@ -152,6 +152,40 @@ div.splash {
 	display: none;
 }
 
+div.statusbar-container {
+	display: none;
+	position: fixed;
+	right:10px;
+	top:60px;
+	width:300px;
+	padding:10px;
+	background-color: white;
+	border: 1px solid #E0E0E0;
+	border-radius: 4px;
+	z-index: 10;
+	overflow-y: scroll;
+	max-height: calc(100% - 100px);
+}
+div.statusbar-container::-webkit-scrollbar {
+	width: 5px;
+}
+div.statusbar-container::-webkit-scrollbar-track {
+	-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+	border-radius: 10px;
+}
+
+div.statusbar-container::-webkit-scrollbar-thumb {
+	border-radius: 10px;
+	-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5);
+}
+
+div.statusbar-container h1 {
+	font-size: 21px;
+	line-height: 40px;
+	color: #333333;
+	font-weight: normal;
+}
+
 ul.jqtree-tree li.jqtree_common > .jqtree-element:hover {
     background-color: #E0E0E0;
 }
@@ -161,6 +195,7 @@ i.released {color: #00b000;}
 i.rejected {color: #b00000;}
 i.in-workflow {color: #11479e;}
 i.workflow-action {color: #91479e;}
+i.selected {border: 1px solid #d4d4d4;padding:3px;border-radius:3px;background-color:#fafafa;background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);}
 
 span.openpopupbox {
 	cursor: pointer;

styles/bootstrap/application.js

@@ -90,11 +90,11 @@ $(document).ready( function() {
 		},
 		highlighter : function (item) {
 			if(item.charAt(0) == 'D')
-				return '<i class="icon-file"></i> ' + item.substring(1);
+				return '<i class="icon-file"></i> ' + item.substring(1).replace(/</g, '&lt;');
 			else if(item.charAt(0) == 'F')
-				return '<i class="icon-folder-close-alt"></i> ' + item.substring(1);
+				return '<i class="icon-folder-close-alt"></i> ' + item.substring(1).replace(/</g, '&lt;');
 			else
-				return '<i class="icon-search"></i> ' + item.substring(1);
+				return '<i class="icon-search"></i> ' + item.substring(1).replace(/</g, '&lt;');
 		}
 	}); /* }}} */
 
@@ -122,7 +122,7 @@ $(document).ready( function() {
 		},
 		highlighter : function (item) {
 			strarr = item.split("#");
-			return '<i class="icon-file"></i> ' + strarr[1];
+			return '<i class="icon-file"></i> ' + strarr[1].replace(/</g, '&lt;');
 		}
 	}); /* }}} */
 
@@ -151,7 +151,7 @@ $(document).ready( function() {
 		},
 		highlighter : function (item) {
 			strarr = item.split("#");
-			return '<i class="icon-folder-close-alt"></i> ' + strarr[1];
+			return '<i class="icon-folder-close-alt"></i> ' + strarr[1].replace(/</g, '&lt;');
 		}
 	}); /* }}} */
 
@@ -545,7 +545,6 @@ function onAddClipboard(ev) { /* {{{ */
 	}
 
 	function sendFileToServer(formData,status) {
-		formData.append('command', 'uploaddocument');
 		var uploadURL = ajaxurl; //Upload URL
 		var extraData ={}; //Extra Data.
 		var jqXHR=$.ajax({
@@ -641,18 +640,29 @@ function onAddClipboard(ev) { /* {{{ */
 		}
 	}
 
-	SeedDMSUpload.handleFileUpload = function(files,obj) {
+	SeedDMSUpload.handleFileUpload = function(files,obj,statusbar) {
-		var target = obj.data('target');
+		/* target is set for the quick upload area */
-		if(target) {
+		var target_id = obj.data('target');
+		var target_type = 'folder';
+		/* droptarget is set for folders and documents in lists */
+		var droptarget = obj.data('droptarget');
+		if(droptarget) {
+			target_type = droptarget.split("_")[0];
+			target_id = droptarget.split("_")[1];
+		}
+		if(target_type == 'folder' && target_id) {
 			for (var i = 0; i < files.length; i++) {
 				if(files[i].size <= maxFileSize) {
 					var fd = new FormData();
-					fd.append('folderid', target);
+					fd.append('targettype', target_type);
-					fd.append('formtoken', obj.data('formtoken'));
+					fd.append('folderid', target_id);
+					fd.append('formtoken', obj.data('uploadformtoken'));
 					fd.append('userfile', files[i]);
+					fd.append('command', 'uploaddocument');
 //					fd.append('path', files[i].webkitRelativePath);
 
-					var status = new createStatusbar(obj);
+					statusbar.parent().show();
+					var status = new createStatusbar(statusbar);
 					status.setFileNameSize(files[i].name,files[i].size);
 					sendFileToServer(fd,status);
 				} else {
@@ -666,6 +676,32 @@ function onAddClipboard(ev) { /* {{{ */
 					});
 				}
 			}
+		} else if(target_type == 'document' && target_id) {
+			/*
+			for (var i = 0; i < files.length; i++) {
+				if(files[i].size <= maxFileSize) {
+					var fd = new FormData();
+					fd.append('targettype', target_type);
+					fd.append('documentid', target_id);
+					fd.append('formtoken', obj.data('uploadformtoken'));
+					fd.append('userfile', files[i]);
+					fd.append('command', 'uploaddocument');
+
+					var status = new createStatusbar(statusbar);
+					status.setFileNameSize(files[i].name,files[i].size);
+					sendFileToServer(fd,status);
+				} else {
+					noty({
+						text: maxFileSizeMsg + '<br /><em>' + files[i].name + ' (' + files[i].size + ' Bytes)</em>',
+						type: 'error',
+						dismissQueue: true,
+						layout: 'topRight',
+						theme: 'defaultTheme',
+						timeout: 5000,
+					});
+				}
+			}
+			*/
 		}
 	}
 }( window.SeedDMSUpload = window.SeedDMSUpload || {}, jQuery )); /* }}} */
@@ -690,120 +726,211 @@ $(document).ready(function() { /* {{{ */
 		var files = e.originalEvent.dataTransfer.files;
 
 		//We need to send dropped files to Server
-		SeedDMSUpload.handleFileUpload(files,obj);
+		SeedDMSUpload.handleFileUpload(files,obj, obj);
 	});
 
-	$(document).on('dragenter', '.table-row-folder', function (e) {
+	$(document).on('dragenter', '.droptarget', function (e) {
 		e.stopPropagation();
 		e.preventDefault();
 		$(e.currentTarget).css('border', '2px dashed #0B85A1');
 	});
-	$(document).on('dragleave', '.table-row-folder', function (e) {
+	$(document).on('dragleave', '.droptarget', function (e) {
 		e.stopPropagation();
 		e.preventDefault();
 		$(e.currentTarget).css('border', '0px solid white');
 	});
-	$(document).on('dragover', '.table-row-folder', function (e) {
+	$(document).on('dragover', '.droptarget', function (e) {
 		e.stopPropagation();
 		e.preventDefault();
 	});
-	$(document).on('drop', '.table-row-folder', function (e) {
+	$(document).on('drop', '.droptarget', function (e) {
 		e.preventDefault();
 		e.stopPropagation();
 		$(e.currentTarget).css('border', '0px solid white');
-		attr_rel = $(e.currentTarget).attr('rel');
+		attr_rel = $(e.currentTarget).data('droptarget');
 		target_type = attr_rel.split("_")[0];
 		target_id = attr_rel.split("_")[1];
-		console.log(e.originalEvent.dataTransfer.getData("text"));
+		if(target_type == 'folder') {
-		var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text"));
+			var files = e.originalEvent.dataTransfer.files;
-		source_type = source_info.type;
+			if(files.length > 0) {
-		source_id = source_info.id;
+				console.log('Drop '+files.length+' files on '+target_type+' '+target_id);
-		formtoken = source_info.formtoken;
+				SeedDMSUpload.handleFileUpload(files,$(e.currentTarget),$('div.statusbar-container h1')/*$(e.currentTarget).find("span")*/);
-//		source_type = e.originalEvent.dataTransfer.getData("type");
+			} else {
-//		source_id = e.originalEvent.dataTransfer.getData("id");
+				var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text"));
-//		formtoken = e.originalEvent.dataTransfer.getData("formtoken");
+				source_type = source_info.type;
-		if(source_type == 'document') {
+				source_id = source_info.id;
-			bootbox.dialog(trans.confirm_move_document, [{
+				formtoken = source_info.formtoken;
-				"label" : "<i class='icon-remove'></i> "+trans.move_document,
+				console.log('Drop '+source_type+' '+source_id+' on '+target_type+' '+target_id);
-				"class" : "btn-danger",
+				if(source_type == 'document') {
-				"callback": function() {
+					bootbox.dialog(trans.confirm_move_document, [{
-					$.get('../op/op.Ajax.php',
+						"label" : "<i class='icon-remove'></i> "+trans.move_document,
-						{ command: 'movedocument', docid: source_id, targetfolderid: target_id, formtoken: formtoken },
+						"class" : "btn-danger",
-						function(data) {
+						"callback": function() {
-							if(data.success) {
+							$.get('../op/op.Ajax.php',
-								$('#table-row-document-'+source_id).hide('slow');
+								{ command: 'movedocument', docid: source_id, targetfolderid: target_id, formtoken: formtoken },
-								noty({
+								function(data) {
-									text: data.message,
+									if(data.success) {
-									type: 'success',
+										$('#table-row-document-'+source_id).hide('slow');
-									dismissQueue: true,
+										noty({
-									layout: 'topRight',
+											text: data.message,
-									theme: 'defaultTheme',
+											type: 'success',
-									timeout: 1500,
+											dismissQueue: true,
-								});
+											layout: 'topRight',
-							} else {
+											theme: 'defaultTheme',
-								noty({
+											timeout: 1500,
-									text: data.message,
+										});
-									type: 'error',
+									} else {
-									dismissQueue: true,
+										noty({
-									layout: 'topRight',
+											text: data.message,
-									theme: 'defaultTheme',
+											type: 'error',
-									timeout: 3500,
+											dismissQueue: true,
-								});
+											layout: 'topRight',
-							}
+											theme: 'defaultTheme',
-						},
+											timeout: 3500,
-						'json'
+										});
-					);
+									}
-				}
+								},
-			}, {
+								'json'
-				"label" : trans.cancel,
+							);
-				"class" : "btn-cancel",
+						}
-				"callback": function() {
+					}, {
-				}
+						"label" : trans.cancel,
-			}]);
+						"class" : "btn-cancel",
+						"callback": function() {
+						}
+					}]);
 
-			url = "../out/out.MoveDocument.php?documentid="+source_id+"&targetid="+target_id;
+					url = "../out/out.MoveDocument.php?documentid="+source_id+"&targetid="+target_id;
-//			document.location = url;
+		//			document.location = url;
-		} else if(source_type == 'folder' && source_id != target_id) {
+				} else if(source_type == 'folder' && source_id != target_id) {
-			bootbox.dialog(trans.confirm_move_folder, [{
+					bootbox.dialog(trans.confirm_move_folder, [{
-				"label" : "<i class='icon-remove'></i> "+trans.move_folder,
+						"label" : "<i class='icon-remove'></i> "+trans.move_folder,
-				"class" : "btn-danger",
+						"class" : "btn-danger",
-				"callback": function() {
+						"callback": function() {
-					$.get('../op/op.Ajax.php',
+							$.get('../op/op.Ajax.php',
-						{ command: 'movefolder', folderid: source_id, targetfolderid: target_id, formtoken: formtoken },
+								{ command: 'movefolder', folderid: source_id, targetfolderid: target_id, formtoken: formtoken },
-						function(data) {
+								function(data) {
-							if(data.success) {
+									if(data.success) {
-								$('#table-row-folder-'+source_id).hide('slow');
+										$('#table-row-folder-'+source_id).hide('slow');
-								noty({
+										noty({
-									text: data.message,
+											text: data.message,
-									type: 'success',
+											type: 'success',
-									dismissQueue: true,
+											dismissQueue: true,
-									layout: 'topRight',
+											layout: 'topRight',
-									theme: 'defaultTheme',
+											theme: 'defaultTheme',
-									timeout: 1500,
+											timeout: 1500,
-								});
+										});
-							} else {
+									} else {
-								noty({
+										noty({
-									text: data.message,
+											text: data.message,
-									type: 'error',
+											type: 'error',
-									dismissQueue: true,
+											dismissQueue: true,
-									layout: 'topRight',
+											layout: 'topRight',
-									theme: 'defaultTheme',
+											theme: 'defaultTheme',
-									timeout: 3500,
+											timeout: 3500,
-								});
+										});
-							}
+									}
-						},
+								},
-						'json'
+								'json'
-					);
+							);
-				}
+						}
-			}, {
+					}, {
-				"label" : trans.cancel,
+						"label" : trans.cancel,
-				"class" : "btn-cancel",
+						"class" : "btn-cancel",
-				"callback": function() {
+						"callback": function() {
-				}
+						}
-			}]);
+					}]);
 
-			url = "../out/out.MoveFolder.php?folderid="+source_id+"&targetid="+target_id;
+					url = "../out/out.MoveFolder.php?folderid="+source_id+"&targetid="+target_id;
-//			document.location = url;
+		//			document.location = url;
+				}
+			}
+		} else if(target_type == 'document') {
+			var files = e.originalEvent.dataTransfer.files;
+			if(files.length > 0) {
+				console.log('Drop '+files.length+' files on '+target_type+' '+target_id);
+				SeedDMSUpload.handleFileUpload(files,$(e.currentTarget),$('div.statusbar-container h1')/*$(e.currentTarget).find("span")*/);
+			} else {
+				var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text"));
+				source_type = source_info.type;
+				source_id = source_info.id;
+				formtoken = source_info.formtoken;
+				console.log('Drop '+source_type+' '+source_id+' on '+target_type+' '+target_id);
+				if(source_type == 'document') {
+					if(source_id != target_id) {
+						bootbox.dialog(trans.confirm_transfer_link_document, [{
+							"label" : "<i class='icon-remove'></i> "+trans.transfer_content,
+							"class" : "btn-danger",
+							"callback": function() {
+								$.get('../op/op.Ajax.php',
+									{ command: 'transfercontent', docid: source_id, targetdocumentid: target_id, formtoken: formtoken },
+									function(data) {
+										if(data.success) {
+											$('#table-row-document-'+source_id).hide('slow');
+											noty({
+												text: data.message,
+												type: 'success',
+												dismissQueue: true,
+												layout: 'topRight',
+												theme: 'defaultTheme',
+												timeout: 1500,
+											});
+										} else {
+											noty({
+												text: data.message,
+												type: 'error',
+												dismissQueue: true,
+												layout: 'topRight',
+												theme: 'defaultTheme',
+												timeout: 3500,
+											});
+										}
+									},
+									'json'
+								);
+							}
+						}, {
+							"label" : trans.link_document,
+							"class" : "btn-danger",
+							"callback": function() {
+								$.get('../op/op.Ajax.php',
+									{ command: 'linkdocument', docid: source_id, targetdocumentid: target_id, formtoken: formtoken },
+									function(data) {
+										if(data.success) {
+											noty({
+												text: data.message,
+												type: 'success',
+												dismissQueue: true,
+												layout: 'topRight',
+												theme: 'defaultTheme',
+												timeout: 1500,
+											});
+										} else {
+											noty({
+												text: data.message,
+												type: 'error',
+												dismissQueue: true,
+												layout: 'topRight',
+												theme: 'defaultTheme',
+												timeout: 3500,
+											});
+										}
+									},
+									'json'
+								);
+							}
+						}, {
+							"label" : trans.cancel,
+							"class" : "btn-cancel",
+							"callback": function() {
+							}
+						}]);
+					}
+
+					url = "../out/out.MoveDocument.php?documentid="+source_id+"&targetid="+target_id;
+		//			document.location = url;
+				}
+			}
 		}
 	});
 	$(document).on('dragstart', '.table-row-folder', function (e) {
@@ -816,9 +943,6 @@ $(document).ready(function() { /* {{{ */
 			formtoken : $(e.target).attr('formtoken')
 		};
 		e.originalEvent.dataTransfer.setData("text", JSON.stringify(dragStartInfo));
-//		e.originalEvent.dataTransfer.setData("id", attr_rel.split("_")[1]);
-//		e.originalEvent.dataTransfer.setData("type","folder");
-//		e.originalEvent.dataTransfer.setData("formtoken", $(e.target).attr('formtoken'));
 	});
 
 	$(document).on('dragstart', '.table-row-document', function (e) {
@@ -831,9 +955,6 @@ $(document).ready(function() { /* {{{ */
 			formtoken : $(e.target).attr('formtoken')
 		};
 		e.originalEvent.dataTransfer.setData("text", JSON.stringify(dragStartInfo));
-//		e.originalEvent.dataTransfer.setData("id", attr_rel.split("_")[1]);
-//		e.originalEvent.dataTransfer.setData("type","document");
-//		e.originalEvent.dataTransfer.setData("formtoken", $(e.target).attr('formtoken'));
 	});
 
 	/* Dropping item on alert below clipboard */

views/bootstrap/class.ApprovalSummary.php

@@ -36,6 +36,13 @@ require_once("SeedDMS/Preview.php");
  */
 class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 
+	function js() { /* {{{ */
+		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
+
+		$this->printDeleteDocumentButtonJs();
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -46,6 +53,8 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
 
+		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("approval_summary"));
 		$this->globalNavigation();
 		$this->contentStart();
@@ -84,10 +93,10 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 				}
 
 				$class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : ''));
-				print "<tr id=\"table-row-document-".$st['documentID']."\" class=\"table-row-document".$class."\" rel=\"document_".$st['documentID']."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+				echo $this->documentListRowStart($document, $class);
 				echo $this->documentListRow($document, $previewer, true, $st['version']);
 				print "<td><small>".getApprovalStatusText($st['status'])."<br />".$st["date"]."<br />". htmlspecialchars($moduser->getFullName()) ."</small></td>";
-				print "</tr>\n";
+				echo $this->documentListRowEnd($document);
 			}
 			if ($st["status"]!=-2) {
 				$iRev[] = $st["documentID"];
@@ -126,10 +135,10 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 				}	
 
 				$class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : ''));
-				print "<tr id=\"table-row-document-".$st['documentID']."\" class=\"table-row-document".$class."\" rel=\"document_".$st['documentID']."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+				echo $this->documentListRowStart($document, $class);
 				echo $this->documentListRow($document, $previewer, true, $st['version']);
 				print "<td><small>".getApprovalStatusText($st["status"])."<br />".$st["date"]."<br />". htmlspecialchars($moduser->getFullName()) ."</small></td>";
-				print "</tr>\n";
+				echo $this->documentListRowEnd($document);
 			}
 		}
 		if (!$printheader) {

views/bootstrap/class.Bootstrap.php

@@ -128,6 +128,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			$this->params['session']->clearSplashMsg();
 			echo "<div class=\"splash\" data-type=\"".$flashmsg['type']."\"".(!empty($flashmsg['timeout']) ? ' data-timeout="'.$flashmsg['timeout'].'"': '').">".$flashmsg['msg']."</div>\n";
 		}
+		echo "<div class=\"statusbar-container\"><h1>".getMLText('recent_uploads')."</h1></div>\n";
 		foreach($hookObjs as $hookObj) {
 			if (method_exists($hookObj, 'startBody')) {
 				$hookObj->startBody($this);
@@ -398,7 +399,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		for ($i = 0; $i < count($path); $i++) {
 			$txtpath .= "<li>";
 			if ($i +1 < count($path)) {
-				$txtpath .= "<a href=\"../out/out.ViewFolder.php?folderid=".$path[$i]->getID()."&showtree=".showtree()."\" rel=\"folder_".$path[$i]->getID()."\" class=\"table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">".
+				$txtpath .= "<a href=\"../out/out.ViewFolder.php?folderid=".$path[$i]->getID()."&showtree=".showtree()."\" data-droptarget=\"folder_".$path[$i]->getID()."\" rel=\"folder_".$path[$i]->getID()."\" class=\"table-row-folder droptarget\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\">".
 					htmlspecialchars($path[$i]->getName())."</a>";
 			}
 			else {
@@ -993,6 +994,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$icons["sxm"]  = "ooo_formula.png";
 		$icons["smf"]  = "ooo_formula.png";
 		$icons["mml"]  = "ooo_formula.png";
+		$icons["folder"]  = "folder.svg";
 
 		$icons["default"] = "text-x-preview.svg"; //"default.png";
 
@@ -1584,18 +1586,19 @@ $(document).ready(function() {
 	 */
 	function printNewTreeNavigationJs($folderid=0, $accessmode=M_READ, $showdocs=0, $formid='form1', $expandtree=0, $orderby='') { /* {{{ */
 		function jqtree($path, $folder, $user, $accessmode, $showdocs=1, $expandtree=0, $orderby='', $level=0) {
+			$orderdir = (isset($orderby[1]) ? ($orderby[1] == 'd' ? 'desc' : 'asc') : 'asc');
 			if($path || $expandtree>=$level) {
 				if($path)
 					$pathfolder = array_shift($path);
-				$subfolders = $folder->getSubFolders($orderby);
+				$subfolders = $folder->getSubFolders(isset($orderby[0]) ? $orderby[0] : '', $orderdir);
 				$subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode);
 				$children = array();
 				foreach($subfolders as $subfolder) {
-					$node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? false : false, 'is_folder'=>true);
+					$node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? true : false, 'is_folder'=>true);
 					if($expandtree>=$level || $pathfolder->getID() == $subfolder->getID()) {
 						$node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1);
 						if($showdocs) {
-							$documents = $subfolder->getDocuments($orderby);
+							$documents = $subfolder->getDocuments(isset($orderby[0]) ? $orderby[0] : '', $orderdir);
 							$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, $accessmode);
 							foreach($documents as $document) {
 								$node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false);
@@ -1607,11 +1610,11 @@ $(document).ready(function() {
 				}
 				return $children;
 			} else {
-				$subfolders = $folder->getSubFolders($orderby);
+				$subfolders = $folder->getSubFolders(isset($orderby[0]) ? $orderby[0] : '', $orderdir);
 				$subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode);
 				$children = array();
 				foreach($subfolders as $subfolder) {
-					$node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? false : false, 'is_folder'=>true);
+					$node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? true : false, 'is_folder'=>true);
 					$children[] = $node;
 				}
 				return $children;
@@ -1619,6 +1622,7 @@ $(document).ready(function() {
 			return array();
 		}
 
+		$orderdir = (isset($orderby[1]) ? ($orderby[1] == 'd' ? 'desc' : 'asc') : 'asc');
 		if($folderid) {
 			$folder = $this->params['dms']->getFolder($folderid);
 			$path = $folder->getPath();
@@ -1631,7 +1635,7 @@ $(document).ready(function() {
 			} else {
 				$node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs, $expandtree, $orderby, 0);
 				if($showdocs) {
-					$documents = $folder->getDocuments($orderby);
+					$documents = $folder->getDocuments(isset($orderby[0]) ? $orderby[0] : '', $orderdir);
 					$documents = SeedDMS_Core_DMS::filterAccess($documents, $this->params['user'], $accessmode);
 					foreach($documents as $document) {
 						$node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false);
@@ -1649,7 +1653,7 @@ $(document).ready(function() {
 			
 		} else {
 			$root = $this->params['dms']->getFolder($this->params['rootfolderid']);
-			$tree = array(array('label'=>$root->getName(), 'id'=>$root->getID(), 'load_on_demand'=>false, 'is_folder'=>true));
+			$tree = array(array('label'=>$root->getName(), 'id'=>$root->getID(), 'load_on_demand'=>true, 'is_folder'=>true));
 		}
 
 ?>
@@ -1672,7 +1676,7 @@ $(function() {
     onCreateLi: function(node, $li) {
         // Add 'icon' span before title
 				if(node.is_folder)
-					$li.find('.jqtree-title').before('<i class="icon-folder-close-alt table-row-folder" rel="folder_' + node.id + '"></i> ').attr('rel', 'folder_' + node.id).attr('formtoken', '<?php echo createFormKey('movefolder'); ?>');
+					$li.find('.jqtree-title').before('<i class="icon-folder-close-alt table-row-folder droptarget" data-droptarget="folder_' + node.id + '" rel="folder_' + node.id + '"></i> ').attr('rel', 'folder_' + node.id).attr('formtoken', '<?php echo createFormKey(''); ?>').attr('data-uploadformtoken', '<?php echo createFormKey(''); ?>');
 				else
 					$li.find('.jqtree-title').before('<i class="icon-file"></i> ');
     }
@@ -2171,6 +2175,21 @@ $(document).ready( function() {
 		";
 	} /* }}} */
 
+	/**
+	 * Start the row for a folder in list of documents and folders
+	 *
+	 * For a detailed description see
+	 * {@link SeedDMS_Bootstrap_Style::folderListRowStart()}
+	 */
+	function documentListRowStart($document, $class='') { /* {{{ */
+		$docID = $document->getID();
+		return "<tr id=\"table-row-document-".$docID."\" class=\"table-row-document droptarget ".($class ? ' '.$class : '')."\" data-droptarget=\"document_".$docID."\" rel=\"document_".$docID."\" formtoken=\"".createFormKey('')."\" draggable=\"true\">";
+	} /* }}} */
+
+	function documentListRowEnd($document) { /* {{{ */
+			return "</tr>\n";
+	} /* }}} */
+
 	/**
 	 * Return HTML of a single row in the document list table
 	 *
@@ -2194,7 +2213,7 @@ $(document).ready( function() {
 		$docID = $document->getID();
 
 		if(!$skipcont)
-			$content .= "<tr id=\"table-row-document-".$docID."\" class=\"table-row-document\" rel=\"document_".$docID."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+			$content .= $this->documentListRowStart($document);
 
 		if($version) {
 			$latestContent = $this->callHook('documentContent', $document, $version);
@@ -2300,10 +2319,50 @@ $(document).ready( function() {
 			$content .= "</td>";
 		}
 		if(!$skipcont)
-			$content .= "</tr>\n";
+			$content .= $this->documentListRowEnd($document);
 		return $content;
 	} /* }}} */
 
+	/**
+	 * Start the row for a folder in list of documents and folders
+	 *
+	 * This method creates the starting tr tag for a new table row containing
+	 * a folder list entry. The tr tag contains various attributes which are
+	 * used for removing the table line and to make drap&drop work.
+	 *
+	 * id=table-row-folder-<id> : used for identifying the row when removing the table
+	 *   row after deletion of the folder by clicking on the delete button in that table
+	 *   row.
+	 * data-droptarget=folder_<id> : identifies the folder represented by this row
+	 *   when it used as a target of the drag&drop operation.
+	 *   If an element (either a file or a dragged item) is dropped on this row, the
+	 *   data-droptarget will be evaluated to identify the underlying dms object.
+	 *   Dropping a file on a folder will upload that file into the folder. Droping
+	 *   an item (which is currently either a document or a folder) from the page will
+	 *   move that item into the folder.
+	 * rel=folder_<id> : This data is put into drag data when a drag starts. When the
+	 *   item is dropped on some other item this data will identify the source object.
+	 *   The attributes data-droptarget and rel are usually equal. At least there is
+	 *   currently no scenario where they are different.
+	 * formtoken=<token> : token made of key 'movefolder'
+	 *   formtoken is also placed in the drag data just like the value of attibute 'rel'.
+	 *   This is always set to a value made of 'movefolder'.
+	 * data-uploadformtoken=<token> : token made of key 'adddocument'
+	 * class=table-row-folder : The class must have a class named 'table-row-folder' in
+	 *   order to be draggable and to extract the drag data from the attributes 'rel' and
+	 *   'formtoken'
+	 *
+	 * @param object $folder
+	 * @return string starting tr tag for a table
+	 */
+	function folderListRowStart($folder, $class='') { /* {{{ */
+		return "<tr id=\"table-row-folder-".$folder->getID()."\" draggable=\"true\" data-droptarget=\"folder_".$folder->getID()."\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder droptarget".($class ? ' '.$class : '')."\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\">";
+	} /* }}} */
+
+	function folderListRowEnd($folder) { /* {{{ */
+			return "</tr>\n";
+	} /* }}} */
+
 	function folderListRow($subFolder, $extracontent=array()) { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -2318,9 +2377,9 @@ $(document).ready( function() {
 		if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
 
 		$content = '';
-		$content .= "<tr id=\"table-row-folder-".$subFolder->getID()."\" draggable=\"true\" rel=\"folder_".$subFolder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
+		$content .= $this->folderListRowStart($subFolder);
-		$content .= "<td><a _rel=\"folder_".$subFolder->getID()."\" draggable=\"false\" href=\"../out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\"><img draggable=\"false\" src=\"".$this->imgpath."folder.svg\" width=\"24\" height=\"24\" border=0></a></td>\n";
+		$content .= "<td><a draggable=\"false\" href=\"../out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\"><img draggable=\"false\" src=\"".$this->getMimeIcon(".folder")."\" width=\"24\" height=\"24\" border=0></a></td>\n";
-		$content .= "<td><a draggable=\"false\" _rel=\"folder_".$subFolder->getID()."\" href=\"../out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . "</a>";
+		$content .= "<td><a draggable=\"false\" href=\"../out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . "</a>";
 		$content .= "<br /><span style=\"font-size: 85%; font-style: italic; color: #666;\">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $subFolder->getDate())."</b></span>";
 		if($comment) {
 			$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
@@ -2375,7 +2434,7 @@ $(document).ready( function() {
 		}
 		$content .= "</div>";
 		$content .= "</td>";
-		$content .= "</tr>\n";
+		$content .= $this->folderListRowEnd($subFolder);
 		return $content;
 	} /* }}} */
 

views/bootstrap/class.Clipboard.php

@@ -57,11 +57,11 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		foreach($clipboard['folders'] as $folderid) {
 			if($folder = $this->params['dms']->getFolder($folderid))
-				$content .= "    <li><a href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><i class=\"icon-folder-close-alt\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
+				$content .= "    <li><a href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\" class=\"table-row-folder droptarget\" data-droptarget=\"folder_".$folder->getID()."\" rel=\"folder_".$folder->getID()."\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\"><i class=\"icon-folder-close-alt\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
 		}
 		foreach($clipboard['docs'] as $docid) {
 			if($document = $this->params['dms']->getDocument($docid))
-				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\"><i class=\"icon-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
+				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\" class=\"table-row-document droptarget\" data-droptarget=\"document_".$document->getID()."\" rel=\"document_".$document->getID()."\"><i class=\"icon-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
 		}
 		$content .= "    <li class=\"divider\"></li>\n";
 		if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) {
@@ -91,6 +91,80 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
 		echo $content;
 	} /* }}} */
 
+	/**
+	 * Return row of clipboard for a folder
+	 *
+	 * @param object $folder
+	 * @return string rendered html content
+	 */
+	public function folderClipboardRow($folder) { /* {{{ */
+		$dms = $this->params['dms'];
+
+		$content = '';
+		$comment = $folder->getComment();
+		if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
+//		$content .= "<tr draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
+		$content .= $this->folderListRowStart($folder);
+		$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\"><img draggable=\"false\" src=\"".$this->getMimeIcon(".folder")."\" width=\"24\" height=\"24\" border=0></a></td>\n";
+		$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\">" . htmlspecialchars($folder->getName()) . "</a>";
+		if($comment) {
+			$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
+		}
+		$content .= "</td>\n";
+		$content .= "<td>\n";
+		$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folder->getID()."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
+		$content .= "</td>\n";
+		$content .= "</tr>\n";
+
+		return $content;
+	} /* }}} */
+
+	/**
+	 * Return row of clipboard for a document
+	 *
+	 * @param object $document
+	 * @return string rendered html content
+	 */
+	public function documentClipboardRow($document, $previewer) { /* {{{ */
+		$dms = $this->params['dms'];
+
+		$content = '';
+		$comment = $document->getComment();
+		if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
+		$latestContent = $this->callHook('documentLatestContent', $document);
+		if($latestContent === null)
+			$latestContent = $document->getLatestContent();
+		if($latestContent) {
+			$previewer->createPreview($latestContent);
+			$version = $latestContent->getVersion();
+			$status = $latestContent->getStatus();
+			
+			$content .= $this->documentListRowStart($document);
+
+			if (file_exists($dms->contentDir . $latestContent->getPath())) {
+				$content .= "<td><a draggable=\"false\" href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$version."\">";
+				if($previewer->hasPreview($latestContent)) {
+					$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"40\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+				} else {
+					$content .= "<img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+				}
+				$content .= "</a></td>";
+			} else
+				$content .= "<td><img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\"></td>";
+			
+			$content .= "<td><a draggable=\"false\" href=\"out.ViewDocument.php?documentid=".$document->getID()."&showtree=".showtree()."\">" . htmlspecialchars($document->getName()) . "</a>";
+			if($comment) {
+				$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
+			}
+			$content .= "</td>\n";
+			$content .= "<td>\n";
+			$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"D".$document->getID()."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$document->getID()."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
+			$content .= "</td>\n";
+			$content .= "</tr>";
+		}
+		return $content;
+	} /* }}} */
+
 	/**
 	 * Return clipboard content rendered as html
 	 *
@@ -112,19 +186,13 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
 			foreach($clipboard['folders'] as $folderid) {
 				/* FIXME: check for access rights, which could have changed after adding the folder to the clipboard */
 				if($folder = $dms->getFolder($folderid)) {
-					$comment = $folder->getComment();
+					$txt = $this->callHook('folderClipboardItem', $folder, 'clipboard');
-					if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
+					if(is_string($txt))
-					$content .= "<tr draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
+						$content .= $txt;
-					$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\"><img draggable=\"false\" src=\"".$this->imgpath."folder.png\" width=\"24\" height=\"24\" border=0></a></td>\n";
+					else {
-					$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\">" . htmlspecialchars($folder->getName()) . "</a>";
+						$content .= $this->folderClipboardRow($folder);
-					if($comment) {
-						$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
 					}
-					$content .= "</td>\n";
+
-					$content .= "<td>\n";
-					$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folderid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$folderid."&type=folder\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
-					$content .= "</td>\n";
-					$content .= "</tr>\n";
 					$foldercount++;
 				}
 			}
@@ -133,40 +201,15 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
 			foreach($clipboard['docs'] as $docid) {
 				/* FIXME: check for access rights, which could have changed after adding the document to the clipboard */
 				if($document = $dms->getDocument($docid)) {
-					$comment = $document->getComment();
+					$document->verifyLastestContentExpriry();
-					if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
+					$txt = $this->callHook('documentClipboardItem', $document, $previewer, 'clipboard');
-					$latestContent = $this->callHook('documentLatestContent', $document);
+					if(is_string($txt))
-					if($latestContent === null)
+						$content .= $txt;
-						$latestContent = $document->getLatestContent();
+					else {
-					if($latestContent) {
+						$content .= $this->documentClipboardRow($document, $previewer);
-						$previewer->createPreview($latestContent);
-						$version = $latestContent->getVersion();
-						$status = $latestContent->getStatus();
-						
-						$content .= "<tr draggable=\"true\" rel=\"document_".$docid."\" class=\"table-row-document\" formtoken=\"".createFormKey('movedocument')."\">";
-
-						if (file_exists($dms->contentDir . $latestContent->getPath())) {
-							$content .= "<td><a draggable=\"false\" href=\"../op/op.Download.php?documentid=".$docid."&version=".$version."\">";
-							if($previewer->hasPreview($latestContent)) {
-								$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"40\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-							} else {
-								$content .= "<img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-							}
-							$content .= "</a></td>";
-						} else
-							$content .= "<td><img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\"></td>";
-						
-						$content .= "<td><a draggable=\"false\" href=\"out.ViewDocument.php?documentid=".$docid."&showtree=".showtree()."\">" . htmlspecialchars($document->getName()) . "</a>";
-						if($comment) {
-							$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
-						}
-						$content .= "</td>\n";
-						$content .= "<td>\n";
-						$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"D".$docid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$docid."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
-						$content .= "</td>\n";
-						$content .= "</tr>";
-						$doccount++;
 					}
+
+					$doccount++;
 				}
 			}
 		}

views/bootstrap/class.ErrorDlg.php

@@ -40,7 +40,7 @@ class SeedDMS_View_ErrorDlg extends SeedDMS_Bootstrap_Style {
 		$settings = $this->params['settings'];
 
 		if(!$plain) {
-			$this->htmlStartPage($pagetitle, 'errorpage', $settings->_httpRoot."out");
+			$this->htmlStartPage($pagetitle, 'errorpage', $settings->_httpRoot."out/");
 			$this->globalNavigation();
 			$this->contentStart();
 		}

views/bootstrap/class.ManageNotify.php

@@ -43,7 +43,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 		$notifications = array();
 		if ($as_group){
 			if(!($groups = $this->user->getGroups()))
-				return NULL;
+				return array();
 
 			foreach ($groups as $group) {
 				$tmp = $group->getNotifications($folders ? T_FOLDER : T_DOCUMENT);

views/bootstrap/class.ReviewSummary.php

@@ -36,6 +36,13 @@ require_once("SeedDMS/Preview.php");
  */
 class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 
+	function js() { /* {{{ */
+		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
+
+		$this->printDeleteDocumentButtonJs();
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -46,6 +53,8 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
 
+		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("my_documents"));
 		$this->globalNavigation();
 		$this->contentStart();
@@ -87,10 +96,10 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 				}
 
 				$class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : ''));
-				print "<tr id=\"table-row-document-".$st['documentID']."\" class=\"table-row-document".$class."\" rel=\"document_".$st['documentID']."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+				echo $this->documentListRowStart($document, $class);
 				echo $this->documentListRow($document, $previewer, true, $st['version']);
 				print "<td><small>".getReviewStatusText($st['status'])."<br />".$st["date"]."<br />". htmlspecialchars($moduser->getFullName()) ."</small></td>";
-				print "</tr>\n";
+				echo $this->documentListRowEnd($document);
 			}
 			if ($st["status"]!=-2) {
 				$iRev[] = $st["documentID"];
@@ -130,7 +139,8 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 				}
 
 				$class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : ''));
-				print "<tr id=\"table-row-document-".$st['documentID']."\" class=\"table-row-document".$class."\" rel=\"document_".$st['documentID']."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+//				print "<tr id=\"table-row-document-".$st['documentID']."\" class=\"table-row-document".$class."\" rel=\"document_".$st['documentID']."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+				echo $this->documentListRowStart($document, $class);
 				echo $this->documentListRow($document, $previewer, true, $st['version']);
 				print "<td><small>".getReviewStatusText($st['status'])."<br />".$st["date"]."<br />". htmlspecialchars($moduser->getFullName()) ."</small></td>";
 				print "</tr>\n";

views/bootstrap/class.Search.php

@@ -55,7 +55,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
 
-		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
+		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
 
 		$this->printFolderChooserJs("form1");
 		$this->printDeleteFolderButtonJs();
@@ -88,6 +88,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 		$expirationdate = $this->params['expirationdate'];
 		$status = $this->params['status'];
 		$this->query = $this->params['query'];
+		$orderby = $this->params['orderby'];
 		$entries = $this->params['searchhits'];
 		$totalpages = $this->params['totalpages'];
 		$pageNumber = $this->params['pagenumber'];
@@ -219,7 +220,6 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 </table>
 <?php
 		$this->contentContainerEnd();
-// }}}
 
 		/* First check if any of the folder filters are set. If it is,
 		 * open the accordion.
@@ -369,6 +369,9 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
     </div>
   </div>
 </div>
+<?php
+		// }}}
+?>
 </form>
 		</div>
 <?php
@@ -459,10 +462,18 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 			if(is_string($txt))
 				echo $txt;
 			else {
+				parse_str($_SERVER['QUERY_STRING'], $tmp);
+				$tmp['orderby'] = $orderby=="n"||$orderby=="na)"?"nd":"n";
 				print "<table class=\"table table-hover\">";
 				print "<thead>\n<tr>\n";
 				print "<th></th>\n";
-				print "<th>".getMLText("name")."</th>\n";
+				print "<th>".getMLText("name");
+				if(!$fullsearch) {
+					print " <a href=\"../out/out.Search.php?".http_build_query($tmp)."\" title=\"".getMLText("sort_by_name")."\">".($orderby=="n"||$orderby=="na"?' <i class="icon-sort-by-alphabet selected"></i>':($orderby=="nd"?' <i class="icon-sort-by-alphabet-alt selected"></i>':' <i class="icon-sort-by-alphabet"></i>'))."</a>";
+					$tmp['orderby'] = $orderby=="d"||$orderby=="da)"?"dd":"d";
+					print " <a href=\"../out/out.Search.php?".http_build_query($tmp)."\" title=\"".getMLText("sort_by_date")."\">".($orderby=="d"||$orderby=="da"?' <i class="icon-sort-by-attributes selected"></i>':($orderby=="dd"?' <i class="icon-sort-by-attributes-alt selected"></i>':' <i class="icon-sort-by-attributes"></i>'))."</a>";
+				}
+				print "</th>\n";
 				//print "<th>".getMLText("attributes")."</th>\n";
 				print "<th>".getMLText("status")."</th>\n";
 				print "<th>".getMLText("action")."</th>\n";
@@ -521,87 +532,6 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 						if($attrstr)
 							$extracontent['bottom_title'] = '<br />'.$this->printPopupBox('<span class="btn btn-mini btn-default">'.getMLText('attributes').'</span>', $attrstr, true);
 						print $this->documentListRow($document, $previewer, false, 0, $extracontent);
-
-						if(0) {
-						print "<tr id=\"table-row-document-".$document->getID()."\" class=\"table-row-document\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
-						if (in_array(2, $searchin)) {
-							$docName = $this->markQuery(htmlspecialchars($document->getName()), "i");
-						} else {
-							$docName = htmlspecialchars($document->getName());
-						}
-						print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\">";
-						if($previewer->hasPreview($lc)) {
-							print "<img class=\"mimeicon\" width=\"".$previewwidth."\" src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$lc->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($lc->getMimeType())."\">";
-						} else {
-							print "<img class=\"mimeicon\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($lc->getFileType())."\" title=\"".htmlspecialchars($lc->getMimeType())."\">";
-						}
-						print "</a></td>";
-						print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\">";
-						print $docName;
-						print "</a>";
-						print "<br /><span style=\"font-size: 85%;\">".getMLText('in_folder').": /";
-						$folder = $document->getFolder();
-						$path = $folder->getPath();
-						for ($i = 1; $i  < count($path); $i++) {
-							print htmlspecialchars($path[$i]->getName())."/";
-						}
-						print "</span>";
-					print "<br /><span style=\"font-size: 85%; font-style: italic; color: #666; \">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $document->getDate())."</b>, ".getMLText('version')." <b>".$version."</b> - <b>".date('Y-m-d', $lc->getDate())."</b></span>";
-						if($comment) {
-							print "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
-						}
-						print "</td>";
-
-						print "<td>";
-						print "<ul class=\"unstyled\">\n";
-						$lcattributes = $lc->getAttributes();
-						if($lcattributes) {
-							foreach($lcattributes as $lcattribute) {
-								$attrdef = $lcattribute->getAttributeDefinition();
-								print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $lcattribute->getValueAsArray()))."</li>\n";
-							}
-						}
-						print "</ul>\n";
-						print "<ul class=\"unstyled\">\n";
-						$docttributes = $document->getAttributes();
-						if($docttributes) {
-							foreach($docttributes as $docttribute) {
-								$attrdef = $docttribute->getAttributeDefinition();
-								print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $docttribute->getValueAsArray()))."</li>\n";
-							}
-						}
-						print "</ul>\n";
-						print "</td>";
-
-						$display_status=$lc->getStatus();
-						print "<td>".getOverallStatusText($display_status["status"]). "</td>";
-						print "<td>";
-						print "<div class=\"list-action\">";
-						if($document->getAccessMode($user) >= M_ALL) {
-							$this->printDeleteDocumentButton($document, 'splash_rm_document');
-						} else {
-	?>
-			 <span style="padding: 2px; color: #CCC;"><i class="icon-remove"></i></span>
-	<?php
-						}
-						if($document->getAccessMode($user) >= M_READWRITE) {
-	?>
-			 <a href="../out/out.EditDocument.php?documentid=<?php echo $document->getID(); ?>"><i class="icon-edit"></i></a>
-	<?php
-						} else {
-	?>
-			 <span style="padding: 2px; color: #CCC;"><i class="icon-edit"></i></span>
-	<?php
-						}
-						if($enableclipboard) {
-	?>
-			 <a class="addtoclipboard" rel="<?php echo "D".$document->getID(); ?>" msg="<?php printMLText('splash_added_to_clipboard'); ?>" _href="../op/op.AddToClipboard.php?documentid=<?php echo $document->getID(); ?>&type=document&id=<?php echo $document->getID(); ?>&refferer=<?php echo urlencode($this->params['refferer']); ?>" title="<?php printMLText("add_to_clipboard");?>"><i class="icon-copy"></i></a>
-<?php
-						}
-						print "</div>";
-						print "</td>";
-						print "</tr>\n";
-						}
 					}
 				} elseif(get_class($entry) == $dms->getClassname('folder')) {
 					$folder = $entry;
@@ -627,64 +557,6 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 					if($attrstr)
 						$extracontent['bottom_title'] = '<br />'.$this->printPopupBox('<span class="btn btn-mini btn-default">'.getMLText('attributes').'</span>', $attrstr, true);
 					print $this->folderListRow($folder, $extracontent);
-					if(0) {
-					print "<tr id=\"table-row-folder-".$folder->getID()."\" draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
-					print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><img src=\"".$this->imgpath."folder.png\" width=\"24\" height=\"24\" border=0></a></td>";
-					print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\">";
-					print $folderName;
-					print "</a>";
-					print "<br /><span style=\"font-size: 85%;\">".getMLText('in_folder').": /";
-					$path = $folder->getPath();
-					for ($i = 1; $i  < count($path)-1; $i++) {
-						print htmlspecialchars($path[$i]->getName())."/";
-					}
-					print "</span>";
-					print "<br /><span style=\"font-size: 85%; font-style: italic; color: #666;\">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $folder->getDate())."</b></span>";
-					if (in_array(3, $searchin)) $comment = $this->markQuery(htmlspecialchars($folder->getComment()));
-					else $comment = htmlspecialchars($folder->getComment());
-					if (strlen($comment) > 50) $comment = substr($comment, 0, 47) . "...";
-					if($comment) {
-						print "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
-					}
-					print "</td>";
-					print "<td>";
-					print "<ul class=\"unstyled\">\n";
-					$folderattributes = $folder->getAttributes();
-					if($folderattributes) {
-						foreach($folderattributes as $folderattribute) {
-							$attrdef = $folderattribute->getAttributeDefinition();
-							print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $folderattribute->getValueAsArray()))."</li>\n";
-						}
-					}
-					print "</td>";
-					print "<td></td>";
-					print "<td nowrap>";
-					print "<div class=\"list-action\">";
-					if($folder->getAccessMode($user) >= M_ALL) {
-						$this->printDeleteFolderButton($folder, 'splash_rm_folder');
-					} else {
-?>
-     <span style="padding: 2px; color: #CCC;"><i class="icon-remove"></i></span>
-<?php
-					}
-					if($folder->getAccessMode($user) >= M_READWRITE) {
-?>
-     <a class_="btn btn-mini" href="../out/out.EditFolder.php?folderid=<?php echo $folder->getID(); ?>"><i class="icon-edit"></i></a>
-<?php
-					} else {
-?>
-     <span style="padding: 2px; color: #CCC;"><i class="icon-edit"></i></span>
-<?php
-					}
-					if($enableclipboard) {
-?>
-     <a class="addtoclipboard" rel="<?php echo "F".$folder->getID(); ?>" msg="<?php printMLText('splash_added_to_clipboard'); ?>" _href="../op/op.AddToClipboard.php?folderid=<?php echo $folder->getID(); ?>&type=folder&id=<?php echo $folder->getID(); ?>&refferer=<?php echo urlencode($this->params['refferer']); ?>" title="<?php printMLText("add_to_clipboard");?>"><i class="icon-copy"></i></a>
-<?php
-					}
-					print "</div>";
-					print "</td>";
-					print "</tr>\n";
-					}
 				}
 			}
 			print "</tbody></table>\n";

views/bootstrap/class.Settings.php

@@ -430,6 +430,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
 <?php $this->showConfigCheckbox('settings_enableVersionDeletion', 'enableVersionDeletion'); ?>
 <?php $this->showConfigCheckbox('settings_enableVersionModification', 'enableVersionModification'); ?>
 <?php $this->showConfigCheckbox('settings_enableDuplicateDocNames', 'enableDuplicateDocNames'); ?>
+<?php $this->showConfigCheckbox('settings_enableDuplicateSubFolderNames', 'enableDuplicateSubFolderNames'); ?>
 <?php $this->showConfigCheckbox('settings_overrideMimeType', 'overrideMimeType'); ?>
 <?php $this->showConfigCheckbox('settings_removeFromDropFolder', 'removeFromDropFolder'); ?>
 

views/bootstrap/class.Tasks.php

@@ -159,7 +159,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "       <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		foreach($tasks['review'] as $t) {
 			$doc = $dms->getDocument($t['id']);
-			$content .= "      <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp\">".$doc->getName()."</a></li>";
+			$content .= "      <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp\" class=\"table-row-document\" rel=\"document_".$doc->getID()."\">".$doc->getName()."</a></li>";
 		}
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
@@ -170,7 +170,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		foreach($tasks['approval'] as $t) {
 			$doc = $dms->getDocument($t['id']);
-			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp\">".$doc->getName()."</a></li>";
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp\" class=\"table-row-document\" rel=\"document_".$doc->getID()."\">".$doc->getName()."</a></li>";
 		}
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
@@ -181,7 +181,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		foreach($tasks['workflow'] as $t) {
 			$doc = $dms->getDocument($t['id']);
-			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=workflow\">".$doc->getName()."</a></li>";
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=workflow\" class=\"table-row-document\" rel=\"document_".$doc->getID()."\">".$doc->getName()."</a></li>";
 		}
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
@@ -258,7 +258,8 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 				if($folder = $dms->getFolder($folderid)) {
 					$comment = $folder->getComment();
 					if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
-					$content .= "<tr draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
+//					$content .= "<tr draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
+					$content .= $this->folderListRowStart($folder);
 					$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\"><img draggable=\"false\" src=\"".$this->imgpath."folder.png\" width=\"24\" height=\"24\" border=0></a></td>\n";
 					$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\">" . htmlspecialchars($folder->getName()) . "</a>";
 					if($comment) {
@@ -268,7 +269,8 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 					$content .= "<td>\n";
 					$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folderid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$folderid."&type=folder\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
 					$content .= "</td>\n";
-					$content .= "</tr>\n";
+					//$content .= "</tr>\n";
+					$content .= $this->folderListRowEnd($folder);
 					$foldercount++;
 				}
 			}

views/bootstrap/class.UpdateDocument.php

@@ -447,7 +447,7 @@ console.log(element);
 						}
 					}
 				}
-				$fieldwrap = array();
+				$fieldwrap = array('', '');
 				if($tmp) {
 					$fieldwrap = array('', $this->getSelectPresetButtonHtml("GrpReviewers", $tmp));
 				}
@@ -597,7 +597,7 @@ console.log(element);
 						}
 					}
 				}
-				$fieldwrap = array();
+				$fieldwrap = array('', '');
 				if($tmp) {
 					$fieldwrap = array('', $this->getSelectPresetButtonHtml("GrpApprovers", $tmp));
 				}

views/bootstrap/class.ViewDocument.php

@@ -705,10 +705,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			echo "</thead><tbody>";
 			foreach($statuslog as $entry) {
 				if($suser = $dms->getUser($entry['userID']))
-					$fullname = $suser->getFullName();
+					$fullname = htmlspecialchars($suser->getFullName());
 				else
 					$fullname = "--";
-				echo "<tr><td>".$entry['date']."</td><td>".getOverallStatusText($entry['status'])."</td><td>".$fullname."</td><td>".$entry['comment']."</td></tr>\n";
+				echo "<tr><td>".$entry['date']."</td><td>".getOverallStatusText($entry['status'])."</td><td>".$fullname."</td><td>".htmlspecialchars($entry['comment'])."</td></tr>\n";
 			}
 			print "</tbody>\n</table>\n";
 			$this->contentContainerEnd();
@@ -725,8 +725,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					echo "<td>".$wkflog->getDate()."</td>";
 					echo "<td>".$wkflog->getTransition()->getAction()->getName()."</td>";
 					$loguser = $wkflog->getUser();
-					echo "<td>".$loguser->getFullName()."</td>";
+					echo "<td>".htmlspecialchars($loguser->getFullName())."</td>";
-					echo "<td>".$wkflog->getComment()."</td>";
+					echo "<td>".htmlspecialchars($wkflog->getComment())."</td>";
 					echo "</tr>";
 				}
 				print "</tbody>\n</table>\n";

views/bootstrap/class.ViewFolder.php

@@ -87,13 +87,14 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
 		$orderby = $this->params['orderby'];
+		$orderdir = (isset($orderby[1]) ? ($orderby[1] == 'd' ? 'desc' : 'asc') : 'asc');
 		$expandFolderTree = $this->params['expandFolderTree'];
 		$enableDropUpload = $this->params['enableDropUpload'];
 		$maxItemsPerPage = $this->params['maxItemsPerPage'];
 		$showtree = $this->params['showtree'];
 
 		header('Content-Type: application/javascript; charset=UTF-8');
-		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
+		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
 ?>
 function folderSelected(id, name) {
 	window.location = '../out/out.ViewFolder.php?folderid=' + id;
@@ -155,6 +156,7 @@ $('#loadmore').click(function(e) {
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
 		$orderby = $this->params['orderby'];
+		$orderdir = (isset($orderby[1]) ? ($orderby[1] == 'd' ? 'desc' : 'asc') : 'asc');
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewConverters'];
@@ -168,13 +170,13 @@ $('#loadmore').click(function(e) {
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
 		$previewer->setConverters($previewconverters);
 
-		$subFolders = $this->callHook('folderGetSubFolders', $folder, $orderby);
+		$subFolders = $this->callHook('folderGetSubFolders', $folder, $orderby[0]);
 		if($subFolders === null)
-			$subFolders = $folder->getSubFolders($orderby);
+			$subFolders = $folder->getSubFolders($orderby[0], $orderdir);
 		$subFolders = SeedDMS_Core_DMS::filterAccess($subFolders, $user, M_READ);
-		$documents = $this->callHook('folderGetDocuments', $folder, $orderby);
+		$documents = $this->callHook('folderGetDocuments', $folder, $orderby[0]);
 		if($documents === null)
-			$documents = $folder->getDocuments($orderby);
+			$documents = $folder->getDocuments($orderby[0], $orderdir);
 		$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ);
 
 		$content = '';
@@ -226,6 +228,7 @@ $('#loadmore').click(function(e) {
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
 		$orderby = $this->params['orderby'];
+		$orderdir = (isset($orderby[1]) ? ($orderby[1] == 'd' ? 'desc' : 'asc') : 'asc');
 		$enableFolderTree = $this->params['enableFolderTree'];
 		$enableClipboard = $this->params['enableclipboard'];
 		$enableDropUpload = $this->params['enableDropUpload'];
@@ -387,7 +390,7 @@ $('#loadmore').click(function(e) {
 //			$this->addFooterJS("SeedDMSUpload.setMaxFileSize(".SeedDMS_Core_File::parse_filesize(ini_get("upload_max_filesize")).");");
 //			$this->addFooterJS("SeedDMSUpload.setMaxFileSizeMsg('".getMLText("uploading_maxsize")."');");
 ?>
-<div id="dragandrophandler" class="well alert" data-target="<?php echo $folder->getID(); ?>" data-formtoken="<?php echo createFormKey('adddocument'); ?>"><?php printMLText('drop_files_here'); ?></div>
+<div id="dragandrophandler" class="well alert" data-droptarget="folder_<?php echo $folder->getID(); ?>" data-target="<?php echo $folder->getID(); ?>" data-uploadformtoken="<?php echo createFormKey(''); ?>"><?php printMLText('drop_files_here'); ?></div>
 <?php
 			echo "</div>";
 			echo "</div>";
@@ -399,13 +402,13 @@ $('#loadmore').click(function(e) {
 		else
 			$this->contentHeading(getMLText("folder_contents"));
 
-		$subFolders = $this->callHook('folderGetSubFolders', $folder, $orderby);
+		$subFolders = $this->callHook('folderGetSubFolders', $folder, $orderby[0], $orderdir);
 		if($subFolders === null)
-			$subFolders = $folder->getSubFolders($orderby);
+			$subFolders = $folder->getSubFolders($orderby[0], $orderdir);
 		$subFolders = SeedDMS_Core_DMS::filterAccess($subFolders, $user, M_READ);
-		$documents = $this->callHook('folderGetDocuments', $folder, $orderby);
+		$documents = $this->callHook('folderGetDocuments', $folder, $orderby[0], $orderdir);
 		if($documents === null)
-			$documents = $folder->getDocuments($orderby);
+			$documents = $folder->getDocuments($orderby[0], $orderdir);
 		$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ);
 
 		$txt = $this->callHook('folderListPreContent', $folder, $subFolders, $documents);
@@ -413,14 +416,18 @@ $('#loadmore').click(function(e) {
 			echo $txt;
 		$i = 0;
 		if ((count($subFolders) > 0)||(count($documents) > 0)){
-			$txt = $this->callHook('folderListHeader', $folder, $orderby);
+			$txt = $this->callHook('folderListHeader', $folder, $orderby, $orderdir);
 			if(is_string($txt))
 				echo $txt;
 			else {
 				print "<table id=\"viewfolder-table\" class=\"table table-condensed table-hover\">";
 				print "<thead>\n<tr>\n";
 				print "<th></th>\n";	
-				print "<th><a href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="n"?"&orderby=s":"&orderby=n")."\">".getMLText("name")."</a></th>\n";
+				print "<th>".getMLText("name");
+				print " <a href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="n"||$orderby=="na"?"&orderby=nd":"&orderby=n")."\" title=\"".getMLText("sort_by_name")."\">".($orderby=="n"||$orderby=="na"?' <i class="icon-sort-by-alphabet selected"></i>':($orderby=="nd"?' <i class="icon-sort-by-alphabet-alt selected"></i>':' <i class="icon-sort-by-alphabet"></i>'))."</a>";
+				print " <a href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="s"||$orderby=="sa"?"&orderby=sd":"&orderby=s")."\" title=\"".getMLText("sort_by_sequence")."\">".($orderby=="s"||$orderby=="sa"?' <i class="icon-sort-by-order selected"></i>':($orderby=="sd"?' <i class="icon-sort-by-order-alt selected"></i>':' <i class="icon-sort-by-order"></i>'))."</a>";
+				print " <a href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="d"||$orderby=="da"?"&orderby=dd":"&orderby=d")."\" title=\"".getMLText("sort_by_date")."\">".($orderby=="d"||$orderby=="da"?' <i class="icon-sort-by-attributes selected"></i>':($orderby=="dd"?' <i class="icon-sort-by-attributes-alt selected"></i>':' <i class="icon-sort-by-attributes"></i>'))."</a>";
+				print "</th>\n";
 	//			print "<th>".getMLText("owner")."</th>\n";
 				print "<th>".getMLText("status")."</th>\n";
 	//			print "<th>".getMLText("version")."</th>\n";