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

CHANGELOG

@@ -5,6 +5,15 @@
 - add attribute groups and selective output of attributes
 - document versions can be downloaded by a temporary link
 
+--------------------------------------------------------------------------------
+                     Changes in version 6.0.1
+--------------------------------------------------------------------------------
+- call hook 'rawcontent' when downloading transmittal list or search content
+- speed up list of locked documents on MyDocuments page
+- sql queries and execution times can be written to file in database layer
+- add document check for docs in revision and missing access rights of revisor
+- add document check for docs requiring receptions but user lacks access right
+
 --------------------------------------------------------------------------------
                      Changes in version 6.0.0
 --------------------------------------------------------------------------------
@@ -29,10 +38,24 @@
 - add document list which can be exported as an archive
 - search results can be exported
 
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.2
+--------------------------------------------------------------------------------
+- do not show spinner when clipboard is loaded in menu (prevents flickering of
+  page)
+- add select menu for predifined expiration dates
+- add some more hooks
+- add list of currently logged in users in menu
+- the owner of a document can see even none public attachments
+- uploading multiple files can be turned off
+- add list of tasks in menu
+- merged changes from 5.0.12
+
 --------------------------------------------------------------------------------
                      Changes in version 5.1.1
 --------------------------------------------------------------------------------
 - fix initial creation of postgres database
+- merged changes from 5.0.11
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.0
@@ -40,9 +63,26 @@
 - added support for postgresql
 - document attachments can linked to a version and be public or hidden
 
+--------------------------------------------------------------------------------
+                     Changes in version 5.0.12
+--------------------------------------------------------------------------------
+- show name and parent folder of document/folder in search list on different
+  lines
+- check for guest login, admin ip and disabled accounts in webdav server
+- update last access time in session only once a minute
+- set Return-Path in emails if from_address in settings is set
+- pass more arguments to hooks (pre|post)UpdateDocument and searchListHeader
+- show help messages on settings page if available
+- fix regex expression in op/op.Settings.php (Closes #317)
+- better debugging of sql statements in SeedDM_Core
+- move css for timeline into Timeline view
+- merged changes from 4.3.35
+
 --------------------------------------------------------------------------------
                      Changes in version 5.0.11
 --------------------------------------------------------------------------------
+- merged changes from 4.3.34
+- added some more hooks
 
 --------------------------------------------------------------------------------
                      Changes in version 5.0.10
@@ -116,11 +156,29 @@
 - add .xml to online file types by default
 - add home folder for users
 
+--------------------------------------------------------------------------------
+                     Changes in version 4.3.35
+--------------------------------------------------------------------------------
+- fix authentication in webdav.php (Closes #250)
+- update last access time only once a minute
+- run action 'css' in view if it exists, move css code for timeline
+- show role of users in user list and substitute user list
+- mysql sql_mode=only_full_group_by can be set without causing errors when
+  creating a temporary table
+- translation updates
+
 --------------------------------------------------------------------------------
                      Changes in version 4.3.34
 --------------------------------------------------------------------------------
 - add multibyte save basename() replacement, which fixes uploading files whose
   name starts with a multibyte char
+- show both number of links from a document A to B and vise versa in tab header
+  on ViewDocuments page
+- add link to duplicate document on ObjectCheck page
+- fix some incompatibilities in sql statements
+- new config parameter maxUploadSize
+- fix document upload by fine-uploader, when using firefox
+- scale default icons for document types, use svg images when available
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.33

Makefile

@@ -1,8 +1,8 @@
-VERSION=6.0.0
+VERSION=6.0.1
 SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer
 # webapp
 
-NODISTFILES=utils/importmail.php utils/seedddms-importmail utils/remote-email-upload utils/remote-upload .svn .gitignore styles/blue styles/hc styles/clean views/blue views/hc views/clean
+NODISTFILES=utils/importmail.php utils/seedddms-importmail utils/remote-email-upload utils/remote-upload utils/da-bv-reminder.php utils/seeddms-da-bv-reminder .svn .gitignore styles/blue styles/hc styles/clean views/blue views/hc views/clean
 
 EXTENSIONS := \
 	dynamic_content.tar.gz\

SeedDMS_Core/Core/inc.ClassAttribute.php

@@ -258,6 +258,13 @@ class SeedDMS_Core_Attribute { /* {{{ */
 	 */
 	function getValidationError() { return $this->_validation_error; }
 
+	/**
+	 * Set validation error
+	 *
+	 * @param integer error code
+	 */
+	function setValidationError($error) { $this->_validation_error = $error; }
+
 	/**
 	 * Get definition of attribute
 	 *
@@ -916,6 +923,15 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 	 * @return boolean true if validation succeds, otherwise false
 	 */
 	function validate($attrvalue) { /* {{{ */
+		/* Check if 'onAttributeValidate' callback is set */
+		if(isset($this->_dms->callbacks['onAttributeValidate'])) {
+			foreach($this->_dms->callbacks['onAttributeValidate'] as $callback) {
+				$ret = call_user_func($callback[0], $callback[1], $this);
+				if(is_bool($ret))
+					return $ret;
+			}
+		}
+
 		if($this->getMultipleValues()) {
 			if(is_string($attrvalue)) {
 				$sep = $attrvalue[0];

SeedDMS_Core/Core/inc.ClassDMS.php

@@ -149,7 +149,9 @@ class SeedDMS_Core_DMS {
 
 	/**
 	 * @var array $noReadForStatus list of status without read right
-	 *      online
+	 *      online. DO NOT USE ANYMORE. SeedDMS_Core_DocumentContent::getAccessMode()
+	 *      was the only method using it, but it now takes the noReadForStatus info
+	 *      from the user's role
 	 * @access public
 	 */
 	public $noReadForStatus;
@@ -404,7 +406,7 @@ class SeedDMS_Core_DMS {
 	static function filterDocumentFiles($user, $files) { /* {{{ */
 		$tmp = array();
 		foreach ($files as $file)
-			if ($file->isPublic() || ($file->getUser()->getID() == $user->getID()) || $user->isAdmin())
+			if ($file->isPublic() || ($file->getUser()->getID() == $user->getID()) || $user->isAdmin() || ($file->getDocument()->getOwner()->getID() == $user->getID()))
 				array_push($tmp, $file);
 		return $tmp;
 	} /* }}} */
@@ -444,7 +446,7 @@ class SeedDMS_Core_DMS {
 		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '6.0.0';
+			$this->version = '6.0.1';
 	} /* }}} */
 
 	/**
@@ -1108,12 +1110,27 @@ class SeedDMS_Core_DMS {
 				$orderdir = 'DESC';
 			else
 				$orderdir = 'ASC';
-			$queryStr .= "AND `tblDocumentLocks`.`userID` = '".$user->getID()."' ";
-			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
-			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
-			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
-			else $queryStr .= "ORDER BY `name`";
-			$queryStr .= " ".$orderdir;
+
+			$qs = 'SELECT `document` FROM `tblDocumentLocks` WHERE `userID`='.$user->getID();
+			$ra = $this->db->getResultArray($qs);
+			if (is_bool($ra) && !$ra) {
+				return false;
+			}
+			$docs = array();
+			foreach($ra as $d) {
+				$docs[] = $d['document'];
+			}
+
+			if ($docs) {
+				$queryStr .= "AND `tblDocuments`.`id` IN (" . implode(',', $docs) . ") ";
+				if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+				else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+				else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+				else $queryStr .= "ORDER BY `name`";
+				$queryStr .= " ".$orderdir;
+			} else {
+				$queryStr = '';
+			}
 			break; // }}}
 		case 'WorkflowOwner': // Documents waiting for workflow trigger I'm owning {{{
 			$user = $param1;
@@ -2923,8 +2940,7 @@ class SeedDMS_Core_DMS {
 
 		$versions = array();
 		foreach($resArr as $row) {
-			$document = new $this->classnames['document']($row['document'], '', '', '', '', '', '', '', '', '', '', '');
-			$document->setDMS($this);
+			$document = $this->getDocument($row['document']);
 			$version = new $this->classnames['documentcontent']($row['id'], $document, $row['version'], $row['comment'], $row['date'], $row['createdBy'], $row['dir'], $row['orgFileName'], $row['fileType'], $row['mimeType'], $row['fileSize'], $row['checksum']);
 			if(!isset($versions[$row['dupid']])) {
 				$versions[$row['id']]['content'] = $version;

SeedDMS_Core/Core/inc.ClassDocument.php

@@ -1615,7 +1615,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 				/* $attribute can be a string or an array */
 				if($attribute)
 					if(!$content->setAttributeValue($this->_dms->getAttributeDefinition($attrdefid), $attribute)) {
-						$this->removeContent($content);
+						$this->_removeContent($content);
 						$db->rollbackTransaction();
 						return false;
 					}
@@ -1629,7 +1629,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		$queryStr = "INSERT INTO `tblDocumentStatus` (`documentID`, `version`) ".
 			"VALUES (". $this->_id .", ". (int) $version .")";
 		if (!$db->getResult($queryStr)) {
-			$this->removeContent($content);
+			$this->_removeContent($content);
 			$db->rollbackTransaction();
 			return false;
 		}
@@ -1792,7 +1792,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 *
 	 * This functions returns an array of content elements ordered by version.
 	 * Version which are not accessible because of its status, will be filtered
-	 * out.
+	 * out. Access rights based on the document status are calculated for the
+	 * currently logged in user.
 	 *
 	 * @return array list of objects of class SeedDMS_Core_DocumentContent
 	 */
@@ -1826,7 +1827,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 * Return the content element of a document with a given version number
 	 *
 	 * This function will check if the version is accessible and return false
-	 * if not.
+	 * if not. Access rights based on the document status are calculated for the
+	 * currently logged in user.
 	 *
 	 * @param integer $version version number of content element
 	 * @return object/boolean object of class {@link SeedDMS_Core_DocumentContent}
@@ -1890,6 +1892,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 * {@link SeedDMS_Core_DMS::noReadForStatus} the function will go
 	 * backwards in history until an accessible version is found. If none
 	 * is found null will be returned.
+	 * Access rights based on the document status are calculated for the
+	 * currently logged in user.
 	 *
 	 * @return object object of class {@link SeedDMS_Core_DocumentContent}
 	 */
@@ -1924,11 +1928,12 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	} /* }}} */
 
 	/**
-	 * Remove a certain version
+	 * Remove version of document
 	 *
-	 * @param integer $version version number
+	 * @param interger $version version number of content
+	 * @return boolean true if successful, otherwise false
 	 */
-	function removeContent($version) { /* {{{ */
+	private function _removeContent($version) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		if (file_exists( $this->_dms->contentDir.$version->getPath() ))
@@ -2103,6 +2108,36 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		return true;
 	} /* }}} */
 
+	/**
+	 * Call callback onPreRemoveDocument before deleting content
+	 *
+	 * @param integer $version version number of content
+	 */
+	function removeContent($version) { /* {{{ */
+		/* Check if 'onPreRemoveDocument' callback is set */
+		if(isset($this->_dms->callbacks['onPreRemoveContent'])) {
+			foreach($this->_dms->callbacks['onPreRemoveContent'] as $callback) {
+				$ret = call_user_func($callback[0], $callback[1], $this, $version);
+				if(is_bool($ret))
+					return $ret;
+			}
+		}
+
+		if(false === ($ret = self::_removeContent($version))) {
+			return false;
+		}
+
+		/* Check if 'onPostRemoveDocument' callback is set */
+		if(isset($this->_dms->callbacks['onPostRemoveContent'])) {
+			foreach($this->_dms->callbacks['onPostRemoveContent'] as $callback) {
+				if(!call_user_func($callback[0], $callback[1], $version)) {
+				}
+			}
+		}
+
+		return $ret;
+	} /* }}} */
+
 	/**
 	 * Return a certain document link
 	 *
@@ -2341,9 +2376,9 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		/* Check if 'onPreRemoveDocument' callback is set */
 		if(isset($this->_dms->callbacks['onPreRemoveDocument'])) {
 			foreach($this->_dms->callbacks['onPreRemoveDocument'] as $callback) {
-				if(!call_user_func($callback[0], $callback[1], $this)) {
-					return false;
-				}
+				$ret = call_user_func($callback[0], $callback[1], $this);
+				if(is_bool($ret))
+					return $ret;
 			}
 		}
 
@@ -2354,7 +2389,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 		// remove content of document
 		foreach ($this->_content as $version) {
-			if (!$this->removeContent($version)) {
+			if (!$this->_removeContent($version)) {
 				$db->rollbackTransaction();
 				return false;
 			}
@@ -3182,7 +3217,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * like a virtual access mode, derived from the status of the document 
 	 * content. The function checks if {@link SeedDMS_Core_DMS::noReadForStatus}
 	 * contains the status of the version and returns M_NONE if it exists and
-	 * the user is not involved in a workflow or review/approval.
+	 * the user is not involved in a workflow or review/approval/revision.
 	 * This method is called by all functions that returns the content e.g.
 	 * {@link SeedDMS_Core_Document::getLatestContent()}
 	 * It is also used by {@link SeedDMS_Core_Document::getAccessMode()} to
@@ -3190,6 +3225,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 *
 	 * FIXME: This function only works propperly if $u is the currently logged in
 	 * user, because noReadForStatus will be set for this user. 
+	 * FIXED: instead of using $dms->noReadForStatus it is take from the user's role
 	 *
 	 * @param object $u user
 	 * @return integer either M_NONE or M_READ
@@ -3198,12 +3234,21 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		$dms = $this->_document->_dms;
 		$db = $dms->getDB();
 
+		if(!$u)
+			return M_NONE;
+
 		/* If read access isn't further restricted by status, than grant read access */
+		/* Old code
 		if(!$dms->noReadForStatus)
 			return M_READ;
+		$noReadForStatus = $dms->noReadForStatus;
+		*/
+		$noReadForStatus = $u->getRole()->getNoAccess();
+		if(!$noReadForStatus)
+			return M_READ;
 
 		/* If the current status is not in list of status without read access, then grant read access */
-		if(!in_array($this->getStatus()['status'], $dms->noReadForStatus))
+		if(!in_array($this->getStatus()['status'], $noReadForStatus))
 			return M_READ;
 
 		/* Administrators have unrestricted access */
@@ -3273,6 +3318,21 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			}
 			break;
 		case S_IN_REVISION:
+			$status = $this->getRevisionStatus();
+			foreach ($status as $r) {
+				if($r['status'] != -2) // Check if reviewer was removed
+					switch ($r["type"]) {
+					case 0: // Revisor is an individual.
+						if($u->getId() == $r["required"])
+							return M_READ;
+						break;
+					case 1: // Revisor is a group.
+						$required = $dms->getGroup($r["required"]);
+						if (is_object($required) && $required->isMember($u))
+							return M_READ;
+						break;
+					}
+			}
 			break;
 		case S_REJECTED:
 			break;
@@ -3384,7 +3444,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		/* Second, insert the new entries */
 		foreach($reviewers as $review) {
 			$queryStr = "INSERT INTO `tblDocumentReviewers` (`documentID`, `version`, `type`, `required`) ".
-				"VALUES ('".$this->_document->getID()."', '".$this->_version."', ".$review['type'] .", ".$review['required']->getID().")";
+				"VALUES ('".$this->_document->getID()."', '".$this->_version."', ".$review['type'] .", ".(is_object($review['required']) ? $review['required']->getID() : (int) $review['required']).")";
 			if (!$db->getResult($queryStr)) {
 				$db->rollbackTransaction();
 				return false;
@@ -3397,7 +3457,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 					return false;
 				}
 				$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ".
-					"VALUES ('".$reviewID ."', '".(int) $log['status']."', ".$db->qstr($log['comment']) .", ".$db->qstr($log['date']).", ".$log['user']->getID().")";
+					"VALUES ('".$reviewID ."', '".(int) $log['status']."', ".$db->qstr($log['comment']) .", ".$db->qstr($log['date']).", ".(is_object($log['user']) ? $log['user']->getID() : (int) $log['user']).")";
 				if (!$db->getResult($queryStr)) {
 					$db->rollbackTransaction();
 					return false;
@@ -3512,7 +3572,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		/* Second, insert the new entries */
 		foreach($reviewers as $review) {
 			$queryStr = "INSERT INTO `tblDocumentApprovers` (`documentID`, `version`, `type`, `required`) ".
-				"VALUES ('".$this->_document->getID()."', '".$this->_version."', ".$review['type'] .", ".$review['required']->getID().")";
+				"VALUES ('".$this->_document->getID()."', '".$this->_version."', ".$review['type'] .", ".(is_object($review['required']) ? $review['required']->getID() : (int) $review['required']).")";
 			if (!$db->getResult($queryStr)) {
 				$db->rollbackTransaction();
 				return false;
@@ -3525,7 +3585,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 					return false;
 				}
 				$queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ".
-					"VALUES ('".$reviewID ."', '".(int) $log['status']."', ".$db->qstr($log['comment']) .", ".$db->qstr($log['date']).", ".$log['user']->getID().")";
+					"VALUES ('".$reviewID ."', '".(int) $log['status']."', ".$db->qstr($log['comment']) .", ".$db->qstr($log['date']).", ".(is_object($log['user']) ? $log['user']->getID() : (int) $log['user']).")";
 				if (!$db->getResult($queryStr)) {
 					$db->rollbackTransaction();
 					return false;
@@ -3593,6 +3653,77 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return $this->_receiptStatus;
 	} /* }}} */
 
+	/**
+	 * Rewrites the complete receipt log
+	 * 
+	 * Attention: this function is highly dangerous.
+	 * It removes an existing receipt log and rewrites it.
+	 * This method was added for importing an xml dump.
+	 *
+	 * @param array $receiptlog new status log with the newest log entry first.
+	 * @return boolean true on success, otherwise false
+	 */
+	function rewriteReceiptLog($recipients) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		$queryStr= "SELECT `tblDocumentRecipients`.* FROM `tblDocumentRecipients` WHERE `tblDocumentRecipients`.`documentID` = '". $this->_document->getID() ."' AND `tblDocumentRecipients`.`version` = '". $this->_version ."' ";
+		$res = $db->getResultArray($queryStr);
+		if (is_bool($res) && !$res)
+			return false;
+
+		$db->startTransaction();
+
+		if($res) {
+			foreach($res as $receipt) {
+				$receiptID = $receipt['receiptID'];
+
+				/* First, remove the old entries */
+				$queryStr = "DELETE from `tblDocumentReceiptLog` where `receiptID`=".$receiptID;
+				if (!$db->getResult($queryStr)) {
+					$db->rollbackTransaction();
+					return false;
+				}
+
+				$queryStr = "DELETE from `tblDocumentRecipients` where `receiptID`=".$receiptID;
+				if (!$db->getResult($queryStr)) {
+					$db->rollbackTransaction();
+					return false;
+				}
+			}
+		}
+
+		/* Second, insert the new entries */
+		foreach($recipients as $receipt) {
+			$queryStr = "INSERT INTO `tblDocumentRecipients` (`documentID`, `version`, `type`, `required`) ".
+				"VALUES ('".$this->_document->getID()."', '".$this->_version."', ".$receipt['type'] .", ".(is_object($receipt['required']) ? $receipt['required']->getID() : (int) $receipt['required']).")";
+			if (!$db->getResult($queryStr)) {
+				$db->rollbackTransaction();
+				return false;
+			}
+			$receiptID = $db->getInsertID('tblDocumentRecipients', 'receiptID');
+			$receiptlog = array_reverse($receipt['logs']);
+			foreach($receiptlog as $log) {
+				if(!SeedDMS_Core_DMS::checkDate($log['date'], 'Y-m-d H:i:s')) {
+					$db->rollbackTransaction();
+					return false;
+				}
+				$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
+					"VALUES ('".$receiptID ."', '".(int) $log['status']."', ".$db->qstr($log['comment']) .", ".$db->qstr($log['date']).", ".(is_object($log['user']) ? $log['user']->getID() : (int) $log['user']).")";
+				if (!$db->getResult($queryStr)) {
+					$db->rollbackTransaction();
+					return false;
+				}
+				$receiptLogID = $db->getInsertID('tblDocumentReceiptLog', 'receiptLogID');
+				if(!empty($log['file'])) {
+					SeedDMS_Core_File::copyFile($log['file'], $this->_dms->contentDir . $this->_document->getDir() . 'r' . $receiptLogID);
+				}
+			}
+		}
+
+		$db->commitTransaction();
+		return true;
+	} /* }}} */
+
 	/**
 	 * Get the current revision status of the document content
 	 * The revision status is a list of revisions
@@ -3645,6 +3776,77 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return $this->_revisionStatus;
 	} /* }}} */
 
+	/**
+	 * Rewrites the complete revision log
+	 * 
+	 * Attention: this function is highly dangerous.
+	 * It removes an existing receipt log and rewrites it.
+	 * This method was added for importing an xml dump.
+	 *
+	 * @param array $revisionlog new status log with the newest log entry first.
+	 * @return boolean true on success, otherwise false
+	 */
+	function rewriteRevisionLog($revisions) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		$queryStr= "SELECT `tblDocumentRevisors`.* FROM `tblDocumentRevisors` WHERE `tblDocumentRevisors`.`documentID` = '". $this->_document->getID() ."' AND `tblDocumentRevisors`.`version` = '". $this->_version ."' ";
+		$res = $db->getResultArray($queryStr);
+		if (is_bool($res) && !$res)
+			return false;
+
+		$db->startTransaction();
+
+		if($res) {
+			foreach($res as $revision) {
+				$revisionID = $revision['revisionID'];
+
+				/* First, remove the old entries */
+				$queryStr = "DELETE from `tblDocumentRevisionLog` where `revisionID`=".$revisionID;
+				if (!$db->getResult($queryStr)) {
+					$db->rollbackTransaction();
+					return false;
+				}
+
+				$queryStr = "DELETE from `tblDocumentRevisors` where `revisionID`=".$revisionID;
+				if (!$db->getResult($queryStr)) {
+					$db->rollbackTransaction();
+					return false;
+				}
+			}
+		}
+
+		/* Second, insert the new entries */
+		foreach($revisions as $revision) {
+			$queryStr = "INSERT INTO `tblDocumentRevisors` (`documentID`, `version`, `type`, `required`) ".
+				"VALUES ('".$this->_document->getID()."', '".$this->_version."', ".$revision['type'] .", ".(is_object($revision['required']) ? $revision['required']->getID() : (int) $revision['required']).")";
+			if (!$db->getResult($queryStr)) {
+				$db->rollbackTransaction();
+				return false;
+			}
+			$revisionID = $db->getInsertID('tblDocumentRevisors', 'revisionID');
+			$revisionlog = array_reverse($revision['logs']);
+			foreach($revisionlog as $log) {
+				if(!SeedDMS_Core_DMS::checkDate($log['date'], 'Y-m-d H:i:s')) {
+					$db->rollbackTransaction();
+					return false;
+				}
+				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
+					"VALUES ('".$revisionID ."', '".(int) $log['status']."', ".$db->qstr($log['comment']) .", ".$db->qstr($log['date']).", ".(is_object($log['user']) ? $log['user']->getID() : (int) $log['user']).")";
+				if (!$db->getResult($queryStr)) {
+					$db->rollbackTransaction();
+					return false;
+				}
+				$revisionLogID = $db->getInsertID('tblDocumentRevisionLog', 'revisionLogID');
+				if(!empty($log['file'])) {
+					SeedDMS_Core_File::copyFile($log['file'], $this->_dms->contentDir . $this->_document->getDir() . 'r' . $revisionLogID);
+				}
+			}
+		}
+
+		$db->commitTransaction();
+		return true;
+	} /* }}} */
+
 	function addIndReviewer($user, $requestUser) { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
@@ -4722,7 +4924,6 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		 */
 		if(count($revisionStatus[$field]) == 0) {
 			$queryStr = "DELETE from `tblDocumentRevisors` WHERE `documentID` = ". $this->_document->getID() ." AND `version` = ".$this->_version." AND `type` = ". $type ." AND `required` = ".$object->getID();
-			echo $queryStr;
 			if (!$db->getResult($queryStr)) {
 				return -1;
 			}
@@ -5206,7 +5407,6 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			$this->_workflow->setDMS($this->_document->_dms);
 
 			if($transition) {
-			echo "Trigger transition";
 				if(false === $this->triggerWorkflowTransition($user, $transition, $comment)) {
 					$db->rollbackTransaction();
 					return false;

SeedDMS_Core/Core/inc.ClassFolder.php

@@ -884,9 +884,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		/* Check if 'onPreRemoveFolder' callback is set */
 		if(isset($this->_dms->callbacks['onPreRemoveFolder'])) {
 			foreach($this->_dms->callbacks['onPreRemoveFolder'] as $callback) {
-				if(!call_user_func($callback[0], $callback[1], $this)) {
-					return false;
-				}
+				$ret = call_user_func($callback[0], $callback[1], $this);
+				if(is_bool($ret))
+					return $ret;
 			}
 		}
 

SeedDMS_Core/Core/inc.DBAccessPDO.php

@@ -38,7 +38,7 @@ class SeedDMS_Core_DatabaseAccess {
 	protected $_hostname;
 
 	/**
-	 * @var int port number of database 
+	 * @var int port number of database
 	 */
 	protected $_port;
 
@@ -101,7 +101,17 @@ class SeedDMS_Core_DatabaseAccess {
 	 * @var boolean set to true if in a database transaction
 	 */
 	private $_intransaction;
-	
+
+	/**
+	 * @var string set a valid file name for logging all sql queries
+	 */
+	private $_logfile;
+
+	/**
+	 * @var resource file pointer of log file
+	 */
+	private $_logfp;
+
 	/**
 	 * Return list of all database tables
 	 *
@@ -152,6 +162,13 @@ class SeedDMS_Core_DatabaseAccess {
 		$this->_user = $user;
 		$this->_passw = $passw;
 		$this->_connected = false;
+		$this->_logfile = '';
+		if($this->_logfile) {
+			$this->_logfp = fopen($this->_logfile, 'a+');
+			if($this->_logfp)
+				fwrite($this->_logfp, microtime()."	BEGIN ------------------------------------------\n");
+		} else
+			$this->_logfp = null;
 		// $tt*****id is a hack to ensure that we do not try to create the
 		// temporary table twice during a single connection. Can be fixed by
 		// using Views (MySQL 5.0 onward) instead of temporary tables.
@@ -178,6 +195,16 @@ class SeedDMS_Core_DatabaseAccess {
 		return $this->_driver;
 	} /* }}} */
 
+	/**
+	 * Destructor of SeedDMS_Core_DatabaseAccess
+	 */
+	function __destruct() { /* {{{ */
+		if($this->_logfp) {
+			fwrite($this->_logfp, microtime()."	END --------------------------------------------\n");
+			fclose($this->_logfp);
+		}
+	} /* }}} */
+
 	/**
 	 * Connect to database
 	 *
@@ -264,6 +291,10 @@ class SeedDMS_Core_DatabaseAccess {
 		if($retick && $this->_driver == 'pgsql') {
 			$queryStr = $this->rbt($queryStr);
 		}
+
+		if($this->_logfp) {
+			fwrite($this->_logfp, microtime()."	".$queryStr."\n");
+		}
 		$res = $this->_conn->query($queryStr);
 		if ($res === false) {
 			if($this->_debug) {
@@ -290,6 +321,10 @@ class SeedDMS_Core_DatabaseAccess {
 		if($retick && $this->_driver == 'pgsql') {
 			$queryStr = $this->rbt($queryStr);
 		}
+
+		if($this->_logfp) {
+			fwrite($this->_logfp, microtime()."	".$queryStr."\n");
+		}
 		$res = $this->_conn->exec($queryStr);
 		if($res === false) {
 			if($this->_debug) {
@@ -299,7 +334,7 @@ class SeedDMS_Core_DatabaseAccess {
 			return false;
 		} else
 			return true;
-		
+
 		return $res;
 	} /* }}} */
 
@@ -356,24 +391,24 @@ class SeedDMS_Core_DatabaseAccess {
 						"SELECT `tblDocumentReviewLog`.`reviewID`, ".
 						"MAX(`tblDocumentReviewLog`.`reviewLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentReviewLog` ".
-						"GROUP BY `tblDocumentReviewLog`.`reviewID` ".
-						"ORDER BY `maxLogID`";
+						"GROUP BY `tblDocumentReviewLog`.`reviewID` "; //.
+//						"ORDER BY `maxLogID`";
 				break;
 				case 'pgsql':
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreviewid` (`reviewID` INTEGER, `maxLogID` INTEGER, PRIMARY KEY (`reviewID`));".
 						"INSERT INTO `ttreviewid` SELECT `tblDocumentReviewLog`.`reviewID`, ".
 						"MAX(`tblDocumentReviewLog`.`reviewLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentReviewLog` ".
-						"GROUP BY `tblDocumentReviewLog`.`reviewID` ".
-						"ORDER BY `maxLogID`";
+						"GROUP BY `tblDocumentReviewLog`.`reviewID` ";//.
+//						"ORDER BY `maxLogID`";
 				break;
 				default:
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreviewid` (PRIMARY KEY (`reviewID`), INDEX (`maxLogID`)) ".
 						"SELECT `tblDocumentReviewLog`.`reviewID`, ".
 						"MAX(`tblDocumentReviewLog`.`reviewLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentReviewLog` ".
-						"GROUP BY `tblDocumentReviewLog`.`reviewID` ".
-						"ORDER BY `maxLogID`";
+						"GROUP BY `tblDocumentReviewLog`.`reviewID` "; //.
+//						"ORDER BY `maxLogID`";
 			}
 			if (!$this->_ttreviewid) {
 				if (!$this->getResult($queryStr))
@@ -397,24 +432,24 @@ class SeedDMS_Core_DatabaseAccess {
 						"SELECT `tblDocumentApproveLog`.`approveID`, ".
 						"MAX(`tblDocumentApproveLog`.`approveLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentApproveLog` ".
-						"GROUP BY `tblDocumentApproveLog`.`approveID` ".
-						"ORDER BY `maxLogID`";
+						"GROUP BY `tblDocumentApproveLog`.`approveID` "; //.
+//						"ORDER BY `maxLogID`";
 					break;
 				case 'pgsql':
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttapproveid` (`approveID` INTEGER, `maxLogID` INTEGER, PRIMARY KEY (`approveID`));".
 						"INSERT INTO `ttapproveid` SELECT `tblDocumentApproveLog`.`approveID`, ".
 						"MAX(`tblDocumentApproveLog`.`approveLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentApproveLog` ".
-						"GROUP BY `tblDocumentApproveLog`.`approveID` ".
-						"ORDER BY `maxLogID`";
+						"GROUP BY `tblDocumentApproveLog`.`approveID` "; //.
+//						"ORDER BY `maxLogID`";
 					break;
 				default:
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttapproveid` (PRIMARY KEY (`approveID`), INDEX (`maxLogID`)) ".
 						"SELECT `tblDocumentApproveLog`.`approveID`, ".
 						"MAX(`tblDocumentApproveLog`.`approveLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentApproveLog` ".
-						"GROUP BY `tblDocumentApproveLog`.`approveID` ".
-						"ORDER BY `maxLogID`";
+						"GROUP BY `tblDocumentApproveLog`.`approveID` "; //.
+//						"ORDER BY `maxLogID`";
 			}
 			if (!$this->_ttapproveid) {
 				if (!$this->getResult($queryStr))
@@ -438,24 +473,24 @@ class SeedDMS_Core_DatabaseAccess {
 						"SELECT `tblDocumentStatusLog`.`statusID` AS `statusID`, ".
 						"MAX(`tblDocumentStatusLog`.`statusLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentStatusLog` ".
-						"GROUP BY `tblDocumentStatusLog`.`statusID` ".
-						"ORDER BY `maxLogID`";
+						"GROUP BY `tblDocumentStatusLog`.`statusID` "; //.
+//						"ORDER BY `maxLogID`";
 					break;
 				case 'pgsql':
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttstatid` (`statusID` INTEGER, `maxLogID` INTEGER, PRIMARY KEY (`statusID`));".
 						"INSERT INTO `ttstatid` SELECT `tblDocumentStatusLog`.`statusID`, ".
 						"MAX(`tblDocumentStatusLog`.`statusLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentStatusLog` ".
-						"GROUP BY `tblDocumentStatusLog`.`statusID` ".
-						"ORDER BY `maxLogID`";
+						"GROUP BY `tblDocumentStatusLog`.`statusID` "; //.
+//						"ORDER BY `maxLogID`";
 					break;
 				default:
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttstatid` (PRIMARY KEY (`statusID`), INDEX (`maxLogID`)) ".
 						"SELECT `tblDocumentStatusLog`.`statusID`, ".
 						"MAX(`tblDocumentStatusLog`.`statusLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentStatusLog` ".
-						"GROUP BY `tblDocumentStatusLog`.`statusID` ".
-						"ORDER BY `maxLogID`";
+						"GROUP BY `tblDocumentStatusLog`.`statusID` "; //.
+//						"ORDER BY `maxLogID`";
 			}
 			if (!$this->_ttstatid) {
 				if (!$this->getResult($queryStr))
@@ -517,7 +552,7 @@ class SeedDMS_Core_DatabaseAccess {
 			switch($this->_driver) {
 				case 'sqlite':
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreceiptid` AS ".
-						"SELECT `tblDocumentReceiptLog`.`receiptID`, ".
+						"SELECT `tblDocumentReceiptLog`.`receiptID` AS `receiptID`, ".
 						"MAX(`tblDocumentReceiptLog`.`receiptLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentReceiptLog` ".
 						"GROUP BY `tblDocumentReceiptLog`.`receiptID` ".
@@ -558,7 +593,7 @@ class SeedDMS_Core_DatabaseAccess {
 			switch($this->_driver) {
 				case 'sqlite':
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttrevisionid` AS ".
-						"SELECT `tblDocumentRevisionLog`.`revisionID`, ".
+						"SELECT `tblDocumentRevisionLog`.`revisionID` AS `revisionID`, ".
 						"MAX(`tblDocumentRevisionLog`.`revisionLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentRevisionLog` ".
 						"GROUP BY `tblDocumentRevisionLog`.`revisionID` ".

SeedDMS_Core/package.xml

@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2017-02-28</date>
+ <date>2017-03-23</date>
  <time>06:34:50</time>
  <version>
-  <release>6.0.0</release>
-  <api>6.0.0</api>
+  <release>6.0.1</release>
+  <api>6.0.1</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,19 +24,10 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- all changes from 5.1.1 merged
-- SeedDMS_Core_User::getReceiptStatus() and SeedDMS_Core_User::getReviewStatus()
-only return entries of the latest document version if not specific document and
-version is passed
-- temp. table for revisions can be created
-- new methods SeedDMS_Core_DMS::getDocumentsInReception() and
-SeedDMS_Core_DMS::getDocumentsInRevision()
-- limit hits of sql statement in SeedDMЅ_Core_DMS::getDuplicateDocumentContent() to 1000
-- finishRevsion() puts all revisors into state waiting, so a new revision can be started
-- fix SeedDMS_Core_Group::getRevisionStatus(), which did not always return the last
-log entry first
-- add roles
-- use classname from SeedDMS_Core_DMS::_classnames for SeedDMS_Core_DocumentContent
+- speed up getting list of locked documents
+- setting _logfile in inc.DBAccessPDO.php will log execution times in file
+- fix sql statement to create temp table ttrevisionid and ttreceiptid
+- SeedDMS_Core_DMS::noReadForStatus no longer needed
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1194,6 +1185,23 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
+SeedDMS_Core_DMS::getDuplicateDocumentContent() returns complete document
+   </notes>
+  </release>
+  <release>
+   <date>2017-03-23</date>
+   <time>06:38:12</time>
+   <version>
+    <release>4.3.35</release>
+    <api>4.3.35</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+do not sort some temporary tables anymore, because it causes an error in mysql if sql_mode=only_full_group_by is set
    </notes>
   </release>
   <release>
@@ -1359,7 +1367,7 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
   </release>
   <release>
    <date>2017-02-28</date>
-   <time>06:23:34</time>
+   <time>07:07:02</time>
    <version>
     <release>5.0.11</release>
     <api>5.0.11</api>
@@ -1373,6 +1381,23 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
 - all changes from 4.3.34 merged
    </notes>
   </release>
+  <release>
+   <date>2017-07-10</date>
+   <time>15:06:09</time>
+   <version>
+    <release>5.0.12</release>
+    <api>5.0.12</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+	 <notes>
+all sql statements can be logged to a file
+do not sort some temporary tables anymore, because it causes an error in mysql if            sql_mode=only_full_group_by is set
+   </notes>
+  </release>
   <release>
    <date>2017-02-20</date>
    <time>07:07:02</time>
@@ -1389,5 +1414,72 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
 - added postgres support
    </notes>
   </release>
+  <release>
+   <date>2017-02-20</date>
+   <time>07:07:02</time>
+   <version>
+    <release>5.1.1</release>
+    <api>5.1.1</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- all changes from 5.0.11 merged
+	 </notes>
+  </release>
+  <release>
+   <date>2017-03-23</date>
+   <time>07:07:02</time>
+   <version>
+    <release>5.1.2</release>
+    <api>5.1.2</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- all changes from 5.0.12 merged
+- SeedDMS_Core_DMS::filterDocumentFiles() returns also documents which are not public
+if the owner tries to access them
+- Check return value of onPreRemove[Document|Folder], return from calling method if bool
+- Add SeedDMS_Core_DMS::getDocumentList()
+- Limit number of duplicate files to 1000
+- Add hook on(Pre|Post)RemoveContent
+- Add hook onAttributeValidate
+	 </notes>
+  </release>
+  <release>
+   <date>2017-02-28</date>
+   <time>06:34:50</time>
+   <version>
+    <release>6.0.0</release>
+    <api>6.0.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- all changes from 5.1.1 merged
+- SeedDMS_Core_User::getReceiptStatus() and SeedDMS_Core_User::getReviewStatus()
+only return entries of the latest document version if not specific document and
+version is passed
+- temp. table for revisions can be created
+- new methods SeedDMS_Core_DMS::getDocumentsInReception() and
+SeedDMS_Core_DMS::getDocumentsInRevision()
+- limit hits of sql statement in SeedDMЅ_Core_DMS::getDuplicateDocumentContent() to 1000
+- finishRevsion() puts all revisors into state waiting, so a new revision can be started
+- fix SeedDMS_Core_Group::getRevisionStatus(), which did not always return the last
+log entry first
+- add roles
+- use classname from SeedDMS_Core_DMS::_classnames for SeedDMS_Core_DocumentContent
+   </notes>
+  </release>
  </changelog>
 </package>

controllers/class.AddDocument.php

@@ -22,15 +22,21 @@
  */
 class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 
-	public function run() {
+	public function run() { /* {{{ */
+		$name = $this->getParam('name');
+		$comment = $this->getParam('comment');
+
 		/* Call preAddDocument early, because it might need to modify some
 		 * of the parameters.
 		 */
-		if(false === $this->callHook('preAddDocument')) {
-			$this->errormsg = 'hook_preAddDocument_failed';
+		if(false === $this->callHook('preAddDocument', array('name'=>&$name, 'comment'=>&$comment))) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_preAddDocument_failed';
 			return null;
 		}
 
+		$name = $this->getParam('name');
+		$comment = $this->getParam('comment');
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$settings = $this->params['settings'];
@@ -38,8 +44,6 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 		$index = $this->params['index'];
 		$indexconf = $this->params['indexconf'];
 		$folder = $this->params['folder'];
-		$name = $this->getParam('name');
-		$comment = $this->getParam('comment');
 		$expires = $this->getParam('expires');
 		$keywords = $this->getParam('keywords');
 		$cats = $this->getParam('categories');
@@ -113,6 +117,6 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 		}
 
 		return $result;
-	}
+	} /* }}} */
 }
 

controllers/class.ApproveDocument.php

@@ -66,6 +66,7 @@ class SeedDMS_Controller_ApproveDocument extends SeedDMS_Controller_Common {
 			/* If document was rejected, set the document status to S_REJECTED right away */
 			if ($approvalstatus == -1){
 				if($content->setStatus(S_REJECTED,$comment,$user)) {
+					$this->callHook('postApproveDocument', $content, S_REJECTED);
 				}
 			} else {
 				$docApprovalStatus = $content->getApprovalStatus();
@@ -88,8 +89,8 @@ class SeedDMS_Controller_ApproveDocument extends SeedDMS_Controller_Common {
 				// count of the approvals required for this document.
 				if ($approvalCT == $approvalTotal) {
 					// Change the status to released.
-					$newStatus=S_RELEASED;
-					if($content->setStatus($newStatus, getMLText("automatic_status_update"), $user)) {
+					if($content->setStatus(S_RELEASED, getMLText("automatic_status_update"), $user)) {
+						$this->callHook('postApproveDocument', $content, S_RELEASED);
 					}
 				}
 			}

controllers/class.TransmittalDownload.php

@@ -31,12 +31,18 @@ class SeedDMS_Controller_TransmittalDownload extends SeedDMS_Controller_Common {
 		if($items) {
 			include("../inc/inc.ClassDownloadMgr.php");
 			$downmgr = new SeedDMS_Download_Mgr();
+			if($extraheader = $this->callHook('extraDownloadHeader'))
+				$downmgr->addHeader($extraheader);
 
 			foreach($items as $item) {
 				$content = $item->getContent();
 				$document = $content->getDocument();
 				if ($document->getAccessMode($user) >= M_READ) {
-					$downmgr->addItem($content);
+					$extracols = $this->callHook('extraDownloadColumns', $document);
+					if($rawcontent = $this->callHook('rawcontent', $content)) {
+						$downmgr->addItem($content, $extracols, $rawcontent);
+					} else
+						$downmgr->addItem($content, $extracols);
 				}
 			}
 

controllers/class.UpdateDocument.php

@@ -0,0 +1,91 @@
+<?php
+/**
+ * Implementation of UpdateDocument 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_UpdateDocument extends SeedDMS_Controller_Common {
+
+	public function run() { /* {{{ */
+		$name = $this->getParam('name');
+		$comment = $this->getParam('comment');
+
+		/* Call preUpdateDocument early, because it might need to modify some
+		 * of the parameters.
+		 */
+		if(false === $this->callHook('preUpdateDocument', $this->params['document'])) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_preUpdateDocument_failed';
+			return null;
+		}
+
+		$name = $this->getParam('name');
+		$comment = $this->getParam('comment');
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$document = $this->params['document'];
+		$settings = $this->params['settings'];
+		$index = $this->params['index'];
+		$indexconf = $this->params['indexconf'];
+		$folder = $this->params['folder'];
+		$userfiletmp = $this->getParam('userfiletmp');
+		$userfilename = $this->getParam('userfilename');
+		$filetype = $this->getParam('filetype');
+		$userfiletype = $this->getParam('userfiletype');
+		$reviewers = $this->getParam('reviewers');
+		$approvers = $this->getParam('approvers');
+		$reqversion = $this->getParam('reqversion');
+		$comment = $this->getParam('comment');
+		$attributes = $this->getParam('attributes');
+		$workflow = $this->getParam('workflow');
+		$maxsizeforfulltext = $this->getParam('maxsizeforfulltext');
+		$initialdocumentstatus = $this->getParam('initialdocumentstatus');
+
+		$result = $this->callHook('updateDocument');
+		if($result === null) {
+			$filesize = SeedDMS_Core_File::fileSize($userfiletmp);
+			$contentResult=$document->addContent($comment, $user, $userfiletmp, basename($userfilename), $filetype, $userfiletype, $reviewers, $approvers, $version=0, $attributes, $workflow, $initialdocumentstatus);
+
+			if ($this->hasParam('expires')) {
+				if($document->setExpires($this->getParam('expires'))) {
+				} else {
+				}
+			}
+
+			if($index) {
+				$lucenesearch = new $indexconf['Search']($index);
+				if($hit = $lucenesearch->getDocument((int) $document->getId())) {
+					$index->delete($hit->id);
+				}
+				$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText));
+				if(!$this->callHook('preIndexDocument', $document, $idoc)) {
+				}
+				$index->addDocument($idoc);
+				$index->commit();
+			}
+
+			if(!$this->callHook('postUpdateDocument', $document, $contentResult->getContent())) {
+			}
+			$result = $contentResult->getContent();
+		}
+
+		return $result;
+	} /* }}} */
+}
+

ext/example/class.example.php

@@ -37,9 +37,6 @@ class SeedDMS_ExtExample extends SeedDMS_ExtBase {
 	 *
 	 * Use this method to do some initialization like setting up the hooks
 	 * You have access to the following global variables:
-	 * $GLOBALS['dms'] : object representing dms
-	 * $GLOBALS['user'] : currently logged in user
-	 * $GLOBALS['session'] : current session
 	 * $GLOBALS['settings'] : current global configuration
 	 * $GLOBALS['settings']['_extensions']['example'] : configuration of this extension
 	 * $GLOBALS['LANG'] : the language array with translations for all languages
@@ -48,6 +45,7 @@ class SeedDMS_ExtExample extends SeedDMS_ExtBase {
 	function init() { /* {{{ */
 		$GLOBALS['SEEDDMS_HOOKS']['view']['addDocument'][] = new SeedDMS_ExtExample_AddDocument;
 		$GLOBALS['SEEDDMS_HOOKS']['view']['viewFolder'][] = new SeedDMS_ExtExample_ViewFolder;
+		$GLOBALS['SEEDDMS_SCHEDULER']['tasks']['example']['example'] = new SeedDMS_ExtExample_Task;
 	} /* }}} */
 
 	function main() { /* {{{ */
@@ -112,4 +110,16 @@ class SeedDMS_ExtExample_ViewFolder {
 
 }
 
+/**
+ * Class containing methods for running a scheduled task
+ *
+ * @author  Uwe Steinmann <uwe@steinmann.cx>
+ * @package SeedDMS
+ * @subpackage  example
+ */
+class SeedDMS_ExtExample_Task {
+	public function execute() {
+	}
+}
+
 ?>

ext/example/conf.php

@@ -16,6 +16,37 @@ $EXT_CONF['example'] = array(
 			'title'=>'Example check box',
 			'type'=>'checkbox',
 		),
+		'list' => array(
+			'title'=>'Example select menu from options',
+			'type'=>'select',
+			'options' => array('Option 1', 'Option 2', 'Option 3'),
+			'multiple' => true,
+			'size' => 2,
+		),
+		'categories' => array(
+			'title'=>'Example select menu from categories',
+			'type'=>'select',
+			'internal'=>'categories',
+			'multiple' => true,
+		),
+		'users' => array(
+			'title'=>'Example select menu from users',
+			'type'=>'select',
+			'internal'=>'users',
+			'multiple' => true,
+		),
+		'groups' => array(
+			'title'=>'Example select menu from groups',
+			'type'=>'select',
+			'internal'=>'groups',
+			'multiple' => true,
+		),
+		'attributedefinitions' => array(
+			'title'=>'Example select menu from attribute definitions',
+			'type'=>'select',
+			'internal'=>'attributedefinitions',
+			'multiple' => true,
+		),
 	),
 	'constraints' => array(
 		'depends' => array('php' => '5.4.4-', 'seeddms' => '4.3.0-'),

inc/inc.Authentication.php

@@ -80,7 +80,8 @@ if (!isset($_COOKIE["mydms_session"])) {
 }
 
 /* Update last access time */
-$session->updateAccess($dms_session);
+if((int)$resArr['lastAccess']+60 < time())
+	$session->updateAccess($dms_session);
 
 /* Load user data */
 $user = $dms->getUser($resArr["userID"]);

inc/inc.ClassControllerCommon.php

@@ -122,6 +122,15 @@ class SeedDMS_Controller_Common {
 		return $this->errormsg;
 	} /* }}} */
 
+	/**
+	 * Set error message
+	 *
+	 * @param string $msg error message
+	 */
+	public function setErrorMsg($msg) { /* {{{ */
+		$this->errormsg = $msg;
+	} /* }}} */
+
 	/**
 	 * Call a controller hook
 	 *
@@ -142,6 +151,9 @@ class SeedDMS_Controller_Common {
 			foreach($GLOBALS['SEEDDMS_HOOKS']['controller'][lcfirst($tmp[2])] as $hookObj) {
 				if (method_exists($hookObj, $hook)) {
 					switch(func_num_args()) {
+						case 3:
+							$result = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2));
+							break;
 						case 2:
 							$result = $hookObj->$hook($this, func_get_arg(1));
 							break;

inc/inc.ClassDownloadMgr.php

@@ -51,6 +51,7 @@ class SeedDMS_Download_Mgr {
 		$this->items = array();
 		$this->header = array('Dokumenten-Nr.', 'Dokumentenname', 'Dateiname', 'Status', 'Int. Version', 'Prüfer', 'Prüfdatum', 'Prüfkommentar', 'Prüfstatus', 'Freigeber', 'Freigabedatum', 'Freigabekommentar', 'Freigabestatus');
 		$this->extracols = array();
+		$this->rawcontents = array();
 		$this->extraheader = array();
 	}
 
@@ -58,9 +59,10 @@ class SeedDMS_Download_Mgr {
 		$this->extraheader = $extraheader;
 	} /* }}} */
 
-	public function addItem($item, $extracols) { /* {{{ */
+	public function addItem($item, $extracols=array(), $rawcontent='') { /* {{{ */
 		$this->items[$item->getID()] = $item;
 		$this->extracols[$item->getID()] = $extracols;
+		$this->rawcontents[$item->getID()] = $rawcontent;
 	} /* }}} */
 
 	public function createToc($file) { /* {{{ */
@@ -193,7 +195,10 @@ class SeedDMS_Download_Mgr {
 				$filename = preg_replace('/[^A-Za-z0-9_-]/', '_', $document->getName()).'.'.$oext;
 			}
 			$filename = $prefixdir."/".$document->getID().'-'.$item->getVersion().'-'.$filename; //$lc->getOriginalFileName();
-			$zip->addFile($dms->contentDir.$item->getPath(), utf8_decode($filename));
+			if($this->rawcontents[$item->getID()]) {
+				$zip->addFromString(utf8_decode($filename), $this->rawcontents[$item->getID()]);
+			} else
+				$zip->addFile($dms->contentDir.$item->getPath(), utf8_decode($filename));
 		}
 
 		$zip->addFile($file, $prefixdir."/metadata.xls");

inc/inc.ClassEmailNotify.php

@@ -69,28 +69,41 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 	 * @return false or -1 in case of error, otherwise true
 	 */
 	function toIndividual($sender, $recipient, $subject, $message, $params=array()) { /* {{{ */
-		if ($recipient->isDisabled() || $recipient->getEmail()=="") return 0;
-
-		if(!is_object($recipient) || strcasecmp(get_class($recipient), $this->_dms->getClassname('user'))) {
-			return -1;
+		if(is_object($recipient) && !strcasecmp(get_class($recipient), $this->_dms->getClassname('user')) && !$recipient->isDisabled() && $recipient->getEmail()!="") {
+			$to = $recipient->getEmail();
+			$lang = $recipient->getLanguage();
+		} elseif(is_string($recipient) && trim($recipient) != "") {
+			$to = $recipient;
+			if(isset($params['__lang__']))
+				$lang = $params['__lang__'];
+			else
+				$lang = 'en_GB';
+		} else {
+			return false;
 		}
 
+		$returnpath = '';
 		if(is_object($sender) && !strcasecmp(get_class($sender), $this->_dms->getClassname('user'))) {
 			$from = $sender->getFullName() ." <". $sender->getEmail() .">";
+			if($this->from_address)
+				$returnpath = $this->from_address;
 		} elseif(is_string($sender) && trim($sender) != "") {
 			$from = $sender;
+			if($this->from_address)
+				$returnpath = $this->from_address;
 		} else {
 			$from = $this->from_address;
 		}
 
-		$lang = $recipient->getLanguage();
 
 		$message = getMLText("email_header", array(), "", $lang)."\r\n\r\n".getMLText($message, $params, "", $lang);
 		$message .= "\r\n\r\n".getMLText("email_footer", array(), "", $lang);
 
 		$headers = array ();
 		$headers['From'] = $from;
-		$headers['To'] = $recipient->getEmail();
+		if($returnpath)
+			$headers['Return-Path'] = $returnpath;
+		$headers['To'] = $to;
 		$preferences = array("input-charset" => "UTF-8", "output-charset" => "UTF-8");
 		$encoded_subject = iconv_mime_encode("Subject", getMLText($subject, $params, "", $lang), $preferences);
 		$headers['Subject'] = substr($encoded_subject, strlen('Subject: '));
@@ -113,13 +126,12 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 			$mail = Mail::factory('mail', $mail_params);
 		}
  
-		$result = $mail->send($recipient->getEmail(), $headers, $message);
+		$result = $mail->send($to, $headers, $message);
 		if (PEAR::isError($result)) {
 			return false;
 		} else {
 			return true;
 		}
-
 	} /* }}} */
 
 	function toGroup($sender, $groupRecipient, $subject, $message, $params=array()) { /* {{{ */

inc/inc.ClassHook.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Implementation of hook response class
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2017 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Parent class for all hook response classes
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2017 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Hook_Response {
+	protected $data;
+
+	protected $error;
+
+	public function __construct($error = false, $data = null) {
+		$this->data = $data;
+		$this->error = $error;
+	}
+
+	public function setData($data) {
+		$this->data = $data;
+	}
+
+	public function getData() {
+		return $this->data;
+	}
+}
+

inc/inc.ClassSession.php

@@ -487,5 +487,28 @@ class SeedDMS_SessionMgr {
 		return $sessions;
 
 	} /* }}} */
+
+	/**
+	 * Get list of active sessions with a given time
+	 *
+	 * @return array list of sessions
+	 */
+	function getLastAccessedSessions($datetime) { /* {{{ */
+		if(!$ts = makeTsFromLongDate($datetime))
+			return false;
+		$queryStr = "SELECT * FROM `tblSessions` WHERE `lastAccess`>=".$ts;
+		$queryStr .= " ORDER BY `lastAccess` DESC";
+		$resArr = $this->db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false)
+			return false;
+		$sessions = array();
+		foreach($resArr as $rec) {
+			$session = new SeedDMS_Session($this->db);
+			$session->load($rec['id']);
+			$sessions[] = $session;
+		}
+		return $sessions;
+
+	} /* }}} */
 }
 ?>

inc/inc.ClassSettings.php

@@ -186,10 +186,12 @@ class Settings { /* {{{ */
 	var $_logFileEnable = true;
 	// the log file rotation
 	var $_logFileRotation = "d";
-	// Enable file upload by jumploader
+	// Enable file upload by fine-uploader (was 'jumploader')
 	var $_enableLargeFileUpload = false;
-	// size of partitions for file upload by jumploader
+	// size of partitions for file uploaded by fine-loader
 	var $_partitionSize = 2000000;
+	// max size of files uploaded by fine-uploader, set to 0 for unlimited
+	var $_maxUploadSize = 0;
 	// enable/disable users images
 	var $_enableUserImage = false;
 	// enable/disable calendar
@@ -202,8 +204,12 @@ class Settings { /* {{{ */
 	var $_enableClipboard = true;
 	// enable/disable list of tasks in main menu
 	var $_enableMenuTasks = true;
+	// enable/disable display of the session list
+	var $_enableSessionList = false;
 	// enable/disable display of the drop zone for file upload
 	var $_enableDropUpload = true;
+	// Enable multiple file upload
+	var $_enableMultiUpload = false;
 	// enable/disable display of the folder tree
 	var $_enableFolderTree = true;
 	// count documents and folders for folderview recursively
@@ -434,9 +440,11 @@ class Settings { /* {{{ */
 		$this->_enableConverting = Settings::boolVal($tab["enableConverting"]);
 		$this->_enableEmail = Settings::boolVal($tab["enableEmail"]);
 		$this->_enableUsersView = Settings::boolVal($tab["enableUsersView"]);
+		$this->_enableSessionList = Settings::boolVal($tab["enableSessionList"]);
 		$this->_enableClipboard = Settings::boolVal($tab["enableClipboard"]);
 		$this->_enableMenuTasks = Settings::boolVal($tab["enableMenuTasks"]);
 		$this->_enableDropUpload = Settings::boolVal($tab["enableDropUpload"]);
+		$this->_enableMultiUpload = Settings::boolVal($tab["enableMultiUpload"]);
 		$this->_enableFolderTree = Settings::boolVal($tab["enableFolderTree"]);
 		$this->_enableRecursiveCount = Settings::boolVal($tab["enableRecursiveCount"]);
 		$this->_maxRecursiveCount = intval($tab["maxRecursiveCount"]);
@@ -478,6 +486,7 @@ class Settings { /* {{{ */
 		$this->_logFileRotation = strval($tab["logFileRotation"]);
 		$this->_enableLargeFileUpload = Settings::boolVal($tab["enableLargeFileUpload"]);
 		$this->_partitionSize = strval($tab["partitionSize"]);
+		$this->_maxUploadSize = strval($tab["maxUploadSize"]);
 
 		// XML Path: /configuration/system/authentication
 		$node = $xml->xpath('/configuration/system/authentication');
@@ -753,9 +762,11 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableConverting", $this->_enableConverting);
     $this->setXMLAttributValue($node, "enableEmail", $this->_enableEmail);
     $this->setXMLAttributValue($node, "enableUsersView", $this->_enableUsersView);
+		$this->setXMLAttributValue($node, "enableSessionList", $this->_enableSessionList);
 		$this->setXMLAttributValue($node, "enableClipboard", $this->_enableClipboard);
 		$this->setXMLAttributValue($node, "enableMenuTasks", $this->_enableMenuTasks);
 		$this->setXMLAttributValue($node, "enableDropUpload", $this->_enableDropUpload);
+		$this->setXMLAttributValue($node, "enableMultiUpload", $this->_enableMultiUpload);
     $this->setXMLAttributValue($node, "enableFolderTree", $this->_enableFolderTree);
     $this->setXMLAttributValue($node, "enableRecursiveCount", $this->_enableRecursiveCount);
     $this->setXMLAttributValue($node, "maxRecursiveCount", $this->_maxRecursiveCount);
@@ -796,6 +807,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "logFileRotation", $this->_logFileRotation);
     $this->setXMLAttributValue($node, "enableLargeFileUpload", $this->_enableLargeFileUpload);
     $this->setXMLAttributValue($node, "partitionSize", $this->_partitionSize);
+    $this->setXMLAttributValue($node, "maxUploadSize", $this->_maxUploadSize);
 
     // XML Path: /configuration/system/authentication
     $node = $this->getXMLNode($xml, '/configuration/system', 'authentication');
@@ -983,7 +995,7 @@ class Settings { /* {{{ */
 			$extnodes = $xml->addChild("extensions");
 		}
     foreach($this->_extensions as $name => $extension)
-    {
+		{
       // search XML node
 			$extnode = $extnodes->addChild('extension');
       $this->setXMLAttributValue($extnode, 'name', $name);

inc/inc.ClassUI.php

@@ -105,9 +105,11 @@ class UI extends UI_Default {
 			$view->setParam('enablelanguageselector', $settings->_enableLanguageSelector);
 			$view->setParam('enableclipboard', $settings->_enableClipboard);
 			$view->setParam('enablemenutasks', $settings->_enableMenuTasks);
+			$view->setParam('enablesessionlist', $settings->_enableSessionList);
 			$view->setParam('workflowmode', $settings->_workflowMode);
-			$view->setParam('partitionsize', $settings->_partitionSize);
 			$view->setParam('checkoutdir', $settings->_checkOutDir);
+			$view->setParam('partitionsize', (int) $settings->_partitionSize);
+			$view->setParam('maxuploadsize', (int) $settings->_maxUploadSize);
 			$view->setParam('showmissingtranslations', $settings->_showMissingTranslations);
 			$view->setParam('defaultsearchmethod', $settings->_defaultSearchMethod);
 			$view->setParam('cachedir', $settings->_cacheDir);

inc/inc.ClassViewCommon.php

@@ -13,6 +13,8 @@
  * @version    Release: @package_version@
  */
 
+require_once "inc.ClassHook.php";
+
 /**
  * Parent class for all view classes
  *
@@ -81,7 +83,8 @@ class SeedDMS_View_Common {
 	 * a list of hook objects with getHookObjects() and call the hooks yourself.
 	 *
 	 * @params string $hook name of hook
-	 * @return string concatenated string of whatever the hook function returns
+	 * @return string concatenated string, merged arrays or whatever the hook
+	 * function returns
 	 */
 	function callHook($hook) { /* {{{ */
 		$tmp = explode('_', get_class($this));
@@ -92,39 +95,28 @@ class SeedDMS_View_Common {
 					switch(func_num_args()) {
 						case 1:
 							$tmpret = $hookObj->$hook($this);
-							if(is_string($tmpret))
-								$ret .= $tmpret;
-							else
-								$ret = $tmpret;
 							break;
 						case 2:
 							$tmpret = $hookObj->$hook($this, func_get_arg(1));
-							if(is_string($tmpret))
-								$ret .= $tmpret;
-							else
-								$ret = $tmpret;
 							break;
 						case 3:
 							$tmpret = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2));
-							if(is_string($tmpret))
-								$ret .= $tmpret;
-							else
-								$ret = $tmpret;
 							break;
 						case 4:
 							$tmpret = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2), func_get_arg(3));
-							if(is_string($tmpret))
-								$ret .= $tmpret;
-							else
-								$ret = $tmpret;
 							break;
 						default:
 						case 5:
 							$tmpret = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2), func_get_arg(3), func_get_arg(4));
-							if(is_string($tmpret))
-								$ret .= $tmpret;
-							else
-								$ret = $tmpret;
+							break;
+					}
+					if($tmpret !== null) {
+						if(is_string($tmpret))
+							$ret .= $tmpret;
+						elseif(is_array($tmpret) || is_object($tmpret)) {
+							$ret = ($ret === null) ? $tmpret : array_merge($ret, $tmpret);
+						} else
+							$ret = $tmpret;
 					}
 				}
 			}

inc/inc.Version.php

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

install/install.php

@@ -123,7 +123,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "6.0.0");
+define("SEEDDMS_VERSION", "6.0.1");
 
 require_once('../inc/inc.ClassSettings.php');
 

install/update-5.1.0/update-sqlite3.sql

@@ -11,6 +11,8 @@ CREATE TABLE `tblVersion` (
 
 INSERT INTO `tblVersion` SELECT * FROM `__tblVersion`;
 
+DROP TABLE `__tblVersion`;
+
 ALTER TABLE `tblUserImages` RENAME TO `__tblUserImages`;
 
 CREATE TABLE `tblUserImages` (
@@ -22,6 +24,8 @@ CREATE TABLE `tblUserImages` (
 
 INSERT INTO `tblUserImages` SELECT * FROM `__tblUserImages`;
 
+DROP TABLE `__tblUserImages`;
+
 ALTER TABLE `tblDocumentContent` RENAME TO `__tblDocumentContent`;
 
 CREATE TABLE `tblDocumentContent` (
@@ -42,6 +46,8 @@ CREATE TABLE `tblDocumentContent` (
 
 INSERT INTO `tblDocumentContent` SELECT * FROM `__tblDocumentContent`;
 
+DROP TABLE `__tblDocumentContent`;
+
 ALTER TABLE `tblDocumentFiles` RENAME TO `__tblDocumentFiles`;
 
 CREATE TABLE `tblDocumentFiles` (
@@ -59,6 +65,12 @@ CREATE TABLE `tblDocumentFiles` (
 
 INSERT INTO `tblDocumentFiles` SELECT * FROM `__tblDocumentFiles`;
 
+DROP TABLE `__tblDocumentFiles`;
+
+ALTER TABLE `tblDocumentFiles` ADD COLUMN `version` INTEGER unsigned NOT NULL DEFAULT '0';
+
+ALTER TABLE `tblDocumentFiles` ADD COLUMN `public` INTEGER unsigned NOT NULL DEFAULT '0';
+
 ALTER TABLE `tblUsers` RENAME TO `__tblUsers`;
 
 CREATE TABLE `tblUsers` (
@@ -82,6 +94,8 @@ CREATE TABLE `tblUsers` (
 
 INSERT INTO `tblUsers` SELECT * FROM `__tblUsers`;
 
+DROP TABLE `__tblUsers`;
+
 ALTER TABLE `tblUserPasswordRequest` RENAME TO `__tblUserPasswordRequest`;
 
 CREATE TABLE `tblUserPasswordRequest` (
@@ -93,6 +107,8 @@ CREATE TABLE `tblUserPasswordRequest` (
 
 INSERT INTO `tblUserPasswordRequest` SELECT * FROM `__tblUserPasswordRequest`;
 
+DROP TABLE `__tblUserPasswordRequest`;
+
 ALTER TABLE `tblUserPasswordHistory` RENAME TO `__tblUserPasswordHistory`;
 
 CREATE TABLE `tblUserPasswordHistory` (
@@ -104,6 +120,8 @@ CREATE TABLE `tblUserPasswordHistory` (
 
 INSERT INTO `tblUserPasswordHistory` SELECT * FROM `__tblUserPasswordHistory`;
 
+DROP TABLE `__tblUserPasswordHistory`;
+
 ALTER TABLE `tblDocumentReviewLog` RENAME TO `__tblDocumentReviewLog`;
 
 CREATE TABLE `tblDocumentReviewLog` (
@@ -117,6 +135,8 @@ CREATE TABLE `tblDocumentReviewLog` (
 
 INSERT INTO `tblDocumentReviewLog` SELECT * FROM `__tblDocumentReviewLog`;
 
+DROP TABLE `__tblDocumentReviewLog`;
+
 ALTER TABLE `tblDocumentStatusLog` RENAME TO `__tblDocumentStatusLog`;
 
 CREATE TABLE `tblDocumentStatusLog` (
@@ -130,6 +150,8 @@ CREATE TABLE `tblDocumentStatusLog` (
 
 INSERT INTO `tblDocumentStatusLog` SELECT * FROM `__tblDocumentStatusLog`;
 
+DROP TABLE `__tblDocumentStatusLog`;
+
 ALTER TABLE `tblDocumentApproveLog` RENAME TO `__tblDocumentApproveLog`;
 
 CREATE TABLE `tblDocumentApproveLog` (
@@ -143,6 +165,8 @@ CREATE TABLE `tblDocumentApproveLog` (
 
 INSERT INTO `tblDocumentApproveLog` SELECT * FROM `__tblDocumentApproveLog`;
 
+DROP TABLE `__tblDocumentApproveLog`;
+
 ALTER TABLE `tblWorkflowLog` RENAME TO `__tblWorkflowLog`;
 
 CREATE TABLE `tblWorkflowLog` (
@@ -158,6 +182,8 @@ CREATE TABLE `tblWorkflowLog` (
 
 INSERT INTO `tblWorkflowLog` SELECT * FROM `__tblWorkflowLog`;
 
+DROP TABLE `__tblWorkflowLog`;
+
 ALTER TABLE `tblWorkflowDocumentContent` RENAME TO `__tblWorkflowDocumentContent`;
 
 CREATE TABLE `tblWorkflowDocumentContent` (
@@ -171,9 +197,7 @@ CREATE TABLE `tblWorkflowDocumentContent` (
 
 INSERT INTO `tblWorkflowDocumentContent` SELECT * FROM `__tblWorkflowDocumentContent`;
 
-ALTER TABLE `tblDocumentFiles` ADD COLUMN `public` INTEGER NOT NULL default '0';
-
-ALTER TABLE `tblDocumentFiles` ADD COLUMN `version` INTEGER NOT NULL default '0';
+DROP TABLE `__tblWorkflowDocumentContent`;
 
 UPDATE tblVersion set major=5, minor=1, subminor=0;
 

install/update-5.1.0/update.sql

@@ -1,16 +1,16 @@
 START TRANSACTION;
 
-ALTER TABLE `tblDocumentContent` CHANGE `mimeType` `mimeType` varchar(100) NOT NULL default '';
+ALTER TABLE `tblDocumentContent` CHANGE `mimeType` `mimeType` varchar(100) NOT NULL DEFAULT '';
 
-ALTER TABLE `tblDocumentFiles` CHANGE `mimeType` `mimeType` varchar(100) NOT NULL default '';
+ALTER TABLE `tblDocumentFiles` CHANGE `mimeType` `mimeType` varchar(100) NOT NULL DEFAULT '';
 
-ALTER TABLE `tblUserImages` CHANGE `mimeType` `mimeType` varchar(100) NOT NULL default '';
+ALTER TABLE `tblUserImages` CHANGE `mimeType` `mimeType` varchar(100) NOT NULL DEFAULT '';
 
-ALTER TABLE `tblDocumentFiles` ADD COLUMN `public` tinyint(1) NOT NULL default '0' AFTER `document`;
+ALTER TABLE `tblDocumentFiles` ADD COLUMN `public` tinyint(1) NOT NULL DEFAULT '0' AFTER `document`;
 
-ALTER TABLE `tblDocumentFiles` ADD COLUMN `version` smallint(5) unsigned NOT NULL default '0' AFTER `document`;
+ALTER TABLE `tblDocumentFiles` ADD COLUMN `version` smallint(5) unsigned NOT NULL DEFAULT '0' AFTER `document`;
 
-ALTER TABLE `tblUsers` CHANGE `pwdExpiration` `pwdExpiration` datetime default NULL;
+ALTER TABLE `tblUsers` CHANGE `pwdExpiration` `pwdExpiration` datetime DEFAULT NULL;
 
 ALTER TABLE `tblUserPasswordRequest` CHANGE `date` `date` datetime NOT NULL;
 

install/update-5.1.0/update.txt

@@ -4,7 +4,12 @@ Caution when you update an sqlite database
 The database changes for this version will require to change the
 definition of various columns. This is not easily possible when using
 sqlite. Therefore, the affected tables are first renamed, than
-new tables with the modified columns are created in the old table
-content will be copied into the new table. The old tables will not
-be removed and are prefixed with '__'. You may manunally remove them
-once you have successfully checked the update.
+new tables with the modified columns are created and the old table
+contents will be copied into the new tables. The old tables will
+be removed afterwards.
+
+Because sqlite does not support transactions on alter, create and drop
+table these changes cannot not be undone in case of an error. Backup
+your database before and consider to do the update manually by running
+
+cat install/update-5.1.0/update-sqlite.sql | sqlite data/content.db

languages/ar_EG/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1272)
+//    Translators: Admin (1274)
 
 $text = array(
 '2_factor_auth' => '',
@@ -222,6 +222,7 @@ URL: [url]',
 'checkedout_file_has_disappeared' => '',
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
 'choose_attrdef' => 'من فضلك اختر تعريف السمة',
@@ -271,6 +272,7 @@ URL: [url]',
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
+'create_download_link' => '',
 'create_fulltext_index' => 'انشاء فهرس للنص الكامل',
 'create_fulltext_index_warning' => 'انت على وشك اعادة انشاء فهرس النص الكامل.هذا سيتطلب وقت كافي وسيؤثر بشكل عام على كفاءة النظام. اذا كنت حقا تود اعادة انشاء الفهرس، من فضلك قم بتاكيد العملية.',
 'creation_date' => 'تم انشاؤه',
@@ -376,6 +378,9 @@ URL: [url]',
 'does_not_expire' => 'لا ينتهى صلاحيته',
 'does_not_inherit_access_msg' => 'صلاحيات موروثة',
 'download' => 'تنزيل',
+'download_links' => '',
+'download_link_email_body' => '',
+'download_link_email_subject' => '',
 'do_object_repair' => 'إصلاح كل المستندات والمجلدات.',
 'do_object_setchecksum' => 'تحديد فحص اخطاء',
 'do_object_setfilesize' => 'تحديد حجم الملف',
@@ -393,6 +398,7 @@ URL: [url]',
 'dump_creation_warning' => 'من خلال تلك العملية يمكنك انشاء ملف مستخرج من محتوى قاعدة البيانات. بعد انشاء الملف المستخرج سيتم حفظه في مجلد البيانات الخاص بسيرفرك',
 'dump_list' => 'ملف مستخرج حالي',
 'dump_remove' => 'ازالة الملف المستخرج',
+'duplicates' => '',
 'duplicate_content' => '',
 'edit' => 'تعديل',
 'edit_attributes' => 'تعديل السمات',
@@ -442,7 +448,18 @@ URL: [url]',
 'event_details' => 'تفاصيل الحدث',
 'exclude_items' => '',
 'expired' => 'انتهى صلاحيته',
+'expired_at_date' => '',
 'expires' => 'تنتهى صلاحيته',
+'expire_by_date' => '',
+'expire_in_1d' => '',
+'expire_in_1h' => '',
+'expire_in_1m' => '',
+'expire_in_1w' => '',
+'expire_in_1y' => '',
+'expire_in_2h' => '',
+'expire_in_2y' => '',
+'expire_today' => '',
+'expire_tomorrow' => '',
 'expiry_changed_email' => 'تم تغيير تاريخ الصلاحية',
 'expiry_changed_email_body' => 'تم تغيير تاريخ الصلاحية
 المستند: [name]
@@ -451,7 +468,7 @@ Parent folder: [folder_path]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - تم تغيير تاريخ الصلاحية',
 'export' => '',
-'extension_manager' => '',
+'extension_manager' => 'ﺇﺩﺍﺭﺓ ﺍﻼﻣﺩﺍﺩﺎﺗ',
 'february' => 'فبراير',
 'file' => 'ملف',
 'files' => 'ملفات',
@@ -505,6 +522,7 @@ URL: [url]',
 'fr_FR' => 'الفرنسية',
 'fullsearch' => 'البحث النصي الكامل',
 'fullsearch_hint' => 'استخدم فهرس النص الكامل',
+'fulltextsearch_disabled' => '',
 'fulltext_info' => 'معلومات فهرس النص الكامل',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'سمات',
@@ -524,6 +542,7 @@ URL: [url]',
 'group_review_summary' => 'ملخص مراجعة المجموعة',
 'guest_login' => 'الدخول كضيف',
 'guest_login_disabled' => 'دخول ضيف غير متاح.',
+'hash' => '',
 'help' => 'المساعدة',
 'home_folder' => '',
 'hook_name' => '',
@@ -536,7 +555,7 @@ URL: [url]',
 'identical_version' => 'الاصدار الجديد مماثل للاصدار الحالي.',
 'import' => 'ﺎﺴﺘﺧﺭﺎﺟ',
 'importfs' => '',
-'import_fs' => '',
+'import_fs' => 'ﻦﺴﺧ ﻢﻧ ﻢﻠﻓ ﺎﻠﻨﻇﺎﻣ',
 'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'اشمل مستندات',
@@ -577,6 +596,7 @@ URL: [url]',
 'invalid_target_folder' => 'معرف خاطىء لمجلد الهدف',
 'invalid_user_id' => 'معرف مستخدم خاطىء',
 'invalid_version' => 'اصدار مستند خاطىء',
+'in_folder' => '',
 'in_revision' => '',
 'in_workflow' => 'رهن مسار عمل',
 'is_disabled' => 'تعطيل الحساب',
@@ -801,6 +821,7 @@ URL: [url]',
 'personal_default_keywords' => 'قوائم الكلمات البحثية الشخصية',
 'pl_PL' => 'ﺎﻠﺑﻮﻠﻧﺪﻳﺓ',
 'possible_substitutes' => '',
+'preset_expires' => '',
 'preview' => '',
 'preview_converters' => '',
 'preview_images' => '',
@@ -995,6 +1016,7 @@ URL: [url]',
 'select_one' => 'اختر واحد',
 'select_users' => 'اضغط لاختيار المستخدم',
 'select_workflow' => 'اختر مسار العمل',
+'send_email' => '',
 'send_test_mail' => '',
 'september' => 'سبتمبر',
 'sequence' => 'تتابع',
@@ -1002,6 +1024,7 @@ URL: [url]',
 'seq_end' => 'في الاخر',
 'seq_keep' => 'حافظ على المرتبة',
 'seq_start' => 'اول مرتبة',
+'sessions' => '',
 'settings' => 'الإعدادات',
 'settings_activate_module' => 'Activate module',
 'settings_activate_php_extension' => 'Activate PHP extension',
@@ -1107,6 +1130,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => '',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',
@@ -1125,6 +1150,8 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
+'settings_enableSessionList' => '',
+'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => '',
 'settings_enableThemeSelector_desc' => '',
 'settings_enableUpdateReceipt' => '',
@@ -1196,6 +1223,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
 'settings_maxSizeForFullText_desc' => '',
+'settings_maxUploadSize' => '',
+'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => '',
 'settings_notfound' => '',
 'settings_Notification' => '',
@@ -1336,6 +1365,8 @@ URL: [url]',
 'splash_edit_role' => '',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
+'splash_error_rm_download_link' => '',
+'splash_error_send_download_link' => '',
 'splash_folder_edited' => '',
 'splash_importfs' => '',
 'splash_invalid_folder_id' => '',
@@ -1343,9 +1374,11 @@ URL: [url]',
 'splash_moved_clipboard' => '',
 'splash_move_document' => '',
 'splash_move_folder' => '',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => '',
 'splash_rm_attribute' => '',
 'splash_rm_document' => 'تم حذف المستند',
+'splash_rm_download_link' => '',
 'splash_rm_folder' => 'تم حذف المجلد',
 'splash_rm_group' => '',
 'splash_rm_group_member' => '',
@@ -1353,6 +1386,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
 'splash_saved_file' => '',
+'splash_send_download_link' => '',
 'splash_settings_saved' => '',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
@@ -1502,6 +1536,7 @@ URL: [url]',
 'use_comment_of_document' => 'ﺎﺴﺘﺧﺪﻣ ﺎﻠﺘﻌﻠﻴﻗﺎﺗ ﻞﻟﻮﺜﻴﻗﺓ',
 'use_default_categories' => 'استخدم اقسام سابقة التعريف',
 'use_default_keywords' => 'استخدام كلمات بحثية معدة مسبقا',
+'valid_till' => '',
 'version' => 'اصدار',
 'versioning_file_creation' => 'انشاء ملف الاصدارات',
 'versioning_file_creation_warning' => 'من خلال تلك العملية يمكنك انشاء ملف يحتوى معلومات الاصدار لمجمل مجلد النظام. بعد الانشاء كل ملف سيتم حفظه داخل المجلد الخاص به',
@@ -1529,6 +1564,7 @@ URL: [url]',
 'workflow_action_name' => 'اسم',
 'workflow_editor' => 'محرر مسارات العمل',
 'workflow_group_summary' => 'ملخص المجموعة',
+'workflow_has_cycle' => '',
 'workflow_initstate' => 'الحالة الابتدائية',
 'workflow_in_use' => 'مسار العمل هذا مستخدم حاليا لمستندات',
 'workflow_layoutdata_saved' => '',

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 (791)
+//    Translators: Admin (831)
 
 $text = array(
 '2_factor_auth' => '',
@@ -53,7 +53,7 @@ $text = array(
 'add_attrdefgroup' => '',
 'add_document' => 'Добави документ',
 'add_document_link' => 'Добави препратка',
-'add_document_notify' => '',
+'add_document_notify' => 'Добави нотификация',
 'add_doc_reviewer_approver_warning' => 'Документът получава статус ДОСТЪПЕН автоматично ако няма нито рецензент нито утвърждаващ',
 'add_doc_workflow_warning' => 'N.B. Документът автоматично семаркира като освободен ако не се работи по него.',
 'add_event' => 'Добави събитие',
@@ -105,7 +105,7 @@ $text = array(
 'april' => 'Април',
 'archive_creation' => 'Създаване архив',
 'archive_creation_warning' => 'Тази операция ще създаде архив, съдържащ всички папки. След създаването архивът ще бъде съхранен в папката с данни на сървъра.<br>ВНИМАНИЕ: Архивът създаден като понятен за  човек, ще бъде непригоден за бекъп!',
-'ar_EG' => '',
+'ar_EG' => 'Арабски',
 'assign_approvers' => 'Назначи утвърждаващи',
 'assign_reviewers' => 'Назначи рецензенти',
 'assign_user_property_to' => 'Назначи свойства на потребителя',
@@ -158,7 +158,7 @@ $text = array(
 'at_least_n_users_of_group' => '',
 'august' => 'Август',
 'authentication' => '',
-'author' => '',
+'author' => 'Автор',
 'automatic_status_update' => 'Автоматично изменение на статуса',
 'back' => 'Назад',
 'backup_list' => 'Списък на бекъпите',
@@ -166,7 +166,7 @@ $text = array(
 'backup_remove' => 'Изтрий бекъп',
 'backup_tools' => 'Иструменти за бекъп',
 'between' => 'между',
-'bg_BG' => '',
+'bg_BG' => 'Български',
 'browse' => 'Преглеждане',
 'calendar' => 'Календар',
 'calendar_week' => '',
@@ -187,14 +187,14 @@ $text = array(
 'category_info' => '',
 'category_in_use' => 'Тази категория се използва от документите',
 'category_noname' => 'Въведете име на категорията',
-'ca_ES' => '',
+'ca_ES' => 'Каталунски',
 'change_assignments' => 'Промени предназначението',
 'change_password' => 'Промени паролата',
 'change_password_message' => 'Паролата променена',
 'change_recipients' => '',
 'change_revisors' => '',
 'change_status' => 'Промени статусът',
-'charts' => '',
+'charts' => 'Графики',
 'chart_docsaccumulated_title' => '',
 'chart_docspercategory_title' => '',
 'chart_docspermimetype_title' => '',
@@ -207,6 +207,7 @@ $text = array(
 'checkedout_file_has_disappeared' => '',
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
 'choose_attrdef' => 'Изберете attribute definition',
@@ -256,10 +257,11 @@ $text = array(
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
+'create_download_link' => '',
 'create_fulltext_index' => 'Създай пълнотекстов индекс',
 'create_fulltext_index_warning' => 'Вие искате да пресъздадете пълнотекстов индекс. Това ще отнеме време и ще понижи производителността. Да продолжа ли?',
 'creation_date' => 'Създаден',
-'cs_CZ' => '',
+'cs_CZ' => 'Чешки',
 'current_password' => 'Текуща парола',
 'current_quota' => '',
 'current_state' => '',
@@ -276,7 +278,7 @@ $text = array(
 'delete' => 'Изтрий',
 'details' => 'Детайли',
 'details_version' => 'Детайли за версия: [version]',
-'de_DE' => '',
+'de_DE' => 'Немски',
 'disclaimer' => 'Работим аккуратно и задълбочено. От това зависи бъдeщето на нашата страна и благополучието на народа.nПетилетката за три години!nДа не оставим неодрусана слива в наше село!',
 'discspace' => '',
 'docs_in_reception_no_access' => '',
@@ -331,6 +333,9 @@ $text = array(
 'does_not_expire' => 'Безсрочен',
 'does_not_inherit_access_msg' => 'Наследване нивото на достъп',
 'download' => 'Изтегли',
+'download_links' => '',
+'download_link_email_body' => '',
+'download_link_email_subject' => '',
 'do_object_repair' => 'Поправи всички папки и документи',
 'do_object_setchecksum' => 'Установи контролна сума',
 'do_object_setfilesize' => 'Установи размер на файла',
@@ -343,11 +348,12 @@ $text = array(
 'dropfolder_file' => 'Файл от drop папка',
 'dropfolder_folder' => '',
 'dropupload' => '',
-'drop_files_here' => '',
+'drop_files_here' => 'Пусни файла тук!',
 'dump_creation' => 'Създаване дъмп на БД',
 'dump_creation_warning' => 'Тази операция шъ създаде дамп на базата данни. След създаването, файлът ще бъде съхранен в папката с данни на сървъра.',
 'dump_list' => 'Съществуващи дъмпове',
 'dump_remove' => 'Изтрий дъмп',
+'duplicates' => '',
 'duplicate_content' => '',
 'edit' => 'Редактирай',
 'edit_attributes' => 'Редактирай атрибути',
@@ -370,7 +376,7 @@ $text = array(
 'edit_user' => 'Редактирай потребител',
 'edit_user_details' => 'Редактирай данните на потребителя',
 'edit_version' => '',
-'el_GR' => '',
+'el_GR' => 'Гръцки',
 'email' => 'Email',
 'email_error_title' => 'Email не е указан',
 'email_footer' => 'Винаги можете да измените e-mail исползвайки функцията \'Моя учетка\'',
@@ -379,7 +385,7 @@ $text = array(
 'empty_attribute_group_list' => '',
 'empty_folder_list' => 'Няма документи или папки',
 'empty_notify_list' => 'Няма записи',
-'en_GB' => '',
+'en_GB' => 'Английски (Великобритания)',
 'equal_transition_states' => 'Началното и крайно състояние са еднакви',
 'error' => 'Грешка',
 'error_add_aro' => '',
@@ -393,16 +399,27 @@ $text = array(
 'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
-'es_ES' => '',
+'es_ES' => 'Испански',
 'event_details' => 'Детайли за събитието',
 'exclude_items' => '',
 'expired' => 'Изтекъл',
+'expired_at_date' => '',
 'expires' => 'Изтича',
+'expire_by_date' => '',
+'expire_in_1d' => '',
+'expire_in_1h' => '',
+'expire_in_1m' => '',
+'expire_in_1w' => '',
+'expire_in_1y' => '',
+'expire_in_2h' => '',
+'expire_in_2y' => '',
+'expire_today' => '',
+'expire_tomorrow' => '',
 'expiry_changed_email' => 'Датата на изтичане променена',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
 'export' => '',
-'extension_manager' => '',
+'extension_manager' => 'управление на добавките',
 'february' => 'Февруари',
 'file' => 'Файл',
 'files' => 'Файлове',
@@ -433,9 +450,10 @@ $text = array(
 'friday' => 'петък',
 'friday_abbr' => '',
 'from' => 'От',
-'fr_FR' => '',
+'fr_FR' => 'Френски',
 'fullsearch' => 'Пълнотекстово търсене',
 'fullsearch_hint' => 'Използвай пълнотекстов индекс',
+'fulltextsearch_disabled' => '',
 'fulltext_info' => 'Информация за пълнотекстов индексе',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'атрибути',
@@ -455,19 +473,20 @@ $text = array(
 'group_review_summary' => 'Сводка по рецензирането на групи',
 'guest_login' => 'Влез като гост',
 'guest_login_disabled' => 'Входът като гост изключен',
+'hash' => '',
 'help' => 'Помощ',
 'home_folder' => '',
 'hook_name' => '',
 'hourly' => 'Ежечасно',
 'hours' => 'часа',
-'hr_HR' => '',
+'hr_HR' => 'Хърватски',
 'human_readable' => 'Човекопонятен архив',
-'hu_HU' => '',
+'hu_HU' => 'Унгарски',
 'id' => 'ID',
 'identical_version' => 'Новата версия е идентична с текущата.',
 'import' => '',
 'importfs' => '',
-'import_fs' => '',
+'import_fs' => 'добави от файловата система',
 'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Включи документи',
@@ -476,7 +495,7 @@ $text = array(
 'index_converters' => 'Index document conversion',
 'index_done' => '',
 'index_error' => '',
-'index_folder' => '',
+'index_folder' => 'Индекс на директорията',
 'index_pending' => '',
 'index_waiting' => '',
 'individuals' => 'Личности',
@@ -508,11 +527,12 @@ $text = array(
 'invalid_target_folder' => 'Неправилен идентификатор на целевата папка',
 'invalid_user_id' => 'Неправилен идентификатор на потребителя',
 'invalid_version' => 'Неправилна версия на документа',
+'in_folder' => '',
 'in_revision' => '',
 'in_workflow' => 'в процес',
 'is_disabled' => 'забранена сметка',
 'is_hidden' => 'Не показвай в списъка с потребители',
-'it_IT' => '',
+'it_IT' => 'Италиански',
 'january' => 'януари',
 'js_form_error' => '',
 'js_form_errors' => '',
@@ -539,9 +559,9 @@ $text = array(
 'keep' => '',
 'keep_doc_status' => 'Запази статуса на документа',
 'keywords' => 'Ключови думи',
-'keywords_loading' => '',
+'keywords_loading' => 'Моля, изчакайте, докато ключовите думи се зареждат',
 'keyword_exists' => 'Ключовата дума съществува',
-'ko_KR' => '',
+'ko_KR' => 'Корейски',
 'language' => 'Език',
 'lastaccess' => '',
 'last_update' => 'Последно обновление',
@@ -554,7 +574,7 @@ $text = array(
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Ако искате да качите файлове над текущия лимит, използвайте друг <a href="%s">начин</a>.',
 'link_to_version' => '',
-'list_access_rights' => '',
+'list_access_rights' => 'Списък на права',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Локален файл',
@@ -626,7 +646,7 @@ $text = array(
 'new_subfolder_email_subject' => '',
 'new_user_image' => 'Ново изображение',
 'next_state' => 'Ново състояние',
-'nl_NL' => '',
+'nl_NL' => 'Холандски',
 'no' => 'Не',
 'notify_added_email' => 'Вие сте добавен в списъка с уведомявани',
 'notify_added_email_body' => '',
@@ -700,8 +720,9 @@ $text = array(
 'pending_reviews' => '',
 'pending_workflows' => '',
 'personal_default_keywords' => 'Личен списък с ключови думи',
-'pl_PL' => '',
+'pl_PL' => 'Полски',
 'possible_substitutes' => '',
+'preset_expires' => '',
 'preview' => '',
 'preview_converters' => '',
 'preview_images' => '',
@@ -709,7 +730,7 @@ $text = array(
 'preview_plain' => '',
 'previous_state' => 'Предишно състояние',
 'previous_versions' => 'Предишни версии',
-'pt_BR' => '',
+'pt_BR' => 'Португалски (Бразилия)',
 'quota' => 'Квота',
 'quota_exceeded' => 'Вашата дискова квота е превишена с [bytes].',
 'quota_is_disabled' => '',
@@ -814,11 +835,11 @@ $text = array(
 'role_name' => '',
 'role_type' => '',
 'role_user' => 'Потребител',
-'ro_RO' => '',
+'ro_RO' => 'Румънски',
 'run_subworkflow' => 'Пусни под-процес',
 'run_subworkflow_email_body' => '',
 'run_subworkflow_email_subject' => '',
-'ru_RU' => '',
+'ru_RU' => 'Руски',
 'saturday' => 'събота',
 'saturday_abbr' => '',
 'save' => 'Съхрани',
@@ -848,18 +869,19 @@ $text = array(
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '',
-'select_grp_notification' => '',
+'select_grp_notification' => 'Избор на групова нотификация',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Кликни да избереш група рецензенти',
 'select_grp_revisors' => '',
 'select_ind_approvers' => 'Кликни да избереш утвърждаващ',
-'select_ind_notification' => '',
+'select_ind_notification' => 'Избор на индивидуална нотификация',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Кликни да избереш рецензент',
 'select_ind_revisors' => '',
 'select_one' => 'Избери един',
 'select_users' => 'Кликни да избереш потребители',
 'select_workflow' => 'Избери процес',
+'send_email' => '',
 'send_test_mail' => '',
 'september' => 'септември',
 'sequence' => 'Последователност',
@@ -867,6 +889,7 @@ $text = array(
 'seq_end' => 'В края',
 'seq_keep' => 'Съхрани позицията',
 'seq_start' => 'Първа позиция',
+'sessions' => '',
 'settings' => 'Настройки',
 'settings_activate_module' => 'Активирай модул',
 'settings_activate_php_extension' => 'Активирай разширение на PHP',
@@ -972,6 +995,8 @@ $text = array(
 'settings_enableLargeFileUpload_desc' => 'Ако е включено, качване на файлове е дустъпно и чрез джава-аплет, именован jumploader, без лимит за размер на файла. Това също ще позволи да се качват няколко файла наведнъж.',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Разреши уведомление до рецензиращи/утвърждаващи',
 'settings_enableNotificationAppRev_desc' => 'Избери за изпращане на уведомление до рецензиращи/утвърждаващи когато се добавя нова версия на документа',
 'settings_enableNotificationWorkflow' => '',
@@ -990,6 +1015,8 @@ $text = array(
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
+'settings_enableSessionList' => '',
+'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => '',
 'settings_enableThemeSelector_desc' => '',
 'settings_enableUpdateReceipt' => '',
@@ -1061,6 +1088,8 @@ $text = array(
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
 'settings_maxSizeForFullText_desc' => '',
+'settings_maxUploadSize' => '',
+'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => 'Още настройки. Логин по подразбиране: admin/admin',
 'settings_notfound' => 'Не е намерено',
 'settings_Notification' => 'Настройка за известяване',
@@ -1177,7 +1206,7 @@ $text = array(
 'sign_in' => 'вход',
 'sign_out' => 'изход',
 'sign_out_user' => '',
-'sk_SK' => '',
+'sk_SK' => 'Словашки',
 'space_used_on_data_folder' => 'Размер на каталога с данните',
 'splash_added_to_clipboard' => '',
 'splash_add_attribute' => '',
@@ -1193,7 +1222,7 @@ $text = array(
 'splash_document_checkedout' => '',
 'splash_document_edited' => '',
 'splash_document_indexed' => '',
-'splash_document_locked' => '',
+'splash_document_locked' => 'Документът е заключен',
 'splash_document_unlocked' => '',
 'splash_edit_attribute' => '',
 'splash_edit_event' => '',
@@ -1201,6 +1230,8 @@ $text = array(
 'splash_edit_role' => '',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
+'splash_error_rm_download_link' => '',
+'splash_error_send_download_link' => '',
 'splash_folder_edited' => '',
 'splash_importfs' => '',
 'splash_invalid_folder_id' => '',
@@ -1208,9 +1239,11 @@ $text = array(
 'splash_moved_clipboard' => '',
 'splash_move_document' => '',
 'splash_move_folder' => '',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => '',
 'splash_rm_attribute' => '',
-'splash_rm_document' => '',
+'splash_rm_document' => 'Документът е преместен',
+'splash_rm_download_link' => '',
 'splash_rm_folder' => '',
 'splash_rm_group' => '',
 'splash_rm_group_member' => '',
@@ -1218,6 +1251,7 @@ $text = array(
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
 'splash_saved_file' => '',
+'splash_send_download_link' => '',
 'splash_settings_saved' => '',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
@@ -1255,14 +1289,14 @@ $text = array(
 'submit_userinfo' => 'Изпрати информация за потребител',
 'subsribe_timelinefeed' => '',
 'substitute_to_user' => '',
-'substitute_user' => '',
+'substitute_user' => 'Заместващ потребител',
 'success_add_aro' => '',
 'success_add_permission' => '',
 'success_remove_permission' => '',
 'success_toogle_permission' => '',
 'sunday' => 'неделя',
 'sunday_abbr' => '',
-'sv_SE' => '',
+'sv_SE' => 'Шведски',
 'switched_to' => '',
 'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => '',
@@ -1276,7 +1310,7 @@ $text = array(
 'theme' => 'Тема',
 'thursday' => 'четвъртък',
 'thursday_abbr' => '',
-'timeline' => '',
+'timeline' => 'времева линия',
 'timeline_add_file' => '',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
@@ -1306,12 +1340,12 @@ $text = array(
 'transmittal_size' => '',
 'tree_loading' => '',
 'trigger_workflow' => 'Процес',
-'tr_TR' => '',
+'tr_TR' => 'Турски',
 'tuesday' => 'вторник',
 'tuesday_abbr' => '',
 'type_of_hook' => '',
 'type_to_search' => 'Тип за търсене',
-'uk_UA' => '',
+'uk_UA' => 'Украински',
 'under_folder' => 'В папка',
 'unknown_attrdef' => '',
 'unknown_command' => 'Командата не е позната.',
@@ -1355,9 +1389,10 @@ $text = array(
 'user_login' => 'Идентификатор на потребителя',
 'user_management' => 'Управление на потребителите',
 'user_name' => 'Пълно име',
-'use_comment_of_document' => '',
+'use_comment_of_document' => 'Използвай коментара от документа',
 'use_default_categories' => 'Исползвай предопределени категории',
 'use_default_keywords' => 'Исползовай предопределенни ключови думи',
+'valid_till' => '',
 'version' => 'Версия',
 'versioning_file_creation' => 'Създаване на файл с версии',
 'versioning_file_creation_warning' => 'Тази операция ще създаде файл с версия за всяка папка. След създаване файлът ще бъде съхранен в каталога на документите.',
@@ -1380,6 +1415,7 @@ $text = array(
 'workflow_action_name' => 'Име',
 'workflow_editor' => 'Редактор на процес',
 'workflow_group_summary' => 'Резюме за група',
+'workflow_has_cycle' => '',
 'workflow_initstate' => 'Начално състояние',
 'workflow_in_use' => 'Този процес се използва от документ.',
 'workflow_layoutdata_saved' => '',
@@ -1400,7 +1436,7 @@ $text = array(
 'workflow_user_summary' => 'Резюме за потребител',
 'year_view' => 'годишен изглед',
 'yes' => 'Да',
-'zh_CN' => '',
-'zh_TW' => '',
+'zh_CN' => 'Китайски (Китай)',
+'zh_TW' => 'Китайски (Тайван)',
 );
 ?>

languages/ca_ES/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (710)
+//    Translators: Admin (722)
 
 $text = array(
 '2_factor_auth' => '',
@@ -143,7 +143,7 @@ URL: [url]',
 'attrdef_type_string' => '',
 'attrdef_type_url' => '',
 'attrdef_valueset' => '',
-'attributes' => '',
+'attributes' => 'Atributs',
 'attribute_changed_email_body' => '',
 'attribute_changed_email_subject' => '',
 'attribute_count' => '',
@@ -188,7 +188,7 @@ URL: [url]',
 'categories_loading' => '',
 'category' => 'Category',
 'category_exists' => '',
-'category_filter' => '',
+'category_filter' => 'Només categories',
 'category_info' => '',
 'category_in_use' => '',
 'category_noname' => '',
@@ -212,6 +212,7 @@ URL: [url]',
 'checkedout_file_has_disappeared' => '',
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
 'choose_attrdef' => '',
@@ -228,7 +229,7 @@ URL: [url]',
 'choose_workflow_action' => '',
 'choose_workflow_state' => '',
 'class_name' => '',
-'clear_cache' => '',
+'clear_cache' => 'Neteja memòria cau',
 'clear_clipboard' => '',
 'clear_password' => '',
 'clipboard' => 'Portapapers',
@@ -261,6 +262,7 @@ URL: [url]',
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
+'create_download_link' => '',
 'create_fulltext_index' => 'Crea un índex full-text',
 'create_fulltext_index_warning' => '',
 'creation_date' => 'Creació',
@@ -293,7 +295,7 @@ URL: [url]',
 'documents_in_process' => 'Documents en procés',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Documents bloquejats per vostè',
-'documents_only' => '',
+'documents_only' => 'Només documents',
 'documents_to_approve' => 'Documents en espera d\'aprovació d\'usuaris',
 'documents_to_process' => '',
 'documents_to_receipt' => '',
@@ -336,6 +338,9 @@ URL: [url]',
 'does_not_expire' => 'No caduca',
 'does_not_inherit_access_msg' => 'heretar l\'accés',
 'download' => 'Descarregar',
+'download_links' => '',
+'download_link_email_body' => '',
+'download_link_email_subject' => '',
 'do_object_repair' => '',
 'do_object_setchecksum' => '',
 'do_object_setfilesize' => '',
@@ -353,6 +358,7 @@ URL: [url]',
 'dump_creation_warning' => 'Amb aquesta operació es crearà un bolcat a fitxer del contingut de la base de dades. Després de la creació del bolcat, el fitxer es guardarà a la carpeta de dades del seu servidor.',
 'dump_list' => 'Fitxers de bolcat existents',
 'dump_remove' => 'Eliminar fitxer de bolcat',
+'duplicates' => '',
 'duplicate_content' => '',
 'edit' => 'editar',
 'edit_attributes' => '',
@@ -402,12 +408,23 @@ URL: [url]',
 'event_details' => 'Detalls de l\'event',
 'exclude_items' => '',
 'expired' => 'Caducat',
+'expired_at_date' => '',
 'expires' => 'Caduca',
+'expire_by_date' => '',
+'expire_in_1d' => '',
+'expire_in_1h' => '',
+'expire_in_1m' => '',
+'expire_in_1w' => '',
+'expire_in_1y' => '',
+'expire_in_2h' => '',
+'expire_in_2y' => '',
+'expire_today' => '',
+'expire_tomorrow' => '',
 'expiry_changed_email' => 'Data de caducitat modificada',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
 'export' => '',
-'extension_manager' => '',
+'extension_manager' => 'Gestiona les Extensions',
 'february' => 'Febrer',
 'file' => 'Fitxer',
 'files' => 'Fitxers',
@@ -416,7 +433,7 @@ URL: [url]',
 'files_loading' => '',
 'file_size' => 'Mida',
 'filter_for_documents' => '',
-'filter_for_folders' => '',
+'filter_for_folders' => 'Filtre adicional per les carpetes',
 'folder' => 'Carpeta',
 'folders' => 'Carpetes',
 'folders_and_documents_statistic' => 'Vista general de continguts',
@@ -441,6 +458,7 @@ URL: [url]',
 'fr_FR' => 'Francès',
 'fullsearch' => 'Cerca full-text',
 'fullsearch_hint' => '',
+'fulltextsearch_disabled' => '',
 'fulltext_info' => 'Informació de full-text',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Atributs',
@@ -460,6 +478,7 @@ URL: [url]',
 'group_review_summary' => 'Resum del grup revisor',
 'guest_login' => 'Accés com a invitat',
 'guest_login_disabled' => 'El compte d\'invitat està deshabilitat.',
+'hash' => '',
 'help' => 'Ajuda',
 'home_folder' => '',
 'hook_name' => '',
@@ -513,6 +532,7 @@ URL: [url]',
 'invalid_target_folder' => 'ID de carpeta destinació no válid',
 'invalid_user_id' => 'ID d\'usuari no vàlid',
 'invalid_version' => 'La versión de documento no és vàlida',
+'in_folder' => '',
 'in_revision' => '',
 'in_workflow' => '',
 'is_disabled' => '',
@@ -591,7 +611,7 @@ URL: [url]',
 'may' => 'Maig',
 'mimetype' => '',
 'minutes' => '',
-'misc' => '',
+'misc' => 'Miscelànea',
 'missing_checksum' => '',
 'missing_file' => '',
 'missing_filesize' => '',
@@ -707,6 +727,7 @@ URL: [url]',
 'personal_default_keywords' => 'Mots clau personals',
 'pl_PL' => 'Polonès',
 'possible_substitutes' => '',
+'preset_expires' => '',
 'preview' => '',
 'preview_converters' => '',
 'preview_images' => '',
@@ -832,21 +853,21 @@ URL: [url]',
 'search_in' => 'Buscar a',
 'search_mode_and' => 'tots els mots',
 'search_mode_documents' => '',
-'search_mode_folders' => '',
+'search_mode_folders' => 'Només carpetes',
 'search_mode_or' => 'si més no, un mot',
 'search_no_results' => 'No hi ha documents que coincideixn amb la seva cerca',
 'search_query' => 'Cercar',
 'search_report' => 'Trobats [count] documents',
 'search_report_fulltext' => '',
-'search_resultmode' => '',
-'search_resultmode_both' => '',
+'search_resultmode' => 'Resultats',
+'search_resultmode_both' => 'Documets i carpetes',
 'search_results' => 'Resultats de la cerca',
 'search_results_access_filtered' => 'Els resultats de la cerca podrien incloure continguts amb l\'accés denegat.',
 'search_time' => 'Temps transcorregut: [time] seg.',
 'seconds' => '',
 'selection' => 'Selecció',
 'select_attrdefgrp_show' => '',
-'select_category' => '',
+'select_category' => 'Prem per seleccionar la categoria',
 'select_groups' => '',
 'select_grp_approvers' => '',
 'select_grp_ind_approvers' => '',
@@ -863,8 +884,9 @@ URL: [url]',
 'select_ind_reviewers' => '',
 'select_ind_revisors' => '',
 'select_one' => 'Seleccionar un',
-'select_users' => '',
+'select_users' => 'Prem per seleccionar els usuaris',
 'select_workflow' => '',
+'send_email' => '',
 'send_test_mail' => '',
 'september' => 'Setembre',
 'sequence' => 'Seqüència',
@@ -872,6 +894,7 @@ URL: [url]',
 'seq_end' => 'Al final',
 'seq_keep' => 'Mantenir posició',
 'seq_start' => 'Primera posició',
+'sessions' => '',
 'settings' => 'Settings',
 'settings_activate_module' => 'Activate module',
 'settings_activate_php_extension' => 'Activate PHP extension',
@@ -977,6 +1000,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => '',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',
@@ -995,6 +1020,8 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
+'settings_enableSessionList' => '',
+'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => '',
 'settings_enableThemeSelector_desc' => '',
 'settings_enableUpdateReceipt' => '',
@@ -1066,6 +1093,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
 'settings_maxSizeForFullText_desc' => '',
+'settings_maxUploadSize' => '',
+'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => '',
 'settings_notfound' => '',
 'settings_Notification' => '',
@@ -1206,6 +1235,8 @@ URL: [url]',
 'splash_edit_role' => '',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
+'splash_error_rm_download_link' => '',
+'splash_error_send_download_link' => '',
 'splash_folder_edited' => '',
 'splash_importfs' => '',
 'splash_invalid_folder_id' => '',
@@ -1213,9 +1244,11 @@ URL: [url]',
 'splash_moved_clipboard' => '',
 'splash_move_document' => '',
 'splash_move_folder' => '',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => '',
 'splash_rm_attribute' => '',
 'splash_rm_document' => 'Document esborrat',
+'splash_rm_download_link' => '',
 'splash_rm_folder' => 'Carpeta esborrada',
 'splash_rm_group' => '',
 'splash_rm_group_member' => '',
@@ -1223,6 +1256,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
 'splash_saved_file' => '',
+'splash_send_download_link' => '',
 'splash_settings_saved' => '',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
@@ -1363,6 +1397,7 @@ URL: [url]',
 'use_comment_of_document' => '',
 'use_default_categories' => 'Use predefined categories',
 'use_default_keywords' => 'Utilitzar els mots clau per omisió',
+'valid_till' => '',
 'version' => 'Versió',
 'versioning_file_creation' => 'Creació de fitxer de versions',
 'versioning_file_creation_warning' => 'Amb aquesta operació podeu crear un fitxer que contingui la informació de versions d\'una carpeta del DMS completa. Després de la creació, tots els fitxers es guardaran a la carpeta de documents.',
@@ -1385,6 +1420,7 @@ URL: [url]',
 'workflow_action_name' => '',
 'workflow_editor' => '',
 'workflow_group_summary' => '',
+'workflow_has_cycle' => '',
 'workflow_initstate' => '',
 'workflow_in_use' => '',
 'workflow_layoutdata_saved' => '',

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 (718), kreml (455)
+//    Translators: Admin (722), kreml (455)
 
 $text = array(
 '2_factor_auth' => '',
@@ -229,6 +229,7 @@ URL: [url]',
 'checkedout_file_has_disappeared' => '',
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
 'choose_attrdef' => 'Zvolte definici atributů',
@@ -278,6 +279,7 @@ URL: [url]',
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
+'create_download_link' => '',
 'create_fulltext_index' => 'Vytvořit fulltext index',
 'create_fulltext_index_warning' => 'Hodláte znovu vytvořit fulltext index. Může to trvat dlouho a zpomalit běh systému. Pokud víte, co děláte, potvďte operaci.',
 'creation_date' => 'Vytvořeno',
@@ -304,7 +306,7 @@ URL: [url]',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
 'document' => 'Dokument',
-'documentcontent' => '',
+'documentcontent' => 'Obsah dokumentu',
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Zpracovávané dokumenty',
@@ -383,6 +385,9 @@ URL: [url]',
 'does_not_expire' => 'Platnost nikdy nevyprší',
 'does_not_inherit_access_msg' => 'Zdědit přístup',
 'download' => 'Stáhnout',
+'download_links' => '',
+'download_link_email_body' => '',
+'download_link_email_subject' => '',
 'do_object_repair' => 'Opravit všechny složky a dokumenty.',
 'do_object_setchecksum' => 'Nastavit kontrolní součet',
 'do_object_setfilesize' => 'Nastavit velikost souboru',
@@ -400,6 +405,7 @@ URL: [url]',
 'dump_creation_warning' => 'Pomocí této operace můžete vytvořit soubor se zálohou databáze. Po vytvoření bude soubor zálohy uložen ve složce data vašeho serveru.',
 'dump_list' => 'Existující soubory záloh',
 'dump_remove' => 'Odstranit soubor zálohy',
+'duplicates' => '',
 'duplicate_content' => '',
 'edit' => 'upravit',
 'edit_attributes' => 'Editovat atributy',
@@ -449,7 +455,18 @@ URL: [url]',
 'event_details' => 'Údaje akce',
 'exclude_items' => '',
 'expired' => 'Platnost vypršela',
+'expired_at_date' => '',
 'expires' => 'Platnost vyprší',
+'expire_by_date' => '',
+'expire_in_1d' => '',
+'expire_in_1h' => '',
+'expire_in_1m' => '',
+'expire_in_1w' => '',
+'expire_in_1y' => '',
+'expire_in_2h' => '',
+'expire_in_2y' => '',
+'expire_today' => '',
+'expire_tomorrow' => '',
 'expiry_changed_email' => 'Datum expirace změněno',
 'expiry_changed_email_body' => 'Datum ukončení platnosti změněn
 Dokument: [name]
@@ -512,6 +529,7 @@ URL: [url]',
 'fr_FR' => 'Francouzština',
 'fullsearch' => 'Fulltextové vyhledávání',
 'fullsearch_hint' => 'Použijte fultext index',
+'fulltextsearch_disabled' => '',
 'fulltext_info' => 'Fulltext index info',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Atributy',
@@ -531,6 +549,7 @@ URL: [url]',
 'group_review_summary' => 'Souhrn revizí skupiny',
 'guest_login' => 'Přihlásit se jako host',
 'guest_login_disabled' => 'Přihlášení jako host je vypnuté.',
+'hash' => '',
 'help' => 'Pomoc',
 'home_folder' => 'Domácí složka',
 'hook_name' => '',
@@ -548,7 +567,7 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'Včetně dokumentů',
 'include_subdirectories' => 'Včetně podadresářů',
-'indexing_tasks_in_queue' => '',
+'indexing_tasks_in_queue' => 'Indexování úkolů ve frontě',
 'index_converters' => 'Index konverze dokumentu',
 'index_done' => '',
 'index_error' => '',
@@ -584,6 +603,7 @@ URL: [url]',
 'invalid_target_folder' => 'Neplatné cílové ID adresáře',
 'invalid_user_id' => 'Neplatné ID uživatele',
 'invalid_version' => 'Neplatná verze dokumentu',
+'in_folder' => '',
 'in_revision' => '',
 'in_workflow' => 'Zpracováváno',
 'is_disabled' => 'Zakázaný účet',
@@ -630,7 +650,7 @@ URL: [url]',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Hodláte-li nahrát soubory větší než je maximální velikost pro nahrávání, použijte prosím <a href="%s">alternativní stránku</a>.',
 'link_to_version' => '',
-'list_access_rights' => '',
+'list_access_rights' => 'Seznam všech přístupových práv ...',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Lokální soubor',
@@ -773,7 +793,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Pro obrázky uživatelů je možné použít pouze obrázky .jpg',
 'order_by_sequence_off' => '',
 'original_filename' => 'Originální název souboru',
-'overall_indexing_progress' => '',
+'overall_indexing_progress' => 'Celkový průběh indexování',
 'owner' => 'Vlastník',
 'ownership_changed_email' => 'Vlastník změněn',
 'ownership_changed_email_body' => 'Vlastník změněn
@@ -812,6 +832,7 @@ Pokud budete mít problém s přihlášením i po změně hesla, kontaktujte Adm
 'personal_default_keywords' => 'Osobní klíčová slova',
 'pl_PL' => 'Polština',
 'possible_substitutes' => '',
+'preset_expires' => '',
 'preview' => '',
 'preview_converters' => '',
 'preview_images' => '',
@@ -1004,6 +1025,7 @@ URL: [url]',
 'select_one' => 'Vyberte jeden',
 'select_users' => 'Kliknutím vyberte uživatele',
 'select_workflow' => 'Vyberte postup práce',
+'send_email' => '',
 'send_test_mail' => '',
 'september' => 'Září',
 'sequence' => 'Posloupnost',
@@ -1011,6 +1033,7 @@ URL: [url]',
 'seq_end' => 'Na konec',
 'seq_keep' => 'Ponechat pozici',
 'seq_start' => 'První pozice',
+'sessions' => '',
 'settings' => 'Settings',
 'settings_activate_module' => 'Activate module',
 'settings_activate_php_extension' => 'Activate PHP extension',
@@ -1116,6 +1139,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'If set, file upload is also available through a java applet called jumploader without a file size limit set by the browser. It also allows to upload several files in one step.',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Povolit oznámení posuzovateli/schvalovateli',
 'settings_enableNotificationAppRev_desc' => 'Označit pro oznamování posuzovateli/schvalovateli, pokud je přidána nová verze dokumentu.',
 'settings_enableNotificationWorkflow' => '',
@@ -1134,6 +1159,8 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => 'Povolit posouzení/schválení pro přihlášeného uživatele',
 'settings_enableSelfRevApp_desc' => 'Povolte, pokud chcete aktuálně přihlášeného uvést jako posuzovatele/schvalovatele a pro přechody pracovního postupu',
+'settings_enableSessionList' => '',
+'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => 'Volba tématu',
 'settings_enableThemeSelector_desc' => 'Volba témat na přihlašovací stránce.',
 'settings_enableUpdateReceipt' => '',
@@ -1205,6 +1232,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => 'Toto je max. počet dokumentů a složek, kterým bude kontrolováno přístupové právo při rekurzivním počítání objektů. Po jeho překročení bude počet složek a dokumentů odhadnut.',
 'settings_maxSizeForFullText' => '',
 'settings_maxSizeForFullText_desc' => '',
+'settings_maxUploadSize' => '',
+'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => 'Configure more settings. Default login: admin/admin',
 'settings_notfound' => '',
 'settings_Notification' => 'Nastavení upozornění',
@@ -1345,6 +1374,8 @@ URL: [url]',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Uživatel uložen',
 'splash_error_add_to_transmittal' => '',
+'splash_error_rm_download_link' => '',
+'splash_error_send_download_link' => '',
 'splash_folder_edited' => 'Změny složky uloženy',
 'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Neplatné ID složky',
@@ -1352,9 +1383,11 @@ URL: [url]',
 'splash_moved_clipboard' => 'Schránka přenesena do aktuální složky',
 'splash_move_document' => '',
 'splash_move_folder' => '',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => 'Odstraněno ze schránky',
 'splash_rm_attribute' => 'Atribut odstraněn',
 'splash_rm_document' => 'Dokument odstraněn',
+'splash_rm_download_link' => '',
 'splash_rm_folder' => 'Složka smazána',
 'splash_rm_group' => 'Skupina odstraněna',
 'splash_rm_group_member' => 'Člen skupiny odstraněn',
@@ -1362,6 +1395,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Uživatel odstraněn',
 'splash_saved_file' => '',
+'splash_send_download_link' => '',
 'splash_settings_saved' => 'Nastavení uloženo',
 'splash_substituted_user' => 'Zaměněný uživatel',
 'splash_switched_back_user' => 'Přepnuto zpět na původního uživatele',
@@ -1511,6 +1545,7 @@ URL: [url]',
 'use_comment_of_document' => 'Použijte komentář dokumentu',
 'use_default_categories' => 'Use predefined categories',
 'use_default_keywords' => 'Použít předdefinovaná klíčová slova',
+'valid_till' => '',
 'version' => 'Verze',
 'versioning_file_creation' => 'Vytvoření verzování souboru',
 'versioning_file_creation_warning' => 'Pomocí této operace můžete vytvořit soubor obsahující informace o verzování celé složky DMS. Po vytvoření bude každý soubor uložen uvnitř složky dokumentů.',
@@ -1538,6 +1573,7 @@ URL: [url]',
 'workflow_action_name' => 'Název',
 'workflow_editor' => 'Editor pracovního postupu',
 'workflow_group_summary' => 'Přehled skupiny',
+'workflow_has_cycle' => '',
 'workflow_initstate' => 'Počáteční stav',
 'workflow_in_use' => 'Tento pracovní postup je momentálně používán dokumentem.',
 'workflow_layoutdata_saved' => '',

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 (2376), dgrutsch (22)
+//    Translators: Admin (2420), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -56,7 +56,7 @@ URL: [url]',
 'add_approval' => 'Freigabe hinzufügen',
 'add_attrdefgroup' => 'Neue Attributgruppe anlegen',
 'add_document' => 'Dokument anlegen',
-'add_document_link' => 'Verweis hinzufügen',
+'add_document_link' => 'Verknüpfung hinzufügen',
 'add_document_notify' => 'Beobachter zuweisen',
 'add_doc_reviewer_approver_warning' => 'Anmerkung: Dokumente werden automatisch geprüft und als freigegeben markiert, wenn kein Prüfer oder keine Freigabe zugewiesen wird.',
 'add_doc_workflow_warning' => 'Anmerkung: Dokumente werden automatisch freigegeben, wenn kein Workflow gewählt wird.',
@@ -234,6 +234,7 @@ URL: [url]',
 'checkedout_file_has_disappeared' => 'Die Datei des ausgecheckten Dokuments ist nicht mehr vorhanden. Ein Einchecken ist nicht möglich.',
 'checkedout_file_is_unchanged' => 'Die Datei des ausgecheckten Dokuments ist noch unverändert. Das Einchecken ist daher nicht möglich. Wenn Sie keine weiteren Änderungen am Dokument vornehmen möchten, dann setzen Sie den CheckOut-Status zurück.',
 'checkin_document' => 'Einchecken',
+'checkoutpath_does_not_exist' => 'Verzeichnis für das Auschecken von Dokumenten exisitiert nicht',
 'checkout_document' => 'Auschecken',
 'checkout_is_disabled' => 'Auschecken von Dokumenten ist in der Konfiguration ausgeschaltet.',
 'choose_attrdef' => 'Attributdefinition wählen',
@@ -283,6 +284,7 @@ URL: [url]',
 'converter_new_cmd' => 'Kommando',
 '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_warning' => 'Sie möchten den Volltextindex neu erzeugen. Dies kann beträchtlich Zeit in Anspruch nehmen und Gesamtleistung Ihres System beeinträchtigen. Bestätigen Sie bitte diese Operation.',
 'creation_date' => 'Erstellt am',
@@ -348,7 +350,7 @@ Benutzer: [username]',
 'document_infos' => 'Informationen',
 'document_is_checked_out' => 'Das Dokument ist zur Zeit ausgecheckt. Wenn Sie eine neue Version hochladen, werden Sie die ausgecheckte Version nicht mehr einchecken können.',
 'document_is_not_locked' => 'Dieses Dokument ist nicht gesperrt',
-'document_link_by' => 'Verweis erstellt von',
+'document_link_by' => 'Verknüpfung erstellt von',
 'document_link_public' => 'Für alle sichtbar',
 'document_moved_email' => 'Dokument verschoben',
 'document_moved_email_body' => 'Dokument verschoben
@@ -388,6 +390,15 @@ URL: [url]',
 'does_not_expire' => 'Kein Ablaufdatum',
 'does_not_inherit_access_msg' => 'Berechtigungen wieder erben',
 'download' => 'Download',
+'download_links' => 'Download Links',
+'download_link_email_body' => 'Klicken Sie bitte auf den untenstehenden Link, um Version [version] des Dokuments \'[docname]\' herunter zu laden.
+
+[url]
+
+Der Link ist bis zum [valid] gültig.
+
+[comment]',
+'download_link_email_subject' => 'Download-Link',
 'do_object_repair' => 'Repariere alle Ordner und Dokumente.',
 'do_object_setchecksum' => 'Setze Check-Summe',
 'do_object_setfilesize' => 'Setze Dateigröße',
@@ -405,6 +416,7 @@ URL: [url]',
 'dump_creation_warning' => 'Mit dieser Operation können Sie einen Dump der Datenbank erzeugen. Nach der Erstellung wird der Dump im Datenordner Ihres Servers gespeichert.',
 'dump_list' => 'Vorhandene DB dumps',
 'dump_remove' => 'DB dump löschen',
+'duplicates' => 'Duplikate',
 'duplicate_content' => 'Doppelte Dateien',
 'edit' => 'Bearbeiten',
 'edit_attributes' => 'Edit attributes',
@@ -454,7 +466,18 @@ URL: [url]',
 'event_details' => 'Ereignisdetails',
 'exclude_items' => 'Einträge auslassen',
 'expired' => 'abgelaufen',
+'expired_at_date' => 'Abgelaufen am [datetime]',
 'expires' => 'Ablaufdatum',
+'expire_by_date' => 'Ablauf nach Datum',
+'expire_in_1d' => 'Ablauf in 1 Tag',
+'expire_in_1h' => 'Ablauf in 1 Std.',
+'expire_in_1m' => 'Ablauf in 1 Monat',
+'expire_in_1w' => 'Ablauf in 1 Woche',
+'expire_in_1y' => 'Ablauf in 1 Jahr',
+'expire_in_2h' => 'Ablauf in 2 Std.',
+'expire_in_2y' => 'Ablauf in 2 Jahren',
+'expire_today' => 'Ablauf heute',
+'expire_tomorrow' => 'Ablauf morgen',
 'expiry_changed_email' => 'Ablaufdatum geändert',
 'expiry_changed_email_body' => 'Ablaufdatum geändert
 Dokument: [name]
@@ -517,6 +540,7 @@ URL: [url]',
 'fr_FR' => 'Französisch',
 'fullsearch' => 'Volltext',
 'fullsearch_hint' => 'Volltextindex benutzen',
+'fulltextsearch_disabled' => 'Volltext-Index ist ausgeschaltet',
 'fulltext_info' => 'Volltext-Index Info',
 'global_attributedefinitiongroups' => 'Attributgruppen',
 'global_attributedefinitions' => 'Attribute',
@@ -536,6 +560,7 @@ URL: [url]',
 'group_review_summary' => 'Übersicht Gruppenprüfungen',
 'guest_login' => 'Als Gast anmelden',
 'guest_login_disabled' => 'Anmeldung als Gast ist gesperrt.',
+'hash' => 'Hash-Wert',
 'help' => 'Hilfe',
 'home_folder' => 'Heimatordner',
 'hook_name' => 'Name des Aufrufs',
@@ -589,6 +614,7 @@ URL: [url]',
 'invalid_target_folder' => 'Unzulässige Ziel-Ordner Identifikation',
 'invalid_user_id' => 'Unzulässige Benutzernummer',
 'invalid_version' => 'Unzulässige Dokumenten-Version',
+'in_folder' => 'In',
 'in_revision' => 'Erneute Prüfung',
 'in_workflow' => 'im Workflow',
 'is_disabled' => 'Anmeldung sperren',
@@ -634,7 +660,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_to_version' => 'Version',
+'link_to_version' => 'An Version hängen',
 'list_access_rights' => 'Alle Zugriffsrechte auflisten ...',
 'list_contains_no_access_docs' => 'Die Liste enthält weitere Dokumente auf die Sie keinen Zugriff haben und deshalb nicht angezeigt werden.',
 'list_hooks' => 'Liste interne Aufrufe',
@@ -820,6 +846,7 @@ Sollen Sie danach immer noch Problem bei der Anmeldung haben, dann kontaktieren
 'personal_default_keywords' => 'Persönliche Stichwortlisten',
 'pl_PL' => 'Polnisch',
 'possible_substitutes' => 'Vertreter',
+'preset_expires' => 'Fester Ablaufzeitpunkt',
 'preview' => 'Vorschau',
 'preview_converters' => 'Vorschau Dokumentenumwandlung',
 'preview_images' => 'Vorschaubilder',
@@ -1054,6 +1081,7 @@ URL: [url]',
 'select_one' => 'Bitte wählen',
 'select_users' => 'Klicken zur Auswahl eines Benutzers',
 'select_workflow' => 'Workflow auswählen',
+'send_email' => 'E-Mail verschicken',
 'send_test_mail' => 'Sende Test-Email',
 'september' => 'September',
 'sequence' => 'Reihenfolge',
@@ -1061,6 +1089,7 @@ URL: [url]',
 'seq_end' => 'Ans Ende',
 'seq_keep' => 'Beibehalten',
 'seq_start' => 'An den Anfang',
+'sessions' => 'Benutzer Online',
 'settings' => 'Einstellungen',
 'settings_activate_module' => 'Modul aktivieren',
 'settings_activate_php_extension' => 'PHP-Erweiterung aktivieren',
@@ -1097,8 +1126,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => 'Die Lebensdauer des Cookies für die Sitzungsverwaltung. Wenn dieser Wert auf 0 gesetzt wird, dann wird der Cookie beim Schließen des Browsers gelöscht.',
 'settings_coreDir' => 'Core SeedDMS Verzeichnis',
 'settings_coreDir_desc' => 'Pfad zum PEAR-Paket SeedDMS_Core (optional). Lassen Sie diese Einstellung leer, wenn SeedDMS_Core ohnehin von PHP gefunden wird, weil es beispielweise im \'Extra PHP Include-Path\' installiert ist.',
-'settings_createCheckOutDir' => 'Check out Verzeichnis',
-'settings_createCheckOutDir_desc' => 'Dokumentenversionen werden hierhin kopiert, wenn ein Dokument ausgecheckt wird.',
+'settings_createCheckOutDir' => 'Check out Verzeichnis erstellen',
+'settings_createCheckOutDir_desc' => 'Check out Verzeichnis erstellen, wenn es nicht existiert.',
 'settings_createdatabase' => 'Datenbank erzeugen',
 'settings_createdirectory' => 'Verzeichnis erzeugen',
 'settings_currentvalue' => 'Aktueller Wert',
@@ -1166,6 +1195,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Wenn dies gesetzt ist, dann ist ebenfalls der Upload von Dokumenten durch ein java applet mit Namen \'jumploader\' ohne Begrenzung der maximalen Dateigröße möglich. Auch das Hochladen mehrerer Dokumente in einem Schritt wird dadurch ermöglicht. Das Einschalten bewirkt, dass keine http only Cookies mehr gesetzt werden.',
 'settings_enableMenuTasks' => 'Aufgabenliste im Menü',
 'settings_enableMenuTasks_desc' => 'Ein-/Ausschalten des Menüeintrags, der anstehenden Aufgaben des Benutzers enthält. Diese Liste beinhaltet Dokumente die geprüft, freigegeben, usw. werden müssen.',
+'settings_enableMultiUpload' => 'Erlaube Hochladen mehrerer Dateien',
+'settings_enableMultiUpload_desc' => 'Beim Erstellen eines neuen Dokuments können mehrere Dateien in einem Vorgang hochgeladen werden. Jede Datei erzeugt ein neues Dokument.',
 'settings_enableNotificationAppRev' => 'Prűfer/Freigeber benachrichtigen',
 'settings_enableNotificationAppRev_desc' => 'Setzen Sie diese Option, wenn die Prüfer und Freigeber eines Dokuments beim Hochladen einer neuen Version benachrichtigt werden sollen.',
 'settings_enableNotificationWorkflow' => 'Sende Benachrichtigung an Benutzer im nächsten Workflow-Schritt',
@@ -1184,6 +1215,8 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => 'Anwählen, um den Workflow der Wiederholungsprüfung von Dokumenten nach einer einstellbaren Zeit zu ermöglichen.',
 'settings_enableSelfRevApp' => 'Erlaube Prüfung/Freigabe durch angemeldeten Benutzer',
 'settings_enableSelfRevApp_desc' => 'Anwählen, um den aktuell angemeldeten Benutzer in der Liste der Prüfer/Freigeber und für Workflow-Aktionen auswählbar zu machen.',
+'settings_enableSessionList' => 'Liste angemeldeter Benutzer einschalten',
+'settings_enableSessionList_desc' => 'Schaltet die Liste der zur Zeit angemeldeten Benutzer im Menu ein/aus.',
 'settings_enableThemeSelector' => 'Auswahl des Themas',
 'settings_enableThemeSelector_desc' => 'Schaltet das Auswahlmenü für die Themenauswahl in der Anmeldemaske ein oder aus.',
 'settings_enableUpdateReceipt' => 'Erlaube die Änderung einer Empfangsbestätigung',
@@ -1255,6 +1288,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => 'Dies ist die maximale Anzahl der Dokumente und Ordner die auf Zugriffsrechte geprüft werden, wenn rekursiv gezählt wird. Wenn diese Anzahl überschritten wird, wird die Anzahl der Dokumente und Unterordner in der Ordner Ansicht geschätzt.',
 'settings_maxSizeForFullText' => 'Maximale Dateigröße für sofortige Indezierung',
 'settings_maxSizeForFullText_desc' => 'Alle neuen Versionen eines Dokuments, die kleiner als die konfigurierte Dateigröße in Bytes sind, werden sofort indiziert. In allen anderen Fällen werden nur die Metadaten erfasst.',
+'settings_maxUploadSize' => 'Maximale Größe hochzuladener Dateien',
+'settings_maxUploadSize_desc' => 'Dies ist die maximale Größe einer hochzuladenen Datei. Es begrenzt sowohl Dokumentenversionen als auch Anhänge.',
 'settings_more_settings' => 'Weitere Einstellungen. Login mit admin/admin',
 'settings_notfound' => 'Nicht gefunden',
 'settings_Notification' => 'Benachrichtigungen-Einstellungen',
@@ -1395,6 +1430,8 @@ URL: [url]',
 'splash_edit_role' => 'Rolle gespeichert',
 'splash_edit_user' => 'Benutzer gespeichert',
 'splash_error_add_to_transmittal' => 'Fehler beim Hinzufügen zur Dokumentenliste',
+'splash_error_rm_download_link' => 'Fehler beim Löschen des Download-Links',
+'splash_error_send_download_link' => 'Fehler beim Verschicken des Download-Links',
 'splash_folder_edited' => 'Änderungen am Ordner gespeichert',
 'splash_importfs' => '[docs] Dokumente und [folders] Ordner importiert',
 'splash_invalid_folder_id' => 'Ungültige Ordner-ID',
@@ -1402,9 +1439,11 @@ URL: [url]',
 'splash_moved_clipboard' => 'Inhalt der Zwischenablage in aktuellen Ordner verschoben',
 'splash_move_document' => 'Dokument verschoben',
 'splash_move_folder' => 'Ordner verschoben',
+'splash_receipt_update_success' => 'Empfangsbestätigung hinzugefügt',
 'splash_removed_from_clipboard' => 'Aus der Zwischenablage entfernt',
 'splash_rm_attribute' => 'Attribut gelöscht',
 'splash_rm_document' => 'Dokument gelöscht',
+'splash_rm_download_link' => 'Download-Link gelöscht',
 'splash_rm_folder' => 'Ordner gelöscht',
 'splash_rm_group' => 'Gruppe gelöscht',
 'splash_rm_group_member' => 'Mitglied der Gruppe gelöscht',
@@ -1412,6 +1451,7 @@ URL: [url]',
 'splash_rm_transmittal' => 'Dokumentenliste gelöscht',
 'splash_rm_user' => 'Benutzer gelöscht',
 'splash_saved_file' => 'Version gespeichert',
+'splash_send_download_link' => 'Download-Link per E-Mail verschickt.',
 'splash_settings_saved' => 'Einstellungen gesichert',
 'splash_substituted_user' => 'Benutzer gewechselt',
 'splash_switched_back_user' => 'Zum ursprünglichen Benutzer zurückgekehrt',
@@ -1561,6 +1601,7 @@ URL: [url]',
 'use_comment_of_document' => 'Verwende Kommentar des Dokuments',
 'use_default_categories' => 'Kategorievorlagen',
 'use_default_keywords' => 'Stichwortvorlagen',
+'valid_till' => 'Gültig bis',
 'version' => 'Version',
 'versioning_file_creation' => 'Datei-Versionierung',
 'versioning_file_creation_warning' => 'Mit dieser Operation erzeugen Sie pro Dokument eine Datei, die sämtliche Versions-Informationen des Dokuments enthält. Nach Erstellung wird jede Datei im Dokumentenverzeichnis gespeichert. Die erzeugten Dateien sind für den regulären Betrieb nicht erforderlich. Sie können aber von Nutzen sein, wenn der Dokumentenbestand auf ein anderes System übertragen werden soll.',
@@ -1588,6 +1629,7 @@ URL: [url]',
 'workflow_action_name' => 'Name',
 'workflow_editor' => 'Workflow Editor',
 'workflow_group_summary' => 'Gruppenübersicht',
+'workflow_has_cycle' => 'Workflow hat Zyklus',
 'workflow_initstate' => 'Initialer Status',
 'workflow_in_use' => 'Dieser Workflow wird zur Zeit noch von einem Dokument verwendet.',
 'workflow_layoutdata_saved' => 'Layout-Daten gespeichert',

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 (215)
+//    Translators: Admin (226)
 
 $text = array(
 '2_factor_auth' => '',
@@ -166,7 +166,7 @@ $text = array(
 'backup_remove' => '',
 'backup_tools' => 'Εργαλεία εφεδρικής καταγραφής',
 'between' => 'μεταξύ',
-'bg_BG' => '',
+'bg_BG' => 'Βουλγάρικα',
 'browse' => '',
 'calendar' => 'Ημερολόγιο',
 'calendar_week' => 'Εβδομάδα',
@@ -187,14 +187,14 @@ $text = array(
 'category_info' => '',
 'category_in_use' => 'Η Κατηγορία αυτή είναι σε χρήση.',
 'category_noname' => 'Δεν δόθηκε όνομα κατηγορίας.',
-'ca_ES' => '',
+'ca_ES' => 'Καταλανικά',
 'change_assignments' => '',
 'change_password' => 'Αλλαγή κωδικού',
 'change_password_message' => 'Ο κωδικός σας έχει αλλάξει.',
 'change_recipients' => '',
 'change_revisors' => '',
 'change_status' => '',
-'charts' => '',
+'charts' => 'Διαγράμματα',
 'chart_docsaccumulated_title' => 'Αριθμός Εγγράφων',
 'chart_docspercategory_title' => 'Έγγραφα κατά κατηγορία',
 'chart_docspermimetype_title' => '',
@@ -207,12 +207,13 @@ $text = array(
 'checkedout_file_has_disappeared' => '',
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
 'choose_attrdef' => '',
 'choose_attrdefgroup' => '',
 'choose_category' => 'Επιλέξτε',
-'choose_group' => '',
+'choose_group' => 'Επιλέξτε Ομάδα',
 'choose_role' => '',
 'choose_target_category' => 'Επιλογή κατηγορίας',
 'choose_target_document' => 'Επιλογή εγγράφου',
@@ -226,7 +227,7 @@ $text = array(
 'clear_cache' => '',
 'clear_clipboard' => '',
 'clear_password' => '',
-'clipboard' => '',
+'clipboard' => 'Πρόχειρο',
 'close' => 'Κλέισιμο',
 'command' => '',
 'comment' => 'Σχόλιο',
@@ -256,9 +257,10 @@ $text = array(
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
+'create_download_link' => '',
 'create_fulltext_index' => '',
 'create_fulltext_index_warning' => '',
-'creation_date' => '',
+'creation_date' => 'Δημιουργήθηκε',
 'cs_CZ' => '',
 'current_password' => '',
 'current_quota' => '',
@@ -331,6 +333,9 @@ $text = array(
 'does_not_expire' => '',
 'does_not_inherit_access_msg' => '',
 'download' => '',
+'download_links' => '',
+'download_link_email_body' => '',
+'download_link_email_subject' => '',
 'do_object_repair' => '',
 'do_object_setchecksum' => '',
 'do_object_setfilesize' => '',
@@ -338,7 +343,7 @@ $text = array(
 'draft' => '',
 'draft_pending_approval' => '',
 'draft_pending_review' => '',
-'drag_icon_here' => '',
+'drag_icon_here' => 'Σείρτε την εικόνα του φακέλου ή το έγγραφο εδώ!',
 'dropfolderdir_missing' => '',
 'dropfolder_file' => '',
 'dropfolder_folder' => '',
@@ -348,6 +353,7 @@ $text = array(
 'dump_creation_warning' => '',
 'dump_list' => '',
 'dump_remove' => '',
+'duplicates' => '',
 'duplicate_content' => '',
 'edit' => '',
 'edit_attributes' => '',
@@ -359,11 +365,11 @@ $text = array(
 'edit_event' => '',
 'edit_existing_access' => '',
 'edit_existing_attribute_groups' => '',
-'edit_existing_notify' => '',
-'edit_folder_access' => '',
+'edit_existing_notify' => 'Επεξεργασία λίστας ειδοποιήσεων',
+'edit_folder_access' => 'Επεξεργασία πρόσβασης',
 'edit_folder_attrdefgrp' => '',
 'edit_folder_notify' => '',
-'edit_folder_props' => '',
+'edit_folder_props' => 'Επεξεργασία φακέλου',
 'edit_group' => '',
 'edit_online' => '',
 'edit_transmittal_props' => '',
@@ -397,7 +403,18 @@ $text = array(
 'event_details' => '',
 'exclude_items' => '',
 'expired' => 'Έχει λήξει',
+'expired_at_date' => '',
 'expires' => 'Λήγει',
+'expire_by_date' => '',
+'expire_in_1d' => '',
+'expire_in_1h' => '',
+'expire_in_1m' => '',
+'expire_in_1w' => '',
+'expire_in_1y' => '',
+'expire_in_2h' => '',
+'expire_in_2y' => '',
+'expire_today' => '',
+'expire_tomorrow' => '',
 'expiry_changed_email' => 'Η ημερομηνία λήξης έχει αλλάξει',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
@@ -436,6 +453,7 @@ $text = array(
 'fr_FR' => 'French/Γαλλικά',
 'fullsearch' => 'Πλήρης αναζήτηση (full text)',
 'fullsearch_hint' => '',
+'fulltextsearch_disabled' => '',
 'fulltext_info' => '',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Ιδιότητες',
@@ -455,6 +473,7 @@ $text = array(
 'group_review_summary' => '',
 'guest_login' => '',
 'guest_login_disabled' => '',
+'hash' => '',
 'help' => 'Βοήθεια',
 'home_folder' => '',
 'hook_name' => '',
@@ -476,7 +495,7 @@ $text = array(
 'index_converters' => '',
 'index_done' => '',
 'index_error' => '',
-'index_folder' => '',
+'index_folder' => 'Ταξινόμηση φακέλου',
 'index_pending' => '',
 'index_waiting' => '',
 'individuals' => 'Άτομα',
@@ -508,6 +527,7 @@ $text = array(
 'invalid_target_folder' => '',
 'invalid_user_id' => '',
 'invalid_version' => '',
+'in_folder' => '',
 'in_revision' => '',
 'in_workflow' => '',
 'is_disabled' => '',
@@ -713,6 +733,7 @@ URL: [url]',
 'personal_default_keywords' => '',
 'pl_PL' => '',
 'possible_substitutes' => '',
+'preset_expires' => '',
 'preview' => '',
 'preview_converters' => '',
 'preview_images' => '',
@@ -871,6 +892,7 @@ URL: [url]',
 'select_one' => '',
 'select_users' => '',
 'select_workflow' => '',
+'send_email' => '',
 'send_test_mail' => '',
 'september' => 'Σεπτέμβριος',
 'sequence' => 'Σειρά',
@@ -878,6 +900,7 @@ URL: [url]',
 'seq_end' => 'Στο τέλος',
 'seq_keep' => 'Διατήρηση θέσης',
 'seq_start' => 'Τοποθέτηση στην αρχή',
+'sessions' => '',
 'settings' => 'Ρυθμίσεις',
 'settings_activate_module' => '',
 'settings_activate_php_extension' => '',
@@ -983,6 +1006,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => '',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',
@@ -1001,6 +1026,8 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
+'settings_enableSessionList' => '',
+'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => '',
 'settings_enableThemeSelector_desc' => '',
 'settings_enableUpdateReceipt' => '',
@@ -1072,6 +1099,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
 'settings_maxSizeForFullText_desc' => '',
+'settings_maxUploadSize' => '',
+'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => '',
 'settings_notfound' => '',
 'settings_Notification' => '',
@@ -1212,6 +1241,8 @@ URL: [url]',
 'splash_edit_role' => '',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
+'splash_error_rm_download_link' => '',
+'splash_error_send_download_link' => '',
 'splash_folder_edited' => '',
 'splash_importfs' => '',
 'splash_invalid_folder_id' => '',
@@ -1219,9 +1250,11 @@ URL: [url]',
 'splash_moved_clipboard' => '',
 'splash_move_document' => '',
 'splash_move_folder' => '',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => '',
 'splash_rm_attribute' => '',
 'splash_rm_document' => '',
+'splash_rm_download_link' => '',
 'splash_rm_folder' => '',
 'splash_rm_group' => '',
 'splash_rm_group_member' => '',
@@ -1229,6 +1262,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
 'splash_saved_file' => '',
+'splash_send_download_link' => '',
 'splash_settings_saved' => '',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
@@ -1369,6 +1403,7 @@ URL: [url]',
 'use_comment_of_document' => '',
 'use_default_categories' => '',
 'use_default_keywords' => '',
+'valid_till' => '',
 'version' => 'Έκδοση',
 'versioning_file_creation' => '',
 'versioning_file_creation_warning' => '',
@@ -1391,6 +1426,7 @@ URL: [url]',
 'workflow_action_name' => 'Όνομα',
 'workflow_editor' => '',
 'workflow_group_summary' => '',
+'workflow_has_cycle' => '',
 'workflow_initstate' => '',
 'workflow_in_use' => 'This workflow is currently used by documents.',
 'workflow_layoutdata_saved' => '',

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 (1503), dgrutsch (9), netixw (14)
+//    Translators: Admin (1545), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -234,6 +234,7 @@ URL: [url]',
 'checkedout_file_has_disappeared' => 'The file of the checked out document has disappeared. Check in will not be possible.',
 'checkedout_file_is_unchanged' => 'The file of the checked out document is still unchanged. Check in will not be possible. If do not plan any modifications, you can reset the check out status.',
 'checkin_document' => 'Check In',
+'checkoutpath_does_not_exist' => 'Checkout path does not exists',
 'checkout_document' => 'Check out',
 'checkout_is_disabled' => 'Check out of documents is disabled in the configuration.',
 'choose_attrdef' => 'Please choose attribute definition',
@@ -283,6 +284,7 @@ URL: [url]',
 'converter_new_cmd' => 'Command',
 'converter_new_mimetype' => 'New mimetype',
 'copied_to_checkout_as' => 'File copied to checkout space as \'[filename]\' on [date]',
+'create_download_link' => 'Create download link',
 'create_fulltext_index' => 'Create fulltext index',
 'create_fulltext_index_warning' => 'You are about to recreate the fulltext index. This can take a considerable amount of time and reduce your overall system performance. If you really want to recreate the index, please confirm your operation.',
 'creation_date' => 'Created',
@@ -388,6 +390,16 @@ URL: [url]',
 'does_not_expire' => 'Does not expire',
 'does_not_inherit_access_msg' => 'Inherit access',
 'download' => 'Download',
+'download_links' => 'Download links',
+'download_link_email_body' => 'Click on the link below to download the version [version] of document
+\'[docname]\'.
+
+[url]
+
+The link is valid until [valid].
+
+[comment]',
+'download_link_email_subject' => 'Download link',
 'do_object_repair' => 'Repair all folders and documents.',
 'do_object_setchecksum' => 'Set checksum',
 'do_object_setfilesize' => 'Set file size',
@@ -405,6 +417,7 @@ URL: [url]',
 'dump_creation_warning' => 'With this operation you can create a dump file of your database content. After the creation the dump file will be saved in the data folder of your server.',
 'dump_list' => 'Existings dump files',
 'dump_remove' => 'Remove dump file',
+'duplicates' => 'Duplicates',
 'duplicate_content' => 'Duplicate Content',
 'edit' => 'Edit',
 'edit_attributes' => 'Edit attributes',
@@ -454,7 +467,18 @@ URL: [url]',
 'event_details' => 'Event details',
 'exclude_items' => 'Exclude items',
 'expired' => 'Expired',
+'expired_at_date' => 'Expired at [datetime]',
 'expires' => 'Expires',
+'expire_by_date' => 'Expires by date',
+'expire_in_1d' => 'Expires in 1 day',
+'expire_in_1h' => 'Expires in 1h',
+'expire_in_1m' => 'Expires in 1 month',
+'expire_in_1w' => 'Expires in 1 week',
+'expire_in_1y' => 'Expires in 1 year',
+'expire_in_2h' => 'Expires in 2h',
+'expire_in_2y' => 'Expires in 2 years',
+'expire_today' => 'Expires today',
+'expire_tomorrow' => 'Expires tomorrow',
 'expiry_changed_email' => 'Expiry date changed',
 'expiry_changed_email_body' => 'Expiry date changed
 Document: [name]
@@ -517,6 +541,7 @@ URL: [url]',
 'fr_FR' => 'French',
 'fullsearch' => 'Full text search',
 'fullsearch_hint' => 'Use fulltext index',
+'fulltextsearch_disabled' => 'Fulltext index is disabled',
 'fulltext_info' => 'Fulltext index info',
 'global_attributedefinitiongroups' => 'Attribute groups',
 'global_attributedefinitions' => 'Attributes',
@@ -536,6 +561,7 @@ URL: [url]',
 'group_review_summary' => 'Group review summary',
 'guest_login' => 'Login as guest',
 'guest_login_disabled' => 'Guest login is disabled.',
+'hash' => 'Hash',
 'help' => 'Help',
 'home_folder' => 'Home folder',
 'hook_name' => 'Name of hook',
@@ -589,6 +615,7 @@ URL: [url]',
 'invalid_target_folder' => 'Invalid Target Folder ID',
 'invalid_user_id' => 'Invalid User ID',
 'invalid_version' => 'Invalid Document Version',
+'in_folder' => 'In',
 'in_revision' => 'In revision',
 'in_workflow' => 'In workflow',
 'is_disabled' => 'Disable account',
@@ -634,7 +661,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_to_version' => 'Version',
+'link_to_version' => 'Attach to version',
 'list_access_rights' => 'List all access rights ...',
 'list_contains_no_access_docs' => 'The list contains more documents you have no access to and are not displayed.',
 'list_hooks' => 'List hooks',
@@ -821,6 +848,7 @@ If you have still problems to login, then please contact your administrator.',
 'personal_default_keywords' => 'Personal keywordlists',
 'pl_PL' => 'Polish',
 'possible_substitutes' => 'Substitutes',
+'preset_expires' => 'Preset expiration',
 'preview' => 'Preview',
 'preview_converters' => 'Preview document conversion',
 'preview_images' => 'Preview images',
@@ -1048,6 +1076,7 @@ URL: [url]',
 'select_one' => 'Select one',
 'select_users' => 'Click to select users',
 'select_workflow' => 'Select workflow',
+'send_email' => 'Send email',
 'send_test_mail' => 'Send test mail',
 'september' => 'September',
 'sequence' => 'Sequence',
@@ -1055,6 +1084,7 @@ URL: [url]',
 'seq_end' => 'At the end',
 'seq_keep' => 'Keep Position',
 'seq_start' => 'First position',
+'sessions' => 'Users online',
 'settings' => 'Settings',
 'settings_activate_module' => 'Activate module',
 'settings_activate_php_extension' => 'Activate PHP extension',
@@ -1091,8 +1121,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => 'The life time of a cookie in seconds. If set to 0 the cookie will be removed when the browser is closed.',
 'settings_coreDir' => 'Core SeedDMS directory',
 'settings_coreDir_desc' => 'Path to SeedDMS_Core (optional). Leave this empty if you have installed SeedDMS_Core at a place where it can be found by PHP, e.g. Extra PHP Include-Path',
-'settings_createCheckOutDir' => 'Check out directory',
-'settings_createCheckOutDir_desc' => 'Document version will be copied in this directory, when a document is checked out.',
+'settings_createCheckOutDir' => 'Create check out directory',
+'settings_createCheckOutDir_desc' => 'Create checkout dir if it does not exists',
 'settings_createdatabase' => 'Create database tables',
 'settings_createdirectory' => 'Create directory',
 'settings_currentvalue' => 'Current value',
@@ -1160,6 +1190,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'If set, file upload is also available through a java applet called jumploader without a file size limit set by the browser. It also allows to upload several files in one step. Turning this on will turn off http only cookies.',
 'settings_enableMenuTasks' => 'Enable task list in menu',
 'settings_enableMenuTasks_desc' => 'Enable/Disable the menu item which contains all tasks for the user. This contains documents, that need to be reviewed, approved, etc.',
+'settings_enableMultiUpload' => 'Allow upload of multiple files',
+'settings_enableMultiUpload_desc' => 'When creating a new document, multiple files can be uploaded. Each will create a new document.',
 'settings_enableNotificationAppRev' => 'Enable reviewer/approver notification',
 'settings_enableNotificationAppRev_desc' => 'Check to send a notification to the reviewer/approver when a new document version is added',
 'settings_enableNotificationWorkflow' => 'Send notification to users in next workflow transition',
@@ -1178,6 +1210,8 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => 'Enable, to be able to run the workflow for revising a document after a given period of time.',
 'settings_enableSelfRevApp' => 'Allow review/approval for logged in user',
 'settings_enableSelfRevApp_desc' => 'Enable this if you want the currently logged in user to be listed as reviewers/approvers and for workflow transitions.',
+'settings_enableSessionList' => 'Enable list of users online',
+'settings_enableSessionList_desc' => 'Enable list of currently logged in users in menu.',
 'settings_enableThemeSelector' => 'Theme selection',
 'settings_enableThemeSelector_desc' => 'Turns on/off the theme selector on the login page.',
 'settings_enableUpdateReceipt' => 'Allow editing of existing reception',
@@ -1249,6 +1283,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => 'This is the maximum number of documents or folders that will be checked for access rights, when recursively counting objects. If this number is exceeded, the number of documents and folders in the folder view will be estimated.',
 'settings_maxSizeForFullText' => 'Maximum filesize for instant indexing',
 'settings_maxSizeForFullText_desc' => 'All new document version smaller than the configured size will be fully indexed right after uploading. In all other cases only the metadata will be indexed.',
+'settings_maxUploadSize' => 'Maxium size for uploaded files',
+'settings_maxUploadSize_desc' => 'This is the maximum size for uploaded files. It will take affect for document versions and attachments.',
 'settings_more_settings' => 'Configure more settings. Default login: admin/admin',
 'settings_notfound' => 'Not found',
 'settings_Notification' => 'Notification settings',
@@ -1389,6 +1425,8 @@ URL: [url]',
 'splash_edit_role' => 'Role saved',
 'splash_edit_user' => 'User saved',
 'splash_error_add_to_transmittal' => 'Error while adding document to transmittal',
+'splash_error_rm_download_link' => 'Error when removing download link',
+'splash_error_send_download_link' => 'Error while sending download link',
 'splash_folder_edited' => 'Save folder changes',
 'splash_importfs' => 'Imported [docs] documents and [folders] folders',
 'splash_invalid_folder_id' => 'Invalid folder ID',
@@ -1396,9 +1434,11 @@ URL: [url]',
 'splash_moved_clipboard' => 'Clipboard moved into current folder',
 'splash_move_document' => 'Document moved',
 'splash_move_folder' => 'Folder moved',
+'splash_receipt_update_success' => 'Reception added successfully',
 'splash_removed_from_clipboard' => 'Removed from clipboard',
 'splash_rm_attribute' => 'Attribute removed',
 'splash_rm_document' => 'Document removed',
+'splash_rm_download_link' => 'Removed download link',
 'splash_rm_folder' => 'Folder deleted',
 'splash_rm_group' => 'Group removed',
 'splash_rm_group_member' => 'Member of group removed',
@@ -1406,6 +1446,7 @@ URL: [url]',
 'splash_rm_transmittal' => 'Transmittal deleted',
 'splash_rm_user' => 'User removed',
 'splash_saved_file' => 'Version saved',
+'splash_send_download_link' => 'Download link sent by email.',
 'splash_settings_saved' => 'Settings saved',
 'splash_substituted_user' => 'Substituted user',
 'splash_switched_back_user' => 'Switched back to original user',
@@ -1555,6 +1596,7 @@ URL: [url]',
 'use_comment_of_document' => 'Use comment of document',
 'use_default_categories' => 'Use predefined categories',
 'use_default_keywords' => 'Use predefined keywords',
+'valid_till' => 'Valid till',
 'version' => 'Version',
 'versioning_file_creation' => 'Versioning file creation',
 'versioning_file_creation_warning' => 'With this operation you can create a file for each document containing the versioning information of that document. After the creation every file will be saved inside the document folder. Those files are not needed for the regular operation of the dms, but could be of value if the complete repository shall be transferred to an other system.',
@@ -1582,6 +1624,7 @@ URL: [url]',
 'workflow_action_name' => 'Name',
 'workflow_editor' => 'Workflow Editor',
 'workflow_group_summary' => 'Group summary',
+'workflow_has_cycle' => 'Workflow has cycle',
 'workflow_initstate' => 'Initial state',
 'workflow_in_use' => 'This workflow is currently used by documents.',
 'workflow_layoutdata_saved' => 'Layout data saved',

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 (1009), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1021), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -170,10 +170,10 @@ URL: [url]',
 'attr_malformed_date' => '',
 'attr_malformed_email' => '',
 'attr_malformed_float' => '',
-'attr_malformed_int' => '',
+'attr_malformed_int' => 'El atributo valor \'[value]\' del atributo \'[attrname]\' no es un número entero válido',
 'attr_malformed_url' => '',
 'attr_max_values' => '',
-'attr_min_values' => '',
+'attr_min_values' => 'No se alcanza el número mínimo de valores requeridos para el campo [attrname]',
 'attr_not_in_valueset' => '',
 'attr_no_regex_match' => 'El valor del atributo no concuerda con la expresión regular',
 'attr_validation_error' => '',
@@ -229,6 +229,7 @@ URL: [url]',
 'checkedout_file_has_disappeared' => '',
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
 'choose_attrdef' => 'Por favor, seleccione definición de atributo',
@@ -250,7 +251,7 @@ URL: [url]',
 'clear_password' => '',
 'clipboard' => 'Portapapeles',
 'close' => 'Cerrar',
-'command' => '',
+'command' => 'Comando',
 'comment' => 'Comentarios',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Comentario de la versión actual',
@@ -278,6 +279,7 @@ URL: [url]',
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
+'create_download_link' => '',
 'create_fulltext_index' => 'Crear índice de texto completo',
 'create_fulltext_index_warning' => 'Usted va a regenerar el índice te texto completo. Esto puede tardar un tiempo considerable y consumir capacidad de su equipo. Si realmente quiere regenerar el índice, por favor confirme la operación.',
 'creation_date' => 'Creación',
@@ -304,7 +306,7 @@ URL: [url]',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
 'document' => 'Documento',
-'documentcontent' => '',
+'documentcontent' => 'Contenido del documento',
 'documents' => 'Documentos',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documentos en proceso',
@@ -383,6 +385,9 @@ URL: [url]',
 'does_not_expire' => 'No caduca',
 'does_not_inherit_access_msg' => 'heredar el acceso',
 'download' => 'Descargar',
+'download_links' => '',
+'download_link_email_body' => '',
+'download_link_email_subject' => '',
 'do_object_repair' => 'Reparar todas las carpetas y documentos.',
 'do_object_setchecksum' => 'Set checksum',
 'do_object_setfilesize' => 'Asignar tamaño de fichero',
@@ -400,6 +405,7 @@ URL: [url]',
 'dump_creation_warning' => 'Con esta operación se creará un volcado a fichero del contenido de la base de datos. Después de la creación del volcado el fichero se guardará en la carpeta de datos de su servidor.',
 'dump_list' => 'Ficheros de volcado existentes',
 'dump_remove' => 'Eliminar fichero de volcado',
+'duplicates' => '',
 'duplicate_content' => 'Contenido duplicado',
 'edit' => 'editar',
 'edit_attributes' => 'Editar atributos',
@@ -449,7 +455,18 @@ URL: [url]',
 'event_details' => 'Detalles del evento',
 'exclude_items' => 'Registros excluidos',
 'expired' => 'Caducado',
+'expired_at_date' => '',
 'expires' => 'Caduca',
+'expire_by_date' => '',
+'expire_in_1d' => '',
+'expire_in_1h' => '',
+'expire_in_1m' => '',
+'expire_in_1w' => '',
+'expire_in_1y' => '',
+'expire_in_2h' => '',
+'expire_in_2y' => '',
+'expire_today' => '',
+'expire_tomorrow' => '',
 'expiry_changed_email' => 'Fecha de caducidad modificada',
 'expiry_changed_email_body' => 'Fecha de caducidad modificada
 Documento: [name]
@@ -512,6 +529,7 @@ URL: [url]',
 'fr_FR' => 'Frances',
 'fullsearch' => 'Búsqueda en texto completo',
 'fullsearch_hint' => 'Utilizar índice de texto completo',
+'fulltextsearch_disabled' => '',
 'fulltext_info' => 'Información de índice de texto completo',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Definición de atributos',
@@ -531,6 +549,7 @@ URL: [url]',
 'group_review_summary' => 'Resumen del grupo revisor',
 'guest_login' => 'Acceso como invitado',
 'guest_login_disabled' => 'La cuenta de invitado está deshabilitada.',
+'hash' => '',
 'help' => 'Ayuda',
 'home_folder' => '',
 'hook_name' => '',
@@ -584,6 +603,7 @@ URL: [url]',
 'invalid_target_folder' => 'ID de carpeta destino no válido',
 'invalid_user_id' => 'ID de usuario no válido',
 'invalid_version' => 'Versión de documento no válida',
+'in_folder' => 'En el directorio',
 'in_revision' => '',
 'in_workflow' => 'En flujo de trabajo',
 'is_disabled' => 'Deshabilitar cuenta',
@@ -816,6 +836,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado
 'personal_default_keywords' => 'Listas de palabras clave personales',
 'pl_PL' => 'Polaco',
 'possible_substitutes' => '',
+'preset_expires' => '',
 'preview' => '',
 'preview_converters' => '',
 'preview_images' => '',
@@ -1010,13 +1031,15 @@ URL: [url]',
 'select_one' => 'Seleccionar uno',
 'select_users' => 'Haga Click para seleccionar usuarios',
 'select_workflow' => 'Selecionar Flujo de Trabajo',
-'send_test_mail' => '',
+'send_email' => '',
+'send_test_mail' => 'Enviar correo de prueba',
 'september' => 'Septiembre',
 'sequence' => 'Secuencia',
 'seq_after' => 'Después "[prevname]"',
 'seq_end' => 'Al final',
 'seq_keep' => 'Mantener posición',
 'seq_start' => 'Primera posición',
+'sessions' => '',
 'settings' => 'Configuración',
 'settings_activate_module' => 'Activar módulo',
 'settings_activate_php_extension' => 'Activar extensión PHP',
@@ -1027,10 +1050,10 @@ URL: [url]',
 'settings_advancedAcl_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Módulo Reescritura',
 'settings_Authentication' => 'Configuración de autenticación',
-'settings_autoLoginUser' => '',
+'settings_autoLoginUser' => 'Acceso automatico',
 'settings_autoLoginUser_desc' => '',
 'settings_available_languages' => 'Idiomas disponibles',
-'settings_available_languages_desc' => '',
+'settings_available_languages_desc' => 'Unicamente los lenguages seleccionados seran cargados y mostrados en el selector de lenguages. El lenguage por defecto siempre sera cargado',
 'settings_backupDir' => '',
 'settings_backupDir_desc' => '',
 'settings_cacheDir' => 'Carpeta caché',
@@ -1048,7 +1071,7 @@ URL: [url]',
 'settings_contentOffsetDir' => 'Carpeta de contenidos de desplazamiento',
 'settings_contentOffsetDir_desc' => 'Para tratar las limitaciones del sistema de ficheros subyacentes, se ha ideado una estructura de carpetas dentro de la carpeta de contenido. Esto requiere una carpeta base desde la que comenzar. Normalmente puede dejar este valor por defecto, 1048576, pero puede ser cualquier número o cadena que no exista ya dentro de ella (carpeta de contenido).',
 'settings_convertToPdf' => 'Convertir documento en PDF para pervisualización',
-'settings_convertToPdf_desc' => '',
+'settings_convertToPdf_desc' => 'Si un documento no puede ser visualizado nativamente en el navegador, una versión convertida a PDF sera mostrada.',
 'settings_cookieLifetime' => 'Tiempo de vida de las cookies',
 'settings_cookieLifetime_desc' => 'Tiempo de vida de las cookies en segundos. Si asigna 0 la cookie será eliminada cuando el navegador se cierre.',
 'settings_coreDir' => 'Carpeta de SeedDMS Core',
@@ -1070,8 +1093,8 @@ URL: [url]',
 'settings_dbUser' => 'Nombre de usuario',
 'settings_dbUser_desc' => 'Nombre de usuario de acceso a su base de datos introducido durante el proceso de instalación. No edite este campo a menos que sea necesario, por ejemplo si la base de datos se transfiere a un nuevo servidor.',
 'settings_dbVersion' => 'Esquema de base de datos demasiado antiguo',
-'settings_defaultAccessDocs' => '',
-'settings_defaultAccessDocs_desc' => '',
+'settings_defaultAccessDocs' => 'Acceso por defecto de nuevos documentos',
+'settings_defaultAccessDocs_desc' => 'Cuando un nuevo documento sea creado, este sera el acceso por defecto.',
 'settings_defaultSearchMethod' => 'Método de búsqueda por defecto',
 'settings_defaultSearchMethod_desc' => 'Método de búsqueda por defecto, cuando se inicia una búsqueda mediante el formulario en el menú principal',
 'settings_defaultSearchMethod_valdatabase' => 'base de datos',
@@ -1122,6 +1145,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Si se habilita, la carga de ficheros también estará disponible a través de un applet java llamado jumploader, sin límite de tamaño de fichero fijado por el navegador. También permite la carga de múltiples ficheros de una sola vez.',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Habilitar notificación a revisor/aprobador',
 'settings_enableNotificationAppRev_desc' => 'Habilitar para enviar notificación a revisor/aprobador cuando se añade una nueva versión de documento',
 'settings_enableNotificationWorkflow' => 'Enviar notificación a los usuarios en la siguiente transacción del flujo.',
@@ -1140,11 +1165,13 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => 'Permitir al usuario identificado revisar/aprobar.',
 'settings_enableSelfRevApp_desc' => 'Habilitar esto si quiere que el usuario identificado sea listado como revisor/aprobador y para las transiciones del flujo de trabajo.',
+'settings_enableSessionList' => '',
+'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => 'Selección de temas (skins)',
 'settings_enableThemeSelector_desc' => 'Habilitar/deshabilitar la selección de temas en la página de login',
 'settings_enableUpdateReceipt' => '',
 'settings_enableUpdateReceipt_desc' => '',
-'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp' => 'Permitir edición de revisión/aprobación existente',
 'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => 'Habilitar imágenes de usuario',
 'settings_enableUserImage_desc' => 'Habilitar imágenes de usuario',
@@ -1211,6 +1238,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => 'Este es el número máximo de documentos o carpetas que pueden ser revisados con derechos de acceso, contando objetos recursivos. Si este número es excedido , el número de carpetas y documentos en la vista de carpeta será estimado.',
 'settings_maxSizeForFullText' => 'Tamaño máximo del fichero para el indexado inmediato',
 'settings_maxSizeForFullText_desc' => '',
+'settings_maxUploadSize' => '',
+'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => 'Configure más parámetros. Acceso por defecto: admin/admin',
 'settings_notfound' => 'No encontrado',
 'settings_Notification' => 'Parámetros de notificación',
@@ -1351,6 +1380,8 @@ URL: [url]',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Usuario guardado',
 'splash_error_add_to_transmittal' => '',
+'splash_error_rm_download_link' => '',
+'splash_error_send_download_link' => '',
 'splash_folder_edited' => 'Cambios a la carpeta guardados',
 'splash_importfs' => '',
 'splash_invalid_folder_id' => 'ID de carpeta inválido',
@@ -1358,9 +1389,11 @@ URL: [url]',
 'splash_moved_clipboard' => 'Portapapeles movido a la carpeta actual',
 'splash_move_document' => '',
 'splash_move_folder' => '',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => 'Eliminado del portapapeles',
 'splash_rm_attribute' => 'Atributo eliminado',
 'splash_rm_document' => 'Documento eliminado',
+'splash_rm_download_link' => '',
 'splash_rm_folder' => 'Carpeta eliminada',
 'splash_rm_group' => 'Grupo eliminado',
 'splash_rm_group_member' => 'Miembro eliminado del grupo',
@@ -1368,6 +1401,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Usuario eliminado',
 'splash_saved_file' => '',
+'splash_send_download_link' => '',
 'splash_settings_saved' => 'Configuración guardada',
 'splash_substituted_user' => 'Usuario sustituido',
 'splash_switched_back_user' => 'Cambió de nuevo al usuario original',
@@ -1517,6 +1551,7 @@ URL: [url]',
 'use_comment_of_document' => 'Usar comentario del documento',
 'use_default_categories' => 'Utilizar categorías predefinidas',
 'use_default_keywords' => 'Utilizar palabras claves por defecto',
+'valid_till' => '',
 'version' => 'Versión',
 'versioning_file_creation' => 'Creación de fichero de versiones',
 'versioning_file_creation_warning' => 'Con esta operación usted puede crear un fichero que contenga la información de versiones de una carpeta del DMS completa. Después de la creación todos los ficheros se guardarán en la carpeta de documentos.',
@@ -1544,6 +1579,7 @@ URL: [url]',
 'workflow_action_name' => 'Nombre',
 'workflow_editor' => 'Editor de Flujo de Trabajo',
 'workflow_group_summary' => 'Resumen de Grupo',
+'workflow_has_cycle' => '',
 'workflow_initstate' => 'Estado Inicial',
 'workflow_in_use' => 'Este flujo de trabajo esta siendo usado por documentos.',
 'workflow_layoutdata_saved' => '',

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 (1060), jeromerobert (50), lonnnew (9), Oudiceval (182)
+//    Translators: Admin (1062), jeromerobert (50), lonnnew (9), Oudiceval (250)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -234,11 +234,12 @@ URL: [url]',
 'checkedout_file_has_disappeared' => 'Le fichier du document bloqué n’existe plus. Le déblocage est impossible.',
 'checkedout_file_is_unchanged' => 'Le fichier du document bloqué est inchangé. Le déblocage n’est pas possible. Si vous ne souhaitez pas apporter de modifications, désactivez le blocage.',
 'checkin_document' => 'Débloquer (check-in)',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => 'Bloquer (check-out)',
 'checkout_is_disabled' => 'Le blocage (check-out) de documents est désactivé dans la configuration.',
 'choose_attrdef' => 'Choisissez une définition d\'attribut',
 'choose_attrdefgroup' => '',
-'choose_category' => 'SVP choisir',
+'choose_category' => 'Sélectionnez une catégorie',
 'choose_group' => 'Choisir un groupe',
 'choose_role' => '',
 'choose_target_category' => 'Choisir une catégorie',
@@ -283,6 +284,7 @@ URL: [url]',
 'converter_new_cmd' => 'Commande',
 'converter_new_mimetype' => 'Nouveau type MIME',
 'copied_to_checkout_as' => 'Fichier copié dans l’espace de blocage en tant que « [filename] » ([date])',
+'create_download_link' => '',
 'create_fulltext_index' => 'Créer un index de recherche plein texte',
 'create_fulltext_index_warning' => 'Vous allez recréer l\'index de recherche plein texte. Cela peut prendre un temps considérable et réduire les performances de votre système dans son ensemble. Si vous voulez vraiment recréer l\'index, merci de confirmer votre opération.',
 'creation_date' => 'Créé le',
@@ -388,6 +390,16 @@ URL: [url]',
 'does_not_expire' => 'N\'expire jamais',
 'does_not_inherit_access_msg' => 'Accès hérité',
 'download' => 'Téléchargement',
+'download_links' => 'Liens de téléchargement',
+'download_link_email_body' => 'Cliquez sur le lien suivant pour télécharger la version [version] du document
+« [docname] ».
+
+[url]
+
+Le lien est valide jusqu’au [valid].
+
+[comment]',
+'download_link_email_subject' => '',
 'do_object_repair' => 'Réparer tous les dossiers et documents.',
 'do_object_setchecksum' => 'Définir checksum',
 'do_object_setfilesize' => 'Définir la taille du fichier',
@@ -405,6 +417,7 @@ URL: [url]',
 'dump_creation_warning' => 'Avec cette opération, vous pouvez créer une sauvegarde du contenu de votre base de données. Après la création, le fichier de sauvegarde sera sauvegardé dans le dossier de données de votre serveur.',
 'dump_list' => 'Fichiers de sauvegarde existants',
 'dump_remove' => 'Supprimer fichier de sauvegarde',
+'duplicates' => 'Doublons',
 'duplicate_content' => 'Contenu en double',
 'edit' => 'Modifier',
 'edit_attributes' => 'Modifier les attributs',
@@ -426,7 +439,7 @@ URL: [url]',
 'edit_transmittal_props' => '',
 'edit_user' => 'Modifier un utilisateur',
 'edit_user_details' => 'Modifier les détails d\'utilisateur',
-'edit_version' => '',
+'edit_version' => 'Modifier le fichier',
 'el_GR' => 'Grec',
 'email' => 'E-mail',
 'email_error_title' => 'Aucun e-mail indiqué',
@@ -454,7 +467,18 @@ URL: [url]',
 'event_details' => 'Détails de l\'événement',
 'exclude_items' => 'Exclure des élements',
 'expired' => 'Expiré',
+'expired_at_date' => 'Expiré le [datetime]',
 'expires' => 'Expiration',
+'expire_by_date' => 'Expire à une date',
+'expire_in_1d' => 'Expire dans 1 jour',
+'expire_in_1h' => 'Expire dans 1 heure',
+'expire_in_1m' => 'Expire dans 1 mois',
+'expire_in_1w' => 'Expire dans 1 semaine',
+'expire_in_1y' => 'Expire dans 1 an',
+'expire_in_2h' => 'Expire dans 2 heures',
+'expire_in_2y' => 'Expire dans 2 ans',
+'expire_today' => 'Expire aujourd’hui',
+'expire_tomorrow' => 'Expire demain',
 'expiry_changed_email' => 'Date d\'expiration modifiée',
 'expiry_changed_email_body' => 'Date d\'expiration modifiée
 Document : [name]
@@ -517,6 +541,7 @@ URL: [url]',
 'fr_FR' => 'Français',
 'fullsearch' => 'Recherche dans le contenu',
 'fullsearch_hint' => 'Utiliser la recherche plein texte',
+'fulltextsearch_disabled' => 'La recherche plein texte est désactivée.',
 'fulltext_info' => 'Information sur l\'index plein texte',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Définitions d\'attributs',
@@ -529,13 +554,14 @@ URL: [url]',
 'groups' => 'Groupes',
 'group_approval_summary' => 'Résumé groupe d\'approbation',
 'group_exists' => 'Ce groupe existe déjà.',
-'group_info' => '',
+'group_info' => 'Informations du groupe',
 'group_management' => 'Groupes',
 'group_members' => 'Membres de groupes',
 'group_receipt_summary' => '',
 'group_review_summary' => 'Résumé groupe correcteur',
 'guest_login' => 'Se connecter comme invité',
 'guest_login_disabled' => 'Connexion d\'invité désactivée.',
+'hash' => 'Hash',
 'help' => 'Aide',
 'home_folder' => 'Dossier personnel',
 'hook_name' => '',
@@ -553,13 +579,13 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'Inclure les documents',
 'include_subdirectories' => 'Inclure les sous-dossiers',
-'indexing_tasks_in_queue' => '',
+'indexing_tasks_in_queue' => 'Opérations d’indexation en attente',
 'index_converters' => 'Conversion de document Index',
-'index_done' => '',
-'index_error' => '',
+'index_done' => 'Terminé',
+'index_error' => 'Erreur',
 'index_folder' => 'Dossier Index',
-'index_pending' => '',
-'index_waiting' => '',
+'index_pending' => 'En attente',
+'index_waiting' => 'Chargement…',
 'individuals' => 'Individuels',
 'indivіduals_in_groups' => '',
 'inherited' => 'hérité',
@@ -589,6 +615,7 @@ URL: [url]',
 'invalid_target_folder' => 'Identifiant de dossier cible invalide',
 'invalid_user_id' => 'Identifiant utilisateur invalide',
 'invalid_version' => 'Version de document invalide',
+'in_folder' => 'Dans',
 'in_revision' => '',
 'in_workflow' => 'Dans le workflow',
 'is_disabled' => 'Compte désactivé',
@@ -598,21 +625,21 @@ URL: [url]',
 'js_form_error' => 'Le formulaire contient encore # erreur.',
 'js_form_errors' => 'Le formulaire contient encore # erreurs.',
 'js_invalid_email' => 'L\'adresse e-mail est invalide',
-'js_no_approval_group' => 'SVP Sélectionnez un groupe d\'approbation',
-'js_no_approval_status' => 'SVP Sélectionnez le statut d\'approbation',
+'js_no_approval_group' => 'Veuillez sélectionner un groupe d’approbation',
+'js_no_approval_status' => 'Veuillez sélectionner le statut d’approbation',
 'js_no_comment' => 'Il n\'y a pas de commentaires',
 'js_no_email' => 'Saisissez votre adresse e-mail',
-'js_no_file' => 'SVP Sélectionnez un fichier',
+'js_no_file' => 'Veuillez sélectionner un fichier',
 'js_no_keywords' => 'Spécifiez quelques mots-clés',
-'js_no_login' => 'SVP Saisissez un identifiant',
+'js_no_login' => 'Veuillez saisir un identifiant',
 'js_no_name' => 'Veuillez saisir un nom',
-'js_no_override_status' => 'SVP Sélectionner le nouveau [override] statut',
+'js_no_override_status' => 'Veuillez sélectionner le nouveau statut [override]',
 'js_no_pwd' => 'Vous devez saisir votre mot de passe',
 'js_no_query' => 'Saisir une requête',
-'js_no_review_group' => 'SVP Sélectionner un groupe de correcteur',
-'js_no_review_status' => 'SVP Sélectionner le statut de correction',
+'js_no_review_group' => 'Veuillez sélectionner un groupe de correcteurs',
+'js_no_review_status' => 'Veuillez sélectionner le statut de correction',
 'js_pwd_not_conf' => 'Mot de passe et confirmation de mot de passe non identiques',
-'js_select_user' => 'SVP Sélectionnez un utilisateur',
+'js_select_user' => 'Veuillez sélectionner un utilisateur',
 'js_select_user_or_group' => 'Sélectionner au moins un utilisateur ou un groupe',
 'js_unequal_passwords' => 'Les mots de passe ne sont pas identiques',
 'july' => 'Juillet',
@@ -778,7 +805,7 @@ URL: [url]',
 '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.',
 'original_filename' => 'Nom de fichier original',
-'overall_indexing_progress' => '',
+'overall_indexing_progress' => 'Progression globale de l’indexation',
 'owner' => 'Propriétaire',
 'ownership_changed_email' => 'Propriétaire modifié',
 'ownership_changed_email_body' => 'Propriétaire modifié
@@ -815,21 +842,22 @@ En cas de problème persistant, veuillez contacter votre administrateur.',
 'password_wrong' => 'Mauvais mot de passe',
 'pending_approvals' => '',
 'pending_reviews' => '',
-'pending_workflows' => '',
+'pending_workflows' => 'Workflows en attente',
 'personal_default_keywords' => 'Mots-clés personnels',
 'pl_PL' => 'Polonais',
 'possible_substitutes' => '',
+'preset_expires' => 'Expiration prédéfinie',
 'preview' => 'Aperçu',
 'preview_converters' => '',
-'preview_images' => 'Prévisualisation des images',
-'preview_markdown' => '',
+'preview_images' => 'Miniatures',
+'preview_markdown' => 'Prévisualisation',
 'preview_plain' => 'Texte',
 'previous_state' => 'État précédent',
 'previous_versions' => 'Versions précédentes',
 'pt_BR' => 'Portuguais (BR)',
 'quota' => 'Quota',
 'quota_exceeded' => 'Votre quota de disque est dépassé de [bytes].',
-'quota_is_disabled' => 'Le support des quota est actuellement désactivé dans les réglages. Affecter un quota utilisateur n\'aura pas d\'effet jusqu\'à ce qu\'il soit de nouveau activé.',
+'quota_is_disabled' => 'Le support des quotas est actuellement désactivé dans les réglages. Affecter un quota utilisateur n’aura pas d’effet jusqu’à ce qu’il soit de nouveau activé.',
 'quota_warning' => 'Votre quota d’espace disque est dépassé de [bytes]. Veuillez supprimer des documents ou d\'anciennes versions.',
 'receipt_deletion_email_body' => 'L’utilisateur a été retiré de la liste des destinataires
 Document : [name]
@@ -871,7 +899,7 @@ Répertoire: [folder_path]
 Utilisateur: [username]
 URL: [url]',
 'removed_workflow_email_subject' => '',
-'removeFolderFromDropFolder' => '',
+'removeFolderFromDropFolder' => 'Suppression du dossier après importation',
 'remove_marked_files' => 'Supprimer les fichiers sélectionnés',
 'repaired' => 'réparé',
 'repairing_objects' => 'Réparation des documents et des dossiers.',
@@ -998,6 +1026,7 @@ URL: [url]',
 'select_one' => 'Selectionner',
 'select_users' => 'Cliquer pour choisir un utilisateur',
 'select_workflow' => 'Choisir un workflow',
+'send_email' => '',
 'send_test_mail' => 'Envoyer un e-mail test',
 'september' => 'Septembre',
 'sequence' => 'Position dans le répertoire',
@@ -1005,6 +1034,7 @@ URL: [url]',
 'seq_end' => 'A la fin',
 'seq_keep' => 'Conserver la position',
 'seq_start' => 'Première position',
+'sessions' => 'Utilisateurs en ligne',
 'settings' => 'Configuration',
 'settings_activate_module' => 'Activez le module',
 'settings_activate_php_extension' => 'Activez l\'extension PHP',
@@ -1031,7 +1061,7 @@ URL: [url]',
 'settings_checkOutDir_desc' => '',
 'settings_cmdTimeout' => 'Délai d\'expiration pour les commandes externes',
 'settings_cmdTimeout_desc' => 'Cette durée en secondes détermine quand une commande externe (par exemple pour la création de l\'index de texte intégral) sera terminée.',
-'settings_contentDir' => 'Contenu du répertoire',
+'settings_contentDir' => 'Répertoire du contenu',
 'settings_contentDir_desc' => 'Endroit ou les fichiers téléchargés sont stockés (il est préférable de choisir un répertoire qui n\'est pas accessible par votre serveur web)',
 'settings_contentOffsetDir' => 'Content Offset Directory',
 'settings_contentOffsetDir_desc' => 'To work around limitations in the underlying file system, a new directory structure has been devised that exists within the content directory (Content Directory). This requires a base directory from which to begin. Usually leave this to the default setting, 1048576, but can be any number or string that does not already exist within (Content Directory)',
@@ -1072,8 +1102,8 @@ URL: [url]',
 'settings_dropFolderDir' => 'Répertoire de dépôt de fichier sur le serveur',
 'settings_dropFolderDir_desc' => 'Ce répertoire peut être utilisé pour déposer des fichiers sur le serveur et les importer à partir d\'ici au lieu de les charger à partir du navigateur. Le répertoire doit avoir un sous-répertoire pour chaque utilisateur autorisé à importer des fichiers de cette manière.',
 'settings_Edition' => 'Paramètres d’édition',
-'settings_editOnlineFileTypes' => 'Editer le type de fichier',
-'settings_editOnlineFileTypes_desc' => 'Editer la description du type de fichier',
+'settings_editOnlineFileTypes' => 'Types de fichiers éditables',
+'settings_editOnlineFileTypes_desc' => 'Le contenu des fichiers portant les extensions précisées pourra être modifié en ligne (utiliser des lettres minuscules)',
 'settings_enable2FactorAuthentication' => 'Activer l’authentification forte',
 'settings_enable2FactorAuthentication_desc' => 'Active/désactive l\'authentification forte à 2 facteurs. Les utilisateurs devront installer Google Authenticator sur leur téléphone mobile.',
 'settings_enableAcknowledgeWorkflow' => '',
@@ -1096,8 +1126,8 @@ URL: [url]',
 'settings_enableEmail_desc' => 'Activer/désactiver la notification automatique par E-mail',
 'settings_enableFolderTree' => 'Activer l\'arborescence des dossiers',
 'settings_enableFolderTree_desc' => 'False pour ne pas montrer l\'arborescence des dossiers',
-'settings_enableFullSearch' => 'Recherches dans le contenu',
-'settings_enableFullSearch_desc' => 'Activer la recherche texte plein',
+'settings_enableFullSearch' => 'Activer la recherche plein texte',
+'settings_enableFullSearch_desc' => 'Activer la recherche plein texte (dans le contenu des fichiers).',
 'settings_enableGuestAutoLogin' => 'Activer la connexion automatique pour le compte invité',
 'settings_enableGuestAutoLogin_desc' => 'Si le compte invité et la connexion automatique sont activés alors le compte invité sera connecté automatiquement.',
 'settings_enableGuestLogin' => 'Activer la connexion Invité',
@@ -1108,8 +1138,10 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Montrer le sélecteur de langue d\'interface après connexion de l\'utilisateur.',
 'settings_enableLargeFileUpload' => 'Activer téléchargement des gros fichiers',
 'settings_enableLargeFileUpload_desc' => 'Si défini, le téléchargement de fichier est également disponible via un applet java appelé jumploader sans limite de taille définie par le navigateur. Il permet également de télécharger plusieurs fichiers en une seule fois.',
-'settings_enableMenuTasks' => '',
-'settings_enableMenuTasks_desc' => '',
+'settings_enableMenuTasks' => 'Activer le menu des tâches',
+'settings_enableMenuTasks_desc' => 'Affiche un menu avec la liste des tâches. Cette liste contient les documents en attente d’une action par l’utilisateur.',
+'settings_enableMultiUpload' => 'Autoriser le dépôt de plusieurs fichiers',
+'settings_enableMultiUpload_desc' => 'Lors de la création d’un document, autoriser le dépôt de plusieurs fichiers à la fois. Un nouveau document sera créé pour chaque fichier.',
 'settings_enableNotificationAppRev' => 'Notification correcteur/approbateur',
 'settings_enableNotificationAppRev_desc' => 'Cochez pour envoyer une notification au correcteur/approbateur quand une nouvelle version du document est ajoutée',
 'settings_enableNotificationWorkflow' => 'Envoyer les notifications aux utilisateurs dans le prochain workflow',
@@ -1128,6 +1160,8 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => 'Autoriser correction/approbbation pour l\'utilisateur actuel',
 'settings_enableSelfRevApp_desc' => 'A autoriser pour avoir l\'utilisateur actuel désigné correcteur/approbateur et pour les transitions de workflow.',
+'settings_enableSessionList' => 'Activer la liste des utilisateurs en ligne',
+'settings_enableSessionList_desc' => 'Affiche un menu avec la liste des utilisateurs connectés.',
 'settings_enableThemeSelector' => 'Sélection du thème',
 'settings_enableThemeSelector_desc' => 'Activer/désactiver le sélecteur de thème sur la page de connexion.',
 'settings_enableUpdateReceipt' => '',
@@ -1157,7 +1191,7 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => 'Premier jour de la semaine',
 'settings_footNote' => 'Note de bas de page',
 'settings_footNote_desc' => 'Message à afficher au bas de chaque page',
-'settings_fullSearchEngine' => 'Moteur de recherche texte complet',
+'settings_fullSearchEngine' => 'Moteur de recherche plein texte',
 'settings_fullSearchEngine_desc' => 'Définissez la méthode utilisée pour la recherche complète de texte.',
 'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
@@ -1176,7 +1210,7 @@ URL: [url]',
 'settings_install_success' => 'L\'installation est terminée avec succès',
 'settings_install_welcome_text' => '<p>Avant de commencer l\'installation de SeedDMS, assurez-vous d\'avoir créé un fichier \'ENABLE_INSTALL_TOOL\' dans votre répertoire de configuration, sinon l\'installation ne fonctionnera pas. Sur des systèmes Unix, cela peut se faire simplement avec \'touch / ENABLE_INSTALL_TOOL\'. Une fois l\'installation terminée, supprimez le fichier.</p><p>SeedDMS a des exigences très minimes. Vous aurez besoin d\'une base de données MySQL ou SQLite et d\'un serveur web PHP. Le package Pear "Log" doit également être installé. Pour la recherche via Lucene, vous devez également installer le framework Zend sur le disque à un emplacement accessible par PHP. Pour le serveur WebDAV, vous aurez besoin d\'installer HTTP_WebDAV_Server. Le chemin d’accès peut être défini ultérieurement pendant l’installation.</p><p>Si vous préférez créer la base de données avant de commencer l\'installation, créez la manuellement avec votre outil favori, créez éventuellement un utilisateur de base de données avec accès sur la base et importez un export de base du répertoire de configuration. Le script d\'installation peut le faire pour vous, mais il requiert un accès à la base de données avec les droits suffisants pour créer des bases de données.</p>',
 'settings_install_welcome_title' => 'Bienvenue dans l\'installation de SeedDMS',
-'settings_install_zendframework' => 'Installer le Framework Zend, si vous avez l\'intention d\'utiliser le moteur de recherche texte complète',
+'settings_install_zendframework' => 'Installez Zend Framework si vous avez l’intention d’utiliser le moteur de recherche plein texte basé sur Zend. Sinon, continuez l’installation en ignorant ce message.',
 'settings_language' => 'Langue par défaut',
 'settings_language_desc' => 'Langue par défaut (nom d\'un sous-dossier dans le dossier "languages")',
 'settings_libraryFolder' => '',
@@ -1199,6 +1233,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => 'Nombre maximum de documents et répertoires dont l\'accès sera vérifié, lors d\'un décompte récursif. Si ce nombre est dépassé, le nombre de documents et répertoires affichés sera approximé.',
 'settings_maxSizeForFullText' => 'Taille maximum pour l\'indexation instantanée',
 'settings_maxSizeForFullText_desc' => 'Toute nouvelle version d\'un document plus petite que la taille configurée sera intégralement indexée juste après l\'upload. Dans tous les autres cas, seulement les métadonnées seront indexées.',
+'settings_maxUploadSize' => 'Taille max. des fichiers',
+'settings_maxUploadSize_desc' => 'Taille maximale (en octets) pour les fichiers téléversés. Concerne les versions d’un document et les fichiers attachés.',
 'settings_more_settings' => 'Configurer d\'autres paramètres. Connexion par défaut: admin/admin',
 'settings_notfound' => 'Introuvable',
 'settings_Notification' => 'Notifications',
@@ -1280,7 +1316,7 @@ URL: [url]',
 'settings_stagingDir_desc' => 'Le répertoire où jumploader mets les parts d\'un fichier chargé avant de le reconstituer.',
 'settings_start_install' => 'Démarrer l\'installation',
 'settings_stopWordsFile' => 'Fichier des mots à exclure',
-'settings_stopWordsFile_desc' => 'Si la recherche de texte complète est activée, ce fichier contient les mots non indexés',
+'settings_stopWordsFile_desc' => 'Si la recherche plein texte est activée, ce fichier contient la liste des mots à ne pas indexer.',
 'settings_strictFormCheck' => 'Formulaires stricts',
 'settings_strictFormCheck_desc' => 'Contrôl strict des formulaires. Si définie sur true, tous les champs du formulaire seront vérifié. Si définie sur false, les commentaires et mots clés deviennent facultatifs. Les commentaires sont toujours nécessaires lors de la soumission d\'une correction ou état ​​du document',
 'settings_suggestionvalue' => 'Valeur suggérée',
@@ -1330,25 +1366,29 @@ URL: [url]',
 'splash_document_added' => 'Document ajouté',
 'splash_document_checkedout' => 'Document bloqué',
 'splash_document_edited' => 'Document sauvegardé',
-'splash_document_indexed' => '',
+'splash_document_indexed' => 'Document « [name] » indexé.',
 'splash_document_locked' => 'Document vérouillé',
 'splash_document_unlocked' => 'Document déverrouillé',
 'splash_edit_attribute' => 'Attribut modifié',
-'splash_edit_event' => '',
+'splash_edit_event' => 'Événement modifié',
 'splash_edit_group' => 'Groupe sauvé',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Utilisateur modifié',
 'splash_error_add_to_transmittal' => '',
-'splash_folder_edited' => '',
+'splash_error_rm_download_link' => 'Erreur lors de la suppression du lien de téléchargement',
+'splash_error_send_download_link' => 'Erreur lors de l’envoi du lien de téléchargement',
+'splash_folder_edited' => 'Dossier modifié',
 'splash_importfs' => '[docs] documents et [folders] dossiers importés',
 'splash_invalid_folder_id' => 'Identifiant de répertoire invalide',
 'splash_invalid_searchterm' => 'Recherche invalide',
 'splash_moved_clipboard' => 'Presse-papier déplacé dans le répertoire courant',
 'splash_move_document' => 'Document déplacé',
 'splash_move_folder' => 'Dossier déplacé',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => 'Enlevé du presse-papiers',
 'splash_rm_attribute' => 'Attribut supprimé',
 'splash_rm_document' => 'Document supprimé',
+'splash_rm_download_link' => 'Lien de téléchargement supprimé',
 'splash_rm_folder' => 'Dossier supprimé',
 'splash_rm_group' => 'Groupe supprimé',
 'splash_rm_group_member' => 'Membre retiré du groupe',
@@ -1356,6 +1396,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Utilisateur supprimé',
 'splash_saved_file' => '',
+'splash_send_download_link' => 'Lien de téléchargement envoyé par e-mail',
 'splash_settings_saved' => 'Configuration sauvegardée',
 'splash_substituted_user' => 'Utilisateur de substitution',
 'splash_switched_back_user' => 'Revenu à l\'utilisateur initial',
@@ -1501,10 +1542,11 @@ URL : [url]',
 'user_list' => 'Liste des utilisateurs',
 'user_login' => 'Identifiant',
 'user_management' => 'Utilisateurs',
-'user_name' => 'Nom utilisateur',
+'user_name' => 'Nom d’affichage',
 'use_comment_of_document' => 'Utiliser le commentaire du document',
 'use_default_categories' => 'Use predefined categories',
 'use_default_keywords' => 'Utiliser les mots-clés prédéfinis',
+'valid_till' => 'Valide jusqu’au',
 'version' => 'Version',
 'versioning_file_creation' => 'Créer les fichiers de versionnage',
 'versioning_file_creation_warning' => 'Cette opération permet de créer, pour chaque document, un fichier texte contenant les informations générales et l’historique des versions du document. Chaque fichier sera enregistré dans le répertoire du document. Ces fichiers ne sont pas nécessaires au bon fonctionnement de SeedDMS, mais ils peuvent être utiles en cas de transfert des fichiers vers un autre système.',
@@ -1532,6 +1574,7 @@ URL: [url]',
 'workflow_action_name' => 'Nom',
 'workflow_editor' => 'Editeur de Workflow',
 'workflow_group_summary' => 'Résumé de groupe',
+'workflow_has_cycle' => '',
 'workflow_initstate' => 'Etat initial',
 'workflow_in_use' => 'Ce workflow est actuellement utilisé par des documents.',
 'workflow_layoutdata_saved' => '',
@@ -1539,7 +1582,7 @@ URL: [url]',
 'workflow_name' => 'Nom',
 'workflow_no_doc_rejected_state' => 'L’état « rejeté » n’a été défini sur aucune action !',
 'workflow_no_doc_released_state' => '',
-'workflow_no_initial_state' => '',
+'workflow_no_initial_state' => 'Aucune transition ne débute par l’état initial défini pour ce workflow !',
 'workflow_no_states' => 'Vous devez d\'abord définir des états de workflow avant d\'ajouter un workflow.',
 'workflow_save_layout' => '',
 'workflow_state' => '',

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 (1195), marbanas (16)
+//    Translators: Admin (1196), marbanas (16)
 
 $text = array(
 '2_factor_auth' => '',
@@ -234,6 +234,7 @@ Internet poveznica: [url]',
 'checkedout_file_has_disappeared' => 'Datoteka odjavljenog dokumenta je nestala. Prijava neće biti moguća.',
 'checkedout_file_is_unchanged' => 'Datoteka odjavljenog dokumenta je još uvijek nepromijenjena. Prijava neće biti moguća. Ukoliko ne planirate izmjene, možete resetirati status odjave.',
 'checkin_document' => 'Prijava',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => 'Odjava',
 'checkout_is_disabled' => 'Odjava dokumenata je onemogućena u konfiguraciji.',
 'choose_attrdef' => 'Molim odaberite definiciju atributa',
@@ -283,6 +284,7 @@ Internet poveznica: [url]',
 'converter_new_cmd' => 'Komanda',
 'converter_new_mimetype' => 'Novi tip datoteke',
 'copied_to_checkout_as' => 'Datoteka je kopirana u prostor odjave kao \'[filename]\'',
+'create_download_link' => '',
 'create_fulltext_index' => 'Indeksiraj cijeli tekst',
 'create_fulltext_index_warning' => 'Želite ponovo indeksirati cijeli tekst. To može duže potrajati i smanjiti sveukupne performanse sustava. Ako zaista želite ponovno indeksirati, molimo potvrdite vašu radnju.',
 'creation_date' => 'Izrađeno',
@@ -388,6 +390,9 @@ Internet poveznica: [url]',
 'does_not_expire' => 'Ne istječe',
 'does_not_inherit_access_msg' => 'Naslijedi nivo pristupa',
 'download' => 'Preuzimanje',
+'download_links' => '',
+'download_link_email_body' => '',
+'download_link_email_subject' => '',
 'do_object_repair' => 'Popravi sve mape i dokumente.',
 'do_object_setchecksum' => 'Postavi kontrolnu sumu',
 'do_object_setfilesize' => 'Postavi veličinu datoteke',
@@ -405,6 +410,7 @@ Internet poveznica: [url]',
 'dump_creation_warning' => 'Ovom radnjom možete stvoriti datoteku za odlaganje sadržaja vaše baze podataka. Nakon izrade datoteka za odlaganje će biti pohranjena u podatkovnoj mapi na vašem serveru.',
 'dump_list' => 'Postojeće datoteke za odlaganje',
 'dump_remove' => 'Ukloni datoteku za odlaganje',
+'duplicates' => '',
 'duplicate_content' => 'Duplicirani sadržaj',
 'edit' => 'Uredi',
 'edit_attributes' => 'Uredi atribute',
@@ -454,7 +460,18 @@ Internet poveznica: [url]',
 'event_details' => 'Detalji događaja',
 'exclude_items' => 'Isključivanje stavki',
 'expired' => 'Isteklo',
+'expired_at_date' => '',
 'expires' => 'Datum isteka',
+'expire_by_date' => '',
+'expire_in_1d' => '',
+'expire_in_1h' => '',
+'expire_in_1m' => '',
+'expire_in_1w' => '',
+'expire_in_1y' => '',
+'expire_in_2h' => '',
+'expire_in_2y' => '',
+'expire_today' => '',
+'expire_tomorrow' => '',
 'expiry_changed_email' => 'Promijenjen datum isteka',
 'expiry_changed_email_body' => 'Promijenjen datum isteka
 Dokument: <b>[name]</b>
@@ -517,6 +534,7 @@ Internet poveznica: [url]',
 'fr_FR' => 'Francuski',
 'fullsearch' => 'Pretraživanje cijelog teksta',
 'fullsearch_hint' => 'Koristi indeks cijelog teksta',
+'fulltextsearch_disabled' => '',
 'fulltext_info' => 'Informacije cijelog teksta',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Atributi',
@@ -536,6 +554,7 @@ Internet poveznica: [url]',
 'group_review_summary' => 'Sažetak pregleda grupe',
 'guest_login' => 'Prijavite se kao gost',
 'guest_login_disabled' => 'Prijava "kao gost" je onemogućena.',
+'hash' => '',
 'help' => 'Pomoć',
 'home_folder' => 'Početna mapa',
 'hook_name' => '',
@@ -589,6 +608,7 @@ Internet poveznica: [url]',
 'invalid_target_folder' => 'Pogrešan ID ciljane mape',
 'invalid_user_id' => 'Pogrešan ID korisnika',
 'invalid_version' => 'Pogrešna verzija dokumenta',
+'in_folder' => '',
 'in_revision' => 'U reviziji',
 'in_workflow' => 'U toku rada',
 'is_disabled' => 'Onemogući klijenta',
@@ -635,7 +655,7 @@ Internet poveznica: [url]',
 '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_to_version' => '',
-'list_access_rights' => '',
+'list_access_rights' => 'Izlistaj sve dozvole pristupa',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Lokalna datoteka',
@@ -820,6 +840,7 @@ Ako i dalje imate problema s prijavom, molimo kontaktirajte Vašeg administrator
 'personal_default_keywords' => 'Osobni popis ključnih riječi',
 'pl_PL' => 'Poljski',
 'possible_substitutes' => 'Zamjene',
+'preset_expires' => '',
 'preview' => 'Predpregled',
 'preview_converters' => 'Pretpregled konverzije dokumenta',
 'preview_images' => '',
@@ -1031,6 +1052,7 @@ Internet poveznica: [url]',
 'select_one' => 'Odaberite jednog',
 'select_users' => 'Kliknite za odabir korisnika',
 'select_workflow' => 'Odaberite tok rada',
+'send_email' => '',
 'send_test_mail' => '',
 'september' => 'Rujan',
 'sequence' => 'Redoslijed',
@@ -1038,6 +1060,7 @@ Internet poveznica: [url]',
 'seq_end' => 'Na kraju',
 'seq_keep' => 'Zadrži poziciju',
 'seq_start' => 'Na početak',
+'sessions' => '',
 'settings' => 'Postavke',
 'settings_activate_module' => 'Aktiviraj modul',
 'settings_activate_php_extension' => 'Aktiviraj PHP ekstenziju',
@@ -1143,6 +1166,8 @@ Internet poveznica: [url]',
 'settings_enableLargeFileUpload_desc' => 'Ako je postavljeno, učitavanje datoteke je također dostupno kroz Java aplet naziva "jumploader" bez postavljenog ograničenja veličine datoteke od strane pretraživača. To također omogućuje učitavanje nekoliko datoteka u jednom koraku. Uključivanjem ovoga isključit će se samo http kolačići.',
 'settings_enableMenuTasks' => 'Omogućavanje liste zadataka u izborniku',
 'settings_enableMenuTasks_desc' => 'Omogućavanje/onemogućavanje stavke izbornika koja sadrži sve zadatke za korisnika. Ovo sadrži dokumente koji trebaju biti revidirani, odobreni itd.',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Omogući bilježenje recezenta/validatora',
 'settings_enableNotificationAppRev_desc' => 'Označi za slanje obavijesti recezentu/validatoru kada je dodana nova verzija dokumenta',
 'settings_enableNotificationWorkflow' => 'Omogući obavijesti o zadanom toku rada',
@@ -1161,6 +1186,8 @@ Internet poveznica: [url]',
 'settings_enableRevisionWorkflow_desc' => 'Omogućite kako bi se mogao pokrenuti tok rada za revidiranje dokumenta nakon zadanog vremenskog perioda.',
 'settings_enableSelfRevApp' => 'Omogući pregled/ovjeru za prijavljenog korisnika',
 'settings_enableSelfRevApp_desc' => 'Omogući ovo ako želite da trenutno prijavljeni korisnik bude naveden kao recezent/validator i za promjenu toka rada.',
+'settings_enableSessionList' => '',
+'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => 'Odabir teme',
 'settings_enableThemeSelector_desc' => 'Uključuje/isključuje izbornik tema na stranici prijave.',
 'settings_enableUpdateReceipt' => '',
@@ -1232,6 +1259,8 @@ Internet poveznica: [url]',
 'settings_maxRecursiveCount_desc' => 'To je maksimalni broj dokumenata ili mapa koji će biti označen pristupnim pravima, pri rekurzivnom brojanju objekata. Ako se taj broj premaši, broj dokumenata i mapa u pregledu mape će biti procjenjen.',
 'settings_maxSizeForFullText' => 'Maksimalna veličina dokumenta za instant indeksiranje',
 'settings_maxSizeForFullText_desc' => '',
+'settings_maxUploadSize' => '',
+'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => 'Konfiguriraj više postavki. Zadana prijava: admin/admin',
 'settings_notfound' => 'Nije pronađeno',
 'settings_Notification' => 'Postavke bilježenja',
@@ -1372,6 +1401,8 @@ Internet poveznica: [url]',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Korisnik pohranjen',
 'splash_error_add_to_transmittal' => '',
+'splash_error_rm_download_link' => '',
+'splash_error_send_download_link' => '',
 'splash_folder_edited' => 'Pohrani izmjene mape',
 'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Nevažeći ID mape',
@@ -1379,9 +1410,11 @@ Internet poveznica: [url]',
 'splash_moved_clipboard' => 'Međuspremnik je premješten u trenutnu mapu',
 'splash_move_document' => '',
 'splash_move_folder' => '',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => 'Uklonjeno iz međuspremnika',
 'splash_rm_attribute' => 'Atribut uklonjen',
 'splash_rm_document' => 'Dokument uklonjen',
+'splash_rm_download_link' => '',
 'splash_rm_folder' => 'Mapa izbrisana',
 'splash_rm_group' => 'Grupa uklonjena',
 'splash_rm_group_member' => 'Član grupe uklonjen',
@@ -1389,6 +1422,7 @@ Internet poveznica: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Korisnik uklonjen',
 'splash_saved_file' => '',
+'splash_send_download_link' => '',
 'splash_settings_saved' => 'Postavke pohranjene',
 'splash_substituted_user' => 'Zamjenski korisnik',
 'splash_switched_back_user' => 'Prebačeno nazad na izvornog korisnika',
@@ -1538,6 +1572,7 @@ Internet poveznica: [url]',
 'use_comment_of_document' => 'Koristi komentar dokumenta',
 'use_default_categories' => 'Koristi predefinirane kategorije',
 'use_default_keywords' => 'Koristi predefinirane ključne riječi',
+'valid_till' => '',
 'version' => 'Verzija',
 'versioning_file_creation' => 'Stvaranje nove verzije datoteke',
 'versioning_file_creation_warning' => 'Ovo radnjom možete izraditi datoteku koja sadrži informacije o verzijama cijele DMS mape. Nakon izrade, svaka datoteka će biti pohranjena unutar podatkovne mape.',
@@ -1565,6 +1600,7 @@ Internet poveznica: [url]',
 'workflow_action_name' => 'Naziv',
 'workflow_editor' => 'Urednik toka rada',
 'workflow_group_summary' => 'Pregled grupe',
+'workflow_has_cycle' => '',
 'workflow_initstate' => 'Početni status',
 'workflow_in_use' => 'Dokumenti trenutno koriste ovaj tok rada.',
 'workflow_layoutdata_saved' => '',

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 (606), ribaz (1023)
+//    Translators: Admin (607), ribaz (1023)
 
 $text = array(
 '2_factor_auth' => '',
@@ -229,6 +229,7 @@ URL: [url]',
 'checkedout_file_has_disappeared' => '',
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
 'choose_attrdef' => 'Kérem válasszon jellemző meghatározást',
@@ -278,6 +279,7 @@ URL: [url]',
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
+'create_download_link' => '',
 'create_fulltext_index' => 'Teljes szöveg index létrehozása',
 'create_fulltext_index_warning' => 'Ön a teljes szöveg index újraépítését kezdeményezte. Ez a művelet hosszú ideig eltarthat és jelentősen csökkentheti az egész rendszer teljesítményét. Ha biztosan újra kívánja építeni az indexet, kérjük erősítse meg a műveletet.',
 'creation_date' => 'Létrehozva',
@@ -383,6 +385,9 @@ URL: [url]',
 'does_not_expire' => 'Soha nem jár le',
 'does_not_inherit_access_msg' => 'Hozzáférés öröklése',
 'download' => 'Letöltés',
+'download_links' => '',
+'download_link_email_body' => '',
+'download_link_email_subject' => '',
 'do_object_repair' => 'Valamennyi mappa és dokumentum helyreállítása.',
 'do_object_setchecksum' => 'Ellenőrző összeg beállítása',
 'do_object_setfilesize' => 'Állomány méret beállítása',
@@ -400,6 +405,7 @@ URL: [url]',
 'dump_creation_warning' => 'Ezzel a művelettel az adatbázis tartalmáról lehet adatbázis mentést készíteni. Az adatbázis mentés létrehozását követően a mentési állomány a kiszolgáló adat mappájába lesz mentve.',
 'dump_list' => 'Meglévő adatbázis metések',
 'dump_remove' => 'Adatbázis mentés eltávolítása',
+'duplicates' => '',
 'duplicate_content' => '',
 'edit' => 'Szerkesztés',
 'edit_attributes' => 'Jellemzők szerkesztése',
@@ -449,7 +455,18 @@ URL: [url]',
 'event_details' => 'Esemény részletek',
 'exclude_items' => 'Kizárt elemek',
 'expired' => 'Lejárt',
+'expired_at_date' => '',
 'expires' => 'Lejárat',
+'expire_by_date' => '',
+'expire_in_1d' => '',
+'expire_in_1h' => '',
+'expire_in_1m' => '',
+'expire_in_1w' => '',
+'expire_in_1y' => '',
+'expire_in_2h' => '',
+'expire_in_2y' => '',
+'expire_today' => '',
+'expire_tomorrow' => '',
 'expiry_changed_email' => 'Lejárati dátum módosítva',
 'expiry_changed_email_body' => 'Lejárati dátum módosult
 Dokumentum: [name]
@@ -512,6 +529,7 @@ URL: [url]',
 'fr_FR' => 'Francia',
 'fullsearch' => 'Keresés a teljes szövegben',
 'fullsearch_hint' => 'Használja a teljes szöveg indexet',
+'fulltextsearch_disabled' => '',
 'fulltext_info' => 'Teljes szöveg index információ',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Jellemzők',
@@ -531,6 +549,7 @@ URL: [url]',
 'group_review_summary' => 'Csoport felülvizsgálat összefoglaló',
 'guest_login' => 'Bejelentkezés vendégként',
 'guest_login_disabled' => 'Vendég bejelentkezés letiltva.',
+'hash' => '',
 'help' => 'Segítség',
 'home_folder' => '',
 'hook_name' => '',
@@ -584,6 +603,7 @@ URL: [url]',
 'invalid_target_folder' => 'Érvénytelen cél mappa állapot',
 'invalid_user_id' => 'Érvénytelen felhasználói azonosító',
 'invalid_version' => 'Érvénytelen dokumentum változat',
+'in_folder' => '',
 'in_revision' => '',
 'in_workflow' => 'Munkafolyamatban',
 'is_disabled' => 'Hozzáférés tiltás',
@@ -630,7 +650,7 @@ URL: [url]',
 '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_to_version' => '',
-'list_access_rights' => '',
+'list_access_rights' => 'Összes jogosultság felsorolása...',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Helyi állomány',
@@ -816,6 +836,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'personal_default_keywords' => 'Személyes kulcsszó lista',
 'pl_PL' => 'Lengyel',
 'possible_substitutes' => '',
+'preset_expires' => '',
 'preview' => 'Előnézet',
 'preview_converters' => '',
 'preview_images' => '',
@@ -1009,6 +1030,7 @@ URL: [url]',
 'select_one' => 'Vßlasszon egyet',
 'select_users' => 'Kattintson a felhasználó kiválasztásához',
 'select_workflow' => 'Munkafolyamat választás',
+'send_email' => '',
 'send_test_mail' => '',
 'september' => 'September',
 'sequence' => 'Sorrend',
@@ -1016,6 +1038,7 @@ URL: [url]',
 'seq_end' => 'V‰g‰re',
 'seq_keep' => 'Pozci megtartßsa',
 'seq_start' => 'Elej‰re',
+'sessions' => '',
 'settings' => 'Beállítások',
 'settings_activate_module' => 'Modul aktiválása',
 'settings_activate_php_extension' => 'PHP kiterjesztés aktiválása',
@@ -1121,6 +1144,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Ha beállítja az állományok feltöltése elérhető lesz egy jumploadernek hívott java appleten keresztül a böngészőprogram állomány méret korlátja nélkül. Ez engedélyezi több állomány feltöltését egy lépésben.',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'A felülvizsgáló/jóváhagyó értesítés engedélyezése',
 'settings_enableNotificationAppRev_desc' => 'Ellenőrzi az értesítés küldését a felülvizsgálónak/jóváhagyónak új dokumentum változat hozzáadásakor',
 'settings_enableNotificationWorkflow' => 'A felhasználó értesítése a következő munkafolyamatnál',
@@ -1139,6 +1164,8 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => 'Engedélyezi a felülvizsgálatot/jóváhagyást a bejelentkezett felhasználó számára',
 'settings_enableSelfRevApp_desc' => 'Engedélyezze, a azt szeretné, hogy a bejelentkezett felhasználó listázásra kerüljön felülvizsgálóként/jóváhagyóként és a munkamenet átmeneteknél.',
+'settings_enableSessionList' => '',
+'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => 'Téma választása',
 'settings_enableThemeSelector_desc' => 'Kapcsolja be/ki a témaválasztót a bejelentkező oldalon',
 'settings_enableUpdateReceipt' => '',
@@ -1210,6 +1237,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => 'A dokumentumok és mappák maximális mennyisége amelyeken ellenőrizni fogják a hozzáférési jogokat, ha rekurzívan számláló tárgyakat. Ha ezt az értéket túllépik, a dokumentumok számát és mappák a Mappa nézetben is becsülhetők.',
 'settings_maxSizeForFullText' => '',
 'settings_maxSizeForFullText_desc' => '',
+'settings_maxUploadSize' => '',
+'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => 'További beállítások konfigurálása. Alapértelmezett bejelentkezés: admin/admin',
 'settings_notfound' => 'Nem található',
 'settings_Notification' => 'Értesítés beállításai',
@@ -1350,6 +1379,8 @@ URL: [url]',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Felhasználó mentve',
 'splash_error_add_to_transmittal' => '',
+'splash_error_rm_download_link' => '',
+'splash_error_send_download_link' => '',
 'splash_folder_edited' => 'Mappa változásainak mentése',
 'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Érvénytelen mappa azonosító',
@@ -1357,9 +1388,11 @@ URL: [url]',
 'splash_moved_clipboard' => 'Vágólap tartalom áthelyezve az aktuális mappába',
 'splash_move_document' => '',
 'splash_move_folder' => '',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => 'Eltávolítva a vágólapról',
 'splash_rm_attribute' => 'Jellemző eltávolítva',
 'splash_rm_document' => 'Dokumentum eltávolítva',
+'splash_rm_download_link' => '',
 'splash_rm_folder' => 'Mappa törölve',
 'splash_rm_group' => 'Csoport eltávolítva',
 'splash_rm_group_member' => 'Csoporttag eltávolítva',
@@ -1367,6 +1400,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Felhasználó eltávolítva',
 'splash_saved_file' => '',
+'splash_send_download_link' => '',
 'splash_settings_saved' => 'Beállítások elmentve',
 'splash_substituted_user' => 'Helyettesített felhasználó',
 'splash_switched_back_user' => 'Visszaváltva az eredeti felhasználóra',
@@ -1516,6 +1550,7 @@ URL: [url]',
 'use_comment_of_document' => 'Használja a dokumentum megjegyzését',
 'use_default_categories' => 'Használjon előre megadott kategóriákat',
 'use_default_keywords' => 'Használjon előre meghatározott kulcsszavakat',
+'valid_till' => '',
 'version' => 'Változat',
 'versioning_file_creation' => 'Változatkezelő állomány létrehozás',
 'versioning_file_creation_warning' => 'Ezzel a művelettel létrehozhat egy állományt ami tartalmazni fogja a változat információkat a teljes DMS mappáról. A létrehozás után minden állomány a dokumentum mappába lesz mentve.',
@@ -1543,6 +1578,7 @@ URL: [url]',
 'workflow_action_name' => 'Név',
 'workflow_editor' => 'Munkafolyamat szerkesztő',
 'workflow_group_summary' => 'Csoport áttekintés',
+'workflow_has_cycle' => '',
 'workflow_initstate' => 'Kezdeti állapot',
 'workflow_in_use' => 'Ezt a munkafolyamatot dokumentumok használják.',
 'workflow_layoutdata_saved' => '',

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 (1538), rickr (144), s.pnt (26)
+//    Translators: Admin (1554), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -235,6 +235,7 @@ URL: [url]',
 'checkedout_file_has_disappeared' => 'File documento approvato non trovato. Impossibile caricare.',
 'checkedout_file_is_unchanged' => 'La versione approvata è uguale alla versione corrente. Impossibile caricare.',
 'checkin_document' => 'Da approvare',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => 'Approvato',
 'checkout_is_disabled' => 'Approvazione dei documenti disabilitata',
 'choose_attrdef' => 'Seleziona l\'Attributo',
@@ -256,7 +257,7 @@ URL: [url]',
 'clear_password' => 'Cancella la password',
 'clipboard' => 'Appunti',
 'close' => 'Chiudi',
-'command' => '',
+'command' => 'Comando',
 'comment' => 'Commento',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Commento per la versione',
@@ -284,6 +285,7 @@ URL: [url]',
 'converter_new_cmd' => 'Comando',
 'converter_new_mimetype' => 'Nuovo mimetype',
 'copied_to_checkout_as' => 'File copiato come \'[filename]\'',
+'create_download_link' => '',
 'create_fulltext_index' => 'Crea indice fulltext',
 'create_fulltext_index_warning' => 'Stai creando un indice fulltext. Questo può occupare un tempo considerevole e ridurre le prestazioni del sistema. Sei sicuro di voler ricreare l\'indice? Prego conferma l\'operazione.',
 'creation_date' => 'Data creazione',
@@ -310,7 +312,7 @@ URL: [url]',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
 'document' => 'Documento',
-'documentcontent' => '',
+'documentcontent' => 'Contenuto documento',
 'documents' => 'Documenti',
 'documents_checked_out_by_you' => 'Documenti approvati da te',
 'documents_in_process' => 'Documenti in lavorazione',
@@ -389,6 +391,9 @@ URL: [url]',
 'does_not_expire' => 'Nessuna scadenza',
 'does_not_inherit_access_msg' => 'Imposta permessi ereditari',
 'download' => 'Scarica',
+'download_links' => '',
+'download_link_email_body' => '',
+'download_link_email_subject' => '',
 'do_object_repair' => 'Ripara tutte le cartelle e i documenti.',
 'do_object_setchecksum' => 'Imposta il checksum',
 'do_object_setfilesize' => 'Imposta la dimensione del file',
@@ -406,6 +411,7 @@ URL: [url]',
 'dump_creation_warning' => 'Con questa operazione è possibile creare un file di dump del contenuto del database. Dopo la creazione il file viene salvato nella cartella dati del server.',
 'dump_list' => 'List dei dump presenti',
 'dump_remove' => 'Cancella il file di dump',
+'duplicates' => 'Duplicati',
 'duplicate_content' => 'Contenuto Duplicato',
 'edit' => 'Modifica',
 'edit_attributes' => 'Modifica gli attributi',
@@ -455,7 +461,18 @@ URL: [url]',
 'event_details' => 'Dettagli evento',
 'exclude_items' => 'Escludi Elementi',
 'expired' => 'Scaduto',
+'expired_at_date' => '',
 'expires' => 'Scadenza',
+'expire_by_date' => '',
+'expire_in_1d' => '',
+'expire_in_1h' => '',
+'expire_in_1m' => '',
+'expire_in_1w' => '',
+'expire_in_1y' => '',
+'expire_in_2h' => '',
+'expire_in_2y' => '',
+'expire_today' => '',
+'expire_tomorrow' => '',
 'expiry_changed_email' => 'Scadenza cambiata',
 'expiry_changed_email_body' => 'Data di scadenza cambiata
 Documento: [name]
@@ -518,6 +535,7 @@ URL: [url]',
 'fr_FR' => 'Francese',
 'fullsearch' => 'Ricerca Fulltext',
 'fullsearch_hint' => 'Usa l\'indice fulltext',
+'fulltextsearch_disabled' => '',
 'fulltext_info' => 'Info indice Fulltext',
 'global_attributedefinitiongroups' => 'Attributo gruppi',
 'global_attributedefinitions' => 'Definizione attributi',
@@ -537,6 +555,7 @@ URL: [url]',
 'group_review_summary' => 'Dettaglio revisioni di gruppo',
 'guest_login' => 'Login come Ospite',
 'guest_login_disabled' => 'Il login come Ospite è disabilitato.',
+'hash' => '',
 'help' => 'Aiuto',
 'home_folder' => 'Cartella Utente',
 'hook_name' => 'Nome del gangio',
@@ -554,7 +573,7 @@ URL: [url]',
 'include_content' => 'Includi contenuto',
 'include_documents' => 'Includi documenti',
 'include_subdirectories' => 'Includi sottocartelle',
-'indexing_tasks_in_queue' => '',
+'indexing_tasks_in_queue' => 'Operazione di indicizzazione in corso',
 'index_converters' => 'Indice di conversione documenti',
 'index_done' => '',
 'index_error' => '',
@@ -590,6 +609,7 @@ URL: [url]',
 'invalid_target_folder' => 'ID cartella selezionata non valido',
 'invalid_user_id' => 'ID utente non valido',
 'invalid_version' => 'Versione del documento non valida',
+'in_folder' => 'nella cartella',
 'in_revision' => 'In fase di revisione',
 'in_workflow' => 'In fase di lavorazione',
 'is_disabled' => 'Account Disabilitato',
@@ -636,7 +656,7 @@ URL: [url]',
 '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_to_version' => '',
-'list_access_rights' => '',
+'list_access_rights' => 'Elenca tutti i diritti di accesso...',
 'list_contains_no_access_docs' => '',
 'list_hooks' => 'Lista ganci',
 'local_file' => 'File locale',
@@ -779,7 +799,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Possono essere utilizzate solo immagini di tipo jpeg',
 'order_by_sequence_off' => 'Ordina in sequenza disabilitato',
 'original_filename' => 'Nome file originale',
-'overall_indexing_progress' => '',
+'overall_indexing_progress' => 'Totale processo di indicizzazione',
 'owner' => 'Proprietario',
 'ownership_changed_email' => 'Proprietario cambiato',
 'ownership_changed_email_body' => 'Cambio di proprietario
@@ -822,6 +842,7 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di
 'personal_default_keywords' => 'Parole-chiave personali',
 'pl_PL' => 'Polacco',
 'possible_substitutes' => 'Sostituti',
+'preset_expires' => '',
 'preview' => 'Anteprima',
 'preview_converters' => 'Anteprima convesione documento',
 'preview_images' => '',
@@ -874,7 +895,7 @@ Cartella: [folder_path]
 Utente: [username]
 URL: [url]',
 'removed_workflow_email_subject' => '[sitename]: [name] - Flusso di lavoro rimosso dalla versione del documento',
-'removeFolderFromDropFolder' => '',
+'removeFolderFromDropFolder' => 'Rimuovi la cartella dopo l\'importazione',
 'remove_marked_files' => 'Rimuovi i files contrassegnati',
 'repaired' => 'riparato',
 'repairing_objects' => 'Riparazione documenti e cartelle in corso...',
@@ -1043,6 +1064,7 @@ URL: [url]',
 'select_one' => 'Seleziona uno',
 'select_users' => 'Clicca per selezionare gli utenti',
 'select_workflow' => 'Seleziona il flusso di lavoro',
+'send_email' => '',
 'send_test_mail' => 'Invia messagio di prova',
 'september' => 'Settembre',
 'sequence' => 'Posizione',
@@ -1050,6 +1072,7 @@ URL: [url]',
 'seq_end' => 'Alla fine',
 'seq_keep' => 'Mantieni la posizione',
 'seq_start' => 'Prima posizione',
+'sessions' => '',
 'settings' => 'Impostazioni',
 'settings_activate_module' => 'Attivazione modulo',
 'settings_activate_php_extension' => 'Attivazione estensione PHP',
@@ -1063,7 +1086,7 @@ URL: [url]',
 'settings_autoLoginUser' => 'Login automatico',
 'settings_autoLoginUser_desc' => 'Utilizzare questo ID utente per l\'accesso se l\'utente non è già connesso. Questo tipo di accesso non creerà una sessione.',
 'settings_available_languages' => 'Lingue disponibili',
-'settings_available_languages_desc' => '',
+'settings_available_languages_desc' => 'Solo le lingue selezionate verranno caricate e mostrate nel selettore. La lingua predefinita sarà sempre caricata.',
 'settings_backupDir' => 'Directory di backup',
 'settings_backupDir_desc' => 'Directory in cui lo strumento di backup salva i backup. Se questa directory non è impostato o non è possibile accedervi, quindi i backup vengono salvati nella directory dei contenuti.',
 'settings_cacheDir' => 'Cartella di cache',
@@ -1080,7 +1103,7 @@ URL: [url]',
 'settings_contentDir_desc' => 'Cartella in cui vengono conservati i files caricati, si consiglia di scegliere una cartella sul web-server che non sia direttamente accessibile.',
 'settings_contentOffsetDir' => 'Cartella Offset',
 'settings_contentOffsetDir_desc' => 'Per supplire a limitazioni all\'utilizzo del filesystem è stata concepita una nuova struttura di cartelle all\'interno della cartella contenitore (Content Directory). Questa necessita di una cartella di partenza: di solito è sufficiente lasciare il nome di default, 1048576, ma può essere usato un qualsiasi numero o stringa che non esistano già all\'interno della cartella contenitore (Content Directory)',
-'settings_convertToPdf' => '',
+'settings_convertToPdf' => 'Converti documento in PDF per anteprima',
 'settings_convertToPdf_desc' => 'Se il documento non può essere nativamente mostrato nel browser, verrà mostrata una versione in PDF.',
 'settings_cookieLifetime' => 'Tempo di vita del cookie',
 'settings_cookieLifetime_desc' => 'Tempo di vita del cookie in secondi: se impostato su 0 il cookie verrà rimosso alla chiusura del browser',
@@ -1103,8 +1126,8 @@ URL: [url]',
 'settings_dbUser' => 'Utente',
 'settings_dbUser_desc' => 'Utente per accedere al database da utilizzarsi durante il processo di installazione. Non modificare questo campo se non assolutamente necessario, per esempio nel caso di trasferimento del database su un nuovo Host.',
 'settings_dbVersion' => 'Schema del database obsoleto',
-'settings_defaultAccessDocs' => '',
-'settings_defaultAccessDocs_desc' => '',
+'settings_defaultAccessDocs' => 'Diritto di accesso per i nuovi documenti',
+'settings_defaultAccessDocs_desc' => 'Quando si crea un nuovo documento, questo sarà il diritto di accesso predefinito',
 'settings_defaultSearchMethod' => 'Metodo di ricerca predefinito',
 'settings_defaultSearchMethod_desc' => 'Metodo di ricerca predefinito, quando la ricerca viene avviata dal modulo di ricerca nel menu principale.',
 'settings_defaultSearchMethod_valdatabase' => 'database',
@@ -1155,6 +1178,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Se selezionato, il caricamento (upload) dei files può essere effettuato anche attraverso un\'applet Java chiamata Jumploader evitando il limite di dimensioni file imposto dal browser; Jumploader permette anche il caricamento di diversi files contemporaneamente.',
 'settings_enableMenuTasks' => 'Abilita compito delle attività nel menù',
 'settings_enableMenuTasks_desc' => 'Abilita / Disabilita la voce di menu che contiene tutte le attività degli utenti. Questo conterrà i documenti che devono essere rivisti, approvati, etc.',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Abilita/disabilita notifica a revisore/approvatore',
 'settings_enableNotificationAppRev_desc' => 'Spuntare per inviare una notifica al revisore/approvatore nel momento in cui viene aggiunta una nuova versione del documento.',
 'settings_enableNotificationWorkflow' => 'Invia notifiche ai partecipanti al flusso di lavoro',
@@ -1173,6 +1198,8 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => 'Abilita per attivare workflow su revisione documenti dopo scadenza.',
 'settings_enableSelfRevApp' => 'Permetti revisione/approvazione all\'utente registrato',
 'settings_enableSelfRevApp_desc' => 'Abilitare se si desidera aggiungere l\'utente attualmente registrato alla lista dei revisori/approvatori e per le transizioni del flusso di lavoro.',
+'settings_enableSessionList' => '',
+'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => 'Selezione tema grafico',
 'settings_enableThemeSelector_desc' => 'Abilita/disabilita il selettore di tema grafico nella finestra di login',
 'settings_enableUpdateReceipt' => '',
@@ -1244,6 +1271,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => 'Numero massimo di documenti e cartelle considerati dal conteggio ricursivo per il controllo dei diritti d\'accesso. Se tale valore dovesse essere superato, il risultato del conteggio sarà stimato.',
 'settings_maxSizeForFullText' => 'La lungeza massima del file per l\'indicizzazione istantanea',
 'settings_maxSizeForFullText_desc' => 'Tutte le nuove versioni dei documenti più in basso della dimensione configurata saranno completamente indicizzati dopo il caricamento. In tutti gli altri casi sarà indicizzato solo i metadati.',
+'settings_maxUploadSize' => 'Dimensiona massima dei file da caricare',
+'settings_maxUploadSize_desc' => 'Questa è la dimensiona massima del file da caricare. Avrà impatto sulla versione del documento e sull\'allegato.',
 'settings_more_settings' => 'Ulteriori configurazioni. Login di default: admin/admin',
 'settings_notfound' => 'Non trovato',
 'settings_Notification' => 'Impostazioni di notifica',
@@ -1384,6 +1413,8 @@ URL: [url]',
 'splash_edit_role' => 'Ruolo memorizzata',
 'splash_edit_user' => 'Utente modificato',
 'splash_error_add_to_transmittal' => 'Errore durante l\'aggiunta di documento per la trasmissione',
+'splash_error_rm_download_link' => '',
+'splash_error_send_download_link' => '',
 'splash_folder_edited' => 'Cartella modificata',
 'splash_importfs' => 'Importati [Documenti] documenti e cartelle [cartelle]',
 'splash_invalid_folder_id' => 'ID cartella non valido',
@@ -1391,9 +1422,11 @@ URL: [url]',
 'splash_moved_clipboard' => 'Appunti trasferiti nella cartella corrente',
 'splash_move_document' => 'Documento spostato',
 'splash_move_folder' => 'Cartella spostato',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => 'Rimosso dagli appunti',
 'splash_rm_attribute' => 'Attributo rimosso',
 'splash_rm_document' => 'Documento rimosso',
+'splash_rm_download_link' => '',
 'splash_rm_folder' => 'Cartella eliminata',
 'splash_rm_group' => 'Gruppo eliminato',
 'splash_rm_group_member' => 'Membro del gruppo eliminato',
@@ -1401,6 +1434,7 @@ URL: [url]',
 'splash_rm_transmittal' => 'Trasmissione cancellato',
 'splash_rm_user' => 'Utente eliminato',
 'splash_saved_file' => '',
+'splash_send_download_link' => '',
 'splash_settings_saved' => 'Impostazioni salvate',
 'splash_substituted_user' => 'Utente sostituito',
 'splash_switched_back_user' => 'Ritorno all\'utente originale',
@@ -1550,6 +1584,7 @@ URL: [url]',
 'use_comment_of_document' => 'Utilizza il commento al documento',
 'use_default_categories' => 'Usa categorie predefinite',
 'use_default_keywords' => 'Usa parole-chiave predefinite',
+'valid_till' => '',
 'version' => 'Versione',
 'versioning_file_creation' => 'Creazione file di versione',
 'versioning_file_creation_warning' => 'Con questa operazione è possibile creare un file di backup delle informazioni di versione dei documenti di un\'intera cartella. Dopo la creazione ogni file viene salvato nella cartella del relativo documento.',
@@ -1577,6 +1612,7 @@ URL: [url]',
 'workflow_action_name' => 'Nome',
 'workflow_editor' => 'Modifica flussi di lavoro',
 'workflow_group_summary' => 'Sommario di gruppo',
+'workflow_has_cycle' => '',
 'workflow_initstate' => 'Stato iniziale',
 'workflow_in_use' => 'Questo flusso di lavoro è attualmente usato da alcuni documenti',
 'workflow_layoutdata_saved' => '',

languages/ko_KR/lang.inc

@@ -19,15 +19,15 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (940), daivoc (418)
+//    Translators: Admin (940), daivoc (421)
 
 $text = array(
-'2_factor_auth' => '',
+'2_factor_auth' => '관리자 ({LOCALE}/lang.inc)',
 '2_factor_auth_info' => '',
 '2_fact_auth_secret' => '',
 'accept' => '동의',
-'access_control' => '',
-'access_control_is_off' => '',
+'access_control' => '접근 제어',
+'access_control_is_off' => '접근 제어 불가',
 'access_denied' => '접근가 거부되었습니다.',
 'access_inheritance' => '접근 상속',
 'access_mode' => '접근 모드',
@@ -236,6 +236,7 @@ URL: [url]',
 'checkedout_file_has_disappeared' => '요청한 문서파일이 사라져 버렸습니다. 확인이 불가능 합니다.',
 'checkedout_file_is_unchanged' => '요청한 문서가 아직 변경전 상태입니다. 변경을 원하지 않는 경우 재설정 할 수 있습니다.',
 'checkin_document' => '체크인',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => '체크아웃',
 'checkout_is_disabled' => '체크아웃된 문서는 설정에서 비활성화됩니다.',
 'choose_attrdef' => '속성의 정의를 선택하세요',
@@ -285,6 +286,7 @@ URL: [url]',
 'converter_new_cmd' => '명령',
 'converter_new_mimetype' => '새 MIME 형태',
 'copied_to_checkout_as' => '체크아웃으로 파일(\'[filename]\')이 파일 복사됨',
+'create_download_link' => '',
 'create_fulltext_index' => '전체 텍스트 인덱스 만들기',
 'create_fulltext_index_warning' => '전체 자료의 텍스트 인덱스를 다시 만들 수 있습니다. 이것은 상당한 시간을 요구하며 진행되는 동안 시스템 성능을 감소시킬 수 있습니다. 인덱스를 재 생성하려면, 확인하시기 바랍니다.',
 'creation_date' => '생성',
@@ -388,6 +390,9 @@ URL: [url]',
 'does_not_expire' => '만료되지 않습니다',
 'does_not_inherit_access_msg' => '액세스 상속',
 'download' => '다운로드',
+'download_links' => '',
+'download_link_email_body' => '',
+'download_link_email_subject' => '',
 'do_object_repair' => '모든 폴더와 문서를 복구',
 'do_object_setchecksum' => '오류 검사',
 'do_object_setfilesize' => '파일 크기 설정',
@@ -405,6 +410,7 @@ URL: [url]',
 'dump_creation_warning' => '이 작업으로 만들 수있는 데이터베이스 내용의 덤프 파일. 작성 후 덤프 파일은 서버의 데이터 폴더에 저장됩니다.',
 'dump_list' => '덤프된 파일',
 'dump_remove' => '덤프 파일 제거',
+'duplicates' => '',
 'duplicate_content' => '중복 내용',
 'edit' => '편집',
 'edit_attributes' => '속성 편집',
@@ -454,7 +460,18 @@ URL: [url]',
 'event_details' => '이벤트의 자세한 사항',
 'exclude_items' => '항목 제외',
 'expired' => '만료',
+'expired_at_date' => '',
 'expires' => '만료',
+'expire_by_date' => '',
+'expire_in_1d' => '',
+'expire_in_1h' => '',
+'expire_in_1m' => '',
+'expire_in_1w' => '',
+'expire_in_1y' => '',
+'expire_in_2h' => '',
+'expire_in_2y' => '',
+'expire_today' => '',
+'expire_tomorrow' => '',
 'expiry_changed_email' => '유효 기간 변경',
 'expiry_changed_email_body' => '유효 기간이 변경
 문서: [name]
@@ -517,6 +534,7 @@ URL: [url]',
 'fr_FR' => '프랑스어',
 'fullsearch' => '전체 텍스트 검색',
 'fullsearch_hint' => '전체 텍스트 색인 사용',
+'fulltextsearch_disabled' => '',
 'fulltext_info' => '전체 텍스트 색인 정보',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => '속성',
@@ -536,6 +554,7 @@ URL: [url]',
 'group_review_summary' => '그룹 검토 요약',
 'guest_login' => '게스트로 로그인',
 'guest_login_disabled' => '고객 로그인을 사용할 수 없습니다.',
+'hash' => '',
 'help' => '도움말',
 'home_folder' => '홈 폴더',
 'hook_name' => '',
@@ -589,6 +608,7 @@ URL: [url]',
 'invalid_target_folder' => '잘못된 대상 폴더 ID',
 'invalid_user_id' => '잘못된 사용자 ID',
 'invalid_version' => '잘못된 문서 버전',
+'in_folder' => '',
 'in_revision' => '개정에서',
 'in_workflow' => '워크플로우내',
 'is_disabled' => '계정 사용 안 함',
@@ -813,6 +833,7 @@ URL : [url]',
 'personal_default_keywords' => '개인 키워드 목록',
 'pl_PL' => '폴란드어',
 'possible_substitutes' => '대체',
+'preset_expires' => '',
 'preview' => '미리보기',
 'preview_converters' => '문서 변환 미리보기',
 'preview_images' => '',
@@ -1024,6 +1045,7 @@ URL : [url]',
 'select_one' => '선택',
 'select_users' => '사용자를 선택합니다',
 'select_workflow' => '선택 워크플로우',
+'send_email' => '',
 'send_test_mail' => '테스트 메일',
 'september' => '9월',
 'sequence' => '순서',
@@ -1031,6 +1053,7 @@ URL : [url]',
 'seq_end' => '마지막 위치',
 'seq_keep' => '위치 유지',
 'seq_start' => '첫 번째 위치',
+'sessions' => '',
 'settings' => '설정',
 'settings_activate_module' => '모듈 활성화',
 'settings_activate_php_extension' => 'PHP 확장 활성화',
@@ -1136,6 +1159,8 @@ URL : [url]',
 'settings_enableLargeFileUpload_desc' => '설정하면, 브라우저가 설정 한 파일 크기 제한없이 jumploader라는 파일 업로드 자바 애플릿을 통해 사용할 수 있습니다. 또한 한 번에 여러 파일을 업로드 할 수 있습니다.',
 'settings_enableMenuTasks' => '메뉴의 작업 목록 허용',
 'settings_enableMenuTasks_desc' => '사용자의 모든 작업이 포함되어있는 메뉴 항목을 활성/비활성 합니다. 이것은 검토, 승인등이 필요한 문서를 포함 합니다',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => '검토 / 승인 알림 사용',
 'settings_enableNotificationAppRev_desc' => '새 문서 버전이 추가 된 경우 리뷰 / 승인자에게 알림을 보내 확인',
 'settings_enableNotificationWorkflow' => '다음 작업 사용자에게 알림을 보냅니다.',
@@ -1154,6 +1179,8 @@ URL : [url]',
 'settings_enableRevisionWorkflow_desc' => '일정 기간후에 문서를 개정 하기위해 워크플로우를 수행 할 수 있도록 설정 합니다.',
 'settings_enableSelfRevApp' => '로그인 한 사용자에 대한 검토 / 승인을 허용',
 'settings_enableSelfRevApp_desc' => '검토 / 승인자로 워크 플로우 전환을 위해 나열되어있는 것이 현재 로그인 한 사용자가 필요한 경우이를 활성화합니다.',
+'settings_enableSessionList' => '',
+'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => '테마 선택',
 'settings_enableThemeSelector_desc' => '로그인 페이지의 테마 선택기를 켜기/끄기로 전환합니다.',
 'settings_enableUpdateReceipt' => '',
@@ -1225,6 +1252,8 @@ URL : [url]',
 'settings_maxRecursiveCount_desc' => '이것은 재귀적으로 개체를 셀 때 사용 권한이 확인됩니다 문서 및 폴더의 최대 수입니다. 이 수를 초과하면 폴더보기에서 문서 나 폴더의 수가 추정됩니다.',
 'settings_maxSizeForFullText' => '',
 'settings_maxSizeForFullText_desc' => '',
+'settings_maxUploadSize' => '',
+'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => '기타 설정을 구성합니다. 기본 로그인 : admin/admin',
 'settings_notfound' => '찾을 수 없음',
 'settings_Notification' => '알림 설정',
@@ -1365,6 +1394,8 @@ URL : [url]',
 'splash_edit_role' => '',
 'splash_edit_user' => '사용자 저장',
 'splash_error_add_to_transmittal' => '',
+'splash_error_rm_download_link' => '',
+'splash_error_send_download_link' => '',
 'splash_folder_edited' => '저장 폴더 변경',
 'splash_importfs' => '',
 'splash_invalid_folder_id' => '잘못된 폴더 ID',
@@ -1372,9 +1403,11 @@ URL : [url]',
 'splash_moved_clipboard' => '클립 보드가 현재 폴더로 이동',
 'splash_move_document' => '',
 'splash_move_folder' => '',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => '클립 보드에서 제거',
 'splash_rm_attribute' => '속성 제거',
 'splash_rm_document' => '문서 삭제',
+'splash_rm_download_link' => '',
 'splash_rm_folder' => '폴더 삭제',
 'splash_rm_group' => '그룹 제거',
 'splash_rm_group_member' => '회원 그룹 제거',
@@ -1382,6 +1415,7 @@ URL : [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '사용자 제거',
 'splash_saved_file' => '',
+'splash_send_download_link' => '',
 'splash_settings_saved' => '설정 저장',
 'splash_substituted_user' => '전환된 사용자',
 'splash_switched_back_user' => '원래 사용자로 전환',
@@ -1531,6 +1565,7 @@ URL : [url]',
 'use_comment_of_document' => '문서 설명을 사용하십시오',
 'use_default_categories' => '미리 정의 된 범주를 사용하십시오',
 'use_default_keywords' => '사전 정의 된 키워드를 사용하십시오',
+'valid_till' => '',
 'version' => '버전',
 'versioning_file_creation' => '버전 관리 파일 생성',
 'versioning_file_creation_warning' => '버전 정보가 포함 된 파일을 만들 수 있습니다. 이 작업은 전체 DMS 폴더를 작성 후 모든 파일이 문서 폴더 안에 저장됩니다.',
@@ -1558,6 +1593,7 @@ URL : [url]',
 'workflow_action_name' => '이름',
 'workflow_editor' => '워크플로우 편집기',
 'workflow_group_summary' => '그룹 요약',
+'workflow_has_cycle' => '',
 'workflow_initstate' => '초기 상태',
 'workflow_in_use' => '이 워크플로는 현재 문서에서 사용 됩니다.',
 'workflow_layoutdata_saved' => '',

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 (723), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (726), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 '2_factor_auth' => '',
@@ -227,6 +227,7 @@ URL: [url]',
 'checkedout_file_has_disappeared' => 'File is onvindbaar',
 'checkedout_file_is_unchanged' => 'Checkout-document ongewijzigd',
 'checkin_document' => 'Veranderd document',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => 'Checkout-document',
 'checkout_is_disabled' => 'Checkout is niet mogelijk',
 'choose_attrdef' => 'Selecteer een kenmerk definitie',
@@ -276,6 +277,7 @@ URL: [url]',
 'converter_new_cmd' => 'Wijziging: nieuw commando',
 'converter_new_mimetype' => 'Wijziging: nieuw mimetype',
 'copied_to_checkout_as' => 'Gekopieerd naar checkout als:',
+'create_download_link' => '',
 'create_fulltext_index' => 'Creeer volledige tekst index',
 'create_fulltext_index_warning' => 'U staat op het punt de volledigetekst opnieuw te indexeren. Dit kan behoorlijk veel tijd en snelheid vergen van het systeem. Als u zeker bent om opnieuw te indexeren, bevestig deze actie.',
 'creation_date' => 'Aangemaakt',
@@ -381,6 +383,9 @@ URL: [url]',
 'does_not_expire' => 'Verloopt niet',
 'does_not_inherit_access_msg' => 'Erft toegang',
 'download' => 'Download',
+'download_links' => '',
+'download_link_email_body' => '',
+'download_link_email_subject' => '',
 'do_object_repair' => 'Repareer alle mappen en documenten.',
 'do_object_setchecksum' => 'Set checksum',
 'do_object_setfilesize' => 'Voer bestandgrootte in',
@@ -398,6 +403,7 @@ URL: [url]',
 'dump_creation_warning' => 'M.b.v. deze functie maakt U een DB dump file. het bestand wordt opgeslagen in uw data-map op de Server',
 'dump_list' => 'Bestaande dump bestanden',
 'dump_remove' => 'Verwijder dump bestand',
+'duplicates' => '',
 'duplicate_content' => 'Dubbele inhoud',
 'edit' => 'Wijzigen',
 'edit_attributes' => 'Bewerk attributen',
@@ -447,7 +453,18 @@ URL: [url]',
 'event_details' => 'Activiteit details',
 'exclude_items' => 'Sluit iems uit',
 'expired' => 'Verlopen',
+'expired_at_date' => '',
 'expires' => 'Verloopt',
+'expire_by_date' => '',
+'expire_in_1d' => '',
+'expire_in_1h' => '',
+'expire_in_1m' => '',
+'expire_in_1w' => '',
+'expire_in_1y' => '',
+'expire_in_2h' => '',
+'expire_in_2y' => '',
+'expire_today' => '',
+'expire_tomorrow' => '',
 'expiry_changed_email' => 'Verloopdatum gewijzigd',
 'expiry_changed_email_body' => 'Vervaldatum gewijzigd
 Document: [name]
@@ -510,6 +527,7 @@ URL: [url]',
 'fr_FR' => 'Frans',
 'fullsearch' => 'Zoek in volledige tekst',
 'fullsearch_hint' => 'Volledige tekst index',
+'fulltextsearch_disabled' => '',
 'fulltext_info' => 'Volledige tekst index info',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Kenmerk definities',
@@ -529,6 +547,7 @@ URL: [url]',
 'group_review_summary' => 'Groep Beoordeling samenvatting',
 'guest_login' => 'Login als Gast',
 'guest_login_disabled' => 'Gast login is uitgeschakeld.',
+'hash' => '',
 'help' => 'Help',
 'home_folder' => 'Thuismap',
 'hook_name' => '',
@@ -582,6 +601,7 @@ URL: [url]',
 'invalid_target_folder' => 'Foutief Doel Map ID',
 'invalid_user_id' => 'Foutief Gebruiker ID',
 'invalid_version' => 'Foutief Document Versie',
+'in_folder' => 'In map',
 'in_revision' => 'In herziening',
 'in_workflow' => 'In workflow',
 'is_disabled' => 'Deactiveer account',
@@ -628,7 +648,7 @@ URL: [url]',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Als u bestanden wilt uploaden groter dan het huidige maximum, gebruik aub de alternatieve <a href="%s">upload pagina</a>.',
 'link_to_version' => '',
-'list_access_rights' => '',
+'list_access_rights' => 'Oplijsten toegangsrechten',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Lokaal bestand',
@@ -814,6 +834,7 @@ Mocht u de komende minuten geen email ontvangen, probeer het dan nogmaals en con
 'personal_default_keywords' => 'Persoonlijke sleutelwoorden',
 'pl_PL' => 'Polen',
 'possible_substitutes' => 'Mogelijke alternatieven',
+'preset_expires' => '',
 'preview' => 'Voorbeeld',
 'preview_converters' => 'Converters',
 'preview_images' => '',
@@ -1033,6 +1054,7 @@ URL: [url]',
 'select_one' => 'Selecteer een',
 'select_users' => 'Klik om gebruikers te selecteren',
 'select_workflow' => 'Selecteer workflow',
+'send_email' => '',
 'send_test_mail' => 'Testmail versturen',
 'september' => 'september',
 'sequence' => 'Volgorde',
@@ -1040,6 +1062,7 @@ URL: [url]',
 'seq_end' => 'Op het einde',
 'seq_keep' => 'Behoud Positie',
 'seq_start' => 'Eerste positie',
+'sessions' => '',
 'settings' => 'Instellingen',
 'settings_activate_module' => 'Activeer module',
 'settings_activate_php_extension' => 'Activeer PHP uitbreiding',
@@ -1149,6 +1172,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Indien ingeschakeld, is bestandsupload ook beschikbaar via een java applet jumploader genaamd zonder een bestandsgrootte limiet door de browser. Het staat ook toe om meerdere bestanden in een keer te versturen.',
 'settings_enableMenuTasks' => 'Menu-taken aanzetten',
 'settings_enableMenuTasks_desc' => 'Menu-taken aanzetten',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Inschakelen controleur/beoordeler notificatie',
 'settings_enableNotificationAppRev_desc' => 'Vink aan om een notificatie te versturen naar de controleur/beoordeler als een nieuw document versie is toegevoegd.',
 'settings_enableNotificationWorkflow' => 'Workflow-notificatie aanzetten',
@@ -1167,6 +1192,8 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => 'Herzieningsworkflow aanzetten',
 'settings_enableSelfRevApp' => 'Beoordeling/ goedkeuring toestaan voor ingelogde gebruikers',
 'settings_enableSelfRevApp_desc' => 'Schakel in indien the huidig ingelogde gebruiker wordt toegewezen als goedkeurder/ beoordelaar en voor workflow overgangen.',
+'settings_enableSessionList' => '',
+'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => 'Selecteer thema',
 'settings_enableThemeSelector_desc' => 'Schakel thema selectie op de aanmeldpagina uit',
 'settings_enableUpdateReceipt' => '',
@@ -1238,6 +1265,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => 'Dit is het maximum aantal documenten of mappen dat zal worden gecontroleerd voor toegangsrechten bij recursieve objecten telling. Als dit aantal is overschreden, zal het aantal documenten en mappen in de het map overzicht worden geschat.',
 'settings_maxSizeForFullText' => '',
 'settings_maxSizeForFullText_desc' => '',
+'settings_maxUploadSize' => '',
+'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => 'Meer instellingen. Standaard login: admin/admin',
 'settings_notfound' => 'Niet gevonden',
 'settings_Notification' => 'Notificatie instellingen',
@@ -1284,7 +1313,7 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'ID van basismap (meestal geen verandering nodig)',
 'settings_SaveError' => 'Opslagfout Configuratiebestand',
 'settings_Server' => 'Server instellingen',
-'settings_showFullPreview' => '',
+'settings_showFullPreview' => 'Toon volledige document',
 'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => 'Ontbrekende vertalingen weergeven',
 'settings_showMissingTranslations_desc' => 'Geef alle ontbrekende vertalingen onder aan de pagina weer. De gebruiker kan een verzoek tot vertaling indienen dat wordt opgeslagen als csv bestand. Let op! Zet deze functie niet aan in productieomgevingen!',
@@ -1378,6 +1407,8 @@ URL: [url]',
 'splash_edit_role' => 'Rol opgeslagen',
 'splash_edit_user' => 'Gebruiker opgeslagen',
 'splash_error_add_to_transmittal' => 'Fout: toevoeging aan verzending',
+'splash_error_rm_download_link' => '',
+'splash_error_send_download_link' => '',
 'splash_folder_edited' => 'Opslaan mapwijzigingen',
 'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Ongeldige map ID',
@@ -1385,9 +1416,11 @@ URL: [url]',
 'splash_moved_clipboard' => 'Klembord verplaatst naar de huidige map',
 'splash_move_document' => 'Document verplaatst',
 'splash_move_folder' => 'Map verplaatst',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => 'Verwijderd van het klembord',
 'splash_rm_attribute' => 'Attribuut verwijderd',
 'splash_rm_document' => 'Document verwijderd',
+'splash_rm_download_link' => '',
 'splash_rm_folder' => 'Map verwijderd',
 'splash_rm_group' => 'Groep verwijderd',
 'splash_rm_group_member' => 'Lid van de groep verwijderd',
@@ -1395,6 +1428,7 @@ URL: [url]',
 'splash_rm_transmittal' => 'Verzending verwijderd',
 'splash_rm_user' => 'Gebruiker verwijderd',
 'splash_saved_file' => '',
+'splash_send_download_link' => '',
 'splash_settings_saved' => 'Instellingen opgeslagen',
 'splash_substituted_user' => 'Invallers gebruiker',
 'splash_switched_back_user' => 'Teruggeschakeld naar de oorspronkelijke gebruiker',
@@ -1544,6 +1578,7 @@ URL: [url]',
 'use_comment_of_document' => 'Gebruik reactie van document',
 'use_default_categories' => 'Gebruik voorgedefinieerde categorieen',
 'use_default_keywords' => 'Gebruik bestaande sleutelwoorden',
+'valid_till' => '',
 'version' => 'Versie',
 'versioning_file_creation' => 'Aanmaken bestand versies',
 'versioning_file_creation_warning' => 'Met deze handeling maakt U een bestand aan die de versie voortgang informatie van een compleet DMS bevat. Na het aanmaken wordt ieder bestand opgeslagen in de document map.',
@@ -1571,6 +1606,7 @@ URL: [url]',
 'workflow_action_name' => 'Naam',
 'workflow_editor' => 'Workflow editor',
 'workflow_group_summary' => 'Groepssamenvatting',
+'workflow_has_cycle' => '',
 'workflow_initstate' => 'Begin status',
 'workflow_in_use' => 'Deze workflow wordt momenteel gebruikt door documenten.',
 'workflow_layoutdata_saved' => '',

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 (752), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (770), netixw (84), romi (93), uGn (112)
 
 $text = array(
 '2_factor_auth' => '',
@@ -140,11 +140,11 @@ URL: [url]',
 'attrdef_regex' => 'Wyrażenie regularne',
 'attrdef_type' => 'Typ',
 'attrdef_type_boolean' => '',
-'attrdef_type_date' => '',
+'attrdef_type_date' => 'Data',
 'attrdef_type_email' => '',
-'attrdef_type_float' => '',
-'attrdef_type_int' => '',
-'attrdef_type_string' => '',
+'attrdef_type_float' => 'Liczna zmiennoprzecinkowa',
+'attrdef_type_int' => 'Liczba całkowita',
+'attrdef_type_string' => 'Ciąg znaków',
 'attrdef_type_url' => '',
 'attrdef_valueset' => 'Set of values',
 'attributes' => 'Atrybuty',
@@ -222,6 +222,7 @@ URL: [url]',
 'checkedout_file_has_disappeared' => '',
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
 'choose_attrdef' => 'Proszę wybrać definicję atrybutu',
@@ -271,6 +272,7 @@ URL: [url]',
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
+'create_download_link' => '',
 'create_fulltext_index' => 'Utwórz indeks pełnotekstowy',
 'create_fulltext_index_warning' => 'Zamierzasz ponownie utworzyć indeks pełnotekstowy. To może zająć sporo czasu i ograniczyć ogólną wydajność systemu. Jeśli faktycznie chcesz to zrobić, proszę potwierdź tę operację.',
 'creation_date' => 'Utworzony',
@@ -297,7 +299,7 @@ URL: [url]',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
 'document' => 'Dokument',
-'documentcontent' => '',
+'documentcontent' => 'Zawartość dokumentu',
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Dokumenty procesowane',
@@ -376,6 +378,9 @@ URL: [url]',
 'does_not_expire' => 'Nigdy nie wygasa',
 'does_not_inherit_access_msg' => 'Dziedzicz dostęp',
 'download' => 'Pobierz',
+'download_links' => '',
+'download_link_email_body' => '',
+'download_link_email_subject' => '',
 'do_object_repair' => 'Napraw wszystkie katalogi i pliki.',
 'do_object_setchecksum' => 'Ustaw sumę kontrolną',
 'do_object_setfilesize' => 'Podaj rozmiar pliku',
@@ -393,6 +398,7 @@ URL: [url]',
 'dump_creation_warning' => 'Ta operacja utworzy plik będący zrzutem zawartości bazy danych. Po utworzeniu plik zrzutu będzie się znajdował w folderze danych na serwerze.',
 'dump_list' => 'Istniejące pliki zrzutu',
 'dump_remove' => 'Usuń plik zrzutu',
+'duplicates' => '',
 'duplicate_content' => 'Zduplikowana zawartość',
 'edit' => 'Edytuj',
 'edit_attributes' => 'Zmiana atrybutów',
@@ -442,7 +448,18 @@ URL: [url]',
 'event_details' => 'Szczegóły zdarzenia',
 'exclude_items' => '',
 'expired' => 'Wygasłe',
+'expired_at_date' => '',
 'expires' => 'Wygasa',
+'expire_by_date' => '',
+'expire_in_1d' => '',
+'expire_in_1h' => '',
+'expire_in_1m' => '',
+'expire_in_1w' => '',
+'expire_in_1y' => '',
+'expire_in_2h' => '',
+'expire_in_2y' => '',
+'expire_today' => '',
+'expire_tomorrow' => '',
 'expiry_changed_email' => 'Zmieniona data wygaśnięcia',
 'expiry_changed_email_body' => 'Zmiana daty wygaśnięcia
 Dokument: [name]
@@ -451,7 +468,7 @@ Użytkownik: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Zmiana daty wygaśnięcia',
 'export' => '',
-'extension_manager' => '',
+'extension_manager' => 'Zarządzanie rozszerzeniami',
 'february' => 'Luty',
 'file' => 'Plik',
 'files' => 'Pliki',
@@ -505,6 +522,7 @@ URL: [url]',
 'fr_FR' => 'Francuzki',
 'fullsearch' => 'Przeszukiwanie treści dokumentów',
 'fullsearch_hint' => 'Przeszukuj treść dokumentów',
+'fulltextsearch_disabled' => '',
 'fulltext_info' => 'Informacje o indeksie pełnotekstowym',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Definicje atrybutów',
@@ -524,6 +542,7 @@ URL: [url]',
 'group_review_summary' => 'Podsumowanie opiniowania dla grupy',
 'guest_login' => 'Zalogowany jako gość',
 'guest_login_disabled' => 'Logowanie dla gościa jest wyłączone.',
+'hash' => '',
 'help' => 'Pomoc',
 'home_folder' => '',
 'hook_name' => '',
@@ -541,7 +560,7 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'Uwzględnij dokumenty',
 'include_subdirectories' => 'Uwzględnij podkatalogi',
-'indexing_tasks_in_queue' => '',
+'indexing_tasks_in_queue' => 'Zadanie indeksowania w kolejce',
 'index_converters' => 'Konwersja indeksu dokumentów',
 'index_done' => '',
 'index_error' => '',
@@ -577,6 +596,7 @@ URL: [url]',
 'invalid_target_folder' => 'Nieprawidłowy identyfikator folderu docelowego',
 'invalid_user_id' => 'Nieprawidłowy identyfikator użytkownika',
 'invalid_version' => 'Nieprawidłowa wersja dokumentu',
+'in_folder' => 'w folderze',
 'in_revision' => '',
 'in_workflow' => 'W procesie',
 'is_disabled' => 'Konto nieaktywne',
@@ -623,7 +643,7 @@ URL: [url]',
 '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_to_version' => '',
-'list_access_rights' => '',
+'list_access_rights' => 'Pokaż uprawnienia dostępu',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Lokalny plik',
@@ -809,6 +829,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem
 'personal_default_keywords' => 'Osobiste sława kluczowe',
 'pl_PL' => 'Polski',
 'possible_substitutes' => '',
+'preset_expires' => '',
 'preview' => '',
 'preview_converters' => '',
 'preview_images' => '',
@@ -989,6 +1010,7 @@ URL: [url]',
 'select_one' => 'Wybierz',
 'select_users' => 'Kliknij by wybrać użytkowników',
 'select_workflow' => 'Wybierz proces',
+'send_email' => '',
 'send_test_mail' => '',
 'september' => 'Wrzesień',
 'sequence' => 'Kolejność',
@@ -996,6 +1018,7 @@ URL: [url]',
 'seq_end' => 'Na końcu',
 'seq_keep' => 'Na tej samej pozycji',
 'seq_start' => 'Na początku',
+'sessions' => '',
 'settings' => 'Ustawienia',
 'settings_activate_module' => 'Aktywuj moduł',
 'settings_activate_php_extension' => 'Aktywuj rozszerzenie PHP',
@@ -1009,7 +1032,7 @@ URL: [url]',
 'settings_autoLoginUser' => '',
 'settings_autoLoginUser_desc' => '',
 'settings_available_languages' => 'Dostępne języki',
-'settings_available_languages_desc' => '',
+'settings_available_languages_desc' => 'Tylko wybrane języki zostaną załadowane i będą widoczne w kontrolce wyboru języka. Domyślny język zawsze jest ładowany.',
 'settings_backupDir' => '',
 'settings_backupDir_desc' => '',
 'settings_cacheDir' => 'Folder bufora',
@@ -1026,8 +1049,8 @@ URL: [url]',
 'settings_contentDir_desc' => 'Miejsce, gdzie będą przechowywane wczytane pliki (najlepien wybrać katalog, który nie jest dostępny dla serwera http)',
 'settings_contentOffsetDir' => 'Offset katalogu treści',
 'settings_contentOffsetDir_desc' => 'Aby obejść ograniczenia w bazowym systemie plików, zostanie w nim utworzona nowa struktura katalogów. To wymaga określenia katalogu początkowego. Zazwyczaj można zostawić domyślną wartość, 1048576, ale może też być dowolnym numerem lub słowem, które aktualnie nie istnieje w katalogu treści (Katalog treści)',
-'settings_convertToPdf' => '',
-'settings_convertToPdf_desc' => '',
+'settings_convertToPdf' => 'Skonwertuj dokument do pdf',
+'settings_convertToPdf_desc' => 'Jeżeli dokument nie będzie możliwy do pokazania w natywnej formie, wyświetlona zostanie wersja skonwertowana do pdf.',
 'settings_cookieLifetime' => 'Czas życia ciasteczka',
 'settings_cookieLifetime_desc' => 'Czas życia pliku cookie w sekundach. Jeśli wartość zostanie ustawione na 0, plik cookie zostanie usunięte po zamknięciu przeglądarki.',
 'settings_coreDir' => 'Katalog Core letoDMS',
@@ -1054,7 +1077,7 @@ URL: [url]',
 'settings_defaultSearchMethod' => '',
 'settings_defaultSearchMethod_desc' => '',
 'settings_defaultSearchMethod_valdatabase' => 'baza danych',
-'settings_defaultSearchMethod_valfulltext' => '',
+'settings_defaultSearchMethod_valfulltext' => 'pewłnotekstowe',
 'settings_delete_install_folder' => 'Aby móc używać LetoDMS, musisz usunąć plik ENABLE_INSTALL_TOOL znajdujący się w katalogu konfiguracyjnym',
 'settings_disableSelfEdit' => 'Wyłącz auto edycję',
 'settings_disableSelfEdit_desc' => 'Jeśli zaznaczone, użytkownik nie może zmieniać własnych danych',
@@ -1063,8 +1086,8 @@ URL: [url]',
 'settings_dropFolderDir' => 'Katalog dla folderu rozwijanego',
 'settings_dropFolderDir_desc' => 'Ten katalog służy do kopiowania plików, przeznaczonych do zaimportowania, bezpośrednio do serwera i z pominięciem przeglądarki. W tym katalogu muszą się znajdować podfoldery dla wszystkich użytkowników, którzy posiadają uprawnienia do tego typu importu.',
 'settings_Edition' => 'Ustawienia edycji',
-'settings_editOnlineFileTypes' => '',
-'settings_editOnlineFileTypes_desc' => '',
+'settings_editOnlineFileTypes' => 'Edytuj typy plików online',
+'settings_editOnlineFileTypes_desc' => 'Pliki z następującymi rozszerzeniami mogą być edytowane online (używaj tylko małych liter)',
 'settings_enable2FactorAuthentication' => '',
 'settings_enable2FactorAuthentication_desc' => '',
 'settings_enableAcknowledgeWorkflow' => '',
@@ -1101,6 +1124,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Jeśli zaznaczone, wczytywanie plików będzie możliwe również przez aplet javy nazywany jumploader bez limitu rozmiaru plików. Aplet ten pozwala również na wczytywanie wielu plików jednocześnie.',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Włącz/Wyłącz powiadomienia dla zatwierdzających/recenzentów',
 'settings_enableNotificationAppRev_desc' => 'Zaznacz aby wysyłać powiadomienia do zatwierdzających i recenzentów kiedy pojawi się nowa wersja dokumentu',
 'settings_enableNotificationWorkflow' => '',
@@ -1119,6 +1144,8 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => 'Pozwalaj przeglądać/zatwierdzać dla zalogowanych użytkowników',
 'settings_enableSelfRevApp_desc' => 'Włącz tę opcję jeżeli zalogowany użytkownik ma prawo do recenzowania/zatwierdzania oraz do przepływu procesu',
+'settings_enableSessionList' => '',
+'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => '',
 'settings_enableThemeSelector_desc' => '',
 'settings_enableUpdateReceipt' => '',
@@ -1141,7 +1168,7 @@ URL: [url]',
 'settings_expandFolderTree_val0' => 'Rozpocznij z ukrytym drzewem',
 'settings_expandFolderTree_val1' => 'Rozpocznij z pokazanym drzewem i rozwiniętym pierwszym poziomem',
 'settings_expandFolderTree_val2' => 'Rozpocznij z pokazanym, w pełni rozwiniętym drzewem',
-'settings_Extensions' => '',
+'settings_Extensions' => 'Rozszerzenia',
 'settings_extraPath' => 'Dodatkowa ścieżka include dla PHP',
 'settings_extraPath_desc' => 'Ścieżka do dodatkowego oprogramowania. Jest to katalog zawierający np. adodb, pear lub dodatkowe pakiety',
 'settings_firstDayOfWeek' => 'Pierwszy dzień tygodnia',
@@ -1190,6 +1217,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => 'Jest to maksymalna liczba dokumentów i folderów, które będą sprawdzane pod kątem praw dostępu, gdy włączone jest rekurencyjnie liczenie obiektów. Jeżeli liczba ta zostanie przekroczona to ilości dokumentów i folderów w widoku zostaną oszacowane.',
 'settings_maxSizeForFullText' => '',
 'settings_maxSizeForFullText_desc' => '',
+'settings_maxUploadSize' => '',
+'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => 'Wykonaj dalszą konfigurację. Domyślny login/hasło: admin/admin',
 'settings_notfound' => 'Nie znaleziono',
 'settings_Notification' => 'Ustawienia powiadomień',
@@ -1236,9 +1265,9 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'ID katalogu głównego (zazwyczaj nie trzeba tego zmieniać)',
 'settings_SaveError' => 'Błąd zapisu pliku konfiguracyjnego',
 'settings_Server' => 'Ustawienia serwera',
-'settings_showFullPreview' => '',
+'settings_showFullPreview' => 'Pokaż cały dokument',
 'settings_showFullPreview_desc' => '',
-'settings_showMissingTranslations' => '',
+'settings_showMissingTranslations' => 'Pokaż brakujące tłumaczenia',
 'settings_showMissingTranslations_desc' => '',
 'settings_showSingleSearchHit' => '',
 'settings_showSingleSearchHit_desc' => '',
@@ -1330,6 +1359,8 @@ URL: [url]',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Zapisano użytkownika',
 'splash_error_add_to_transmittal' => '',
+'splash_error_rm_download_link' => '',
+'splash_error_send_download_link' => '',
 'splash_folder_edited' => 'Zapisz zmiany folderu',
 'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Nieprawidłowy identyfikator folderu',
@@ -1337,9 +1368,11 @@ URL: [url]',
 'splash_moved_clipboard' => 'Schowek został przeniesiony do bieżącego folderu',
 'splash_move_document' => '',
 'splash_move_folder' => '',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => 'Usunięto ze schowka',
 'splash_rm_attribute' => 'Usunięto atrybut',
 'splash_rm_document' => 'Dokument usunięto',
+'splash_rm_download_link' => '',
 'splash_rm_folder' => 'Folder usunięty',
 'splash_rm_group' => 'Grupę usunięto',
 'splash_rm_group_member' => 'Usunięto członka grupy',
@@ -1347,6 +1380,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Użytkownika usunięto',
 'splash_saved_file' => '',
+'splash_send_download_link' => '',
 'splash_settings_saved' => 'Zmiany zapisano',
 'splash_substituted_user' => 'Zmieniono użytkownika',
 'splash_switched_back_user' => 'Przełączono z powrotem do oryginalnego użytkownika',
@@ -1496,6 +1530,7 @@ URL: [url]',
 'use_comment_of_document' => 'Skomentuj dokumentu',
 'use_default_categories' => 'Użyj predefiniowanych kategorii',
 'use_default_keywords' => 'Użyj predefiniowanych słów kluczowych',
+'valid_till' => '',
 'version' => 'Wersja',
 'versioning_file_creation' => 'Utwórz archiwum z wersjonowaniem',
 'versioning_file_creation_warning' => 'Ta operacja utworzy plik zawierający informacje o wersjach plików z całego wskazanego folderu. Po utworzeniu, każdy plik będzie zapisany w folderze odpowiednim dla danego dokumentu.',
@@ -1523,6 +1558,7 @@ URL: [url]',
 'workflow_action_name' => 'Nazwa',
 'workflow_editor' => 'Edytor procesu',
 'workflow_group_summary' => 'Podsumowanie grupy',
+'workflow_has_cycle' => '',
 'workflow_initstate' => 'Początkowy status',
 'workflow_in_use' => 'Proces ten jest obecnie zastosowany w dokumentach.',
 'workflow_layoutdata_saved' => '',

languages/pt_BR/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (934), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (945), flaviove (627), lfcristofoli (352)
 
 $text = array(
 '2_factor_auth' => '',
@@ -173,14 +173,14 @@ URL: [url]',
 'attr_malformed_int' => '',
 'attr_malformed_url' => '',
 'attr_max_values' => '',
-'attr_min_values' => '',
+'attr_min_values' => 'O valor mínimo para o atributo [attrname] não foi alcançado.',
 'attr_not_in_valueset' => '',
 'attr_no_regex_match' => 'O valor do atributo não corresponde à expressão regular',
 'attr_validation_error' => '',
 'at_least_n_users_of_group' => 'Pelo menos [nuber_of_users] usuários de [group]',
 'august' => 'August',
 'authentication' => 'Autenticação',
-'author' => '',
+'author' => 'Autor',
 'automatic_status_update' => 'Mudança de status automático',
 'back' => 'Voltar',
 'backup_list' => 'Existings backup list',
@@ -229,6 +229,7 @@ URL: [url]',
 'checkedout_file_has_disappeared' => '',
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
 'choose_attrdef' => 'Por favor escolha a definição de atributo',
@@ -278,6 +279,7 @@ URL: [url]',
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
+'create_download_link' => '',
 'create_fulltext_index' => 'Criar índice de texto completo',
 'create_fulltext_index_warning' => 'Você está para recriar o índice de texto completo. Isso pode levar uma quantidade considerável de tempo e reduzir o desempenho geral do sistema. Se você realmente deseja recriar o índice, por favor confirme a operação.',
 'creation_date' => 'Criado',
@@ -382,6 +384,9 @@ URL: [url]',
 'does_not_expire' => 'não Expira',
 'does_not_inherit_access_msg' => 'Inherit access',
 'download' => 'Download',
+'download_links' => '',
+'download_link_email_body' => '',
+'download_link_email_subject' => '',
 'do_object_repair' => 'Reparar todas as pastas e documentos.',
 'do_object_setchecksum' => 'Defina soma de verificação',
 'do_object_setfilesize' => 'Defina o tamanho do arquivo',
@@ -399,6 +404,7 @@ URL: [url]',
 'dump_creation_warning' => 'With this operation you can create a dump file of your database content. After the creation the dump file will be saved in the data folder of your server.',
 'dump_list' => 'Existings dump files',
 'dump_remove' => 'Remove dump file',
+'duplicates' => '',
 'duplicate_content' => 'Conteúdo Duplicado',
 'edit' => 'editar',
 'edit_attributes' => 'Editar atributos',
@@ -448,7 +454,18 @@ URL: [url]',
 'event_details' => 'Event details',
 'exclude_items' => 'Excluir ítens',
 'expired' => 'Expirado',
+'expired_at_date' => '',
 'expires' => 'Expira',
+'expire_by_date' => '',
+'expire_in_1d' => '',
+'expire_in_1h' => '',
+'expire_in_1m' => '',
+'expire_in_1w' => '',
+'expire_in_1y' => '',
+'expire_in_2h' => '',
+'expire_in_2y' => '',
+'expire_today' => '',
+'expire_tomorrow' => '',
 'expiry_changed_email' => 'Data de validade mudou',
 'expiry_changed_email_body' => 'Data de validade mudou
 Documento: [name]
@@ -511,6 +528,7 @@ URL: [url]',
 'fr_FR' => 'Francês',
 'fullsearch' => 'Pesquisa de texto completo',
 'fullsearch_hint' => 'Use índice de texto completo',
+'fulltextsearch_disabled' => '',
 'fulltext_info' => 'Informações índice Texto completo',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Atributos',
@@ -530,6 +548,7 @@ URL: [url]',
 'group_review_summary' => 'Resumo da avaliação do grupo',
 'guest_login' => 'Entre como convidado',
 'guest_login_disabled' => 'Guest login is disabled.',
+'hash' => '',
 'help' => 'Ajuda',
 'home_folder' => '',
 'hook_name' => '',
@@ -547,7 +566,7 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'Include documents',
 'include_subdirectories' => 'Include subdirectories',
-'indexing_tasks_in_queue' => '',
+'indexing_tasks_in_queue' => 'Tarefas de indexação em fila',
 'index_converters' => 'Índice de conversão de documentos',
 'index_done' => '',
 'index_error' => '',
@@ -583,6 +602,7 @@ URL: [url]',
 'invalid_target_folder' => 'Invalid Target Folder ID',
 'invalid_user_id' => 'Invalid User ID',
 'invalid_version' => 'Invalid Document Version',
+'in_folder' => 'Na Pasta',
 'in_revision' => '',
 'in_workflow' => 'No fluxo de trabalho',
 'is_disabled' => 'Desativar conta',
@@ -629,7 +649,7 @@ URL: [url]',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Se você gostaria de fazer envio de arquivos maiores que o tamanho permitido, por favor use a página alternativa de <a href="%s">envio</a>.',
 'link_to_version' => '',
-'list_access_rights' => '',
+'list_access_rights' => 'Listar todos os direitos de acesso...',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Arquivo local',
@@ -771,7 +791,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Somente imagens jpg podem ser utilizadas como avatar',
 'order_by_sequence_off' => '',
 'original_filename' => 'Arquivo original',
-'overall_indexing_progress' => '',
+'overall_indexing_progress' => 'Progresso geral da indexação',
 'owner' => 'Proprietário',
 'ownership_changed_email' => 'O proprietário mudou',
 'ownership_changed_email_body' => 'Proprietário mudou
@@ -814,6 +834,7 @@ Se você ainda tiver problemas para fazer o login, por favor, contate o administ
 'personal_default_keywords' => 'palavras-chave pessoais',
 'pl_PL' => 'Polonês',
 'possible_substitutes' => '',
+'preset_expires' => '',
 'preview' => 'visualizar',
 'preview_converters' => '',
 'preview_images' => '',
@@ -1007,6 +1028,7 @@ URL: [url]',
 'select_one' => 'Selecione um',
 'select_users' => 'Clique para selecionar os usuários',
 'select_workflow' => 'Selecione o fluxo de trabalho',
+'send_email' => '',
 'send_test_mail' => '',
 'september' => 'September',
 'sequence' => 'Sequência',
@@ -1014,6 +1036,7 @@ URL: [url]',
 'seq_end' => 'No final',
 'seq_keep' => 'Manter posição',
 'seq_start' => 'Primeira posição',
+'sessions' => '',
 'settings' => 'Configurações',
 'settings_activate_module' => 'Ativar módulo',
 'settings_activate_php_extension' => 'Ativar extensão PHP',
@@ -1024,10 +1047,10 @@ URL: [url]',
 'settings_advancedAcl_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Módulo Rewrite',
 'settings_Authentication' => 'Definições de autenticação',
-'settings_autoLoginUser' => '',
+'settings_autoLoginUser' => 'Login automático',
 'settings_autoLoginUser_desc' => '',
 'settings_available_languages' => 'Idiomas disponíveis',
-'settings_available_languages_desc' => '',
+'settings_available_languages_desc' => 'Apenas os idiomas selecionados serão carregados e mostrados no seletor de idioma. O idioma padrão sempre será carregado.',
 'settings_backupDir' => '',
 'settings_backupDir_desc' => '',
 'settings_cacheDir' => 'Diretório de cache',
@@ -1044,7 +1067,7 @@ URL: [url]',
 'settings_contentDir_desc' => 'Onde arquivos enviados são armazenados (melhor escolher um diretório que não é acessível através de seu web-server)',
 'settings_contentOffsetDir' => 'Pasta de Compensação de Conteúdo',
 'settings_contentOffsetDir_desc' => 'Para contornar as limitações do sistema de arquivos subjacente, uma nova estrutura de diretórios foi concebida que existe dentro do diretório de conteúdo (Content Directory). Isso requer um diretório base para começar. Normalmente, deixe Isso para a configuração padrão, 1048576, mas pode ser qualquer número ou cadeia de caracteres que ainda não existe dentro (Diretório de conteúdo)',
-'settings_convertToPdf' => '',
+'settings_convertToPdf' => 'Converte o PDF para visualização',
 'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => 'Tempo de Vida dos Cookies',
 'settings_cookieLifetime_desc' => 'O tempo de vida de um cookie em segundos. Se definido como 0, o cookie será removido quando o navegador é fechado.',
@@ -1119,6 +1142,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Se selecionado, o upload de arquivo também estará disponível através de um applet java chamado jumploader sem limite de tamanho de arquivo definido pelo navegador. Ele também permite fazer o upload de vários arquivos de uma só vez.',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Habilitar notificações revisor/aprovador',
 'settings_enableNotificationAppRev_desc' => 'Verificar o envio de uma notificação para o revisor/aprovador quando uma nova versão do documento for adicionada',
 'settings_enableNotificationWorkflow' => '',
@@ -1137,6 +1162,8 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => 'Permitir revisão/aprovação para usuário conectado',
 'settings_enableSelfRevApp_desc' => 'Habilite esta opção se quiser que o usuário conectado no momento seja listado como revisores/aprovadores e para transições de fluxo de trabalho.',
+'settings_enableSessionList' => '',
+'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => 'Seleção de tema',
 'settings_enableThemeSelector_desc' => 'Liga/desliga o seletor de tema na página de login.',
 'settings_enableUpdateReceipt' => '',
@@ -1166,7 +1193,7 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => 'Primeiro dia da semana',
 'settings_footNote' => 'Nota de Pé',
 'settings_footNote_desc' => 'Mensagem a ser exibida na parte inferior de cada página',
-'settings_fullSearchEngine' => '',
+'settings_fullSearchEngine' => 'Motor de texto',
 'settings_fullSearchEngine_desc' => 'Selecione o método utilizado para a busca textual',
 'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
@@ -1208,6 +1235,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => 'Este é o número máximo de documentos ou pastas que serão verificados por direitos de acesso, quando recursivamente contar objetos. Se esse número for ultrapassado, será estimado o número de documentos e pastas na visualização da pasta.',
 'settings_maxSizeForFullText' => '',
 'settings_maxSizeForFullText_desc' => '',
+'settings_maxUploadSize' => '',
+'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => 'Configurar outras configurações. Login padrão: admin/admin',
 'settings_notfound' => 'Não encontrado',
 'settings_Notification' => 'Configurações de notificação',
@@ -1254,7 +1283,7 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'ID da pasta-raiz (na maioria das vezes não precisa ser mudado)',
 'settings_SaveError' => 'Erro no arquivo de configuração salvo',
 'settings_Server' => 'Configuraçoes do servidor',
-'settings_showFullPreview' => '',
+'settings_showFullPreview' => 'Mostra o documento completo',
 'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => 'Mostrar traduções em falta',
 'settings_showMissingTranslations_desc' => 'Listar todas as traduções faltando na página na parte inferior da página. O usuário conectado será capaz de apresentar uma proposta para uma tradução em falta que serão salvos em um arquivo CSV. Não ativar eáa função, se em um ambiente de produção!',
@@ -1348,6 +1377,8 @@ URL: [url]',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Usuário salvo',
 'splash_error_add_to_transmittal' => '',
+'splash_error_rm_download_link' => '',
+'splash_error_send_download_link' => '',
 'splash_folder_edited' => 'Salvar modificação de pastas',
 'splash_importfs' => '',
 'splash_invalid_folder_id' => 'ID de pasta inválida',
@@ -1355,9 +1386,11 @@ URL: [url]',
 'splash_moved_clipboard' => 'Área de transferência movida para a pasta corrente',
 'splash_move_document' => '',
 'splash_move_folder' => '',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => 'Remover da área de transferência',
 'splash_rm_attribute' => 'Atributo removido',
 'splash_rm_document' => 'Documento removido',
+'splash_rm_download_link' => '',
 'splash_rm_folder' => 'Pasta excluida',
 'splash_rm_group' => 'Grupo removido',
 'splash_rm_group_member' => 'Membro do grupo removido',
@@ -1365,6 +1398,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Usuário removido',
 'splash_saved_file' => '',
+'splash_send_download_link' => '',
 'splash_settings_saved' => 'Configurações salvas',
 'splash_substituted_user' => 'Usuário substituido',
 'splash_switched_back_user' => 'Comutada de volta ao usuário original',
@@ -1514,6 +1548,7 @@ URL: [url]',
 'use_comment_of_document' => 'Utilize comentário de documento',
 'use_default_categories' => 'Utilize categorias predefinidas',
 'use_default_keywords' => 'Use palavras-chave pré-definidas',
+'valid_till' => '',
 'version' => 'Versão',
 'versioning_file_creation' => 'Versioning file creation',
 'versioning_file_creation_warning' => 'With this operation you can create a file containing the versioning information of an entire DMS folder. After the creation every file will be saved inside the document folder.',
@@ -1541,6 +1576,7 @@ URL: [url]',
 'workflow_action_name' => 'Nome',
 'workflow_editor' => 'Editor de Fluxo de trabalho',
 'workflow_group_summary' => 'Sumário do grupo',
+'workflow_has_cycle' => '',
 'workflow_initstate' => 'Estado inicial',
 'workflow_in_use' => 'Esse fluxo de trabalho é usado atualmente por documentos.',
 'workflow_layoutdata_saved' => '',

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 (1048), balan (87)
+//    Translators: Admin (1060), balan (87)
 
 $text = array(
 '2_factor_auth' => '',
@@ -152,7 +152,7 @@ URL: [url]',
 'attrdef_regex' => 'Expresie regulată',
 'attrdef_type' => 'Tip',
 'attrdef_type_boolean' => 'Boolean',
-'attrdef_type_date' => '',
+'attrdef_type_date' => 'Data',
 'attrdef_type_email' => 'Email',
 'attrdef_type_float' => 'Float',
 'attrdef_type_int' => 'Intreg',
@@ -234,6 +234,7 @@ URL: [url]',
 'checkedout_file_has_disappeared' => 'Fisierul documentului verificat a disparut. Check in-ul nu va fi posibil.',
 'checkedout_file_is_unchanged' => 'Fisierul documentului verificat este inca neschimbat. Check in-ul nu va fi posibil. Daca nu planuiti modificari, puteti reseta starea de Verificare.',
 'checkin_document' => 'Check In',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => 'Verifica',
 'checkout_is_disabled' => 'Verificarea documentelor este dezactivata in configurari.',
 'choose_attrdef' => 'Vă rugăm să alegeți definiția atributului',
@@ -255,7 +256,7 @@ URL: [url]',
 'clear_password' => '',
 'clipboard' => 'Clipboard',
 'close' => 'Inchide',
-'command' => '',
+'command' => 'Comanda',
 'comment' => 'Comentariu',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Comentariu versiune',
@@ -283,6 +284,7 @@ URL: [url]',
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
+'create_download_link' => '',
 'create_fulltext_index' => 'Creați indexul pentru tot textul',
 'create_fulltext_index_warning' => 'Sunteți pe cale sa recreați indexul pentru tot textul. Acest lucru poate dura o perioadă considerabilă de timp și poate reduce performanța sistemului în ansamblu. Dacă doriți cu adevărat să recreati indexul pentru tot textul, vă rugăm să confirmați operațiunea.',
 'creation_date' => 'Creat',
@@ -309,7 +311,7 @@ URL: [url]',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
 'document' => 'Document',
-'documentcontent' => '',
+'documentcontent' => 'Continut Document',
 'documents' => 'Documente',
 'documents_checked_out_by_you' => 'Documente verificate de tine',
 'documents_in_process' => 'Documente în procesare',
@@ -388,6 +390,9 @@ URL: [url]',
 'does_not_expire' => 'Nu expiră',
 'does_not_inherit_access_msg' => 'Acces moștenit',
 'download' => 'Descarca',
+'download_links' => '',
+'download_link_email_body' => '',
+'download_link_email_subject' => '',
 'do_object_repair' => 'Repară toate folderele și documentele.',
 'do_object_setchecksum' => 'Setare sumă de control(checksum)',
 'do_object_setfilesize' => 'Setare dimensiune fișier',
@@ -405,6 +410,7 @@ URL: [url]',
 'dump_creation_warning' => 'Cu această operațiune puteți crea un fișier de imagine a conținutului bazei de date. După crearea fișierului de imagine acesta va fi salvat în folderul de date a serverului.',
 'dump_list' => 'Fișiere imagine existente',
 'dump_remove' => 'Sterge fișier imagine',
+'duplicates' => '',
 'duplicate_content' => '',
 'edit' => 'Editează',
 'edit_attributes' => 'Editează atribute',
@@ -454,7 +460,18 @@ URL: [url]',
 'event_details' => 'Detalii eveniment',
 'exclude_items' => 'Elemente excluse',
 'expired' => 'Expirat',
+'expired_at_date' => '',
 'expires' => 'Expiră',
+'expire_by_date' => '',
+'expire_in_1d' => '',
+'expire_in_1h' => '',
+'expire_in_1m' => '',
+'expire_in_1w' => '',
+'expire_in_1y' => '',
+'expire_in_2h' => '',
+'expire_in_2y' => '',
+'expire_today' => '',
+'expire_tomorrow' => '',
 'expiry_changed_email' => 'Data de expirare schimbată',
 'expiry_changed_email_body' => 'Data de expirare schimbată
 Document: [name]
@@ -517,6 +534,7 @@ URL: [url]',
 'fr_FR' => 'Franceza',
 'fullsearch' => 'Căutare text complet',
 'fullsearch_hint' => 'Foloseste indexarea intregului text',
+'fulltextsearch_disabled' => '',
 'fulltext_info' => 'Info indexarea intregului text',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Atribute',
@@ -536,6 +554,7 @@ URL: [url]',
 'group_review_summary' => 'Sumar revizuiri grup',
 'guest_login' => 'Login ca oaspete',
 'guest_login_disabled' => 'Logarea ca oaspete este dezactivată.',
+'hash' => '',
 'help' => 'Ajutor',
 'home_folder' => 'Folder Home',
 'hook_name' => '',
@@ -553,7 +572,7 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'Include documente',
 'include_subdirectories' => 'Include subfoldere',
-'indexing_tasks_in_queue' => '',
+'indexing_tasks_in_queue' => 'Actiuni de indexare in stiva',
 'index_converters' => 'Indexare conversie documente',
 'index_done' => '',
 'index_error' => '',
@@ -589,6 +608,7 @@ URL: [url]',
 'invalid_target_folder' => 'ID Folder țintă invalid',
 'invalid_user_id' => 'ID Utilizator invalid',
 'invalid_version' => 'Versiune Document invalidă',
+'in_folder' => '',
 'in_revision' => 'In revizuire',
 'in_workflow' => 'În workflow',
 'is_disabled' => 'Dezactivează cont',
@@ -635,7 +655,7 @@ URL: [url]',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Dacă doriți să încărcați fișiere mai mari decât dimensiunea maximă curentă de încărcare, vă rugăm să folosiți alternativa <a href="%s">pagină de încărcare</a>.',
 'link_to_version' => '',
-'list_access_rights' => '',
+'list_access_rights' => 'Listeaza toate drepturile de acces',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Fișier local',
@@ -778,7 +798,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Doar imagini .jpg pot fi utilizate ca imagine-utilizator',
 'order_by_sequence_off' => 'Ordonarea dupa secventa este dezactivata in setari. Daca doriti acest parametru sa aiba efect, va trebui sa-l reactivati.',
 'original_filename' => 'Nume de fișier original',
-'overall_indexing_progress' => '',
+'overall_indexing_progress' => 'Progres indexare total',
 'owner' => 'Proprietar',
 'ownership_changed_email' => 'Proprietar schimbat',
 'ownership_changed_email_body' => 'Proprietar schimbat
@@ -821,6 +841,7 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț
 'personal_default_keywords' => 'Liste de cuvinte cheie personale',
 'pl_PL' => 'Poloneză',
 'possible_substitutes' => '',
+'preset_expires' => '',
 'preview' => '',
 'preview_converters' => '',
 'preview_images' => '',
@@ -1032,13 +1053,15 @@ URL: [url]',
 'select_one' => 'Selectați unul',
 'select_users' => 'Click pentru a selecta utilizatori',
 'select_workflow' => 'Selectați workflow',
-'send_test_mail' => '',
+'send_email' => '',
+'send_test_mail' => 'Trimite e-mail de test',
 'september' => 'Septembrie',
 'sequence' => 'Poziție',
 'seq_after' => 'După "[prevname]"',
 'seq_end' => 'La sfârșit',
 'seq_keep' => 'Păstrați poziția',
 'seq_start' => 'Prima poziție',
+'sessions' => '',
 'settings' => 'Setări',
 'settings_activate_module' => 'Activați modulul',
 'settings_activate_php_extension' => 'Activați extensia PHP',
@@ -1049,9 +1072,9 @@ URL: [url]',
 'settings_advancedAcl_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Setări de autentificare',
-'settings_autoLoginUser' => '',
+'settings_autoLoginUser' => 'Login automat',
 'settings_autoLoginUser_desc' => '',
-'settings_available_languages' => '',
+'settings_available_languages' => 'Limbi disponibile',
 'settings_available_languages_desc' => '',
 'settings_backupDir' => '',
 'settings_backupDir_desc' => '',
@@ -1069,7 +1092,7 @@ URL: [url]',
 'settings_contentDir_desc' => 'Unde sunt stocate  fișierele încărcate (este recomandat sa alegeti un director care nu este accesibil prin intermediul web-server-ului dumneavoastră)',
 'settings_contentOffsetDir' => 'Conținut Director Offset',
 'settings_contentOffsetDir_desc' => 'Pentru a lucra în jurul valorii de limităre în sistemul de fișiere de bază, o nouă structură director a fost concepută care există  in directorul conținut (Content Director). Acest lucru necesită un director de bază din care să se înceapă. De obicei, lăsați asta la setarea implicită, 1048576, dar se poate trece orice număr sau șir care nu este deja inclus (Content Director)',
-'settings_convertToPdf' => '',
+'settings_convertToPdf' => 'Converteste PDF pentru previzualizare',
 'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => 'Timp de viață Cookie',
 'settings_cookieLifetime_desc' => 'Durata de viață a unui cookie în secunde. Dacă este setat la 0 cookie-ul va fi eliminat atunci când browser-ul este închis.',
@@ -1144,6 +1167,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Dacă este setat, incărcarea este de asemenea disponibilă prin intermediul unui applet Java numit jumploader fără limită de dimensiune a fișierului stabilită de browser. De asemenea, permite încărcarea mai multor fișiere într-un singur pas. Activand aceasta optiune va dezactiva optiunea http only cookies.',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Activare notificari rezuitor/aprobator',
 'settings_enableNotificationAppRev_desc' => 'Bifati pentru a trimite o notificare către revizuitor/aprobator când se adaugă o nouă versiune la document',
 'settings_enableNotificationWorkflow' => 'Trimite notificare utilizatorilor din urmatorul pas al workflow-ului',
@@ -1162,6 +1187,8 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => 'Permite revizuirea/aprobarea pentru utilizatorul autentificat',
 'settings_enableSelfRevApp_desc' => 'Activați această opțiune dacă doriți ca utilizatorul autentificat să fie listat ca revizuitor/aprobator sau in tranzițiile workflow-ului.',
+'settings_enableSessionList' => '',
+'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => 'Selecție Temă',
 'settings_enableThemeSelector_desc' => 'Activare/dezactivare selector temă pe pagina de login.',
 'settings_enableUpdateReceipt' => '',
@@ -1233,6 +1260,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => 'Acesta este numărul maxim de documente sau foldere care vor fi verificate pentru drepturile de acces, atunci când se numără recursiv obiectele. Dacă acest număr este depășit, numărul de documente și foldere în vizualizarea directorului va fi estimat.',
 'settings_maxSizeForFullText' => '',
 'settings_maxSizeForFullText_desc' => '',
+'settings_maxUploadSize' => '',
+'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => 'Configurare mai multe setări. Autentificare implicită: admin/admin',
 'settings_notfound' => 'Nu a fost găsit',
 'settings_Notification' => 'Setările de notificare',
@@ -1279,7 +1308,7 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'ID-ul folder-ului rădăcină (de regulă nu este nevoie să se schimbe)',
 'settings_SaveError' => 'Eroare la salvarea fișierului de configurare',
 'settings_Server' => 'Setări server',
-'settings_showFullPreview' => '',
+'settings_showFullPreview' => 'Afiseaza document integral',
 'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => 'Arată traducerile lipsă',
 'settings_showMissingTranslations_desc' => 'Listează toate traducerile lipsă în partea de jos a paginii. Utilizatorul autentificat va putea să propună o traducere lipsă care va fi apoi salvată într-un fișier csv. Nu porniți această funcționalitate într-un mediu de producție!',
@@ -1373,6 +1402,8 @@ URL: [url]',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Utilizator salvat',
 'splash_error_add_to_transmittal' => '',
+'splash_error_rm_download_link' => '',
+'splash_error_send_download_link' => '',
 'splash_folder_edited' => 'Salvați modificările folderului',
 'splash_importfs' => '',
 'splash_invalid_folder_id' => 'ID folder invalid',
@@ -1380,9 +1411,11 @@ URL: [url]',
 'splash_moved_clipboard' => 'Clipboard mutat în folderul curent',
 'splash_move_document' => '',
 'splash_move_folder' => '',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => 'Eliminat din clipboard',
 'splash_rm_attribute' => 'Atribut eliminat',
 'splash_rm_document' => 'Document eliminat',
+'splash_rm_download_link' => '',
 'splash_rm_folder' => 'Folder șters',
 'splash_rm_group' => 'Grup eliminat',
 'splash_rm_group_member' => 'Membru grup eliminat',
@@ -1390,6 +1423,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Uilizator eliminat',
 'splash_saved_file' => '',
+'splash_send_download_link' => '',
 'splash_settings_saved' => 'Setări salvate',
 'splash_substituted_user' => 'Utilizator substituit',
 'splash_switched_back_user' => 'Comutat înapoi la utilizatorul original',
@@ -1449,7 +1483,7 @@ URL: [url]',
 'thursday' => 'Joi',
 'thursday_abbr' => 'Jo',
 'timeline' => 'Cronologie',
-'timeline_add_file' => '',
+'timeline_add_file' => 'Atasament nou',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '[document]<br />Adaugă atașament',
 'timeline_full_add_version' => '',
@@ -1539,6 +1573,7 @@ URL: [url]',
 'use_comment_of_document' => 'Utilizați comentarii la documente',
 'use_default_categories' => 'Utilizați categorii predefinite',
 'use_default_keywords' => 'Utilizați cuvinte cheie predefinite',
+'valid_till' => '',
 'version' => 'Versiune',
 'versioning_file_creation' => 'Creare fișier de versionare',
 'versioning_file_creation_warning' => 'Cu această operațiune puteți crea un fișier care conține informațiile versiunilor pentru un întreg folder DMS. După creare, fiecare fisier va fi salvat in folder-ul de documente.',
@@ -1566,6 +1601,7 @@ URL: [url]',
 'workflow_action_name' => 'Nume',
 'workflow_editor' => 'Editor Workflow',
 'workflow_group_summary' => 'Sumar Grup',
+'workflow_has_cycle' => '',
 'workflow_initstate' => 'Stare inițială',
 'workflow_in_use' => 'Acest Workflow este utilizat în prezent de documente.',
 'workflow_layoutdata_saved' => '',

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 (1642)
+//    Translators: Admin (1644)
 
 $text = array(
 '2_factor_auth' => 'Двухфакторная аутентификация',
@@ -234,6 +234,7 @@ URL: [url]',
 'checkedout_file_has_disappeared' => 'Файл полученного документа не найден. Загрузка невозможна.',
 'checkedout_file_is_unchanged' => 'Документ не изменен. Загрузка не возможна.',
 'checkin_document' => 'Получение',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => 'Загрузка',
 'checkout_is_disabled' => 'Загрузка отключена.',
 'choose_attrdef' => 'Выберите атрибут',
@@ -283,6 +284,7 @@ URL: [url]',
 'converter_new_cmd' => 'Команда',
 'converter_new_mimetype' => 'Новый mime тип',
 'copied_to_checkout_as' => 'Файл скопирован в среду загрузки как \'[filename]\' на [date]',
+'create_download_link' => '',
 'create_fulltext_index' => 'Создать полнотекстовый индекс',
 'create_fulltext_index_warning' => 'Вы хотите пересоздать полнотекстовый индекс. Это займёт какое-то время и снизит производительность. Продолжить?',
 'creation_date' => 'Создан',
@@ -309,7 +311,7 @@ URL: [url]',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
 'document' => 'Документ',
-'documentcontent' => '',
+'documentcontent' => 'Содержание документа',
 'documents' => 'док.',
 'documents_checked_out_by_you' => 'Документ проверен вами',
 'documents_in_process' => 'Документы в работе',
@@ -388,6 +390,9 @@ URL: [url]',
 'does_not_expire' => 'безсрочный',
 'does_not_inherit_access_msg' => 'Наследовать уровень доступа',
 'download' => 'Загрузить',
+'download_links' => '',
+'download_link_email_body' => '',
+'download_link_email_subject' => '',
 'do_object_repair' => 'Исправить все каталоги и документы',
 'do_object_setchecksum' => 'Установить контрольную сумму',
 'do_object_setfilesize' => 'Установить размер файла',
@@ -405,6 +410,7 @@ URL: [url]',
 'dump_creation_warning' => 'Эта операция создаст дамп базы данных. После создания, файл будет сохранен в каталоге данных сервера.',
 'dump_list' => 'Существующие дампы',
 'dump_remove' => 'Удалить дамп',
+'duplicates' => '',
 'duplicate_content' => 'Дублированное содержимое',
 'edit' => 'Изменить',
 'edit_attributes' => 'Изменить атрибуты',
@@ -454,7 +460,18 @@ URL: [url]',
 'event_details' => 'Информация о событии',
 'exclude_items' => 'Не показывать события:',
 'expired' => 'Срок действия вышел',
+'expired_at_date' => '',
 'expires' => 'Срок действия',
+'expire_by_date' => '',
+'expire_in_1d' => '',
+'expire_in_1h' => '',
+'expire_in_1m' => '',
+'expire_in_1w' => '',
+'expire_in_1y' => '',
+'expire_in_2h' => '',
+'expire_in_2y' => '',
+'expire_today' => '',
+'expire_tomorrow' => '',
 'expiry_changed_email' => 'Срок действия изменен',
 'expiry_changed_email_body' => 'Срок действия изменен
 Документ: [name]
@@ -517,6 +534,7 @@ URL: [url]',
 'fr_FR' => 'French',
 'fullsearch' => 'Полнотекстовый поиск',
 'fullsearch_hint' => 'Использовать полнотекстовый индекс',
+'fulltextsearch_disabled' => '',
 'fulltext_info' => 'Информация о полнотекстовом индексе',
 'global_attributedefinitiongroups' => 'Глобальные группы атрибутов',
 'global_attributedefinitions' => 'Атрибуты',
@@ -536,6 +554,7 @@ URL: [url]',
 'group_review_summary' => 'Сводка по рецензированию группы',
 'guest_login' => 'Войти как гость',
 'guest_login_disabled' => 'Гостевой вход отключён',
+'hash' => '',
 'help' => 'Помощь',
 'home_folder' => 'Домашний каталог',
 'hook_name' => 'Имя хука',
@@ -589,6 +608,7 @@ URL: [url]',
 'invalid_target_folder' => 'Неверный идентификатор целевого каталога',
 'invalid_user_id' => 'Неверный идентификатор пользователя',
 'invalid_version' => 'Неверная версия документа',
+'in_folder' => '',
 'in_revision' => 'В рассмотрении',
 'in_workflow' => 'В процессе',
 'is_disabled' => 'Отключить учётную запись',
@@ -635,7 +655,7 @@ URL: [url]',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Для загрузки файлов, превышающих ограничение размера, используйте <a href="%s">другой способ</a>.',
 'link_to_version' => '',
-'list_access_rights' => '',
+'list_access_rights' => 'Показать все права доступа',
 'list_contains_no_access_docs' => '',
 'list_hooks' => 'Список хуков',
 'local_file' => 'Локальный файл',
@@ -818,6 +838,7 @@ URL: [url]',
 'personal_default_keywords' => 'Личный список меток',
 'pl_PL' => 'Polish',
 'possible_substitutes' => 'Замена',
+'preset_expires' => '',
 'preview' => 'Предварительный просмотр',
 'preview_converters' => 'Предварительный просмотр конвертации документа',
 'preview_images' => '',
@@ -1039,6 +1060,7 @@ URL: [url]',
 'select_one' => 'Выберите',
 'select_users' => 'Выберите пользователей',
 'select_workflow' => 'Выберите процесс',
+'send_email' => '',
 'send_test_mail' => 'Отправить тестовое сообщение',
 'september' => 'Сентябрь',
 'sequence' => 'Позиция',
@@ -1046,6 +1068,7 @@ URL: [url]',
 'seq_end' => 'В конце',
 'seq_keep' => 'Не изменять',
 'seq_start' => 'В начале',
+'sessions' => '',
 'settings' => 'Настройки',
 'settings_activate_module' => 'Активировать модуль',
 'settings_activate_php_extension' => 'Активировать расширение PHP',
@@ -1151,6 +1174,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Если включено, загрузка файлов доступна так же через Java-апплет, называемый jumploader, без ограничения размера файла. Это также позволит загружать несколько файлов за раз.',
 'settings_enableMenuTasks' => 'Включить список задач в меню',
 'settings_enableMenuTasks_desc' => 'Включить/отключить пункт меню, который содержит все задачи пользователя. Там содержатся документы, которые нуждаются в рецензии, утверждении и т.д.',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Извещать рецензента или утверждающего',
 'settings_enableNotificationAppRev_desc' => 'Включите для отправки извещения рецензенту или утверждающему при добавлении новой версии документа.',
 'settings_enableNotificationWorkflow' => 'Отправить уведомление пользователям в следующей стадии процесса',
@@ -1169,6 +1194,8 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => 'Включить для активации функции ревизии документа по истечении определенного периода времени.',
 'settings_enableSelfRevApp' => 'Разрешить рецензию/утверждение<br/>пользователями вошедшими в систему',
 'settings_enableSelfRevApp_desc' => 'Включите для того, чтобы пользователи, в настоящее время выполнившие вход в систему, были в списке рецензентов/утверждающих и в изменении процесса.',
+'settings_enableSessionList' => '',
+'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => 'Выбор темы',
 'settings_enableThemeSelector_desc' => 'Включить или отключить возможность выбора темы на странице входа.',
 'settings_enableUpdateReceipt' => '',
@@ -1240,6 +1267,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => 'Максимальное количество документов или каталогов, которые будут проверены на права доступа при рекурсивном подсчёте объектов. При превышении этого количества, будет оценено количество документов и каталогов в виде каталога.',
 'settings_maxSizeForFullText' => 'Макс. размер документа для индексирования на лету',
 'settings_maxSizeForFullText_desc' => 'Размер документа, который может быть индексирован срузу после добавления',
+'settings_maxUploadSize' => '',
+'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => 'Прочие настройки. Логин по умолчанию: admin/admin',
 'settings_notfound' => 'Не найден',
 'settings_Notification' => 'Настройки извещения',
@@ -1380,6 +1409,8 @@ URL: [url]',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Пользователь сохранён',
 'splash_error_add_to_transmittal' => '',
+'splash_error_rm_download_link' => '',
+'splash_error_send_download_link' => '',
 'splash_folder_edited' => 'Изменения каталога сохранены',
 'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Неверный идентификатор каталога',
@@ -1387,9 +1418,11 @@ URL: [url]',
 'splash_moved_clipboard' => 'Буфер обмена перенесён в текущий каталог',
 'splash_move_document' => '',
 'splash_move_folder' => '',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => 'Удалён из буфера обмена',
 'splash_rm_attribute' => 'Атрибут удалён',
 'splash_rm_document' => 'Документ удалён',
+'splash_rm_download_link' => '',
 'splash_rm_folder' => 'Папка удалена',
 'splash_rm_group' => 'Группа удалена',
 'splash_rm_group_member' => 'Удалён член группы',
@@ -1397,6 +1430,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Пользователь удалён',
 'splash_saved_file' => '',
+'splash_send_download_link' => '',
 'splash_settings_saved' => 'Настройки сохранены',
 'splash_substituted_user' => 'Пользователь переключён',
 'splash_switched_back_user' => 'Переключён на исходного пользователя',
@@ -1546,6 +1580,7 @@ URL: [url]',
 'use_comment_of_document' => 'Использовать комментарий документа',
 'use_default_categories' => 'Использовать предопределённые категории',
 'use_default_keywords' => 'Использовать предопределённые метки',
+'valid_till' => '',
 'version' => 'Версия',
 'versioning_file_creation' => 'Создать файл версий',
 'versioning_file_creation_warning' => 'Эта операция создаст файлы версий для всего каталога. После создания файлы версий будут сохранены в каталоге документов.',
@@ -1573,6 +1608,7 @@ URL: [url]',
 'workflow_action_name' => 'Название',
 'workflow_editor' => 'Редактор процесса',
 'workflow_group_summary' => 'Сводка по группе',
+'workflow_has_cycle' => '',
 'workflow_initstate' => 'Начальный статус',
 'workflow_in_use' => 'Этот процесс используется документами.',
 'workflow_layoutdata_saved' => '',

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 (544), destinqo (19)
+//    Translators: Admin (547), destinqo (19)
 
 $text = array(
 '2_factor_auth' => '',
@@ -211,6 +211,7 @@ URL: [url]',
 'checkedout_file_has_disappeared' => '',
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
 'choose_attrdef' => '',
@@ -260,6 +261,7 @@ URL: [url]',
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
+'create_download_link' => '',
 'create_fulltext_index' => 'Vytvoriť fulltext index',
 'create_fulltext_index_warning' => '',
 'creation_date' => 'Vytvorené',
@@ -335,6 +337,9 @@ URL: [url]',
 'does_not_expire' => 'Platnosť nikdy nevyprší',
 'does_not_inherit_access_msg' => 'Zdediť prístup',
 'download' => 'Stiahnuť',
+'download_links' => '',
+'download_link_email_body' => '',
+'download_link_email_subject' => '',
 'do_object_repair' => '',
 'do_object_setchecksum' => '',
 'do_object_setfilesize' => '',
@@ -352,6 +357,7 @@ URL: [url]',
 'dump_creation_warning' => 'Touto akciou môžete vytvoriť výstup obsahu Vašej databázy. Po vytvorení bude výstup uložený v dátovej zložke vášho servera.',
 'dump_list' => 'Existujúce výstupy',
 'dump_remove' => 'Odstrániť vystup',
+'duplicates' => '',
 'duplicate_content' => '',
 'edit' => 'upraviť',
 'edit_attributes' => 'Uprav parametre',
@@ -401,12 +407,23 @@ URL: [url]',
 'event_details' => 'Detail udalosti',
 'exclude_items' => '',
 'expired' => 'Platnosť vypršala',
+'expired_at_date' => '',
 'expires' => 'Platnosť vyprší',
+'expire_by_date' => '',
+'expire_in_1d' => '',
+'expire_in_1h' => '',
+'expire_in_1m' => '',
+'expire_in_1w' => '',
+'expire_in_1y' => '',
+'expire_in_2h' => '',
+'expire_in_2y' => '',
+'expire_today' => '',
+'expire_tomorrow' => '',
 'expiry_changed_email' => 'Datum platnosti zmeneny',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
 'export' => '',
-'extension_manager' => '',
+'extension_manager' => 'Správa rozšírení',
 'february' => 'Február',
 'file' => 'Súbor',
 'files' => 'Súbory',
@@ -440,6 +457,7 @@ URL: [url]',
 'fr_FR' => 'Francúzština',
 'fullsearch' => 'Fulltext index vyhľadávanie',
 'fullsearch_hint' => 'Použiť fulltext index',
+'fulltextsearch_disabled' => '',
 'fulltext_info' => 'Informácie o fulltext indexe',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Atribúty',
@@ -459,6 +477,7 @@ URL: [url]',
 'group_review_summary' => 'Zhrnutie skupinovej recenzie',
 'guest_login' => 'Prihlásiť sa ako hosť',
 'guest_login_disabled' => 'Prihlásenie ako hosť je vypnuté.',
+'hash' => '',
 'help' => 'Pomoc',
 'home_folder' => '',
 'hook_name' => '',
@@ -471,7 +490,7 @@ URL: [url]',
 'identical_version' => '',
 'import' => '',
 'importfs' => '',
-'import_fs' => '',
+'import_fs' => 'Importovanie zo súborového systému',
 'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Vrátane súborov',
@@ -512,6 +531,7 @@ URL: [url]',
 'invalid_target_folder' => 'Neplatné cieľové ID zložky',
 'invalid_user_id' => 'Neplatné ID používateľa',
 'invalid_version' => 'Neplatná verzia dokumentu',
+'in_folder' => '',
 'in_revision' => '',
 'in_workflow' => '',
 'is_disabled' => '',
@@ -616,7 +636,7 @@ URL: [url]',
 'new_attrdef' => '',
 'new_default_keywords' => 'Pridať kľúčové slová',
 'new_default_keyword_category' => 'Pridať kategóriu',
-'new_document_category' => '',
+'new_document_category' => 'Pridať kategóriu',
 'new_document_email' => 'Novy dokument',
 'new_document_email_body' => '',
 'new_document_email_subject' => '',
@@ -706,6 +726,7 @@ URL: [url]',
 'personal_default_keywords' => 'Osobné kľúčové slová',
 'pl_PL' => 'Polština',
 'possible_substitutes' => '',
+'preset_expires' => '',
 'preview' => '',
 'preview_converters' => '',
 'preview_images' => '',
@@ -864,6 +885,7 @@ URL: [url]',
 'select_one' => 'Vyberte jeden',
 'select_users' => '',
 'select_workflow' => '',
+'send_email' => '',
 'send_test_mail' => '',
 'september' => 'September',
 'sequence' => 'Postupnosť',
@@ -871,6 +893,7 @@ URL: [url]',
 'seq_end' => 'Na koniec',
 'seq_keep' => 'Ponechať pozíciu',
 'seq_start' => 'Prvá pozícia',
+'sessions' => '',
 'settings' => 'Nastavenia',
 'settings_activate_module' => '',
 'settings_activate_php_extension' => '',
@@ -976,6 +999,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => '',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',
@@ -994,6 +1019,8 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
+'settings_enableSessionList' => '',
+'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => 'Výber šablóny',
 'settings_enableThemeSelector_desc' => '',
 'settings_enableUpdateReceipt' => '',
@@ -1065,6 +1092,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
 'settings_maxSizeForFullText_desc' => '',
+'settings_maxUploadSize' => '',
+'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => '',
 'settings_notfound' => '',
 'settings_Notification' => '',
@@ -1205,6 +1234,8 @@ URL: [url]',
 'splash_edit_role' => '',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
+'splash_error_rm_download_link' => '',
+'splash_error_send_download_link' => '',
 'splash_folder_edited' => '',
 'splash_importfs' => '',
 'splash_invalid_folder_id' => '',
@@ -1212,9 +1243,11 @@ URL: [url]',
 'splash_moved_clipboard' => '',
 'splash_move_document' => '',
 'splash_move_folder' => '',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => '',
 'splash_rm_attribute' => '',
 'splash_rm_document' => 'Dokument odstránený',
+'splash_rm_download_link' => '',
 'splash_rm_folder' => 'Zložka zmazaná',
 'splash_rm_group' => '',
 'splash_rm_group_member' => '',
@@ -1222,6 +1255,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
 'splash_saved_file' => '',
+'splash_send_download_link' => '',
 'splash_settings_saved' => '',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
@@ -1362,6 +1396,7 @@ URL: [url]',
 'use_comment_of_document' => 'Použite komentár dokumentu',
 'use_default_categories' => '',
 'use_default_keywords' => 'Použiť preddefinované kľúčové slová',
+'valid_till' => '',
 'version' => 'Verzia',
 'versioning_file_creation' => 'Vytvorenie verziovacieho súboru',
 'versioning_file_creation_warning' => 'Touto akciou môžete vytvoriť súbor, obsahujúci verziovaciu informáciu celej DMS zložky. Po vytvorení bude každý súbor uložený do zložky súborov.',
@@ -1384,6 +1419,7 @@ URL: [url]',
 'workflow_action_name' => '',
 'workflow_editor' => '',
 'workflow_group_summary' => '',
+'workflow_has_cycle' => '',
 'workflow_initstate' => '',
 'workflow_in_use' => '',
 'workflow_layoutdata_saved' => '',

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 (1138), tmichelfelder (106)
+//    Translators: Admin (1144), tmichelfelder (106)
 
 $text = array(
 '2_factor_auth' => '',
@@ -57,7 +57,7 @@ URL: [url]',
 'add_attrdefgroup' => '',
 'add_document' => 'Lägg till dokument',
 'add_document_link' => 'Lägg till länkat dokument',
-'add_document_notify' => '',
+'add_document_notify' => 'Lägg till notifiering',
 'add_doc_reviewer_approver_warning' => 'OBS! Dokumentet kommer automatiskt att markeras klart för användning, om ingen person anges för granskning eller godkännande av dokumentet.',
 'add_doc_workflow_warning' => 'OBS! Dokumentet kommer automatiskt att markeras klart för användning, om inget arbetsflöde anges.',
 'add_event' => 'Lägg till händelse',
@@ -173,7 +173,7 @@ URL: [url]',
 'at_least_n_users_of_group' => 'Åtminstone [number_of_users] användare av [group]',
 'august' => 'augusti',
 'authentication' => '',
-'author' => '',
+'author' => 'Författare',
 'automatic_status_update' => 'Automatisk ändring av status',
 'back' => 'Tillbaka',
 'backup_list' => 'Befintliga backup-filer',
@@ -222,6 +222,7 @@ URL: [url]',
 'checkedout_file_has_disappeared' => '',
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
 'choose_attrdef' => 'Välj attributdefinition',
@@ -271,6 +272,7 @@ URL: [url]',
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
+'create_download_link' => '',
 'create_fulltext_index' => 'Skapa fulltext-sökindex',
 'create_fulltext_index_warning' => 'Du håller på att skapa fulltext-sökindex. Detta kan ta mycket lång tid och sakta ner den allmänna systemprestandan. Om du verkligen vill skapa indexet, bekräfta åtgärden.',
 'creation_date' => 'Skapat',
@@ -376,6 +378,9 @@ URL: [url]',
 'does_not_expire' => 'Löper aldrig ut',
 'does_not_inherit_access_msg' => 'Ärv behörighet',
 'download' => 'Ladda ner',
+'download_links' => '',
+'download_link_email_body' => '',
+'download_link_email_subject' => '',
 'do_object_repair' => 'Försök att laga kataloger och dokument.',
 'do_object_setchecksum' => 'Lägg till checksumma',
 'do_object_setfilesize' => 'Ange filstorlek',
@@ -393,6 +398,7 @@ URL: [url]',
 'dump_creation_warning' => 'Med denna funktion kan du skapa en dumpfil av innehållet i din databas. När dumpfilen har skapats, kommer den att sparas i datamappen på servern.',
 'dump_list' => 'Befintliga dumpfiler',
 'dump_remove' => 'Ta bort dumpfil',
+'duplicates' => '',
 'duplicate_content' => 'Duplicera innehåll',
 'edit' => 'Ändra',
 'edit_attributes' => 'Ändra attribut',
@@ -442,7 +448,18 @@ URL: [url]',
 'event_details' => 'Händelseinställningar',
 'exclude_items' => '',
 'expired' => 'Har gått ut',
+'expired_at_date' => '',
 'expires' => 'Kommer att gå ut',
+'expire_by_date' => '',
+'expire_in_1d' => '',
+'expire_in_1h' => '',
+'expire_in_1m' => '',
+'expire_in_1w' => '',
+'expire_in_1y' => '',
+'expire_in_2h' => '',
+'expire_in_2y' => '',
+'expire_today' => '',
+'expire_tomorrow' => '',
 'expiry_changed_email' => 'Utgångsdatum ändrat',
 'expiry_changed_email_body' => 'Utgångsdatum ändrat
 Dokument: [name]
@@ -457,7 +474,7 @@ URL: [url]',
 'files' => 'Filer',
 'files_deletion' => 'Ta bort alla filer',
 'files_deletion_warning' => 'Med detta alternativ kan du ta bort alla filer i en dokumentkatalog. Versionsinformationen kommer fortfarande att visas.',
-'files_loading' => '',
+'files_loading' => 'V.v. vänta tills listan med filer har laddats ...',
 'file_size' => 'Filstorlek',
 'filter_for_documents' => '',
 'filter_for_folders' => '',
@@ -505,6 +522,7 @@ URL: [url]',
 'fr_FR' => 'franska',
 'fullsearch' => 'Fulltext-sökning',
 'fullsearch_hint' => 'Använd fulltext-index',
+'fulltextsearch_disabled' => '',
 'fulltext_info' => 'Fulltext-indexinfo',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Attributdefinitioner',
@@ -524,6 +542,7 @@ URL: [url]',
 'group_review_summary' => 'Sammanfattning av gruppgranskning',
 'guest_login' => 'Gästinloggning',
 'guest_login_disabled' => 'Gästinloggningen är inaktiverad.',
+'hash' => '',
 'help' => 'Hjälp',
 'home_folder' => '',
 'hook_name' => '',
@@ -577,6 +596,7 @@ URL: [url]',
 'invalid_target_folder' => 'Ogiltigt ID för målkatalogen',
 'invalid_user_id' => 'Ogiltigt användar-ID',
 'invalid_version' => 'Ogiltig dokumentversion',
+'in_folder' => '',
 'in_revision' => '',
 'in_workflow' => 'Utkast: under bearbetning',
 'is_disabled' => 'Inaktivera kontot',
@@ -801,6 +821,7 @@ URL: [url]',
 'personal_default_keywords' => 'Personlig nyckelordslista',
 'pl_PL' => 'polska',
 'possible_substitutes' => '',
+'preset_expires' => '',
 'preview' => '',
 'preview_converters' => '',
 'preview_images' => '',
@@ -983,18 +1004,19 @@ URL: [url]',
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '',
-'select_grp_notification' => '',
+'select_grp_notification' => 'Klicka för att välja gruppnotifiering',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Välj en grupp som ska granska',
 'select_grp_revisors' => '',
 'select_ind_approvers' => 'Välj en person som ska godkänna',
-'select_ind_notification' => '',
+'select_ind_notification' => 'Klicka för att välja individuell notifiering',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Välj en person som ska granska',
 'select_ind_revisors' => '',
 'select_one' => 'Välj',
 'select_users' => 'Välj användare',
 'select_workflow' => 'Välj arbetsflöde',
+'send_email' => '',
 'send_test_mail' => '',
 'september' => 'september',
 'sequence' => 'Position',
@@ -1002,6 +1024,7 @@ URL: [url]',
 'seq_end' => 'på slutet',
 'seq_keep' => 'behåll positionen',
 'seq_start' => 'första positionen',
+'sessions' => '',
 'settings' => 'Inställningar',
 'settings_activate_module' => 'Aktivera modul',
 'settings_activate_php_extension' => 'Aktivera PHP-extension',
@@ -1015,7 +1038,7 @@ URL: [url]',
 'settings_autoLoginUser' => '',
 'settings_autoLoginUser_desc' => '',
 'settings_available_languages' => 'Tillgängliga språk',
-'settings_available_languages_desc' => '',
+'settings_available_languages_desc' => 'Bara de valda språken kommer att laddas och visas i språk väljaren. Det förvalda språket kommer alltid att laddas.',
 'settings_backupDir' => '',
 'settings_backupDir_desc' => '',
 'settings_cacheDir' => 'Cache-mapp',
@@ -1107,6 +1130,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Om aktiverad, kan filer laddas upp via javaapplet med namnet jumploader, utan begränsningar i filstorlek. Flera filer kan även laddas upp samtidigt i ett steg.',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Aktivera meddelande till personer som granskar/godkänner',
 'settings_enableNotificationAppRev_desc' => 'Kryssa i, för att skicka ett meddelande till personer som granskar/godkänner när en ny version av dokumentet har lagts till',
 'settings_enableNotificationWorkflow' => '',
@@ -1125,6 +1150,8 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => 'Tillåt granskning/godkänning av inloggad användare',
 'settings_enableSelfRevApp_desc' => 'Aktivera om du vill att aktuell inloggad användare visas i listan för personer som granskar/godkänner dokument och i övergång på arbetsflöden.',
+'settings_enableSessionList' => '',
+'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => 'Tema urval',
 'settings_enableThemeSelector_desc' => 'Stäng på/av tema urval vid inloggningssidan.',
 'settings_enableUpdateReceipt' => '',
@@ -1196,6 +1223,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => 'Detta är maximum antal av dokument eller katalog som kommer att testas om att det har korrekt rättigheter, när objekt räknas rekursiv. Om detta nummer överskrids, kommer antalet av dokument och katalog i katalogvyn bara bli uppskattat.',
 'settings_maxSizeForFullText' => '',
 'settings_maxSizeForFullText_desc' => '',
+'settings_maxUploadSize' => '',
+'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => 'Konfigurera flera inställningar. Standard-inloggning: admin/admin',
 'settings_notfound' => 'Hittades inte',
 'settings_Notification' => 'Meddelandeinställningar',
@@ -1336,6 +1365,8 @@ URL: [url]',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Användare sparat',
 'splash_error_add_to_transmittal' => '',
+'splash_error_rm_download_link' => '',
+'splash_error_send_download_link' => '',
 'splash_folder_edited' => 'Spara katalog ändringar',
 'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Ogiltigt katalog ID',
@@ -1343,9 +1374,11 @@ URL: [url]',
 'splash_moved_clipboard' => 'Urklipp flyttades till aktuella katalogen',
 'splash_move_document' => '',
 'splash_move_folder' => '',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => 'Borttagen från urklipp',
 'splash_rm_attribute' => 'Attribut har tagits bort',
 'splash_rm_document' => 'Dokument borttaget',
+'splash_rm_download_link' => '',
 'splash_rm_folder' => 'Mapp raderad',
 'splash_rm_group' => 'Grupp har tagits bort',
 'splash_rm_group_member' => 'Gruppmedlem har tagits bort',
@@ -1353,6 +1386,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Användare har tagits bort',
 'splash_saved_file' => '',
+'splash_send_download_link' => '',
 'splash_settings_saved' => 'Inställningar sparat',
 'splash_substituted_user' => 'Bytt användare',
 'splash_switched_back_user' => 'Byt tillbaka till original användare',
@@ -1502,6 +1536,7 @@ URL: [url]',
 'use_comment_of_document' => 'Använd dokumentets kommentar',
 'use_default_categories' => 'Använd fördefinerade kategorier',
 'use_default_keywords' => 'Använd fördefinerade nyckelord',
+'valid_till' => '',
 'version' => 'Version',
 'versioning_file_creation' => 'Skapa versionsfil',
 'versioning_file_creation_warning' => 'Med denna funktion kan du skapa en fil som innehåller versionsinformationen för hela DMS-mappen. Efter skapandet kommer alla filer att sparas inom dokumentets mapp.',
@@ -1529,6 +1564,7 @@ URL: [url]',
 'workflow_action_name' => 'Namn',
 'workflow_editor' => 'Arbetsflöde Editor',
 'workflow_group_summary' => 'Sammanfattning grupp',
+'workflow_has_cycle' => '',
 'workflow_initstate' => 'Ursprungsstatus',
 'workflow_in_use' => 'Detta arbetsflöde används i ett dokument.',
 'workflow_layoutdata_saved' => '',

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 (1048), aydin (83)
+//    Translators: Admin (1051), aydin (83)
 
 $text = array(
 '2_factor_auth' => '',
@@ -228,6 +228,7 @@ URL: [url]',
 'checkedout_file_has_disappeared' => '',
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
 'choose_attrdef' => 'Lütfen nitelik tanımını seçiniz',
@@ -277,6 +278,7 @@ URL: [url]',
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
+'create_download_link' => '',
 'create_fulltext_index' => 'Tam metin indeksi oluştur',
 'create_fulltext_index_warning' => 'Tam metin indeksi yeniden oluşturmak üzeresiniz. Bu işlem bir hayli uzun sürebilir ve sistem performansını olumsuz etkileyebilir. Buna rağmen indeksi oluşturmak istiyorsanız lütfen bu işlemi onaylayın.',
 'creation_date' => 'Oluşturma tarihi',
@@ -382,6 +384,9 @@ URL: [url]',
 'does_not_expire' => 'Süresiz',
 'does_not_inherit_access_msg' => 'Erişim haklarını devir al',
 'download' => 'İndir',
+'download_links' => '',
+'download_link_email_body' => '',
+'download_link_email_subject' => '',
 'do_object_repair' => 'Tüm klasörleri ve dokümanları onar.',
 'do_object_setchecksum' => 'Sağlama (checksum) ayarla',
 'do_object_setfilesize' => 'Dosya boyutu ayarla',
@@ -399,6 +404,7 @@ URL: [url]',
 'dump_creation_warning' => 'Bu işlemle veritabanınızın dump dosyasını oluşturabilirsiniz. Dump dosyası sunucunuzdaki data klasörüne kaydedilcektir.',
 'dump_list' => 'Mevcut dump dosyaları',
 'dump_remove' => 'Dump dosyasını sil',
+'duplicates' => '',
 'duplicate_content' => 'içeriği_klonla',
 'edit' => 'Düzenle',
 'edit_attributes' => 'Nitelikleri düzenle',
@@ -448,7 +454,18 @@ URL: [url]',
 'event_details' => 'Etkinkil detayları',
 'exclude_items' => '',
 'expired' => 'Süresi doldu',
+'expired_at_date' => '',
 'expires' => 'Süresinin dolacağı zaman',
+'expire_by_date' => '',
+'expire_in_1d' => '',
+'expire_in_1h' => '',
+'expire_in_1m' => '',
+'expire_in_1w' => '',
+'expire_in_1y' => '',
+'expire_in_2h' => '',
+'expire_in_2y' => '',
+'expire_today' => '',
+'expire_tomorrow' => '',
 'expiry_changed_email' => 'Süresinin dolacağı tarihi değişti',
 'expiry_changed_email_body' => 'Bitiş tarihi değişti
 Doküman: [name]
@@ -511,6 +528,7 @@ URL: [url]',
 'fr_FR' => 'Fransızca',
 'fullsearch' => 'Tam metinde ara',
 'fullsearch_hint' => 'Tam metin indeks kullan',
+'fulltextsearch_disabled' => '',
 'fulltext_info' => 'Tam metin indeks bilgi',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Nitelikler',
@@ -530,6 +548,7 @@ URL: [url]',
 'group_review_summary' => 'Grup gözden geçirme özeti',
 'guest_login' => 'Misafir olarak giriş yap',
 'guest_login_disabled' => 'Misafir girişi devre dışı.',
+'hash' => '',
 'help' => 'Yardım',
 'home_folder' => 'Temel klasör',
 'hook_name' => '',
@@ -583,6 +602,7 @@ URL: [url]',
 'invalid_target_folder' => 'Geçersiz Hedef Klasör ID',
 'invalid_user_id' => 'Geçersiz Kullanıcı ID',
 'invalid_version' => 'Geçersiz Doküman Versiyonu',
+'in_folder' => '',
 'in_revision' => '',
 'in_workflow' => 'İş Akışında',
 'is_disabled' => 'Hesap devredışı',
@@ -629,7 +649,7 @@ URL: [url]',
 '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_to_version' => '',
-'list_access_rights' => '',
+'list_access_rights' => 'Tüm erişim haklarini listele',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Yerel dosya',
@@ -817,6 +837,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
 'personal_default_keywords' => 'Kişisel anahtar kelimeler',
 'pl_PL' => 'Polonyaca',
 'possible_substitutes' => '',
+'preset_expires' => '',
 'preview' => 'Önizle',
 'preview_converters' => '',
 'preview_images' => '',
@@ -1011,6 +1032,7 @@ URL: [url]',
 'select_one' => 'Birini seçiniz',
 'select_users' => 'Kullanıcı seçmek için tıklayın',
 'select_workflow' => 'İş akışı seç',
+'send_email' => '',
 'send_test_mail' => '',
 'september' => 'Eylül',
 'sequence' => 'Sıralama',
@@ -1018,6 +1040,7 @@ URL: [url]',
 'seq_end' => 'En sona',
 'seq_keep' => 'Sırayı Koru',
 'seq_start' => 'İlk sıra',
+'sessions' => '',
 'settings' => 'Ayarlar',
 'settings_activate_module' => 'Modülü etkinleştir',
 'settings_activate_php_extension' => 'PHP uzantısını etkinleştir',
@@ -1123,6 +1146,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Etkinleştirilirse, büyük dosyalar dosya limitine bakılmaksızın jumploader isimli java applet aracılığıyla yüklenebilir. Bu ayrıca bir seferde birden çok dosya yüklemeyi de sağlar. Bu açıldığında sadece http çerezleri kapanmış olur.',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Kontrol eden/onaylayan bildirimlerini etkinleştir',
 'settings_enableNotificationAppRev_desc' => 'Dokümanın yeni versiyonu yüklendiğinde kontrol eden/onaylayana bildirim mesajı gitmesi için bunu etkinleştirin.',
 'settings_enableNotificationWorkflow' => 'Bir sonraki iş akışında kullanıcıları bilgilendir',
@@ -1141,6 +1166,8 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => 'Giriş yapmış kullanıcılar için kontrol/onay izni ver',
 'settings_enableSelfRevApp_desc' => 'O an giriş yapmış olan kullanıcıları kontrol eden/onaylayan olarak listelemek ve iş akışına dahil etmek için bunu seçebilirsiniz.',
+'settings_enableSessionList' => '',
+'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => 'Tema seçimini aç/kapat',
 'settings_enableThemeSelector_desc' => 'Giriş sayfasında tema seçimini aç/kapat',
 'settings_enableUpdateReceipt' => '',
@@ -1212,6 +1239,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => 'Nesneleri özyinelemeli olarak erişim hakkı kontrolü için sayarken bu değer en fazla sayılacak doküman ve klasör sayısını belirler. Bu sayı aşıldığında klasörün içindeki dosya ve diğer klasörlerin sayısı tahmin yolu ile belirlenecektir.',
 'settings_maxSizeForFullText' => '',
 'settings_maxSizeForFullText_desc' => '',
+'settings_maxUploadSize' => '',
+'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => 'Daha fazla ayar yapın. Varsayılan kullanıcı adı/parola: admin/admin',
 'settings_notfound' => 'Bulunamadı',
 'settings_Notification' => 'Bildirim ayarları',
@@ -1352,6 +1381,8 @@ URL: [url]',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Kullanıcı kaydedildi',
 'splash_error_add_to_transmittal' => '',
+'splash_error_rm_download_link' => '',
+'splash_error_send_download_link' => '',
 'splash_folder_edited' => 'Klasör değişiklikleri kaydedildi',
 'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Hatalı klasör ID',
@@ -1359,9 +1390,11 @@ URL: [url]',
 'splash_moved_clipboard' => 'Pano mevcut klasöre taşındı',
 'splash_move_document' => '',
 'splash_move_folder' => '',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => 'Panodan silindi',
 'splash_rm_attribute' => 'Nitelik silindi',
 'splash_rm_document' => 'Doküman silindi',
+'splash_rm_download_link' => '',
 'splash_rm_folder' => 'Klasör silindi',
 'splash_rm_group' => 'Grup silindi',
 'splash_rm_group_member' => 'Grup üyesi silindi',
@@ -1369,6 +1402,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Kullanıcı silindi',
 'splash_saved_file' => '',
+'splash_send_download_link' => '',
 'splash_settings_saved' => 'Ayarlar kaydedildi',
 'splash_substituted_user' => 'Yerine geçilen kullanıcı',
 'splash_switched_back_user' => 'Orijinal kullanıcıya geri dönüldü',
@@ -1415,7 +1449,7 @@ URL: [url]',
 'sunday_abbr' => 'Pa',
 'sv_SE' => 'İsveççe',
 'switched_to' => 'Yerine geçilen',
-'takeOverAttributeValue' => '',
+'takeOverAttributeValue' => 'Son versiyondaki özellikleri devral',
 'takeOverGrpApprover' => 'Bir önceki versiyon onayını yapan grubu al.',
 'takeOverGrpReviewer' => 'Bir önceki versiyon kontrolünü yapan grubu al.',
 'takeOverIndApprover' => 'Bir önceki versiyonu onaylayanı al.',
@@ -1428,7 +1462,7 @@ URL: [url]',
 'thursday' => 'Perşembe',
 'thursday_abbr' => 'Pe',
 'timeline' => 'Zaman Çizelgesi',
-'timeline_add_file' => '',
+'timeline_add_file' => 'Yeni Ek',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
@@ -1518,6 +1552,7 @@ URL: [url]',
 'use_comment_of_document' => 'Doküman açıklamasını kullan',
 'use_default_categories' => 'Ön tanımlı kategorileri kullan',
 'use_default_keywords' => 'Ön tanımlı anahtar kelimeleri kullan',
+'valid_till' => '',
 'version' => 'Versiyon',
 'versioning_file_creation' => 'Version dosyası oluşturma',
 'versioning_file_creation_warning' => 'Bu işlem ile tüm klasörlerdeki versiyon bilgisinin bulunduğu bir dosya oluşturursunuz. Her dosya oluşturulduğunda doküman klasörüne kaydedilir.',
@@ -1545,6 +1580,7 @@ URL: [url]',
 'workflow_action_name' => 'İsim',
 'workflow_editor' => 'İş Akış Editörü',
 'workflow_group_summary' => 'Grup özeti',
+'workflow_has_cycle' => '',
 'workflow_initstate' => 'İlk durum',
 'workflow_in_use' => 'Bu iş akışı doküman(lar) tarafından kullanımda.',
 'workflow_layoutdata_saved' => '',

languages/uk_UA/lang.inc

@@ -234,6 +234,7 @@ URL: [url]',
 'checkedout_file_has_disappeared' => 'Файл отримуваного документа не знайдено. Завантаження неможливе.',
 'checkedout_file_is_unchanged' => 'Документ не змінено. Завантаження неможливе',
 'checkin_document' => 'Отримання',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => 'Завантаження',
 'checkout_is_disabled' => 'Завантаження відключене',
 'choose_attrdef' => 'Оберіть атрибут',
@@ -283,6 +284,7 @@ URL: [url]',
 'converter_new_cmd' => 'Команда',
 'converter_new_mimetype' => 'Новий mime тип',
 'copied_to_checkout_as' => 'Файл скопійовано в середовище скачування як',
+'create_download_link' => '',
 'create_fulltext_index' => 'Створити повнотекстовий індекс',
 'create_fulltext_index_warning' => 'Ви хочете перестворити повнотекстовий індекс. Це займе деякий час і знизить продуктивність. Продовжити?',
 'creation_date' => 'Створено',
@@ -388,6 +390,9 @@ URL: [url]',
 'does_not_expire' => 'Без терміну виконання',
 'does_not_inherit_access_msg' => 'Наслідувати рівень доступу',
 'download' => 'Завантажити',
+'download_links' => '',
+'download_link_email_body' => '',
+'download_link_email_subject' => '',
 'do_object_repair' => 'Виправити всі каталоги і документи',
 'do_object_setchecksum' => 'Встановити контрольну суму',
 'do_object_setfilesize' => 'Встановити розмір файлу',
@@ -405,6 +410,7 @@ URL: [url]',
 'dump_creation_warning' => 'Ця операція створить дамп бази даних. Після створення файл буде збережено в каталозі даних сервера.',
 'dump_list' => 'Існуючі дампи',
 'dump_remove' => 'Видалити дамп',
+'duplicates' => '',
 'duplicate_content' => 'Дубльований вміст',
 'edit' => 'Змінити',
 'edit_attributes' => 'Змінити атрибути',
@@ -454,7 +460,18 @@ URL: [url]',
 'event_details' => 'Інформація про подію',
 'exclude_items' => 'Виключені елементи',
 'expired' => 'Термін виконання вийшов',
+'expired_at_date' => '',
 'expires' => 'Термін виконання виходить',
+'expire_by_date' => '',
+'expire_in_1d' => '',
+'expire_in_1h' => '',
+'expire_in_1m' => '',
+'expire_in_1w' => '',
+'expire_in_1y' => '',
+'expire_in_2h' => '',
+'expire_in_2y' => '',
+'expire_today' => '',
+'expire_tomorrow' => '',
 'expiry_changed_email' => 'Дату терміну виконання змінено',
 'expiry_changed_email_body' => 'Змінено дату терміну виконання
 Документ: [name]
@@ -517,6 +534,7 @@ URL: [url]',
 'fr_FR' => 'French',
 'fullsearch' => 'Повнотекстовий пошук',
 'fullsearch_hint' => 'Використовувати повнотекстовий індекс',
+'fulltextsearch_disabled' => '',
 'fulltext_info' => 'Інформація про повнотекстовий індекс',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => 'Атрибути',
@@ -536,6 +554,7 @@ URL: [url]',
 'group_review_summary' => 'Підсумки рецензування групи',
 'guest_login' => 'Увійти як гість',
 'guest_login_disabled' => 'Гостьовий вхід відключено',
+'hash' => '',
 'help' => 'Допомога',
 'home_folder' => 'Домашній каталог',
 'hook_name' => '',
@@ -589,6 +608,7 @@ URL: [url]',
 'invalid_target_folder' => 'Невірний ідентифікатор цільового призначення',
 'invalid_user_id' => 'Невірний ідентифікатор користувача',
 'invalid_version' => 'Невірна версія документа',
+'in_folder' => '',
 'in_revision' => 'В процесі ревізії',
 'in_workflow' => 'В процесі',
 'is_disabled' => 'Відключити обліковий запис',
@@ -818,6 +838,7 @@ URL: [url]',
 'personal_default_keywords' => 'Особистий список ключових слів',
 'pl_PL' => 'Polish',
 'possible_substitutes' => 'Підстановки',
+'preset_expires' => '',
 'preview' => 'Попередній перегляд',
 'preview_converters' => 'Попередній перегляд перетворення документу',
 'preview_images' => '',
@@ -1032,6 +1053,7 @@ URL: [url]',
 'select_one' => 'Оберіть',
 'select_users' => 'Оберіть користувачів',
 'select_workflow' => 'Оберіть процес',
+'send_email' => '',
 'send_test_mail' => 'Надіслати тестове повідомлення',
 'september' => 'Вересень',
 'sequence' => 'Позиція',
@@ -1039,6 +1061,7 @@ URL: [url]',
 'seq_end' => 'В кінці',
 'seq_keep' => 'Не змінювати',
 'seq_start' => 'На початку',
+'sessions' => '',
 'settings' => 'Налаштування',
 'settings_activate_module' => 'Активувати модуль',
 'settings_activate_php_extension' => 'Активувати розширення PHP',
@@ -1144,6 +1167,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Якщо увімкнено, завантаження файлів доступне також через Java-аплет jumploader без обмеження розміру файлів. Це також дозволить завантажувати кілька файлів за раз.',
 'settings_enableMenuTasks' => 'Включити список завдань в меню',
 'settings_enableMenuTasks_desc' => 'Включити/відключити пункт меню, який містить всі завдання користувача. Там містяться документи, які потребують рецензії, затвердження і т.ін.',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Сповіщати рецензента і затверджувача',
 'settings_enableNotificationAppRev_desc' => 'Увімкніть для відправки сповіщення рецензенту чи затверджувачеві при додаванні нової версії документа.',
 'settings_enableNotificationWorkflow' => 'Відсилати сповіщення користувачам, задіяним в наступній стадії процесу',
@@ -1162,6 +1187,8 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => 'Увімкніть для актвації функції ревізії документа через певний час',
 'settings_enableSelfRevApp' => 'Дозволити рецензію/затвердження<br/>користувачами, авторизованими у системі',
 'settings_enableSelfRevApp_desc' => 'Увімкніть для того, щоб користувачі, в даний момент авторизовані у системі, були в списку рецензентів/затверджувачів і в зміні процесу.',
+'settings_enableSessionList' => '',
+'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => 'Вибір теми',
 'settings_enableThemeSelector_desc' => 'Увімкнути/вимкнути можливість вибору теми на сторінці авторизації.',
 'settings_enableUpdateReceipt' => '',
@@ -1233,6 +1260,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => 'Максимальна кількість документів і каталогів, які будуть перевірені на права доступу при рекурсивному підрахунку об\'єктів. При перевищенні цієї кількості, буде оцінено кількість документів і каталогів у вигляді каталогу.',
 'settings_maxSizeForFullText' => '',
 'settings_maxSizeForFullText_desc' => '',
+'settings_maxUploadSize' => '',
+'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => 'Інші налаштування. Логін по замовчуванню: admin/admin',
 'settings_notfound' => 'Не знайдено',
 'settings_Notification' => 'Налаштування сповіщення',
@@ -1373,6 +1402,8 @@ URL: [url]',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Користувача збережено',
 'splash_error_add_to_transmittal' => '',
+'splash_error_rm_download_link' => '',
+'splash_error_send_download_link' => '',
 'splash_folder_edited' => 'Зміни каталогу збережено',
 'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Невірний ідентифікатор каталогу',
@@ -1380,9 +1411,11 @@ URL: [url]',
 'splash_moved_clipboard' => 'Буфер обміну перенесено в поточний каталог',
 'splash_move_document' => '',
 'splash_move_folder' => '',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => 'Видалити з буферу обміну',
 'splash_rm_attribute' => 'Атрибут видалено',
 'splash_rm_document' => 'Документ видалено',
+'splash_rm_download_link' => '',
 'splash_rm_folder' => 'Папку видалено',
 'splash_rm_group' => 'Групу видалено',
 'splash_rm_group_member' => 'Члена групи видалено',
@@ -1390,6 +1423,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Користувача видалено',
 'splash_saved_file' => '',
+'splash_send_download_link' => '',
 'splash_settings_saved' => 'Налаштування збережено',
 'splash_substituted_user' => 'Користувача переключено',
 'splash_switched_back_user' => 'Переключено на початкового користувача',
@@ -1539,6 +1573,7 @@ URL: [url]',
 'use_comment_of_document' => 'Використовувати коментар документа',
 'use_default_categories' => 'Використовувати наперед визначені категорії',
 'use_default_keywords' => 'Використовувати наперед визначені ключові слова',
+'valid_till' => '',
 'version' => 'Версія',
 'versioning_file_creation' => 'Створити файл версій',
 'versioning_file_creation_warning' => 'Ця операція створить файли версій для всього каталогу. Після створення файли версій будуть збережені в каталозі документів.',
@@ -1566,6 +1601,7 @@ URL: [url]',
 'workflow_action_name' => 'Назва',
 'workflow_editor' => 'Редактор процесу',
 'workflow_group_summary' => 'Підсумки по процесу групи',
+'workflow_has_cycle' => '',
 'workflow_initstate' => 'Початковий статус',
 'workflow_in_use' => 'Цей процес використовується в документах.',
 'workflow_layoutdata_saved' => '',

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 (674), fengjohn (5)
+//    Translators: Admin (683), fengjohn (5)
 
 $text = array(
 '2_factor_auth' => '',
@@ -155,14 +155,14 @@ URL: [url]',
 'attr_malformed_int' => '',
 'attr_malformed_url' => '',
 'attr_max_values' => '',
-'attr_min_values' => '',
+'attr_min_values' => '最小值没达到',
 'attr_not_in_valueset' => '',
 'attr_no_regex_match' => '',
 'attr_validation_error' => '',
 'at_least_n_users_of_group' => '',
 'august' => '八 月',
 'authentication' => '认证',
-'author' => '',
+'author' => '作者',
 'automatic_status_update' => '自动状态变化',
 'back' => '返回',
 'backup_list' => '备份列表',
@@ -211,6 +211,7 @@ URL: [url]',
 'checkedout_file_has_disappeared' => '',
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
 'choose_attrdef' => '请选择属性',
@@ -260,6 +261,7 @@ URL: [url]',
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
+'create_download_link' => '',
 'create_fulltext_index' => '创建全文索引',
 'create_fulltext_index_warning' => '你将重新创建全
 文索引。这将花费一定的时间但是会提升系统的整体表现。如果你想要重新创建索引，请确
@@ -288,7 +290,7 @@ URL: [url]',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
 'document' => '文档',
-'documentcontent' => '',
+'documentcontent' => '文档内容',
 'documents' => '文档',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => '待处理文档',
@@ -337,6 +339,9 @@ URL: [url]',
 'does_not_expire' => '永不过期',
 'does_not_inherit_access_msg' => '继承访问权限',
 'download' => '下载',
+'download_links' => '',
+'download_link_email_body' => '',
+'download_link_email_subject' => '',
 'do_object_repair' => '',
 'do_object_setchecksum' => '',
 'do_object_setfilesize' => '设置文件大小',
@@ -354,6 +359,7 @@ URL: [url]',
 'dump_creation_warning' => '通过此操作，您可以创建一个您数据库的转储文件，之后可以将转储数据保存到您服务器所在的数据文件夹中',
 'dump_list' => '存在转储文件',
 'dump_remove' => '删除转储文件',
+'duplicates' => '',
 'duplicate_content' => '重复的内容',
 'edit' => '编辑',
 'edit_attributes' => '编辑属性',
@@ -403,12 +409,23 @@ URL: [url]',
 'event_details' => '错误详情',
 'exclude_items' => '',
 'expired' => '过期',
+'expired_at_date' => '',
 'expires' => '有效限期',
+'expire_by_date' => '',
+'expire_in_1d' => '',
+'expire_in_1h' => '',
+'expire_in_1m' => '',
+'expire_in_1w' => '',
+'expire_in_1y' => '',
+'expire_in_2h' => '',
+'expire_in_2y' => '',
+'expire_today' => '',
+'expire_tomorrow' => '',
 'expiry_changed_email' => '到期日子已改变',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
 'export' => '',
-'extension_manager' => '',
+'extension_manager' => '扩展管理器',
 'february' => '二 月',
 'file' => '文件',
 'files' => '文件',
@@ -442,6 +459,7 @@ URL: [url]',
 'fr_FR' => '法语',
 'fullsearch' => '全文搜索',
 'fullsearch_hint' => '使用全文索引',
+'fulltextsearch_disabled' => '',
 'fulltext_info' => '全文索引信息',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => '属性',
@@ -461,6 +479,7 @@ URL: [url]',
 'group_review_summary' => '校对组汇总',
 'guest_login' => '来宾登录',
 'guest_login_disabled' => '来宾登录被禁止',
+'hash' => '',
 'help' => '帮助',
 'home_folder' => '',
 'hook_name' => '',
@@ -478,7 +497,7 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => '包含文档',
 'include_subdirectories' => '包含子目录',
-'indexing_tasks_in_queue' => '',
+'indexing_tasks_in_queue' => '队列中的检索任务',
 'index_converters' => '索引文件转换',
 'index_done' => '',
 'index_error' => '',
@@ -514,6 +533,7 @@ URL: [url]',
 'invalid_target_folder' => '无效目标文件夹ID号',
 'invalid_user_id' => '无效用户ID号',
 'invalid_version' => '无效文档版本',
+'in_folder' => '',
 'in_revision' => '',
 'in_workflow' => '',
 'is_disabled' => '禁用帐户',
@@ -560,7 +580,7 @@ URL: [url]',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => '超过20M大文件，请选择<a href="%s">上传大文件</a>.',
 'link_to_version' => '',
-'list_access_rights' => '',
+'list_access_rights' => '列出所有的访问权限',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => '本地文件',
@@ -667,7 +687,7 @@ URL: [url]',
 'no_revision_planed' => '',
 'no_update_cause_locked' => '您不能更新此文档，请联系该文档锁定人',
 'no_user_image' => '无图片',
-'no_version_check' => '',
+'no_version_check' => '检查SeedDMS的新版本失败！这可能是由于在您的php配置中allow_url_fopen设置为0引起的。',
 'no_version_modification' => '',
 'no_workflow_available' => '',
 'objectcheck' => '文件夹/文件检查',
@@ -708,6 +728,7 @@ URL: [url]',
 'personal_default_keywords' => '用户关键字',
 'pl_PL' => '波兰语',
 'possible_substitutes' => '',
+'preset_expires' => '',
 'preview' => '预览',
 'preview_converters' => '',
 'preview_images' => '',
@@ -734,7 +755,7 @@ URL: [url]',
 'reception_rejected' => '',
 'recipients' => '',
 'redraw' => '',
-'refresh' => '',
+'refresh' => '刷新',
 'rejected' => '拒绝',
 'released' => '发布',
 'removed_approver' => '已经从审核人名单中删除',
@@ -866,6 +887,7 @@ URL: [url]',
 'select_one' => '选择一个',
 'select_users' => '点击选择用户',
 'select_workflow' => '',
+'send_email' => '',
 'send_test_mail' => '',
 'september' => '九 月',
 'sequence' => '次序',
@@ -873,6 +895,7 @@ URL: [url]',
 'seq_end' => '末尾',
 'seq_keep' => '当前',
 'seq_start' => '首位',
+'sessions' => '',
 'settings' => '设置',
 'settings_activate_module' => '',
 'settings_activate_php_extension' => '',
@@ -978,6 +1001,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => '',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',
@@ -996,6 +1021,8 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
+'settings_enableSessionList' => '',
+'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => '',
 'settings_enableThemeSelector_desc' => '',
 'settings_enableUpdateReceipt' => '',
@@ -1018,7 +1045,7 @@ URL: [url]',
 'settings_expandFolderTree_val0' => '',
 'settings_expandFolderTree_val1' => '',
 'settings_expandFolderTree_val2' => '',
-'settings_Extensions' => '',
+'settings_Extensions' => '设置扩展',
 'settings_extraPath' => '额外的PHP的include路径',
 'settings_extraPath_desc' => '附加软件的路径。这是包含目录，例如在ADODB目录或额外的PEAR包',
 'settings_firstDayOfWeek' => '每周第一天',
@@ -1067,6 +1094,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
 'settings_maxSizeForFullText_desc' => '',
+'settings_maxUploadSize' => '',
+'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => '',
 'settings_notfound' => '',
 'settings_Notification' => '通知设置',
@@ -1207,6 +1236,8 @@ URL: [url]',
 'splash_edit_role' => '',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
+'splash_error_rm_download_link' => '',
+'splash_error_send_download_link' => '',
 'splash_folder_edited' => '',
 'splash_importfs' => '',
 'splash_invalid_folder_id' => '',
@@ -1214,9 +1245,11 @@ URL: [url]',
 'splash_moved_clipboard' => '',
 'splash_move_document' => '',
 'splash_move_folder' => '',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => '已从剪切板删除',
 'splash_rm_attribute' => '',
 'splash_rm_document' => '文档已被移除',
+'splash_rm_download_link' => '',
 'splash_rm_folder' => '已删除的文件夹',
 'splash_rm_group' => '',
 'splash_rm_group_member' => '',
@@ -1224,6 +1257,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
 'splash_saved_file' => '',
+'splash_send_download_link' => '',
 'splash_settings_saved' => '',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
@@ -1364,6 +1398,7 @@ URL: [url]',
 'use_comment_of_document' => '文档注释',
 'use_default_categories' => '默认分类',
 'use_default_keywords' => '使用预定义关键字',
+'valid_till' => '',
 'version' => '版本',
 'versioning_file_creation' => '创建版本文件',
 'versioning_file_creation_warning' => '通过此操作，您可以一个包含整个DMS文件夹的版本信息文件. 版本文件一经创建，每个文件都将保存到文件夹中.',
@@ -1386,6 +1421,7 @@ URL: [url]',
 'workflow_action_name' => '',
 'workflow_editor' => '',
 'workflow_group_summary' => '',
+'workflow_has_cycle' => '',
 'workflow_initstate' => '',
 'workflow_in_use' => '',
 'workflow_layoutdata_saved' => '',

languages/zh_TW/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2376)
+//    Translators: Admin (2378)
 
 $text = array(
 '2_factor_auth' => '',
@@ -211,6 +211,7 @@ URL: [url]',
 'checkedout_file_has_disappeared' => '',
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '',
+'checkoutpath_does_not_exist' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
 'choose_attrdef' => '請選擇屬性',
@@ -260,6 +261,7 @@ URL: [url]',
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
+'create_download_link' => '',
 'create_fulltext_index' => '創建全文索引',
 'create_fulltext_index_warning' => '',
 'creation_date' => '創建日期',
@@ -335,6 +337,9 @@ URL: [url]',
 'does_not_expire' => '永不過期',
 'does_not_inherit_access_msg' => '繼承存取權限',
 'download' => '下載',
+'download_links' => '',
+'download_link_email_body' => '',
+'download_link_email_subject' => '',
 'do_object_repair' => '',
 'do_object_setchecksum' => '',
 'do_object_setfilesize' => '',
@@ -352,6 +357,7 @@ URL: [url]',
 'dump_creation_warning' => '通過此操作，您可以創建一個您資料庫的轉儲檔，之後可以將轉儲資料保存到您伺服器所在的資料檔案夾中',
 'dump_list' => '存在轉儲文件',
 'dump_remove' => '刪除轉儲檔',
+'duplicates' => '',
 'duplicate_content' => '',
 'edit' => '編輯',
 'edit_attributes' => '編輯屬性',
@@ -401,7 +407,18 @@ URL: [url]',
 'event_details' => '錯誤詳情',
 'exclude_items' => '',
 'expired' => '過期',
+'expired_at_date' => '',
 'expires' => '有效限期',
+'expire_by_date' => '',
+'expire_in_1d' => '',
+'expire_in_1h' => '',
+'expire_in_1m' => '',
+'expire_in_1w' => '',
+'expire_in_1y' => '',
+'expire_in_2h' => '',
+'expire_in_2y' => '',
+'expire_today' => '',
+'expire_tomorrow' => '',
 'expiry_changed_email' => '到期日子已改變',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
@@ -440,6 +457,7 @@ URL: [url]',
 'fr_FR' => '法語',
 'fullsearch' => '全文檢索搜尋',
 'fullsearch_hint' => '使用全文索引',
+'fulltextsearch_disabled' => '',
 'fulltext_info' => '全文索引資訊',
 'global_attributedefinitiongroups' => '',
 'global_attributedefinitions' => '屬性',
@@ -459,6 +477,7 @@ URL: [url]',
 'group_review_summary' => '校對組匯總',
 'guest_login' => '來賓登錄',
 'guest_login_disabled' => '來賓登錄被禁止',
+'hash' => '',
 'help' => '幫助',
 'home_folder' => '',
 'hook_name' => '',
@@ -469,7 +488,7 @@ URL: [url]',
 'hu_HU' => '匈牙利語',
 'id' => '序號',
 'identical_version' => '新版本的內容與舊版本完全相同',
-'import' => '',
+'import' => '匯入',
 'importfs' => '',
 'import_fs' => '由檔案系統匯入',
 'import_fs_warning' => '',
@@ -512,6 +531,7 @@ URL: [url]',
 'invalid_target_folder' => '無效目的檔案夾ID號',
 'invalid_user_id' => '無效用戶ID號',
 'invalid_version' => '無效文檔版本',
+'in_folder' => '',
 'in_revision' => '',
 'in_workflow' => '',
 'is_disabled' => '禁用帳戶',
@@ -706,6 +726,7 @@ URL: [url]',
 'personal_default_keywords' => '用戶關鍵字',
 'pl_PL' => '波蘭語',
 'possible_substitutes' => '',
+'preset_expires' => '',
 'preview' => '',
 'preview_converters' => '',
 'preview_images' => '',
@@ -837,7 +858,7 @@ URL: [url]',
 'search_query' => '搜索',
 'search_report' => '找到 [count] 個文檔',
 'search_report_fulltext' => '',
-'search_resultmode' => '',
+'search_resultmode' => '搜尋結果',
 'search_resultmode_both' => '',
 'search_results' => '搜索結果',
 'search_results_access_filtered' => '搜索到得結果中可能包含受限訪問的文檔',
@@ -864,6 +885,7 @@ URL: [url]',
 'select_one' => '選擇一個',
 'select_users' => '點擊選擇用戶',
 'select_workflow' => '',
+'send_email' => '',
 'send_test_mail' => '',
 'september' => '九 月',
 'sequence' => '次序',
@@ -871,6 +893,7 @@ URL: [url]',
 'seq_end' => '末尾',
 'seq_keep' => '當前',
 'seq_start' => '首位',
+'sessions' => '',
 'settings' => '設置',
 'settings_activate_module' => '',
 'settings_activate_php_extension' => '',
@@ -976,6 +999,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => '',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',
@@ -994,6 +1019,8 @@ URL: [url]',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
+'settings_enableSessionList' => '',
+'settings_enableSessionList_desc' => '',
 'settings_enableThemeSelector' => '',
 'settings_enableThemeSelector_desc' => '',
 'settings_enableUpdateReceipt' => '',
@@ -1065,6 +1092,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
 'settings_maxSizeForFullText_desc' => '',
+'settings_maxUploadSize' => '',
+'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => '',
 'settings_notfound' => '',
 'settings_Notification' => '通知設置',
@@ -1205,6 +1234,8 @@ URL: [url]',
 'splash_edit_role' => '',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
+'splash_error_rm_download_link' => '',
+'splash_error_send_download_link' => '',
 'splash_folder_edited' => '',
 'splash_importfs' => '',
 'splash_invalid_folder_id' => '',
@@ -1212,9 +1243,11 @@ URL: [url]',
 'splash_moved_clipboard' => '',
 'splash_move_document' => '',
 'splash_move_folder' => '',
+'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => '',
 'splash_rm_attribute' => '',
 'splash_rm_document' => '文檔已被移除',
+'splash_rm_download_link' => '',
 'splash_rm_folder' => '已刪除的資料夾',
 'splash_rm_group' => '',
 'splash_rm_group_member' => '',
@@ -1222,6 +1255,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
 'splash_saved_file' => '',
+'splash_send_download_link' => '',
 'splash_settings_saved' => '',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
@@ -1362,6 +1396,7 @@ URL: [url]',
 'use_comment_of_document' => '',
 'use_default_categories' => '默認分類',
 'use_default_keywords' => '使用預定義關鍵字',
+'valid_till' => '',
 'version' => '版本',
 'versioning_file_creation' => '創建版本檔',
 'versioning_file_creation_warning' => '通過此操作，您可以一個包含整個DMS資料夾的版本資訊檔. 版本檔一經創建，每個檔都將保存到資料夾中.',
@@ -1384,6 +1419,7 @@ URL: [url]',
 'workflow_action_name' => '流程動作名稱',
 'workflow_editor' => '',
 'workflow_group_summary' => '流程群組簡述',
+'workflow_has_cycle' => '',
 'workflow_initstate' => '',
 'workflow_in_use' => '正在使用之流程',
 'workflow_layoutdata_saved' => '',

op/op.AddDocument.php

@@ -127,14 +127,31 @@ if (!is_numeric($sequence)) {
 	UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("invalid_sequence"));
 }
 
-$expires = false;
-if (!isset($_POST['expires']) || $_POST["expires"] != "false") {
-	if($_POST["expdate"]) {
-		$tmp = explode('-', $_POST["expdate"]);
-		$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]);
-	} else {
-		$expires = mktime(0,0,0, $_POST["expmonth"], $_POST["expday"], $_POST["expyear"]);
-	}
+switch($_POST["presetexpdate"]) {
+case "date":
+	$tmp = explode('-', $_POST["expdate"]);
+	$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]);
+	break;
+case "1w":
+	$tmp = explode('-', date('Y-m-d'));
+	$expires = mktime(0,0,0, $tmp[1], $tmp[2]+7, $tmp[0]);
+	break;
+case "1m":
+	$tmp = explode('-', date('Y-m-d'));
+	$expires = mktime(0,0,0, $tmp[1]+1, $tmp[2], $tmp[0]);
+	break;
+case "1y":
+	$tmp = explode('-', date('Y-m-d'));
+	$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]+1);
+	break;
+case "2y":
+	$tmp = explode('-', date('Y-m-d'));
+	$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]+2);
+	break;
+case "never":
+default:
+	$expires = null;
+	break;
 }
 
 // Get the list of reviewers and approvers for this document.
@@ -275,9 +292,10 @@ if($settings->_dropFolderDir) {
 	}
 }
 
-if(isset($_POST['fineuploaderuuids']) && $_POST['fineuploaderuuids']) {
-	$uuids = explode(';', $_POST['fineuploaderuuids']);
-	$names = explode(';', $_POST['fineuploadernames']);
+$prefix = 'userfile';
+if(isset($_POST[$prefix.'-fine-uploader-uuids']) && $_POST[$prefix.'-fine-uploader-uuids']) {
+	$uuids = explode(';', $_POST[$prefix.'-fine-uploader-uuids']);
+	$names = explode(';', $_POST[$prefix.'-fine-uploader-names']);
 	foreach($uuids as $i=>$uuid) {
 		$fullfile = $settings->_stagingDir.'/'.utf8_basename($uuid);
 		if(file_exists($fullfile)) {

op/op.AddFile.php

@@ -99,7 +99,7 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 	}
 
 	$res = $document->addDocumentFile($name, $comment, $user, $userfiletmp, 
-                                  basename($userfilename),$fileType, $userfiletype, $version, $public);
+																		utf8_basename($userfilename),$fileType, $userfiletype, $version, $public);
                                 
 	if (is_bool($res) && !$res) {
 		UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured"));

op/op.AddFile2.php

@@ -78,7 +78,7 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 		}
 
 		$res = $document->addDocumentFile($name, $comment, $user, $userfiletmp, 
-																			basename($userfilename),$fileType, $userfiletype );
+																			utf8_basename($userfilename),$fileType, $userfiletype );
 																		
 		if (is_bool($res) && !$res) {
 			UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured"));

op/op.Ajax.php

@@ -27,6 +27,7 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassNotificationService.php");
 include("../inc/inc.ClassEmailNotify.php");
 include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassController.php");
 
 require_once("../inc/inc.ClassSession.php");
 include("../inc/inc.ClassPasswordStrength.php");
@@ -511,89 +512,6 @@ switch($command) {
 		}
 		break; /* }}} */
 
-	case 'view': /* {{{ */
-		require_once("SeedDMS/Preview.php");
-		require_once("../inc/inc.ClassAccessOperation.php");
-		$view = UI::factory($theme, '', array('dms'=>$dms, 'user'=>$user));
-		$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-		if($view) {
-			$view->setParam('refferer', '');
-			$view->setParam('cachedir', $settings->_cacheDir);
-			$view->setParam('accessobject', $accessop);
-		}
-		$content = '';
-		$viewname = $_REQUEST["view"];
-		switch($viewname) {
-			case 'menuclipboard':
-				$content = $view->menuClipboard($session->getClipboard());
-				break;
-			case 'menutasks':
-				$reviews = array();
-				$approvals = array();
-				$receipts = array();
-				$revisions = array();
-				$resArr = $dms->getDocumentList('ApproveByMe', $user);
-				if($resArr) {
-					foreach ($resArr as $res) {
-						$document = $dms->getDocument($res["id"]);
-						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-							$approvals[] = $res['id'];
-						}
-					}
-				}
-				$resArr = $dms->getDocumentList('ReviewByMe', $user);
-				if($resArr) {
-					foreach ($resArr as $res) {
-						$document = $dms->getDocument($res["id"]);
-						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-							$reviews[] = $res['id'];
-						}
-					}
-				}
-				$resArr = $dms->getDocumentList('ReceiptByMe', $user);
-				if($resArr) {
-					foreach ($resArr as $res) {
-						$document = $dms->getDocument($res["id"]);
-						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-							$receipts[] = $res['id'];
-						}
-					}
-				}
-				$resArr = $dms->getDocumentList('ReviseByMe', $user);
-				if($resArr) {
-					foreach ($resArr as $res) {
-						$document = $dms->getDocument($res["id"]);
-						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-							$revisions[] = $res['id'];
-						}
-					}
-				}
-				$content = $view->menuTasks(array('review'=>$reviews, 'approval'=>$approvals, 'receipt'=>$receipts, 'revision'=>$revisions));
-				break;
-			case 'mainclipboard':
-				$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $settings->_previewWidthList);
-				$previewer->setConverters($settings->_converters['preview']);
-				$content = $view->mainClipboard($session->getClipboard(), $previewer);
-				break;
-			case 'documentlistrow':
-				$document = $dms->getDocument($_REQUEST['id']);
-				if($document) {
-					if ($document->getAccessMode($user) >= M_READ) {
-						$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $settings->_previewWidthList);
-						$previewer->setConverters($settings->_converters['preview']);
-						$view->setParam('previewWidthList', $settings->_previewWidthList);
-						$view->setParam('showtree', showtree());
-						$content = $view->documentListRow($document, $previewer, true);
-					}
-				}
-				break;
-			default:
-				$content = '';
-		}
-		echo $content;
-
-		break; /* }}} */
-
 	case 'uploaddocument': /* {{{ */
 		if($user) {
 			if(checkFormKey('adddocument')) {
@@ -719,73 +637,54 @@ switch($command) {
 
 				$cats = array();
 
-				$filesize = SeedDMS_Core_File::fileSize($userfiletmp);
-				$res = $folder->addDocument($name, '', $expires, $user, '',
-																		array(), $userfiletmp, utf8_basename($userfilename),
-																		$fileType, $userfiletype, 0,
-																		$reviewers, $approvers, 1,
-																		'', array(), array(), $workflow);
+				if($settings->_enableFullSearch) {
+					$index = $indexconf['Indexer']::open($settings->_luceneDir);
+					$indexconf['Indexer']::init($settings->_stopWordsFile);
+				} else {
+					$index = null;
+				}
 
-				if (is_bool($res) && !$res) {
+				$controller = Controller::factory('AddDocument');
+				$controller->setParam('documentsource', 'upload');
+				$controller->setParam('folder', $folder);
+				$controller->setParam('index', $index);
+				$controller->setParam('indexconf', $indexconf);
+				$controller->setParam('name', $name);
+				$controller->setParam('comment', '');
+				$controller->setParam('expires', $expires);
+				$controller->setParam('keywords', '');
+				$controller->setParam('categories', $cats);
+				$controller->setParam('owner', $user);
+				$controller->setParam('userfiletmp', $userfiletmp);
+				$controller->setParam('userfilename', $userfilename);
+				$controller->setParam('filetype', $fileType);
+				$controller->setParam('userfiletype', $userfiletype);
+				$controller->setParam('sequence', 0);
+				$controller->setParam('reviewers', $reviewers);
+				$controller->setParam('approvers', $approvers);
+				$controller->setParam('reqversion', 1);
+				$controller->setParam('versioncomment', '');
+				$controller->setParam('attributes', array());
+				$controller->setParam('attributesversion', array());
+				$controller->setParam('workflow', $workflow);
+				$controller->setParam('notificationgroups', array());
+				$controller->setParam('notificationusers', array());
+				$controller->setParam('maxsizeforfulltext', $settings->_maxSizeForFullText);
+				$controller->setParam('defaultaccessdocs', $settings->_defaultAccessDocs);
+
+				if(!$document = $controller->run()) {
 					header('Content-Type: application/json');
-					echo json_encode(array('success'=>false, 'message'=>getMLText("error_occured")));
+					echo json_encode(array('success'=>false, 'message'=>getMLText($controller->getErrorMsg())));
 					exit;
 				} else {
-					$document = $res[0];
-
-					/* Set access as specified in settings. */
-					if($settings->_defaultAccessDocs) {
-						if($settings->_defaultAccessDocs > 0 && $settings->_defaultAccessDocs < 4) {
-							$document->setInheritAccess(0, true);
-							$document->setDefaultAccess($settings->_defaultAccessDocs, true);
-						}
-					}
-
-					if(isset($GLOBALS['SEEDDMS_HOOKS']['addDocument'])) {
-						foreach($GLOBALS['SEEDDMS_HOOKS']['addDocument'] as $hookObj) {
-							if (method_exists($hookObj, 'postAddDocument')) {
-								$hookObj->postAddDocument($document);
-							}
-						}
-					}
-					if($settings->_enableFullSearch) {
-						$index = $indexconf['Indexer']::open($settings->_luceneDir);
-						if($index) {
-							$indexconf['Indexer']::init($settings->_stopWordsFile);
-							$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText));
-							if(isset($GLOBALS['SEEDDMS_HOOKS']['addDocument'])) {
-								foreach($GLOBALS['SEEDDMS_HOOKS']['addDocument'] as $hookObj) {
-									if (method_exists($hookObj, 'preIndexDocument')) {
-										$hookObj->preIndexDocument(null, $document, $idoc);
-									}
-								}
-							}
-							$index->addDocument($idoc);
-						}
-					}
-
-					/* Add a default notification for the owner of the document */
-					if($settings->_enableOwnerNotification) {
-						$res = $document->addNotify($user->getID(), true);
-					}
 					// Send notification to subscribers of folder.
 					if($notifier) {
-						$notifyList = $folder->getNotifyList();
-						if($settings->_enableNotificationAppRev) {
-							/* Reviewers and approvers will be informed about the new document */
-							foreach($reviewers['i'] as $reviewerid) {
-								$notifyList['users'][] = $dms->getUser($reviewerid);
-							}
-							foreach($approvers['i'] as $approverid) {
-								$notifyList['users'][] = $dms->getUser($approverid);
-							}
-							foreach($reviewers['g'] as $reviewergrpid) {
-								$notifyList['groups'][] = $dms->getGroup($reviewergrpid);
-							}
-							foreach($approvers['g'] as $approvergrpid) {
-								$notifyList['groups'][] = $dms->getGroup($approvergrpid);
-							}
-						}
+						$fnl = $folder->getNotifyList();
+						$dnl = $document->getNotifyList();
+						$nl = array(
+							'users'=>array_merge($dnl['users'], $fnl['users']),
+							'groups'=>array_merge($dnl['groups'], $fnl['groups'])
+						);
 
 						$subject = "new_document_email_subject";
 						$message = "new_document_email_body";
@@ -799,11 +698,80 @@ switch($command) {
 						$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 						$params['sitename'] = $settings->_siteName;
 						$params['http_root'] = $settings->_httpRoot;
-						$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
-						foreach ($notifyList["groups"] as $grp) {
+						$notifier->toList($user, $nl["users"], $subject, $message, $params);
+						foreach ($nl["groups"] as $grp) {
 							$notifier->toGroup($user, $grp, $subject, $message, $params);
 						}
 
+						if($workflow && $settings->_enableNotificationWorkflow) {
+							$subject = "request_workflow_action_email_subject";
+							$message = "request_workflow_action_email_body";
+							$params = array();
+							$params['name'] = $document->getName();
+							$params['version'] = 1;
+							$params['workflow'] = $workflow->getName();
+							$params['folder_path'] = $folder->getFolderPathPlain();
+							$params['current_state'] = $workflow->getInitState()->getName();
+							$params['username'] = $user->getFullName();
+							$params['sitename'] = $settings->_siteName;
+							$params['http_root'] = $settings->_httpRoot;
+							$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+
+							foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) {
+								foreach($ntransition->getUsers() as $tuser) {
+									$notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params);
+								}
+								foreach($ntransition->getGroups() as $tuser) {
+									$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params);
+								}
+							}
+						}
+
+						if($settings->_enableNotificationAppRev) {
+							/* Reviewers and approvers will be informed about the new document */
+							if($reviewers['i'] || $reviewers['g']) {
+								$subject = "review_request_email_subject";
+								$message = "review_request_email_body";
+								$params = array();
+								$params['name'] = $document->getName();
+								$params['folder_path'] = $folder->getFolderPathPlain();
+								$params['version'] = 1;
+								$params['comment'] = '';
+								$params['username'] = $user->getFullName();
+								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+								$params['sitename'] = $settings->_siteName;
+								$params['http_root'] = $settings->_httpRoot;
+
+								foreach($reviewers['i'] as $reviewerid) {
+									$notifier->toIndividual($user, $dms->getUser($reviewerid), $subject, $message, $params);
+								}
+								foreach($reviewers['g'] as $reviewergrpid) {
+									$notifier->toGroup($user, $dms->getGroup($reviewergrpid), $subject, $message, $params);
+								}
+							}
+
+							elseif($approvers['i'] || $approvers['g']) {
+								$subject = "approval_request_email_subject";
+								$message = "approval_request_email_body";
+								$params = array();
+								$params['name'] = $document->getName();
+								$params['folder_path'] = $folder->getFolderPathPlain();
+								$params['version'] = 1;
+								$params['comment'] = '';
+								$params['username'] = $user->getFullName();
+								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+								$params['sitename'] = $settings->_siteName;
+								$params['http_root'] = $settings->_httpRoot;
+
+								foreach($approvers['i'] as $approverid) {
+									$notifier->toIndividual($user, $dms->getUser($approverid), $subject, $message, $params);
+								}
+								foreach($approvers['g'] as $approvergrpid) {
+									$notifier->toGroup($user, $dms->getGroup($approvergrpid), $subject, $message, $params);
+								}
+							}
+						}
+
 					}
 				}
 				header('Content-Type: application/json');
@@ -886,53 +854,6 @@ switch($command) {
 		}
 		break; /* }}} */
 
-	case 'mytasks': /* {{{ */
-		if($user) {
-			$startts = microtime(true);
-			$reviews = array();
-			$approvals = array();
-			$receipts = array();
-			$revisions = array();
-			$resArr = $dms->getDocumentList('ApproveByMe', $user);
-			if($resArr) {
-				foreach ($resArr as $res) {
-					$document = $dms->getDocument($res["id"]);
-					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-						$approvals[] = array('id'=>$res['id'], 'name'=>$res['name']);
-					}
-				}
-			}
-			$resArr = $dms->getDocumentList('ReviewByMe', $user);
-			if($resArr) {
-				foreach ($resArr as $res) {
-					$document = $dms->getDocument($res["id"]);
-					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-						$reviews[] = array('id'=>$res['id'], 'name'=>$res['name']);
-					}
-				}
-			}
-			$resArr = $dms->getDocumentList('ReceiptByMe', $user);
-			if($resArr) {
-				foreach ($resArr as $res) {
-					$document = $dms->getDocument($res["id"]);
-					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-						$receipts[] = array('id'=>$res['id'], 'name'=>$res['name']);
-					}
-				}
-			}
-			$resArr = $dms->getDocumentList('ReviseByMe', $user);
-			if($resArr) {
-				foreach ($resArr as $res) {
-					$document = $dms->getDocument($res["id"]);
-					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-						$revisions[] = array('id'=>$res['id'], 'name'=>$res['name']);
-					}
-				}
-			}
-			header('Content-Type: application/json');
-			echo json_encode(array('error'=>0, 'data'=>array('review'=>$reviews, 'approval'=>$approvals, 'receipt'=>$receipts, 'revision'=>$revisions), 'processing_time'=>microtime(true)-$startts));
-		}
-		break; /* }}} */
 	case 'indexdocument': /* {{{ */
 		if($user && $user->isAdmin()) {
 			if($settings->_enableFullSearch) {

op/op.EditDocument.php

@@ -141,17 +141,42 @@ if (($oldcomment = $document->getComment()) != $comment) {
 	}
 }
 
-$expires = false;
-if (!isset($_POST["expires"]) || $_POST["expires"] != "false") {
-	if(isset($_POST["expdate"]) && $_POST["expdate"]) {
-		$tmp = explode('-', $_POST["expdate"]);
-		$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]);
-	} else {
-		$expires = mktime(0,0,0, $_POST["expmonth"], $_POST["expday"], $_POST["expyear"]);
-	}
+switch($_POST["presetexpdate"]) {
+case "date":
+	$tmp = explode('-', $_POST["expdate"]);
+	$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]);
+	break;
+case "1w":
+	$tmp = explode('-', date('Y-m-d'));
+	$expires = mktime(0,0,0, $tmp[1], $tmp[2]+7, $tmp[0]);
+	break;
+case "1m":
+	$tmp = explode('-', date('Y-m-d'));
+	$expires = mktime(0,0,0, $tmp[1]+1, $tmp[2], $tmp[0]);
+	break;
+case "1y":
+	$tmp = explode('-', date('Y-m-d'));
+	$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]+1);
+	break;
+case "2y":
+	$tmp = explode('-', date('Y-m-d'));
+	$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]+2);
+	break;
+case "never":
+default:
+	$expires = null;
+	break;
 }
 
 if ($expires != $document->getExpires()) {
+	if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
+		foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
+			if (method_exists($hookObj, 'preSetExpires')) {
+				$hookObj->preSetExpires(null, array('document'=>$document, 'expires'=>&$expires));
+			}
+		}
+	}
+
 	if($document->setExpires($expires)) {
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
@@ -180,16 +205,43 @@ if ($expires != $document->getExpires()) {
 	} else {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 	}
+
+	$document->verifyLastestContentExpriry();
+
+	if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
+		foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
+			if (method_exists($hookObj, 'postSetExpires')) {
+				$hookObj->postSetExpires(null, array('document'=>$document, 'expires'=>$expires));
+			}
+		}
+	}
 }
 
 if (($oldkeywords = $document->getKeywords()) != $keywords) {
+	if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
+		foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
+			if (method_exists($hookObj, 'preSetKeywords')) {
+				$hookObj->preSetKeywords(null, array('document'=>$document, 'keywords'=>&$keywords, 'oldkeywords'=>&$oldkeywords));
+			}
+		}
+	}
+
 	if($document->setKeywords($keywords)) {
 	}
 	else {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 	}
+
+	if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
+		foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
+			if (method_exists($hookObj, 'postSetKeywords')) {
+				$hookObj->postSetKeywords(null, array('document'=>$document, 'keywords'=>&$keywords, 'oldkeywords'=>&$oldkeywords));
+			}
+		}
+	}
 }
 
+$oldcategories = $document->getCategories();
 if($categories) {
 	$categoriesarr = array();
 	foreach($categories as $catid) {
@@ -198,23 +250,50 @@ if($categories) {
 		}
 		
 	}
-	$oldcategories = $document->getCategories();
 	$oldcatsids = array();
 	foreach($oldcategories as $oldcategory)
 		$oldcatsids[] = $oldcategory->getID();
 
 	if (count($categoriesarr) != count($oldcategories) ||
 			array_diff($categories, $oldcatsids)) {
+		if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
+			foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
+				if (method_exists($hookObj, 'preSetCategories')) {
+					$hookObj->preSetCategories(null, array('document'=>$document, 'categories'=>&$categoriesarr, 'oldcategories'=>&$oldcategories));
+				}
+			}
+		}
 		if($document->setCategories($categoriesarr)) {
 		} else {
 			UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 		}
+		if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
+			foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
+				if (method_exists($hookObj, 'postSetCategories')) {
+					$hookObj->postSetCategories(null, array('document'=>$document, 'categories'=>&$categoriesarr, 'oldcategories'=>&$oldcategories));
+				}
+			}
+		}
+	}
+} elseif($oldcategories) {
+	if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
+		foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
+			if (method_exists($hookObj, 'preSetCategories')) {
+				$hookObj->preSetCategories(null, array('document'=>$document, 'categories'=>array(), 'oldcategories'=>&$oldcategories));
+			}
+		}
 	}
-} else {
 	if($document->setCategories(array())) {
 	} else {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 	}
+	if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
+		foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
+			if (method_exists($hookObj, 'postSetCategories')) {
+				$hookObj->postSetCategories(null, array('document'=>$document, 'categories'=>array(), 'oldcategories'=>&$oldcategories));
+			}
+		}
+	}
 }
 
 $oldattributes = $document->getAttributes();

op/op.RemoveVersion.php

@@ -158,23 +158,6 @@ else {
 				$eU = $version->_document->_dms->getGroup($eID);
 				$grouprecipients[] = $eU;
 			}
-/*
-			$subject = "###SITENAME###: ".$document->getName().", v.".$version->_version." - ".getMLText("version_deleted_email");
-			$message = getMLText("version_deleted_email")."\r\n";
-			$message .= 
-				getMLText("document").": "User.$document->getName()."\r\n".
-				getMLText("version").": ".$version->_version."\r\n".
-				getMLText("comment").": ".$version->getComment()."\r\n".
-				getMLText("user").": ".$user->getFullName()." <". $user->getEmail() ."> ";
-
-			$notifier->toList($user, $recipients, $subject, $message);
-			
-			// Send notification to subscribers.
-			$notifier->toList($user, $nl["users"], $subject, $message);
-			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message);
-			}
-*/
 
 			$subject = "version_deleted_email_subject";
 			$message = "version_deleted_email_body";

op/op.ReviewDocument.php

@@ -165,26 +165,28 @@ if ($newdocstatus == S_DRAFT_APP) {
 	$requestUser = $document->getOwner();
 
 	if($notifier) {
-		$subject = "approval_request_email_subject";
-		$message = "approval_request_email_body";
-		$params = array();
-		$params['name'] = $document->getName();
-		$params['folder_path'] = $folder->getFolderPathPlain();
-		$params['version'] = $version;
-		$params['username'] = $user->getFullName();
-		$params['sitename'] = $settings->_siteName;
-		$params['http_root'] = $settings->_httpRoot;
-		foreach ($docApprovalStatus as $dastat) {
-		
-			if ($dastat["status"] == 0) {
-				if ($dastat["type"] == 0) {
+		if($docApprovalStatus = $content->getApprovalStatus()) {
+			$subject = "approval_request_email_subject";
+			$message = "approval_request_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['version'] = $version;
+			$params['username'] = $user->getFullName();
+			$params['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			foreach ($docApprovalStatus as $dastat) {
+			
+				if ($dastat["status"] == 0) {
+					if ($dastat["type"] == 0) {
 
-					$approver = $dms->getUser($dastat["required"]);
-					$notifier->toIndividual($document->getOwner(), $approver, $subject, $message, $params);
-				} elseif ($dastat["type"] == 1) {
-				
-					$group = $dms->getGroup($dastat["required"]);
-					$notifier->toGroup($document->getOwner(), $group, $subject, $message, $params);
+						$approver = $dms->getUser($dastat["required"]);
+						$notifier->toIndividual($document->getOwner(), $approver, $subject, $message, $params);
+					} elseif ($dastat["type"] == 1) {
+					
+						$group = $dms->getGroup($dastat["required"]);
+						$notifier->toGroup($document->getOwner(), $group, $subject, $message, $params);
+					}
 				}
 			}
 		}

op/op.SetExpires.php

@@ -43,20 +43,41 @@ if ($document->getAccessMode($user) < M_READWRITE) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
 
-$expires = false;
-if (!isset($_POST["expires"]) || $_POST["expires"] != "false") {
-	if(isset($_POST["expdate"]) && $_POST["expdate"]) {
-		$tmp = explode('-', $_POST["expdate"]);
-		$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]);
-	} else {
-		$expires = mktime(0,0,0, $_POST["expmonth"], $_POST["expday"], $_POST["expyear"]);
-	}
+if (!isset($_POST["presetexpdate"]) || $_POST["presetexpdate"] == "") {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_expiration_date"));
+}
+
+switch($_POST["presetexpdate"]) {
+case "date":
+	$tmp = explode('-', $_POST["expdate"]);
+	$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]);
+	break;
+case "1w":
+	$tmp = explode('-', date('Y-m-d'));
+	$expires = mktime(0,0,0, $tmp[1], $tmp[2]+7, $tmp[0]);
+	break;
+case "1m":
+	$tmp = explode('-', date('Y-m-d'));
+	$expires = mktime(0,0,0, $tmp[1]+1, $tmp[2], $tmp[0]);
+	break;
+case "1y":
+	$tmp = explode('-', date('Y-m-d'));
+	$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]+1);
+	break;
+case "2y":
+	$tmp = explode('-', date('Y-m-d'));
+	$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]+2);
+	break;
+case "never":
+default:
+	$expires = null;
+	break;
 }
 
 if(isset($GLOBALS['SEEDDMS_HOOKS']['setExpires'])) {
 	foreach($GLOBALS['SEEDDMS_HOOKS']['setExpires'] as $hookObj) {
 		if (method_exists($hookObj, 'preSetExpires')) {
-			$hookObj->preSetExpires(array('document'=>$document, 'expires'=>&$expires));
+			$hookObj->preSetExpires(null, array('document'=>$document, 'expires'=>&$expires));
 		}
 	}
 }
@@ -70,7 +91,7 @@ $document->verifyLastestContentExpriry();
 if(isset($GLOBALS['SEEDDMS_HOOKS']['setExpires'])) {
 	foreach($GLOBALS['SEEDDMS_HOOKS']['setExpires'] as $hookObj) {
 		if (method_exists($hookObj, 'postSetExpires')) {
-			$hookObj->postSetExpires(array('document'=>$document, 'expires'=>$expires));
+			$hookObj->postSetExpires(null, array('document'=>$document, 'expires'=>$expires));
 		}
 	}
 }

op/op.Settings.php

@@ -81,9 +81,11 @@ if ($action == "saveSettings")
   $settings->_fullSearchEngine = $_POST["fullSearchEngine"];
   $settings->_defaultSearchMethod = $_POST["defaultSearchMethod"];
   $settings->_showSingleSearchHit = getBoolValue("showSingleSearchHit");
+  $settings->_enableSessionList = getBoolValue("enableSessionList");
   $settings->_enableClipboard = getBoolValue("enableClipboard");
   $settings->_enableMenuTasks = getBoolValue("enableMenuTasks");
   $settings->_enableDropUpload = getBoolValue("enableDropUpload");
+  $settings->_enableMultiUpload = getBoolValue("enableMultiUpload");
   $settings->_enableFolderTree = getBoolValue("enableFolderTree");
   $settings->_enableRecursiveCount = getBoolValue("enableRecursiveCount");
   $settings->_maxRecursiveCount = intval($_POST["maxRecursiveCount"]);
@@ -117,6 +119,7 @@ if ($action == "saveSettings")
   $settings->_logFileRotation = $_POST["logFileRotation"];
   $settings->_enableLargeFileUpload = getBoolValue("enableLargeFileUpload");
   $settings->_partitionSize = $_POST["partitionSize"];
+  $settings->_maxUploadSize = $_POST["maxUploadSize"];
 
   // SETTINGS - SYSTEM - AUTHENTICATION
   $settings->_enableGuestLogin = getBoolValue("enableGuestLogin");
@@ -204,7 +207,7 @@ if ($action == "saveSettings")
 		$settings->_converters['fulltext'] = $_POST["converters"]["fulltext"];
 	else
 		$settings->_converters['fulltext'] = $_POST["converters"];
-	$newmimetype = preg_replace('#[^A-Za-z0-9_/+.-*]+#', '', $settings->_converters["fulltext"]["newmimetype"]);
+	$newmimetype = preg_replace('#[^A-Za-z0-9_/+.*-]+#', '', $settings->_converters["fulltext"]["newmimetype"]);
 	if($newmimetype && trim($settings->_converters['fulltext']['newcmd']))
 		$settings->_converters['fulltext'][$newmimetype] = trim($settings->_converters['fulltext']['newcmd']);
 	unset($settings->_converters['fulltext']['newmimetype']);
@@ -212,7 +215,7 @@ if ($action == "saveSettings")
 
 	if(isset($_POST["converters"]["preview"]))
 		$settings->_converters['preview'] = $_POST["converters"]["preview"];
-	$newmimetype = preg_replace('#[^A-Za-z0-9_/+.-*]+#', '', $settings->_converters["preview"]["newmimetype"]);
+	$newmimetype = preg_replace('#[^A-Za-z0-9_/+.*-]+#', '', $settings->_converters["preview"]["newmimetype"]);
 	if($newmimetype && trim($settings->_converters['preview']['newcmd']))
 		$settings->_converters['preview'][$newmimetype] = trim($settings->_converters['preview']['newcmd']);
 	unset($settings->_converters['preview']['newmimetype']);

op/op.TriggerWorkflow.php

@@ -71,7 +71,7 @@ $workflow = $transition->getWorkflow();
 if(isset($GLOBALS['SEEDDMS_HOOKS']['triggerWorkflowTransition'])) {
 	foreach($GLOBALS['SEEDDMS_HOOKS']['triggerWorkflowTransition'] as $hookObj) {
 		if (method_exists($hookObj, 'preTriggerWorkflowTransition')) {
-			$hookObj->preTriggerWorkflowTransition(array('version'=>$version, 'transition'=>$transition, 'comment'=>$_POST["comment"]));
+			$hookObj->preTriggerWorkflowTransition(null, array('version'=>$version, 'transition'=>$transition, 'comment'=>$_POST["comment"]));
 		}
 	}
 }
@@ -130,7 +130,7 @@ if($version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) {
 	if(isset($GLOBALS['SEEDDMS_HOOKS']['triggerWorkflowTransition'])) {
 		foreach($GLOBALS['SEEDDMS_HOOKS']['triggerWorkflowTransition'] as $hookObj) {
 			if (method_exists($hookObj, 'postTriggerWorkflowTransition')) {
-				$hookObj->postTriggerWorkflowTransition(array('version'=>$version, 'transition'=>$transition, 'comment'=>$_POST["comment"]));
+				$hookObj->postTriggerWorkflowTransition(null, array('version'=>$version, 'transition'=>$transition, 'comment'=>$_POST["comment"]));
 			}
 		}
 	}

op/op.UpdateDocument.php

@@ -24,8 +24,17 @@ include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassController.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$controller = Controller::factory($tmp[1]);
+
+/* Check if the form data comes from a trusted request */
+if(!checkFormKey('updatedocument')) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
+}
 
 if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
@@ -58,11 +67,12 @@ if ($document->isLocked()) {
 	else $document->setLocked(false);
 }
 
-if(isset($_POST['fineuploaderuuids']) && $_POST['fineuploaderuuids']) {
-	$uuids = explode(';', $_POST['fineuploaderuuids']);
-	$names = explode(';', $_POST['fineuploadernames']);
+$prefix = 'userfile';
+if(isset($_POST[$prefix.'-fine-uploader-uuids']) && $_POST[$prefix.'-fine-uploader-uuids']) {
+	$uuids = explode(';', $_POST[$prefix.'-fine-uploader-uuids']);
+	$names = explode(';', $_POST[$prefix.'-fine-uploader-names']);
 	$uuid = $uuids[0];
-	$fullfile = $settings->_stagingDir.'/'.basename($uuid);
+	$fullfile = $settings->_stagingDir.'/'.utf8_basename($uuid);
 	if(file_exists($fullfile)) {
 		$finfo = finfo_open(FILEINFO_MIME_TYPE);
 		$mimetype = finfo_file($finfo, $fullfile);
@@ -74,12 +84,7 @@ if(isset($_POST['fineuploaderuuids']) && $_POST['fineuploaderuuids']) {
 	}
 }
 
-if(isset($_POST["comment"]))
-	$comment  = $_POST["comment"];
-else
-	$comment = "";
-
-if ($_FILES['userfile']['error'] == 0) {
+if (isset($_FILES['userfile']) && $_FILES['userfile']['error'] == 0) {
 //	if(!is_uploaded_file($_FILES["userfile"]["tmp_name"]))
 //		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured")."lsajdflk");
 
@@ -121,6 +126,46 @@ if ($_FILES['userfile']['error'] == 0) {
 
 	$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 
+if($settings->_enableFullSearch) {
+	$index = $indexconf['Indexer']::open($settings->_luceneDir);
+	$indexconf['Indexer']::init($settings->_stopWordsFile);
+} else {
+	$index = null;
+}
+
+if(isset($_POST["comment"]))
+	$comment  = $_POST["comment"];
+else
+	$comment = "";
+
+$oldexpires = $document->getExpires();
+switch($_POST["presetexpdate"]) {
+case "date":
+	$tmp = explode('-', $_POST["expdate"]);
+	$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]);
+	break;
+case "1w":
+	$tmp = explode('-', date('Y-m-d'));
+	$expires = mktime(0,0,0, $tmp[1], $tmp[2]+7, $tmp[0]);
+	break;
+case "1m":
+	$tmp = explode('-', date('Y-m-d'));
+	$expires = mktime(0,0,0, $tmp[1]+1, $tmp[2], $tmp[0]);
+	break;
+case "1y":
+	$tmp = explode('-', date('Y-m-d'));
+	$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]+1);
+	break;
+case "2y":
+	$tmp = explode('-', date('Y-m-d'));
+	$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]+2);
+	break;
+case "never":
+default:
+	$expires = null;
+	break;
+}
+
 	// Get the list of reviewers and approvers for this document.
 	$reviewers = array();
 	$approvers = array();
@@ -240,8 +285,8 @@ if ($_FILES['userfile']['error'] == 0) {
 		}
 	}
 
-	if(isset($_POST["attributes"]) && $_POST["attributes"]) {
-		$attributes = $_POST["attributes"];
+	if(isset($_POST["attributes_version"]) && $_POST["attributes_version"]) {
+		$attributes = $_POST["attributes_version"];
 		foreach($attributes as $attrdefid=>$attribute) {
 			$attrdef = $dms->getAttributeDefinition($attrdefid);
 			if($attribute) {
@@ -257,48 +302,26 @@ if ($_FILES['userfile']['error'] == 0) {
 		$attributes = array();
 	}
 
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['updateDocument'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['updateDocument'] as $hookObj) {
-			if (method_exists($hookObj, 'preUpdateDocument')) {
-				$hookObj->preUpdateDocument(array('name'=>&$name, 'comment'=>&$comment));
-			}
-		}
-	}
-
-	$filesize = SeedDMS_Core_File::fileSize($userfiletmp);
-	$contentResult=$document->addContent($comment, $user, $userfiletmp, basename($userfilename), $fileType, $userfiletype, $reviewers, $approvers, $version=0, $attributes, $workflow, $settings->_initialDocumentStatus);
-	if (is_bool($contentResult) && !$contentResult) {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
-	}
-	else {
-		if(isset($GLOBALS['SEEDDMS_HOOKS']['updateDocument'])) {
-			foreach($GLOBALS['SEEDDMS_HOOKS']['updateDocument'] as $hookObj) {
-				if (method_exists($hookObj, 'postUpdateDocument')) {
-					$hookObj->postUpdateDocument($document);
-				}
-			}
-		}
-		if($settings->_enableFullSearch) {
-			$index = $indexconf['Indexer']::open($settings->_luceneDir);
-			if($index) {
-				$lucenesearch = new $indexconf['Search']($index);
-				if($hit = $lucenesearch->getDocument((int) $document->getId())) {
-					$index->delete($hit->id);
-				}
-				$indexconf['Indexer']::init($settings->_stopWordsFile);
-				$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText));
-				if(isset($GLOBALS['SEEDDMS_HOOKS']['updateDocument'])) {
-					foreach($GLOBALS['SEEDDMS_HOOKS']['updateDocument'] as $hookObj) {
-						if (method_exists($hookObj, 'preIndexDocument')) {
-							$hookObj->preIndexDocument(null, $document, $idoc);
-						}
-					}
-				}
-				$index->addDocument($idoc);
-				$index->commit();
-			}
-		}
+	$controller->setParam('folder', $folder);
+	$controller->setParam('document', $document);
+	$controller->setParam('index', $index);
+	$controller->setParam('indexconf', $indexconf);
+	$controller->setParam('comment', $comment);
+	if($oldexpires != $expires)
+		$controller->setParam('expires', $expires);
+	$controller->setParam('userfiletmp', $userfiletmp);
+	$controller->setParam('userfilename', $userfilename);
+	$controller->setParam('filetype', $fileType);
+	$controller->setParam('userfiletype', $userfiletype);
+	$controller->setParam('reviewers', $reviewers);
+	$controller->setParam('approvers', $approvers);
+	$controller->setParam('attributes', $attributes);
+	$controller->setParam('workflow', $workflow);
+	$controller->setParam('initialdocumentstatus', $settings->_initialDocumentStatus);
 
+	if(!$content = $controller->run()) {
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));
+	} else {
 		// Send notification to subscribers.
 		if ($notifier){
 			$notifyList = $document->getNotifyList();
@@ -311,7 +334,7 @@ if ($_FILES['userfile']['error'] == 0) {
 			$params['folder_path'] = $folder->getFolderPathPlain();
 			$params['username'] = $user->getFullName();
 			$params['comment'] = $document->getComment();
-			$params['version_comment'] = $contentResult->getContent()->getComment();
+			$params['version_comment'] = $content->getComment();
 			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
@@ -328,7 +351,7 @@ if ($_FILES['userfile']['error'] == 0) {
 				$message = "request_workflow_action_email_body";
 				$params = array();
 				$params['name'] = $document->getName();
-				$params['version'] = $contentResult->getContent()->getVersion();
+				$params['version'] = $content->getVersion();
 				$params['workflow'] = $workflow->getName();
 				$params['folder_path'] = $folder->getFolderPathPlain();
 				$params['current_state'] = $workflow->getInitState()->getName();
@@ -355,8 +378,8 @@ if ($_FILES['userfile']['error'] == 0) {
 					$params = array();
 					$params['name'] = $document->getName();
 					$params['folder_path'] = $folder->getFolderPathPlain();
-					$params['version'] = $contentResult->getContent()->getVersion();
-					$params['comment'] = $contentResult->getContent()->getComment();
+					$params['version'] = $content->getVersion();
+					$params['comment'] = $content->getComment();
 					$params['username'] = $user->getFullName();
 					$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 					$params['sitename'] = $settings->_siteName;
@@ -376,8 +399,8 @@ if ($_FILES['userfile']['error'] == 0) {
 					$params = array();
 					$params['name'] = $document->getName();
 					$params['folder_path'] = $folder->getFolderPathPlain();
-					$params['version'] = $contentResult->getContent()->getVersion();
-					$params['comment'] = $contentResult->getContent()->getComment();
+					$params['version'] = $content->getVersion();
+					$params['comment'] = $content->getComment();
 					$params['username'] = $user->getFullName();
 					$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 					$params['sitename'] = $settings->_siteName;
@@ -391,43 +414,25 @@ if ($_FILES['userfile']['error'] == 0) {
 					}
 				}
 			}
-		}
 
-		$expires = false;
-		if (!isset($_POST['expires']) || $_POST["expires"] != "false") {
-			if($_POST["expdate"]) {
-				$tmp = explode('-', $_POST["expdate"]);
-				$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]);
-			} else {
-				$expires = mktime(0,0,0, $_POST["expmonth"], $_POST["expday"], $_POST["expyear"]);
-			}
-		}
-
-		if ($expires) {
-			if($document->setExpires($expires)) {
-				if($notifier) {
-					$notifyList = $document->getNotifyList();
-					$folder = $document->getFolder();
-
-					// Send notification to subscribers.
-					$subject = "expiry_changed_email_subject";
-					$message = "expiry_changed_email_body";
-					$params = array();
-					$params['name'] = $document->getName();
-					$params['folder_path'] = $folder->getFolderPathPlain();
-					$params['username'] = $user->getFullName();
-					$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-					$params['sitename'] = $settings->_siteName;
-					$params['http_root'] = $settings->_httpRoot;
-					$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
-					foreach ($notifyList["groups"] as $grp) {
-						$notifier->toGroup($user, $grp, $subject, $message, $params);
-					}
+			if($oldexpires != $document->getExpires()) {
+				// Send notification to subscribers.
+				$subject = "expiry_changed_email_subject";
+				$message = "expiry_changed_email_body";
+				$params = array();
+				$params['name'] = $document->getName();
+				$params['folder_path'] = $folder->getFolderPathPlain();
+				$params['username'] = $user->getFullName();
+				$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+				$params['sitename'] = $settings->_siteName;
+				$params['http_root'] = $settings->_httpRoot;
+				$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+				foreach ($notifyList["groups"] as $grp) {
+					$notifier->toGroup($user, $grp, $subject, $message, $params);
 				}
-			} else {
-				UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 			}
 		}
+
 		if($settings->_removeFromDropFolder) {
 			if(file_exists($userfiletmp)) {
 				unlink($userfiletmp);

out/out.AddDocument.php

@@ -73,6 +73,7 @@ if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('strictformcheck', $settings->_strictFormCheck);
 	$view->setParam('enablelargefileupload', $settings->_enableLargeFileUpload);
+	$view->setParam('enablemultiupload', $settings->_enableMultiUpload);
 	$view->setParam('enableadminrevapp', $settings->_enableAdminRevApp);
 	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
 	$view->setParam('enableselfrevapp', $settings->_enableSelfRevApp);

out/out.AddFile.php

@@ -33,7 +33,7 @@ $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 if (!$accessop->check_view_access($view, $_GET)) {
-	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
+	UI::exitError(getMLText("document_title"), getMLText("access_denied"));
 }
 
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"]<1)) {

out/out.Clipboard.php

@@ -0,0 +1,41 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005 Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010-2016 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.Authentication.php");
+include("../inc/inc.ClassUI.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+
+if($view) {
+	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view($_GET);
+	exit;
+}
+
+?>

out/out.ObjectCheck.php

@@ -78,11 +78,17 @@ foreach($tmprevs as $rev) {
 		if($rev['type'] == 0) {
 			$ruser = $dms->getUser($rev['required']);
 			$mode = $doc->getAccessMode($ruser);
+			$content = $doc->getContentByVersion($rev['version']);
+			$cmode = $content->getAccessMode($ruser);
 		} elseif($rev['type'] == 1) {
 			$rgroup = $dms->getGroup($rev['required']);
 			$mode = $doc->getGroupAccessMode($rgroup);
+			$cmode = M_READ;
 		}
-		if($mode < M_READ)
+		/* Caution: $content->getAccessMode($ruser) doesn't work as it uses the role
+		 * restrictions of the currently logged in user
+		 */
+		if($mode < M_READ || $cmode < M_READ)
 			$docsinrevision[] = $doc;
 	}
 }
@@ -93,11 +99,17 @@ foreach($tmprevs as $rev) {
 		if($rev['type'] == 0) {
 			$ruser = $dms->getUser($rev['required']);
 			$mode = $doc->getAccessMode($ruser);
+			$content = $doc->getContentByVersion($rev['version']);
+			$cmode = $content->getAccessMode($ruser);
 		} elseif($rev['type'] == 1) {
 			$rgroup = $dms->getGroup($rev['required']);
 			$mode = $doc->getGroupAccessMode($rgroup);
+			$cmode = M_READ;
 		}
-		if($mode < M_READ)
+		/* Caution: $content->getAccessMode($ruser) doesn't work as it uses the role
+		 * restrictions of the currently logged in user
+		 */
+		if($mode < M_READ || $cmode < M_READ)
 			$docsinreception[] = $doc;
 	}
 }

out/out.Session.php

@@ -0,0 +1,39 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005 Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010-2016 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+
+if($view) {
+	$view($_GET);
+	exit;
+}
+
+?>

out/out.Tasks.php

@@ -0,0 +1,41 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005 Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010-2016 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.Authentication.php");
+include("../inc/inc.ClassUI.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+
+if($view) {
+	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view($_GET);
+	exit;
+}
+
+?>

styles/bootstrap/application.css

@@ -148,34 +148,6 @@ div.help h3 {
 	margin-right: auto;
 }
 
-#timeline {
-	font-size: 12px;
-	line-height: 14px;
-}
-div.timeline-event-content {
-	margin: 3px 5px;
-}
-div.timeline-frame {
-	border-radius: 4px;
-	border-color: #e3e3e3;
-}
-
-div.status_change_2 {
-	background-color: #DAF6D5;
-	border-color: #AAF897;
-}
-
-div.status_change_-1 {
-	background-color: #F6D5D5;
-	border-color: #F89797;
-}
-
-div.timeline-event-selected {
-	background-color: #fff785;
-	border-color: #ffc200;
-	z-index: 999;
-}
-
 div.splash {
 	display: none;
 }
@@ -320,6 +292,9 @@ ul.qq-upload-list li span {
 	border: 1px solid #cccccc;
 	border-radius: 4px;
 }
+.qq-hide, .qq-uploader dialog {
+	display: none;
+}
 
 @media (max-width: 480px) { 
     .nav-tabs > li {

styles/bootstrap/application.js

@@ -165,8 +165,10 @@ $(document).ready( function() {
 			{ command: 'addtoclipboard', type: type, id: id },
 			function(data) {
 				if(data.success) {
-					$("#main-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=mainclipboard')
-					$("#menu-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=menuclipboard')
+//					$("#main-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=mainclipboard')
+					$("#main-clipboard").html('Loading').load('../out/out.Clipboard.php?action=mainclipboard')
+					//$("#menu-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=menuclipboard')
+					$("#menu-clipboard").html('Loading').load('../out/out.Clipboard.php?action=menuclipboard')
 					noty({
 						text: attr_msg,
 						type: 'success',
@@ -200,8 +202,10 @@ $(document).ready( function() {
 			{ command: 'removefromclipboard', type: type, id: id },
 			function(data) {
 				if(data.success) {
-					$("#main-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=mainclipboard')
-					$("#menu-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=menuclipboard')
+//					$("#main-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=mainclipboard')
+					$("#main-clipboard").html('Loading').load('../out/out.Clipboard.php?action=mainclipboard')
+					//$("#menu-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=menuclipboard')
+					$("#menu-clipboard").html('Loading').load('../out/out.Clipboard.php?action=menuclipboard')
 					noty({
 						text: attr_msg,
 						type: 'success',
@@ -234,7 +238,8 @@ $(document).ready( function() {
 			{ command: 'tooglelockdocument', id: id },
 			function(data) {
 				if(data.success) {
-					$("#table-row-document-"+id).html('Loading').load('../op/op.Ajax.php?command=view&view=documentlistrow&id='+id)
+					//$("#table-row-document-"+id).html('Loading').load('../op/op.Ajax.php?command=view&view=documentlistrow&id='+id)
+					$("#table-row-document-"+id).html('Loading').load('../out/out.ViewDocument.php?action=documentlistitem&documentid='+id)
 					noty({
 						text: attr_msg,
 						type: 'success',
@@ -342,7 +347,7 @@ $(document).ready( function() {
 		input.trigger('fileselect', [numFiles, label]);
 	});
 
-	$(document).on('fileselect', '#upload-file .btn-file :file', function(event, numFiles, label) {
+	$(document).on('fileselect', '.upload-file .btn-file :file', function(event, numFiles, label) {
 		var input = $(this).parents('.input-append').find(':text'),
 		log = numFiles > 1 ? numFiles + ' files selected' : label;
 
@@ -357,17 +362,21 @@ $(document).ready( function() {
 		var element = $(this);
 		var url = '';
 		var href = element.data('href');
+		var base = element.data('base');
+		if(typeof base == 'undefined')
+			base = '';
 		var view = element.data('view');
 		var action = element.data('action');
 		var query = element.data('query');
 		if(view && action) {
-			url = "out."+view+".php?action="+action;
+			url = seeddms_webroot+base+"out/out."+view+".php?action="+action;
 			if(query) {
 				url += "&"+query;
 			}
 		} else
 			url = href;
-		element.prepend('<div style="position: _absolute; overflow: hidden; background: #f7f7f7; z-index: 1000; height: 200px; width: '+element.width()+'px; opacity: 0.7; display: table;"><div style="display: table-cell;text-align: center; vertical-align: middle; "><img src="../views/bootstrap/images/ajax-loader.gif"></div>');
+		if(!element.data('no-spinner'))
+			element.prepend('<div style="position: _absolute; overflow: hidden; background: #f7f7f7; z-index: 1000; height: 200px; width: '+element.width()+'px; opacity: 0.7; display: table;"><div style="display: table-cell;text-align: center; vertical-align: middle; "><img src="../views/bootstrap/images/ajax-loader.gif"></div>');
 		$.get(url, function(data) {
 			element.html(data);
 //			$(".chzn-select").chosen();
@@ -390,10 +399,13 @@ $(document).ready( function() {
 		var element = $(this);
 		var url = '';
 		var href = element.data('href');
+		var base = element.data('base');
+		if(typeof base == 'undefined')
+			base = '';
 		var view = element.data('view');
 		var action = element.data('action');
 		if(view && action)
-			url = "out."+view+".php?action="+action;
+			url = seeddms_webroot+base+"out/out."+view+".php?action="+action;
 		else
 			url = href;
 		if(typeof param1 === 'object') {
@@ -451,8 +463,10 @@ $(document).ready( function() {
 			success: function(data){
 				if(data.success) {
 					if(element.data('param1') == 'command=clearclipboard') {
-						$("#main-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=mainclipboard')
-						$("#menu-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=menuclipboard')
+//						$("#main-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=mainclipboard')
+						$("#main-clipboard").html('Loading').load('../out/out.Clipboard.php?action=mainclipboard')
+						//$("#menu-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=menuclipboard')
+						$("#menu-clipboard").html('Loading').load('../out/out.Clipboard.php?action=menuclipboard')
 					}
 					noty({
 						text: data.message,
@@ -494,8 +508,10 @@ function onAddClipboard(ev) { /* {{{ */
 			{ command: 'addtoclipboard', type: source_type, id: source_id },
 			function(data) {
 				if(data.success) {
-					$("#main-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=mainclipboard')
-					$("#menu-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=menuclipboard')
+//					$("#main-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=mainclipboard')
+					$("#main-clipboard").html('Loading').load('../out/out.Clipboard.php?action=mainclipboard')
+					//$("#menu-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=menuclipboard')
+					$("#menu-clipboard").html('Loading').load('../out/out.Clipboard.php?action=menuclipboard')
 					noty({
 						text: data.message,
 						type: 'success',
@@ -1008,17 +1024,17 @@ $(document).ready(function() { /* {{{ */
 
 	var approval_count, review_count, receipt_count, revision_count;
 	var checkTasks = function() {
-		$.ajax({url: '../op/op.Ajax.php',
+		$.ajax({url: '../out/out.Tasks.php',
 			type: 'GET',
 			dataType: "json",
-			data: {command: 'mytasks'},
+			data: {action: 'mytasks'},
 			success: function(data) {
 				if(data) {
 					if(approval_count != data.data.approval.length ||
 						 review_count != data.data.review.length ||
 						 receipt_count != data.data.receipt.length ||
 						 revision_count != data.data.revision.length) {
-						$("#menu-tasks > ul > li").html('Loading').hide().load('../op/op.Ajax.php?command=view&view=menutasks').fadeIn('500')
+						$("#menu-tasks > ul > li").html('Loading').hide().load('../out/out.Tasks.php?action=menutasks').fadeIn('500')
 						approval_count = data.data.approval.length;
 						review_count = data.data.review.length;
 						receipt_count = data.data.receipt.length;
@@ -1026,8 +1042,8 @@ $(document).ready(function() { /* {{{ */
 					}
 				}
 			},
-			timeout: 1000
+			timeout: 3000
 		}); 
-		timeOutId = setTimeout(checkTasks, 10000);
+		timeOutId = setTimeout(checkTasks, 30000);
 	}
 

styles/bootstrap/fine-uploader/fine-uploader.js

@@ -7411,4 +7411,4 @@
         });
     };
 })(window);
-//# sourceMappingURL=fine-uploader.js.map
+//# sourceMappingURL=fine-uploader.js.map

utils/xmldump.php

@@ -1,6 +1,11 @@
 <?php
-require_once("../inc/inc.ClassSettings.php");
-require_once("../inc/inc.ClassAcl.php");
+if(isset($_SERVER['SEEDDMS_HOME'])) {
+	require_once($_SERVER['SEEDDMS_HOME']."/inc/inc.ClassSettings.php");
+	require_once($_SERVER['SEEDDMS_HOME']."/inc/inc.ClassAcl.php");
+} else {
+	require_once("../inc/inc.ClassSettings.php");
+	require_once("../inc/inc.ClassAcl.php");
+}
 
 function usage() { /* {{{ */
 	echo "Usage:\n";
@@ -279,7 +284,7 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
 			if($attributes = $document->getAttributes()) {
 				foreach($attributes as $attribute) {
 					$attrdef = $attribute->getAttributeDefinition();
-					echo $indent." <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".$attribute->getValue()."</attr>\n";
+					echo $indent." <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".wrapWithCData($attribute->getValue())."</attr>\n";
 				}
 			}
 
@@ -335,7 +340,7 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
 					if($attributes = $version->getAttributes()) {
 						foreach($attributes as $attribute) {
 							$attrdef = $attribute->getAttributeDefinition();
-							echo $indent."   <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".$attribute->getValue()."</attr>\n";
+							echo $indent."   <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".wrapWithCData($attribute->getValue())."</attr>\n";
 						}
 					}
 					if($statuslog = $version->getStatusLog()) {
@@ -420,7 +425,7 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
 					echo $indent."   <attr name=\"date\" format=\"Y-m-d H:i:s\">".date('Y-m-d H:i:s', $file->getDate())."</attr>\n";
 					echo $indent."   <attr name=\"filetype\">".wrapWithCData($file->getFileType())."</attr>\n";
 					echo $indent."   <attr name=\"version\">".$file->getVersion()."</attr>\n";
-					echo $indent."   <attr name=\"pulic\">".($file->isPublic() ? 1 : 0)."</attr>\n";
+					echo $indent."   <attr name=\"public\">".($file->isPublic() ? 1 : 0)."</attr>\n";
 					echo $indent."   <attr name=\"owner\">".$owner->getId()."</attr>\n";
 					echo $indent."   <attr name=\"comment\">".wrapWithCData($file->getComment())."</attr>\n";
 					echo $indent."   <attr name=\"orgfilename\">".wrapWithCData($file->getOriginalFileName())."</attr>\n";
@@ -709,7 +714,7 @@ if($attrdefs) {
 		echo "\">\n";
 		echo "  <attr name=\"name\">".$attrdef->getName()."</attr>\n";
 		echo "  <attr name=\"multiple\">".$attrdef->getMultipleValues()."</attr>\n";
-		echo "  <attr name=\"valueset\">".$attrdef->getValueSet()."</attr>\n";
+		echo "  <attr name=\"valueset\">".wrapWithCData($attrdef->getValueSet())."</attr>\n";
 		echo "  <attr name=\"type\">".$attrdef->getType()."</attr>\n";
 		echo "  <attr name=\"minvalues\">".$attrdef->getMinValues()."</attr>\n";
 		echo "  <attr name=\"maxvalues\">".$attrdef->getMaxValues()."</attr>\n";

utils/xmlimport.php

@@ -1,6 +1,11 @@
 <?php
-require_once("../inc/inc.ClassSettings.php");
-require_once("../inc/inc.ClassAcl.php");
+if(isset($_SERVER['SEEDDMS_HOME'])) {
+	require_once($_SERVER['SEEDDMS_HOME']."/inc/inc.ClassSettings.php");
+	require_once($_SERVER['SEEDDMS_HOME']."/inc/inc.ClassAcl.php");
+} else {
+	require_once("../inc/inc.ClassSettings.php");
+	require_once("../inc/inc.ClassAcl.php");
+}
 require("Log.php");
 
 function usage() { /* {{{ */
@@ -40,10 +45,15 @@ function getRevAppLog($reviews) { /* {{{ */
 		if($review['attributes']['type'] == 1) {
 			if(isset($objmap['groups'][(int) $review['attributes']['required']]))
 				$newreview['required'] = $dms->getGroup($objmap['groups'][(int) $review['attributes']['required']]);
+			else
+				$logger->warning("Group ".(int) $review['attributes']['required']." for Log cannot be mapped");
 		} else {
 			if(isset($objmap['users'][(int) $review['attributes']['required']]))
 				$newreview['required'] = $dms->getUser($objmap['users'][(int) $review['attributes']['required']]);
+			else
+				$logger->warning("User ".(int) $review['attributes']['required']." for Log cannot be mapped");
 		}
+		if(isset($newreview['required'])) {
 		$newreview['logs'] = array();
 		foreach($review['logs'] as $j=>$log) {
 			if(!array_key_exists($log['attributes']['user'], $objmap['users'])) {
@@ -64,6 +74,7 @@ function getRevAppLog($reviews) { /* {{{ */
 			}
 		}
 		$newreviews[] = $newreview;
+		}
 	}
 	return $newreviews;
 } /* }}} */
@@ -111,7 +122,7 @@ function insert_user($user) { /* {{{ */
 	}
 
 	if ($newUser = $dms->getUserByLogin($user['attributes']['login'])) {
-		$logger->info("User '".$user['attributes']['login']."' already exists");
+		$logger->warning("User '".$user['attributes']['login']."' already exists");
 	} else {
 		if(in_array('users', $sections)) {
 			if(substr($user['attributes']['pwdexpiration'], 0, 10) == '0000-00-00')
@@ -176,7 +187,7 @@ function insert_group($group) { /* {{{ */
 	if($debug) print_r($group);
 
 	if ($newGroup = $dms->getGroupByName($group['attributes']['name'])) {
-		$logger->info("Group already exists");
+		$logger->warning("Group already exists");
 	} else {
 		if(in_array('groups', $sections)) {
 			$newGroup = $dms->addGroup($group['attributes']['name'], $group['attributes']['comment']);
@@ -272,10 +283,11 @@ function insert_attributedefinition($attrdef) { /* {{{ */
 	if($debug)
 		print_r($attrdef);
 	if($newAttrdef = $dms->getAttributeDefinitionByName($attrdef['attributes']['name'])) {
-		$logger->info("Attribute definition already exists");
+		$logger->warning("Attribute definition already exists");
 	} else {
 		if(in_array('attributedefinitions', $sections)) {
-			if(!$newAttrdef = $dms->addAttributeDefinition($attrdef['attributes']['name'], $attrdef['objecttype'], $attrdef['attributes']['type'], $attrdef['attributes']['multiple'], $attrdef['attributes']['minvalues'], $attrdef['attributes']['maxvalues'], $attrdef['attributes']['valueset'], $attrdef['attributes']['regex'])) {
+			$objtype = ($attrdef['objecttype'] == 'folder' ? SeedDMS_Core_AttributeDefinition::objtype_folder : ($attrdef['objecttype'] == 'document' ? SeedDMS_Core_AttributeDefinition::objtype_document : ($attrdef['objecttype'] == 'documentcontent' ? SeedDMS_Core_AttributeDefinition::objtype_documentcontent : 0)));
+			if(!$newAttrdef = $dms->addAttributeDefinition($attrdef['attributes']['name'], $objtype, $attrdef['attributes']['type'], $attrdef['attributes']['multiple'], $attrdef['attributes']['minvalues'], $attrdef['attributes']['maxvalues'], $attrdef['attributes']['valueset'], $attrdef['attributes']['regex'])) {
 				$logger->err("Could not add attribute definition");
 				$logger->debug($dms->getDB()->getErrorMsg());
 				return false;
@@ -297,7 +309,7 @@ function insert_documentcategory($documentcat) { /* {{{ */
 	if($debug) print_r($documentcat);
 
 	if($newCategory = $dms->getDocumentCategoryByName($documentcat['attributes']['name'])) {
-		$logger->info("Document category already exists");
+		$logger->warning("Document category already exists");
 	} else {
 		if(in_array('documentcategories', $sections)) {
 			if(!$newCategory = $dms->addDocumentCategory($documentcat['attributes']['name'])) {
@@ -329,7 +341,7 @@ function insert_keywordcategory($keywordcat) { /* {{{ */
 	$owner = $objmap['users'][(int) $keywordcat['attributes']['owner']];
 
 	if($newCategory = $dms->getKeywordCategoryByName($keywordcat['attributes']['name'], $owner)) {
-		$logger->info("Document category already exists");
+		$logger->warning("Keyword category already exists");
 	} else {
 		if(in_array('keywordcategories', $sections)) {
 			if(!$newCategory = $dms->addKeywordCategory($owner, $keywordcat['attributes']['name'])) {
@@ -362,7 +374,7 @@ function insert_workflow($workflow) { /* {{{ */
 	if($debug)
 		print_r($workflow);
 	if($newWorkflow = $dms->getWorkflowByName($workflow['attributes']['name'])) {
-		$logger->info("Workflow already exists");
+		$logger->warning("Workflow already exists");
 	} else {
 		if(in_array('workflows', $sections)) {
 			if(!$initstate = $dms->getWorkflowState($objmap['workflowstates'][(int)$workflow['attributes']['initstate']])) {
@@ -437,7 +449,7 @@ function insert_workflowstate($workflowstate) { /* {{{ */
 	if($debug)
 		print_r($workflowstate);
 	if($newWorkflowstate = $dms->getWorkflowStateByName($workflowstate['attributes']['name'])) {
-		$logger->info("Workflow state already exists");
+		$logger->warning("Workflow state already exists");
 	} else {
 		if(in_array('workflows', $sections)) {
 			if(!$newWorkflowstate = $dms->addWorkflowState($workflowstate['attributes']['name'], isset($workflowstate['attributes']['documentstate']) ? $workflowstate['attributes']['documentstate'] : 0)) {
@@ -461,7 +473,7 @@ function insert_workflowaction($workflowaction) { /* {{{ */
 	if($debug)
 		print_r($workflowaction);
 	if($newWorkflowaction = $dms->getWorkflowActionByName($workflowaction['attributes']['name'])) {
-		$logger->info("Workflow action already exists");
+		$logger->warning("Workflow action already exists");
 	} else {
 		if(in_array('workflows', $sections)) {
 			if(!$newWorkflowaction = $dms->addWorkflowAction($workflowaction['attributes']['name'])) {
@@ -581,7 +593,7 @@ function insert_document($document) { /* {{{ */
 			$document['attributes']['comment'],
 			isset($document['attributes']['expires']) ? dateToTimestamp($document['attributes']['expires']) : 0,
 			$owner,
-			isset($document['attributes']['keywords']) ? $document['attributes']['keywords'] : 0,
+			isset($document['attributes']['keywords']) ? $document['attributes']['keywords'] : '',
 			$categories,
 			$filename,
 			$initversion['attributes']['orgfilename'],
@@ -643,6 +655,10 @@ function insert_document($document) { /* {{{ */
 			$newapprovals = getRevAppLog($initversion['approvals']);
 			$newVersion->rewriteApprovalLog($newapprovals);
 		}
+		if($initversion['receipts']) {
+			$newreceipts = getRevAppLog($initversion['receipts']);
+			$newVersion->rewriteReceiptLog($newreceipts);
+		}
 
 		if($initversion['workflowlogs']) {
 			$newworkflowlogs = getWorkflowLog($initversion['workflowlogs']);
@@ -753,6 +769,10 @@ function insert_document($document) { /* {{{ */
 				$newapprovals = getRevAppLog($version['approvals']);
 				$newVersion->rewriteApprovalLog($newapprovals);
 			}
+			if($version['receipts']) {
+				$newreceipts = getRevAppLog($version['receipts']);
+				$newVersion->rewriteReceiptLog($newreceipts);
+			}
 
 			if($version['workflowlogs']) {
 				$newworkflowlogs = getWorkflowLog($version['workflowlogs']);
@@ -825,7 +845,9 @@ function insert_document($document) { /* {{{ */
 					$filename,
 					$file['attributes']['orgfilename'],
 					$file['attributes']['filetype'],
-					$file['attributes']['mimetype']
+					$file['attributes']['mimetype'],
+					$file['attributes']['version'],
+					$file['attributes']['public']
 				);
 				unlink($filename);
 			}
@@ -1050,7 +1072,7 @@ function set_mandatory() { /* {{{ */
 } /* }}} */
 
 function startElement($parser, $name, $attrs) { /* {{{ */
-	global $logger, $dms, $noversioncheck, $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_workflowlog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role, $cur_acopath, $cur_acos;
+	global $logger, $dms, $noversioncheck, $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_workflowlog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_receipt, $cur_receiptlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role, $cur_acopath, $cur_acos;
 
 	$parent = end($elementstack);
 	array_push($elementstack, array('name'=>$name, 'attributes'=>$attrs));
@@ -1172,6 +1194,7 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 			$cur_version['attributes'] = array();
 			$cur_version['approvals'] = array();
 			$cur_version['reviews'] = array();
+			$cur_version['receipts'] = array();
 			$cur_version['statuslogs'] = array();
 			$cur_version['workflowlogs'] = array();
 			break;
@@ -1204,6 +1227,15 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 			$cur_reviewlog = array();
 			$cur_reviewlog['attributes'] = array();
 			break;
+		case "RECEIPT":
+			$cur_receipt = array();
+			$cur_receipt['attributes'] = array();
+			$cur_receipt['logs'] = array();
+			break;
+		case "RECEIPTLOG":
+			$cur_receiptlog = array();
+			$cur_receiptlog['attributes'] = array();
+			break;
 		case 'ATTRIBUTEDEFINITION':
 			$cur_attrdef = array();
 			$cur_attrdef['id'] = (int) $attrs['ID'];
@@ -1235,6 +1267,10 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 				$cur_review['attributes'][$attrs['NAME']] = '';
 			} elseif($parent['name'] == 'REVIEWLOG') {
 				$cur_reviewlog['attributes'][$attrs['NAME']] = '';
+			} elseif($parent['name'] == 'RECEIPT') {
+				$cur_receipt['attributes'][$attrs['NAME']] = '';
+			} elseif($parent['name'] == 'RECEIPTLOG') {
+				$cur_receiptlog['attributes'][$attrs['NAME']] = '';
 			} elseif($parent['name'] == 'FOLDER') {
 				if(isset($attrs['TYPE']) && $attrs['TYPE'] == 'user') {
 					$cur_folder['user_attributes'][$attrs['ATTRDEF']] = '';
@@ -1427,7 +1463,7 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 } /* }}} */
 
 function endElement($parser, $name) { /* {{{ */
-	global $logger, $dms, $sections, $rootfolder, $objmap, $elementstack, $users, $groups, $links,$cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowlog, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role, $cur_acopath, $cur_acos;
+	global $logger, $dms, $sections, $rootfolder, $objmap, $elementstack, $users, $groups, $links,$cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_receipt, $cur_receiptlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowlog, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role, $cur_acopath, $cur_acos;
 
 	array_pop($elementstack);
 	$parent = end($elementstack);
@@ -1461,6 +1497,12 @@ function endElement($parser, $name) { /* {{{ */
 		case "REVIEWLOG":
 			$cur_review['logs'][] = $cur_reviewlog;
 			break;
+		case "RECEIPT":
+			$cur_version['receipts'][] = $cur_receipt;
+			break;
+		case "RECEIPTLOG":
+			$cur_receipt['logs'][] = $cur_receiptlog;
+			break;
 		case "USER":
 			/* users can be the users data or the member of a group */
 			$first = $elementstack[1];
@@ -1567,7 +1609,7 @@ function endElement($parser, $name) { /* {{{ */
 } /* }}} */
 
 function characterData($parser, $data) { /* {{{ */
-	global $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowlog, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role, $cur_acopath, $cur_acos;
+	global $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_receipt, $cur_receiptlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowlog, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role, $cur_acopath, $cur_acos;
 
 	$current = end($elementstack);
 	$parent = prev($elementstack);
@@ -1637,6 +1679,15 @@ function characterData($parser, $data) { /* {{{ */
 					else
 						$cur_reviewlog['attributes'][$current['attributes']['NAME']] = $data;
 					break;
+				case 'RECEIPT':
+					$cur_receipt['attributes'][$current['attributes']['NAME']] = $data;
+					break;
+				case 'RECEIPTLOG':
+					if(isset($cur_receiptlog['attributes'][$current['attributes']['NAME']]))
+						$cur_receiptlog['attributes'][$current['attributes']['NAME']] .= $data;
+					else
+						$cur_receiptlog['attributes'][$current['attributes']['NAME']] = $data;
+					break;
 				case 'WORKFLOWLOG':
 					if(isset($cur_workflowlog['attributes'][$current['attributes']['NAME']]))
 						$cur_workflowlog['attributes'][$current['attributes']['NAME']] .= $data;

views/bootstrap/class.AddDocument.php

@@ -35,17 +35,21 @@ class SeedDMS_View_AddDocument extends SeedDMS_Bootstrap_Style {
 		$libraryfolder = $this->params['libraryfolder'];
 		$dropfolderdir = $this->params['dropfolderdir'];
 		$partitionsize = $this->params['partitionsize'];
+		$maxuploadsize = $this->params['maxuploadsize'];
 		$enablelargefileupload = $this->params['enablelargefileupload'];
+		$enablemultiupload = $this->params['enablemultiupload'];
 		header('Content-Type: application/javascript; charset=UTF-8');
 
-		if($enablelargefileupload)
-			$this->printFineUploaderJs('../op/op.UploadChunks.php', $partitionsize);
+		if($enablelargefileupload) {
+			$this->printFineUploaderJs('../op/op.UploadChunks.php', $partitionsize, $maxuploadsize, $enablemultiupload);
+		}
 ?>
 $(document).ready(function() {
 	$('#new-file').click(function(event) {
-			$("#upload-file").clone().appendTo("#upload-files").removeAttr("id").children('div').children('input').val('');
+		tttttt = $("#userfile-upload-file").clone().appendTo("#userfile-upload-files").removeAttr("id");
+		tttttt.children('div').children('input').val('');
+		tttttt.children('div').children('span').children('input').val('');
 	});
-
 	jQuery.validator.addMethod("alternatives", function(value, element, params) {
 		if(value != '')
 			return true;
@@ -89,7 +93,11 @@ $(document).ready(function() {
 		if($enablelargefileupload) {
 ?>
 		submitHandler: function(form) {
-			manualuploader.uploadStoredFiles();
+			/* fileuploader may not have any files if drop folder is used */
+			if(userfileuploader.getUploads().length)
+				userfileuploader.uploadStoredFiles();
+			else
+				form.submit();
 		},
 <?php
 		}
@@ -98,8 +106,8 @@ $(document).ready(function() {
 <?php
 		if($enablelargefileupload) {
 ?>
-			fineuploaderuuids: {
-				fineuploader: [ manualuploader, $('#dropfolderfileform1') ]
+			'userfile-fine-uploader-uuids': {
+				fineuploader: [ userfileuploader, $('#dropfolderfileform1') ]
 			}
 <?php
 		} else {
@@ -127,6 +135,12 @@ $(document).ready(function() {
 			}
 		}
 	});
+	$('#presetexpdate').on('change', function(ev){
+		if($(this).val() == 'date')
+			$('#control_expdate').show();
+		else
+			$('#control_expdate').hide();
+	});
 });
 <?php
 			$this->printKeywordChooserJs("form1");
@@ -143,6 +157,7 @@ $(document).ready(function() {
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
 		$enablelargefileupload = $this->params['enablelargefileupload'];
+		$enablemultiupload = $this->params['enablemultiupload'];
 		$enableadminrevapp = $this->params['enableadminrevapp'];
 		$enableownerrevapp = $this->params['enableownerrevapp'];
 		$enableselfrevapp = $this->params['enableselfrevapp'];
@@ -156,8 +171,10 @@ $(document).ready(function() {
 		$folderid = $folder->getId();
 
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
-		if($enablelargefileupload)
+		if($enablelargefileupload) {
 			$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/fine-uploader/jquery.fine-uploader.min.js"></script>'."\n", 'js');
+			$this->htmlAddHeader($this->getFineUploaderTemplate(), 'js');
+		}
 
 		$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
 		$this->globalNavigation($folder);
@@ -165,9 +182,6 @@ $(document).ready(function() {
 		$this->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder);
 		
 		$msg = getMLText("max_upload_size").": ".ini_get( "upload_max_filesize");
-		if(0 && $enablelargefileupload) {
-			$msg .= "<p>".sprintf(getMLText('link_alt_updatedocument'), "out.AddMultiDocument.php?folderid=".$folderid."&showtree=".showtree())."</p>";
-		}
 		$this->warningMsg($msg);
 		$this->contentHeading(getMLText("add_document"));
 		$this->contentContainerStart();
@@ -216,6 +230,37 @@ $(document).ready(function() {
 			<td><?php printMLText("sequence");?>:</td>
 			<td><?php $this->printSequenceChooser($folder->getDocuments('s')); if($orderby != 's') echo "<br />".getMLText('order_by_sequence_off'); ?></td>
 		</tr>
+<?php
+			if($presetexpiration) {
+				if(!($expts = strtotime($presetexpiration)))
+					$expts = false;
+			} else {
+				$expts = false;
+			}
+?>
+		<tr>
+			<td><?php printMLText("preset_expires");?>:</td>
+			<td>
+				<select class="span3" name="presetexpdate" id="presetexpdate">
+					<option value="never"><?php printMLText('does_not_expire');?></option>
+					<option value="date"<?php echo ($expts != '' ? " selected" : ""); ?>><?php printMLText('expire_by_date');?></option>
+					<option value="1w"><?php printMLText('expire_in_1w');?></option>
+					<option value="1m"><?php printMLText('expire_in_1m');?></option>
+					<option value="1y"><?php printMLText('expire_in_1y');?></option>
+					<option value="2y"><?php printMLText('expire_in_2y');?></option>
+				</select>
+			</td>
+		</tr>
+		<tr id="control_expdate" <?php echo ($expts == false ? 'style="display: none;"' : ''); ?>>
+			<td><?php printMLText("expires");?>:</td>
+			<td>
+        <span class="input-append date span6" id="expirationdate" data-date="<?php echo ($expts ? date('Y-m-d', $expts) : ''); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>" data-checkbox="#expires">
+          <input class="span3" size="16" name="expdate" type="text" value="<?php echo ($expts ? date('Y-m-d', $expts) : ''); ?>">
+          <span class="add-on"><i class="icon-calendar"></i></span>
+        </span>
+			</td>
+		</tr>
+
 <?php if($user->isAdmin()) { ?>
 		<tr>
 			<td><?php printMLText("owner");?>:</td>
@@ -238,12 +283,14 @@ $(document).ready(function() {
 			$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_document, SeedDMS_Core_AttributeDefinition::objtype_all));
 			if($attrdefs) {
 				foreach($attrdefs as $attrdef) {
-					$arr = $this->callHook('editDocumentAttribute', null, $attrdef);
+					$arr = $this->callHook('addDocumentAttribute', null, $attrdef);
 					if(is_array($arr)) {
-						echo "<tr>";
-						echo "<td>".$arr[0].":</td>";
-						echo "<td>".$arr[1]."</td>";
-						echo "</tr>";
+						if($arr) {
+							echo "<tr>";
+							echo "<td>".$arr[0].":</td>";
+							echo "<td>".$arr[1]."</td>";
+							echo "</tr>";
+						}
 					} else {
 ?>
 		<tr>
@@ -254,26 +301,16 @@ $(document).ready(function() {
 					}
 				}
 			}
-			if($presetexpiration) {
-				if(!($expts = strtotime($presetexpiration)))
-					$expts = time();
-			} else {
-				$expts = time();
+			$arrs = $this->callHook('addDocumentAttributes', $folder);
+			if(is_array($arrs)) {
+				foreach($arrs as $arr) {
+					echo "<tr>";
+					echo "<td>".$arr[0].":</td>";
+					echo "<td>".$arr[1]."</td>";
+					echo "</tr>";
+				}
 			}
 ?>
-		<tr>
-			<td><?php printMLText("expires");?>:</td>
-			<td>
-        <span class="input-append date span12" id="expirationdate" data-date="<?php echo date('Y-m-d', $expts); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>" data-checkbox="#expires">
-          <input class="span3" size="16" name="expdate" type="text" value="<?php echo date('Y-m-d', $expts); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
-        </span>&nbsp;
-        <label class="checkbox inline">
-					<input type="checkbox" id="expires" name="expires" value="false" <?php echo  ($presetexpiration ? "" : "checked");?>><?php printMLText("does_not_expire");?>
-        </label>
-			</td>
-		</tr>
-
 		<tr>
 			<td>
 		<?php $this->contentSubHeading(getMLText("version_info")); ?>
@@ -286,20 +323,16 @@ $(document).ready(function() {
 		<tr>
 			<td><?php printMLText("local_file");?>:</td>
 			<td>
-<!--
-			<a href="javascript:addFiles()"><?php printMLtext("add_multiple_files") ?></a>
-			<ol id="files">
-			<li><input type="file" name="userfile[]" size="60"></li>
-			</ol>
--->
 <?php
 		if($enablelargefileupload)
 			$this->printFineUploaderHtml();
 		else {
 			$this->printFileChooser('userfile[]', false);
+			if($enablemultiupload) {
 ?>
 			<a class="" id="new-file"><?php printMLtext("add_multiple_files") ?></a>
 <?php
+			}
 		}
 ?>
 			</td>
@@ -325,7 +358,7 @@ $(document).ready(function() {
 			$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all));
 			if($attrdefs) {
 				foreach($attrdefs as $attrdef) {
-					$arr = $this->callHook('editDocumentAttribute', null, $attrdef);
+					$arr = $this->callHook('addDocumentContentAttribute', null, $attrdef);
 					if(is_array($arr)) {
 						echo "<tr>";
 						echo "<td>".$arr[0].":</td>";
@@ -341,6 +374,17 @@ $(document).ready(function() {
 					}
 				}
 			}
+
+			$arrs = $this->callHook('addDocumentContentAttributes', $folder);
+			if(is_array($arrs)) {
+				foreach($arrs as $arr) {
+					echo "<tr>";
+					echo "<td>".$arr[0].":</td>";
+					echo "<td>".$arr[1]."</td>";
+					echo "</tr>";
+				}
+			}
+
 		if($workflowmode == 'advanced') {
 ?>
 		<tr>	

views/bootstrap/class.AddFile.php

@@ -34,9 +34,10 @@ class SeedDMS_View_AddFile extends SeedDMS_Bootstrap_Style {
 	function js() { /* {{{ */
 		$enablelargefileupload = $this->params['enablelargefileupload'];
 		$partitionsize = $this->params['partitionsize'];
+		$maxuploadsize = $this->params['maxuploadsize'];
 		header('Content-Type: application/javascript');
 		if($enablelargefileupload)
-			$this->printFineUploaderJs('../op/op.UploadChunks.php', $partitionsize);
+			$this->printFineUploaderJs('../op/op.UploadChunks.php', $partitionsize, $maxuploadsize);
 ?>
 
 $(document).ready( function() {
@@ -119,8 +120,10 @@ $(document).ready( function() {
 		$enablelargefileupload = $this->params['enablelargefileupload'];
 
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
-		if($enablelargefileupload)
+		if($enablelargefileupload) {
 			$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/fine-uploader/jquery.fine-uploader.min.js"></script>'."\n", 'js');
+			$this->htmlAddHeader($this->getFineUploaderTemplate(), 'js');
+		}
 
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
@@ -155,7 +158,7 @@ $(document).ready( function() {
 	</div>
 </div>
 <div class="control-group">
-	<label class="control-label"><?php printMLText("link_to_version");?>:</label>
+	<label class="control-label"><?php printMLText("version");?>:</label>
 	<div class="controls"><select name="version" id="version">
 		<option value=""></option>
 <?php

views/bootstrap/class.AddSubFolder.php

@@ -126,12 +126,22 @@ $(document).ready( function() {
 	$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_folder, SeedDMS_Core_AttributeDefinition::objtype_all));
 	if($attrdefs) {
 		foreach($attrdefs as $attrdef) {
+			$arr = $this->callHook('addFolderAttribute', null, $attrdef);
+			if(is_array($arr)) {
+				if($arr) {
+					echo "<div class=\"control-group\">";
+					echo "	<label class=\"control-label\">".$arr[0].":</label>";
+					echo "	<div class=\"controls\">".$arr[1]."</div>";
+					echo "</div>";
+				}
+			} else {
 ?>
 <div class="control-group">
 	<label class="control-label"><?php echo htmlspecialchars($attrdef->getName()); ?>:</label>
 	<div class="controls"><?php $this->printAttributeEditField($attrdef, '') ?></div>
 </div>
 <?php
+			}
 		}
 	}
 ?>

views/bootstrap/class.AdminTools.php

@@ -31,6 +31,14 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 
+	static function wrapRow($content) { /* {{{ */
+		return '<div class="row-fluid">'.$content.'</div>';
+	} /* }}} */
+
+	static function rowButton($link, $icon, $label) { /* {{{ */
+		return '<a href="'.$link.'" class="span3 btn btn-medium"><i class="icon-'.$icon.'"></i><br />'.getMLText($label).'</a>';
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -46,6 +54,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerStart();
 ?>
 	<div id="admin-tools">
+	<?php echo $this->callHook('beforeRows'); ?>
 	<div class="row-fluid">
 <?php if($accessop->check_view_access('UsrMgr')) { ?>
 		<a href="../out/out.UsrMgr.php" class="span3 btn btn-medium"><i class="icon-user"></i><br /><?php echo getMLText("user_management")?></a>
@@ -56,6 +65,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 <?php if($accessop->check_view_access('RoleMgr')) { ?>
 		<a href="../out/out.RoleMgr.php" class="span3 btn btn-medium"><i class="icon-bullseye"></i><br /><?php echo getMLText("role_management")?></a>
 <?php } ?>
+	<?php echo $this->callHook('endOfRow', 1); ?>
 	</div>
 	<div class="row-fluid">
 <?php if($accessop->check_view_access('BackupTools')) { ?>
@@ -65,6 +75,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 		if ($logfileenable && ($accessop->check_view_access('LogManagement')))
 			echo "<a href=\"../out/out.LogManagement.php\" class=\"span3 btn btn-medium\"><i class=\"icon-list\"></i><br />".getMLText("log_management")."</a>";
 ?>
+		<?php echo $this->callHook('endOfRow', 2); ?>
 	</div>
 	<div class="row-fluid">
 <?php if($accessop->check_view_access('DefaultKeywords')) { ?>
@@ -79,6 +90,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 <?php if($accessop->check_view_access('AttributeGroupMgr')) { ?>
 		<a href="../out/out.AttributeGroupMgr.php" class="span3 btn btn-medium"><i class="icon-tags"></i><br /><?php echo getMLText("global_attributedefinitiongroups")?></a>
 <?php } ?>
+		<?php echo $this->callHook('endOfRow', 3); ?>
 	</div>
 <?php
 	if($this->params['workflowmode'] == 'advanced') {
@@ -93,6 +105,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 <?php if($accessop->check_view_access('WorkflowActionsMgr')) { ?>
 		<a href="../out/out.WorkflowActionsMgr.php" class="span3 btn btn-medium"><i class="icon-bolt"></i><br /><?php echo getMLText("global_workflow_actions"); ?></a>
 <?php } ?>
+		<?php echo $this->callHook('endOfRow', 4); ?>
 	</div>
 <?php
 		}
@@ -108,6 +121,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 <?php if($accessop->check_view_access('IndexInfo')) { ?>
 		<a href="../out/out.IndexInfo.php" class="span3 btn btn-medium"><i class="icon-info-sign"></i><br /><?php echo getMLText("fulltext_info")?></a>
 <?php } ?>
+		<?php echo $this->callHook('endOfRow', 5); ?>
 	</div>
 <?php
 		}
@@ -125,6 +139,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 <?php if($accessop->check_view_access('Timeline')) { ?>
 		<a href="../out/out.Timeline.php" class="span3 btn btn-medium"><i class="icon-time"></i><br /><?php echo getMLText("timeline")?></a>
 <?php } ?>
+		<?php echo $this->callHook('endOfRow', 6); ?>
 	</div>
 	<div class="row-fluid">
 <?php if($accessop->check_view_access('Settings')) { ?>
@@ -136,7 +151,9 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 <?php if($accessop->check_view_access('Info')) { ?>
 		<a href="../out/out.Info.php" class="span3 btn btn-medium"><i class="icon-info-sign"></i><br /><?php echo getMLText("version_info")?></a>
 <?php } ?>
+		<?php echo $this->callHook('endOfRow', 7); ?>
 	</div>
+	<?php echo $this->callHook('afterRows'); ?>
 	</div>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.AttributeMgr.php

@@ -90,8 +90,8 @@ $(document).ready( function() {
 							$content .= "<td>";
 							/* Check if value is in value set */
 							if($selattrdef->getValueSet()) {
-								foreach($values as $v) {
-									if(!in_array($value, $selattrdef->getValueSetAsArray()))
+								foreach($value as $v) {
+									if(!in_array($v, $selattrdef->getValueSetAsArray()))
 										$content .= getMLText("attribute_value_not_in_valueset");
 								}
 							}

views/bootstrap/class.Bootstrap.php

@@ -64,6 +64,12 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 				header($csp . ": " . $csp_rules);
 			}
 		}
+		$hookObjs = $this->getHookObjects('SeedDMS_View_Bootstrap');
+		foreach($hookObjs as $hookObj) {
+			if (method_exists($hookObj, 'startPage')) {
+				$hookObj->startPage($this);
+			}
+		}
 		echo "<!DOCTYPE html>\n";
 		echo "<html lang=\"en\">\n<head>\n";
 		echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
@@ -81,7 +87,8 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 		echo '<link href="../styles/'.$this->theme.'/application.css" rel="stylesheet">'."\n";
 		if($this->extraheader['css'])
 			echo $this->extraheader['css'];
-//		echo '<link href="../styles/'.$this->theme.'/jquery-ui-1.10.4.custom/css/ui-lightness/jquery-ui-1.10.4.custom.css" rel="stylesheet">'."\n";
+		if(method_exists($this, 'css'))
+			echo '<link href="../out/out.'.$this->params['class'].'.php?action=css'.(!empty($_SERVER['QUERY_STRING']) ? '&'.$_SERVER['QUERY_STRING'] : '').'" rel="stylesheet">'."\n";
 
 		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jquery/jquery.min.js"></script>'."\n";
 		if($this->extraheader['js'])
@@ -113,6 +120,11 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			$this->params['session']->clearSplashMsg();
 			echo "<div class=\"splash\" data-type=\"".$flashmsg['type']."\">".$flashmsg['msg']."</div>\n";
 		}
+		foreach($hookObjs as $hookObj) {
+			if (method_exists($hookObj, 'startBody')) {
+				$hookObj->startBody($this);
+			}
+		}
 	} /* }}} */
 
 	function htmlAddHeader($head, $type='js') { /* {{{ */
@@ -123,7 +135,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		if(!$nofooter) {
 			$this->footNote();
 			if($this->params['showmissingtranslations']) {
-				$this->missingḺanguageKeys();
+				$this->missingLanguageKeys();
 			}
 		}
 		echo '<script src="../styles/'.$this->theme.'/bootstrap/js/bootstrap.min.js"></script>'."\n";
@@ -132,6 +144,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			echo '<script src="../styles/'.$this->theme.'/datepicker/js/locales/bootstrap-datepicker.'.$lang.'.js"></script>'."\n";
 		echo '<script src="../styles/'.$this->theme.'/chosen/js/chosen.jquery.min.js"></script>'."\n";
 		echo '<script src="../styles/'.$this->theme.'/select2/js/select2.min.js"></script>'."\n";
+		parse_str($_SERVER['QUERY_STRING'], $tmp);
+		$tmp['action'] = 'webrootjs';
+		echo '<script src="'.$this->params['absbaseprefix'].'out/out.'.$this->params['class'].'.php?'.http_build_query($tmp).'"></script>'."\n";
 		echo '<script src="../styles/'.$this->theme.'/application.js"></script>'."\n";
 		if(isset($this->params['user']) && $this->params['user']) {
 			$this->addFooterJS('checkTasks();');
@@ -149,7 +164,6 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			if(is_dir($this->params['cachedir'].'/js')) {
 				file_put_contents($this->params['cachedir'].'/js/'.$hashjs.'.js', $jscode);
 			}
-			parse_str($_SERVER['QUERY_STRING'], $tmp);
 			$tmp['action'] = 'footerjs';
 			$tmp['hash'] = $hashjs;
 			echo '<script src="'.$this->params['absbaseprefix'].'out/out.'.$this->params['class'].'.php?'.http_build_query($tmp).'"></script>'."\n";
@@ -162,6 +176,12 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "</body>\n</html>\n";
 	} /* }}} */
 
+	function webrootjs() { /* {{{ */
+		header('Content-Type: application/javascript');
+		echo "var seeddms_absbaseprefix=\"".$this->params['absbaseprefix']."\";\n";
+		echo "var seeddms_webroot=\"".$this->params['settings']->_httpRoot."\";\n";
+	} /* }}} */
+
 	function footerjs() { /* {{{ */
 		header('Content-Type: application/javascript');
 		if(file_exists($this->params['cachedir'].'/js/'.$_GET['hash'].'.js')) {
@@ -169,7 +189,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		}
 	} /* }}} */
 
-	function missingḺanguageKeys() { /* {{{ */
+	function missingLanguageKeys() { /* {{{ */
 		global $MISSING_LANG, $LANG;
 		if($MISSING_LANG) {
 			echo '<div class="container-fluid">'."\n";
@@ -239,46 +259,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	 *        documents and folders.
 	 * @return string html code
 	 */
-	function menuClipboard($clipboard) { /* {{{ */
-		if ($this->params['user']->isGuest() || (count($clipboard['docs']) + count($clipboard['folders'])) == 0) {
-			return '';
-		}
-		$content = '';
-		$content .= "   <ul id=\"main-menu-clipboard\" class=\"nav pull-right\">\n";
-		$content .= "    <li class=\"dropdown add-clipboard-area\">\n";
-		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-clipboard-area\">".getMLText('clipboard')." (".count($clipboard['folders'])."/".count($clipboard['docs']).") <i class=\"icon-caret-down\"></i></a>\n";
-		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
-		foreach($clipboard['folders'] as $folderid) {
-			if($folder = $this->params['dms']->getFolder($folderid))
-				$content .= "    <li><a href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><i class=\"icon-folder-close-alt\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
-		}
-		foreach($clipboard['docs'] as $docid) {
-			if($document = $this->params['dms']->getDocument($docid))
-				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\"><i class=\"icon-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
-		}
-		$content .= "    <li class=\"divider\"></li>\n";
-		if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) {
-			$content .= "    <li><a href=\"../op/op.MoveClipboard.php?targetid=".$this->params['folder']->getID()."&refferer=".urlencode($this->params['refferer'])."\">".getMLText("move_clipboard")."</a></li>\n";
-		}
-//		$content .= "    <li><a href=\"../op/op.ClearClipboard.php?refferer=".urlencode($this->params['refferer'])."\">".getMLText("clear_clipboard")."</a><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">kkk</a> </li>\n";
-		$content .= "    <li><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">".getMLText("clear_clipboard")."</a></li>\n";
-		$content .= "     </ul>\n";
-		$content .= "    </li>\n";
-		$content .= "   </ul>\n";
-		return $content;
-	} /* }}} */
-
-	/**
-	 * Returns the html needed for the clipboard list in the menu
-	 *
-	 * This function renders the clipboard in a way suitable to be
-	 * used as a menu
-	 *
-	 * @param array $clipboard clipboard containing two arrays for both
-	 *        documents and folders.
-	 * @return string html code
-	 */
-	function menuTasks($tasks) { /* {{{ */
+	function __menuTasks($tasks) { /* {{{ */
 		$dms = $this->params['dms'];
 		$content = '';
 //		$content .= "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
@@ -422,16 +403,21 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				echo "   <div id=\"menu-tasks\">";
 				echo "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
 				echo "    <li class=\"dropdown\">\n";
-				echo $this->menuTasks(array('review'=>array(), 'approval'=>array(), 'receipt'=>array(), 'revision'=>array()));
+//				echo $this->menuTasks(array('review'=>array(), 'approval'=>array(), 'receipt'=>array(), 'revision'=>array()));
 				echo "    </li>\n";
 				echo "   </ul>\n";
 				echo "   </div>";
 				//$this->addFooterJS('checkTasks();');
 			}
 
+			if($this->params['enablesessionlist']) {
+				echo "   <div id=\"menu-session\">";
+				echo "     <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Session\" data-action=\"menuSessions\"></div>";
+				echo "   </div>";
+			}
 			if($this->params['enableclipboard']) {
 				echo "   <div id=\"menu-clipboard\">";
-				echo $this->menuClipboard($this->params['session']->getClipboard());
+				echo "     <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Clipboard\" data-action=\"menuClipboard\"></div>";
 				echo "   </div>";
 			}
 
@@ -977,74 +963,74 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	function getMimeIcon($fileType) { /* {{{ */
 		// for extension use LOWER CASE only
 		$icons = array();
-		$icons["txt"]  = "txt.png";
-		$icons["text"] = "txt.png";
-		$icons["doc"]  = "word.png";
-		$icons["dot"]  = "word.png";
-		$icons["docx"] = "word.png";
-		$icons["dotx"] = "word.png";
-		$icons["rtf"]  = "document.png";
-		$icons["xls"]  = "excel.png";
-		$icons["xlt"]  = "excel.png";
-		$icons["xlsx"] = "excel.png";
-		$icons["xltx"] = "excel.png";
-		$icons["ppt"]  = "powerpoint.png";
-		$icons["pot"]  = "powerpoint.png";
-		$icons["pptx"] = "powerpoint.png";
-		$icons["potx"] = "powerpoint.png";
-		$icons["exe"]  = "binary.png";
-		$icons["html"] = "html.png";
-		$icons["htm"]  = "html.png";
-		$icons["gif"]  = "image.png";
-		$icons["jpg"]  = "image.png";
-		$icons["jpeg"] = "image.png";
-		$icons["bmp"]  = "image.png";
-		$icons["png"]  = "image.png";
-		$icons["tif"]  = "image.png";
-		$icons["tiff"] = "image.png";
+		$icons["txt"]  = "text-x-preview.svg";
+		$icons["text"] = "text-x-preview.svg";
+		$icons["doc"]  = "office-document.svg";
+		$icons["dot"]  = "office-document.svg";
+		$icons["docx"] = "office-document.svg";
+		$icons["dotx"] = "office-document.svg";
+		$icons["rtf"]  = "office-document.svg";
+		$icons["xls"]  = "office-spreadsheet.svg";
+		$icons["xlt"]  = "office-spreadsheet.svg";
+		$icons["xlsx"] = "office-spreadsheet.svg";
+		$icons["xltx"] = "office-spreadsheet.svg";
+		$icons["ppt"]  = "office-presentation.svg";
+		$icons["pot"]  = "office-presentation.svg";
+		$icons["pptx"] = "office-presentation.svg";
+		$icons["potx"] = "office-presentation.svg";
+		$icons["exe"]  = "executable.svg";
+		$icons["html"] = "web.svg";
+		$icons["htm"]  = "web.svg";
+		$icons["gif"]  = "image.svg";
+		$icons["jpg"]  = "image.svg";
+		$icons["jpeg"] = "image.svg";
+		$icons["bmp"]  = "image.svg";
+		$icons["png"]  = "image.svg";
+		$icons["tif"]  = "image.svg";
+		$icons["tiff"] = "image.svg";
 		$icons["log"]  = "log.png";
-		$icons["midi"] = "midi.png";
+		$icons["midi"] = "audio.svg";
 		$icons["pdf"]  = "pdf.png";
-		$icons["wav"]  = "sound.png";
-		$icons["mp3"]  = "sound.png";
+		$icons["wav"]  = "audio.svg";
+		$icons["mp3"]  = "audio.svg";
 		$icons["c"]    = "source_c.png";
 		$icons["cpp"]  = "source_cpp.png";
 		$icons["h"]    = "source_h.png";
 		$icons["java"] = "source_java.png";
 		$icons["py"]   = "source_py.png";
-		$icons["tar"]  = "tar.png";
+		$icons["tar"]  = "package.svg";
 		$icons["gz"]   = "gz.png";
 		$icons["7z"]   = "gz.png";
 		$icons["bz"]   = "gz.png";
 		$icons["bz2"]  = "gz.png";
 		$icons["tgz"]  = "gz.png";
-		$icons["zip"]  = "gz.png";
+		$icons["zip"]  = "package.svg";
 		$icons["rar"]  = "gz.png";
-		$icons["mpg"]  = "video.png";
-		$icons["avi"]  = "video.png";
+		$icons["mpg"]  = "video.svg";
+		$icons["avi"]  = "video.svg";
 		$icons["tex"]  = "tex.png";
-		$icons["ods"]  = "x-office-spreadsheet.png";
-		$icons["ots"]  = "x-office-spreadsheet.png";
-		$icons["sxc"]  = "x-office-spreadsheet.png";
-		$icons["stc"]  = "x-office-spreadsheet.png";
-		$icons["odt"]  = "x-office-document.png";
-		$icons["ott"]  = "x-office-document.png";
-		$icons["sxw"]  = "x-office-document.png";
-		$icons["stw"]  = "x-office-document.png";
-		$icons["odp"]  = "ooo_presentation.png";
-		$icons["otp"]  = "ooo_presentation.png";
-		$icons["sxi"]  = "ooo_presentation.png";
-		$icons["sti"]  = "ooo_presentation.png";
-		$icons["odg"]  = "ooo_drawing.png";
-		$icons["otg"]  = "ooo_drawing.png";
-		$icons["sxd"]  = "ooo_drawing.png";
-		$icons["std"]  = "ooo_drawing.png";
+		$icons["ods"]  = "office-spreadsheet.svg";
+		$icons["ots"]  = "office-spreadsheet.svg";
+		$icons["sxc"]  = "office-spreadsheet.svg";
+		$icons["stc"]  = "office-spreadsheet.svg";
+		$icons["odt"]  = "office-document.svg";
+		$icons["ott"]  = "office-document.svg";
+		$icons["sxw"]  = "office-document.svg";
+		$icons["stw"]  = "office-document.svg";
+		$icons["odp"]  = "office-presentation.svg";
+		$icons["otp"]  = "office-presentation.svg";
+		$icons["sxi"]  = "office-presentation.svg";
+		$icons["sti"]  = "office-presentation.svg";
+		$icons["odg"]  = "office-drawing.png";
+		$icons["otg"]  = "office-drawing.png";
+		$icons["sxd"]  = "office-drawing.png";
+		$icons["std"]  = "office-drawing.png";
 		$icons["odf"]  = "ooo_formula.png";
 		$icons["sxm"]  = "ooo_formula.png";
 		$icons["smf"]  = "ooo_formula.png";
 		$icons["mml"]  = "ooo_formula.png";
 
-		$icons["default"] = "default.png";
+		$icons["default"] = "text-x-preview.svg"; //"default.png";
 
 		$ext = strtolower(substr($fileType, 1));
 		if (isset($icons[$ext])) {
@@ -1055,14 +1041,34 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		}
 	} /* }}} */
 
-	function printFileChooser($varname='userfile', $multiple=false, $accept='') { /* {{{ */
-?>
-	<div id="upload-files">
-		<div id="upload-file">
+	function getFileChooser($varname='userfile', $multiple=false, $accept='') { /* {{{ */
+		$id = preg_replace('/[^A-Za-z]/', '', $varname);
+		$html = '
+	<div id="'.$id.'-upload-files">
+		<div id="'.$id.'-upload-file" class="upload-file">
 			<div class="input-append">
 				<input type="text" class="form-control" readonly>
 				<span class="btn btn-default btn-file">
-					<?php printMLText("browse");?>&hellip; <input id="<?php echo $varname; ?>" type="file" name="<?php echo $varname; ?>"<?php if($multiple) echo " multiple"; ?><?php if($accept) echo " accept=\"".$accept."\""; ?>>
+					'.getMLText("browse").'&hellip; <input _id="'.$id.'" type="file" name="'.$varname.'"'.($multiple ? " multiple" : "").($accept ? ' accept="'.$accept.'"' : "").'">
+				</span>
+			</div>
+		</div>
+	</div>
+';
+		return $html;
+	} /* }}} */
+
+	function printFileChooser($varname='userfile', $multiple=false, $accept='') { /* {{{ */
+		echo $this->getFileChooser($varname, $multiple, $accept);
+		return;
+		$id = preg_replace('/[^A-Za-z]/', '', $varname);
+?>
+	<div id="<?php echo $id; ?>-upload-files">
+		<div id="<?php echo $id; ?>-upload-file" class="upload-file">
+			<div class="input-append">
+				<input type="text" class="form-control" readonly>
+				<span class="btn btn-default btn-file">
+					<?php printMLText("browse");?>&hellip; <input id="<?php echo $id; ?>" type="file" name="<?php echo $varname; ?>"<?php if($multiple) echo " multiple"; ?><?php if($accept) echo " accept=\"".$accept."\""; ?>>
 				</span>
 			</div>
 		</div>
@@ -1274,7 +1280,7 @@ $(document).ready(function() {
 		print "<div class=\"input-append\">\n";
 		print "<input type=\"text\" disabled name=\"categoryname".$formName."\" value=\"".implode(' ', $names)."\">";
 		print "<button type=\"button\" class=\"btn\" onclick=\"javascript:clearCategory".$formName."();\"><i class=\"icon-remove\"></i></button>";
-		print "<a data-target=\"#categoryChooser\" href=\"out.CategoryChooser.php?form=form1&cats=".implode(',', $ids)."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("category")."…</a>\n";
+		print "<a data-target=\"#categoryChooser\" href=\"../out/out.CategoryChooser.php?form=form1&cats=".implode(',', $ids)."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("category")."…</a>\n";
 		print "</div>\n";
 ?>
 <div class="modal hide" id="categoryChooser" tabindex="-1" role="dialog" aria-labelledby="categoryChooserLabel" aria-hidden="true">
@@ -1298,7 +1304,7 @@ $(document).ready(function() {
 ?>
 		    <div class="input-append">
 				<input type="text" name="<?php echo $fieldname; ?>" id="<?php echo $fieldname; ?>" value="<?php print htmlspecialchars($keywords);?>"<?php echo $strictformcheck ? ' required' : ''; ?> />
-				<a data-target="#keywordChooser" role="button" class="btn" data-toggle="modal" href="out.KeywordChooser.php?target=<?php echo $formName; ?>"><?php printMLText("keywords");?>…</a>
+				<a data-target="#keywordChooser" role="button" class="btn" data-toggle="modal" href="../out/out.KeywordChooser.php?target=<?php echo $formName; ?>"><?php printMLText("keywords");?>…</a>
 		    </div>
 <div class="modal hide" id="keywordChooser" tabindex="-1" role="dialog" aria-labelledby="keywordChooserLabel" aria-hidden="true">
   <div class="modal-header">
@@ -1446,7 +1452,7 @@ $(document).ready(function() {
 		print "<div class=\"input-append\">\n";
 		print "<input readonly type=\"text\" id=\"dropfolderfile".$formName."\" name=\"dropfolderfile".$formName."\" value=\"".$dropfolderfile."\">";
 		print "<button type=\"button\" class=\"btn\" id=\"clearfilename".$formName."\"><i class=\"icon-remove\"></i></button>";
-		print "<a data-target=\"#dropfolderChooser\" href=\"out.DropFolderChooser.php?form=form1&dropfolderfile=".$dropfolderfile."&showfolders=".$showfolders."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))."…</a>\n";
+		print "<a data-target=\"#dropfolderChooser\" href=\"../out/out.DropFolderChooser.php?form=form1&dropfolderfile=".$dropfolderfile."&showfolders=".$showfolders."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))."…</a>\n";
 		print "</div>\n";
 ?>
 <div class="modal hide" id="dropfolderChooser" tabindex="-1" role="dialog" aria-labelledby="dropfolderChooserLabel" aria-hidden="true">
@@ -1731,94 +1737,6 @@ $(function() {
 		}
 	} /* }}} */
 
-	/**
-	 * Return clipboard content rendered as html
-	 *
-	 * @param array clipboard
-	 * @return string rendered html content
-	 */
-	function mainClipboard($clipboard, $previewer){ /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$accessop = $this->params['accessobject'];
-		$content = '';
-		$foldercount = $doccount = 0;
-		if($clipboard['folders']) {
-			foreach($clipboard['folders'] as $folderid) {
-				/* FIXME: check for access rights, which could have changed after adding the folder to the clipboard */
-				if($folder = $dms->getFolder($folderid)) {
-					$comment = $folder->getComment();
-					if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
-					$content .= "<tr draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
-					$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\"><img draggable=\"false\" src=\"".$this->imgpath."folder.png\" width=\"24\" height=\"24\" border=0></a></td>\n";
-					$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\">" . htmlspecialchars($folder->getName()) . "</a>";
-					if($comment) {
-						$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
-					}
-					$content .= "</td>\n";
-					$content .= "<td>\n";
-					$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folderid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$folderid."&type=folder\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
-					$content .= "</td>\n";
-					$content .= "</tr>\n";
-					$foldercount++;
-				}
-			}
-		}
-		if($clipboard['docs']) {
-			foreach($clipboard['docs'] as $docid) {
-				/* FIXME: check for access rights, which could have changed after adding the document to the clipboard */
-				if($document = $dms->getDocument($docid)) {
-					$comment = $document->getComment();
-					if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
-					if($latestContent = $document->getLatestContent()) {
-						$previewer->createPreview($latestContent);
-						$version = $latestContent->getVersion();
-						$status = $latestContent->getStatus();
-						
-						$content .= "<tr draggable=\"true\" rel=\"document_".$docid."\" class=\"table-row-document\" formtoken=\"".createFormKey('movedocument')."\">";
-
-						if (file_exists($dms->contentDir . $latestContent->getPath())) {
-							$content .= "<td>";
-							if($accessop->check_controller_access('Download', array('action'=>'version')))
-								$content .= "<a draggable=\"false\" href=\"../op/op.Download.php?documentid=".$docid."&version=".$version."\">";
-							if($previewer->hasPreview($latestContent)) {
-								$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"40\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-							} else {
-								$content .= "<img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-							}
-							if($accessop->check_controller_access('Download', array('action'=>'version')))
-								$content .= "</a>";
-							$content .= "</td>";
-						} else
-							$content .= "<td><img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\"></td>";
-						
-						$content .= "<td><a draggable=\"false\" href=\"out.ViewDocument.php?documentid=".$docid."&showtree=".showtree()."\">" . htmlspecialchars($document->getName()) . "</a>";
-						if($comment) {
-							$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
-						}
-						$content .= "</td>\n";
-						$content .= "<td>\n";
-						$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"D".$docid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$docid."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
-						$content .= "</td>\n";
-						$content .= "</tr>";
-						$doccount++;
-					}
-				}
-			}
-		}
-
-		/* $foldercount or $doccount will only count objects which are
-		 * actually available
-		 */
-		if($foldercount || $doccount) {
-			$content = "<table class=\"table\">".$content;
-			$content .= "</table>";
-		} else {
-		}
-		$content .= "<div class=\"alert add-clipboard-area\">".getMLText("drag_icon_here")."</div>";
-		return $content;
-	} /* }}} */
-
 	/**
 	 * Print clipboard in div container
 	 *
@@ -1827,7 +1745,9 @@ $(function() {
 	function printClipboard($clipboard, $previewer){ /* {{{ */
 		$this->contentHeading(getMLText("clipboard"), true);
 		echo "<div id=\"main-clipboard\">\n";
-		echo $this->mainClipboard($clipboard, $previewer);
+?>
+		<div class="ajax" data-view="Clipboard" data-action="mainClipboard"></div>
+<?php
 		echo "</div>\n";
 	} /* }}} */
 
@@ -2190,18 +2110,18 @@ $(document).ready( function() {
 				if($accessop->check_controller_access('Download', array('action'=>'version')))
 					$content .= "<a draggable=\"false\" href=\"../op/op.Download.php?documentid=".$docID."&version=".$version."\">";
 				if($previewer->hasPreview($latestContent)) {
-					$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+					$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"".$previewwidth."\" src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 				} else {
-					$content .= "<img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+					$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" ".($previewwidth ? "width=\"".$previewwidth."\"" : "")."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 				}
 				if($accessop->check_controller_access('Download', array('action'=>'run')))
 					$content .= "</a>";
 			} else
-				$content .= "<img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+				$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 			$content .= "</td>";
 
 			$content .= "<td>";	
-			$content .= "<a draggable=\"false\" href=\"out.ViewDocument.php?documentid=".$docID."&showtree=".$showtree."\">" . htmlspecialchars($document->getName()) . "</a>";
+			$content .= "<a draggable=\"false\" href=\"../out/out.ViewDocument.php?documentid=".$docID."&showtree=".$showtree."\">" . htmlspecialchars($document->getName()) . "</a>";
 			$content .= "<br /><span style=\"font-size: 85%; font-style: italic; color: #666; \">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $document->getDate())."</b>, ".getMLText('version')." <b>".$version."</b> - <b>".date('Y-m-d', $latestContent->getDate())."</b>".($document->expires() ? ", ".getMLText('expires').": <b>".getReadableDate($document->getExpires())."</b>" : "")."</span>";
 			if($comment) {
 				$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
@@ -2326,8 +2246,8 @@ $(document).ready( function() {
 		$content = '';
 		$content .= "<tr id=\"table-row-folder-".$subFolder->getID()."\" draggable=\"true\" rel=\"folder_".$subFolder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
 	//	$content .= "<td><img src=\"images/folder_closed.gif\" width=18 height=18 border=0></td>";
-		$content .= "<td><a _rel=\"folder_".$subFolder->getID()."\" draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$subFolder->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\" _rel=\"folder_".$subFolder->getID()."\" href=\"out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . "</a>";
+		$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\" _rel=\"folder_".$subFolder->getID()."\" 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>";
@@ -2717,6 +2637,71 @@ mayscript>
 		parent::show();
 	} /* }}} */
 
+	/**
+	 * Return HTML Template for jumploader
+	 *
+	 * @param string $uploadurl URL where post data is send
+	 * @param integer $folderid id of folder where document is saved
+	 * @param integer $maxfiles maximum number of files allowed to upload
+	 * @param array $fields list of post fields
+	 */
+	function getFineUploaderTemplate() { /* {{{ */
+		return '
+<script type="text/template" id="qq-template">
+<div class="qq-uploader-selector qq-uploader" qq-drop-area-text="'.getMLText('drop_files_here').'">
+	<div class="qq-total-progress-bar-container-selector qq-total-progress-bar-container">
+		<div role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" class="qq-total-progress-bar-selector qq-progress-bar qq-total-progress-bar"></div>
+		</div>
+	<div class="input-append">
+	<div class="qq-upload-drop-area-selector qq-upload-drop-area" _qq-hide-dropzone>
+		<span class="qq-upload-drop-area-text-selector"></span>
+	</div>
+	<button class="btn qq-upload-button-selector qq-upload-button">'.getMLText('browse').'&hellip;</button>
+	</div>
+	<span class="qq-drop-processing-selector qq-drop-processing">
+		<span class="qq-drop-processing-spinner-selector qq-drop-processing-spinner"></span>
+	</span>
+	<ul class="qq-upload-list-selector qq-upload-list unstyled" aria-live="polite" aria-relevant="additions removals">
+		<li>
+			<div class="progress qq-progress-bar-container-selector">
+				<div class="bar qq-progress-bar-selector qq-progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
+			</div>
+			<span class="qq-upload-spinner-selector qq-upload-spinner"></span>
+			<img class="qq-thumbnail-selector" qq-max-size="100" qq-server-scale>
+			<span class="qq-upload-file-selector qq-upload-file"></span>
+			<span class="qq-upload-size-selector qq-upload-size"></span>
+			<button class="btn btn-mini qq-btn qq-upload-cancel-selector qq-upload-cancel">Cancel</button>
+			<span role="status" class="qq-upload-status-text-selector qq-upload-status-text"></span>
+		</li>
+	</ul>
+	<dialog class="qq-alert-dialog-selector">
+		<div class="qq-dialog-message-selector"></div>
+		<div class="qq-dialog-buttons">
+			<button class="btn qq-cancel-button-selector">Cancel</button>
+		</div>
+	</dialog>
+
+	<dialog class="qq-confirm-dialog-selector">
+		<div class="qq-dialog-message-selector"></div>
+		<div class="qq-dialog-buttons">
+			<button class="btn qq-cancel-button-selector">Cancel</button>
+			<button class="btn qq-ok-button-selector">Ok</button>
+		</div>
+	</dialog>
+
+	<dialog class="qq-prompt-dialog-selector">
+		<div class="qq-dialog-message-selector"></div>
+		<input type="text">
+		<div class="qq-dialog-buttons">
+			<button class="btn qq-cancel-button-selector">Cancel</button>
+			<button class="btn qq-ok-button-selector">Ok</button>
+		</div>
+	</dialog>
+</div>
+</script>
+';
+	} /* }}} */
+
 	/**
 	 * Output HTML Code for jumploader
 	 *
@@ -2725,63 +2710,11 @@ mayscript>
 	 * @param integer $maxfiles maximum number of files allowed to upload
 	 * @param array $fields list of post fields
 	 */
-	function printFineUploaderHtml() { /* {{{ */
+	function printFineUploaderHtml($prefix='userfile') { /* {{{ */
 ?>
-		<script type="text/template" id="qq-template">
-		<div class="qq-uploader-selector qq-uploader" qq-drop-area-text="">
-			<div class="qq-total-progress-bar-container-selector qq-total-progress-bar-container">
-				<div role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" class="qq-total-progress-bar-selector qq-progress-bar qq-total-progress-bar"></div>
-				</div>
-			<div class="input-append">
-			<div class="qq-upload-drop-area-selector qq-upload-drop-area" _qq-hide-dropzone>Drop files here
-				<span class="qq-upload-drop-area-text-selector"></span>
-			</div>
-			<button class="btn qq-upload-button-selector qq-upload-button"><?php printMLText('browse'); ?>&hellip;</button>
-			</div>
-			<span class="qq-drop-processing-selector qq-drop-processing">
-				<span class="qq-drop-processing-spinner-selector qq-drop-processing-spinner"></span>
-			</span>
-			<ul class="qq-upload-list-selector qq-upload-list unstyled" aria-live="polite" aria-relevant="additions removals">
-				<li>
-					<div class="progress qq-progress-bar-container-selector">
-						<div class="bar qq-progress-bar-selector qq-progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
-					</div>
-					<span class="qq-upload-spinner-selector qq-upload-spinner"></span>
-					<img class="qq-thumbnail-selector" qq-max-size="100" qq-server-scale>
-					<span class="qq-upload-file-selector qq-upload-file"></span>
-					<span class="qq-upload-size-selector qq-upload-size"></span>
-					<button class="btn btn-mini qq-btn qq-upload-cancel-selector qq-upload-cancel">Cancel</button>
-					<span role="status" class="qq-upload-status-text-selector qq-upload-status-text"></span>
-				</li>
-			</ul>
-			<dialog class="qq-alert-dialog-selector">
-				<div class="qq-dialog-message-selector"></div>
-				<div class="qq-dialog-buttons">
-					<button class="btn qq-cancel-button-selector">Cancel</button>
-				</div>
-			</dialog>
-
-			<dialog class="qq-confirm-dialog-selector">
-				<div class="qq-dialog-message-selector"></div>
-				<div class="qq-dialog-buttons">
-					<button class="btn qq-cancel-button-selector">Cancel</button>
-					<button class="btn qq-ok-button-selector">Ok</button>
-				</div>
-			</dialog>
-
-			<dialog class="qq-prompt-dialog-selector">
-				<div class="qq-dialog-message-selector"></div>
-				<input type="text">
-				<div class="qq-dialog-buttons">
-					<button class="btn qq-cancel-button-selector">Cancel</button>
-					<button class="btn qq-ok-button-selector">Ok</button>
-				</div>
-			</dialog>
-		</div>
-		</script>
-		<div id="manual-fine-uploader"></div>
-		<input type="hidden" class="do_validate" id="fineuploaderuuids" name="fineuploaderuuids" value="" />
-		<input type="hidden" id="fineuploadernames" name="fineuploadernames" value="" />
+		<div id="<?php echo $prefix; ?>-fine-uploader"></div>
+		<input type="hidden" <?php echo ($prefix=='userfile' ? 'class="do_validate"' : ''); ?> id="<?php echo $prefix; ?>-fine-uploader-uuids" name="<?php echo $prefix; ?>-fine-uploader-uuids" value="" />
+		<input type="hidden" id="<?php echo $prefix; ?>-fine-uploader-names" name="<?php echo $prefix; ?>-fine-uploader-names" value="" />
 <?php
 	} /* }}} */
 
@@ -2793,22 +2726,31 @@ mayscript>
 	 * @param integer $maxfiles maximum number of files allowed to upload
 	 * @param array $fields list of post fields
 	 */
-	function printFineUploaderJs($uploadurl, $partsize=0, $multiple=true) { /* {{{ */
+	function printFineUploaderJs($uploadurl, $partsize=0, $maxuploadsize=0, $multiple=true, $prefix='userfile') { /* {{{ */
 ?>
 $(document).ready(function() {
-	manualuploader = new qq.FineUploader({
-		debug: true,
+	<?php echo $prefix; ?>uploader = new qq.FineUploader({
+		debug: false,
 		autoUpload: false,
 		multiple: <?php echo ($multiple ? 'true' : 'false'); ?>,
-		element: $('#manual-fine-uploader')[0],
+		element: $('#<?php echo $prefix; ?>-fine-uploader')[0],
+		template: 'qq-template',
 		request: {
 			endpoint: '<?php echo $uploadurl; ?>'
 		},
+<?php echo ($maxuploadsize > 0 ? '
+		validation: {
+			sizeLimit: '.$maxuploadsize.'
+		},
+' : ''); ?>
 		chunking: {
 			enabled: true,
 			<?php echo $partsize ? 'partSize: '.(int)$partsize.",\n" : ''; ?>
 			mandatory: true
 		},
+		messages: {
+			sizeError: '{file} is too large, maximum file size is {sizeLimit}.'
+		},
 		callbacks: {
 			onComplete: function(id, name, json, xhr) {
 			},
@@ -2819,8 +2761,8 @@ $(document).ready(function() {
 					uuids.push(this.getUuid(succeeded[i]))
 					names.push(this.getName(succeeded[i]))
 				}
-				$('#fineuploaderuuids').val(uuids.join(';'));
-				$('#fineuploadernames').val(names.join(';'));
+				$('#<?php echo $prefix; ?>-fine-uploader-uuids').val(uuids.join(';'));
+				$('#<?php echo $prefix; ?>-fine-uploader-names').val(names.join(';'));
 				/* Run upload only if all files could be uploaded */
 				if(succeeded.length > 0 && failed.length == 0)
 					document.getElementById('form1').submit();
@@ -2866,7 +2808,7 @@ $(document).ready(function() {
 			$statusList = $latestContent->getRevisionStatus(10);
 			break;
 		case "receipt":
-			$statusList = $latestContent->getReceiptStatus(1);
+			$statusList = $latestContent->getReceiptStatus(10);
 			break;
 		default:
 			$statusList = array();

views/bootstrap/class.Clipboard.php

@@ -0,0 +1,166 @@
+<?php
+/**
+ * Implementation of Clipboard view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
+/**
+ * Class which outputs the html page for clipboard view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
+	/**
+	 * Returns the html needed for the clipboard list in the menu
+	 *
+	 * This function renders the clipboard in a way suitable to be
+	 * used as a menu
+	 *
+	 * @param array $clipboard clipboard containing two arrays for both
+	 *        documents and folders.
+	 * @return string html code
+	 */
+	public function menuClipboard() { /* {{{ */
+		$clipboard = $this->params['session']->getClipboard();
+		if ($this->params['user']->isGuest() || (count($clipboard['docs']) + count($clipboard['folders'])) == 0) {
+			return '';
+		}
+		$content = '';
+		$content .= "   <ul id=\"main-menu-clipboard\" class=\"nav pull-right\">\n";
+		$content .= "    <li class=\"dropdown add-clipboard-area\">\n";
+		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-clipboard-area\">".getMLText('clipboard')." (".count($clipboard['folders'])."/".count($clipboard['docs']).") <i class=\"icon-caret-down\"></i></a>\n";
+		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		foreach($clipboard['folders'] as $folderid) {
+			if($folder = $this->params['dms']->getFolder($folderid))
+				$content .= "    <li><a href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><i class=\"icon-folder-close-alt\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
+		}
+		foreach($clipboard['docs'] as $docid) {
+			if($document = $this->params['dms']->getDocument($docid))
+				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\"><i class=\"icon-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
+		}
+		$content .= "    <li class=\"divider\"></li>\n";
+		if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) {
+			$content .= "    <li><a href=\"../op/op.MoveClipboard.php?targetid=".$this->params['folder']->getID()."&refferer=".urlencode($this->params['refferer'])."\">".getMLText("move_clipboard")."</a></li>\n";
+		}
+//		$content .= "    <li><a href=\"../op/op.ClearClipboard.php?refferer=".urlencode($this->params['refferer'])."\">".getMLText("clear_clipboard")."</a><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">kkk</a> </li>\n";
+		$content .= "    <li><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">".getMLText("clear_clipboard")."</a></li>\n";
+		$content .= "     </ul>\n";
+		$content .= "    </li>\n";
+		$content .= "   </ul>\n";
+		echo $content;
+	} /* }}} */
+
+	/**
+	 * Return clipboard content rendered as html
+	 *
+	 * @param array clipboard
+	 * @return string rendered html content
+	 */
+	public function mainClipboard() { /* {{{ */
+		$dms = $this->params['dms'];
+		$clipboard = $this->params['session']->getClipboard();
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$content = '';
+		$foldercount = $doccount = 0;
+		if($clipboard['folders']) {
+			foreach($clipboard['folders'] as $folderid) {
+				/* FIXME: check for access rights, which could have changed after adding the folder to the clipboard */
+				if($folder = $dms->getFolder($folderid)) {
+					$comment = $folder->getComment();
+					if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
+					$content .= "<tr draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
+					$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\"><img draggable=\"false\" src=\"".$this->imgpath."folder.png\" width=\"24\" height=\"24\" border=0></a></td>\n";
+					$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\">" . htmlspecialchars($folder->getName()) . "</a>";
+					if($comment) {
+						$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
+					}
+					$content .= "</td>\n";
+					$content .= "<td>\n";
+					$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folderid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$folderid."&type=folder\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
+					$content .= "</td>\n";
+					$content .= "</tr>\n";
+					$foldercount++;
+				}
+			}
+		}
+		if($clipboard['docs']) {
+			foreach($clipboard['docs'] as $docid) {
+				/* FIXME: check for access rights, which could have changed after adding the document to the clipboard */
+				if($document = $dms->getDocument($docid)) {
+					$comment = $document->getComment();
+					if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
+					if($latestContent = $document->getLatestContent()) {
+						$previewer->createPreview($latestContent);
+						$version = $latestContent->getVersion();
+						$status = $latestContent->getStatus();
+						
+						$content .= "<tr draggable=\"true\" rel=\"document_".$docid."\" class=\"table-row-document\" formtoken=\"".createFormKey('movedocument')."\">";
+
+						if (file_exists($dms->contentDir . $latestContent->getPath())) {
+							$content .= "<td><a draggable=\"false\" href=\"../op/op.Download.php?documentid=".$docid."&version=".$version."\">";
+							if($previewer->hasPreview($latestContent)) {
+								$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"40\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+							} else {
+								$content .= "<img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+							}
+							$content .= "</a></td>";
+						} else
+							$content .= "<td><img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\"></td>";
+						
+						$content .= "<td><a draggable=\"false\" href=\"out.ViewDocument.php?documentid=".$docid."&showtree=".showtree()."\">" . htmlspecialchars($document->getName()) . "</a>";
+						if($comment) {
+							$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
+						}
+						$content .= "</td>\n";
+						$content .= "<td>\n";
+						$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"D".$docid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$docid."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
+						$content .= "</td>\n";
+						$content .= "</tr>";
+						$doccount++;
+					}
+				}
+			}
+		}
+
+		/* $foldercount or $doccount will only count objects which are
+		 * actually available
+		 */
+		if($foldercount || $doccount) {
+			$content = "<table class=\"table\">".$content;
+			$content .= "</table>";
+		} else {
+		}
+		$content .= "<div class=\"alert add-clipboard-area\">".getMLText("drag_icon_here")."</div>";
+		echo $content;
+	} /* }}} */
+
+}

views/bootstrap/class.DropFolderChooser.php

@@ -83,7 +83,7 @@ $('.folderselect').click(function(ev) {
 							$previewer->createRawPreview($dir.'/'.$entry, 'dropfolder/', $mimetype);
 							echo "<tr><td style=\"min-width: ".$previewwidth."px;\">";
 							if($previewer->hasRawPreview($dir.'/'.$entry, 'dropfolder/')) {
-								echo "<img style=\"cursor: pointer;\" class=\"fileselect mimeicon\" filename=\"".$entry."\" width=\"".$previewwidth."\"src=\"../op/op.DropFolderPreview.php?filename=".$entry."&width=".$previewwidth."\" title=\"".htmlspecialchars($mimetype)."\">";
+								echo "<img style=\"cursor: pointer;\" class=\"fileselect mimeicon\" filename=\"".$entry."\" width=\"".$previewwidth."\" src=\"../op/op.DropFolderPreview.php?filename=".$entry."&width=".$previewwidth."\" title=\"".htmlspecialchars($mimetype)."\">";
 							}
 							echo "</td><td><span style=\"cursor: pointer;\" class=\"fileselect\" filename=\"".$entry."\">".$entry."</span></td><td align=\"right\">".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry))."</td><td>".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."</td></tr>\n";
 						} elseif($showfolders && is_dir($dir.'/'.$entry)) {

views/bootstrap/class.EditDocument.php

@@ -88,6 +88,12 @@ $(document).ready( function() {
 			keywords: "<?php printMLText("js_no_keywords");?>"
 		}
 	});
+	$('#presetexpdate').on('change', function(ev){
+		if($(this).val() == 'date')
+			$('#control_expdate').show();
+		else
+			$('#control_expdate').hide();
+	});
 });
 <?php
 	} /* }}} */
@@ -155,13 +161,23 @@ $(document).ready( function() {
 		<tr>
 			<td><?php printMLText("expires");?>:</td>
 			<td>
-        <span class="input-append date span12" id="expirationdate" data-date="<?php echo $expdate; ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>" data-checkbox="#expires">
-          <input class="span3" size="16" name="expdate" type="text" value="<?php echo $expdate; ?>">
+				<select class="span3" name="presetexpdate" id="presetexpdate">
+					<option value="never"><?php printMLText('does_not_expire');?></option>
+					<option value="date"<?php echo ($expdate != '' ? " selected" : ""); ?>><?php printMLText('expire_by_date');?></option>
+					<option value="1w"><?php printMLText('expire_in_1w');?></option>
+					<option value="1m"><?php printMLText('expire_in_1m');?></option>
+					<option value="1y"><?php printMLText('expire_in_1y');?></option>
+					<option value="2y"><?php printMLText('expire_in_2y');?></option>
+				</select>
+			</td>
+		</tr>
+		<tr id="control_expdate" <?php echo (!$expdate ? 'style="display: none;"' : ''); ?>>
+			<td><?php printMLText("expires");?>:</td>
+			<td>
+        <span class="input-append date span6" id="expirationdate" data-date="<?php echo ($expdate ? $expdate : ''); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>" data-checkbox="#expires">
+          <input class="span3" size="16" name="expdate" type="text" value="<?php echo ($expdate ? $expdate : ''); ?>">
           <span class="add-on"><i class="icon-calendar"></i></span>
-        </span><br />
-        <label class="checkbox inline">
-				  <input type="checkbox" id="expires" name="expires" value="false"<?php if (!$document->expires()) print " checked";?>><?php printMLText("does_not_expire");?><br>
-        </label>
+        </span>
 			</td>
 		</tr>
 <?php
@@ -224,10 +240,12 @@ $(document).ready( function() {
 				if($found) {
 				$arr = $this->callHook('editDocumentAttribute', $document, $attrdef);
 				if(is_array($arr)) {
-					echo "<tr>";
-					echo "<td>".$arr[0].":</td>";
-					echo "<td>".$arr[1]."</td>";
-					echo "</tr>";
+					if($arr) {
+						echo "<tr>";
+						echo "<td>".$arr[0].":</td>";
+						echo "<td>".$arr[1]."</td>";
+						echo "</tr>";
+					}
 				} else {
 ?>
 		<tr>

views/bootstrap/class.EditFolder.php

@@ -181,13 +181,14 @@ $(document).ready(function() {
 						$found = true;
 				}
 				if($found) {
-				$arr = $this->callHook('folderEditAttribute', $folder, $attrdef);
+				$arr = $this->callHook('editFolderAttribute', $folder, $attrdef);
 				if(is_array($arr)) {
-					echo $txt;
-					echo "<div class=\"control-group\">";
-					echo "<label class=\"control-label\">".$arr[0]."</label>";
-					echo "<div class=\"controls\">".$arr[1]."</div>";
-					echo "</div>";
+					if($arr) {
+						echo "<div class=\"control-group\">";
+						echo "<label class=\"control-label\">".$arr[0]."</label>";
+						echo "<div class=\"controls\">".$arr[1]."</div>";
+						echo "</div>";
+					}
 				} else {
 ?>
 			<div class="control-group">

views/bootstrap/class.ManageNotify.php

@@ -115,9 +115,9 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 					print "<tr>\n";
 					print "<td>";
 					if($previewer->hasPreview($latest)) {
-						print "<img class=\"mimeicon\" width=\"".$this->previewwidth."\"src=\"../op/op.Preview.php?documentid=".$doc->getID()."&version=".$latest->getVersion()."&width=".$this->previewwidth."\" title=\"".htmlspecialchars($latest->getMimeType())."\">";
+						print "<img class=\"mimeicon\" width=\"".$this->previewwidth."\" src=\"../op/op.Preview.php?documentid=".$doc->getID()."&version=".$latest->getVersion()."&width=".$this->previewwidth."\" title=\"".htmlspecialchars($latest->getMimeType())."\">";
 					} else {
-						print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latest->getFileType())."\" title=\"".htmlspecialchars($latest->getMimeType())."\">";
+						print "<img class=\"mimeicon\" width=\"".$this->previewwidth."\" src=\"".$this->getMimeIcon($latest->getFileType())."\" title=\"".htmlspecialchars($latest->getMimeType())."\">";
 					}
 					print "</td>";
 

views/bootstrap/class.ObjectCheck.php

@@ -291,6 +291,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 			print "<th>".getMLText("version")."</th>\n";
 			print "<th>".getMLText("original_filename")."</th>\n";
 			print "<th>".getMLText("mimetype")."</th>\n";
+			print "<th>".getMLText("duplicates")."</th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
 			foreach($duplicateversions as $rec) {
 				$version = $rec['content'];
@@ -299,7 +300,9 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 				print "<td>".$doc->getId()."</td><td>".$version->getVersion()."</td><td>".$version->getOriginalFileName()."</td><td>".$version->getMimeType()."</td>";
 				print "<td>";
 				foreach($rec['duplicates'] as $duplicate) {
-					print $duplicate->getVersion();
+					$dupdoc = $duplicate->getDocument();
+					print "<a href=\"../out/out.ViewDocument.php?documentid=".$dupdoc->getID()."\">".$dupdoc->getID()."/".$duplicate->getVersion()."</a>";
+					echo "<br />";
 				}
 				print "</td>";
 				print "</tr>\n";

views/bootstrap/class.Search.php

@@ -82,7 +82,10 @@ $(document).ready( function() {
 		foreach($entries as $entry) {
 			if(get_class($entry) == $dms->getClassname('document')) {
 				$extracols = $this->callHook('extraDownloadColumns', $entry);
-				$downmgr->addItem($entry->getLatestContent(), $extracols);
+				if(isset($_GET['includecontent']) && $_GET['includecontent'] && $rawcontent = $this->callHook('rawcontent', $entry->getLatestContent())) {
+					$downmgr->addItem($entry->getLatestContent(), $extracols, $rawcontent);
+				} else
+					$downmgr->addItem($entry->getLatestContent(), $extracols);
 			}
 		}
 		$filename = tempnam('/tmp', '');
@@ -645,7 +648,7 @@ $(document).ready( function() {
 			$this->pageList($pageNumber, $totalpages, "../out/out.Search.php", $urlparams);
 //			$this->contentContainerStart();
 
-			$txt = $this->callHook('searchListHeader', $folder, $orderby);
+			$txt = $this->callHook('searchListHeader');
 			if(is_string($txt))
 				echo $txt;
 			else {
@@ -689,19 +692,21 @@ $(document).ready( function() {
 						}
 						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())."\">";
+							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\" src=\"".$this->getMimeIcon($lc->getFileType())."\" title=\"".htmlspecialchars($lc->getMimeType())."\">";
+							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 "<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 $docName;
-						print "</a>";
+						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>";
@@ -772,13 +777,14 @@ $(document).ready( function() {
 					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();
-					print "/";
 					for ($i = 1; $i  < count($path)-1; $i++) {
 						print htmlspecialchars($path[$i]->getName())."/";
 					}
-					print $folderName;
-					print "</a>";
+					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());
@@ -798,7 +804,7 @@ $(document).ready( function() {
 					}
 					print "</td>";
 					print "<td></td>";
-					print "<td>";
+					print "<td nowrap>";
 					print "<div class=\"list-action\">";
 					if($folder->getAccessMode($user) >= M_ALL) {
 						$this->printDeleteFolderButton($folder, 'splash_rm_folder');

views/bootstrap/class.Session.php

@@ -0,0 +1,69 @@
+<?php
+/**
+ * Implementation of Clipboard view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for clipboard view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_Session extends SeedDMS_Bootstrap_Style {
+	/**
+	 * Returns the html needed for the clipboard list in the menu
+	 *
+	 * This function renders the clipboard in a way suitable to be
+	 * used as a menu
+	 *
+	 * @param array $clipboard clipboard containing two arrays for both
+	 *        documents and folders.
+	 * @return string html code
+	 */
+	public function menuSessions() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+
+		$sessionmgr = new SeedDMS_SessionMgr($dms->getDB());
+		$sessions = $sessionmgr->getLastAccessedSessions(date('Y-m-d H:i:s', time()-3600));
+
+		if ($user->isGuest() || count($sessions) == 0) {
+			return '';
+		}
+		$content = '';
+		$content .= "   <ul id=\"main-menu-session\" class=\"nav pull-right\">\n";
+		$content .= "    <li class=\"dropdown add-session-area\">\n";
+		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-session-area\">".getMLText('sessions')." (".count($sessions).") <i class=\"icon-caret-down\"></i></a>\n";
+		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		foreach($sessions as $session) {
+			if($sesuser = $dms->getUser($session->getUser()))
+				if(!$sesuser->isHidden())
+					$content .= "    <li><a _href=\"\"><i class=\"icon-user\"></i> ".htmlspecialchars($sesuser->getFullName())." ".getReadableDuration(time()-$session->getLastAccess())."</a></li>\n";
+		}
+		$content .= "     </ul>\n";
+		$content .= "    </li>\n";
+		$content .= "   </ul>\n";
+		echo $content;
+	} /* }}} */
+
+}

views/bootstrap/class.SetExpires.php

@@ -31,6 +31,20 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_SetExpires extends SeedDMS_Bootstrap_Style {
 
+	function js() { /* {{{ */
+		header('Content-Type: application/javascript');
+?>
+$(document).ready( function() {
+	$('#presetexpdate').on('change', function(ev){
+		if($(this).val() == 'date')
+			$('#control_expdate').show();
+		else
+			$('#control_expdate').hide();
+	});
+});
+<?php
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -53,15 +67,25 @@ class SeedDMS_View_SetExpires extends SeedDMS_Bootstrap_Style {
 <form class="form-horizontal" action="../op/op.SetExpires.php" method="post">
 <input type="hidden" name="documentid" value="<?php print $document->getID();?>">
 	<div class="control-group">
+		<label class="control-label" for="login"><?php printMLText("preset_expires");?>:</label>
+		<div class="controls">
+			<select name="presetexpdate" id="presetexpdate">
+				<option value="never"><?php printMLText('does_not_expire');?></option>
+				<option value="date"<?php echo ($expdate != '' ? " selected" : ""); ?>><?php printMLText('expire_by_date');?></option>
+				<option value="1w"><?php printMLText('expire_in_1w');?></option>
+				<option value="1m"><?php printMLText('expire_in_1m');?></option>
+				<option value="1y"><?php printMLText('expire_in_1y');?></option>
+				<option value="2y"><?php printMLText('expire_in_2y');?></option>
+			</select>
+		</div>
+	</div>
+	<div class="control-group" id="control_expdate">
 		<label class="control-label"><?php printMLText("expires");?>:</label>
 		<div class="controls">
     <span class="input-append date span12" id="expirationdate" data-date="<?php echo $expdate; ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
-      <input class="span6" name="expdate" type="text" value="<?php echo $expdate; ?>">
+      <input class="span3" name="expdate" type="text" value="<?php echo $expdate; ?>">
       <span class="add-on"><i class="icon-calendar"></i></span>
-    </span><br />
-    <label class="checkbox inline">
-		  <input type="checkbox" name="expires" value="false"<?php if (!$document->expires()) print " checked";?>><?php printMLText("does_not_expire");?><br>
-    </label>
+    </span>
 		</div>
 	</div>
 	<div class="controls">

views/bootstrap/class.Settings.php

@@ -272,10 +272,18 @@ if(!is_writeable($settings->_configFilePath)) {
 	    <tr title="<?php printMLText("settings_enableMenuTasks_desc");?>">
         <td><?php printMLText("settings_enableMenuTasks");?>:</td>
         <td><input name="enableMenuTasks" type="checkbox" <?php if ($settings->_enableMenuTasks) echo "checked" ?> /></td>
+      </tr>
+	    <tr title="<?php printMLText("settings_enableSessionList_desc");?>">
+        <td><?php printMLText("settings_enableSessionList");?>:</td>
+        <td><input name="enableSessionList" type="checkbox" <?php if ($settings->_enableSessionList) echo "checked" ?> /></td>
       </tr>
 	    <tr title="<?php printMLText("settings_enableDropUpload_desc");?>">
         <td><?php printMLText("settings_enableDropUpload");?>:</td>
         <td><input name="enableDropUpload" type="checkbox" <?php if ($settings->_enableDropUpload) echo "checked" ?> /></td>
+      </tr>
+	    <tr title="<?php printMLText("settings_enableMultiUpload_desc");?>">
+        <td><?php printMLText("settings_enableMultiUpload");?>:</td>
+        <td><input name="enableMultiUpload" type="checkbox" <?php if ($settings->_enableMultiUpload) echo "checked" ?> /></td>
       </tr>
       <tr title="<?php printMLText("settings_enableFolderTree_desc");?>">
         <td><?php printMLText("settings_enableFolderTree");?>:</td>
@@ -434,6 +442,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_partitionSize");?>:</td>
         <td><?php $this->showTextField("partitionSize", $settings->_partitionSize); ?></td>
       </tr>
+      <tr title="<?php printMLText("settings_maxUploadSize_desc");?>">
+        <td><?php printMLText("settings_maxUploadSize");?>:</td>
+        <td><?php $this->showTextField("maxUploadSize", $settings->_maxUploadSize); ?></td>
+      </tr>
       <!--
         -- SETTINGS - SYSTEM - AUTHENTICATION
       -->
@@ -811,7 +823,7 @@ if(!is_writeable($settings->_configFilePath)) {
 <?php
 					foreach($extconf['config'] as $confkey=>$conf) {
 ?>
-      <tr title="<?php echo $extconf['title'];?>">
+      <tr title="<?php echo isset($conf['help']) ? $conf['help'] : '';?>">
         <td><?php echo $conf['title'];?>:</td><td>
 <?php
 						switch($conf['type']) {
@@ -820,36 +832,82 @@ if(!is_writeable($settings->_configFilePath)) {
         <input type="checkbox" name="<?php echo "extensions[".$extname."][".$confkey."]"; ?>" value="1" <?php if(isset($settings->_extensions[$extname][$confkey]) && $settings->_extensions[$extname][$confkey]) echo 'checked'; ?> />
 <?php
 								break;
-							case 'database':
-								switch($conf['table']) {
-								case 'users':
-									if(isset($settings->_extensions[$extname][$confkey]))
-										$selusers = explode(',', $settings->_extensions[$extname][$confkey]);
-									else
-										$selusers = array();
-									echo '<select class="chzn-select" multiple="multiple" name="extensions['.$extname.']['.$confkey.'][]" data-placeholder="'.getMLText('select_users').'">';
-									foreach($users as $user) {
-										echo '<option value="'.$user->getID().'"'.(in_array($user->getID(), $selusers) ? ' selected' : '').'>'.$user->getLogin().'</option>';
+							case 'select':
+								if(!empty($conf['options'])) {
+									$selections = explode(",", $settings->_extensions[$extname][$confkey]);
+									echo "<select class=\"chzn-select\" name=\"extensions[".$extname."][".$confkey."][]\"".(!empty($conf['multiple']) ? "  multiple" : "").(!empty($conf['size']) ? "  size=\"".$conf['size']."\"" : "").">";
+									foreach($conf['options'] as $key=>$opt) {
+										echo "<option value=\"".$key."\"";
+										if(in_array($key, $selections))
+											echo " selected";
+										echo ">".htmlspecialchars($opt)."</option>";
 									}
-									echo '</select>';
-									break;
-								case 'groups':
-									if(isset($settings->_extensions[$extname][$confkey]))
-										$selgroups = explode(',', $settings->_extensions[$extname][$confkey]);
-									else
-										$selgroups = array();
-									echo '<select class="chzn-select" multiple="multiple" name="extensions['.$extname.']['.$confkey.'][]" data-placeholder="'.getMLText('select_groups').'">';
-									foreach($groups as $group) {
-										echo '<option value="'.$group->getID().'"'.(in_array($group->getID(), $selgroups) ? ' selected' : '').'>'.$group->getName().'</option>';
+									echo "</select>";
+								} elseif(!empty($conf['internal'])) {
+									$selections = empty($settings->_extensions[$extname][$confkey]) ? array() : explode(",", $settings->_extensions[$extname][$confkey]);
+									switch($conf['internal']) {
+									case "categories":
+										$categories = $dms->getDocumentCategories();
+										if($categories) {
+											echo "<select class=\"chzn-select\" name=\"extensions[".$extname."][".$confkey."][]\"".(!empty($conf['multiple']) ? "  multiple" : "").(!empty($conf['size']) ? "  size=\"".$conf['size']."\"" : "").">";
+											foreach($categories as $category) {
+												echo "<option value=\"".$category->getID()."\"";
+												if(in_array($category->getID(), $selections))
+													echo " selected";
+												echo ">".htmlspecialchars($category->getName())."</option>";
+											}
+											echo "</select>";
+										}
+										break;
+									case "users":
+										$users = $dms->getAllUsers();
+										if($users) {
+											echo "<select class=\"chzn-select\" name=\"extensions[".$extname."][".$confkey."][]\"".(!empty($conf['multiple']) ? "  multiple" : "").(!empty($conf['size']) ? "  size=\"".$conf['size']."\"" : "").">";
+											foreach($users as $curuser) {
+												echo "<option value=\"".$curuser->getID()."\"";
+												if(in_array($curuser->getID(), $selections))
+													echo " selected";
+												echo ">".htmlspecialchars($curuser->getLogin()." - ".$curuser->getFullName())."</option>";
+											}
+											echo "</select>";
+										}
+										break;
+									case "groups":
+										$recs = $dms->getAllGroups();
+										if($recs) {
+											echo "<select class=\"chzn-select\" name=\"extensions[".$extname."][".$confkey."][]\"".(!empty($conf['multiple']) ? "  multiple" : "").(!empty($conf['size']) ? "  size=\"".$conf['size']."\"" : "").">";
+											foreach($recs as $rec) {
+												echo "<option value=\"".$rec->getID()."\"";
+												if(in_array($rec->getID(), $selections))
+													echo " selected";
+												echo ">".htmlspecialchars($rec->getName())."</option>";
+											}
+											echo "</select>";
+										}
+										break;
+									case "attributedefinitions":
+										$recs = $dms->getAllAttributeDefinitions();
+										if($recs) {
+											echo "<select class=\"chzn-select\" name=\"extensions[".$extname."][".$confkey."][]\"".(!empty($conf['multiple']) ? "  multiple" : "").(!empty($conf['size']) ? "  size=\"".$conf['size']."\"" : "").">";
+											foreach($recs as $rec) {
+												echo "<option value=\"".$rec->getID()."\"";
+												if(in_array($rec->getID(), $selections))
+													echo " selected";
+												echo ">".htmlspecialchars($rec->getName())."</option>";
+											}
+											echo "</select>";
+										}
+										break;
 									}
-									echo '</select>';
-									break;
 								}
 								break;
 							default:
+								$this->showTextField("extensions[".$extname."][".$confkey."]", isset($settings->_extensions[$extname][$confkey]) ? $settings->_extensions[$extname][$confkey] : '', '', '');
+								/*
 ?>
-        <input type="text" name="<?php echo "extensions[".$extname."][".$confkey."]"; ?>" title="<?php echo isset($conf['help']) ? $conf['help'] : ''; ?>" value="<?php if(isset($settings->_extensions[$extname][$confkey])) echo $settings->_extensions[$extname][$confkey]; ?>" size="<?php echo $conf['size']; ?>" />
+        <input type="text" name="<?php echo "extensions[".$extname."][".$confkey."]"; ?>" title="<?php echo isset($conf['help']) ? $conf['help'] : ''; ?>" value="<?php if(isset($settings->_extensions[$extname][$confkey])) echo $settings->_extensions[$extname][$confkey]; ?>" <?php echo isset($conf['size']) ? 'size="'.$conf['size'].'"' : ""; ?>" />
 <?php
+*/
 						}
 ?>
       </td></tr>

views/bootstrap/class.SubstituteUser.php

@@ -76,6 +76,19 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 			}
 			echo "</td>";
 			echo "<td>";
+			switch($currUser->getRole()) {
+			case SeedDMS_Core_User::role_user:
+				printMLText("role_user");
+				break;
+			case SeedDMS_Core_User::role_admin:
+				printMLText("role_admin");
+				break;
+			case SeedDMS_Core_User::role_guest:
+				printMLText("role_guest");
+				break;
+			}
+			echo "</td>";
+			echo "<td>";
 			if($currUser->getID() != $user->getID()) {
 				echo "<a class=\"btn\" href=\"../op/op.SubstituteUser.php?userid=".((int) $currUser->getID())."&formtoken=".createFormKey('substituteuser')."\"><i class=\"icon-exchange\"></i> ".getMLText('substitute_user')."</a> ";
 			}

views/bootstrap/class.Tasks.php

@@ -0,0 +1,309 @@
+<?php
+/**
+ * Implementation of Tasks view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
+/**
+ * Class which outputs the html page for clipboard view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
+
+	private function __myTasks() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$tasks['review'] = array();
+		$tasks['approval'] = array();
+		$tasks['receipt'] = array();
+		$tasks['revision'] = array();
+		$resArr = $dms->getDocumentList('ApproveByMe', $user);
+		if($resArr) {
+			foreach ($resArr as $res) {
+				$document = $dms->getDocument($res["id"]);
+				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+					$tasks['approval'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+				}
+			}
+		}
+		$resArr = $dms->getDocumentList('ReviewByMe', $user);
+		if($resArr) {
+			foreach ($resArr as $res) {
+				$document = $dms->getDocument($res["id"]);
+				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+					$tasks['review'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+				}
+			}
+		}
+		$resArr = $dms->getDocumentList('ReceiptByMe', $user);
+		if($resArr) {
+			foreach ($resArr as $res) {
+				$document = $dms->getDocument($res["id"]);
+				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+					$tasks['receipt'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+				}
+			}
+		}
+		$resArr = $dms->getDocumentList('ReviseByMe', $user);
+		if($resArr) {
+			foreach ($resArr as $res) {
+				$document = $dms->getDocument($res["id"]);
+				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+					$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+				}
+			}
+		}
+		return $tasks;
+	} /* }}} */
+
+	/**
+	 * Returns the html needed for the task list in the menu
+	 *
+	 * This function renders the tasks in a way suitable to be
+	 * used as a menu
+	 *
+	 * @param array $clipboard clipboard containing two arrays for both
+	 *        documents and folders.
+	 * @return string html code
+	 */
+	function myTasks() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$startts = microtime(true);
+
+		$tasks = $this->__myTasks();
+
+		header('Content-Type: application/json');
+		echo json_encode(array('error'=>0, 'data'=>$tasks, 'processing_time'=>microtime(true)-$startts));
+	} /* }}} */
+
+	/**
+	 * Returns the html needed for the task list in the menu
+	 *
+	 * This function renders the tasks in a way suitable to be
+	 * used as a menu
+	 *
+	 * @param array $clipboard clipboard containing two arrays for both
+	 *        documents and folders.
+	 * @return string html code
+	 */
+	function menuTasks() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+
+		$tasks = $this->__myTasks();
+
+		$content = '';
+//		$content .= "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
+//		$content .= "    <li class=\"dropdown\">\n";
+		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." (".count($tasks['review'])."/".count($tasks['approval'])."/".count($tasks['receipt'])."/".count($tasks['revision']).") <i class=\"icon-caret-down\"></i></a>\n";
+		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		if($tasks['review']) {
+		$content .= "      <li class=\"dropdown-submenu\">\n";
+		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_review")."</a>\n";
+		$content .= "       <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		foreach($tasks['review'] as $t) {
+			$doc = $dms->getDocument($t['id']);
+			$content .= "      <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp\">".$doc->getName()."</a></li>";
+		}
+		$content .= "       </ul>\n";
+		$content .= "      </li>\n";
+		}
+		if($tasks['approval']) {
+		$content .= "      <li class=\"dropdown-submenu\">\n";
+		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_approve")."</a>\n";
+		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		foreach($tasks['approval'] as $t) {
+			$doc = $dms->getDocument($t['id']);
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp\">".$doc->getName()."</a></li>";
+		}
+		$content .= "       </ul>\n";
+		$content .= "      </li>\n";
+		}
+		if($tasks['receipt']) {
+		$content .= "      <li class=\"dropdown-submenu\">\n";
+		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_receipt")."</a>\n";
+		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		foreach($tasks['receipt'] as $t) {
+			$doc = $dms->getDocument($t['id']);
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=recipients\">".$doc->getName()."</a></li>";
+		}
+		$content .= "       </ul>\n";
+		$content .= "      </li>\n";
+		}
+		if($tasks['revision']) {
+		$content .= "      <li class=\"dropdown-submenu\">\n";
+		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_revise")."</a>\n";
+		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		foreach($tasks['revision'] as $t) {
+			$doc = $dms->getDocument($t['id']);
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revision\">".$doc->getName()."</a></li>";
+		}
+		$content .= "       </ul>\n";
+		$content .= "      </li>\n";
+		}
+		if ($this->check_access('MyDocuments')) {
+			$content .= "    <li class=\"divider\"></li>\n";
+			$content .= "    <li><a href=\"../out/out.MyDocuments.php\">".getMLText("my_documents")."</a></li>\n";
+		}
+		$content .= "     </ul>\n";
+//		$content .= "    </li>\n";
+//		$content .= "   </ul>\n";
+		echo $content;
+	} /* }}} */
+
+	/**
+	 * Returns the html needed for the clipboard list in the menu
+	 *
+	 * This function renders the clipboard in a way suitable to be
+	 * used as a menu
+	 *
+	 * @param array $clipboard clipboard containing two arrays for both
+	 *        documents and folders.
+	 * @return string html code
+	 */
+	public function menuClipboard() { /* {{{ */
+		$clipboard = $this->params['session']->getClipboard();
+		if ($this->params['user']->isGuest() || (count($clipboard['docs']) + count($clipboard['folders'])) == 0) {
+			return '';
+		}
+		$content = '';
+		$content .= "   <ul id=\"main-menu-clipboard\" class=\"nav pull-right\">\n";
+		$content .= "    <li class=\"dropdown add-clipboard-area\">\n";
+		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-clipboard-area\">".getMLText('clipboard')." (".count($clipboard['folders'])."/".count($clipboard['docs']).") <i class=\"icon-caret-down\"></i></a>\n";
+		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		foreach($clipboard['folders'] as $folderid) {
+			if($folder = $this->params['dms']->getFolder($folderid))
+				$content .= "    <li><a href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><i class=\"icon-folder-close-alt\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
+		}
+		foreach($clipboard['docs'] as $docid) {
+			if($document = $this->params['dms']->getDocument($docid))
+				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\"><i class=\"icon-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
+		}
+		$content .= "    <li class=\"divider\"></li>\n";
+		if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) {
+			$content .= "    <li><a href=\"../op/op.MoveClipboard.php?targetid=".$this->params['folder']->getID()."&refferer=".urlencode($this->params['refferer'])."\">".getMLText("move_clipboard")."</a></li>\n";
+		}
+//		$content .= "    <li><a href=\"../op/op.ClearClipboard.php?refferer=".urlencode($this->params['refferer'])."\">".getMLText("clear_clipboard")."</a><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">kkk</a> </li>\n";
+		$content .= "    <li><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">".getMLText("clear_clipboard")."</a></li>\n";
+		$content .= "     </ul>\n";
+		$content .= "    </li>\n";
+		$content .= "   </ul>\n";
+		echo $content;
+	} /* }}} */
+
+	/**
+	 * Return clipboard content rendered as html
+	 *
+	 * @param array clipboard
+	 * @return string rendered html content
+	 */
+	public function mainClipboard() { /* {{{ */
+		$dms = $this->params['dms'];
+		$clipboard = $this->params['session']->getClipboard();
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$content = '';
+		$foldercount = $doccount = 0;
+		if($clipboard['folders']) {
+			foreach($clipboard['folders'] as $folderid) {
+				/* FIXME: check for access rights, which could have changed after adding the folder to the clipboard */
+				if($folder = $dms->getFolder($folderid)) {
+					$comment = $folder->getComment();
+					if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
+					$content .= "<tr draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
+					$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\"><img draggable=\"false\" src=\"".$this->imgpath."folder.png\" width=\"24\" height=\"24\" border=0></a></td>\n";
+					$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\">" . htmlspecialchars($folder->getName()) . "</a>";
+					if($comment) {
+						$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
+					}
+					$content .= "</td>\n";
+					$content .= "<td>\n";
+					$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folderid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$folderid."&type=folder\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
+					$content .= "</td>\n";
+					$content .= "</tr>\n";
+					$foldercount++;
+				}
+			}
+		}
+		if($clipboard['docs']) {
+			foreach($clipboard['docs'] as $docid) {
+				/* FIXME: check for access rights, which could have changed after adding the document to the clipboard */
+				if($document = $dms->getDocument($docid)) {
+					$comment = $document->getComment();
+					if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
+					if($latestContent = $document->getLatestContent()) {
+						$previewer->createPreview($latestContent);
+						$version = $latestContent->getVersion();
+						$status = $latestContent->getStatus();
+						
+						$content .= "<tr draggable=\"true\" rel=\"document_".$docid."\" class=\"table-row-document\" formtoken=\"".createFormKey('movedocument')."\">";
+
+						if (file_exists($dms->contentDir . $latestContent->getPath())) {
+							$content .= "<td><a draggable=\"false\" href=\"../op/op.Download.php?documentid=".$docid."&version=".$version."\">";
+							if($previewer->hasPreview($latestContent)) {
+								$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"40\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+							} else {
+								$content .= "<img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+							}
+							$content .= "</a></td>";
+						} else
+							$content .= "<td><img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\"></td>";
+						
+						$content .= "<td><a draggable=\"false\" href=\"out.ViewDocument.php?documentid=".$docid."&showtree=".showtree()."\">" . htmlspecialchars($document->getName()) . "</a>";
+						if($comment) {
+							$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
+						}
+						$content .= "</td>\n";
+						$content .= "<td>\n";
+						$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"D".$docid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$docid."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
+						$content .= "</td>\n";
+						$content .= "</tr>";
+						$doccount++;
+					}
+				}
+			}
+		}
+
+		/* $foldercount or $doccount will only count objects which are
+		 * actually available
+		 */
+		if($foldercount || $doccount) {
+			$content = "<table class=\"table\">".$content;
+			$content .= "</table>";
+		} else {
+		}
+		$content .= "<div class=\"alert add-clipboard-area\">".getMLText("drag_icon_here")."</div>";
+		echo $content;
+	} /* }}} */
+
+}

views/bootstrap/class.Timeline.php

@@ -163,6 +163,39 @@ $(document).ready(function () {
 		$this->printTimelineJs($timelineurl, 550, ''/*date('Y-m-d', $from)*/, ''/*date('Y-m-d', $to+1)*/, $skip);
 	} /* }}} */
 
+	function css() { /* {{{ */
+?>
+#timeline {
+	font-size: 12px;
+	line-height: 14px;
+}
+div.timeline-event-content {
+	margin: 3px 5px;
+}
+div.timeline-frame {
+	border-radius: 4px;
+	border-color: #e3e3e3;
+}
+
+div.status_change_2 {
+	background-color: #DAF6D5;
+	border-color: #AAF897;
+}
+
+div.status_change_-1 {
+	background-color: #F6D5D5;
+	border-color: #F89797;
+}
+
+div.timeline-event-selected {
+	background-color: #fff785;
+	border-color: #ffc200;
+	z-index: 999;
+}
+<?php
+		header('Content-Type: text/css');
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];

views/bootstrap/class.UpdateDocument.php

@@ -36,13 +36,14 @@ class SeedDMS_View_UpdateDocument extends SeedDMS_Bootstrap_Style {
 		$dropfolderdir = $this->params['dropfolderdir'];
 		$enablelargefileupload = $this->params['enablelargefileupload'];
 		$partitionsize = $this->params['partitionsize'];
+		$maxuploadsize = $this->params['maxuploadsize'];
 		header('Content-Type: application/javascript');
 		$this->printDropFolderChooserJs("form1");
 		$this->printSelectPresetButtonJs();
 		$this->printInputPresetButtonJs();
 		$this->printCheckboxPresetButtonJs();
 		if($enablelargefileupload)
-			$this->printFineUploaderJs('../op/op.UploadChunks.php', $partitionsize, false);
+			$this->printFineUploaderJs('../op/op.UploadChunks.php', $partitionsize, $maxuploadsize, false);
 ?>
 $(document).ready( function() {
 	jQuery.validator.addMethod("alternatives", function(value, element, params) {
@@ -67,6 +68,8 @@ $(document).ready( function() {
 		return false;
 	}, "<?php printMLText("js_no_file");?>");
 	$("#form1").validate({
+		debug: false,
+		ignore: ":hidden:not(.do_validate)",
 		invalidHandler: function(e, validator) {
 			noty({
 				text:  (validator.numberOfInvalids() == 1) ? "<?php printMLText("js_form_error");?>".replace('#', validator.numberOfInvalids()) : "<?php printMLText("js_form_errors");?>".replace('#', validator.numberOfInvalids()),
@@ -81,7 +84,11 @@ $(document).ready( function() {
 		if($enablelargefileupload) {
 ?>
 		submitHandler: function(form) {
-			manualuploader.uploadStoredFiles();
+			/* fileuploader may not have any files if drop folder is used */
+			if(userfileuploader.getUploads().length)
+				userfileuploader.uploadStoredFiles();
+			else
+				form.submit();
 		},
 <?php
 		}
@@ -90,8 +97,8 @@ $(document).ready( function() {
 <?php
 		if($enablelargefileupload) {
 ?>
-			fineuploaderuuids: {
-				fineuploader: [ manualuploader, $('#dropfolderfileform1') ]
+			'userfile-fine-uploader-uuids': {
+				fineuploader: [ userfileuploader, $('#dropfolderfileform1') ]
 			}
 <?php
 		} else {
@@ -118,6 +125,12 @@ console.log(element);
 			}
 		}
 	});
+	$('#presetexpdate').on('change', function(ev){
+		if($(this).val() == 'date')
+			$('#control_expdate').show();
+		else
+			$('#control_expdate').hide();
+	});
 });
 <?php
 	} /* }}} */
@@ -129,6 +142,7 @@ console.log(element);
 		$document = $this->params['document'];
 		$strictformcheck = $this->params['strictformcheck'];
 		$enablelargefileupload = $this->params['enablelargefileupload'];
+		$maxuploadsize = $this->params['maxuploadsize'];
 		$enableadminrevapp = $this->params['enableadminrevapp'];
 		$enableownerrevapp = $this->params['enableownerrevapp'];
 		$enableselfrevapp = $this->params['enableselfrevapp'];
@@ -138,8 +152,10 @@ console.log(element);
 		$documentid = $document->getId();
 
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
-		if($enablelargefileupload)
+		if($enablelargefileupload) {
 			$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/fine-uploader/jquery.fine-uploader.min.js"></script>'."\n", 'js');
+			$this->htmlAddHeader($this->getFineUploaderTemplate(), 'js');
+		}
 
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
@@ -182,11 +198,20 @@ console.log(element);
 			}
 		}
 
-		$msg = getMLText("max_upload_size").": ".ini_get( "upload_max_filesize");
 		if($enablelargefileupload) {
+			if($maxuploadsize) {
+				$msg = getMLText("max_upload_size").": ".SeedDMS_Core_File::format_filesize($maxuploadsize);
+			} else {
+				$msg = '';
+			}
+		} else {
+			$msg = getMLText("max_upload_size").": ".ini_get( "upload_max_filesize");
+		}
+		if(0 && $enablelargefileupload) {
 			$msg .= "<p>".sprintf(getMLText('link_alt_updatedocument'), "out.AddMultiDocument.php?folderid=".$folder->getID()."&showtree=".showtree())."</p>";
 		}
-		$this->warningMsg($msg);
+		if($msg)
+			$this->warningMsg($msg);
 
 		if ($document->isCheckedOut()) {
 			$msg = getMLText('document_is_checked_out');
@@ -197,6 +222,7 @@ console.log(element);
 ?>
 
 <form action="../op/op.UpdateDocument.php" enctype="multipart/form-data" method="post" name="form1" id="form1">
+	<?php echo createHiddenFieldWithKey('updatedocument'); ?>
 	<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
 	<table class="table-condensed">
 	
@@ -226,39 +252,50 @@ console.log(element);
 <?php
 			if($presetexpiration) {
 				if(!($expts = strtotime($presetexpiration)))
-					$expts = time();
+					$expts = false;
 			} else {
-				$expts = time();
+				$expts = false;
 			}
 ?>
 		<tr>
+			<td><?php printMLText("preset_expires");?>:</td>
+			<td>
+				<select class="span6" name="presetexpdate" id="presetexpdate">
+					<option value="never"><?php printMLText('does_not_expire');?></option>
+					<option value="date"<?php echo ($expts != '' ? " selected" : ""); ?>><?php printMLText('expire_by_date');?></option>
+					<option value="1w"><?php printMLText('expire_in_1w');?></option>
+					<option value="1m"><?php printMLText('expire_in_1m');?></option>
+					<option value="1y"><?php printMLText('expire_in_1y');?></option>
+					<option value="2y"><?php printMLText('expire_in_2y');?></option>
+				</select>
+			</td>
+		</tr>
+		<tr id="control_expdate" <?php echo ($expts == false ? 'style="display: none;"' : ''); ?>>
 			<td><?php printMLText("expires");?>:</td>
 			<td class="standardText">
-        <span class="input-append date span12" id="expirationdate" data-date="<?php echo date('Y-m-d', $expts); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
-          <input class="span3" size="16" name="expdate" type="text" value="<?php echo date('Y-m-d', $expts); ?>">
+        <span class="input-append date span12" id="expirationdate" data-date="<?php echo ($expts ? date('Y-m-d', $expts) : ''); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+          <input class="span6" size="16" name="expdate" type="text" value="<?php echo ($expts ? date('Y-m-d', $expts) : ''); ?>">
           <span class="add-on"><i class="icon-calendar"></i></span>
-        </span><br />
-        <label class="checkbox inline">
-				  <input type="checkbox" name="expires" value="false"<?php if (!$document->expires()) print " checked";?>><?php printMLText("does_not_expire");?><br>
-        </label>
+        </span>
 			</td>
 		</tr>
 <?php
 	$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all));
 	if($attrdefs) {
 		foreach($attrdefs as $attrdef) {
-			$arr = $this->callHook('editDocumentContentAttribute', null, $attrdef);
+			$arr = $this->callHook('editDocumentContentAttribute', $document, $attrdef);
 			if(is_array($arr)) {
-				echo $txt;
-				echo "<tr>";
-				echo "<td>".$arr[0].":</td>";
-				echo "<td>".$arr[1]."</td>";
-				echo "</tr>";
+				if($arr) {
+					echo "<tr>";
+					echo "<td>".$arr[0].":</td>";
+					echo "<td>".$arr[1]."</td>";
+					echo "</tr>";
+				}
 			} else {
 ?>
     <tr>
 	    <td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-			<td><?php $this->printAttributeEditField($attrdef, '') ?>
+			<td><?php $this->printAttributeEditField($attrdef, '', 'attributes_version') ?>
 <?php
 			if($latestContent->getAttributeValue($attrdef)) {
 				switch($attrdef->getType()) {
@@ -266,10 +303,10 @@ console.log(element);
 				case SeedDMS_Core_AttributeDefinition::type_date:
 				case SeedDMS_Core_AttributeDefinition::type_int:
 				case SeedDMS_Core_AttributeDefinition::type_float:
-					$this->printInputPresetButtonHtml('attributes_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef), $attrdef->getValueSetSeparator());
+					$this->printInputPresetButtonHtml('attributes_version_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef), $attrdef->getValueSetSeparator());
 					break;
 				case SeedDMS_Core_AttributeDefinition::type_boolean:
-					$this->printCheckboxPresetButtonHtml('attributes_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef));
+					$this->printCheckboxPresetButtonHtml('attributes_version_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef));
 					break;
 				}
 //				print_r($latestContent->getAttributeValue($attrdef));
@@ -280,6 +317,17 @@ console.log(element);
 			}
 		}
 	}
+
+	$arrs = $this->callHook('addDocumentContentAttributes', $folder);
+	if(is_array($arrs)) {
+		foreach($arrs as $arr) {
+			echo "<tr>";
+			echo "<td>".$arr[0].":</td>";
+			echo "<td>".$arr[1]."</td>";
+			echo "</tr>";
+		}
+	}
+
 	if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 		// Retrieve a list of all users and groups that have review / approve
 		// privileges.

views/bootstrap/class.ViewDocument.php

@@ -125,6 +125,25 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		}
 	} /* }}} */
 
+	function documentListItem() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$previewwidth = $this->params['previewWidthList'];
+		$cachedir = $this->params['cachedir'];
+		$document = $this->params['document'];
+		if($document) {
+			if ($document->getAccessMode($user) >= M_READ) {
+				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+				$txt = $this->callHook('documentListItem', $document, $previewer, true, '');
+				if(is_string($txt))
+					$content = $txt;
+				else 
+					$content = $this->documentListRow($document, $previewer, true);
+				echo $content;
+			}
+		}
+	} /* }}} */
+
 	function timelinedata() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -360,7 +379,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			return;
 
 		$accessop = $this->params['accessobject'];
-		if($accessop->check_controller_access('Download', array('action'=>'version'))) {
+		if($accessop->check_controller_access('ViewOnline', array('action'=>'version'))) {
 			$latestContent = $document->getLatestContent();
 			$txt = $this->callHook('preDocumentPreview', $latestContent);
 			if(is_string($txt))
@@ -377,20 +396,20 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					$this->contentHeading(getMLText("preview"));
 ?>
 		<audio controls style="width: 100%;">
-		<source  src="../op/op.Download.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" type="audio/mpeg">
+		<source  src="../op/op.ViewOnline.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" type="audio/mpeg">
 		</audio>
 <?php
 					break;
 				case 'application/pdf':
 					$this->contentHeading(getMLText("preview"));
 ?>
-			<iframe src="../pdfviewer/web/viewer.html?file=<?php echo urlencode('../../op/op.Download.php?documentid='.$document->getID().'&version='.$latestContent->getVersion()); ?>" width="100%" height="700px"></iframe>
+			<iframe src="../pdfviewer/web/viewer.html?file=<?php echo urlencode('../../op/op.ViewOnline.php?documentid='.$document->getID().'&version='.$latestContent->getVersion()); ?>" width="100%" height="700px"></iframe>
 <?php
 					break;
 				case 'image/svg+xml':
 					$this->contentHeading(getMLText("preview"));
 ?>
-			<img src="../op/op.Download.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" width="100%">
+			<img src="../op/op.ViewOnline.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" width="100%">
 <?php
 					break;
 				default:
@@ -540,7 +559,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			}
 ?>
 		  <li class="<?php if($currenttab == 'attachments') echo 'active'; ?>"><a data-target="#attachments" data-toggle="tab"><?php printMLText('linked_files'); echo (count($files)) ? " (".count($files).")" : ""; ?></a></li>
-			<li class="<?php if($currenttab == 'links') echo 'active'; ?>"><a data-target="#links" data-toggle="tab"><?php printMLText('linked_documents'); echo (count($links)) ? " (".count($links).")" : ""; ?></a></li>
+			<li class="<?php if($currenttab == 'links') echo 'active'; ?>"><a data-target="#links" data-toggle="tab"><?php printMLText('linked_documents'); echo (count($links) || count($reverselinks)) ? " (".count($links)."/".count($reverselinks).")" : ""; ?></a></li>
 			<li class="<?php if($currenttab == 'downloadlinks') echo 'active'; ?>"><a data-target="#downloadlinks" data-toggle="tab"><?php printMLText('download_links'); echo (count($downloadlinks)) ? " (".count($downloadlinks).")" : ""; ?></a></li>
 		</ul>
 		<div class="tab-content">
@@ -586,7 +605,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if($previewer->hasPreview($latestContent)) {
 			print("<img class=\"mimeicon\" width=\"".$previewwidthdetail."\" src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">");
 		} else {
-			print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+			print "<img class=\"mimeicon\" width=\"".$previewwidthdetail."\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 		}
 		if ($file_exists) {
 			if($accessop->check_controller_access('Download', array('action'=>'run')) || $accessop->check_controller_access('ViewOnline', array('action'=>'run')))
@@ -695,7 +714,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<li>".$this->html_link('EditAttributes', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-edit\"></i>".getMLText("edit_attributes"), false, true)."</li>";
 			}
 
-		//print "<li>".$this->html_link('Download', array('documentid'=>$documentid, 'vfile'=>1), array(), "<i class=\"icon-info-sign\"></i>".getMLText("versioning_info"), false, true)."</li>";	
+		$items = $this->callHook('extraVersionActions', $latestContent);
+		if($items) {
+			foreach($items as $item) {
+				echo "<li>".$item."</li>";
+			}
+		}
 
 		print "</ul>";
 		echo "</td>";
@@ -1170,9 +1194,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				$required = null;
 				$is_recipient = false;
 				$stat[''.$r['status']]++;
+				$accesserr = '';
 				switch ($r["type"]) {
 					case 0: // Recipient is an individual.
 						$required = $dms->getUser($r["required"]);
+						if($user->isAdmin() && ($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ))
+							$accesserr = getMLText("access_denied");
 						if (!is_object($required)) {
 							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
 						}
@@ -1207,7 +1234,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print "<td>".htmlspecialchars($r["comment"])."</td>\n";
 					print "<td>".getReceiptStatusText($r["status"])."</td>\n";
 					print "<td><ul class=\"unstyled\">";
-
+					if($accesserr)
+						echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
 					if($accessop->mayReceipt($document)) {
 						if ($is_recipient) {
 							if($r["status"]==0) {
@@ -1392,7 +1420,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				if($previewer->hasPreview($version)) {
 					print("<img class=\"mimeicon\" width=\"".$previewwidthdetail."\" src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($version->getMimeType())."\">");
 				} else {
-					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+					print "<img class=\"mimeicon\" width=\"".$previewwidthdetail."\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
 				}
 				if($file_exists) {
 					if($accessop->check_controller_access('Download', array('action'=>'run')) || $accessop->check_controller_access('ViewOnline', array('action'=>'run')))
@@ -1443,6 +1471,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print "<li>".$this->html_link('EditAttributes', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "<i class=\"icon-edit\"></i>".getMLText("edit_attributes"), false, true)."</li>";
 				}
 				print "<li>".$this->html_link('DocumentVersionDetail', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "<i class=\"icon-info-sign\"></i>".getMLText("details"), false, true)."</li>";
+				$items = $this->callHook('extraVersionActions', $version);
+				if($items) {
+					foreach($items as $item) {
+						echo "<li>".$item."</li>";
+					}
+				}
 				print "</ul>";
 				print "</td>\n</tr>\n";
 			}
@@ -1491,7 +1525,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				if($previewer->hasPreview($file)) {
 					print("<img class=\"mimeicon\" width=\"".$previewwidthdetail."\" src=\"../op/op.Preview.php?documentid=".$document->getID()."&file=".$file->getID()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($file->getMimeType())."\">");
 				} else {
-					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($file->getFileType())."\" title=\"".htmlspecialchars($file->getMimeType())."\">";
+					print "<img class=\"mimeicon\" width=\"".$previewwidthdetail."\" src=\"".$this->getMimeIcon($file->getFileType())."\" title=\"".htmlspecialchars($file->getMimeType())."\">";
 				}
 				if($file_exists) {
 					if($accessop->check_controller_access('Download', array('action'=>'run')) || $accessop->check_controller_access('ViewOnline', array('action'=>'run')))
@@ -1501,7 +1535,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				
 				print "<td><ul class=\"unstyled\">\n";
 				print "<li>".htmlspecialchars($file->getName())."</li>\n";
-				print "<li>".htmlspecialchars($file->getOriginalFileName())."</li>\n";
+				if($file->getName() != $file->getOriginalFileName())
+					print "<li>".htmlspecialchars($file->getOriginalFileName())."</li>\n";
 				if ($file_exists)
 					print "<li>".SeedDMS_Core_File::format_filesize(filesize($dms->contentDir . $file->getPath())) ." bytes, ".htmlspecialchars($file->getMimeType())."</li>";
 				else print "<li>".htmlspecialchars($file->getMimeType())." - <span class=\"warning\">".getMLText("document_deleted")."</span></li>";
@@ -1538,8 +1573,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		}
 		else printMLText("no_attached_files");
 
-		if ($document->getAccessMode($user) >= M_READWRITE){
-			print "<ul class=\"unstyled\"><li>".$this->html_link('AddFile', array('documentid'=>$documentid), array('class'=>'btn'), getMLText("add"), false, true)."</li></ul>\n";
+		if($this->check_access('AddFile')) {
+			if ($document->getAccessMode($user) >= M_READWRITE){
+				print "<ul class=\"unstyled\"><li>".$this->html_link('AddFile', array('documentid'=>$documentid), array('class'=>'btn'), getMLText("add"), false, true)."</li></ul>\n";
+			}
 		}
 		$this->contentContainerEnd();
 ?>
@@ -1580,9 +1617,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				if($accessop->check_controller_access('Download', array('action'=>'version')))
 					print "<a href=\"../op/op.Download.php?documentid=".$targetDoc->getID()."&version=".$targetlc->getVersion()."\">";
 				if($previewer->hasPreview($targetlc)) {
-					print "<img class=\"mimeicon\" width=\"".$previewwidthdetail."\"src=\"../op/op.Preview.php?documentid=".$targetDoc->getID()."&version=".$targetlc->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($targetlc->getMimeType())."\">";
+					print "<img class=\"mimeicon\" width=\"".$previewwidthlist."\" src=\"../op/op.Preview.php?documentid=".$targetDoc->getID()."&version=".$targetlc->getVersion()."&width=".$previewwidthlist."\" title=\"".htmlspecialchars($targetlc->getMimeType())."\">";
 				} else {
-					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($targetlc->getFileType())."\" title=\"".htmlspecialchars($targetlc->getMimeType())."\">";
+					print "<img class=\"mimeicon\" width=\"".$previewwidthlist."\" src=\"".$this->getMimeIcon($targetlc->getFileType())."\" title=\"".htmlspecialchars($targetlc->getMimeType())."\">";
 				}
 				if($accessop->check_controller_access('Download', array('action'=>'run')))
 					print "</a>";
@@ -1649,32 +1686,35 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			foreach($reverselinks as $link) {
 				$responsibleUser = $link->getUser();
 				$sourceDoc = $link->getDocument();
-				$sourcelc = $sourceDoc->getLatestContent();
-
-				$previewer->createPreview($sourcelc, $previewwidthdetail);
-				print "<tr>";
-				print "<td style=\"width:".$previewwidthdetail."px; text-align: center;\">";
-				if($accessop->check_controller_access('Download', array('action'=>'version')))
-					print "<a href=\"../op/op.Download.php?documentid=".$sourceDoc->getID()."&version=".$sourcelc->getVersion()."\">";
-				if($previewer->hasPreview($sourcelc)) {
-					print "<img class=\"mimeicon\" width=\"".$previewwidthdetail."\"src=\"../op/op.Preview.php?documentid=".$sourceDoc->getID()."&version=".$sourcelc->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($sourcelc->getMimeType())."\">";
-				} else {
-					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($sourcelc->getFileType())."\" title=\"".htmlspecialchars($sourcelc->getMimeType())."\">";
+				/* Check if latest content is accessible. Could be that even if the document
+				 * is accessible, the document content isn't because of its status
+				 */
+				if($sourcelc = $sourceDoc->getLatestContent()) {
+					$previewer->createPreview($sourcelc, $previewwidthdetail);
+					print "<tr>";
+					print "<td style=\"width:".$previewwidthdetail."px; text-align: center;\">";
+					if($accessop->check_controller_access('Download', array('action'=>'version')))
+						print "<a href=\"../op/op.Download.php?documentid=".$sourceDoc->getID()."&version=".$sourcelc->getVersion()."\">";
+					if($previewer->hasPreview($sourcelc)) {
+						print "<img class=\"mimeicon\" width=\"".$previewwidthlist."\" src=\"../op/op.Preview.php?documentid=".$sourceDoc->getID()."&version=".$sourcelc->getVersion()."&width=".$previewwidthlist."\" title=\"".htmlspecialchars($sourcelc->getMimeType())."\">";
+					} else {
+						print "<img class=\"mimeicon\" width=\"".$previewwidthlist."\" src=\"".$this->getMimeIcon($sourcelc->getFileType())."\" title=\"".htmlspecialchars($sourcelc->getMimeType())."\">";
+					}
+					if($accessop->check_controller_access('Download', array('action'=>'run')))
+						print "</a>";
+					print "</td>";
+					print "<td><a href=\"out.ViewDocument.php?documentid=".$sourceDoc->getID()."\" class=\"linklist\">".htmlspecialchars($sourceDoc->getName())."</a></td>";
+					print "<td>".htmlspecialchars($sourceDoc->getComment())."</td>";
+					print "<td>".getMLText("document_link_by")." ".htmlspecialchars($responsibleUser->getFullName());
+					if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
+						print "<br />".getMLText("document_link_public").": ".(($link->isPublic()) ? getMLText("yes") : getMLText("no"));
+					print "</td>";
+					print "<td><span class=\"actions\">";
+					if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
+						print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button></form>";
+					print "</span></td>";
+					print "</tr>";
 				}
-				if($accessop->check_controller_access('Download', array('action'=>'run')))
-					print "</a>";
-				print "</td>";
-				print "<td><a href=\"out.ViewDocument.php?documentid=".$sourceDoc->getID()."\" class=\"linklist\">".htmlspecialchars($sourceDoc->getName())."</a></td>";
-				print "<td>".htmlspecialchars($sourceDoc->getComment())."</td>";
-				print "<td>".getMLText("document_link_by")." ".htmlspecialchars($responsibleUser->getFullName());
-				if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
-					print "<br />".getMLText("document_link_public").": ".(($link->isPublic()) ? getMLText("yes") : getMLText("no"));
-				print "</td>";
-				print "<td><span class=\"actions\">";
-				if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
-					print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button></form>";
-				print "</span></td>";
-				print "</tr>";
 			}
 			print "</tbody>\n</table>\n";
 			$this->contentContainerEnd();

views/bootstrap/class.ViewFolder.php

@@ -299,7 +299,11 @@ function folderSelected(id, name) {
 			echo "</div>";
 		}
 
-		$this->contentHeading(getMLText("folder_contents"));
+		$txt = $this->callHook('listHeader', $folder);
+		if(is_string($txt))
+			echo $txt;
+		else
+			$this->contentHeading(getMLText("folder_contents"));
 
 		$subFolders = $folder->getSubFolders($orderby);
 		$subFolders = SeedDMS_Core_DMS::filterAccess($subFolders, $user, M_READ);
@@ -329,6 +333,12 @@ function folderSelected(id, name) {
 				}
 			}
 
+			if($subFolders && $documents) {
+				$txt = $this->callHook('folderListSeparator', $folder);
+				if(is_string($txt))
+					echo $txt;
+			}
+
 			foreach($documents as $document) {
 				$document->verifyLastestContentExpriry();
 				$txt = $this->callHook('documentListItem', $document, $previewer, 'viewfolder');

views/bootstrap/class.WorkflowSummary.php

@@ -90,9 +90,9 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style {
 				print "<tr>\n";
 				print "<td><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$st['version']."\">";
 				if($previewer->hasPreview($version)) {
-					print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+					print "<img class=\"mimeicon\" width=\"".$previewwidth."\" src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
 				} else {
-					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+					print "<img class=\"mimeicon\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
 				}
 				print "</a></td>";
 				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["document"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName());
@@ -147,9 +147,9 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style {
 				print "<tr>\n";
 				print "<td><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$st['version']."\">";
 				if($previewer->hasPreview($version)) {
-					print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+					print "<img class=\"mimeicon\" width=\"".$previewwidth."\" src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
 				} else {
-					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+					print "<img class=\"mimeicon\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
 				}
 				print "</a></td>";
 				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["document"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";

views/bootstrap/images/executable.svg

@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48.000000px"
+   height="48.000000px"
+   id="svg53383"
+   sodipodi:version="0.32"
+   inkscape:version="0.45"
+   sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/mimetypes"
+   sodipodi:docname="application-x-executable.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4746">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4748" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4750" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2300">
+      <stop
+         id="stop2302"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.32673267;" />
+      <stop
+         id="stop2304"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="aigrd1"
+       gradientUnits="userSpaceOnUse"
+       x1="99.7773"
+       y1="15.4238"
+       x2="153.0005"
+       y2="248.6311">
+      <stop
+         offset="0"
+         style="stop-color:#184375"
+         id="stop53300" />
+      <stop
+         offset="1"
+         style="stop-color:#C8BDDC"
+         id="stop53302" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#aigrd1"
+       id="linearGradient53551"
+       gradientUnits="userSpaceOnUse"
+       x1="99.7773"
+       y1="15.4238"
+       x2="153.0005"
+       y2="248.6311"
+       gradientTransform="matrix(0.200685,0.000000,0.000000,0.200685,-0.585758,-1.050787)" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="11.689870"
+       fy="72.568001"
+       fx="14.287618"
+       cy="68.872971"
+       cx="14.287618"
+       gradientTransform="matrix(1.399258,-2.234445e-7,8.196178e-8,0.513264,4.365074,4.839285)"
+       id="radialGradient2308"
+       xlink:href="#linearGradient2300"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4746"
+       id="linearGradient4752"
+       x1="25.625187"
+       y1="31.785736"
+       x2="25.821404"
+       y2="58.910736"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:showpageshadow="false"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="63.362147"
+     inkscape:cy="-4.2524833"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="872"
+     inkscape:window-height="697"
+     inkscape:window-x="414"
+     inkscape:window-y="275" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Executable</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://jimmac.musichall.cz/</dc:source>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>executable</rdf:li>
+            <rdf:li>program</rdf:li>
+            <rdf:li>binary</rdf:li>
+            <rdf:li>bin</rdf:li>
+            <rdf:li>script</rdf:li>
+            <rdf:li>shell</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="shadow"
+     id="layer2"
+     inkscape:groupmode="layer">
+    <path
+       transform="matrix(1.186380,0.000000,0.000000,1.186380,-4.539687,-7.794678)"
+       d="M 44.285715 38.714287 A 19.928572 9.8372450 0 1 1  4.4285717,38.714287 A 19.928572 9.8372450 0 1 1  44.285715 38.714287 z"
+       sodipodi:ry="9.8372450"
+       sodipodi:rx="19.928572"
+       sodipodi:cy="38.714287"
+       sodipodi:cx="24.357143"
+       id="path1538"
+       style="color:#000000;fill:url(#radialGradient2308);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.50000042;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc" />
+  </g>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:url(#linearGradient53551);fill-rule:nonzero;stroke:#3f4561;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
+       d="M 24.285801,43.196358 L 4.3751874,23.285744 L 24.285801,3.3751291 L 44.196415,23.285744 L 24.285801,43.196358 L 24.285801,43.196358 z "
+       id="path53304" />
+    <path
+       style="opacity:0.49999997;fill:#ffffff;fill-rule:nonzero;stroke:none;stroke-miterlimit:4.0000000"
+       d="M 8.9257729,27.145172 L 9.6642227,26.120988 C 10.300972,26.389480 10.964841,26.606057 11.650406,26.765873 L 11.644594,28.342731 C 12.072322,28.431066 12.507604,28.498867 12.948699,28.547102 L 13.430473,27.045213 C 13.774514,27.073690 14.122237,27.089380 14.473834,27.089380 C 14.825043,27.089380 15.172958,27.073883 15.517000,27.045213 L 15.998775,28.547102 C 16.440063,28.498867 16.875151,28.431066 17.302879,28.342731 L 17.296874,26.765680 C 17.982632,26.606057 18.646307,26.389480 19.283056,26.120988 L 20.205536,27.400490 C 20.607887,27.218396 20.999777,27.017899 21.380431,26.799968 L 20.887614,25.301952 C 21.484844,24.939702 22.049337,24.528633 22.575085,24.073980 L 23.847226,25.005759 C 24.172864,24.709178 24.484555,24.397487 24.780942,24.071849 L 23.849357,22.799902 C 24.304204,22.274154 24.715273,21.709855 25.077523,21.112237 L 26.575538,21.605248 C 26.793470,21.224400 26.994161,20.832316 27.175867,20.430160 L 25.896559,19.507873 C 26.165051,18.871124 26.381627,18.207255 26.541638,17.521497 L 28.118301,17.527308 C 28.206636,17.099581 28.274438,16.664298 28.322479,16.223010 L 26.820784,15.741236 C 26.849648,15.397388 26.864951,15.049472 26.864951,14.698069 C 26.864951,14.346666 26.849260,13.998944 26.820784,13.654708 L 28.322479,13.172934 C 28.274632,12.731840 28.206442,12.296751 28.118495,11.868830 L 26.541444,11.874835 C 26.381627,11.189076 26.165051,10.525208 25.896753,9.8886539 L 27.176061,8.9663652 C 26.994354,8.5640139 26.793470,8.1721237 26.575926,7.7912754 L 25.077717,8.2842867 C 24.715466,7.6868623 24.304398,7.1225635 23.849744,6.5970095 L 24.781330,5.3248686 C 24.502958,5.0189892 24.210252,4.7268638 23.905922,4.4467488 L 5.0669275,23.285938 L 6.0738693,24.292880 L 6.3725811,24.074174 C 6.8983295,24.528827 7.4626276,24.939896 8.0600509,25.302146 L 7.8180983,26.037303 L 8.9261605,27.145365 L 8.9257729,27.145172 z "
+       id="path53361" />
+    <path
+       style="opacity:0.49999997;fill:#ffffff;fill-rule:nonzero;stroke:none;stroke-miterlimit:4.0000000"
+       d="M 28.448976,32.191116 C 28.448976,25.706434 32.682859,20.211647 38.536216,18.317093 L 36.309244,16.089926 C 36.292390,16.096901 36.275344,16.102906 36.258684,16.110073 L 36.077171,15.858241 L 34.665167,14.446237 C 34.201989,14.665137 33.748497,14.900697 33.305853,15.153885 L 33.999942,17.263078 C 33.158628,17.772747 32.364194,18.351768 31.624195,18.991810 L 29.833085,17.680151 C 29.374364,18.097611 28.935788,18.536187 28.518521,18.994716 L 29.829986,20.785630 C 29.189945,21.525825 28.611118,22.320258 28.101255,23.161378 L 25.991868,22.467289 C 25.685214,23.003692 25.402775,23.555593 25.146874,24.122021 L 26.948056,25.420314 C 26.570114,26.316643 26.265204,27.251328 26.040298,28.216815 L 23.820299,28.208291 C 23.696127,28.810557 23.600430,29.423479 23.532823,30.044342 L 25.647246,30.722740 C 25.606953,31.207033 25.585255,31.696750 25.585255,32.191310 C 25.585255,32.686063 25.606953,33.175780 25.647246,33.660073 L 23.532823,34.337889 C 23.600430,34.959140 23.696127,35.571868 23.820493,36.174134 L 26.040298,36.165804 C 26.265204,37.131291 26.570114,38.065976 26.948056,38.962306 L 25.146874,40.260792 C 25.289256,40.575582 25.440743,40.885723 25.599010,41.191215 L 29.403033,37.387579 C 28.787013,35.773334 28.448783,34.021743 28.448783,32.191310 L 28.448976,32.191116 z "
+       id="path53363" />
+    <path
+       id="path4736"
+       d="M 24.285794,41.696345 L 5.8751859,23.285737 L 24.285794,4.875128 L 42.696402,23.285737 L 24.285794,41.696345 L 24.285794,41.696345 z "
+       style="fill:none;fill-rule:nonzero;stroke:url(#linearGradient4752);stroke-width:0.9999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;opacity:0.35714286"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true" />
+  </g>
+</svg>

views/bootstrap/images/folder.svg

@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   x="0.0000000"
+   y="0.0000000"
+   width="48.000000px"
+   height="48.000000px"
+   id="svg1"
+   sodipodi:version="0.32"
+   inkscape:version="0.45"
+   sodipodi:docname="folder.svg"
+   sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/places"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata162">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Folder</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:date>2005-02-01</dc:date>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:identifier>http://jimmac.musichall.cz/</dc:identifier>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>folder</rdf:li>
+            <rdf:li>directory</rdf:li>
+            <rdf:li>storage</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="0.14901961"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="922"
+     inkscape:window-height="655"
+     inkscape:cy="50.536684"
+     inkscape:cx="30.884152"
+     inkscape:zoom="1"
+     inkscape:document-units="px"
+     showgrid="false"
+     inkscape:window-x="515"
+     inkscape:window-y="365"
+     inkscape:current-layer="layer2"
+     inkscape:showpageshadow="false" />
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient4734">
+      <stop
+         style="stop-color:#cccdbc;stop-opacity:1;"
+         offset="0"
+         id="stop4736" />
+      <stop
+         style="stop-color:#b9baa4;stop-opacity:1;"
+         offset="1"
+         id="stop4738" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2339">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2341" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2343" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2339"
+       id="linearGradient2345"
+       x1="25.850664"
+       y1="37.625"
+       x2="24.996323"
+       y2="25.25"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient356">
+      <stop
+         style="stop-color:#fffff3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop357" />
+      <stop
+         style="stop-color:#fffff3;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop358" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient311">
+      <stop
+         style="stop-color:#cfcfc4;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop312" />
+      <stop
+         style="stop-color:#cfcfc4;stop-opacity:1.0000000;"
+         offset="0.32673267"
+         id="stop335" />
+      <stop
+         style="stop-color:#cfcfc4;stop-opacity:0;"
+         offset="1"
+         id="stop313" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient235">
+      <stop
+         style="stop-color:#59594a;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop236" />
+      <stop
+         style="stop-color:#a2a491;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop237" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient235"
+       id="linearGradient253"
+       gradientTransform="scale(1.068312,0.936056)"
+       x1="24.983023"
+       y1="22.828066"
+       x2="24.983023"
+       y2="8.3744106"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient311"
+       id="linearGradient320"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(0.750458,1.332520)"
+       x1="32.827568"
+       y1="7.9206076"
+       x2="60.071049"
+       y2="7.8678756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient356"
+       id="linearGradient355"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(0.806859,1.239374)"
+       x1="23.643002"
+       y1="12.818464"
+       x2="28.443289"
+       y2="25.232374" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4734"
+       id="linearGradient4740"
+       x1="24.588383"
+       y1="1.8991361"
+       x2="24.588383"
+       y2="40.858932"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="pixmap"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="vectors"
+     style="display:inline">
+    <g
+       transform="matrix(0.216083,0.000000,0.000000,0.263095,-0.893233,-10.24236)"
+       id="g1197">
+      <path
+         d="M 32.706693,164.36026 C 22.319193,164.36026 13.956693,172.72276 13.956693,183.11026 C 13.956693,193.49776 22.319193,201.86026 32.706693,201.86026 L 205.20669,201.86026 C 215.59419,201.86026 223.95669,193.49776 223.95669,183.11026 C 223.95669,172.72276 215.59419,164.36026 205.20669,164.36026 L 32.706693,164.36026 z "
+         style="opacity:0.047872309;fill-rule:evenodd;stroke-width:3.0000000pt"
+         id="path1196" />
+      <path
+         d="M 32.706693,165.61026 C 23.011693,165.61026 15.206693,173.41526 15.206693,183.11026 C 15.206693,192.80526 23.011693,200.61026 32.706693,200.61026 L 205.20669,200.61026 C 214.90169,200.61026 222.70669,192.80526 222.70669,183.11026 C 222.70669,173.41526 214.90169,165.61026 205.20669,165.61026 L 32.706693,165.61026 z "
+         style="opacity:0.047872309;fill-rule:evenodd;stroke-width:3.0000000pt"
+         id="path1195" />
+      <path
+         d="M 32.706694,166.86026 C 23.704194,166.86026 16.456694,174.10776 16.456694,183.11026 C 16.456694,192.11276 23.704194,199.36026 32.706694,199.36026 L 205.20669,199.36026 C 214.20919,199.36026 221.45669,192.11276 221.45669,183.11026 C 221.45669,174.10776 214.20919,166.86026 205.20669,166.86026 L 32.706694,166.86026 z "
+         style="opacity:0.047872309;fill-rule:evenodd;stroke-width:3.0000000pt"
+         id="path1194" />
+      <path
+         d="M 32.706694,168.11026 C 24.396694,168.11026 17.706694,174.80026 17.706694,183.11026 C 17.706694,191.42026 24.396694,198.11026 32.706694,198.11026 L 205.20669,198.11026 C 213.51669,198.11026 220.20669,191.42026 220.20669,183.11026 C 220.20669,174.80026 213.51669,168.11026 205.20669,168.11026 L 32.706694,168.11026 z "
+         style="opacity:0.047872309;fill-rule:evenodd;stroke-width:3.0000000pt"
+         id="path1193" />
+      <path
+         d="M 32.707764,169.36026 C 25.090264,169.36026 18.957764,175.49276 18.957764,183.11026 C 18.957764,190.72776 25.090264,196.86026 32.707764,196.86026 L 205.20618,196.86026 C 212.82368,196.86026 218.95618,190.72776 218.95618,183.11026 C 218.95618,175.49276 212.82368,169.36026 205.20618,169.36026 L 32.707764,169.36026 z "
+         style="opacity:0.047872309;fill-rule:evenodd;stroke-width:3.0000000pt"
+         id="path1192" />
+      <path
+         d="M 32.706694,170.61026 C 25.781694,170.61026 20.206694,176.18526 20.206694,183.11026 C 20.206694,190.03526 25.781694,195.61026 32.706694,195.61026 L 205.20669,195.61026 C 212.13169,195.61026 217.70669,190.03526 217.70669,183.11026 C 217.70669,176.18526 212.13169,170.61026 205.20669,170.61026 L 32.706694,170.61026 z "
+         style="opacity:0.047872309;fill-rule:evenodd;stroke-width:3.0000000pt"
+         id="path1191" />
+      <path
+         d="M 32.706694,171.86026 C 26.474194,171.86026 21.456694,176.87776 21.456694,183.11026 C 21.456694,189.34276 26.474194,194.36026 32.706694,194.36026 L 205.20669,194.36026 C 211.43919,194.36026 216.45669,189.34276 216.45669,183.11026 C 216.45669,176.87776 211.43919,171.86026 205.20669,171.86026 L 32.706694,171.86026 z "
+         style="opacity:0.047872309;fill-rule:evenodd;stroke-width:3.0000000pt"
+         id="path1190" />
+      <path
+         d="M 32.706694,173.11026 C 27.166694,173.11026 22.706694,177.57026 22.706694,183.11026 C 22.706694,188.65026 27.166694,193.11026 32.706694,193.11026 L 205.20669,193.11026 C 210.74669,193.11026 215.20669,188.65026 215.20669,183.11026 C 215.20669,177.57026 210.74669,173.11026 205.20669,173.11026 L 32.706694,173.11026 z "
+         style="opacity:0.047872309;fill-rule:evenodd;stroke-width:3.0000000pt"
+         id="path1189" />
+    </g>
+    <path
+       d="M 5.4186638,5.4561100 C 4.9536872,5.4561100 4.6035534,5.6913368 4.6035534,6.1828330 L 4.6035534,39.203794 C 4.6035534,39.930940 5.0906584,40.415354 5.7526104,40.415354 L 43.489564,40.415354 C 44.155366,40.415354 44.419872,39.962588 44.419872,39.328794 L 44.419872,10.425912 C 44.419872,9.8829469 44.019585,9.5893540 43.520814,9.5893540 L 24.411490,9.5893540 C 24.074477,9.5893540 23.714810,9.3909280 23.517009,9.1180670 L 20.914778,5.9180580 C 20.696913,5.6175190 20.272703,5.4561250 19.901500,5.4561250 L 5.4186638,5.4561100 z "
+       style="fill:url(#linearGradient253);fill-opacity:1.0;fill-rule:evenodd;stroke:#555753;stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-opacity:1"
+       id="path895"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <g
+       id="g891"
+       transform="matrix(0.186703,0.000000,0.000000,0.186703,-21.10730,57.62299)" />
+    <path
+       style="fill:url(#linearGradient320);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;opacity:1.0000000;color:#000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible"
+       d="M 5.0625000,7.9062500 L 5.0625000,36.156250 L 6.0312500,31.781250 L 6.2500000,9.1562500 C 6.2500000,8.4058274 6.7614657,8.0312500 7.4869586,8.0312500 L 19.093750,8.0312500 C 20.655346,8.0312500 22.108598,11.218750 24.411417,11.218750 C 30.383036,11.218750 43.749813,11.306338 43.750000,11.218750 L 43.750000,10.187500 L 24.218750,10.062500 C 22.362615,10.050621 21.088324,6.9062500 19.656250,6.9062500 L 6.2838336,6.9062500 C 5.4685048,6.9062500 5.0625000,7.2604161 5.0625000,7.9062500 z "
+       id="path315"
+       sodipodi:nodetypes="ccccczscczzcc" />
+    <path
+       style="color:#000000;fill:url(#linearGradient4740);fill-opacity:1.0;fill-rule:evenodd;stroke:#555753;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 7.6864537,16.296282 L 15.619799,16.296282 C 16.361533,16.296282 16.987769,15.915471 17.306966,15.414278 C 17.443709,15.199569 18.574948,13.28855 18.66464,13.158052 C 18.963427,12.723328 19.437557,12.399136 20.006622,12.399136 L 43.048855,12.399136 C 43.851692,12.399136 44.498018,13.042925 44.498018,13.84261 L 44.498018,38.915459 C 44.498018,39.715143 43.851692,40.358932 43.048855,40.358932 L 6.1279084,40.358932 C 5.3250725,40.358932 4.6787461,39.715143 4.6787461,38.915459 L 4.6787461,19.481904 C 4.6787461,17.507539 5.8190623,16.296282 7.6864537,16.296282 z "
+       id="rect337"
+       sodipodi:nodetypes="czzszcccccccc"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true" />
+    <path
+       style="fill:url(#linearGradient355);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;opacity:1.0000000;color:#000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible"
+       d="M 20.500000,13.750000 C 19.853581,13.750000 19.490960,14.031698 19.125000,14.500000 C 18.759040,14.968302 18.343502,15.671815 18.062500,16.218750 C 17.781498,16.765685 17.493409,17.272919 17.218750,17.625000 C 16.944091,17.977081 16.729167,18.125000 16.500000,18.125000 C 15.250000,18.125000 7.3428301,18.125000 6.8428301,18.125000 C 6.3844968,18.125000 6.0073599,18.355519 5.6865801,18.656250 C 5.3658003,18.956981 5.0928301,19.362500 5.0928301,19.875000 C 5.0928302,20.499998 5.0928301,39.250000 5.0928301,39.250000 L 6.0928301,39.250000 C 6.0928301,39.250000 6.0928302,20.500002 6.0928301,19.875000 C 6.0928301,19.762500 6.1948599,19.543019 6.3740801,19.375000 C 6.5533003,19.206981 6.8011635,19.125000 6.8428301,19.125000 C 7.3428301,19.125000 15.250000,19.125000 16.500000,19.125000 C 17.145833,19.125000 17.634731,18.718232 18.000000,18.250000 C 18.365269,17.781768 18.656559,17.203065 18.937500,16.656250 C 19.218441,16.109435 19.568667,15.477011 19.843750,15.125000 C 20.118833,14.772989 20.269189,14.750000 20.500000,14.750000 C 21.716667,14.750000 43.750000,14.875000 43.750000,14.875000 L 43.750000,13.875000 C 43.750000,13.875000 21.783333,13.750000 20.500000,13.750000 z "
+       id="path349"
+       sodipodi:nodetypes="ccccccccccccccccccccc" />
+    <rect
+       style="color:#000000;fill:#fffffd;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible"
+       id="rect459"
+       width="1.2500000"
+       height="1.2500000"
+       x="5.5290294"
+       y="7.3598347"
+       rx="1.4434735"
+       ry="1.2500000" />
+    <rect
+       style="opacity:0.28571429;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2345);stroke-width:1.00000024;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect2337"
+       width="37.95816"
+       height="23.625"
+       x="5.5381637"
+       y="15.75"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true"
+       rx="0.43750021"
+       ry="0.4375" />
+  </g>
+</svg>