Merge branch 'seeddms-4.3.x'

CHANGELOG

@@ -1,3 +1,15 @@
+--------------------------------------------------------------------------------
+                     Changes in version 4.3.20
+--------------------------------------------------------------------------------
+- fix setting expire date when editing a document (Closes: #225)
+- MyDocumets: list only documents to approve which have passed review
+- show preview image in Review/Approval summary
+- timeout for external commands for creating fulltext index can be set
+- add translations for korean, croation, ukrainian
+- file can be submitted with approval/review
+- alternative full text search engine without dependency on Zend
+- much faster user manager
+
 --------------------------------------------------------------------------------
                      Changes in version 4.3.19
 --------------------------------------------------------------------------------

Makefile

@@ -1,4 +1,4 @@
-VERSION=4.3.19
+VERSION=4.3.20
 SRC=CHANGELOG inc conf utils index.php languages views op out README.md README.Notification README.Ubuntu drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi
 # webapp
 
@@ -14,6 +14,7 @@ pear:
 	(cd SeedDMS_Core/; pear package)
 	(cd SeedDMS_Lucene/; pear package)
 	(cd SeedDMS_Preview/; pear package)
+	(cd SeedDMS_SQLiteFTS/; pear package)
 
 webdav:
 	mkdir -p tmp/seeddms-webdav-$(VERSION)

SeedDMS_Core/Core/inc.ClassDMS.php

@@ -186,6 +186,17 @@ class SeedDMS_Core_DMS {
 		return false;
 	} /* }}} */
 
+	/**
+	 * Checks if date conforms to a given format
+	 *
+	 * @param string $date date to be checked
+	 * @return boolean true if date is in propper format, otherwise false
+	 */
+	static function checkDate($date, $format='Y-m-d H:i:s') { /* {{{ */
+		$d = DateTime::createFromFormat($format, $date);
+		return $d && $d->format($format) == $date;
+	} /* }}} */
+
 	/**
 	 * Filter objects out which are not accessible in a given mode by a user.
 	 *
@@ -262,7 +273,7 @@ class SeedDMS_Core_DMS {
 		$this->convertFileTypes = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '4.3.19';
+			$this->version = '4.3.20';
 	} /* }}} */
 
 	/**

SeedDMS_Core/Core/inc.ClassDocument.php

@@ -303,6 +303,30 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		return $this->_date;
 	} /* }}} */
 
+	/**
+	 * Set creation date of the document
+	 *
+	 * @param integer $date timestamp of creation date. If false then set it
+	 * to the current timestamp
+	 * @return boolean true on success
+	 */
+	function setDate($date) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		if(!$date)
+			$date = time();
+		else {
+			if(!is_numeric($date))
+				return false;
+		}
+
+		$queryStr = "UPDATE tblDocuments SET date = " . (int) $date . " WHERE id = ". $this->_id;
+		if (!$db->getResult($queryStr))
+			return false;
+		$this->_date = $date;
+		return true;
+	} /* }}} */
+
 	/**
 	 * Return the parent folder of the document
 	 *
@@ -782,35 +806,42 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		/* The owner of the document has unrestricted access */
 		if ($user->getID() == $this->_ownerID) return M_ALL;
 
-		/* The guest users do not have more than read access */
-		if ($user->isGuest()) {
-			$mode = $this->getDefaultAccess();
-			if ($mode >= M_READ) return M_READ;
-			else return M_NONE;
-		}
-
 		/* Check ACLs */
 		$accessList = $this->getAccessList();
 		if (!$accessList) return false;
 
 		foreach ($accessList["users"] as $userAccess) {
 			if ($userAccess->getUserID() == $user->getID()) {
-				return $userAccess->getMode();
+				$mode = $userAccess->getMode();
+				if ($user->isGuest()) {
+					if ($mode >= M_READ) $mode = M_READ;
+				}
+				return $mode;
 			}
 		}
+
 		/* Get the highest right defined by a group */
-		$result = 0;
+		if($accessList['groups']) {
-		foreach ($accessList["groups"] as $groupAccess) {
+			$mode = 0;
-			if ($user->isMemberOfGroup($groupAccess->getGroup())) {
+			foreach ($accessList["groups"] as $groupAccess) {
-				if ($groupAccess->getMode() > $result)
+				if ($user->isMemberOfGroup($groupAccess->getGroup())) {
-					$result = $groupAccess->getMode();
+					if ($groupAccess->getMode() > $mode)
-//					return $groupAccess->getMode();
+						$mode = $groupAccess->getMode();
+				}
+			}
+			if($mode) {
+				if ($user->isGuest()) {
+					if ($mode >= M_READ) $mode = M_READ;
+				}
+				return $mode;
 			}
 		}
-		if($result)
+
-			return $result;
+		$mode = $this->getDefaultAccess();
-		$result = $this->getDefaultAccess();
+		if ($user->isGuest()) {
-		return $result;
+			if ($mode >= M_READ) $mode = M_READ;
+		}
+		return $mode;
 	} /* }}} */
 
 	/**
@@ -2413,7 +2444,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * @param object $updateUser user initiating the status change
 	 * @return boolean true on success, otherwise false
 	 */
-	function setStatus($status, $comment, $updateUser) { /* {{{ */
+	function setStatus($status, $comment, $updateUser, $date='') { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
 		if (!is_numeric($status)) return false;
@@ -2436,8 +2467,12 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if ($this->_status["status"]==$status) {
 			return false;
 		}
+		if($date)
+			$ddate = $db->qstr($date);
+		else
+			$ddate = 'CURRENT_TIMESTAMP';
 		$queryStr = "INSERT INTO `tblDocumentStatusLog` (`statusID`, `status`, `comment`, `date`, `userID`) ".
-			"VALUES ('". $this->_status["statusID"] ."', '". (int) $status ."', ".$db->qstr($comment).", CURRENT_TIMESTAMP, '". $updateUser->getID() ."')";
+			"VALUES ('". $this->_status["statusID"] ."', '". (int) $status ."', ".$db->qstr($comment).", ".$ddate.", '". $updateUser->getID() ."')";
 		$res = $db->getResult($queryStr);
 		if (is_bool($res) && !$res)
 			return false;
@@ -2447,6 +2482,55 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return true;
 	} /* }}} */
 
+	/**
+	 * Rewrites the complete status log
+	 * 
+	 * Attention: this function is highly dangerous.
+	 * It removes an existing status log and rewrites it.
+	 * This method was added for importing an xml dump.
+	 *
+	 * @param array $statuslog new status log with the newest log entry first.
+	 * @return boolean true on success, otherwise false
+	 */
+	function rewriteStatusLog($statuslog) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		$queryStr= "SELECT `tblDocumentStatus`.* FROM `tblDocumentStatus` WHERE `tblDocumentStatus`.`documentID` = '". $this->_document->getID() ."' AND `tblDocumentStatus`.`version` = '". $this->_version ."' ";
+		$res = $db->getResultArray($queryStr);
+		if (is_bool($res) && !$res)
+			return false;
+
+		$statusID = $res[0]['statusID'];
+
+		$db->startTransaction();
+
+		/* First, remove the old entries */
+		$queryStr = "DELETE from `tblDocumentStatusLog` where `statusID`=".$statusID;
+		if (!$db->getResult($queryStr)) {
+			$db->rollbackTransaction();
+			return false;
+		}
+
+		/* Second, insert the new entries */
+		$statuslog = array_reverse($statuslog);
+		foreach($statuslog as $log) {
+			if(!SeedDMS_Core_DMS::checkDate($log['date'], 'Y-m-d H:i:s')) {
+				$db->rollbackTransaction();
+				return false;
+			}
+			$queryStr = "INSERT INTO `tblDocumentStatusLog` (`statusID`, `status`, `comment`, `date`, `userID`) ".
+				"VALUES ('".$statusID ."', '".(int) $log['status']."', ".$db->qstr($log['comment']) .", ".$db->qstr($log['date']).", ".$log['user']->getID().")";
+			if (!$db->getResult($queryStr)) {
+				$db->rollbackTransaction();
+				return false;
+			}
+		}
+
+		$db->commitTransaction();
+		return true;
+	} /* }}} */
+
+
 	/**
 	 * Returns the access mode similar to a document
 	 * There is no real access mode for document content, so this is more
@@ -2538,6 +2622,73 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return $this->_reviewStatus;
 	} /* }}} */
 
+	/**
+	 * Rewrites the complete review log
+	 * 
+	 * Attention: this function is highly dangerous.
+	 * It removes an existing review log and rewrites it.
+	 * This method was added for importing an xml dump.
+	 *
+	 * @param array $reviewlog new status log with the newest log entry first.
+	 * @return boolean true on success, otherwise false
+	 */
+	function rewriteReviewLog($reviewers) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		$queryStr= "SELECT `tblDocumentReviewers`.* FROM `tblDocumentReviewers` WHERE `tblDocumentReviewers`.`documentID` = '". $this->_document->getID() ."' AND `tblDocumentReviewers`.`version` = '". $this->_version ."' ";
+		$res = $db->getResultArray($queryStr);
+		if (is_bool($res) && !$res)
+			return false;
+
+		$db->startTransaction();
+
+		if($res) {
+			foreach($res as $review) {
+				$reviewID = $review['reviewID'];
+
+				/* First, remove the old entries */
+				$queryStr = "DELETE from `tblDocumentReviewLog` where `reviewID`=".$reviewID;
+				if (!$db->getResult($queryStr)) {
+					$db->rollbackTransaction();
+					return false;
+				}
+
+				$queryStr = "DELETE from `tblDocumentReviewers` where `reviewID`=".$reviewID;
+				if (!$db->getResult($queryStr)) {
+					$db->rollbackTransaction();
+					return false;
+				}
+			}
+		}
+
+		/* 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().")";
+			if (!$db->getResult($queryStr)) {
+				$db->rollbackTransaction();
+				return false;
+			}
+			$reviewID = $db->getInsertID();
+			$reviewlog = array_reverse($review['logs']);
+			foreach($reviewlog as $log) {
+				if(!SeedDMS_Core_DMS::checkDate($log['date'], 'Y-m-d H:i:s')) {
+					$db->rollbackTransaction();
+					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().")";
+				if (!$db->getResult($queryStr)) {
+					$db->rollbackTransaction();
+					return false;
+				}
+			}
+		}
+
+		$db->commitTransaction();
+		return true;
+	} /* }}} */
+
 	/**
 	 * Get the current approval status of the document content
 	 * The approval status is a list of approvals and its current status
@@ -2595,6 +2746,73 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return $this->_approvalStatus;
 	} /* }}} */
 
+	/**
+	 * Rewrites the complete approval log
+	 * 
+	 * Attention: this function is highly dangerous.
+	 * It removes an existing review log and rewrites it.
+	 * This method was added for importing an xml dump.
+	 *
+	 * @param array $reviewlog new status log with the newest log entry first.
+	 * @return boolean true on success, otherwise false
+	 */
+	function rewriteApprovalLog($reviewers) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		$queryStr= "SELECT `tblDocumentApprovers`.* FROM `tblDocumentApprovers` WHERE `tblDocumentApprovers`.`documentID` = '". $this->_document->getID() ."' AND `tblDocumentApprovers`.`version` = '". $this->_version ."' ";
+		$res = $db->getResultArray($queryStr);
+		if (is_bool($res) && !$res)
+			return false;
+
+		$db->startTransaction();
+
+		if($res) {
+			foreach($res as $review) {
+				$reviewID = $review['reviewID'];
+
+				/* First, remove the old entries */
+				$queryStr = "DELETE from `tblDocumentApproveLog` where `approveID`=".$reviewID;
+				if (!$db->getResult($queryStr)) {
+					$db->rollbackTransaction();
+					return false;
+				}
+
+				$queryStr = "DELETE from `tblDocumentApprovers` where `approveID`=".$reviewID;
+				if (!$db->getResult($queryStr)) {
+					$db->rollbackTransaction();
+					return false;
+				}
+			}
+		}
+
+		/* 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().")";
+			if (!$db->getResult($queryStr)) {
+				$db->rollbackTransaction();
+				return false;
+			}
+			$reviewID = $db->getInsertID();
+			$reviewlog = array_reverse($review['logs']);
+			foreach($reviewlog as $log) {
+				if(!SeedDMS_Core_DMS::checkDate($log['date'], 'Y-m-d H:i:s')) {
+					$db->rollbackTransaction();
+					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().")";
+				if (!$db->getResult($queryStr)) {
+					$db->rollbackTransaction();
+					return false;
+				}
+			}
+		}
+
+		$db->commitTransaction();
+		return true;
+	} /* }}} */
+
 	function addIndReviewer($user, $requestUser, $listadmin=false) { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 

SeedDMS_Core/Core/inc.ClassFolder.php

@@ -133,6 +133,30 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		return $this->_date;
 	} /* }}} */
 
+	/**
+	 * Set creation date of the document
+	 *
+	 * @param integer $date timestamp of creation date. If false then set it
+	 * to the current timestamp
+	 * @return boolean true on success
+	 */
+	function setDate($date) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		if(!$date)
+			$date = time();
+		else {
+			if(!is_numeric($date))
+				return false;
+		}
+
+		$queryStr = "UPDATE tblFolders SET date = " . (int) $date . " WHERE id = ". $this->_id;
+		if (!$db->getResult($queryStr))
+			return false;
+		$this->_date = $date;
+		return true;
+	} /* }}} */
+
 	/**
 	 * Returns the parent
 	 *
@@ -1005,41 +1029,48 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		if(!$user)
 			return M_NONE;
 
-		/* Admins have full access */
+		/* Administrators have unrestricted access */
 		if ($user->isAdmin()) return M_ALL;
 
-		/* User has full access if he/she is the owner of the document */
+		/* The owner of the document has unrestricted access */
 		if ($user->getID() == $this->_ownerID) return M_ALL;
 
-		/* Guest has read access by default, if guest login is allowed at all */
+		/* Check ACLs */
-		if ($user->isGuest()) {
-			$mode = $this->getDefaultAccess();
-			if ($mode >= M_READ) return M_READ;
-			else return M_NONE;
-		}
-
-		/* check ACLs */
 		$accessList = $this->getAccessList();
 		if (!$accessList) return false;
 
 		foreach ($accessList["users"] as $userAccess) {
 			if ($userAccess->getUserID() == $user->getID()) {
-				return $userAccess->getMode();
+				$mode = $userAccess->getMode();
+				if ($user->isGuest()) {
+					if ($mode >= M_READ) $mode = M_READ;
+				}
+				return $mode;
 			}
 		}
+
 		/* Get the highest right defined by a group */
-		$result = 0;
+		if($accessList['groups']) {
-		foreach ($accessList["groups"] as $groupAccess) {
+			$mode = 0;
-			if ($user->isMemberOfGroup($groupAccess->getGroup())) {
+			foreach ($accessList["groups"] as $groupAccess) {
-				if ($groupAccess->getMode() > $result)
+				if ($user->isMemberOfGroup($groupAccess->getGroup())) {
-					$result = $groupAccess->getMode();
+					if ($groupAccess->getMode() > $mode)
-//					return $groupAccess->getMode();
+						$mode = $groupAccess->getMode();
+				}
+			}
+			if($mode) {
+				if ($user->isGuest()) {
+					if ($mode >= M_READ) $mode = M_READ;
+				}
+				return $mode;
 			}
 		}
-		if($result)
+
-			return $result;
+		$mode = $this->getDefaultAccess();
-		$result = $this->getDefaultAccess();
+		if ($user->isGuest()) {
-		return $result;
+			if ($mode >= M_READ) $mode = M_READ;
+		}
+		return $mode;
 	} /* }}} */
 
 	/**

SeedDMS_Core/package.xml

@@ -15,8 +15,8 @@
  <date>2015-06-26</date>
  <time>16:45:59</time>
  <version>
-  <release>4.3.19</release>
+  <release>4.3.20</release>
-  <api>4.3.19</api>
+  <api>4.3.20</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,9 +24,15 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- add optional paramter $noclean to clearAccessList(), setDefaultAccess(), setInheritAccess()
+- add method SeedDMS_Core_DMS::checkDate()
-- clearAccessList() will clean up the notifier list
+- add method SeedDMS_Core_Document::setDate()
-- new method cleanNotifyList()
+- add method SeedDMS_Core_Folder::setDate()
+- date can be passed to SeedDMS_Core_DocumentContent::setStatus()
+- add method SeedDMS_Core_DocumentContent::rewriteStatusLog()
+- add method SeedDMS_Core_DocumentContent::rewriteReviewLog()
+- add method SeedDMS_Core_DocumentContent::rewriteApprovalLog()
+- access rights for guest are also taken into account if set in an acl. Previously guest could gain read rights even if the access was probibited
+by a group or user right
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -850,5 +856,23 @@ clean workflow log when a document version was deleted
 - add method SeedDMS_Core_DMS::getDuplicateDocumentContent()
    </notes>
   </release>
+  <release>
+   <date>2015-06-26</date>
+   <time>16:45:59</time>
+   <version>
+    <release>4.3.19</release>
+    <api>4.3.19</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- add optional paramter $noclean to clearAccessList(), setDefaultAccess(), setInheritAccess()
+- clearAccessList() will clean up the notifier list
+- new method cleanNotifyList()
+   </notes>
+  </release>
  </changelog>
 </package>

SeedDMS_Lucene/Lucene/IndexedDocument.php

@@ -23,11 +23,45 @@
  * @version    Release: @package_version@
  */
 class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
+
+	static function execWithTimeout($cmd, $timeout=2) { /* {{{ */
+		$descriptorspec = array(
+			0 => array("pipe", "r"),
+			1 => array("pipe", "w"),
+			2 => array("pipe", "w")
+		);
+		$pipes = array();
+	 
+	  $timeout += time();
+		$process = proc_open($cmd, $descriptorspec, $pipes);
+		if (!is_resource($process)) {
+			throw new Exception("proc_open failed on: " . $cmd);
+		}
+			 
+		$output = '';
+		do {
+			$timeleft = $timeout - time();
+			$read = array($pipes[1]);
+			stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, NULL);
+					 
+			if (!empty($read)) {
+				$output .= fread($pipes[1], 8192);
+													}
+		} while (!feof($pipes[1]) && $timeleft > 0);
+ 
+		if ($timeleft <= 0) {
+			proc_terminate($process);
+			throw new Exception("command timeout on: " . $cmd);
+		} else {
+			return $output;
+		}
+	} /* }}} */
+
 	/**
 	 * Constructor. Creates our indexable document and adds all
 	 * necessary fields to it using the passed in document
 	 */
-	public function __construct($dms, $document, $convcmd=null, $nocontent=false) {
+	public function __construct($dms, $document, $convcmd=null, $nocontent=false, $timeout=5) {
 		$_convcmd = array(
 			'application/pdf' => 'pdftotext -enc UTF-8 -nopgbrk %s - |sed -e \'s/ [a-zA-Z0-9.]\{1\} / /g\' -e \'s/[0-9.]//g\'',
 			'application/msword' => 'catdoc %s',
@@ -90,6 +124,8 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 			$mimetype = $version->getMimeType();
 			if(isset($_convcmd[$mimetype])) {
 				$cmd = sprintf($_convcmd[$mimetype], $path);
+				$content = self::execWithTimeout($cmd);
+				/*
 				$fp = popen($cmd, 'r');
 				if($fp) {
 					$content = '';
@@ -98,6 +134,7 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 					}
 					pclose($fp);
 				}
+				 */
 				if($content) {
 					$this->addField(Zend_Search_Lucene_Field::UnStored('content', $content, 'utf-8'));
 				}

SeedDMS_Lucene/Lucene/Search.php

@@ -42,6 +42,17 @@ class SeedDMS_Lucene_Search {
 			$this->version = '3.0.0';
 	} /* }}} */
 
+	/**
+	 * Get document from index
+	 *
+	 * @param object $index lucene index
+	 * @return object instance of SeedDMS_Lucene_Document of false
+	 */
+	function getDocument($id) { /* {{{ */
+		$hits = $this->index->find('document_id:'.$id);
+		return $hits ? $hits[0] : false;
+	} /* }}} */
+
 	/**
 	 * Search in index
 	 *

SeedDMS_Lucene/package.xml

@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2014-07-30</date>
+ <date>2015-08-05</date>
- <time>09:00:34</time>
+ <time>21:13:13</time>
  <version>
-  <release>1.1.5</release>
+  <release>1.1.6</release>
-  <api>1.1.5</api>
+  <api>1.1.6</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,8 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-field for original filename is treated as utf-8
+run external commands with a timeout
-declare SeeDMS_Lucene_Indexer::open() static
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -170,5 +169,22 @@ do not check if deleting document from index fails, update it in any case
 class SeedDMS_Lucene_Search::search returns false if query is invalid instead of an empty result record
    </notes>
   </release>
+  <release>
+   <date>2014-07-30</date>
+   <time>09:00:34</time>
+   <version>
+    <release>1.1.5</release>
+    <api>1.1.5</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+field for original filename is treated as utf-8
+declare SeeDMS_Lucene_Indexer::open() static
+   </notes>
+  </release>
  </changelog>
 </package>

SeedDMS_Preview/Preview/Previewer.php

@@ -50,6 +50,39 @@ class SeedDMS_Preview_Previewer {
 		$this->width = intval($width);
 	}
 
+	static function execWithTimeout($cmd, $timeout=2) { /* {{{ */
+		$descriptorspec = array(
+			0 => array("pipe", "r"),
+			1 => array("pipe", "w"),
+			2 => array("pipe", "w")
+		);
+		$pipes = array();
+	 
+	  $timeout += time();
+		$process = proc_open($cmd, $descriptorspec, $pipes);
+		if (!is_resource($process)) {
+			throw new Exception("proc_open failed on: " . $cmd);
+		}
+			 
+		$output = '';
+		do {
+			$timeleft = $timeout - time();
+			$read = array($pipes[1]);
+			stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, NULL);
+					 
+			if (!empty($read)) {
+				$output .= fread($pipes[1], 8192);
+													}
+		} while (!feof($pipes[1]) && $timeleft > 0);
+ 
+		if ($timeleft <= 0) {
+			proc_terminate($process);
+			throw new Exception("command timeout on: " . $cmd);
+		} else {
+			return $output;
+		}
+	} /* }}} */
+
 	/**
 	 * Retrieve the physical filename of the preview image on disk
 	 *
@@ -113,7 +146,11 @@ class SeedDMS_Preview_Previewer {
 					break;
 			}
 			if($cmd) {
-				exec($cmd);
+				//exec($cmd);
+				try {
+					self::execWithTimeout($cmd);
+				} catch(Exception $e) {
+				}
 			}
 			return true;
 		}

SeedDMS_Preview/package.xml

@@ -11,10 +11,10 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2015-02-13</date>
+ <date>2015-08-08</date>
- <time>20:29:39</time>
+ <time>09:36:57</time>
  <version>
-  <release>1.1.3</release>
+  <release>1.1.4</release>
   <api>1.1.0</api>
  </version>
  <stability>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-preview images will also be recreated if the object this image belongs is of newer date than the image itself. This happens if versions are being deleted and than a new version is uploaded. Because the new version will get the version number of the old version, it will also take over the old preview image.Comparing the creation date of the image with the object detects this case.
+command for creating the preview will be called with a given timeout
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -115,5 +115,21 @@ add converters for .tar.gz, .ps, .txt
 create fixed width image with proportional height
    </notes>
   </release>
+  <release>
+   <date>2015-02-13</date>
+   <time>20:29:39</time>
+   <version>
+    <release>1.1.3</release>
+    <api>1.1.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+preview images will also be recreated if the object this image belongs is of newer date than the image itself. This happens if versions are being deleted and than a new version is uploaded. Because the new version will get the version number of the old version, it will also take over the old preview image.Comparing the creation date of the image with the object detects this case.
+   </notes>
+  </release>
  </changelog>
 </package>

SeedDMS_SQLiteFTS/SQLiteFTS.php

@@ -0,0 +1,44 @@
+<?php
+//    SeedDMS. Document Management System
+//    Copyright (C) 2011-2015 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+/**
+ * @uses SeedDMS_SQLiteFTS_Indexer
+ */
+require_once('SQLiteFTS/Indexer.php');
+
+/**
+ * @uses SeedDMS_SQLiteFTS_Search
+ */
+require_once('SQLiteFTS/Search.php');
+
+/**
+ * @uses SeedDMS_SQLiteFTS_Term
+ */
+require_once('SQLiteFTS/Term.php');
+
+/**
+ * @uses SeedDMS_SQLiteFTS_QueryHit
+ */
+require_once('SQLiteFTS/QueryHit.php');
+
+/**
+ * @uses SeedDMS_SQLiteFTS_IndexedDocument
+ */
+require_once('SQLiteFTS/IndexedDocument.php');
+
+?>

SeedDMS_SQLiteFTS/SQLiteFTS/Document.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ * Implementation of a document
+ *
+ * @category   DMS
+ * @package    SeedDMS_SQLiteFTS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010, Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+
+/**
+ * Class for managing a document.
+ *
+ * @category   DMS
+ * @package    SeedDMS_SQLiteFTS
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2011, Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_SQLiteFTS_Document {
+
+	/**
+	 * @var integer $id id of document
+	 * @access protected
+	 */
+	public $id;
+
+	/**
+	 * @var array $fields fields
+	 * @access protected
+	 */
+	protected $fields;
+
+	public function addField($key, $value) { /* {{{ */
+		if($key == 'document_id') {
+			$this->id = $this->fields[$key] = (int) $value;
+		} else {
+			if(isset($this->fields[$key]))
+				$this->fields[$key] .= ' '.$value;
+			else
+				$this->fields[$key] = $value;
+		}
+	} /* }}} */
+
+	public function getFieldValue($key) { /* {{{ */
+		if(isset($this->fields[$key]))
+			return $this->fields[$key];
+		else
+			return false;
+	} /* }}} */
+
+}
+?>

SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php

@@ -0,0 +1,140 @@
+<?php
+/**
+ * Implementation of an indexed document
+ *
+ * @category   DMS
+ * @package    SeedDMS_SQLiteFTS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010, Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * @uses SeedDMS_SQLiteFTS_Document
+ */
+require_once('Document.php');
+
+
+/**
+ * Class for managing an indexed document.
+ *
+ * @category   DMS
+ * @package    SeedDMS_SQLiteFTS
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2011, Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
+
+	static function execWithTimeout($cmd, $timeout=2) { /* {{{ */
+		$descriptorspec = array(
+			0 => array("pipe", "r"),
+			1 => array("pipe", "w"),
+			2 => array("pipe", "w")
+		);
+		$pipes = array();
+	 
+	  $timeout += time();
+		$process = proc_open($cmd, $descriptorspec, $pipes);
+		if (!is_resource($process)) {
+			throw new Exception("proc_open failed on: " . $cmd);
+		}
+			 
+		$output = '';
+		do {
+			$timeleft = $timeout - time();
+			$read = array($pipes[1]);
+			stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, NULL);
+					 
+			if (!empty($read)) {
+				$output .= fread($pipes[1], 8192);
+													}
+		} while (!feof($pipes[1]) && $timeleft > 0);
+ 
+		if ($timeleft <= 0) {
+			proc_terminate($process);
+			throw new Exception("command timeout on: " . $cmd);
+		} else {
+			return $output;
+		}
+	} /* }}} */
+
+	/**
+	 * Constructor. Creates our indexable document and adds all
+	 * necessary fields to it using the passed in document
+	 */
+	public function __construct($dms, $document, $convcmd=null, $nocontent=false, $timeout=5) {
+		$_convcmd = array(
+			'application/pdf' => 'pdftotext -enc UTF-8 -nopgbrk %s - |sed -e \'s/ [a-zA-Z0-9.]\{1\} / /g\' -e \'s/[0-9.]//g\'',
+			'application/msword' => 'catdoc %s',
+			'application/vnd.ms-excel' => 'ssconvert -T Gnumeric_stf:stf_csv -S %s fd://1',
+			'audio/mp3' => "id3 -l -R %s | egrep '(Title|Artist|Album)' | sed 's/^[^:]*: //g'",
+			'audio/mpeg' => "id3 -l -R %s | egrep '(Title|Artist|Album)' | sed 's/^[^:]*: //g'",
+			'text/plain' => 'cat %s',
+		);
+		if($convcmd) {
+			$_convcmd = $convcmd;
+		}
+
+		$version = $document->getLatestContent();
+		$this->addField('document_id', $document->getID());
+		if($version) {
+			$this->addField('mimetype', $version->getMimeType());
+			$this->addField('origfilename', $version->getOriginalFileName());
+			if(!$nocontent)
+				$this->addField('created', $version->getDate(), 'unindexed');
+			if($attributes = $version->getAttributes()) {
+				foreach($attributes as $attribute) {
+					$attrdef = $attribute->getAttributeDefinition();
+					if($attrdef->getValueSet() != '')
+						$this->addField('attr_'.str_replace(' ', '_', $attrdef->getName()), $attribute->getValue());
+					else
+						$this->addField('attr_'.str_replace(' ', '_', $attrdef->getName()), $attribute->getValue());
+				}
+			}
+		}
+		$this->addField('title', $document->getName());
+		if($categories = $document->getCategories()) {
+			$names = array();
+			foreach($categories as $cat) {
+				$names[] = $cat->getName();
+			}
+			$this->addField('category', implode(' ', $names));
+		}
+		if($attributes = $document->getAttributes()) {
+			foreach($attributes as $attribute) {
+				$attrdef = $attribute->getAttributeDefinition();
+				if($attrdef->getValueSet() != '')
+					$this->addField('attr_'.str_replace(' ', '_', $attrdef->getName()), $attribute->getValue());
+				else
+					$this->addField('attr_'.str_replace(' ', '_', $attrdef->getName()), $attribute->getValue());
+			}
+		}
+
+		$owner = $document->getOwner();
+		$this->addField('owner', $owner->getLogin());
+		if($keywords = $document->getKeywords()) {
+			$this->addField('keywords', $keywords);
+		}
+		if($comment = $document->getComment()) {
+			$this->addField('comment', $comment);
+		}
+		if($version && !$nocontent) {
+			$path = $dms->contentDir . $version->getPath();
+			$content = '';
+			$fp = null;
+			$mimetype = $version->getMimeType();
+			if(isset($_convcmd[$mimetype])) {
+				$cmd = sprintf($_convcmd[$mimetype], $path);
+				$content = self::execWithTimeout($cmd);
+				if($content) {
+					$this->addField('content', $content, 'unstored');
+				}
+			}
+		}
+	}
+}
+?>

SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php

@@ -0,0 +1,255 @@
+<?php
+/**
+ * Implementation of SQLiteFTS index
+ *
+ * @category   DMS
+ * @package    SeedDMS_Lucene
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010, Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+
+/**
+ * Class for managing a SQLiteFTS index.
+ *
+ * @category   DMS
+ * @package    SeedDMS_Lucene
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2011, Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_SQLiteFTS_Indexer {
+	/**
+	 * @var object $index sqlite index
+	 * @access protected
+	 */
+	protected $_conn;
+
+	/**
+	 * Constructor
+	 *
+	 */
+	function __construct($indexerDir) { /* {{{ */
+		$this->_conn = new PDO('sqlite:'.$indexerDir.'/index.db');
+	} /* }}} */
+
+	/**
+	 * Open an existing index
+	 *
+	 * @param string $indexerDir directory on disk containing the index
+	 */
+	static function open($indexerDir) { /* {{{ */
+		if(file_exists($indexerDir.'/index.db')) {
+			return new SeedDMS_SQLiteFTS_Indexer($indexerDir);
+		} else
+			return self::create($indexerDir);
+	} /* }}} */
+
+	/**
+	 * Create a new index
+	 *
+	 * @param string $indexerDir directory on disk containing the index
+	 */
+	static function create($indexerDir) { /* {{{ */
+		unlink($indexerDir.'/index.db');
+		$index =  new SeedDMS_SQLiteFTS_Indexer($indexerDir);
+		/* Make sure the sequence of fields is identical to the field list
+		 * in SeedDMS_SQLiteFTS_Term
+		 */
+		$sql = 'CREATE VIRTUAL TABLE docs USING fts4(title, comment, keywords, category, mimetype, origfilename, owner, content, created, notindexed=created, matchinfo=fts3)';
+		$res = $index->_conn->exec($sql);
+		if($res === false) {
+			return null;
+		}
+		$sql = 'CREATE VIRTUAL TABLE docs_terms USING fts4aux(docs);';
+		$res = $index->_conn->exec($sql);
+		if($res === false) {
+			return null;
+		}
+		return($index);
+	} /* }}} */
+
+	/**
+	 * Do some initialization
+	 *
+	 */
+	static function init($stopWordsFile='') { /* {{{ */
+	} /* }}} */
+
+	/**
+	 * Add document to index
+	 *
+	 * @param object $doc indexed document of class 
+	 * SeedDMS_SQLiteFTS_IndexedDocument
+	 * @return boolean false in case of an error, otherwise true
+	 */
+	function addDocument($doc) { /* {{{ */
+		if(!$this->_conn)
+			return false;
+
+		$sql = "INSERT INTO docs (docid, title, comment, keywords, category, owner, content, mimetype, origfilename, created) VALUES(".$doc->getFieldValue('document_id').", ".$this->_conn->quote($doc->getFieldValue('title')).", ".$this->_conn->quote($doc->getFieldValue('comment')).", ".$this->_conn->quote($doc->getFieldValue('keywords')).", ".$this->_conn->quote($doc->getFieldValue('category')).", ".$this->_conn->quote($doc->getFieldValue('owner')).", ".$this->_conn->quote($doc->getFieldValue('content')).", ".$this->_conn->quote($doc->getFieldValue('mimetype')).", ".$this->_conn->quote($doc->getFieldValue('origfilename')).", ".time().")";
+		$res = $this->_conn->exec($sql);
+		if($res === false) {
+			var_dump($this->_conn->errorInfo());
+		}
+		return $res;
+	} /* }}} */
+
+	/**
+	 * Remove document from index
+	 *
+	 * @param object $doc indexed document of class 
+	 * SeedDMS_SQLiteFTS_IndexedDocument
+	 * @return boolean false in case of an error, otherwise true
+	 */
+	public function delete($id) { /* {{{ */
+		if(!$this->_conn)
+			return false;
+
+		$sql = "DELETE FROM docs WHERE docid=".(int) $id;
+		$res = $this->_conn->exec($sql);
+		return $res;
+	} /* }}} */
+
+	/**
+	 * Check if document was deleted
+	 *
+	 * Just for compatibility with lucene.
+	 *
+	 * @return boolean always false
+	 */
+	public function isDeleted($id) { /* {{{ */
+		return false;
+	} /* }}} */
+
+	/**
+	 * Find documents in index
+	 *
+	 * @param object $doc indexed document of class 
+	 * SeedDMS_SQLiteFTS_IndexedDocument
+	 * @return boolean false in case of an error, otherwise true
+	 */
+	public function find($query) { /* {{{ */
+		if(!$this->_conn)
+			return false;
+
+		$sql = "SELECT docid FROM docs WHERE docs MATCH ".$this->_conn->quote($query);
+		$res = $this->_conn->query($sql);
+		$hits = array();
+		if($res) {
+			foreach($res as $rec) {
+				$hit = new SeedDMS_SQLiteFTS_QueryHit($this);
+				$hit->id = $rec['docid'];
+				$hits[] = $hit;
+			}
+		}
+		return $hits;
+	} /* }}} */
+
+	/**
+	 * Get a single document from index
+	 *
+	 * @param integer $id id of document
+	 * @return boolean false in case of an error, otherwise true
+	 */
+	public function findById($id) { /* {{{ */
+		if(!$this->_conn)
+			return false;
+
+		$sql = "SELECT docid FROM docs WHERE docid=".(int) $id;
+		$res = $this->_conn->query($sql);
+		$hits = array();
+		if($res) {
+			while($rec = $res->fetch(PDO::FETCH_ASSOC)) {
+				$hit = new SeedDMS_SQLiteFTS_QueryHit($this);
+				$hit->id = $rec['docid'];
+				$hits[] = $hit;
+			}
+		}
+		return $hits;
+	} /* }}} */
+
+	/**
+	 * Get a single document from index
+	 *
+	 * @param integer $id id of document
+	 * @return boolean false in case of an error, otherwise true
+	 */
+	public function getDocument($id) { /* {{{ */
+		if(!$this->_conn)
+			return false;
+
+		$sql = "SELECT title, comment, owner, keywords, category, mimetype, origfilename, created FROM docs WHERE docid=".(int) $id;
+		$res = $this->_conn->query($sql);
+		$doc = false;
+		if($res) {
+			$rec = $res->fetch(PDO::FETCH_ASSOC);
+			$doc = new SeedDMS_SQLiteFTS_Document();
+			$doc->addField('title', $rec['title']);
+			$doc->addField('comment', $rec['comment']);
+			$doc->addField('keywords', $rec['keywords']);
+			$doc->addField('category', $rec['category']);
+			$doc->addField('mimetype', $rec['mimetype']);
+			$doc->addField('origfilename', $rec['origfilename']);
+			$doc->addField('owner', $rec['owner']);
+			$doc->addField('created', $rec['created']);
+		}
+		return $doc;
+	} /* }}} */
+
+	/**
+	 * Return list of terms in index
+	 *
+	 * This function does nothing!
+	 */
+	public function terms() { /* {{{ */
+		if(!$this->_conn)
+			return false;
+
+		$sql = "SELECT term, col, occurrences FROM docs_terms WHERE col!='*' ORDER BY col";
+		$res = $this->_conn->query($sql);
+		$terms = array();
+		if($res) {
+			while($rec = $res->fetch(PDO::FETCH_ASSOC)) {
+				$term = new SeedDMS_SQLiteFTS_Term($rec['term'], $rec['col'], $rec['occurrences']);
+				$terms[] = $term;
+			}
+		}
+		return $terms;
+	} /* }}} */
+
+	/**
+	 * Return list of documents in index
+	 *
+	 */
+	public function count() { /* {{{ */
+		$sql = "SELECT count(*) c FROM docs";
+		$res = $this->_conn->query($sql);
+		if($res) {
+			$rec = $res->fetch(PDO::FETCH_ASSOC);
+			return $rec['c'];
+		}
+		return 0;
+	} /* }}} */
+
+	/**
+	 * Commit changes
+	 *
+	 * This function does nothing!
+	 */
+	function commit() { /* {{{ */
+	} /* }}} */
+
+	/**
+	 * Optimize index
+	 *
+	 * This function does nothing!
+	 */
+	function optimize() { /* {{{ */
+	} /* }}} */
+}
+?>

SeedDMS_SQLiteFTS/SQLiteFTS/QueryHit.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * Implementation of a query hit
+ *
+ * @category   DMS
+ * @package    SeedDMS_SQLiteFTS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010, Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+
+/**
+ * Class for managing a query hit.
+ *
+ * @category   DMS
+ * @package    SeedDMS_SQLiteFTS
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2011, Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_SQLiteFTS_QueryHit {
+
+	/**
+	 * @var SeedDMS_SQliteFTS_Indexer $index
+	 * @access protected
+	 */
+	protected $_index;
+
+	/**
+	 * @var SeedDMS_SQliteFTS_Document $document
+	 * @access protected
+	 */
+	protected $_document;
+
+	/**
+	 * @var integer $id id of document
+	 * @access public
+	 */
+	public $id;
+
+	/**
+	 *
+	 */
+	public function __construct(SeedDMS_SQLiteFTS_Indexer $index) { /* {{{ */
+		$this->_index = $index;
+	} /* }}} */
+
+	/**
+	 * Return the document associated with this hit
+	 *
+	 * @return SeedDMS_SQLiteFTS_Document
+	 */
+	public function getDocument() { /* {{{ */
+		if (!$this->_document instanceof SeedDMS_SQLiteFTS_Document) {
+			$this->_document = $this->_index->getDocument($this->id);
+		}
+
+		return $this->_document;
+	} /* }}} */
+}
+?>

SeedDMS_SQLiteFTS/SQLiteFTS/Search.php

@@ -0,0 +1,96 @@
+<?php
+/**
+ * Implementation of search in SQlite FTS index
+ *
+ * @category   DMS
+ * @package    SeedDMS_Lucene
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010, Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+
+/**
+ * Class for searching in a SQlite FTS index.
+ *
+ * @category   DMS
+ * @package    SeedDMS_Lucene
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2011, Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_SQliteFTS_Search {
+	/**
+	 * @var object $index SQlite FTS index
+	 * @access protected
+	 */
+	protected $index;
+
+	/**
+	 * Create a new instance of the search
+	 *
+	 * @param object $index SQlite FTS index
+	 * @return object instance of SeedDMS_SQliteFTS_Search
+	 */
+	function __construct($index) { /* {{{ */
+		$this->index = $index;
+		$this->version = '@package_version@';
+		if($this->version[0] == '@')
+			$this->version = '3.0.0';
+	} /* }}} */
+
+	/**
+	 * Get hit from index
+	 *
+	 * @param object $index lucene index
+	 * @return object instance of SeedDMS_Lucene_Document of false
+	 */
+	function getDocument($id) { /* {{{ */
+		$hits = $this->index->findById((int) $id);
+		return $hits ? $hits[0] : false;
+	} /* }}} */
+
+	/**
+	 * Search in index
+	 *
+	 * @param object $index SQlite FTS index
+	 * @return object instance of SeedDMS_Lucene_Search
+	 */
+	function search($term, $owner, $status='', $categories=array(), $fields=array()) { /* {{{ */
+		$querystr = '';
+		if($fields) {
+		} else {
+			if($term)
+				$querystr .= trim($term);
+		}
+		if($owner) {
+			if($querystr)
+				$querystr .= ' ';
+				//$querystr .= ' AND ';
+			$querystr .= 'owner:'.$owner;
+			//$querystr .= $owner;
+		}
+		if($categories) {
+			if($querystr)
+				$querystr .= ' ';
+				//$querystr .= ' AND ';
+			$querystr .= 'category:';
+			$querystr .= implode(' OR category:', $categories);
+			$querystr .= '';
+		}
+		try {
+			$hits = $this->index->find($querystr);
+			$recs = array();
+			foreach($hits as $hit) {
+				$recs[] = array('id'=>$hit->id, 'document_id'=>$hit->id);
+			}
+			return $recs;
+		} catch (Exception $e) {
+			return false;
+		}
+	} /* }}} */
+}
+?>

SeedDMS_SQLiteFTS/SQLiteFTS/Term.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * Implementation of a term
+ *
+ * @category   DMS
+ * @package    SeedDMS_SQLiteFTS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010, Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+
+/**
+ * Class for managing a term.
+ *
+ * @category   DMS
+ * @package    SeedDMS_SQLiteFTS
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2011, Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_SQLiteFTS_Term {
+
+	/**
+	 * @var string $text
+	 * @access public
+	 */
+	public $text;
+
+	/**
+	 * @var string $field
+	 * @access public
+	 */
+	public $field;
+
+	/**
+	 * @var integer $occurrence 
+	 * @access public
+	 */
+	public $_occurrence;
+
+	/**
+	 *
+	 */
+	public function __construct($term, $col, $occurrence) { /* {{{ */
+		$this->text = $term;
+		$fields = array(
+			0 => 'title',
+			1 => 'comment',
+			2 => 'keywords',
+			3 => 'category',
+			4 => 'mimetype',
+			5 => 'origfilename',
+			6 => 'owner',
+			7 => 'content',
+			8 => 'created'
+		);
+		$this->field = $fields[$col];
+		$this->_occurrence = $occurrence;
+	} /* }}} */
+
+}
+?>

SeedDMS_SQLiteFTS/package.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package packagerversion="1.8.1" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
+ <name>SeedDMS_SQLiteFTS</name>
+ <channel>pear.php.net</channel>
+ <summary>Fulltext search based on sqlite for SeedDMS</summary>
+ <description>SeedDMS is a web based document management system (DMS). This is
+ the fulltext search engine for it, based on SQLite FTS.</description>
+ <lead>
+  <name>Uwe Steinmann</name>
+  <user>steinm</user>
+  <email>uwe@steinmann.cx</email>
+  <active>yes</active>
+ </lead>
+ <date>2015-08-10</date>
+ <time>21:13:13</time>
+ <version>
+  <release>1.0.0</release>
+  <api>1.0.0</api>
+ </version>
+ <stability>
+  <release>stable</release>
+  <api>stable</api>
+ </stability>
+ <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+ <notes>
+initial release
+ </notes>
+ <contents>
+  <dir baseinstalldir="SeedDMS" name="/">
+   <dir name="SQLiteFTS">
+    <file name="Indexer.php" role="php">
+     <tasks:replace from="@package_version@" to="version" type="package-info" />
+    </file>
+    <file name="IndexedDocument.php" role="php">
+     <tasks:replace from="@package_version@" to="version" type="package-info" />
+    </file>
+    <file name="Document.php" role="php">
+     <tasks:replace from="@package_version@" to="version" type="package-info" />
+    </file>
+    <file name="QueryHit.php" role="php">
+     <tasks:replace from="@package_version@" to="version" type="package-info" />
+    </file>
+    <file name="Search.php" role="php">
+     <tasks:replace from="@package_version@" to="version" type="package-info" />
+    </file>
+    <file name="Term.php" role="php">
+     <tasks:replace from="@package_version@" to="version" type="package-info" />
+    </file>
+   </dir> <!-- /SQLiteFTS -->
+   <dir name="tests">
+   </dir> <!-- /tests -->
+   <file name="SQLiteFTS.php" role="php">
+    <tasks:replace from="@package_version@" to="version" type="package-info" />
+   </file>
+  </dir> <!-- / -->
+ </contents>
+ <dependencies>
+  <required>
+   <php>
+    <min>4.3.0</min>
+   </php>
+   <pearinstaller>
+    <min>1.5.4</min>
+   </pearinstaller>
+  </required>
+ </dependencies>
+ <phprelease />
+ <changelog>
+ </changelog>
+</package>

inc/inc.ClassSettings.php

@@ -87,12 +87,14 @@ class Settings { /* {{{ */
 	var $_stopWordsFile = null;
 	// enable/disable lucene fulltext search
 	var $_enableFullSearch = true;
+	// fulltext search engine
+	var $_fullSearchEngine = 'lucene';
 	// contentOffsetDirTo
 	var $_contentOffsetDir = "1048576";
 	// Maximum number of sub-directories per parent directory
 	var $_maxDirID = 32700;
 	// default language (name of a subfolder in folder "languages")
-	var $_language = "English";
+	var $_language = "en_GB";
 	// users are notified about document-changes that took place within the last $_updateNotifyTime seconds
 	var $_updateNotifyTime = 86400;
 	// files with one of the following endings can be viewed online
@@ -179,6 +181,8 @@ class Settings { /* {{{ */
 	var $_adminIP = "";
 	// Max Execution Time
 	var $_maxExecutionTime = null;
+	// command timeout
+	var $_cmdTimeout = 5;
 	// Preview image width in lists
 	var $_previewWidthList = 40;
 	// Preview image width on document details page
@@ -187,6 +191,8 @@ class Settings { /* {{{ */
 	var $_showMissingTranslations = false;
 	// Extra Path to additional software, will be added to include path
 	var $_extraPath = null;
+	// do not check version of database
+	var $_doNotCheckDBVersion = false;
 	// DB-Driver used by adodb (see adodb-readme)
 	var $_dbDriver = "mysql";
 	// DB-Server
@@ -343,6 +349,7 @@ class Settings { /* {{{ */
 		$this->_enableLanguageSelector = Settings::boolVal($tab["enableLanguageSelector"]);
 		$this->_enableThemeSelector = Settings::boolVal($tab["enableThemeSelector"]);
 		$this->_enableFullSearch = Settings::boolVal($tab["enableFullSearch"]);
+		$this->_fullSearchEngine = strval($tab["fullSearchEngine"]);
 		$this->_stopWordsFile = strval($tab["stopWordsFile"]);
 		$this->_sortUsersInList = strval($tab["sortUsersInList"]);
 		$this->_sortFoldersDefault = strval($tab["sortFoldersDefault"]);
@@ -436,6 +443,7 @@ class Settings { /* {{{ */
 		$this->_dbDatabase = strval($tab["dbDatabase"]);
 		$this->_dbUser = strval($tab["dbUser"]);
 		$this->_dbPass = strval($tab["dbPass"]);
+		$this->_doNotCheckDBVersion = Settings::boolVal($tab["doNotCheckVersion"]);
 
 		// XML Path: /configuration/system/smtp
 		$node = $xml->xpath('/configuration/system/smtp');
@@ -505,6 +513,7 @@ class Settings { /* {{{ */
 		$this->_contentOffsetDir = strval($tab["contentOffsetDir"]);
 		$this->_maxDirID = intval($tab["maxDirID"]);
 		$this->_updateNotifyTime = intval($tab["updateNotifyTime"]);
+		$this->_cmdTimeout = intval($tab["cmdTimeout"]);
 		if (isset($tab["maxExecutionTime"]))
 			$this->_maxExecutionTime = intval($tab["maxExecutionTime"]);
 		else
@@ -613,6 +622,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableLanguageSelector", $this->_enableLanguageSelector);
     $this->setXMLAttributValue($node, "enableThemeSelector", $this->_enableThemeSelector);
     $this->setXMLAttributValue($node, "enableFullSearch", $this->_enableFullSearch);
+    $this->setXMLAttributValue($node, "fullSearchEngine", $this->_fullSearchEngine);
     $this->setXMLAttributValue($node, "expandFolderTree", $this->_expandFolderTree);
     $this->setXMLAttributValue($node, "stopWordsFile", $this->_stopWordsFile);
     $this->setXMLAttributValue($node, "sortUsersInList", $this->_sortUsersInList);
@@ -712,6 +722,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "dbDatabase", $this->_dbDatabase);
     $this->setXMLAttributValue($node, "dbUser", $this->_dbUser);
     $this->setXMLAttributValue($node, "dbPass", $this->_dbPass);
+    $this->setXMLAttributValue($node, "doNotCheckVersion", $this->_doNotCheckVersion);
 
     // XML Path: /configuration/system/smtp
     $node = $this->getXMLNode($xml, '/configuration/system', 'smtp');
@@ -761,6 +772,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "maxDirID", $this->_maxDirID);
     $this->setXMLAttributValue($node, "updateNotifyTime", $this->_updateNotifyTime);
     $this->setXMLAttributValue($node, "maxExecutionTime", $this->_maxExecutionTime);
+    $this->setXMLAttributValue($node, "cmdTimeout", $this->_cmdTimeout);
 
     // XML Path: /configuration/advanced/converters
     foreach($this->_converters['fulltext'] as $mimeType => $cmd)

inc/inc.ClassViewCommon.php

@@ -25,17 +25,26 @@
  * @version    Release: @package_version@
  */
 class SeedDMS_View_Common {
-	var $theme;
+	protected $theme;
 
-	var $params;
+	protected $params;
-
-//	var $settings;
 
 	function __construct($params, $theme='blue') {
 		$this->theme = $theme;
 		$this->params = $params;
 	}
 
+	function __invoke($get=array()) {
+		if(isset($get['action']) && $get['action']) {
+			if(method_exists($this, $get['action'])) {
+				$this->{$get['action']}();
+			} else {
+				echo "Missing action '".$get['action']."'";
+			}
+		} else
+			$this->show();
+	}
+
 	function setParams($params) {
 		$this->params = $params;
 	}
@@ -44,19 +53,18 @@ class SeedDMS_View_Common {
 		$this->params[$name] = $value;
 	}
 
+	function getParam($name) {
+		if(isset($this->params[$name]))
+			return $this->params[$name];
+		return null;
+	}
+
 	function unsetParam($name) {
 		if(isset($this->params[$name]))
 			unset($this->params[$name]);
 	}
 
-/*
-	function setConfiguration($conf) {
-		$this->settings = $conf;
-	}
-*/
-
 	function show() {
-
 	}
 }
 ?>

inc/inc.DBInit.php

@@ -28,7 +28,7 @@ $db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostn
 
 $dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
 
-if(!$dms->checkVersion()) {
+if(!$settings->_doNotCheckDBVersion && !$dms->checkVersion()) {
 	echo "Database update needed.";
 	exit;
 }

inc/inc.Settings.php

@@ -88,4 +88,28 @@ if (get_magic_quotes_gpc()) {
 	}
 	unset($process);
 }
+
+if($settings->_enableFullSearch) {
+	if($settings->_fullSearchEngine == 'sqlitefts') {
+		$indexconf = array(
+			'Indexer' => 'SeedDMS_SQLiteFTS_Indexer',
+			'Search' => 'SeedDMS_SQLiteFTS_Search',
+			'IndexedDocument' => 'SeedDMS_SQLiteFTS_IndexedDocument'
+		);
+
+		require_once('SeedDMS/SQLiteFTS.php');
+	} else {
+		$indexconf = array(
+			'Indexer' => 'SeedDMS_Lucene_Indexer',
+			'Search' => 'SeedDMS_Lucene_Search',
+			'IndexedDocument' => 'SeedDMS_Lucene_IndexedDocument'
+		);
+
+		if(!empty($settings->_luceneClassDir))
+			require_once($settings->_luceneClassDir.'/Lucene.php');
+		else
+			require_once('SeedDMS/Lucene.php');
+	}
+}
+
 ?>

inc/inc.Utils.php

@@ -296,11 +296,12 @@ function dskspace($dir) { /* {{{ */
 	if(is_file($dir)) {
 		$space = filesize($dir);
 	} elseif (is_dir($dir)) {
-		$dh = opendir($dir);
+		if($dh = opendir($dir)) {
-		while (($file = readdir($dh)) !== false)
+			while (($file = readdir($dh)) !== false)
-			if ($file != "." and $file != "..")
+				if ($file != "." and $file != "..")
-				$space += dskspace($dir."/".$file);
+					$space += dskspace($dir."/".$file);
-		closedir($dh);
+			closedir($dh);
+		}
 	}
 	return $space;
 } /* }}} */

inc/inc.Version.php

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

install/index.php

@@ -7,9 +7,7 @@ $settings->_rootDir = $rootDir.'/';
 
 $theme = "blue";
 include("../inc/inc.Language.php");
-include "../languages/en_GB/lang.inc";
 include("../inc/inc.ClassUI.php");
-$LANG['en_GB'] = $text;
 
 UI::htmlStartPage("INSTALL");
 UI::contentHeading("SeedDMS Installation...");

install/install.php

@@ -119,7 +119,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "4.3.19");
+define("SEEDDMS_VERSION", "4.3.20");
 
 require_once('../inc/inc.ClassSettings.php');
 
@@ -206,7 +206,7 @@ if (isset($_GET['disableinstall'])) { /* {{{ */
 		if(unlink($configDir."/ENABLE_INSTALL_TOOL")) {
 			echo getMLText("settings_install_disabled");
 			echo "<br/><br/>";
-			echo '<a href="' . $httpRoot . '/out/out.Settings.php">' . getMLText("settings_more_settings") .'</a>';
+			echo '<a href="../out/out.Settings.php">' . getMLText("settings_more_settings") .'</a>';
 		} else {
 			echo getMLText("settings_cannot_disable");
 			echo "<br/><br/>";
@@ -368,7 +368,7 @@ if ($action=="setSettings") {
 						echo '<a href="install.php?disableinstall=1">' . getMLText("settings_disable_install") . '</a>';
 						echo "<br/><br/>";
 
-						echo '<a href="' . $httpRoot . '/out/out.Settings.php">' . getMLText("settings_more_settings") .'</a>';
+						echo '<a href="../out/out.Settings.php">' . getMLText("settings_more_settings") .'</a>';
 						$showform = false;
 					}
 				} else {

languages/ar_EG/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1247)
+//    Translators: Admin (1253)
 
 $text = array(
 'accept' => 'وافق',
@@ -51,7 +51,7 @@ URL: [url]',
 'add_approval' => 'ادخال موافقة',
 'add_document' => 'إضافة مستند',
 'add_document_link' => 'إضافة رابط',
-'add_document_notify' => '',
+'add_document_notify' => 'ﺖﺨﺼﻴﺻ ﺎﺸﻋﺍﺭ',
 'add_doc_reviewer_approver_warning' => 'ملاحظة : يتم اعتبار المستندات نهائية اذا لم يتم تعيين مراجع او موافق للمستند',
 'add_doc_workflow_warning' => 'ملاحظة : يتم اعتبار المستندات نهائية اذا لم يتم اختيار مسار عمل للمستند',
 'add_event' => 'إضافة حدث',
@@ -269,6 +269,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'مستندات في انتظار المراجعة',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'مستندات ملكك تستلزم انتباهك',
 'document_already_checkedout' => '',
 'document_already_locked' => 'هذا المستند محمي ضد التعديل',
@@ -465,6 +466,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => 'بالساعة',
 'hours' => 'ساعات',
+'hr_HR' => '',
 'human_readable' => 'ارشيف مقروء',
 'hu_HU' => 'مجرية',
 'id' => 'معرف',
@@ -527,6 +529,7 @@ URL: [url]',
 'keep_doc_status' => 'ابقاء حالة المستند',
 'keywords' => 'كلمات البحث',
 'keyword_exists' => 'كلمات البحث بالفعل موجودة',
+'ko_KR' => '',
 'language' => 'اللغة',
 'lastaccess' => '',
 'last_update' => 'اخر تحديث',
@@ -652,7 +655,9 @@ URL: [url]',
 'no_group_members' => 'هذه المجموعة لايوجد بها اعضاء',
 'no_linked_files' => 'لايوجد ملفات مرتبطة',
 'no_previous_versions' => 'لايوجد اصدارات سابقة',
+'no_receipt_needed' => '',
 'no_review_needed' => 'لايوجد مراجعات في الانتظار',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'لايمكنك تعديل المستند. قم بمخاطبة المستخدم الذي قام بحمايته من التعديل',
 'no_user_image' => 'لا يوجد صورة متاحة',
@@ -844,12 +849,12 @@ URL: [url]',
 'select_category' => 'اضغط لاختيار قسم',
 'select_groups' => 'اضغط لاختيار مجموعة',
 'select_grp_approvers' => 'اضغط لاختيار مجموعة الموافقون',
-'select_grp_notification' => '',
+'select_grp_notification' => 'ﺎﻨﻗﺭ ﻼﺨﺘﻳﺍﺭ ﺍﻼﺸﻋﺍﺭ ﻞﻤﺠﻣﻮﻋﺓ',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'اضغط لاختيار مجموعة المراجعون',
 'select_grp_revisors' => '',
 'select_ind_approvers' => 'اضغط لاختيار موافق فردي',
-'select_ind_notification' => '',
+'select_ind_notification' => 'ﺎﻨﻗﺭ ﻼﺨﺘﻳﺍﺭ ﺍﻼﺸﻋﺍﺭ ﻞﺸﺨﺻ',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'اضغط لاختيار مراجع فردي',
 'select_ind_revisors' => '',
@@ -870,6 +875,10 @@ URL: [url]',
 'settings_Advanced' => 'متقدم',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => '',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
+'settings_backupDir' => '',
+'settings_backupDir_desc' => '',
 'settings_cacheDir' => '',
 'settings_cacheDir_desc' => '',
 'settings_Calendar' => 'اعدادات التقويم',
@@ -878,6 +887,8 @@ URL: [url]',
 'settings_cannot_disable' => '',
 'settings_checkOutDir' => '',
 'settings_checkOutDir_desc' => '',
+'settings_cmdTimeout' => '',
+'settings_cmdTimeout_desc' => '',
 'settings_contentDir' => 'مجلد المحتوى',
 'settings_contentDir_desc' => '',
 'settings_contentOffsetDir' => '',
@@ -937,6 +948,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Show selector for user interface language after being logged in.',
 'settings_enableLargeFileUpload' => 'Enable large file upload',
 'settings_enableLargeFileUpload_desc' => '',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',
@@ -978,6 +991,10 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => '',
 'settings_footNote' => '',
 'settings_footNote_desc' => '',
+'settings_fullSearchEngine' => '',
+'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
+'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => '',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => '',
@@ -1194,6 +1211,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => '',
 'testmail_subject' => '',
 'theme' => 'شكل',
@@ -1225,7 +1243,7 @@ URL: [url]',
 'tuesday' => 'الثلاثاء',
 'tuesday_abbr' => 'ث',
 'type_to_search' => 'اكتب لتبحث',
-'uk_UA' => '',
+'uk_UA' => 'ﺍﻮﻛﺭﺎﻨﻳ',
 'under_folder' => 'في المجلد',
 'unknown_attrdef' => '',
 'unknown_command' => 'لم يتم التعرف على الأمر.',

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 (778)
+//    Translators: Admin (780)
 
 $text = array(
 'accept' => 'Приеми',
@@ -254,6 +254,7 @@ $text = array(
 'documents_to_receipt' => '',
 'documents_to_review' => 'Документы, чакащи Вашата рецензия',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Ваши документи, изискващи внимание',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Документът е вече блокиран',
@@ -396,6 +397,7 @@ $text = array(
 'home_folder' => '',
 'hourly' => 'Ежечасно',
 'hours' => 'часа',
+'hr_HR' => '',
 'human_readable' => 'Човекопонятен архив',
 'hu_HU' => '',
 'id' => 'ID',
@@ -458,6 +460,7 @@ $text = array(
 'keep_doc_status' => 'Запази статуса на документа',
 'keywords' => 'Ключови думи',
 'keyword_exists' => 'Ключовата дума съществува',
+'ko_KR' => '',
 'language' => 'Език',
 'lastaccess' => '',
 'last_update' => 'Последно обновление',
@@ -559,7 +562,9 @@ $text = array(
 'no_group_members' => 'Групата няма членове',
 'no_linked_files' => 'Няма свързани файлове',
 'no_previous_versions' => 'Няма други версии',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Рецензия не е нужна',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Вие не можете да обновите документа. Свържете се с блокирщия го потребител.',
 'no_user_image' => 'Изображение не е намерено',
@@ -735,6 +740,10 @@ $text = array(
 'settings_Advanced' => 'Допълнително',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Настройки на автентификацията',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
+'settings_backupDir' => '',
+'settings_backupDir_desc' => '',
 'settings_cacheDir' => 'Кеш папка',
 'settings_cacheDir_desc' => 'къде се съхраняват превю картинките (най-добре да се избере папка която не е достъпна през web-server-а)',
 'settings_Calendar' => 'Настройки календар',
@@ -743,6 +752,8 @@ $text = array(
 'settings_cannot_disable' => 'Невозможно е да се изтрие ENABLE_INSTALL_TOOL',
 'settings_checkOutDir' => '',
 'settings_checkOutDir_desc' => '',
+'settings_cmdTimeout' => '',
+'settings_cmdTimeout_desc' => '',
 'settings_contentDir' => 'Папка със данните',
 'settings_contentDir_desc' => 'Къде да съхранява качените файлове (най-добре изберете папка, недостъпна за уеб-сървъра)',
 'settings_contentOffsetDir' => 'Content Offset Directory',
@@ -802,6 +813,8 @@ $text = array(
 'settings_enableLanguageSelector_desc' => 'Покажи селектор за език на интерфейса след влизане. Това не влияе на избора на език на първа страница.',
 'settings_enableLargeFileUpload' => 'Включи джава-зараждане на файлове',
 'settings_enableLargeFileUpload_desc' => 'Ако е включено, качване на файлове е дустъпно и чрез джава-аплет, именован jumploader, без лимит за размер на файла. Това също ще позволи да се качват няколко файла наведнъж.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Разреши уведомление до рецензиращи/утвърждаващи',
 'settings_enableNotificationAppRev_desc' => 'Избери за изпращане на уведомление до рецензиращи/утвърждаващи когато се добавя нова версия на документа',
 'settings_enableNotificationWorkflow' => '',
@@ -843,6 +856,10 @@ $text = array(
 'settings_firstDayOfWeek_desc' => 'Първи ден на седмицата',
 'settings_footNote' => 'Футер',
 'settings_footNote_desc' => 'Съобщение, показвано отдолу на всяка страница',
+'settings_fullSearchEngine' => '',
+'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
+'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'Идентификатор за гостенин',
 'settings_guestID_desc' => 'Идентификатор за гост (може да не се променя)',
 'settings_httpRoot' => 'Корен Http',
@@ -1059,6 +1076,7 @@ $text = array(
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => '',
 'testmail_subject' => '',
 'theme' => 'Тема',

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 (655)
+//    Translators: Admin (657)
 
 $text = array(
 'accept' => 'Acceptar',
@@ -259,6 +259,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents en espera de revisió d\'usuaris',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documents de la seva propietat que requereixen atenció',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Aquest document ja està bloquejat',
@@ -401,6 +402,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => 'Hourly',
 'hours' => '',
+'hr_HR' => '',
 'human_readable' => 'Arxiu llegible per humans',
 'hu_HU' => '',
 'id' => 'ID',
@@ -463,6 +465,7 @@ URL: [url]',
 'keep_doc_status' => '',
 'keywords' => 'Mots clau',
 'keyword_exists' => 'El mot clau ja existeix',
+'ko_KR' => '',
 'language' => 'Llenguatge',
 'lastaccess' => '',
 'last_update' => 'Última modificació',
@@ -564,7 +567,9 @@ URL: [url]',
 'no_group_members' => 'Aquest grup no té membres',
 'no_linked_files' => 'No hi ha fitxers enllaçats',
 'no_previous_versions' => 'No s\'han trobat altres versions',
+'no_receipt_needed' => '',
 'no_review_needed' => 'No hi ha revisions pendents.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Aquest document no es pot actualitzar. Si us plau, contacteu amb l\'usuari que l\'ha bloquejat.',
 'no_user_image' => 'No es troba la imatge',
@@ -740,6 +745,10 @@ URL: [url]',
 'settings_Advanced' => '',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => '',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
+'settings_backupDir' => '',
+'settings_backupDir_desc' => '',
 'settings_cacheDir' => '',
 'settings_cacheDir_desc' => '',
 'settings_Calendar' => '',
@@ -748,6 +757,8 @@ URL: [url]',
 'settings_cannot_disable' => '',
 'settings_checkOutDir' => '',
 'settings_checkOutDir_desc' => '',
+'settings_cmdTimeout' => '',
+'settings_cmdTimeout_desc' => '',
 'settings_contentDir' => '',
 'settings_contentDir_desc' => '',
 'settings_contentOffsetDir' => '',
@@ -807,6 +818,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => '',
 'settings_enableLargeFileUpload' => '',
 'settings_enableLargeFileUpload_desc' => '',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',
@@ -848,6 +861,10 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => '',
 'settings_footNote' => '',
 'settings_footNote_desc' => '',
+'settings_fullSearchEngine' => '',
+'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
+'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'Guest ID',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => 'Http Root',
@@ -1064,6 +1081,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => '',
 'testmail_subject' => '',
 'theme' => 'Tema gràfic',

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 (683), kreml (455)
+//    Translators: Admin (688), kreml (455)
 
 $text = array(
 'accept' => 'Přijmout',
@@ -276,6 +276,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čekající na kontrolu uživatele',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dokumenty, které uživatel vlastní a vyžadují pozornost',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Tento dokument je už zamčený',
@@ -472,6 +473,7 @@ URL: [url]',
 'home_folder' => 'Domácí složka',
 'hourly' => 'Hodinově',
 'hours' => 'hodiny',
+'hr_HR' => 'Chorvatština',
 'human_readable' => 'Bežně čitelný archív',
 'hu_HU' => 'Maďarština',
 'id' => 'ID',
@@ -534,6 +536,7 @@ URL: [url]',
 'keep_doc_status' => 'Zachovat stav dokumentu',
 'keywords' => 'Klíčová slova',
 'keyword_exists' => 'Klíčové slovo už existuje',
+'ko_KR' => 'Korejština',
 'language' => 'Jazyk',
 'lastaccess' => 'Poslední přístup',
 'last_update' => 'Naposledy aktualizoval',
@@ -659,7 +662,9 @@ URL: [url]',
 'no_group_members' => 'Tato skupina nemá žádné členy',
 'no_linked_files' => 'Žádné propojené soubory',
 'no_previous_versions' => 'Nebyly nalezeny žádné jiné verze',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Nic nečeká k revizi.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Proto nemůžete aktualizovat tento dokument. Prosím, kontaktujte uživatele, který ho zamknul.',
 'no_user_image' => 'nebyl nalezen žádný obrázek',
@@ -879,6 +884,10 @@ URL: [url]',
 'settings_Advanced' => 'Advanced',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Authentication settings',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
+'settings_backupDir' => '',
+'settings_backupDir_desc' => '',
 'settings_cacheDir' => 'Adresář mezipaměti',
 'settings_cacheDir_desc' => 'Kde jsou uloženy náhledy obrázků (nejlepší zvolit adresář, který není přístupný přes webový server)',
 'settings_Calendar' => 'Nastavení kalendáře',
@@ -887,6 +896,8 @@ URL: [url]',
 'settings_cannot_disable' => 'Soubor ENABLE_INSTALL_TOOL nejde vymazat',
 'settings_checkOutDir' => '',
 'settings_checkOutDir_desc' => '',
+'settings_cmdTimeout' => '',
+'settings_cmdTimeout_desc' => '',
 'settings_contentDir' => 'Obsah adresáře',
 'settings_contentDir_desc' => 'Místo, kde jsou nahrané soubory uloženy (nejlepší zvolit adresář, který není přístupný přes váš web-server)',
 'settings_contentOffsetDir' => '',
@@ -946,6 +957,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Zobrazit výběr jazyka uživatelského rozhraní po přihlášení.',
 'settings_enableLargeFileUpload' => 'Enable large file upload',
 'settings_enableLargeFileUpload_desc' => 'If set, file upload is also available through a java applet called jumploader without a file size limit set by the browser. It also allows to upload several files in one step.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Povolit oznámení posuzovateli/schvalovateli',
 'settings_enableNotificationAppRev_desc' => 'Označit pro oznamování posuzovateli/schvalovateli, pokud je přidána nová verze dokumentu.',
 'settings_enableNotificationWorkflow' => '',
@@ -987,6 +1000,10 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => 'First day of the week',
 'settings_footNote' => 'Poznámka pod čarou',
 'settings_footNote_desc' => 'Message to display at the bottom of every page',
+'settings_fullSearchEngine' => '',
+'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
+'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => '',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => 'Http Root',
@@ -1203,6 +1220,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => 'Tento mail slouží pouze pro test konfigurace SeedDMS',
 'testmail_subject' => 'Testovací mail',
 'theme' => 'Vzhled',
@@ -1234,7 +1252,7 @@ URL: [url]',
 'tuesday' => 'Úterý',
 'tuesday_abbr' => 'Út',
 'type_to_search' => 'Zadejte hledaný výraz',
-'uk_UA' => '',
+'uk_UA' => 'Ukrajnština',
 'under_folder' => 'Ve složce',
 'unknown_attrdef' => 'Neznámá definice atributu',
 'unknown_command' => 'Příkaz nebyl rozpoznán.',

languages/de_DE/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2087), dgrutsch (18)
+//    Translators: Admin (2106), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -191,7 +191,7 @@ URL: [url]',
 'category_in_use' => 'Diese Kategorie wird zur Zeit von Dokumenten verwendet.',
 'category_noname' => 'Kein Kategoriename eingetragen.',
 'ca_ES' => 'Katalanisch',
-'change_assignments' => 'Zuweisungen ändern',
+'change_assignments' => 'Setze Prüfer/Freigeber',
 'change_password' => 'Passwort ändern',
 'change_password_message' => 'Ihr Passwort wurde geändert.',
 'change_recipients' => 'Empfängerliste ändern',
@@ -281,6 +281,7 @@ URL: [url]',
 'documents_to_receipt' => 'Dokumente deren Empfang bestätigt werden muss',
 'documents_to_review' => 'Prüfung erforderlich',
 'documents_to_revise' => 'Erneute Prüfung erforderlich',
+'documents_user_rejected' => 'Abgelehnte Dokumente',
 'documents_user_requiring_attention' => 'Diese Dokumente sollte ich mal nachsehen',
 'document_already_checkedout' => 'Dieses Dokument ist bereits ausgecheckt',
 'document_already_locked' => 'Dieses Dokument ist bereits gesperrt',
@@ -477,6 +478,7 @@ URL: [url]',
 'home_folder' => 'Heimatordner',
 'hourly' => 'stündlich',
 'hours' => 'Stunden',
+'hr_HR' => 'Kroatisch',
 'human_readable' => 'Menschenlesbares Archiv',
 'hu_HU' => 'Ungarisch',
 'id' => 'ID',
@@ -539,6 +541,7 @@ URL: [url]',
 'keep_doc_status' => 'Dokumentenstatus beibehalten',
 'keywords' => 'Stichworte',
 'keyword_exists' => 'Stichwort besteht bereits',
+'ko_KR' => 'Koreanisch',
 'language' => 'Sprache',
 'lastaccess' => 'Letzter Zugriff',
 'last_update' => 'Letzte Aktualisierung',
@@ -663,7 +666,9 @@ URL: [url]',
 'no_group_members' => 'Diese Gruppe hat keine Mitglieder',
 'no_linked_files' => 'Keine verknüpften Dokumente',
 'no_previous_versions' => 'Keine anderen Versionen gefunden',
+'no_receipt_needed' => 'Es gibt zur Zeit keine Dokumente, die eine Empfangsbestätigung erfordern.',
 'no_review_needed' => 'Keine offenen Prüfungen.',
+'no_revision_needed' => 'Es gibt zur Zeit keine Dokumente, die eine erneute Prüfung erfordern.',
 'no_revision_planed' => 'Keine Wiederholungsprüfung des Dokuments eingeplant.',
 'no_update_cause_locked' => 'Sie können daher im Moment diese Datei nicht aktualisieren. Wenden Sie sich an den Benutzer, der die Sperrung eingerichtet hat',
 'no_user_image' => 'Kein Bild vorhanden',
@@ -899,6 +904,10 @@ URL: [url]',
 'settings_Advanced' => 'Erweitert',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Authentifikations-Einstellungen',
+'settings_autoLoginUser' => 'Automatisches Login',
+'settings_autoLoginUser_desc' => 'Verwende den Benutzer mit der angegebenen Id, sofern man nicht bereits angemeldet ist. Solch ein Zugriff erzeugt keine eigene Sitzung.',
+'settings_backupDir' => 'Sicherungs-Verzeichnis',
+'settings_backupDir_desc' => 'Verzeichnis in dem das Backup-Tool die Sicherungen ablegt. Wenn hier kein Wert gesetzt wird oder auf das Verzeichnis nicht zugriffen werden kann, dann werden die Sicherungen im Content-Verzeichnis abgelegt.',
 'settings_cacheDir' => 'Cache Verzeichnis',
 'settings_cacheDir_desc' => 'Verzeichnis in dem Vorschaubilder abgelegt werden. Dies sollte ein Verzeichnis sein, auf das man über den Web-Browser keinen direkten Zugriff hat.',
 'settings_Calendar' => 'Kalender-Einstellungen',
@@ -907,6 +916,8 @@ URL: [url]',
 'settings_cannot_disable' => 'Datei ENABLE_INSTALL_TOOL konnte nicht gelöscht werden.',
 'settings_checkOutDir' => 'Verzeichnis für ausgecheckte Dokumente',
 'settings_checkOutDir_desc' => 'Dies ist das Verzeichnis, in das Dokumenteninhalte bei einem Check out kopiert werden. Wenn dieses Verzeichnis für die Benutzer erreichbar ist, können die Dateien editiert und dann wieder eingecheckt werden.',
+'settings_cmdTimeout' => 'Timeout für externe Programme',
+'settings_cmdTimeout_desc' => 'Diese Zeit in Sekunden legt fest, wann ein externes Programm (z.B. für die Erstellung des Volltextindex) beendet wird.',
 'settings_contentDir' => 'Content-Verzeichnis',
 'settings_contentDir_desc' => 'Verzeichnis, in dem die Dokumente gespeichert werden. Sie sollten ein Verzeichnis wählen, das nicht durch den Web-Server erreichbar ist.',
 'settings_contentOffsetDir' => 'Content Offset Directory',
@@ -966,6 +977,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Zeige Auswahl der verfügbaren Sprachen nachdem man sich angemeldet hat.',
 'settings_enableLargeFileUpload' => 'Hochladen von sehr großen Dateien ermöglichen',
 'settings_enableLargeFileUpload_desc' => 'Wenn dies gesetzt ist, dann ist ebenfalls der Upload von Dokumenten durch ein java applet mit Namen \'jumploader\' ohne Begrenzung der maximalen Dateigröße möglich. Auch das Hochladen mehrerer Dokumente in einem Schritt wird dadurch ermöglicht. Das Einschalten bewirkt, dass keine http only Cookies mehr gesetzt werden.',
+'settings_enableMenuTasks' => 'Aufgabenliste im Menü',
+'settings_enableMenuTasks_desc' => 'Ein-/Ausschalten des Menüeintrags, der anstehenden Aufgaben des Benutzers enthält. Diese Liste beinhaltet Dokumente die geprüft, freigegeben, usw. werden müssen.',
 'settings_enableNotificationAppRev' => 'Prűfer/Freigeber benachrichtigen',
 'settings_enableNotificationAppRev_desc' => 'Setzen Sie diese Option, wenn die Prüfer und Freigeber eines Dokuments beim Hochladen einer neuen Version benachrichtigt werden sollen.',
 'settings_enableNotificationWorkflow' => 'Sende Benachrichtigung an Benutzer im nächsten Workflow-Schritt',
@@ -1007,6 +1020,10 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => 'Erster Tag der Woche',
 'settings_footNote' => 'Text im Fuß der Seite',
 'settings_footNote_desc' => 'Meldung, die im Fuß jeder Seite angezeigt wird.',
+'settings_fullSearchEngine' => 'Verfahren für Volltext',
+'settings_fullSearchEngine_desc' => 'Setzt das Verfahren, welches für die Volltextsuche verwendet wird.',
+'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
+'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'Gast-ID',
 'settings_guestID_desc' => 'Id des Gast-Benutzers, wenn man sich als \'guest\' anmeldet.',
 'settings_httpRoot' => 'HTTP Wurzelverzeichnis',
@@ -1223,6 +1240,7 @@ URL: [url]',
 'takeOverGrpReviewer' => 'Übernehme Gruppe von Prüfern von letzter Version.',
 'takeOverIndApprover' => 'Übernehme Einzelfreigebende von letzter Version.',
 'takeOverIndReviewer' => 'Übernehme die Einzelprüfer von der letzten Version.',
+'tasks' => 'Aufgaben',
 'testmail_body' => 'Diese Mail ist lediglich zum Test der Mail-Konfiguration von SeedDMS',
 'testmail_subject' => 'Test Mail',
 'theme' => 'Aussehen',

languages/en_GB/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1216), dgrutsch (3), netixw (14)
+//    Translators: Admin (1238), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -191,7 +191,7 @@ URL: [url]',
 'category_in_use' => 'This category is currently used by documents.',
 'category_noname' => 'No category name given.',
 'ca_ES' => 'Catalan',
-'change_assignments' => 'Change Assignments',
+'change_assignments' => 'Set reviewer/approver',
 'change_password' => 'Change password',
 'change_password_message' => 'Your password has been changed.',
 'change_recipients' => 'Change list of recipients',
@@ -281,6 +281,7 @@ URL: [url]',
 'documents_to_receipt' => 'Documents awaiting to confirm the receipt',
 'documents_to_review' => 'Documents awaiting your review',
 'documents_to_revise' => 'Documents to revise',
+'documents_user_rejected' => 'Rejected documents',
 'documents_user_requiring_attention' => 'Documents owned by you that require attention',
 'document_already_checkedout' => 'This document is already checked out',
 'document_already_locked' => 'This document is aleady locked',
@@ -477,6 +478,7 @@ URL: [url]',
 'home_folder' => 'Home folder',
 'hourly' => 'Hourly',
 'hours' => 'hours',
+'hr_HR' => 'Croatian',
 'human_readable' => 'Human readable archive',
 'hu_HU' => 'Hungarian',
 'id' => 'ID',
@@ -539,6 +541,7 @@ URL: [url]',
 'keep_doc_status' => 'Keep document status',
 'keywords' => 'Keywords',
 'keyword_exists' => 'Keyword already exists',
+'ko_KR' => 'Korean',
 'language' => 'Language',
 'lastaccess' => 'Last access',
 'last_update' => 'Last Update',
@@ -663,7 +666,9 @@ URL: [url]',
 'no_group_members' => 'This group has no members',
 'no_linked_files' => 'No linked files',
 'no_previous_versions' => 'No other versions found',
+'no_receipt_needed' => '',
 'no_review_needed' => 'No review pending.',
+'no_revision_needed' => 'No revision pending.',
 'no_revision_planed' => 'No revision of document scheduled',
 'no_update_cause_locked' => 'You can therefore not update this document. Please contact the locking user.',
 'no_user_image' => 'No image found',
@@ -777,10 +782,10 @@ URL: [url]',
 'reviewer_already_removed' => 'Reviewer has already been removed from review process or has already submitted a review',
 'review_deletion_email' => 'Review request deleted',
 'review_deletion_email_body' => 'Review request deleted
-Dokument: [name]
+Document: [name]
 Version: [version]
-Elternordner: [folder_path]
+Parentfolder: [folder_path]
-Benutzer: [username]
+User: [username]
 URL: [url]',
 'review_deletion_email_subject' => '[sitename]: [name] - Review request deleted',
 'review_file' => 'File',
@@ -906,6 +911,10 @@ URL: [url]',
 'settings_Advanced' => 'Advanced',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Authentication settings',
+'settings_autoLoginUser' => 'Automatic login',
+'settings_autoLoginUser_desc' => 'Use this user id for accesses if the user is not already logged in. Such an access will not create a session.',
+'settings_backupDir' => 'Backup directory',
+'settings_backupDir_desc' => 'Directory where the backup tool saves backups. If this directory is not set or cannot be accessed, then the backups will be saved in the content directory.',
 'settings_cacheDir' => 'Cache directory',
 'settings_cacheDir_desc' => 'Where the preview images are stored (best to choose a directory that is not accessible through your web-server)',
 'settings_Calendar' => 'Calendar settings',
@@ -914,6 +923,8 @@ URL: [url]',
 'settings_cannot_disable' => 'File ENABLE_INSTALL_TOOL could not deleted',
 'settings_checkOutDir' => 'Directory for checked out documents',
 'settings_checkOutDir_desc' => 'This is the directory where the latest content of a document is copied if the document is checked out. If you make this directory accessible for users, they can edit the file and check it back in when finished.',
+'settings_cmdTimeout' => 'Timeout for external commands',
+'settings_cmdTimeout_desc' => 'This duration in seconds determines when an external command (e.g. for creating the full text index) will be terminatd.',
 'settings_contentDir' => 'Content directory',
 'settings_contentDir_desc' => 'Where the uploaded files are stored (best to choose a directory that is not accessible through your web-server)',
 'settings_contentOffsetDir' => 'Content Offset Directory',
@@ -973,10 +984,12 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Show selector for user interface language after being logged in.',
 'settings_enableLargeFileUpload' => 'Enable large file upload',
 'settings_enableLargeFileUpload_desc' => 'If set, file upload is also available through a java applet called jumploader without a file size limit set by the browser. It also allows to upload several files in one step. Turning this on will turn off http only cookies.',
+'settings_enableMenuTasks' => 'Enable task list in menu',
+'settings_enableMenuTasks_desc' => 'Enable/Disable the menu item which contains all tasks for the user. This contains documents, that need to be reviewed, approved, etc.',
 'settings_enableNotificationAppRev' => 'Enable reviewer/approver notification',
 'settings_enableNotificationAppRev_desc' => 'Check to send a notification to the reviewer/approver when a new document version is added',
 'settings_enableNotificationWorkflow' => 'Send notification to users in next workflow transition',
-'settings_enableNotificationWorkflow_desc' => 'If this option is enabled, the users and groups which need to take action in the next workflow transiton will be notified. Even if they have not added a notification for the document.',
+'settings_enableNotificationWorkflow_desc' => 'If this option is enabled, the users and groups which need to take action in the next workflow transition will be notified. Even if they have not added a notification for the document.',
 'settings_enableOwnerNotification' => 'Enable owner notification by default',
 'settings_enableOwnerNotification_desc' => 'Check for adding a notification for the owner if a document when it is added.',
 'settings_enableOwnerRevApp' => 'Allow review/approval for owner',
@@ -1014,6 +1027,10 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => 'First day of the week',
 'settings_footNote' => 'Foot Note',
 'settings_footNote_desc' => 'Message to display at the bottom of every page',
+'settings_fullSearchEngine' => 'Fulltext engine',
+'settings_fullSearchEngine_desc' => 'Set the method used for the fulltext search.',
+'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
+'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'Guest ID',
 'settings_guestID_desc' => 'ID of guest-user used when logged in as guest (mostly no need to change)',
 'settings_httpRoot' => 'Http Root',
@@ -1230,6 +1247,7 @@ URL: [url]',
 'takeOverGrpReviewer' => 'Take over group of reviewers from last version.',
 'takeOverIndApprover' => 'Take over individual approver from last version.',
 'takeOverIndReviewer' => 'Take over individual reviewer from last version.',
+'tasks' => 'Tasks',
 'testmail_body' => 'This mail is just for testing the mail configuration of SeedDMS',
 'testmail_subject' => 'Test mail',
 'theme' => 'Theme',
@@ -1252,7 +1270,7 @@ URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Workflow transition triggered',
 'transmittal' => 'Transmittal',
 'transmittalitem_removed' => 'Transmittal item removed',
-'transmittalitem_updated' => 'Dokument updated to latest version',
+'transmittalitem_updated' => 'Document updated to latest version',
 'transmittal_comment' => 'Comment',
 'transmittal_name' => 'Name',
 'transmittal_size' => 'Size',

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 (946), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (952), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 'accept' => 'Aceptar',
@@ -276,6 +276,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documentos en espera de revisión de usuarios',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documentos de su propiedad que requieren atención',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Este documento ya está bloqueado',
@@ -355,7 +356,7 @@ URL: [url]',
 'dump_creation_warning' => 'Con esta operación se creará un volcado a fichero del contenido de la base de datos. Después de la creación del volcado el fichero se guardará en la carpeta de datos de su servidor.',
 'dump_list' => 'Ficheros de volcado existentes',
 'dump_remove' => 'Eliminar fichero de volcado',
-'duplicate_content' => '',
+'duplicate_content' => 'Contenido duplicado',
 'edit' => 'editar',
 'edit_attributes' => 'Editar atributos',
 'edit_comment' => 'Editar comentario',
@@ -472,6 +473,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => 'Horaria',
 'hours' => 'horas',
+'hr_HR' => 'Croata',
 'human_readable' => 'Archivo legible por humanos',
 'hu_HU' => 'Hungaro',
 'id' => 'ID',
@@ -534,6 +536,7 @@ URL: [url]',
 'keep_doc_status' => 'Mantener estado del documento',
 'keywords' => 'Palabras clave',
 'keyword_exists' => 'La palabra clave ya existe',
+'ko_KR' => 'Coreano',
 'language' => 'Idioma',
 'lastaccess' => 'Último acceso',
 'last_update' => 'Última modificación',
@@ -659,7 +662,9 @@ URL: [url]',
 'no_group_members' => 'Este grupo no tiene miembros',
 'no_linked_files' => 'No hay ficheros vinculados',
 'no_previous_versions' => 'No se han encontrado otras versiones',
+'no_receipt_needed' => '',
 'no_review_needed' => 'No hay revisiones pendientes.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'No puede actualizar este documento. Contacte con el usuario que lo bloqueó.',
 'no_user_image' => 'No se encontró imagen',
@@ -885,6 +890,10 @@ URL: [url]',
 'settings_Advanced' => 'Avanzado',
 'settings_apache_mod_rewrite' => 'Apache - Módulo Reescritura',
 'settings_Authentication' => 'Configuración de autenticación',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
+'settings_backupDir' => '',
+'settings_backupDir_desc' => '',
 'settings_cacheDir' => 'Carpeta caché',
 'settings_cacheDir_desc' => 'Donde están archivadas las imágenes anteriores (mejor elegir una carpeta que no sea accesible a través de su servidor web)',
 'settings_Calendar' => 'Configuración de calendario',
@@ -893,6 +902,8 @@ URL: [url]',
 'settings_cannot_disable' => 'No es posible eliminar el archivo ENABLE_INSTALL_TOOL',
 'settings_checkOutDir' => '',
 'settings_checkOutDir_desc' => '',
+'settings_cmdTimeout' => '',
+'settings_cmdTimeout_desc' => '',
 'settings_contentDir' => 'Carpeta de contenidos',
 'settings_contentDir_desc' => 'Donde se almacenan los archivos subidos (es preferible seleccionar una carpeta que no sea accesible a través del servidor web)',
 'settings_contentOffsetDir' => 'Carpeta de contenidos de desplazamiento',
@@ -952,6 +963,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Mostrar selector de lenguaje para usuario despues de identificarse.',
 'settings_enableLargeFileUpload' => 'Habilitar la carga de ficheros grandes',
 'settings_enableLargeFileUpload_desc' => 'Si se habilita, la carga de ficheros también estará disponible a través de un applet java llamado jumploader, sin límite de tamaño de fichero fijado por el navegador. También permite la carga de múltiples ficheros de una sola vez.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Habilitar notificación a revisor/aprobador',
 'settings_enableNotificationAppRev_desc' => 'Habilitar para enviar notificación a revisor/aprobador cuando se añade una nueva versión de documento',
 'settings_enableNotificationWorkflow' => 'Enviar notificación a los usuarios en la siguiente transacción del flujo.',
@@ -993,6 +1006,10 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => 'Primer día de la semana',
 'settings_footNote' => 'Nota del pie',
 'settings_footNote_desc' => 'Mensaje para mostrar en la parte inferior de cada página',
+'settings_fullSearchEngine' => '',
+'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
+'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'ID de invitado',
 'settings_guestID_desc' => 'ID del usuario invitado cuando se conecta como invitado (mayormente no necesita cambiarlo)',
 'settings_httpRoot' => 'Raíz Http',
@@ -1209,6 +1226,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => 'El propósito de este e-mail es probar la configuración del DMS',
 'testmail_subject' => 'E-mail de prueba',
 'theme' => 'Tema gráfico',
@@ -1240,7 +1258,7 @@ URL: [url]',
 'tuesday' => 'Martes',
 'tuesday_abbr' => 'M',
 'type_to_search' => 'Tipo de búsqueda',
-'uk_UA' => '',
+'uk_UA' => 'Ucraniano',
 'under_folder' => 'En carpeta',
 'unknown_attrdef' => 'Definición de atributo desconocida',
 'unknown_command' => 'Orden no reconocida.',

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 (968), jeromerobert (50), lonnnew (9)
+//    Translators: Admin (975), jeromerobert (50), lonnnew (9)
 
 $text = array(
 'accept' => 'Accepter',
@@ -166,7 +166,7 @@ URL: [url]',
 'backup_remove' => 'Supprimer le fichier de sauvegarde',
 'backup_tools' => 'Outils de sauvegarde',
 'between' => 'entre',
-'bg_BG' => '',
+'bg_BG' => 'Bulgare',
 'browse' => 'Parcourir',
 'calendar' => 'Agenda',
 'calendar_week' => 'Semaine',
@@ -276,6 +276,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents en attente de correction',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documents à surveiller',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Ce document est déjà verrouillé',
@@ -472,6 +473,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => 'Une fois par heure',
 'hours' => 'heures',
+'hr_HR' => 'Croate',
 'human_readable' => 'Archive au format lisible',
 'hu_HU' => 'Hongrois',
 'id' => 'ID',
@@ -534,6 +536,7 @@ URL: [url]',
 'keep_doc_status' => 'Garder le statut du document',
 'keywords' => 'Mots-clés',
 'keyword_exists' => 'Mot-clé déjà existant',
+'ko_KR' => 'Korean',
 'language' => 'Langue',
 'lastaccess' => 'Dernière connexion',
 'last_update' => 'Dernière modification',
@@ -658,7 +661,9 @@ URL: [url]',
 'no_group_members' => 'Ce groupe ne contient aucun membre',
 'no_linked_files' => 'Aucun fichier lié',
 'no_previous_versions' => 'Aucune autre version trouvée',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Aucune correction en attente',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Vous ne pouvez actuellement pas mettre à jour ce document. Contactez l\'utilisateur qui l\'a verrouillé.',
 'no_user_image' => 'Aucune image trouvée',
@@ -861,6 +866,10 @@ URL: [url]',
 'settings_Advanced' => 'Avancé',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Paramètres d\'authentification',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
+'settings_backupDir' => '',
+'settings_backupDir_desc' => '',
 'settings_cacheDir' => 'Dossier Cache',
 'settings_cacheDir_desc' => 'Lieu de stockage des images de prévisualisation (choisir de préférence un dossier non accessible à travers le web-server)',
 'settings_Calendar' => 'Paramètres de l\'agenda',
@@ -869,6 +878,8 @@ URL: [url]',
 'settings_cannot_disable' => 'Le fichier ENABLE_INSTALL_TOOL ne peut pas être supprimé',
 'settings_checkOutDir' => '',
 'settings_checkOutDir_desc' => '',
+'settings_cmdTimeout' => '',
+'settings_cmdTimeout_desc' => '',
 'settings_contentDir' => 'Contenu du répertoire',
 'settings_contentDir_desc' => 'Endroit ou les fichiers téléchargés sont stockés (il est préférable de choisir un répertoire qui n\'est pas accessible par votre serveur web)',
 'settings_contentOffsetDir' => 'Content Offset Directory',
@@ -928,6 +939,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Montrer le sélecteur de langue d\'interface après connexion de l\'utilisateur.',
 'settings_enableLargeFileUpload' => 'Activer téléchargement des gros fichiers',
 'settings_enableLargeFileUpload_desc' => 'Si défini, le téléchargement de fichier est également disponible via un applet java appelé jumploader sans limite de taille définie par le navigateur. Il permet également de télécharger plusieurs fichiers en une seule fois.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Notification correcteur/approbateur',
 'settings_enableNotificationAppRev_desc' => 'Cochez pour envoyer une notification au correcteur/approbateur quand une nouvelle version du document est ajoutée',
 'settings_enableNotificationWorkflow' => '',
@@ -969,6 +982,10 @@ 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' => '',
+'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
+'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'ID invité',
 'settings_guestID_desc' => 'ID de l\'invité utilisé lorsque vous êtes connecté en tant qu\'invité (la plupart du temps pas besoin de changer)',
 'settings_httpRoot' => 'Http Root',
@@ -1185,6 +1202,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => '',
 'testmail_subject' => '',
 'theme' => 'Thème',
@@ -1207,7 +1225,7 @@ URL: [url]',
 'tuesday' => 'Mardi',
 'tuesday_abbr' => 'Mar.',
 'type_to_search' => 'Effectuer une recherche',
-'uk_UA' => '',
+'uk_UA' => 'Ukrénien',
 'under_folder' => 'Dans le dossier',
 'unknown_attrdef' => '',
 'unknown_command' => 'Commande non reconnue.',

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 (558), ribaz (1019)
+//    Translators: Admin (562), ribaz (1019)
 
 $text = array(
 'accept' => 'Elfogad',
@@ -276,6 +276,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Felülvizsgálatára váró dokumentumok',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Az Ön tulajdonában álló dokumentumok, amelyekre figyelmet kell fordítani',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Ez a dokumentum már zárolt',
@@ -472,6 +473,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => 'Óra',
 'hours' => 'óra',
+'hr_HR' => 'Horvát',
 'human_readable' => 'Felhasználó által olvasható archívum',
 'hu_HU' => 'Magyar',
 'id' => 'ID',
@@ -534,6 +536,7 @@ URL: [url]',
 'keep_doc_status' => 'Dokumentum állapot megőrzése',
 'keywords' => 'Kulcsszavak',
 'keyword_exists' => 'Kulcsszó már létezik',
+'ko_KR' => '',
 'language' => 'Nyelv',
 'lastaccess' => 'Utolsó hozzáférés',
 'last_update' => 'Utolsó frissítés',
@@ -659,7 +662,9 @@ URL: [url]',
 'no_group_members' => 'Ennek a csoportnak nincsenek tagjai',
 'no_linked_files' => 'Nincsenek hivatkozott állományok',
 'no_previous_versions' => 'Nem találhatók más változatok',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Nincs folyamatban lévő felülvizsgálat.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Emiatt nem módosíthatja a dokumentumot. Kérjük lépjen kapcsolatba a zároló felhasználóval.',
 'no_user_image' => 'Kép nem található',
@@ -884,6 +889,10 @@ URL: [url]',
 'settings_Advanced' => 'Részletek',
 'settings_apache_mod_rewrite' => 'Apache - Rewrite modul',
 'settings_Authentication' => 'Hitelesítési beállítások',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
+'settings_backupDir' => '',
+'settings_backupDir_desc' => '',
 'settings_cacheDir' => 'Átmeneti állományok könyvtára',
 'settings_cacheDir_desc' => 'Ahol az előnézeti képek tárolódnak (legjobb olyan könyvtárat választani, amit a web-kiszolgálón keresztül nem lehet elérni)',
 'settings_Calendar' => 'Naptár beállítások',
@@ -892,6 +901,8 @@ URL: [url]',
 'settings_cannot_disable' => 'ENABLE_INSTALL_TOOL állomány nem került törlésre',
 'settings_checkOutDir' => '',
 'settings_checkOutDir_desc' => '',
+'settings_cmdTimeout' => '',
+'settings_cmdTimeout_desc' => '',
 'settings_contentDir' => 'Tartalom könyvtár',
 'settings_contentDir_desc' => 'Feltöltött állományok tárolási helye (olyan könyvtárat érdemes választani, amelyhez nem lehet a webszerveren keresztül hozzáférni)',
 'settings_contentOffsetDir' => 'Tartalom eltérési könyvtár',
@@ -951,6 +962,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Megjelenít egy választást a felhasználói felületen a bejelentkezést követően.',
 'settings_enableLargeFileUpload' => 'Nagy méretű állományok feltöltésének engedélyezése',
 'settings_enableLargeFileUpload_desc' => 'Ha beállítja az állományok feltöltése elérhető lesz egy jumploadernek hívott java appleten keresztül a böngészőprogram állomány méret korlátja nélkül. Ez engedélyezi több állomány feltöltését egy lépésben.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'A felülvizsgáló/jóváhagyó értesítés engedélyezése',
 'settings_enableNotificationAppRev_desc' => 'Ellenőrzi az értesítés küldését a felülvizsgálónak/jóváhagyónak új dokumentum változat hozzáadásakor',
 'settings_enableNotificationWorkflow' => 'A felhasználó értesítése a következő munkafolyamatnál',
@@ -992,6 +1005,10 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => 'A hét első napja',
 'settings_footNote' => 'Lábjegyzet',
 'settings_footNote_desc' => 'Minden oldal alján megjelenő üzenet',
+'settings_fullSearchEngine' => '',
+'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
+'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'Vendég azonosító',
 'settings_guestID_desc' => 'A vendég felhasználó azonosítója ami a vendégként történő bejelentkezéskor lesz használva (általában nem szükséges módosítani)',
 'settings_httpRoot' => 'Http gyökér',
@@ -1208,6 +1225,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => 'Ez az üzenet a SeedDMS levelezési beállításainak tesztelésére szolgál',
 'testmail_subject' => 'Teszt üzenet',
 'theme' => 'Téma',
@@ -1239,7 +1257,7 @@ URL: [url]',
 'tuesday' => 'Kedd',
 'tuesday_abbr' => 'Ke',
 'type_to_search' => 'Adja meg a keresendő kifejezést',
-'uk_UA' => '',
+'uk_UA' => 'Ukrán',
 'under_folder' => 'Mappában',
 'unknown_attrdef' => 'Ismeretlen tulajdonság meghatározás',
 'unknown_command' => 'Parancs nem ismerhető fel.',

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 (1383), s.pnt (26)
+//    Translators: Admin (1494), s.pnt (26)
 
 $text = array(
 'accept' => 'Accetta',
@@ -59,13 +59,13 @@ URL: [url]',
 'add_member' => 'Aggiungi un membro',
 'add_multiple_documents' => 'Aggiungi documenti multipli',
 'add_multiple_files' => 'Aggiungi documenti multipli (il nome del file verrà usato come nome del documento)',
-'add_receipt' => '',
+'add_receipt' => 'invio ricevuta',
 'add_review' => 'Invio revisione',
-'add_revision' => '',
+'add_revision' => 'Aggiungi approvazione',
 'add_subfolder' => 'Aggiungi sottocartella',
 'add_to_clipboard' => 'Aggiungi agli appunti',
-'add_to_transmittal' => '',
+'add_to_transmittal' => 'Aggiungi alla trasmissione',
-'add_transmittal' => '',
+'add_transmittal' => 'Aggiungi trasmissione',
 'add_user' => 'Aggiungi un nuovo utente',
 'add_user_to_group' => 'Aggiungi un utente al gruppo',
 'add_workflow' => 'Crea un flusso di lavoro',
@@ -89,7 +89,7 @@ Cartella: [folder_path]
 Utente: [username]
 URL: [url]',
 'approval_deletion_email_subject' => '[sitename]: [name] - Richiesta di approvazione cancellata',
-'approval_file' => '',
+'approval_file' => 'File',
 'approval_group' => 'Gruppo di approvazione',
 'approval_log' => 'Registro delle approvazioni',
 'approval_request_email' => 'Richiesta di approvazione',
@@ -114,8 +114,8 @@ URL: [url]',
 'approval_summary' => 'Dettaglio approvazioni',
 'approval_update_failed' => 'Errore nel modificare lo stato di approvazione. Aggiornamento fallito.',
 'approvers' => 'Approvatori',
-'approver_already_assigned' => '',
+'approver_already_assigned' => 'Utente già approvatore',
-'approver_already_removed' => '',
+'approver_already_removed' => 'Utente già rimosso dal processo di approvazione o ha già approvato',
 'april' => 'Aprile',
 'archive_creation' => 'Creazione archivi',
 'archive_creation_warning' => 'Con questa operazione è possibile creare archivi contenenti i file di intere cartelle del DMS. Dopo la creazione l\'archivio viene salvato nella cartella dati del server. Attenzione: un archivio creato per uso esterno non è utilizzabile come backup del server.',
@@ -137,12 +137,12 @@ URL: [url]',
 'attrdef_objtype' => 'Tipo di oggetto',
 'attrdef_regex' => 'Espressione regolare',
 'attrdef_type' => 'Tipo',
-'attrdef_type_boolean' => '',
+'attrdef_type_boolean' => 'Booleano',
-'attrdef_type_email' => '',
+'attrdef_type_email' => 'Email',
-'attrdef_type_float' => '',
+'attrdef_type_float' => 'Virgola mobile',
-'attrdef_type_int' => '',
+'attrdef_type_int' => 'Intero',
-'attrdef_type_string' => '',
+'attrdef_type_string' => 'Stringa',
-'attrdef_type_url' => '',
+'attrdef_type_url' => 'URL',
 'attrdef_valueset' => 'Set di valori',
 'attributes' => 'Attributi',
 'attribute_changed_email_body' => 'Attributo modificato
@@ -155,7 +155,8 @@ URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: [name] - Attributo modificato',
 'attribute_count' => 'Numero di utilizzi',
 'attribute_value' => 'Valore dell\'Attributo',
-'attr_malformed_email' => '',
+'attr_malformed_email' => 'Il valore di \'[value]\' dell,
+ => attributo \'[attrname]\' non é un URL valido.',
 'attr_malformed_url' => '',
 'attr_max_values' => 'Il numero massimo dei valori richiesti per l\'Attributo [attrname] è superato.',
 'attr_min_values' => 'Il numero minimo di valori richiesti per l\'Attributo [attrname] non è raggiunto.',
@@ -194,8 +195,8 @@ URL: [url]',
 'change_assignments' => 'Modifica le Assegnazioni',
 'change_password' => 'Cambia la password',
 'change_password_message' => 'La password è stata cambiata',
-'change_recipients' => '',
+'change_recipients' => 'Cambia lista cartelle',
-'change_revisors' => '',
+'change_revisors' => 'Cambia reimmissione',
 'change_status' => 'Modifica lo Stato',
 'charts' => 'Grafici',
 'chart_docsaccumulated_title' => 'Numero di documenti',
@@ -206,12 +207,12 @@ URL: [url]',
 'chart_docsperuser_title' => 'Documenti per utente',
 'chart_selection' => 'Seleziona grafico',
 'chart_sizeperuser_title' => 'Spazio su disco per utente',
-'checkedout_file_has_different_version' => '',
+'checkedout_file_has_different_version' => 'La versione approvata non è uguale alla versione corrente. Non si aggiornerà documento.',
-'checkedout_file_has_disappeared' => '',
+'checkedout_file_has_disappeared' => 'File documento approvato non trovato. Impossibile caricare.',
-'checkedout_file_is_unchanged' => '',
+'checkedout_file_is_unchanged' => 'La versione approvata è uguale alla versione corrente. Impossibile caricare.',
-'checkin_document' => '',
+'checkin_document' => 'Da approvare',
-'checkout_document' => '',
+'checkout_document' => 'Approvato',
-'checkout_is_disabled' => '',
+'checkout_is_disabled' => 'Approvazione dei documenti disabilitata',
 'choose_attrdef' => 'Seleziona l\'Attributo',
 'choose_category' => 'Seleziona',
 'choose_group' => 'Seleziona il gruppo',
@@ -240,15 +241,15 @@ URL: [url]',
 'confirm_rm_folder_files' => 'Vuoi davvero rimuovere tutti i file dalla cartella "[foldername]" e dalle sue sottocartelle? Attenzione: questa operazione non può essere annullata.',
 'confirm_rm_group' => 'Vuoi davvero rimuovere il gruppo "[groupname]"? Attenzione: questa operazione non può essere annullata.',
 'confirm_rm_log' => 'Vuoi davvero rimuovere il file di log "[logname]"?<br>Attenzione: questa operazione non può essere annullata.',
-'confirm_rm_transmittalitem' => '',
+'confirm_rm_transmittalitem' => 'Conferma rimozione',
 'confirm_rm_user' => 'Vuoi davvero rimuovere l\'utente "[username]"? Attenzione: questa operazione non può essere annullata.',
 'confirm_rm_version' => 'Vuoi veramente eliminare la versione [version] del documento "[documentname]"? Attenzione: questa operazione non può essere annullata.',
-'confirm_update_transmittalitem' => '',
+'confirm_update_transmittalitem' => 'Conferma aggiornamento',
 'content' => 'Contenuto',
 'continue' => 'Continua',
-'converter_new_cmd' => '',
+'converter_new_cmd' => 'Comando',
-'converter_new_mimetype' => '',
+'converter_new_mimetype' => 'Nuovo mimetype',
-'copied_to_checkout_as' => '',
+'copied_to_checkout_as' => 'File copiato come \'[filename]\'',
 'create_fulltext_index' => 'Crea indice fulltext',
 'create_fulltext_index_warning' => 'Stai creando un indice fulltext. Questo può occupare un tempo considerevole e ridurre le prestazioni del sistema. Sei sicuro di voler ricreare l\'indice? Prego conferma l\'operazione.',
 'creation_date' => 'Data creazione',
@@ -273,16 +274,17 @@ URL: [url]',
 'discspace' => 'Spazio su disco',
 'document' => 'Documento',
 'documents' => 'Documenti',
-'documents_checked_out_by_you' => '',
+'documents_checked_out_by_you' => 'Documenti approvati da te',
 'documents_in_process' => 'Documenti in lavorazione',
 'documents_locked_by_you' => 'Documenti bloccati da te',
 'documents_only' => 'Solo documenti',
 'documents_to_approve' => 'Documenti in attesa della tua approvazione',
-'documents_to_receipt' => '',
+'documents_to_receipt' => 'Documenti in attesa di conferma ricezione',
 'documents_to_review' => 'Documenti in attesa della tua revisione',
-'documents_to_revise' => '',
+'documents_to_revise' => 'Documenti da revisionare.',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Tuoi documenti in attesa di revisione o approvazione',
-'document_already_checkedout' => '',
+'document_already_checkedout' => 'Questo documento è già approvato',
 'document_already_locked' => 'Questo documento è già bloccato',
 'document_comment_changed_email' => 'Commento modificato',
 'document_comment_changed_email_body' => 'Commento modificato
@@ -303,7 +305,7 @@ Utente: [username]',
 'document_duplicate_name' => 'Nome del Documento duplicato',
 'document_has_no_workflow' => 'Il documento non ha un flusso di lavoro',
 'document_infos' => 'Informazioni documento',
-'document_is_checked_out' => '',
+'document_is_checked_out' => 'Il documento é approvato. Se aggiorni il documento, la versione approvata verrà sovrascritta definitivamente',
 'document_is_not_locked' => 'Questo documento non è bloccato',
 'document_link_by' => 'Collegato da',
 'document_link_public' => 'Pubblico',
@@ -315,7 +317,7 @@ Nuova cartella: [new_folder_path]
 Utente: [username]
 URL: [url]',
 'document_moved_email_subject' => '[sitename]: [name] - Documento spostato',
-'document_not_checkedout' => '',
+'document_not_checkedout' => 'Documento non approvato',
 'document_renamed_email' => 'Documento rinominato',
 'document_renamed_email_body' => 'Documento rinominato
 Documento: [name]
@@ -349,7 +351,7 @@ URL: [url]',
 'do_object_setchecksum' => 'Imposta il checksum',
 'do_object_setfilesize' => 'Imposta la dimensione del file',
 'do_object_unlink' => 'Cancella la versione del documento',
-'draft' => '',
+'draft' => 'Bozza',
 'draft_pending_approval' => 'Bozza - in approvazione',
 'draft_pending_review' => 'Bozza - in revisione',
 'drag_icon_here' => 'Trascina qui l\'icona della cartella o del documento',
@@ -375,7 +377,7 @@ URL: [url]',
 'edit_folder_notify' => 'Modifica la lista di notifica per la cartella',
 'edit_folder_props' => 'Modifica proprietà cartella',
 'edit_group' => 'Modifica il gruppo',
-'edit_transmittal_props' => '',
+'edit_transmittal_props' => 'Modifica proprietà trasmissione',
 'edit_user' => 'Modifica l\'utente',
 'edit_user_details' => 'Modifica i dettagli utente',
 'email' => 'Email',
@@ -402,7 +404,7 @@ Cartella: [folder_path]
 Utente: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Scadenza cambiata',
-'export' => '',
+'export' => 'Esporta',
 'extension_manager' => 'Gestisci le estensioni dei files',
 'february' => 'Febbraio',
 'file' => 'File',
@@ -474,14 +476,15 @@ URL: [url]',
 'guest_login' => 'Login come Ospite',
 'guest_login_disabled' => 'Il login come Ospite è disabilitato.',
 'help' => 'Aiuto',
-'home_folder' => '',
+'home_folder' => 'Cartella Utente',
 'hourly' => 'Ogni ora',
 'hours' => 'ore',
+'hr_HR' => 'Croato',
 'human_readable' => 'Archivio per uso esterno',
 'hu_HU' => 'Ungherese',
 'id' => 'ID',
 'identical_version' => 'La nuova versione è identica a quella attuale.',
-'include_content' => '',
+'include_content' => 'Includi contenuto',
 'include_documents' => 'Includi documenti',
 'include_subdirectories' => 'Includi sottocartelle',
 'index_converters' => 'Indice di conversione documenti',
@@ -511,7 +514,7 @@ URL: [url]',
 'invalid_target_folder' => 'ID cartella selezionata non valido',
 'invalid_user_id' => 'ID utente non valido',
 'invalid_version' => 'Versione del documento non valida',
-'in_revision' => '',
+'in_revision' => 'In fase di revisione',
 'in_workflow' => 'In fase di lavorazione',
 'is_disabled' => 'Account Disabilitato',
 'is_hidden' => 'Nascondi dalla lista utenti',
@@ -539,11 +542,12 @@ URL: [url]',
 'keep_doc_status' => 'Mantieni lo stato del documento',
 'keywords' => 'Parole-chiave',
 'keyword_exists' => 'Parola-chiave già presente',
+'ko_KR' => 'Coreano',
 'language' => 'Lingua',
 'lastaccess' => 'Ultimo accesso',
 'last_update' => 'Ultima modifica',
 'legend' => 'Legenda',
-'librarydoc' => '',
+'librarydoc' => 'Documento da cartella',
 'linked_documents' => 'Documenti collegati',
 'linked_files' => 'Allegati',
 'link_alt_updatedocument' => 'Se vuoi caricare file più grandi del limite massimo attuale, usa la <a href="%s">pagina alternativa di upload</a>.',
@@ -590,7 +594,7 @@ URL: [url]',
 'move_folder' => 'Sposta cartella',
 'my_account' => 'Account personale',
 'my_documents' => 'Documenti personali',
-'my_transmittals' => '',
+'my_transmittals' => 'Mie trasmissioni',
 'name' => 'Nome',
 'needs_workflow_action' => 'Il documento richiede attenzione. Prego controllare il flusso di lavoro.',
 'never' => 'Mai',
@@ -651,21 +655,23 @@ URL: [url]',
 'no_attached_files' => 'Nessun file allegato',
 'no_current_version' => 'La corrente versione di SeedDMS non è aggiornata. La versione più recente disponibile è la [latestversion].',
 'no_default_keywords' => 'Nessuna parola-chiave disponibile',
-'no_docs_checked_out' => '',
+'no_docs_checked_out' => 'Nessun documento approvato',
 'no_docs_locked' => 'Nessun documento bloccato.',
 'no_docs_to_approve' => 'Non ci sono documenti che richiedano approvazione.',
 'no_docs_to_look_at' => 'Non ci sono documenti che richiedano attenzione.',
-'no_docs_to_receipt' => '',
+'no_docs_to_receipt' => 'Nessuna cartella richiesta.',
 'no_docs_to_review' => 'Non ci sono documenti che richiedano revisioni.',
-'no_docs_to_revise' => '',
+'no_docs_to_revise' => 'Non ci sono documenti che richiedano approvazione.',
 'no_email_or_login' => 'Login ed email devono essere digitate',
 'no_fulltextindex' => 'Nessun indice fulltext disponibile',
 'no_groups' => 'Nessun gruppo',
 'no_group_members' => 'Questo gruppo non ha membri',
 'no_linked_files' => 'Nessun file collegato',
 'no_previous_versions' => 'Nessun\'altra versione trovata',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Nessuna revisione in sospeso.',
-'no_revision_planed' => '',
+'no_revision_needed' => '',
+'no_revision_planed' => 'Nessuna revisione pianificata.',
 'no_update_cause_locked' => 'Non è quindi possible aggiornare il documento. Prego contattare l\'utente che l\'ha bloccato.',
 'no_user_image' => 'Nessuna immagine trovata',
 'no_version_check' => 'Il controllo per una nuova versione di SeedDMS è fallito! Questo può essere causato da allow_url_fopen settato a 0 nella tua configurazione php.',
@@ -715,8 +721,8 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di
 'password_wrong' => 'Password errata',
 'personal_default_keywords' => 'Parole-chiave personali',
 'pl_PL' => 'Polacco',
-'possible_substitutes' => '',
+'possible_substitutes' => 'Sostituti',
-'preview_converters' => '',
+'preview_converters' => 'Anteprima convesione documento',
 'previous_state' => 'Stato precedente',
 'previous_versions' => 'Versioni precedenti',
 'pt_BR' => 'Portoghese (BR)',
@@ -724,9 +730,9 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di
 'quota_exceeded' => 'La quota-disco è stata superata di [bytes].',
 'quota_is_disabled' => 'Il supporto per le quote è attualmente disattivato nelle impostazioni. L\'impostazione di una quota-utente non avrà alcun effetto finché tale funzionalità non verrà nuovamente attivata.',
 'quota_warning' => 'Il vostro utilizzo massimo di spazio è stato superato di [bytes]. Si prega di rimuovere documenti o versioni obsolete.',
-'receipt_log' => '',
+'receipt_log' => 'Ricezione Log',
-'receipt_summary' => '',
+'receipt_summary' => 'Sommario ricezione',
-'recipients' => '',
+'recipients' => 'Cartelle',
 'refresh' => 'Ricarica',
 'rejected' => 'Rifiutato',
 'released' => 'Rilasciato',
@@ -737,9 +743,9 @@ Documento: [document]
 Utente: [username]
 URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Allegato rimosso',
-'removed_recipient' => '',
+'removed_recipient' => 'è stato rimosso dalla lista delle cartelle.',
-'removed_reviewer' => 'é stato rimosso dalla lista dei revisori.',
+'removed_reviewer' => 'è stato rimosso dalla lista dei revisori.',
-'removed_revispr' => '',
+'removed_revispr' => 'è stato rimosso dalla lista degli approvatori.',
 'removed_workflow_email_body' => 'Flusso di lavoro rimosso dalla versione del documento
 Documento: [name]
 Versione: [version]
@@ -760,7 +766,7 @@ Cartella: [folder_path]
 Utente: [username]
 URL: [url]',
 'request_workflow_action_email_subject' => 'Richiesta di azione in un flusso di lavoro',
-'reset_checkout' => '',
+'reset_checkout' => 'Check Out terminato',
 'results_page' => 'Pagina dei risultati',
 'return_from_subworkflow' => 'Ritorno dal sotto-flusso di lavoro',
 'return_from_subworkflow_email_body' => 'Ritorno dal sotto-flusso di lavoro
@@ -784,7 +790,7 @@ Cartella: [folder_path]
 Utente: [username]
 URL: [url]',
 'review_deletion_email_subject' => '[sitename]: [name] - Richiesta di revisione cancellata',
-'review_file' => '',
+'review_file' => 'File',
 'review_group' => 'Gruppo revisori',
 'review_log' => 'Rivedi log',
 'review_request_email' => 'Richiesta di revisione',
@@ -808,13 +814,13 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Sottoposta revisione',
 'review_summary' => 'Dettaglio revisioni',
 'review_update_failed' => 'Errore nella variazione dello stato di revisione. Aggiornamento fallito.',
-'revise_document' => '',
+'revise_document' => 'Rivedi documento',
-'revise_document_on' => '',
+'revise_document_on' => 'Prossima revisione del documento il [date]',
-'revision_date' => '',
+'revision_date' => 'data revisione',
-'revision_log' => '',
+'revision_log' => 'Log revisione',
-'revisors' => '',
+'revisors' => 'Revisori',
-'revisor_already_assigned' => '',
+'revisor_already_assigned' => 'Utente già assegnato al ruolo di revisore',
-'revisor_already_removed' => '',
+'revisor_already_removed' => 'Revisore già rimosso dal processo di revisione o ha già revisionato documento.',
 'rewind_workflow' => 'Inverti il flusso di lavoro',
 'rewind_workflow_email_body' => 'Il flusso di lavoro è stato invertito
 Document: [name]
@@ -833,8 +839,8 @@ URL: [url]',
 'rm_folder' => 'Rimuovi cartella',
 'rm_from_clipboard' => 'Rimuovi dalla clipboard',
 'rm_group' => 'Rimuovi questo gruppo',
-'rm_transmittal' => '',
+'rm_transmittal' => 'Rimuovi trasmissione',
-'rm_transmittalitem' => '',
+'rm_transmittalitem' => 'Rimuovi oggetto',
 'rm_user' => 'Rimuovi questo utente',
 'rm_version' => 'Rimuovi versione',
 'rm_workflow' => 'Rimuovi flusso di lavoro',
@@ -882,14 +888,14 @@ URL: [url]',
 'select_groups' => 'Clicca per selezionare i gruppi',
 'select_grp_approvers' => 'Seleziona gruppo approvatore',
 'select_grp_notification' => 'Seleziona Gruppo',
-'select_grp_recipients' => '',
+'select_grp_recipients' => 'Seleziona gruppo cartelle',
 'select_grp_reviewers' => 'Seleziona gruppo revisore',
-'select_grp_revisors' => '',
+'select_grp_revisors' => 'Seleziona gruppo revisori',
 'select_ind_approvers' => 'Seleziona approvatore',
 'select_ind_notification' => 'Seleziona Utente',
-'select_ind_recipients' => '',
+'select_ind_recipients' => 'Seleziona singole cartelle',
 'select_ind_reviewers' => 'Seleziona revisore',
-'select_ind_revisors' => '',
+'select_ind_revisors' => 'Seleziona singoli revisori',
 'select_one' => 'Seleziona uno',
 'select_users' => 'Clicca per selezionare gli utenti',
 'select_workflow' => 'Seleziona il flusso di lavoro',
@@ -907,14 +913,20 @@ URL: [url]',
 'settings_Advanced' => 'Avanzate',
 'settings_apache_mod_rewrite' => 'Apache - Mod Rewrite',
 'settings_Authentication' => 'Impostazioni di Autenticazione',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
+'settings_backupDir' => '',
+'settings_backupDir_desc' => '',
 'settings_cacheDir' => 'Cartella di cache',
 'settings_cacheDir_desc' => 'Cartella in cui vengono conservate le immagini di anteprima, si consiglia di scegliere una cartella sul web-server che non sia direttamente accessibile.',
 'settings_Calendar' => 'Impostazioni calendario',
 'settings_calendarDefaultView' => 'Vista di default del calendario',
 'settings_calendarDefaultView_desc' => 'Vista di default del calendario',
 'settings_cannot_disable' => 'Il file ENABLE_INSTALL_TOOL non può essere cancellato',
-'settings_checkOutDir' => '',
+'settings_checkOutDir' => 'Cartella per i documenti approvati',
-'settings_checkOutDir_desc' => '',
+'settings_checkOutDir_desc' => 'Questa eultima versione del documento viene copiata se approvato. Se accessibile agli utenti, possono editare il documento e ricopiarlo quando finito.',
+'settings_cmdTimeout' => '',
+'settings_cmdTimeout_desc' => '',
 'settings_contentDir' => 'Cartella contenitore',
 'settings_contentDir_desc' => 'Cartella in cui vengono conservati i files caricati, si consiglia di scegliere una cartella sul web-server che non sia direttamente accessibile.',
 'settings_contentOffsetDir' => 'Cartella Offset',
@@ -923,8 +935,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => 'Tempo di vita del cookie in secondi: se impostato su 0 il cookie verrà rimosso alla chiusura del browser',
 'settings_coreDir' => 'Cartella principale dell\'applicazione',
 'settings_coreDir_desc' => 'Percorso del pacchetto principale dell\'applicazione',
-'settings_createCheckOutDir' => '',
+'settings_createCheckOutDir' => 'Cartella approvati',
-'settings_createCheckOutDir_desc' => '',
+'settings_createCheckOutDir_desc' => 'I documenti verranno copiati in questa cartella, quando approvati.',
 'settings_createdatabase' => 'Crea database',
 'settings_createdirectory' => 'Crea cartella',
 'settings_currentvalue' => 'Valore corrente',
@@ -948,8 +960,8 @@ URL: [url]',
 'settings_dropFolderDir' => 'Cartella per il drop',
 'settings_dropFolderDir_desc' => 'Questa cartella viene utilizzata per rilasciare (drop) files sul server per importarli direttamente anziché caricarli attraverso il browser. La cartella deve contenere una sottocartella per ciascun utente autorizzato ad importare files in questo modo.',
 'settings_Edition' => 'Impostazioni di edizione',
-'settings_enableAcknowledgeWorkflow' => '',
+'settings_enableAcknowledgeWorkflow' => 'Abilitare per notifiche',
-'settings_enableAcknowledgeWorkflow_desc' => '',
+'settings_enableAcknowledgeWorkflow_desc' => 'Abilitare per attivare sul workflow le ricevute di notifica.',
 'settings_enableAdminRevApp' => 'Permetti la revisione/approvazione da parte degli amministratori',
 'settings_enableAdminRevApp_desc' => 'Abilita per elencare gli amministratori tra i revisori/approvatori e per le transizioni del flusso di lavoro',
 'settings_enableCalendar' => 'Abilita calendario',
@@ -974,6 +986,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Mostra/nasconde il selettore di lingua successivamente al login.',
 'settings_enableLargeFileUpload' => 'Abilita caricamento grandi files',
 'settings_enableLargeFileUpload_desc' => 'Se selezionato, il caricamento (upload) dei files può essere effettuato anche attraverso un\'applet Java chiamata Jumploader evitando il limite di dimensioni file imposto dal browser; Jumploader permette anche il caricamento di diversi files contemporaneamente.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Abilita/disabilita notifica a revisore/approvatore',
 'settings_enableNotificationAppRev_desc' => 'Spuntare per inviare una notifica al revisore/approvatore nel momento in cui viene aggiunta una nuova versione del documento.',
 'settings_enableNotificationWorkflow' => 'Invia notifiche ai partecipanti al flusso di lavoro',
@@ -986,8 +1000,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Spuntare nel caso si desideri permettere all\'utente di re-impostare la password inviata per email.',
 'settings_enableRecursiveCount' => 'Abilita il conteggio ricursivo di documenti/cartelle',
 'settings_enableRecursiveCount_desc' => 'Se selezionato il numero di documenti e sottocartelle accessibili all\'utente sarà calcolato con un conteggio ricursivo di tutti gli oggetti contenuti nella cartella.',
-'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow' => 'Abilita revisione documenti',
-'settings_enableRevisionWorkflow_desc' => '',
+'settings_enableRevisionWorkflow_desc' => 'Abilita per attivare workflow su revisione documenti dopo scadenza.',
 'settings_enableSelfRevApp' => 'Permetti revisione/approvazione all\'utente registrato',
 'settings_enableSelfRevApp_desc' => 'Abilitare se si desidera aggiungere l\'utente attualmente registrato alla lista dei revisori/approvatori e per le transizioni del flusso di lavoro.',
 'settings_enableThemeSelector' => 'Selezione tema grafico',
@@ -1015,14 +1029,18 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => 'Primo giorno della settimana',
 'settings_footNote' => 'Pié di pagina',
 'settings_footNote_desc' => 'Messaggio da visualizzare alla fine di ogni pagina',
+'settings_fullSearchEngine' => '',
+'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
+'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'ID Ospite',
 'settings_guestID_desc' => 'ID o utenza ospite utilizzata quando collegati al sito come ospite (da cambiare solo in casi eccezionali).',
 'settings_httpRoot' => 'Cartella web principale',
 'settings_httpRoot_desc' => 'Percorso relativo nell\'URL dopo il dominio e senza il prefisso \'http://\'. Es: se l\'URL completo è http://www.esempio.com/SeedDMS/, impostare \'/SeedDMS/\'; se invece l\'URL è http://www.esempio.com/, impostare \'/\'',
-'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus' => 'Stato iniziale documento',
-'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_desc' => 'Stato assegnato quando si aggiunge documento',
-'settings_initialDocumentStatus_draft' => '',
+'settings_initialDocumentStatus_draft' => 'Bozza',
-'settings_initialDocumentStatus_released' => '',
+'settings_initialDocumentStatus_released' => 'Rilasciato',
 'settings_installADOdb' => 'Installa ADOdb',
 'settings_install_disabled' => 'Il file ENABLE_INSTALL_TOOL è stato cancellato. Ora puoi effettuare il login in SeedDMS e fare ulteriori configurazioni.',
 'settings_install_pear_package_log' => 'Installa il registro del pacchetto Pear',
@@ -1033,8 +1051,8 @@ URL: [url]',
 'settings_install_zendframework' => 'Installare il framework Zend, se si intende usufruire del motore di ricerca fulltext.',
 'settings_language' => 'Lingua di default',
 'settings_language_desc' => 'Lingua di default (nome della sottocartella corrispondente nella cartella "languages")',
-'settings_libraryFolder' => '',
+'settings_libraryFolder' => 'Libreria cartelle',
-'settings_libraryFolder_desc' => '',
+'settings_libraryFolder_desc' => 'Cartella dove i documenti possono essere copiati per crearne di nuovi.',
 'settings_logFileEnable' => 'Abilita il file di registro',
 'settings_logFileEnable_desc' => 'Abilita/disabilita il file di registro',
 'settings_logFileRotation' => 'Rotazione del file di registro',
@@ -1056,8 +1074,8 @@ URL: [url]',
 'settings_Notification' => 'Impostazioni di notifica',
 'settings_notwritable' => 'La configurazione non può essere salvata perchè il file di configurazione non può essere sovrascritto.',
 'settings_no_content_dir' => 'Cartella contenitore',
-'settings_overrideMimeType' => '',
+'settings_overrideMimeType' => 'Ignora MimeType',
-'settings_overrideMimeType_desc' => '',
+'settings_overrideMimeType_desc' => 'Ignora il MimeType impostato dal browser, se un file viene caricato. Il MimeType è determinato ed impostato dal DMS stesso.',
 'settings_partitionSize' => 'Dimensione file parziale',
 'settings_partitionSize_desc' => 'Dimensione parziale dei files caricati da Jumploader in bytes. Non impostare un valore maggiore del massimo carico di upload attribuito dal server.',
 'settings_passwordExpiration' => 'Scadenza Password',
@@ -1170,7 +1188,7 @@ URL: [url]',
 'splash_add_user' => 'Utente aggiunto',
 'splash_cleared_clipboard' => 'Appunti cancellati',
 'splash_document_added' => 'Documento aggiunto',
-'splash_document_checkedout' => '',
+'splash_document_checkedout' => 'Documento approvato',
 'splash_document_edited' => 'Documento modificato',
 'splash_document_locked' => 'Documento bloccato',
 'splash_document_unlocked' => 'Documento sbloccato',
@@ -1199,29 +1217,29 @@ URL: [url]',
 'status_approved' => 'Approvato',
 'status_approver_removed' => 'Approvatore rimosso dal processo',
 'status_not_approved' => 'Non ancora approvato',
-'status_not_receipted' => '',
+'status_not_receipted' => 'Non ancora ricevuto',
 'status_not_reviewed' => 'Non ancora revisionato',
-'status_not_revised' => '',
+'status_not_revised' => 'Non revisionato',
-'status_receipted' => '',
+'status_receipted' => 'Ricevuto',
-'status_receipt_rejected' => '',
+'status_receipt_rejected' => 'Rigettato',
-'status_recipient_removed' => '',
+'status_recipient_removed' => 'Cartella rimossa dalla lista',
 'status_reviewed' => 'Revisionato',
 'status_reviewer_rejected' => 'Bozza rifiutata',
 'status_reviewer_removed' => 'Revisore rimosso dal processo',
-'status_revised' => '',
+'status_revised' => 'Revisionato',
-'status_revision_rejected' => '',
+'status_revision_rejected' => 'Rigettato',
-'status_revision_sleeping' => '',
+'status_revision_sleeping' => 'In attesa',
-'status_revisor_removed' => '',
+'status_revisor_removed' => 'Revisore rimosso dalla lista',
 'status_unknown' => 'Sconosciuto',
 'storage_size' => 'Spazio di archiviazione',
 'submit_approval' => 'Invio approvazione',
 'submit_login' => 'Accedi',
 'submit_password' => 'Impostazione nuova password',
 'submit_password_forgotten' => 'Inizio processo di recupero',
-'submit_receipt' => '',
+'submit_receipt' => 'Invio ricevuta',
 'submit_review' => 'Invio revisione',
 'submit_userinfo' => 'Invio info utente',
-'substitute_to_user' => '',
+'substitute_to_user' => 'Cambia in \'[username]\'',
 'substitute_user' => 'Impersona utente',
 'sunday' => 'Domenica',
 'sunday_abbr' => 'Dom',
@@ -1231,6 +1249,7 @@ URL: [url]',
 'takeOverGrpReviewer' => 'Riprendi il gruppo dei revisori dall\'ultima versione.',
 'takeOverIndApprover' => 'Riprendi l\'approvatore dall\'ultima versione.',
 'takeOverIndReviewer' => 'Riprendi il revisore dall\'ultima versione.',
+'tasks' => '',
 'testmail_body' => 'Questo messaggio di posta elettronica è solo un test per verificare la configurazione del repository',
 'testmail_subject' => 'Messaggio di test',
 'theme' => 'Tema',
@@ -1251,18 +1270,18 @@ Cartella: [folder_path]
 Utente: [username]
 URL: [url]',
 'transition_triggered_email_subject' => 'Transizione del flusso di lavoro iniziata',
-'transmittal' => '',
+'transmittal' => 'Trasmissione',
-'transmittalitem_removed' => '',
+'transmittalitem_removed' => 'Oggetto trasmissione rimosso',
-'transmittalitem_updated' => '',
+'transmittalitem_updated' => 'Documento aggiornato alla ultima versione',
-'transmittal_comment' => '',
+'transmittal_comment' => 'Commento',
-'transmittal_name' => '',
+'transmittal_name' => 'Nome',
-'transmittal_size' => '',
+'transmittal_size' => 'Dimensione',
 'trigger_workflow' => 'Flusso di lavoro',
 'tr_TR' => 'Turco',
 'tuesday' => 'Martedì',
 'tuesday_abbr' => 'Mar',
 'type_to_search' => 'Digitare per cercare',
-'uk_UA' => '',
+'uk_UA' => 'Ucraino',
 'under_folder' => 'Nella cartella',
 'unknown_attrdef' => 'Attributo sconosciuto',
 'unknown_command' => 'Comando non riconosciuto',
@@ -1285,10 +1304,10 @@ URL: [url]',
 'update_fulltext_index' => 'Aggiorna indice fulltext',
 'update_info' => 'Aggiorna informazioni',
 'update_locked_msg' => 'Questo documento è bloccato.',
-'update_recipients' => '',
+'update_recipients' => 'Aggiorna lista cartelle',
 'update_reviewers' => 'Aggiorna lista revisori',
-'update_revisors' => '',
+'update_revisors' => 'Aggiorna lista dei revisori',
-'update_transmittalitem' => '',
+'update_transmittalitem' => 'Aggiorna alla ultima versione del documento',
 'uploaded_by' => 'Caricato da',
 'uploading_failed' => 'Upload fallito. Controllare la dimensione massima caricabile consentita.',
 'uploading_maxsize' => 'Il file caricato supera la dimensione massima consentita.',

languages/nl_NL/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (694), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (703), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 'accept' => 'Accept',
@@ -269,6 +269,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documenten die wachten op uw controle',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Eigen documenten die (nog) aandacht behoeven',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Dit document is al geblokkeerd',
@@ -465,6 +466,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => 'Elk uur',
 'hours' => 'uren',
+'hr_HR' => 'Kroatisch',
 'human_readable' => 'Leesbaar Archief',
 'hu_HU' => 'Hongaars',
 'id' => 'ID',
@@ -527,6 +529,7 @@ URL: [url]',
 'keep_doc_status' => 'Behoud document status',
 'keywords' => 'Sleutelwoorden',
 'keyword_exists' => 'Sleutelwoord bestaat al',
+'ko_KR' => 'Koreaans',
 'language' => 'Talen',
 'lastaccess' => '',
 'last_update' => 'Laatste Update',
@@ -651,7 +654,9 @@ URL: [url]',
 'no_group_members' => 'Deze Groep heeft geen leden',
 'no_linked_files' => 'Geen gekoppelde bestanden',
 'no_previous_versions' => 'Geen andere versie(s) gevonden',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Geen review bezig.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'U kunt daarom dit document niet bijwerken. Neem contact op met de persoon die het document heeft geblokkeerd.',
 'no_user_image' => 'Geen afbeelding(en) gevonden',
@@ -833,15 +838,15 @@ URL: [url]',
 'search_fulltext' => 'Zoek in volledige tekst',
 'search_in' => 'Zoek in',
 'search_mode_and' => 'alle woorden',
-'search_mode_documents' => '',
+'search_mode_documents' => 'Alleen documenten',
-'search_mode_folders' => '',
+'search_mode_folders' => 'Alleen mappen',
 'search_mode_or' => 'tenminste 1 woord',
 'search_no_results' => 'Er zijn geen documenten gevonden die aan uw zoekvraag voldoen',
 'search_query' => 'Zoeken naar',
 'search_report' => '[count] documenten en [foldercount] mappen gevonden in [searchtime] sec.',
 'search_report_fulltext' => '[doccount] documenten gevonden',
-'search_resultmode' => '',
+'search_resultmode' => 'Zoek resultaat',
-'search_resultmode_both' => '',
+'search_resultmode_both' => 'Documenten en mappen',
 'search_results' => 'Zoekresultaten',
 'search_results_access_filtered' => 'Zoekresultaten kunnen inhoud bevatten waar U geen toegang toe heeft.',
 'search_time' => 'Verstreken tijd: [time] sec.',
@@ -876,6 +881,10 @@ URL: [url]',
 'settings_Advanced' => 'Uitgebreid',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Authenticatie instellingen',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
+'settings_backupDir' => '',
+'settings_backupDir_desc' => '',
 'settings_cacheDir' => 'cache directory',
 'settings_cacheDir_desc' => 'Waar de voorbeeld afbeeldingen zijn opgeslagen (het is het beste om te kiezen voor een pad, welke niet toegankelijk is door uw webserver)',
 'settings_Calendar' => 'Kalender instellingen',
@@ -884,6 +893,8 @@ URL: [url]',
 'settings_cannot_disable' => 'Bestand ENABLE_INSTALL_TOOL kon niet verwijderd worden',
 'settings_checkOutDir' => '',
 'settings_checkOutDir_desc' => '',
+'settings_cmdTimeout' => '',
+'settings_cmdTimeout_desc' => '',
 'settings_contentDir' => 'Inhoud map',
 'settings_contentDir_desc' => 'Waar de verzonden bestande opgeslagen worden (Kan het beste een map zijn die niet benaderbaar is voor de webserver.)',
 'settings_contentOffsetDir' => 'Inhouds Basis Map',
@@ -943,6 +954,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Laat selector zien voor taalinterface, nadat gebruikers inloggen.',
 'settings_enableLargeFileUpload' => 'Inschakelen groot bestand upload',
 'settings_enableLargeFileUpload_desc' => 'Indien ingeschakeld, is bestandsupload ook beschikbaar via een java applet jumploader genaamd zonder een bestandsgrootte limiet door de browser. Het staat ook toe om meerdere bestanden in een keer te versturen.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Inschakelen controleur/beoordeler notificatie',
 'settings_enableNotificationAppRev_desc' => 'Vink aan om een notificatie te versturen naar de controleur/beoordeler als een nieuw document versie is toegevoegd.',
 'settings_enableNotificationWorkflow' => '',
@@ -984,6 +997,10 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => 'Eerste dag van de week',
 'settings_footNote' => 'Onderschrift',
 'settings_footNote_desc' => 'Bericht om onderop elke pagina te tonen',
+'settings_fullSearchEngine' => '',
+'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
+'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'Gast ID',
 'settings_guestID_desc' => 'ID van gastgebruiker gebruikt indien ingelogd als gast (meestal geen wijziging nodig)',
 'settings_httpRoot' => 'Http Basis',
@@ -1200,6 +1217,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => 'Deze mail dient enkel voor het testen van de mail configuratie van SeedDMS',
 'testmail_subject' => 'Test mail',
 'theme' => 'Thema',
@@ -1231,7 +1249,7 @@ URL: [url]',
 'tuesday' => 'Dinsdag',
 'tuesday_abbr' => 'Tu',
 'type_to_search' => 'voer in om te zoeken',
-'uk_UA' => '',
+'uk_UA' => 'Oekraïne',
 'under_folder' => 'In map',
 'unknown_attrdef' => 'Onbekende attribuut definitie',
 'unknown_command' => 'Opdracht niet herkend.',

languages/pl_PL/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (707), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (710), netixw (84), romi (93), uGn (112)
 
 $text = array(
 'accept' => 'Akceptuj',
@@ -269,6 +269,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty oczekujące na Twoją recenzję',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dokumenty należące do Ciebie, które wymagają uwagi',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Ten dokument jest już zablokowany',
@@ -465,6 +466,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => 'Co godzinę',
 'hours' => 'godzin',
+'hr_HR' => '',
 'human_readable' => 'Archiwum czytelne dla człowieka',
 'hu_HU' => 'Węgierski',
 'id' => 'ID',
@@ -527,6 +529,7 @@ URL: [url]',
 'keep_doc_status' => 'Pozostaw status dokumentu',
 'keywords' => 'Słowa kluczowe',
 'keyword_exists' => 'Słowo kluczowe już istnieje',
+'ko_KR' => '',
 'language' => 'Język',
 'lastaccess' => 'Ostatni dostęp',
 'last_update' => 'Ostatnia aktualizacja',
@@ -652,7 +655,9 @@ URL: [url]',
 'no_group_members' => 'Ta grupa nie ma członków',
 'no_linked_files' => 'Brak powiązanych dokumentów',
 'no_previous_versions' => 'Nie znaleziono poprzednich wersji',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Brak dokumentów w trakcie opiniowania.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Nie możesz zaktualizować tego dokumentu. Proszę skontaktuj się z osobą która go blokuje.',
 'no_user_image' => 'Nie znaleziono obrazu',
@@ -864,6 +869,10 @@ URL: [url]',
 'settings_Advanced' => 'Zaawansowane',
 'settings_apache_mod_rewrite' => 'Apache - Moduł Rewrite',
 'settings_Authentication' => 'Ustawienia uwierzytelniania',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
+'settings_backupDir' => '',
+'settings_backupDir_desc' => '',
 'settings_cacheDir' => 'Folder bufora',
 'settings_cacheDir_desc' => 'Miejsce przechowywania obrazków podglądu (najlepiej wybrać katalog nie dostępny bezpośrednio dla web-serwera).',
 'settings_Calendar' => 'Ustawienia kalendarza',
@@ -872,6 +881,8 @@ URL: [url]',
 'settings_cannot_disable' => 'Plik ENABLE_INSTALL_TOOL nie może zostać usunięty',
 'settings_checkOutDir' => '',
 'settings_checkOutDir_desc' => '',
+'settings_cmdTimeout' => '',
+'settings_cmdTimeout_desc' => '',
 'settings_contentDir' => 'Katalog treści',
 'settings_contentDir_desc' => 'Miejsce, gdzie będą przechowywane wczytane pliki (najlepien wybrać katalog, który nie jest dostępny dla serwera http)',
 'settings_contentOffsetDir' => 'Offset katalogu treści',
@@ -931,6 +942,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Pokaż selektor języka dla interfejsu użytkownika po zalogowaniu To nie ma wpływu na wybór języka na stronie logowania.',
 'settings_enableLargeFileUpload' => 'Zezwól na wczytywanie dużych plików',
 'settings_enableLargeFileUpload_desc' => 'Jeśli zaznaczone, wczytywanie plików będzie możliwe również przez aplet javy nazywany jumploader bez limitu rozmiaru plików. Aplet ten pozwala również na wczytywanie wielu plików jednocześnie.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Włącz/Wyłącz powiadomienia dla zatwierdzających/recenzentów',
 'settings_enableNotificationAppRev_desc' => 'Zaznacz aby wysyłać powiadomienia do zatwierdzających i recenzentów kiedy pojawi się nowa wersja dokumentu',
 'settings_enableNotificationWorkflow' => '',
@@ -972,6 +985,10 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => 'Pierwszy dzień tygodnia',
 'settings_footNote' => 'Treść stopki',
 'settings_footNote_desc' => 'Wiadomość wyświetlana na dole każdej strony',
+'settings_fullSearchEngine' => '',
+'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
+'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'ID gościa',
 'settings_guestID_desc' => 'ID gościa używane kiedy gość jest zalogowany (zazwyczaj nie wymaga zmiany)',
 'settings_httpRoot' => 'Http Root',
@@ -1188,6 +1205,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => 'To jest mail testowy SeedDMS',
 'testmail_subject' => 'Wiadomość testowa',
 'theme' => 'Wygląd',
@@ -1219,7 +1237,7 @@ URL: [url]',
 'tuesday' => 'Wtorek',
 'tuesday_abbr' => 'Wt',
 'type_to_search' => 'Wpisz wyszukiwane',
-'uk_UA' => '',
+'uk_UA' => 'Ukrainski',
 'under_folder' => 'W folderze',
 'unknown_attrdef' => '',
 'unknown_command' => 'Polecenie nie rozpoznane.',

languages/pt_BR/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (878), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (889), flaviove (627), lfcristofoli (352)
 
 $text = array(
 'accept' => 'Aceitar',
@@ -276,6 +276,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents Awaiting User\'s Review',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documents Owned by User That Require Attention',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Este documento já está travado',
@@ -344,7 +345,7 @@ URL: [url]',
 'do_object_setfilesize' => 'Defina o tamanho do arquivo',
 'do_object_unlink' => 'Excluir versão do documento',
 'draft' => '',
-'draft_pending_approval' => '',
+'draft_pending_approval' => 'Rascunho - Aprovação pendente',
 'draft_pending_review' => 'Draft - pending review',
 'drag_icon_here' => 'Arraste ícone de pasta ou documento para aqui!',
 'dropfolder_file' => 'Arquivo de pasta suspensa',
@@ -471,6 +472,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => 'De hora em hora',
 'hours' => 'horas',
+'hr_HR' => 'Croata',
 'human_readable' => 'Human readable archive',
 'hu_HU' => 'Húngaro',
 'id' => 'ID',
@@ -533,6 +535,7 @@ URL: [url]',
 'keep_doc_status' => 'Mantenha status do documento',
 'keywords' => 'Palavras-chave',
 'keyword_exists' => 'Keyword already exists',
+'ko_KR' => 'Coreano',
 'language' => 'Idioma',
 'lastaccess' => 'Último acesso',
 'last_update' => 'última versão',
@@ -657,7 +660,9 @@ URL: [url]',
 'no_group_members' => 'Este grupo não tem membros',
 'no_linked_files' => 'Não há arquivos vinculados',
 'no_previous_versions' => 'No other versions found',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Nenhuma revisão pendente.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Por isso você não pode atualizar este documento. Por favor contacte usuário que poáui a trava.',
 'no_user_image' => 'não foi encontrado imagem de perfil',
@@ -839,15 +844,15 @@ URL: [url]',
 'search_fulltext' => 'Pesquisa em texto completo',
 'search_in' => 'Busca em',
 'search_mode_and' => 'todas as palavras',
-'search_mode_documents' => '',
+'search_mode_documents' => 'Só Documentos',
-'search_mode_folders' => '',
+'search_mode_folders' => 'Só Pastas',
 'search_mode_or' => 'at least one word',
 'search_no_results' => 'não há documento que satisfaçam sua busca',
 'search_query' => 'Busca por',
 'search_report' => 'Encontrados [count] documentos',
 'search_report_fulltext' => 'Encontrados [doccount] documentos',
-'search_resultmode' => '',
+'search_resultmode' => 'Resultados da Busca',
-'search_resultmode_both' => '',
+'search_resultmode_both' => 'Documentos e Pastas',
 'search_results' => 'Resultados da busca',
 'search_results_access_filtered' => 'Search results may contain content to which access has been denied.',
 'search_time' => 'Tempo decorrido: [time] sec.',
@@ -882,6 +887,10 @@ URL: [url]',
 'settings_Advanced' => 'Avançado',
 'settings_apache_mod_rewrite' => 'Apache - Módulo Rewrite',
 'settings_Authentication' => 'Definições de autenticação',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
+'settings_backupDir' => '',
+'settings_backupDir_desc' => '',
 'settings_cacheDir' => 'Diretório de cache',
 'settings_cacheDir_desc' => 'Onde as imagens de visualização são armazenadas (melhor escolher um diretório que não é acessível através de seu web-server)',
 'settings_Calendar' => 'Configurações do calendário',
@@ -890,6 +899,8 @@ URL: [url]',
 'settings_cannot_disable' => 'Arquivo ENABLE_INSTALL_TOOL não pode ser eliminado',
 'settings_checkOutDir' => '',
 'settings_checkOutDir_desc' => '',
+'settings_cmdTimeout' => '',
+'settings_cmdTimeout_desc' => '',
 'settings_contentDir' => 'Diretório de conteúdo',
 'settings_contentDir_desc' => 'Onde arquivos enviados são armazenados (melhor escolher um diretório que não é acessível através de seu web-server)',
 'settings_contentOffsetDir' => 'Pasta de Compensação de Conteúdo',
@@ -949,6 +960,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Mostrar seletor para idioma de interface de usuário após login.',
 'settings_enableLargeFileUpload' => 'Ativar envio de grandes arquivos',
 'settings_enableLargeFileUpload_desc' => 'Se selecionado, o upload de arquivo também estará disponível através de um applet java chamado jumploader sem limite de tamanho de arquivo definido pelo navegador. Ele também permite fazer o upload de vários arquivos de uma só vez.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Habilitar notificações revisor/aprovador',
 'settings_enableNotificationAppRev_desc' => 'Verificar o envio de uma notificação para o revisor/aprovador quando uma nova versão do documento for adicionada',
 'settings_enableNotificationWorkflow' => '',
@@ -990,6 +1003,10 @@ 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_desc' => '',
+'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
+'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'ID convidado',
 'settings_guestID_desc' => 'ID do usuário-convidado  usada quando conectado como convidado (na maioria das vezes não há necessidade de mudar)',
 'settings_httpRoot' => 'Raiz Http',
@@ -1125,7 +1142,7 @@ URL: [url]',
 'settings_workflowMode_desc' => 'O fluxo de trabalho avançado permite especificar seu próprio fluxo de trabalho de liberação de versões de documentos.',
 'settings_workflowMode_valadvanced' => 'avançado',
 'settings_workflowMode_valtraditional' => 'tradicional',
-'settings_workflowMode_valtraditional_only_approval' => '',
+'settings_workflowMode_valtraditional_only_approval' => 'tradicional (sem revisão)',
 'settings_zendframework' => 'Zend Framework',
 'set_expiry' => 'Configurar Expiração',
 'set_owner' => 'Define proprietário',
@@ -1206,6 +1223,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => 'Este e-mail é apenas para testar a configuração de correio de SeedDMS',
 'testmail_subject' => 'Email Teste',
 'theme' => 'Tema',
@@ -1237,7 +1255,7 @@ URL: [url]',
 'tuesday' => 'Tuesday',
 'tuesday_abbr' => 'Tu',
 'type_to_search' => 'Tipo de pesquisa',
-'uk_UA' => '',
+'uk_UA' => 'Ucraniano',
 'under_folder' => 'Na pasta',
 'unknown_attrdef' => 'Definição de atributo desconhecido',
 'unknown_command' => 'Command not recognized.',

languages/ro_RO/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1005), balan (87)
+//    Translators: Admin (1007), balan (87)
 
 $text = array(
 'accept' => 'Accept',
@@ -281,6 +281,7 @@ URL: [url]',
 'documents_to_receipt' => 'Documente in asteptare pentru confirmarea primirii',
 'documents_to_review' => 'Documente care așteaptă revizuirea dumneavoastră',
 'documents_to_revise' => 'Documente de revizut',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documente deținute de tine care necesită atenție',
 'document_already_checkedout' => 'Acest document este deja verificat',
 'document_already_locked' => 'Acest document este deja blocat',
@@ -477,6 +478,7 @@ URL: [url]',
 'home_folder' => 'Folder Home',
 'hourly' => 'Orare',
 'hours' => 'ore',
+'hr_HR' => '',
 'human_readable' => 'Arhivă lizibilă omului',
 'hu_HU' => 'Ungureste',
 'id' => 'ID',
@@ -539,6 +541,7 @@ URL: [url]',
 'keep_doc_status' => 'Păstrați status document',
 'keywords' => 'Cuvinte cheie',
 'keyword_exists' => 'Cuvant cheie existent deja',
+'ko_KR' => '',
 'language' => 'Limbă',
 'lastaccess' => 'Ultima accesare',
 'last_update' => 'Ultima actualizare',
@@ -664,7 +667,9 @@ URL: [url]',
 'no_group_members' => 'Acest grup nu are membri',
 'no_linked_files' => 'Nici un fișiere asociate',
 'no_previous_versions' => 'Nu sunt alte versiuni gasite',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Nici o revizuire în așteptare.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Deci, nu puteti sa actualizati acest document. Vă rugăm să contactați administratorul.',
 'no_user_image' => 'Nu au fost găsite imagini',
@@ -907,6 +912,10 @@ URL: [url]',
 'settings_Advanced' => 'Avansat',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Setări de autentificare',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
+'settings_backupDir' => '',
+'settings_backupDir_desc' => '',
 'settings_cacheDir' => 'Director Cache',
 'settings_cacheDir_desc' => 'Unde sunt stocate imaginile de previzualizare (este recomandat sa alegeti un director care nu este accesibil prin intermediul web-server-ului dumneavoastră)',
 'settings_Calendar' => 'Setări calendar',
@@ -915,6 +924,8 @@ URL: [url]',
 'settings_cannot_disable' => 'Fișierul ENABLE_INSTALL_TOOL nu a putut fi șters',
 'settings_checkOutDir' => 'Director pentru documente verificate',
 'settings_checkOutDir_desc' => 'Acesta este directorul unde se copie ultimul continut al unui document daca documentul este verificat. Daca faceti acest director accesibil pentru utilizatori, ei pot edita fisierul si ii pot face iar check in cand au terminat.',
+'settings_cmdTimeout' => '',
+'settings_cmdTimeout_desc' => '',
 'settings_contentDir' => 'Director conținut',
 'settings_contentDir_desc' => 'Unde sunt stocate  fișierele încărcate (este recomandat sa alegeti un director care nu este accesibil prin intermediul web-server-ului dumneavoastră)',
 'settings_contentOffsetDir' => 'Conținut Director Offset',
@@ -974,6 +985,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Arată selectorul de limbă pentru interfața cu utilizatorul după ce a fost autentificat.',
 'settings_enableLargeFileUpload' => 'Activare încărcare fișier mare',
 'settings_enableLargeFileUpload_desc' => 'Dacă este setat, incărcarea este de asemenea disponibilă prin intermediul unui applet Java numit jumploader fără limită de dimensiune a fișierului stabilită de browser. De asemenea, permite încărcarea mai multor fișiere într-un singur pas. Activand aceasta optiune va dezactiva optiunea http only cookies.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Activare notificari rezuitor/aprobator',
 'settings_enableNotificationAppRev_desc' => 'Bifati pentru a trimite o notificare către revizuitor/aprobator când se adaugă o nouă versiune la document',
 'settings_enableNotificationWorkflow' => 'Trimite notificare utilizatorilor din urmatorul pas al workflow-ului',
@@ -1015,6 +1028,10 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => 'Prima zi a săptămânii',
 'settings_footNote' => 'Notă de subsol',
 'settings_footNote_desc' => 'Mesaj pentru afișat în partea de jos a fiecarei pagini',
+'settings_fullSearchEngine' => '',
+'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
+'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'ID oaspete',
 'settings_guestID_desc' => 'ID-ul utilizatorului oaspete folosit când la Logarea ca oaspete (de cele mai multe ori nu este nevoie să se schimbe)',
 'settings_httpRoot' => 'Http Root',
@@ -1231,6 +1248,7 @@ URL: [url]',
 'takeOverGrpReviewer' => 'Preia grupul de revizuitori din ultima versiune.',
 'takeOverIndApprover' => 'Preia aprobatorul individual din ultima versiune.',
 'takeOverIndReviewer' => 'Preia revizuitorul individual din ultima versiune.',
+'tasks' => '',
 'testmail_body' => 'Acest e-mail este doar pentru testarea configurarea email din SeedDMS',
 'testmail_subject' => 'Mail de test',
 'theme' => 'Temă',

languages/ru_RU/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1251)
+//    Translators: Admin (1260)
 
 $text = array(
 'accept' => 'Принять',
@@ -188,12 +188,12 @@ URL: [url]',
 'charts' => 'Диаграммы',
 'chart_docsaccumulated_title' => 'Количество документов',
 'chart_docspercategory_title' => '',
-'chart_docspermimetype_title' => '',
+'chart_docspermimetype_title' => 'Документы по mime типам',
-'chart_docspermonth_title' => '',
+'chart_docspermonth_title' => 'Новые документы за месяц',
-'chart_docsperstatus_title' => '',
+'chart_docsperstatus_title' => 'Документы по статусу',
 'chart_docsperuser_title' => 'Документы на пользователя',
-'chart_selection' => '',
+'chart_selection' => 'Выбор графика',
-'chart_sizeperuser_title' => '',
+'chart_sizeperuser_title' => 'Занятое дисковое пространство по пользователям',
 'checkedout_file_has_different_version' => '',
 'checkedout_file_has_disappeared' => '',
 'checkedout_file_is_unchanged' => '',
@@ -269,6 +269,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Документы, ожидающие вашей рецензии',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Ваши документы, требующие внимания',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Документ уже заблокирован',
@@ -465,6 +466,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => 'Ежечасно',
 'hours' => 'часы',
+'hr_HR' => '',
 'human_readable' => 'Понятный человеку архив',
 'hu_HU' => 'Hungarian',
 'id' => 'Идентификатор',
@@ -527,6 +529,7 @@ URL: [url]',
 'keep_doc_status' => 'Сохранить статус документа',
 'keywords' => 'Метки',
 'keyword_exists' => 'Метка существует',
+'ko_KR' => '',
 'language' => 'Язык',
 'lastaccess' => '',
 'last_update' => 'Последнее обновление',
@@ -651,7 +654,9 @@ URL: [url]',
 'no_group_members' => 'Группа не имеет членов',
 'no_linked_files' => 'Нет связанных документов',
 'no_previous_versions' => 'Нет предыдущих версий',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Рецензия не требуется',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Вы не можете обновить документ. Свяжитесь с заблокировавшим его пользователем.',
 'no_user_image' => 'Изображение не найдено',
@@ -875,6 +880,10 @@ URL: [url]',
 'settings_Advanced' => 'Дополнительно',
 'settings_apache_mod_rewrite' => 'Apache — модуль Rewrite',
 'settings_Authentication' => 'Настройки авторизации',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
+'settings_backupDir' => '',
+'settings_backupDir_desc' => '',
 'settings_cacheDir' => 'Каталог кэша',
 'settings_cacheDir_desc' => 'Где хранятся эскизы изображений (лучше выбрать каталог недоступный веб-серверу).',
 'settings_Calendar' => 'Настройки календаря',
@@ -883,6 +892,8 @@ URL: [url]',
 'settings_cannot_disable' => 'Невозможно удалить ENABLE_INSTALL_TOOL',
 'settings_checkOutDir' => '',
 'settings_checkOutDir_desc' => '',
+'settings_cmdTimeout' => '',
+'settings_cmdTimeout_desc' => '',
 'settings_contentDir' => 'Каталог содержимого',
 'settings_contentDir_desc' => 'Куда сохраняются загруженные файлы (лучше выбрать каталог недоступный веб-серверу).',
 'settings_contentOffsetDir' => 'Базовый начальный каталог',
@@ -942,6 +953,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Показывать меню выбора языка пользовательского интерфейса после входа в систему. Это не влияет на выбор языка на странице входа.',
 'settings_enableLargeFileUpload' => 'Включить Java-загрузчик файлов',
 'settings_enableLargeFileUpload_desc' => 'Если включено, загрузка файлов доступна так же через Java-апплет, называемый jumploader, без ограничения размера файла. Это также позволит загружать несколько файлов за раз.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Извещать рецензента или утверждающего',
 'settings_enableNotificationAppRev_desc' => 'Включите для отправки извещения рецензенту или утверждающему при добавлении новой версии документа.',
 'settings_enableNotificationWorkflow' => '',
@@ -983,6 +996,10 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => 'Первый день недели.',
 'settings_footNote' => 'Нижний колонтитул',
 'settings_footNote_desc' => 'Сообщение, показываемое внизу каждой страницы.',
+'settings_fullSearchEngine' => '',
+'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
+'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'Идентификатор гостя',
 'settings_guestID_desc' => 'Идентификатор гостя (можно не изменять).',
 'settings_httpRoot' => 'Корень http',
@@ -1047,10 +1064,10 @@ URL: [url]',
 'settings_php_version' => 'Версия PHP',
 'settings_presetExpirationDate' => '',
 'settings_presetExpirationDate_desc' => '',
-'settings_previewWidthDetail' => '',
+'settings_previewWidthDetail' => 'Ширина картинок предварительного просмотра (детально)',
 'settings_previewWidthDetail_desc' => 'Ширина изображения для предпросмотра на странице информации',
 'settings_previewWidthList' => 'Ширина изображения для предпросмотра (список)',
-'settings_previewWidthList_desc' => '',
+'settings_previewWidthList_desc' => 'Ширина картинок предварительного просмотра показана в списках',
 'settings_printDisclaimer' => 'Выводить предупреждение',
 'settings_printDisclaimer_desc' => 'Если включено, то предупреждение из lang.inc будет выводится внизу каждой страницы.',
 'settings_quota' => 'Квота пользователя',
@@ -1199,6 +1216,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => 'Это тестовое письмо для проверки настроек почты SeedDMS',
 'testmail_subject' => 'Тестовое письмо',
 'theme' => 'Тема',

languages/sk_SK/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (462)
+//    Translators: Admin (478)
 
 $text = array(
 'accept' => 'Prijať',
@@ -170,14 +170,14 @@ $text = array(
 'change_recipients' => '',
 'change_revisors' => '',
 'change_status' => 'Zmeniť stav',
-'charts' => '',
+'charts' => 'Grafy',
-'chart_docsaccumulated_title' => '',
+'chart_docsaccumulated_title' => 'Počet dokumentov',
-'chart_docspercategory_title' => '',
+'chart_docspercategory_title' => 'Dokumenty podľa kategórie',
 'chart_docspermimetype_title' => '',
-'chart_docspermonth_title' => '',
+'chart_docspermonth_title' => 'Nové dokumenty za mesiac',
-'chart_docsperstatus_title' => '',
+'chart_docsperstatus_title' => 'Dokumenty podľa stavu',
-'chart_docsperuser_title' => '',
+'chart_docsperuser_title' => 'Dokumenty podľa používateľa',
-'chart_selection' => '',
+'chart_selection' => 'Vyber graf',
 'chart_sizeperuser_title' => '',
 'checkedout_file_has_different_version' => '',
 'checkedout_file_has_disappeared' => '',
@@ -237,7 +237,7 @@ $text = array(
 'december' => 'December',
 'default_access' => 'Štandardný režim prístupu',
 'default_keywords' => 'Dostupné kľúčové slová',
-'definitions' => '',
+'definitions' => 'Definície',
 'delete' => 'Zmazať',
 'details' => 'Podrobnosti',
 'details_version' => 'Podrobnosti verzie: [version]',
@@ -254,6 +254,7 @@ $text = array(
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čakajúce na kontrolu používateľa',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dokumenty, ktoré používateľ vlastní a vyžadujú pozornosť',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Tento dokument je už zamknutý',
@@ -297,7 +298,7 @@ $text = array(
 'draft_pending_review' => 'Návrh - čaká na kontrolu',
 'drag_icon_here' => 'Sem myšou pretiahnite ikonu, zložku alebo dokument',
 'dropfolder_file' => '',
-'dropupload' => '',
+'dropupload' => 'Rýchlo nahraj',
 'drop_files_here' => 'Sem vložte súbory!',
 'dump_creation' => 'Vytvorenie výstupu DB',
 'dump_creation_warning' => 'Touto akciou môžete vytvoriť výstup obsahu Vašej databázy. Po vytvorení bude výstup uložený v dátovej zložke vášho servera.',
@@ -396,6 +397,7 @@ $text = array(
 'home_folder' => '',
 'hourly' => '',
 'hours' => '',
+'hr_HR' => '',
 'human_readable' => 'Použivateľský archív',
 'hu_HU' => 'Maďarčina',
 'id' => 'ID',
@@ -458,6 +460,7 @@ $text = array(
 'keep_doc_status' => '',
 'keywords' => 'Kľúčové slová',
 'keyword_exists' => 'Kľúčové slovo už existuje',
+'ko_KR' => '',
 'language' => 'Jazyk',
 'lastaccess' => '',
 'last_update' => 'Posledná aktualizácia',
@@ -495,7 +498,7 @@ $text = array(
 'may' => 'Máj',
 'mimetype' => '',
 'minutes' => '',
-'misc' => '',
+'misc' => 'Rôzne',
 'missing_checksum' => '',
 'missing_filesize' => '',
 'missing_transition_user_group' => '',
@@ -559,7 +562,9 @@ $text = array(
 'no_group_members' => 'Táto skupina nemá žiadnych členov',
 'no_linked_files' => 'No linked files',
 'no_previous_versions' => 'Neboli nájdené žiadne iné verzie',
+'no_receipt_needed' => '',
 'no_review_needed' => 'No review pending.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Preto nemôžete aktualizovať tento dokument. Prosím, kontaktujte používateľa, ktorý ho zamkol.',
 'no_user_image' => 'nebol nájdený žiadny obrázok',
@@ -706,7 +711,7 @@ $text = array(
 'search_time' => 'Uplynulý čas: [time] sek',
 'seconds' => '',
 'selection' => 'Výber',
-'select_category' => '',
+'select_category' => 'Vyber kategóriu',
 'select_groups' => '',
 'select_grp_approvers' => '',
 'select_grp_notification' => '',
@@ -735,6 +740,10 @@ $text = array(
 'settings_Advanced' => '',
 'settings_apache_mod_rewrite' => '',
 'settings_Authentication' => '',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
+'settings_backupDir' => '',
+'settings_backupDir_desc' => '',
 'settings_cacheDir' => '',
 'settings_cacheDir_desc' => '',
 'settings_Calendar' => '',
@@ -743,6 +752,8 @@ $text = array(
 'settings_cannot_disable' => '',
 'settings_checkOutDir' => '',
 'settings_checkOutDir_desc' => '',
+'settings_cmdTimeout' => '',
+'settings_cmdTimeout_desc' => '',
 'settings_contentDir' => '',
 'settings_contentDir_desc' => '',
 'settings_contentOffsetDir' => '',
@@ -802,6 +813,8 @@ $text = array(
 'settings_enableLanguageSelector_desc' => '',
 'settings_enableLargeFileUpload' => '',
 'settings_enableLargeFileUpload_desc' => '',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',
@@ -843,6 +856,10 @@ $text = array(
 'settings_firstDayOfWeek_desc' => '',
 'settings_footNote' => '',
 'settings_footNote_desc' => '',
+'settings_fullSearchEngine' => '',
+'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
+'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => '',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => '',
@@ -1059,6 +1076,7 @@ $text = array(
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => '',
 'testmail_subject' => '',
 'theme' => 'Vzhľad',
@@ -1080,12 +1098,12 @@ $text = array(
 'tr_TR' => 'Turecky',
 'tuesday' => 'Utorok',
 'tuesday_abbr' => '',
-'type_to_search' => '',
+'type_to_search' => 'Vyhľadať typ',
-'uk_UA' => '',
+'uk_UA' => 'Ukrajinsky',
 'under_folder' => 'V zložke',
 'unknown_attrdef' => '',
 'unknown_command' => 'Príkaz nebol rozpoznaný.',
-'unknown_document_category' => '',
+'unknown_document_category' => 'Neznáma kategória',
 'unknown_group' => 'Neznámy ID skupiny',
 'unknown_id' => 'Neznáme ID',
 'unknown_keyword_category' => 'Neznáma kategória',

languages/sv_SE/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1089), tmichelfelder (106)
+//    Translators: Admin (1096), tmichelfelder (106)
 
 $text = array(
 'accept' => 'Godkänn',
@@ -269,6 +269,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokument som du behöver granska',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dokument som du behöver granska/godkänna',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Detta dokument är redan låst',
@@ -348,7 +349,7 @@ URL: [url]',
 'dump_creation_warning' => 'Med denna funktion kan du skapa en dumpfil av innehållet i din databas. När dumpfilen har skapats, kommer den att sparas i datamappen på servern.',
 'dump_list' => 'Befintliga dumpfiler',
 'dump_remove' => 'Ta bort dumpfil',
-'duplicate_content' => '',
+'duplicate_content' => 'Duplicera innehåll',
 'edit' => 'Ändra',
 'edit_attributes' => 'Ändra attribut',
 'edit_comment' => 'Ändra kommentar',
@@ -465,6 +466,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => 'timvis',
 'hours' => 'timmar',
+'hr_HR' => 'Kroatiska',
 'human_readable' => 'Arkiv som är läsbart av användare',
 'hu_HU' => 'ungerska',
 'id' => 'ID',
@@ -527,6 +529,7 @@ URL: [url]',
 'keep_doc_status' => 'Bibehåll dokumentstatus',
 'keywords' => 'Nyckelord',
 'keyword_exists' => 'Nyckelordet finns redan',
+'ko_KR' => 'Koreanska',
 'language' => 'Språk',
 'lastaccess' => '',
 'last_update' => 'Senast uppdaterat',
@@ -652,7 +655,9 @@ URL: [url]',
 'no_group_members' => 'Denna grupp har inga medlemmar',
 'no_linked_files' => 'Inga länkade dokumenter',
 'no_previous_versions' => 'Inga andra versioner hittades.',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Det finns inga dokument som du behöver granska.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Därför kan du inte uppdatera detta dokument. Ta kontakt med användaren som låst dokumentet.',
 'no_user_image' => 'Ingen bild hittades',
@@ -702,7 +707,7 @@ URL: [url]',
 'pt_BR' => 'portugisiska (BR)',
 'quota' => 'Kvot',
 'quota_exceeded' => 'Din minneskvot har överskridits med [bytes].',
-'quota_is_disabled' => '',
+'quota_is_disabled' => 'Kvot stöd är för närvarande inaktiverad i inställningarna. Ställa in en användarkvot kommer att ha någon effekt förrän den är aktiverad igen.',
 'quota_warning' => 'Din maximala minneskvot har överskridits med [bytes]. Ta bort dokument eller tidigare versioner.',
 'receipt_log' => '',
 'receipt_summary' => '',
@@ -870,6 +875,10 @@ URL: [url]',
 'settings_Advanced' => 'Avancerat',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Autentiseringsinställningar',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
+'settings_backupDir' => '',
+'settings_backupDir_desc' => '',
 'settings_cacheDir' => 'Cache-mapp',
 'settings_cacheDir_desc' => 'Här kommer bilder för förhandsvisning att sparas. (Det är bäst att använda en mapp som inte är tillgänglig från webbservern)',
 'settings_Calendar' => 'Kalenderinställningar',
@@ -878,6 +887,8 @@ URL: [url]',
 'settings_cannot_disable' => 'Filen ENABLE_INSTALL_TOOL kunde inte tas bort',
 'settings_checkOutDir' => '',
 'settings_checkOutDir_desc' => '',
+'settings_cmdTimeout' => '',
+'settings_cmdTimeout_desc' => '',
 'settings_contentDir' => 'Mapp för innehållet',
 'settings_contentDir_desc' => 'Mappen där alla uppladdade filer kommer att sparas. (Det bästa är att välja en mapp som inte är tillgänglig från webbservern)',
 'settings_contentOffsetDir' => 'Innehåll offset-mapp',
@@ -937,6 +948,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Visa språkurval i användargränssnittet efter inloggning.',
 'settings_enableLargeFileUpload' => 'Aktivera uppladdning av stora filer',
 'settings_enableLargeFileUpload_desc' => 'Om aktiverad, kan filer laddas upp via javaapplet med namnet jumploader, utan begränsningar i filstorlek. Flera filer kan även laddas upp samtidigt i ett steg.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Aktivera meddelande till personer som granskar/godkänner',
 'settings_enableNotificationAppRev_desc' => 'Kryssa i, för att skicka ett meddelande till personer som granskar/godkänner när en ny version av dokumentet har lagts till',
 'settings_enableNotificationWorkflow' => '',
@@ -978,6 +991,10 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => 'Första dagen i veckan',
 'settings_footNote' => 'Fotnot',
 'settings_footNote_desc' => 'Meddelande som visas på slutet av varje sida',
+'settings_fullSearchEngine' => '',
+'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
+'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'Gäst-ID',
 'settings_guestID_desc' => 'ID som används för inloggad gästanvändare (behöver oftast inte ändras)',
 'settings_httpRoot' => 'Http-Root',
@@ -1194,6 +1211,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => 'Denna epost är bara till för att testa epost inställningarna av SeedDMS.',
 'testmail_subject' => 'Test epost',
 'theme' => 'Visningstema',
@@ -1225,7 +1243,7 @@ URL: [url]',
 'tuesday' => 'tisdag',
 'tuesday_abbr' => 'ti',
 'type_to_search' => 'Skriv för att söka',
-'uk_UA' => '',
+'uk_UA' => 'Ukrainska',
 'under_folder' => 'I katalogen',
 'unknown_attrdef' => 'Okännd attributdefinition',
 'unknown_command' => 'Okänt kommando.',

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 (1004), aydin (83)
+//    Translators: Admin (1006), aydin (83)
 
 $text = array(
 'accept' => 'Kabul',
@@ -275,6 +275,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Kontrol etmenizi bekleyen dokümanlar',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dikkatinizi gerektiren size ait dokümanlar',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Bu doküman zaten kilitli',
@@ -471,6 +472,7 @@ URL: [url]',
 'home_folder' => 'Temel klasör',
 'hourly' => 'Saatlik',
 'hours' => 'saat',
+'hr_HR' => '',
 'human_readable' => 'Okunabilir arşiv',
 'hu_HU' => 'Macarca',
 'id' => 'ID',
@@ -533,6 +535,7 @@ URL: [url]',
 'keep_doc_status' => 'Doküman durumunu değiştirme',
 'keywords' => 'Anahtar kelimeler',
 'keyword_exists' => 'Anahtar kelime zaten mevcut',
+'ko_KR' => '',
 'language' => 'Dil',
 'lastaccess' => 'Son erişim',
 'last_update' => 'Son Güncelleme',
@@ -658,7 +661,9 @@ URL: [url]',
 'no_group_members' => 'Bu grubun hiç üyesi yok',
 'no_linked_files' => 'Link verilmiş dosya yok',
 'no_previous_versions' => 'Başka versiyon yok',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Bekleyen kontrol yok.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Bu doküman kilitli olduğundan güncellenemez. Lütfen kilitleyen kullanıcıyla görüşünüz.',
 'no_user_image' => 'Resim bulunamadı',
@@ -886,6 +891,10 @@ URL: [url]',
 'settings_Advanced' => 'Gelişmiş ayarlar',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Yetkilendirme ayarları',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
+'settings_backupDir' => '',
+'settings_backupDir_desc' => '',
 'settings_cacheDir' => 'Cache klasörü',
 'settings_cacheDir_desc' => 'Önizleme resimlerinin depolanacağı yer (web üzerinden erişilemeyen bir yer tercih etmeniz önerilir.)',
 'settings_Calendar' => 'Takvim ayarları',
@@ -894,6 +903,8 @@ URL: [url]',
 'settings_cannot_disable' => 'ENABLE_INSTALL_TOOL dosyası silinemedi',
 'settings_checkOutDir' => '',
 'settings_checkOutDir_desc' => '',
+'settings_cmdTimeout' => '',
+'settings_cmdTimeout_desc' => '',
 'settings_contentDir' => 'İçerik dizini',
 'settings_contentDir_desc' => 'Yüklenecek dosyaların depolanacağı yer (web üzerinden erişilemeyen bir yer tercih etmeniz önerilir.)',
 'settings_contentOffsetDir' => 'İçerik Ofset Klasörü',
@@ -953,6 +964,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Kullanıcının giriş yaparken dil seçimi yapabilmesi için bu seçeneği etkinleştirin.',
 'settings_enableLargeFileUpload' => 'Büyük dosya yüklemeyi etkinleştir',
 'settings_enableLargeFileUpload_desc' => 'Etkinleştirilirse, büyük dosyalar dosya limitine bakılmaksızın jumploader isimli java applet aracılığıyla yüklenebilir. Bu ayrıca bir seferde birden çok dosya yüklemeyi de sağlar. Bu açıldığında sadece http çerezleri kapanmış olur.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Kontrol eden/onaylayan bildirimlerini etkinleştir',
 'settings_enableNotificationAppRev_desc' => 'Dokümanın yeni versiyonu yüklendiğinde kontrol eden/onaylayana bildirim mesajı gitmesi için bunu etkinleştirin.',
 'settings_enableNotificationWorkflow' => '',
@@ -994,6 +1007,10 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => 'Haftanın ilk günü',
 'settings_footNote' => 'Dipnot',
 'settings_footNote_desc' => 'Her sayfanın en altında görünecek mesaj',
+'settings_fullSearchEngine' => '',
+'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
+'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'Misafir ID',
 'settings_guestID_desc' => 'Misafir kullanıcı için ID (genelde değiştirmek gerekmez)',
 'settings_httpRoot' => 'Http Kök dizini',
@@ -1210,6 +1227,7 @@ URL: [url]',
 'takeOverGrpReviewer' => 'Bir önceki versiyon kontrolünü yapan grubu al.',
 'takeOverIndApprover' => 'Bir önceki versiyonu onaylayanı al.',
 'takeOverIndReviewer' => 'Bir önceki versiyonu kontrol edeni al.',
+'tasks' => '',
 'testmail_body' => 'Bu mail SeedDMS mail sisteminin kontrolü amacıyla gönderilmiştir.',
 'testmail_subject' => 'Test e-posta',
 'theme' => 'Tema',

languages/uk_UA/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1128)
+//    Translators: Admin (1130)
 
 $text = array(
 'accept' => 'Прийняти',
@@ -281,6 +281,7 @@ URL: [url]',
 'documents_to_receipt' => 'Документи, які чекають підтвердження отримання',
 'documents_to_review' => 'Документи, які чекають вашої рецензії',
 'documents_to_revise' => 'Документи для повторного розгляду',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Ваші документи, які потребують уваги',
 'document_already_checkedout' => 'Цей документ вже на обробці',
 'document_already_locked' => 'Цей документ вже заблокований',
@@ -477,6 +478,7 @@ URL: [url]',
 'home_folder' => 'Домашній каталог',
 'hourly' => 'Щогодини',
 'hours' => 'години',
+'hr_HR' => '',
 'human_readable' => 'Зрозумілий людині архів',
 'hu_HU' => 'Hungarian',
 'id' => 'Ідентифікатор',
@@ -539,6 +541,7 @@ URL: [url]',
 'keep_doc_status' => 'Зберегти статус документа',
 'keywords' => 'Ключові слова',
 'keyword_exists' => 'Ключове слово існує',
+'ko_KR' => '',
 'language' => 'Мова',
 'lastaccess' => 'Останній доступ',
 'last_update' => 'Останнє оновлення',
@@ -663,7 +666,9 @@ URL: [url]',
 'no_group_members' => 'Група не має членів',
 'no_linked_files' => 'Немає пов\'язаних документів',
 'no_previous_versions' => 'Немає попередніх версій',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Рецензія не потрібна',
+'no_revision_needed' => '',
 'no_revision_planed' => 'Повторне опрацювання не заплановане',
 'no_update_cause_locked' => 'Ви не можете оновити документ. Зв\'яжіться з користувачем, який його заблокував.',
 'no_user_image' => 'Зображення не знайдено',
@@ -897,6 +902,10 @@ URL: [url]',
 'settings_Advanced' => 'Додатково',
 'settings_apache_mod_rewrite' => 'Apache — модуль Rewrite',
 'settings_Authentication' => 'Налаштування авторизації',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
+'settings_backupDir' => '',
+'settings_backupDir_desc' => '',
 'settings_cacheDir' => 'Каталог кешу',
 'settings_cacheDir_desc' => 'Де зберігаються ескізи зображень (краще вибрати каталог, недоступний веб-серверові).',
 'settings_Calendar' => 'Налаштування календаря',
@@ -905,6 +914,8 @@ URL: [url]',
 'settings_cannot_disable' => 'Неможливо видалити ENABLE_INSTALL_TOOL',
 'settings_checkOutDir' => 'Каталог для документів на опрацюванні',
 'settings_checkOutDir_desc' => 'Це каталог, куди скопійовано останній вміст документу, якщо він на опрацюванні. Якщо ви зробите цей каталог доступний користувачам, вони зможуть редагувати файл і завантажувати його назад по завершенні роботи.',
+'settings_cmdTimeout' => '',
+'settings_cmdTimeout_desc' => '',
 'settings_contentDir' => 'Каталог вмісту',
 'settings_contentDir_desc' => 'Куди зберігаються завантажені файли (краще вибрати каталог, недоступний веб-серверові).',
 'settings_contentOffsetDir' => 'Базовий початковий каталог',
@@ -964,6 +975,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Відображати меню вибору мови інтерфейсу користувача після входу в систему. Це не впливає на вибір мови на сторінці авторизації.',
 'settings_enableLargeFileUpload' => 'Увімкнути Java-завантажувач файлів',
 'settings_enableLargeFileUpload_desc' => 'Якщо увімкнено, завантаження файлів доступне такок через Java-аплет jumploader без обмеження розміру файлів. Це також дозволить завантажувати кілька файлів за раз.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Сповіщати рецензента і затверджувача',
 'settings_enableNotificationAppRev_desc' => 'Увімкніть для відправки сповіщення рецензенту чи затверджувачеві при додаванні нової версії документа.',
 'settings_enableNotificationWorkflow' => 'Відсилати сповіщення користувачам, задіяним в наступній стадії процесу',
@@ -1005,6 +1018,10 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => 'Перший день тижня.',
 'settings_footNote' => 'Нижній колонтитул',
 'settings_footNote_desc' => 'Повідомлення, яке відображається внизу кожної сторінки.',
+'settings_fullSearchEngine' => '',
+'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
+'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'Ідентифікатор гостя',
 'settings_guestID_desc' => 'Ідентифікатор гостя (можна не змінювати).',
 'settings_httpRoot' => 'Корінь http',
@@ -1221,6 +1238,7 @@ URL: [url]',
 'takeOverGrpReviewer' => 'Використати групу рецензентів з попередньої версії',
 'takeOverIndApprover' => 'Використати затверджувачів з попередньої версії',
 'takeOverIndReviewer' => 'Використати рецензентів з попередньої версії',
+'tasks' => '',
 'testmail_body' => 'Це тестовий лист для перевірки налаштувань пошти SeedDMS',
 'testmail_subject' => 'Тестовий лист',
 'theme' => 'Тема',

languages/zh_CN/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (578), fengjohn (5)
+//    Translators: Admin (589), fengjohn (5)
 
 $text = array(
 'accept' => '接受',
@@ -260,6 +260,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校对的文档',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => '需您关注的文档',
 'document_already_checkedout' => '',
 'document_already_locked' => '该文档已被锁定',
@@ -402,6 +403,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => '',
 'hours' => '',
+'hr_HR' => '克罗地亚人',
 'human_readable' => '可读存档',
 'hu_HU' => '匈牙利语',
 'id' => '序号',
@@ -464,6 +466,7 @@ URL: [url]',
 'keep_doc_status' => '',
 'keywords' => '关键字',
 'keyword_exists' => '关键字已存在',
+'ko_KR' => '韩国人',
 'language' => '语言',
 'lastaccess' => '',
 'last_update' => '上次更新',
@@ -565,7 +568,9 @@ URL: [url]',
 'no_group_members' => '该组没有成员',
 'no_linked_files' => '无链接文件',
 'no_previous_versions' => '无其它版本',
+'no_receipt_needed' => '',
 'no_review_needed' => '无待校对的文件',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => '您不能更新此文档，请联系该文档锁定人',
 'no_user_image' => '无图片',
@@ -698,15 +703,15 @@ URL: [url]',
 'search_fulltext' => '',
 'search_in' => '搜索于',
 'search_mode_and' => '与模式',
-'search_mode_documents' => '',
+'search_mode_documents' => '仅文档',
-'search_mode_folders' => '',
+'search_mode_folders' => '仅目录',
 'search_mode_or' => '或模式',
 'search_no_results' => '没有找到与您搜索添加相匹配的文件',
 'search_query' => '搜索',
 'search_report' => '找到 [count] 个文档',
 'search_report_fulltext' => '',
-'search_resultmode' => '',
+'search_resultmode' => '搜索模式',
-'search_resultmode_both' => '',
+'search_resultmode_both' => '文档和目录',
 'search_results' => '搜索结果',
 'search_results_access_filtered' => '搜索到得结果中可能包含受限访问的文档',
 'search_time' => '耗时:[time]秒',
@@ -717,12 +722,12 @@ URL: [url]',
 'select_grp_approvers' => '',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
-'select_grp_reviewers' => '',
+'select_grp_reviewers' => '点击选择审核群组',
 'select_grp_revisors' => '',
 'select_ind_approvers' => '',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
-'select_ind_reviewers' => '',
+'select_ind_reviewers' => '点击选择审核人',
 'select_ind_revisors' => '',
 'select_one' => '选择一个',
 'select_users' => '点击选择用户',
@@ -741,6 +746,10 @@ URL: [url]',
 'settings_Advanced' => '高级设置',
 'settings_apache_mod_rewrite' => '',
 'settings_Authentication' => '',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
+'settings_backupDir' => '',
+'settings_backupDir_desc' => '',
 'settings_cacheDir' => '',
 'settings_cacheDir_desc' => '',
 'settings_Calendar' => '',
@@ -749,6 +758,8 @@ URL: [url]',
 'settings_cannot_disable' => '',
 'settings_checkOutDir' => '',
 'settings_checkOutDir_desc' => '',
+'settings_cmdTimeout' => '',
+'settings_cmdTimeout_desc' => '',
 'settings_contentDir' => '',
 'settings_contentDir_desc' => '',
 'settings_contentOffsetDir' => '内容偏移目录',
@@ -808,6 +819,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => '',
 'settings_enableLargeFileUpload' => '',
 'settings_enableLargeFileUpload_desc' => '',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',
@@ -849,6 +862,10 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => '',
 'settings_footNote' => '附注',
 'settings_footNote_desc' => '显示在每个页面底部的信息',
+'settings_fullSearchEngine' => '',
+'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
+'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => '',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => '',
@@ -1065,6 +1082,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => '',
 'testmail_subject' => '',
 'theme' => '主题',
@@ -1087,7 +1105,7 @@ URL: [url]',
 'tuesday' => 'Tuesday',
 'tuesday_abbr' => '',
 'type_to_search' => '搜索类型',
-'uk_UA' => '',
+'uk_UA' => '乌克兰语',
 'under_folder' => '文件夹内',
 'unknown_attrdef' => '',
 'unknown_command' => '未知命令',

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 (2336)
+//    Translators: Admin (2338)
 
 $text = array(
 'accept' => '接受',
@@ -258,6 +258,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校對的文檔',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => '需您關注的文檔',
 'document_already_checkedout' => '',
 'document_already_locked' => '該文檔已被鎖定',
@@ -400,6 +401,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => '',
 'hours' => '',
+'hr_HR' => '',
 'human_readable' => '可讀存檔',
 'hu_HU' => '匈牙利語',
 'id' => '序號',
@@ -462,6 +464,7 @@ URL: [url]',
 'keep_doc_status' => '',
 'keywords' => '關鍵字',
 'keyword_exists' => '關鍵字已存在',
+'ko_KR' => '',
 'language' => '語言',
 'lastaccess' => '',
 'last_update' => '上次更新',
@@ -563,7 +566,9 @@ URL: [url]',
 'no_group_members' => '該組沒有成員',
 'no_linked_files' => '無連結檔',
 'no_previous_versions' => '無其它版本',
+'no_receipt_needed' => '',
 'no_review_needed' => '無待校對的文件',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => '您不能更新此文檔，請聯繫該文檔鎖定人',
 'no_user_image' => '無圖片',
@@ -739,6 +744,10 @@ URL: [url]',
 'settings_Advanced' => '',
 'settings_apache_mod_rewrite' => '',
 'settings_Authentication' => '',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
+'settings_backupDir' => '',
+'settings_backupDir_desc' => '',
 'settings_cacheDir' => '',
 'settings_cacheDir_desc' => '',
 'settings_Calendar' => '',
@@ -747,6 +756,8 @@ URL: [url]',
 'settings_cannot_disable' => '',
 'settings_checkOutDir' => '',
 'settings_checkOutDir_desc' => '',
+'settings_cmdTimeout' => '',
+'settings_cmdTimeout_desc' => '',
 'settings_contentDir' => '',
 'settings_contentDir_desc' => '',
 'settings_contentOffsetDir' => '內容偏移目錄',
@@ -806,6 +817,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => '',
 'settings_enableLargeFileUpload' => '',
 'settings_enableLargeFileUpload_desc' => '',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',
@@ -847,6 +860,10 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => '',
 'settings_footNote' => '',
 'settings_footNote_desc' => '',
+'settings_fullSearchEngine' => '',
+'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
+'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => '',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => '',
@@ -1063,6 +1080,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => '',
 'testmail_subject' => '',
 'theme' => '主題',

op/op.AddDocument.php

@@ -293,15 +293,10 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 			}
 		}
 		if($settings->_enableFullSearch) {
-			if(!empty($settings->_luceneClassDir))
+			$index = $indexconf['Indexer']::open($settings->_luceneDir);
-				require_once($settings->_luceneClassDir.'/Lucene.php');
-			else
-				require_once('SeedDMS/Lucene.php');
-
-			$index = SeedDMS_Lucene_Indexer::open($settings->_luceneDir);
 			if($index) {
-				SeedDMS_Lucene_Indexer::init($settings->_stopWordsFile);
+				$indexconf['Indexer']::init($settings->_stopWordsFile);
-				$index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, true));
+				$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, true));
 			}
 		}
 

op/op.Ajax.php

@@ -319,6 +319,17 @@ switch($command) {
 				if($document) {
 					if ($document->getAccessMode($user) >= M_READWRITE) {
 						if($document->remove()) {
+							/* Remove the document from the fulltext index */
+							if($settings->_enableFullSearch) {
+								$index = $indexconf['Indexer']::open($settings->_luceneDir);
+								if($index) {
+									$lucenesearch = new $indexconf['Search']($index);
+									if($hit = $lucenesearch->getDocument($_REQUEST['id'])) {
+										$index->delete($hit->id);
+										$index->commit();
+									}
+								}
+							}
 							header('Content-Type', 'application/json');
 							echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
 						} else {

op/op.EditDocument.php

@@ -178,8 +178,8 @@ if (($oldcomment = $document->getComment()) != $comment) {
 }
 
 $expires = false;
-if (isset($_POST["expires"]) && $_POST["expires"] != "false") {
+if (!isset($_POST["expires"]) || $_POST["expires"] != "false") {
-	if($_POST["expdate"]) {
+	if(isset($_POST["expdate"]) && $_POST["expdate"]) {
 		$tmp = explode('-', $_POST["expdate"]);
 		$expires = mktime(0,0,0, $tmp[1], $tmp[0], $tmp[2]);
 	} else {
@@ -268,7 +268,6 @@ if($attributes) {
 					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
 				}
 				if($attrdef->getMaxValues() && $attrdef->getMaxValues() < count($attribute)) {
-					print_r($attrdef);
 					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
 				}
 			}

op/op.RemoveDocument.php

@@ -62,16 +62,13 @@ if (!$document->remove()) {
 
 	/* Remove the document from the fulltext index */
 	if($settings->_enableFullSearch) {
-		if(!empty($settings->_luceneClassDir))
+		$index = $indexconf['Indexer']::open($settings->_luceneDir);
-			require_once($settings->_luceneClassDir.'/Lucene.php');
+		if($index) {
-		else
+			$lucenesearch = new $indexconf['Search']($index);
-			require_once('SeedDMS/Lucene.php');
+			if($hit = $lucenesearch->getDocument($documentid)) {
-
+				$index->delete($hit->id);
-		$index = SeedDMS_Lucene_Indexer::open($settings->_luceneDir);
+				$index->commit();
-		if($index && $hits = $index->find('document_id:'.$documentid)) {
+			}
-			$hit = $hits[0];
-			$index->delete($hit->id);
-			$index->commit();
 		}
 	}
 

op/op.RemoveFolder.php

@@ -54,21 +54,19 @@ $parent=$folder->getParent();
  * The callback must return true other the removal will be canceled.
  */
 if($settings->_enableFullSearch) {
-	if(!empty($settings->_luceneClassDir))
+	function removeFromIndex($arr, $document) {
-		require_once($settings->_luceneClassDir.'/Lucene.php');
+		$index = $arr[0];
-	else
+		$indexconf = $arr[1];
-		require_once('SeedDMS/Lucene.php');
+		$lucenesearch = new $indexconf['Search']($index);
-
+		if($hit = $lucenesearch->getDocument($document->getID())) {
-	$index = SeedDMS_Lucene_Indexer::open($settings->_luceneDir);
-	function removeFromIndex($index, $document) {
-		if($hits = $index->find('document_id:'.$document->getId())) {
-			$hit = $hits[0];
 			$index->delete($hit->id);
 			$index->commit();
 		}
 		return true;
 	}
-	$dms->setCallback('onPreRemoveDocument', 'removeFromIndex', $index);
+	$index = $indexconf['Indexer']::open($settings->_luceneDir);
+	if($index)
+		$dms->setCallback('onPreRemoveDocument', 'removeFromIndex', array($index, $indexconf));
 }
 
 $nl =	$folder->getNotifyList();

op/op.Search.php

@@ -112,25 +112,13 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
 		}
 	}
 
-	$pageNumber=1;
-	if (isset($_GET["pg"])) {
-		if (is_numeric($_GET["pg"]) && $_GET["pg"]>0) {
-			$pageNumber = (integer)$_GET["pg"];
-		}
-		else if (!strcasecmp($_GET["pg"], "all")) {
-			$pageNumber = "all";
-		}
-	}
-
 	$startTime = getTime();
 	if($settings->_enableFullSearch) {
-		if(!empty($settings->_luceneClassDir))
+		if($settings->_fullSearchEngine == 'lucene') {
-			require_once($settings->_luceneClassDir.'/Lucene.php');
+			Zend_Search_Lucene_Search_QueryParser::setDefaultEncoding('utf-8');
-		else
+		}
-			require_once('SeedDMS/Lucene.php');
 	}
 
-	Zend_Search_Lucene_Search_QueryParser::setDefaultEncoding('utf-8');
 	if(strlen($query) < 4 && strpos($query, '*')) {
 		$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('splash_invalid_searchterm')));
 		$resArr = array();
@@ -140,8 +128,9 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
 		$entries = array();
 		$searchTime = 0;
 	} else {
-		$index = Zend_Search_Lucene::open($settings->_luceneDir);
+		$startTime = getTime();
-		$lucenesearch = new SeedDMS_Lucene_Search($index);
+		$index = $indexconf['Indexer']::open($settings->_luceneDir);
+		$lucenesearch = new $indexconf['Search']($index);
 		$hits = $lucenesearch->search($query, $owner ? $owner->getLogin() : '', '', $categorynames);
 		if($hits === false) {
 			$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('splash_invalid_searchterm')));
@@ -166,11 +155,14 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
 			}
 
 			$entries = array();
+			$dcount = 0;
+			$fcount = 0;
 			if($hits) {
 				foreach($hits as $hit) {
 					if($tmp = $dms->getDocument($hit['document_id'])) {
 						if($tmp->getAccessMode($user) >= M_READ) {
 							$entries[] = $tmp;
+							$dcount++;
 						}
 					}
 				}

op/op.Settings.php

@@ -67,6 +67,7 @@ if ($action == "saveSettings")
   $settings->_enableEmail =getBoolValue("enableEmail");
   $settings->_enableUsersView = getBoolValue("enableUsersView");
   $settings->_enableFullSearch = getBoolValue("enableFullSearch");
+	$settings->_fullSearchEngine = $_POST["fullSearchEngine"];
   $settings->_enableClipboard = getBoolValue("enableClipboard");
   $settings->_enableDropUpload = getBoolValue("enableDropUpload");
   $settings->_enableFolderTree = getBoolValue("enableFolderTree");
@@ -162,6 +163,7 @@ if ($action == "saveSettings")
   $settings->_maxDirID = intval($_POST["maxDirID"]);
   $settings->_updateNotifyTime = intval($_POST["updateNotifyTime"]);
   $settings->_maxExecutionTime = intval($_POST["maxExecutionTime"]);
+  $settings->_cmdTimeout = (intval($_POST["cmdTimeout"]) > 0) ?intval($_POST["cmdTimeout"]) : 1;
 
   // SETTINGS - ADVANCED - INDEX CMD
   $settings->_converters['fulltext'] = $_POST["converters"];

out/out.ApprovalSummary.php

@@ -24,12 +24,17 @@ include("../inc/inc.Language.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList));
 if($view) {
 	$view->show();
 	exit;

out/out.IndexInfo.php

@@ -34,12 +34,7 @@ if(!$settings->_enableFullSearch) {
 	UI::exitError(getMLText("admin_tools"),getMLText("fulltextsearch_disabled"));
 }
 
-if(!empty($settings->_luceneClassDir))
+$index = $indexconf['Indexer']::open($settings->_luceneDir);
-	require_once($settings->_luceneClassDir.'/Lucene.php');
-else
-	require_once('SeedDMS/Lucene.php');
-
-$index = SeedDMS_Lucene_Indexer::open($settings->_luceneDir);
 if(!$index) {
 	UI::exitError(getMLText("admin_tools"),getMLText("no_fulltextindex"));
 }

out/out.Indexer.php

@@ -35,25 +35,23 @@ if(!$settings->_enableFullSearch) {
 	UI::exitError(getMLText("admin_tools"),getMLText("fulltextsearch_disabled"));
 }
 
-if(!empty($settings->_luceneClassDir))
-	require_once($settings->_luceneClassDir.'/Lucene.php');
-else
-	require_once('SeedDMS/Lucene.php');
-
 if(isset($_GET['create']) && $_GET['create'] == 1) {
 	if(isset($_GET['confirm']) && $_GET['confirm'] == 1) {
-		$index = SeedDMS_Lucene_Indexer::create($settings->_luceneDir);
+		$index = $indexconf['Indexer']::create($settings->_luceneDir);
-		SeedDMS_Lucene_Indexer::init($settings->_stopWordsFile);
+		if(!$index) {
+			UI::exitError(getMLText("admin_tools"),getMLText("no_fulltextindex"));
+		}
+		$indexconf['Indexer']::init($settings->_stopWordsFile);
 	} else {
 		header('Location: out.CreateIndex.php');
 		exit;
 	}
 } else {
-	$index = SeedDMS_Lucene_Indexer::open($settings->_luceneDir);
+	$index = $indexconf['Indexer']::open($settings->_luceneDir);
 	if(!$index) {
 		UI::exitError(getMLText("admin_tools"),getMLText("no_fulltextindex"));
 	}
-	SeedDMS_Lucene_Indexer::init($settings->_stopWordsFile);
+	$indexconf['Indexer']::init($settings->_stopWordsFile);
 }
 
 if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
@@ -65,7 +63,7 @@ else {
 $folder = $dms->getFolder($folderid);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'index'=>$index, 'recreate'=>(isset($_GET['create']) && $_GET['create']==1), 'folder'=>$folder, 'converters'=>$settings->_converters['fulltext']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'index'=>$index, 'indexconf'=>$indexconf, 'recreate'=>(isset($_GET['create']) && $_GET['create']==1), 'folder'=>$folder, 'converters'=>$settings->_converters['fulltext'], 'timeout'=>$settings->_cmdTimeout));
 if($view) {
 	$view->show();
 	exit;

out/out.ReviewSummary.php

@@ -25,12 +25,17 @@ include("../inc/inc.Language.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList));
 if($view) {
 	$view->show();
 	exit;

out/out.UsrMgr.php

@@ -47,8 +47,7 @@ if(isset($_GET['userid']) && $_GET['userid']) {
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'seluser'=>$seluser, 'allusers'=>$users, 'allgroups'=>$groups, 'passwordstrength'=>$settings->_passwordStrength, 'passwordexpiration'=>$settings->_passwordExpiration, 'httproot'=>$settings->_httpRoot, 'enableuserimage'=>$settings->_enableUserImage, 'undeluserids'=>explode(',', $settings->_undelUserIds), 'workflowmode'=>$settings->_workflowMode, 'quota'=>$settings->_quota));
 if($view) {
-	$view->show();
+	$view($_GET);
-	exit;
 }
 
 ?>

restapi/index.php

@@ -140,6 +140,7 @@ function getLockedDocuments() { /* {{{ */
 				'name'=>$document->getName(),
 				'mimetype'=>$lc->getMimeType(),
 				'version'=>$lc->getVersion(),
+				'size'=>$lc->getFileSize(),
 				'comment'=>$document->getComment(),
 				'keywords'=>$document->getKeywords(),
 			);
@@ -249,6 +250,7 @@ function getFolderChildren($id) { /* {{{ */
 							'name'=>htmlspecialchars($document->getName()),
 							'mimetype'=>$lc->getMimeType(),
 							'version'=>$lc->getVersion(),
+							'size'=>$lc->getFileSize(),
 							'comment'=>$document->getComment(),
 							'keywords'=>$document->getKeywords(),
 						);
@@ -436,6 +438,7 @@ function getDocument($id) { /* {{{ */
 				'date'=>$document->getDate(),
 				'mimetype'=>$lc->getMimeType(),
 				'version'=>$lc->getVersion(),
+				'size'=>$lc->getFileSize(),
 				'keywords'=>htmlspecialchars($document->getKeywords()),
 			);
 			$app->response()->header('Content-Type', 'application/json');
@@ -540,6 +543,7 @@ function getDocumentVersions($id) { /* {{{ */
 					'version'=>$lc->getVersion(),
 					'date'=>$lc->getDate(),
 					'mimetype'=>$lc->getMimeType(),
+					'size'=>$lc->getFileSize(),
 					'comment'=>htmlspecialchars($lc->getComment()),
 				);
 			}
@@ -752,6 +756,7 @@ function doSearch() { /* {{{ */
 						'name'=>$document->getName(),
 						'mimetype'=>$lc->getMimeType(),
 						'version'=>$lc->getVersion(),
+						'size'=>$lc->getFileSize(),
 						'comment'=>$document->getComment(),
 						'keywords'=>$document->getKeywords(),
 					);
@@ -814,6 +819,7 @@ function doSearchByAttr() { /* {{{ */
 				'name'=>$document->getName(),
 				'mimetype'=>$lc->getMimeType(),
 				'version'=>$lc->getVersion(),
+				'size'=>$lc->getFileSize(),
 				'comment'=>$document->getComment(),
 				'keywords'=>$document->getKeywords(),
 			);

styles/bootstrap/application.js

@@ -382,9 +382,6 @@ $(document).ready( function() {
 		});
 	});
 	
-});
-
-$(document).ready( function() {
 	$(document).on('change', '.btn-file :file', function() {
 		var input = $(this),
 		numFiles = input.get(0).files ? input.get(0).files.length : 1,
@@ -402,6 +399,62 @@ $(document).ready( function() {
 			if( log ) alert(log);
 		}
 	});
+
+	$('div.ajax').each(function(index) {
+		var element = $(this);
+		var url = '';
+		var href = element.data('href');
+		var view = element.data('view');
+		var action = element.data('action');
+		if(view && action)
+			url = "out."+view+".php?action="+action;
+		else
+			url = href;
+	//	console.log('Calling '+url);
+		$.get(url, function(data) {
+			element.html(data);
+			$(".chzn-select").chosen();
+		});
+	});
+	$('div.ajax').on('update', function(event, param1) {
+		var element = $(this);
+		var url = '';
+		var href = element.data('href');
+		var view = element.data('view');
+		var action = element.data('action');
+		if(view && action)
+			url = "out."+view+".php?action="+action;
+		else
+			url = href;
+		if(typeof param1 === 'object') {
+			for(var key in param1) {
+				url += "&"+key+"="+param1[key];
+			}
+		} else {
+			url += "&"+param1;
+		}
+	//	console.log("Calling: "+url);
+		element.prepend('<div style="position: absolute; overflow: hidden; background: #f7f7f7; z-index: 1000; height: '+element.height()+'px; width: '+element.width()+'px; opacity: 0.7; display: table;"><div style="display: table-cell;text-align: center; vertical-align: middle; "><img src="../views/bootstrap/images/ajax-loader.gif"></div>');
+		$.get(url, function(data) {
+			element.html(data);
+			$(".chzn-select").chosen();
+		});
+	});
+	$("body").on("click", ".ajax-click", function() {
+		var element = $(this);
+		var url = element.data('href')+"?"+element.data('param1');
+		$.ajax({
+			type: 'GET',
+			url: url,
+			dataType: 'json',
+			success: function(data){
+				for (var i = 0; i < data.length; i++) {
+					noty({text: data[i].text, type: data[i].type});
+				}
+			}
+		});
+	});
+
 });		
 
 function allowDrop(ev) {

utils/indexer.php

@@ -52,26 +52,46 @@ if(isset($settings->_extraPath))
 	ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path'));
 
 require_once("SeedDMS/Core.php");
-require_once("SeedDMS/Lucene.php");
+if($settings->_fullSearchEngine == 'sqlitefts') {
+	$indexconf = array(
+		'Indexer' => 'SeedDMS_SQLiteFTS_Indexer',
+		'Search' => 'SeedDMS_SQLiteFTS_Search',
+		'IndexedDocument' => 'SeedDMS_SQLiteFTS_IndexedDocument'
+	);
 
-function tree($dms, $index, $folder, $indent='') {
+	require_once('SeedDMS/SQLiteFTS.php');
+} else {
+	$indexconf = array(
+		'Indexer' => 'SeedDMS_Lucene_Indexer',
+		'Search' => 'SeedDMS_Lucene_Search',
+		'IndexedDocument' => 'SeedDMS_Lucene_IndexedDocument'
+	);
+
+	require_once('SeedDMS/Lucene.php');
+}
+
+function tree($dms, $index, $indexconf, $folder, $indent='') { /* {{{ */
 	global $settings;
 	echo $indent."D ".$folder->getName()."\n";
 	$subfolders = $folder->getSubFolders();
 	foreach($subfolders as $subfolder) {
-		tree($dms, $index, $subfolder, $indent.'  ');
+		tree($dms, $index, $indexconf, $subfolder, $indent.'  ');
 	}
 	$documents = $folder->getDocuments();
 	foreach($documents as $document) {
 		echo $indent."  ".$document->getId().":".$document->getName()." ";
-		if(!($hits = $index->find('document_id:'.$document->getId()))) {
+		$lucenesearch = new $indexconf['Search']($index);
-			$index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null));
+		if(!($hit = $lucenesearch->getDocument($document->getId()))) {
-			echo " (Document added)\n";
+			try {
+				$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false));
+				echo " (Document added)\n";
+			} catch(Exception $e) {
+				echo " (Timeout)\n";
+			}
 		} else {
-			$hit = $hits[0];
 			try {
 				$created = (int) $hit->getDocument()->getFieldValue('created');
-			} catch (Zend_Search_Lucene_Exception $e) {
+			} catch (Exception $e) {
 				$created = 0;
 			}
 			$content = $document->getLatestContent();
@@ -79,33 +99,42 @@ function tree($dms, $index, $folder, $indent='') {
 				echo " (Document unchanged)\n";
 			} else {
 				if($index->delete($hit->id)) {
-					$index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, $settings->_converters['fulltext'] ? $settings->_converters['fulltext'] : null));
+					try {
-					echo " (Document updated)\n";
+						$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false));
+						echo " (Document updated)\n";
+					} catch(Exception $e) {
+						echo " (Timeout)\n";
+					}
 				}
 			}
 		}
 	}
-}
+} /* }}} */
 
 $db = new SeedDMS_Core_DatabaseAccess($settings->_dbDriver, $settings->_dbHostname, $settings->_dbUser, $settings->_dbPass, $settings->_dbDatabase);
 $db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostname . "\"");
 
 $dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
 if(!$dms->checkVersion()) {
-	echo "Database update needed.";
+	echo "Database update needed.\n";
-	exit;
+	exit(1);
 }
 
 $dms->setRootFolderID($settings->_rootFolderID);
 
 if($recreate)
-	$index = Zend_Search_Lucene::create($settings->_luceneDir);
+	$index = $indexconf['Indexer']::create($settings->_luceneDir);
 else
-	$index = Zend_Search_Lucene::open($settings->_luceneDir);
+	$index = $indexconf['Indexer']::open($settings->_luceneDir);
-SeedDMS_Lucene_Indexer::init($settings->_stopWordsFile);
+if(!$index) {
+	echo "Could not create index.\n";
+	exit(1);
+}
+
+$indexconf['Indexer']::init($settings->_stopWordsFile);
 
 $folder = $dms->getFolder($settings->_rootFolderID);
-tree($dms, $index, $folder);
+tree($dms, $index, $indexconf, $folder);
 
 $index->commit();
 $index->optimize();

utils/xmldump.php

@@ -13,7 +13,12 @@ function usage() { /* {{{ */
 	echo "  -v, --version: print version and exit.\n";
 	echo "  --config: set alternative config file.\n";
 	echo "  --folder: set start folder.\n";
-	echo "  --maxsize: maximum size of files to be include in output.\n";
+	echo "  --skip-root: do not export the root folder itself.\n";
+	echo "  --sections <sections>: comma seperated list of sections to export.\n";
+	echo "  --maxsize: maximum size of files to be included in output\n";
+	echo "    (defaults to 100000)\n";
+	echo "  --contentdir: directory where all document versions are stored\n";
+	echo "    which are larger than maxsize.\n";
 } /* }}} */
 
 function wrapWithCData($text) { /* {{{ */
@@ -25,7 +30,7 @@ function wrapWithCData($text) { /* {{{ */
 
 $version = "0.0.1";
 $shortoptions = "hv";
-$longoptions = array('help', 'version', 'config:', 'folder:', 'maxsize:');
+$longoptions = array('help', 'version', 'skip-root', 'config:', 'folder:', 'maxsize:', 'contentdir:', 'sections:');
 if(false === ($options = getopt($shortoptions, $longoptions))) {
 	usage();
 	exit(0);
@@ -52,11 +57,30 @@ if(isset($options['config'])) {
 
 /* Set maximum size of files included in xml file */
 if(isset($options['maxsize'])) {
-	$maxsize = intval($maxsize);
+	$maxsize = intval($options['maxsize']);
 } else {
 	$maxsize = 100000;
 }
 
+/* Set directory for file largen than maxsize */
+if(isset($options['contentdir'])) {
+	if(file_exists($options['contentdir'])) {
+		$contentdir = $options['contentdir'];
+		if(substr($contentdir, -1, 1) != DIRECTORY_SEPARATOR)
+			$contentdir .= DIRECTORY_SEPARATOR;
+	} else {
+		echo "Directory ".$options['contentdir']." does not exists\n";
+		exit(1);
+	}
+} else {
+	$contentdir = '';
+}
+
+$sections = array();
+if(isset($options['sections'])) {
+	$sections = explode(',', $options['sections']);
+}
+
 if(isset($settings->_extraPath))
 	ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path'));
 
@@ -68,54 +92,132 @@ if(isset($options['folder'])) {
 	$folderid = $settings->_rootFolderID;
 }
 
-function tree($folder, $parent=null, $indent='') { /* {{{ */
+$skiproot = false;
-	global $index, $dms;
+if(isset($options['skip-root'])) {
-	echo $indent."<folder id=\"".$folder->getId()."\"";
+	$skiproot = true;
-	if($parent)
+}
-		echo " parent=\"".$parent->getID()."\"";
+
-	echo ">\n";
+$statistic = array(
-	echo $indent." <attr name=\"name\">".wrapWithCData($folder->getName())."</attr>\n";
+	'documents'=>0,
-	echo $indent." <attr name=\"date\">".date('c', $folder->getDate())."</attr>\n";
+	'folders'=>0,
-	echo $indent." <attr name=\"defaultaccess\">".$folder->getDefaultAccess()."</attr>\n";
+	'users'=>0,
-	echo $indent." <attr name=\"inheritaccess\">".$folder->inheritsAccess()."</attr>\n";
+	'groups'=>0,
-	echo $indent." <attr name=\"sequence\">".$folder->getSequence()."</attr>\n";
+	'attributedefinitions'=>0,
-	if($folder->getComment())
+	'keywordcategories'=>0,
+	'documentcategories'=>0,
+);
+
+function dumplog($version, $type, $logs, $indent) { /* {{{ */
+	global $dms, $contentdir, $maxsize;
+
+	$document = $version->getDocument();
+	switch($type) {
+	case 'approval':
+		$type2 = 'approve';
+		break;
+	default:
+		$type2 = $type;
+	}
+	echo $indent."   <".$type."s>\n";
+	$curid = 0;
+	foreach($logs as $a) {
+		if($a[$type2.'ID'] != $curid) {
+			if($curid != 0) {
+				echo $indent."    </".$type.">\n";
+			}
+			echo $indent."    <".$type." id=\"".$a[$type2.'ID']."\">\n";
+			echo $indent."     <attr name=\"type\">".$a['type']."</attr>\n";
+			echo $indent."     <attr name=\"required\">".$a['required']."</attr>\n";
+		}
+		echo $indent."     <".$type."log id=\"".$a[$type2.'LogID']."\">\n";
+		echo $indent."      <attr name=\"user\">".$a['userID']."</attr>\n";
+		echo $indent."      <attr name=\"status\">".$a['status']."</attr>\n";
+		echo $indent."      <attr name=\"comment\">".wrapWithCData($a['comment'])."</attr>\n";
+		echo $indent."      <attr name=\"date\" format=\"Y-m-d H:i:s\">".$a['date']."</attr>\n";
+		if(!empty($a['file'])) {
+			$filename = $dms->contentDir . $document->getDir().'r'.(int) $a[$type2.'LogID'];
+			if(file_exists($filename)) {
+				echo $indent."     <data length=\"".filesize($filename)."\"";
+				if(filesize($filename) < $maxsize) {
+					echo ">\n";
+					echo chunk_split(base64_encode(file_get_contents($filename)), 76, "\n");
+					echo $indent."     </data>\n";
+				} else {
+					echo " fileref=\"".$filename."\" />\n";
+					if($contentdir) {
+						copy($filename, $contentdir.$document->getID()."-R-".$a[$type2.'LogID']);
+					} else {
+						echo "Warning: ".$type." log file (size=".filesize($filename).") will be missing from output\n";
+					}
+				}
+			}
+		}
+		echo $indent."     </".$type."log>\n";
+		$curid = $a[$type2.'ID'];
+	}
+	if($curid != 0)
+		echo $indent."    </".$type.">\n";
+	echo $indent."   </".$type."s>\n";
+} /* }}} */
+
+function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
+	global $sections, $statistic, $index, $dms, $maxsize, $contentdir;
+
+	if(!$sections || in_array('folders', $sections)) {
+	if(!$skipcurrent) {
+		echo $indent."<folder id=\"".$folder->getId()."\"";
+		if($parent)
+			echo " parent=\"".$parent->getID()."\"";
+		echo ">\n";
+		echo $indent." <attr name=\"name\">".wrapWithCData($folder->getName())."</attr>\n";
+		echo $indent." <attr name=\"date\" format=\"Y-m-d H:i:s\">".date('Y-m-d H:i:s', $folder->getDate())."</attr>\n";
+		echo $indent." <attr name=\"defaultaccess\">".$folder->getDefaultAccess()."</attr>\n";
+		echo $indent." <attr name=\"inheritaccess\">".$folder->inheritsAccess()."</attr>\n";
+		echo $indent." <attr name=\"sequence\">".$folder->getSequence()."</attr>\n";
 		echo $indent." <attr name=\"comment\">".wrapWithCData($folder->getComment())."</attr>\n";
-	echo $indent." <attr name=\"owner\">".$folder->getOwner()->getId()."</attr>\n";
+		echo $indent." <attr name=\"owner\">".$folder->getOwner()->getId()."</attr>\n";
-	if($attributes = $folder->getAttributes()) {
+		if($attributes = $folder->getAttributes()) {
-		foreach($attributes as $attribute) {
+			foreach($attributes as $attribute) {
-			$attrdef = $attribute->getAttributeDefinition();
+				$attrdef = $attribute->getAttributeDefinition();
-			echo $indent." <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".$attribute->getValue()."</attr>\n";
+				echo $indent." <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".$attribute->getValue()."</attr>\n";
+			}
 		}
-	}
+		if($folder->inheritsAccess()) {
-	if($folder->inheritsAccess()) {
+			echo $indent." <acls type=\"inherited\" />\n";
-		echo $indent." <acls type=\"inherited\" />\n";
+		} else {
+			echo $indent." <acls>\n";
+			$accesslist = $folder->getAccessList();
+			foreach($accesslist['users'] as $acl) {
+				echo $indent."  <acl type=\"user\"";
+				$user = $acl->getUser();
+				echo " user=\"".$user->getID()."\"";
+				echo " mode=\"".$acl->getMode()."\"";
+				echo "/>\n";
+			}
+			foreach($accesslist['groups'] as $acl) {
+				echo $indent."  <acl type=\"group\"";
+				$group = $acl->getGroup();
+				echo $indent." group=\"".$group->getID()."\"";
+				echo $indent." mode=\"".$acl->getMode()."\"";
+				echo "/>\n";
+			}
+			echo $indent." </acls>\n";
+		}
+		echo $indent."</folder>\n";
+		$statistic['folders']++;
+		$parentfolder = $folder;
 	} else {
-		echo $indent." <acls>\n";
+		$parentfolder = null;
-		$accesslist = $folder->getAccessList();
-		foreach($accesslist['users'] as $acl) {
-			echo $indent."  <acl type=\"user\"";
-			$user = $acl->getUser();
-			echo " user=\"".$user->getID()."\"";
-			echo " mode=\"".$acl->getMode()."\"";
-			echo "/>\n";
-		}
-		foreach($accesslist['groups'] as $acl) {
-			echo $indent."  <acl type=\"group\"";
-			$group = $acl->getGroup();
-			echo $indent." group=\"".$group->getID()."\"";
-			echo $indent." mode=\"".$acl->getMode()."\"";
-			echo "/>\n";
-		}
-		echo $indent." </acls>\n";
 	}
-	echo $indent."</folder>\n";
 	$subfolders = $folder->getSubFolders();
 	if($subfolders) {
 		foreach($subfolders as $subfolder) {
-			tree($subfolder, $folder, $indent);
+			tree($subfolder, $parentfolder, $indent);
 		}
 	}
+	}
+
+	if(!$sections || in_array('documents', $sections)) {
 	$documents = $folder->getDocuments();
 	if($documents) {
 		foreach($documents as $document) {
@@ -125,9 +227,9 @@ function tree($folder, $parent=null, $indent='') { /* {{{ */
 				echo " locked=\"true\"";
 			echo ">\n";
 			echo $indent." <attr name=\"name\">".wrapWithCData($document->getName())."</attr>\n";
-			echo $indent." <attr name=\"date\">".date('c', $document->getDate())."</attr>\n";
+			echo $indent." <attr name=\"date\" format=\"Y-m-d H:i:s\">".date('Y-m-d H:i:s', $document->getDate())."</attr>\n";
 			if($document->getExpires())
-				echo $indent." <attr name=\"expires\">".date('c', $document->getExpires())."</attr>\n";
+				echo $indent." <attr name=\"expires\" format=\"Y-m-d H:i:s\">".date('Y-m-d H:i:s', $document->getExpires())."</attr>\n";
 			echo $indent." <attr name=\"owner\">".$owner->getId()."</attr>\n";
 			if($document->getKeywords())
 				echo $indent." <attr name=\"keywords\">".wrapWithCData($document->getKeywords())."</attr>\n";
@@ -138,8 +240,7 @@ function tree($folder, $parent=null, $indent='') { /* {{{ */
 				$user = $document->getLockingUser();
 				echo $indent." <attr name=\"lockedby\">".$user->getId()."</attr>\n";
 			}
-			if($document->getComment())
+			echo $indent." <attr name=\"comment\">".wrapWithCData($document->getComment())."</attr>\n";
-				echo $indent." <attr name=\"comment\">".wrapWithCData($document->getComment())."</attr>\n";
 			if($attributes = $document->getAttributes()) {
 				foreach($attributes as $attribute) {
 					$attrdef = $attribute->getAttributeDefinition();
@@ -149,36 +250,30 @@ function tree($folder, $parent=null, $indent='') { /* {{{ */
 
 			/* Check if acl is not inherited */
 			if(!$document->inheritsAccess()) {
-				$acls = $document->getAccessList();
+				echo $indent." <acls>\n";
-				if($acls['groups'] || $acls['users']) {
+				$accesslist = $document->getAccessList();
-					echo $indent." <acls>\n";
+				foreach($accesslist['users'] as $acl) {
-					if($acls['users']) {
+					echo $indent."  <acl type=\"user\"";
-						foreach($acls['users'] as $acluser) {
+					$user = $acl->getUser();
-							$user = $acluser->getUser();
+					echo " user=\"".$user->getID()."\"";
-							echo $indent."  <acl type=\"user\">\n";
+					echo " mode=\"".$acl->getMode()."\"";
-							echo $indent."   <attr name=\"user\">".$user->getId()."</attr>\n";
+					echo "/>\n";
-							echo $indent."   <attr name=\"mode\">".$acluser->getMode()."</attr>\n";
-							echo $indent."  </acl>\n";
-						}
-					}
-					if($acls['groups']) {
-						foreach($acls['groups'] as $aclgroup) {
-							$group = $aclgroup->getGroup();
-							echo $indent."  <acl type=\"group\">\n";
-							echo $indent."   <attr name=\"group\">".$group->getId()."</attr>\n";
-							echo $indent."   <attr name=\"mode\">".$acluser->getMode()."</attr>\n";
-							echo $indent."  </acl>\n";
-						}
-					}
-					echo $indent." </acls>\n";
 				}
+				foreach($accesslist['groups'] as $acl) {
+					echo $indent."  <acl type=\"group\"";
+					$group = $acl->getGroup();
+					echo $indent." group=\"".$group->getID()."\"";
+					echo $indent." mode=\"".$acl->getMode()."\"";
+					echo "/>\n";
+				}
+				echo $indent." </acls>\n";
 			}
 
 			$cats = $document->getCategories();
 			if($cats) {
 				echo $indent." <categories>\n";
 				foreach($cats as $cat) {
-					echo $indent."  <category>".$cat->getId()."</category>\n";
+					echo $indent."  <category id=\"".$cat->getId()."\"/>\n";
 				}
 				echo $indent." </categories>\n";
 			}
@@ -187,12 +282,12 @@ function tree($folder, $parent=null, $indent='') { /* {{{ */
 			if($versions) {
 				echo $indent." <versions>\n";
 				foreach($versions as $version) {
-					$approvalStatus = $version->getApprovalStatus();
+					$approvalStatus = $version->getApprovalStatus(30);
-					$reviewStatus = $version->getReviewStatus();
+					$reviewStatus = $version->getReviewStatus(30);
 					$owner = $version->getUser();
-					echo $indent."  <version id=\"".$version->getVersion()."\">\n";
+					echo $indent."  <version version=\"".$version->getVersion()."\">\n";
 					echo $indent."   <attr name=\"mimetype\">".$version->getMimeType()."</attr>\n";
-					echo $indent."   <attr name=\"date\">".date('c', $version->getDate())."</attr>\n";
+					echo $indent."   <attr name=\"date\" format=\"Y-m-d H:i:s\">".date('Y-m-d H:i:s', $version->getDate())."</attr>\n";
 					echo $indent."   <attr name=\"filetype\">".$version->getFileType()."</attr>\n";
 					echo $indent."   <attr name=\"comment\">".wrapWithCData($version->getComment())."</attr>\n";
 					echo $indent."   <attr name=\"owner\">".$owner->getId()."</attr>\n";
@@ -203,40 +298,38 @@ function tree($folder, $parent=null, $indent='') { /* {{{ */
 							echo $indent."   <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".$attribute->getValue()."</attr>\n";
 						}
 					}
-					if($approvalStatus) {
+					if($statuslog = $version->getStatusLog()) {
-						echo $indent."   <approvals>\n";
+						echo $indent."   <status id=\"".$statuslog[0]['statusID']."\">\n";
-						foreach($approvalStatus as $a) {
+						foreach($statuslog as $entry) {
-							echo $indent."    <approval id=\"".$a['approveID']."\">\n";
+							echo $indent."    <statuslog>\n";
-							echo $indent."     <attr name=\"type\">".$a['type']."</attr>\n";
+							echo $indent."     <attr name=\"status\">".$entry['status']."</attr>\n";
-							echo $indent."     <attr name=\"required\">".$a['required']."</attr>\n";
+							echo $indent."     <attr name=\"comment\">".wrapWithCData($entry['comment'])."</attr>\n";
-							echo $indent."     <attr name=\"status\">".$a['status']."</attr>\n";
+							echo $indent."     <attr name=\"date\" format=\"Y-m-d H:i:s\">".$entry['date']."</attr>\n";
-							echo $indent."     <attr name=\"comment\">".wrapWithCData($a['comment'])."</attr>\n";
+							echo $indent."     <attr name=\"user\">".$entry['userID']."</attr>\n";
-							echo $indent."     <attr name=\"user\">".$a['userID']."</attr>\n";
+							echo $indent."    </statuslog>\n";
-							echo $indent."     <attr name=\"date\">".$a['date']."</attr>\n";
-							echo $indent."    </approval>\n";
 						}
-						echo $indent."   </approvals>\n";
+						echo $indent."   </status>\n";
+					}
+					if($approvalStatus) {
+						dumplog($version, 'approval', $approvalStatus, $indent);
 					}
 					if($reviewStatus) {
-						echo $indent."   <reviews>\n";
+						dumplog($version, 'review', $reviewStatus, $indent);
-						foreach($reviewStatus as $a) {
-							echo $indent."    <review id=\"".$a['reviewID']."\">\n";
-							echo $indent."     <attr name=\"type\">".$a['type']."</attr>\n";
-							echo $indent."     <attr name=\"required\">".$a['required']."</attr>\n";
-							echo $indent."     <attr name=\"status\">".$a['status']."</attr>\n";
-							echo $indent."     <attr name=\"comment\">".wrapWithCData($a['comment'])."</attr>\n";
-							echo $indent."     <attr name=\"user\">".$a['userID']."</attr>\n";
-							echo $indent."     <attr name=\"date\">".$a['date']."</attr>\n";
-							echo $indent."    </review>\n";
-						}
-						echo $indent."   </reviews>\n";
 					}
 					if(file_exists($dms->contentDir . $version->getPath())) {
-						echo $indent."   <data length=\"".filesize($dms->contentDir . $version->getPath())."\">\n";
+						echo $indent."   <data length=\"".filesize($dms->contentDir . $version->getPath())."\"";
-						if(filesize($dms->contentDir . $version->getPath()) < 1000000) {
+						if(filesize($dms->contentDir . $version->getPath()) < $maxsize) {
+							echo ">\n";
 							echo chunk_split(base64_encode(file_get_contents($dms->contentDir . $version->getPath())), 76, "\n");
+							echo $indent."   </data>\n";
+						} else {
+							echo " fileref=\"".$document->getID()."-".$version->getVersion().$version->getFileType()."\" />\n";
+							if($contentdir) {
+								copy($dms->contentDir . $version->getPath(), $contentdir.$document->getID()."-".$version->getVersion().$version->getFileType());
+							} else {
+								echo "Warning: version content (size=".filesize($dms->contentDir . $version->getPath()).") will be missing from output\n";
+							}
 						}
-						echo $indent."   </data>\n";
 					} else {
 						echo $indent."   <!-- ".$dms->contentDir . $version->getPath()." not found -->\n";
 					}
@@ -253,16 +346,28 @@ function tree($folder, $parent=null, $indent='') { /* {{{ */
 					echo $indent."  <file id=\"".$file->getId()."\">\n";
 					echo $indent."   <attr name=\"name\">".wrapWithCData($file->getName())."</attr>\n";
 					echo $indent."   <attr name=\"mimetype\">".$file->getMimeType()."</attr>\n";
-					echo $indent."   <attr name=\"date\">".date('c', $file->getDate())."</attr>\n";
+					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=\"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";
-					echo $indent."   <data length=\"".filesize($dms->contentDir . $file->getPath())."\">\n";
+					if(file_exists($dms->contentDir . $file->getPath())) {
-					if(filesize($dms->contentDir . $file->getPath()) < 1000000) {
+						echo $indent."   <data length=\"".filesize($dms->contentDir . $file->getPath())."\"";
-						echo chunk_split(base64_encode(file_get_contents($dms->contentDir . $file->getPath())), 76, "\n");
+						if(filesize($dms->contentDir . $file->getPath()) < $maxsize) {
+							echo ">\n";
+							echo chunk_split(base64_encode(file_get_contents($dms->contentDir . $file->getPath())), 76, "\n");
+							echo $indent."   </data>\n";
+						} else {
+							echo " fileref=\"".$document->getID()."-A-".$file->getID().$file->getFileType()."\" />\n";
+							if($contentdir) {
+								copy($dms->contentDir . $version->getPath(), $contentdir.$document->getID()."-A-".$file->getID().$file->getFileType());
+							} else {
+								echo "Warning: file content (size=".filesize($dms->contentDir . $file->getPath()).") will be missing from output\n";
+							}
+						}
+					} else {
+						echo $indent."   <!-- ".$dms->contentDir . $version->getID()." not found -->\n";
 					}
-					echo $indent."   </data>\n";
 					echo $indent."  </file>\n";
 				}
 				echo $indent." </files>\n";
@@ -287,32 +392,30 @@ function tree($folder, $parent=null, $indent='') { /* {{{ */
 					echo $indent." <notifications>\n";
 					if($notifications['users']) {
 						foreach($notifications['users'] as $user) {
-							echo $indent."  <notification type=\"user\">\n";
+							echo $indent."  <user id=\"".$user->getID()."\" />\n";
-							echo $indent."   <attr name=\"user\">".$user->getId()."</attr>\n";
-							echo $indent."  </notification>\n";
 						}
 					}
 					if($notifications['groups']) {
 						foreach($notifications['groups'] as $group) {
-							echo $indent."  <notification type=\"group\">\n";
+							echo $indent."  <group id=\"".$group->getID()."\" />\n";
-							echo $indent."   <attr name=\"group\">".$group->getId()."</attr>\n";
-							echo $indent."  </notification>\n";
 						}
 					}
-					echo $indent." </notification>\n";
+					echo $indent." </notifications>\n";
 				}
 			}
 
 			echo $indent."</document>\n";
+			$statistic['documents']++;
 		}
 	}
+	}
 } /* }}} */
 
 $db = new SeedDMS_Core_DatabaseAccess($settings->_dbDriver, $settings->_dbHostname, $settings->_dbUser, $settings->_dbPass, $settings->_dbDatabase);
 $db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostname . "\"");
 
 $dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
-if(!$dms->checkVersion()) {
+if(!$settings->_doNotCheckDBVersion && !$dms->checkVersion()) {
 	echo "Database update needed.";
 	exit;
 }
@@ -320,7 +423,10 @@ if(!$dms->checkVersion()) {
 $dms->setRootFolderID($settings->_rootFolderID);
 
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
-echo "<dms>\n";
+echo "<dms dbversion=\"".implode('.', array_slice($dms->getDBVersion(), 1, 3))."\" date=\"".date('Y-m-d H:i:s')."\">\n";
+
+/* Dump users {{{ */
+if(!$sections || in_array('users', $sections)) {
 $users = $dms->getAllUsers();
 if($users) {
 	echo "<users>\n";
@@ -343,11 +449,36 @@ if($users) {
 			echo "   <data>".base64_encode($image['image'])."</data>\n";
 			echo "  </image>\n";
 		}
+		if($mreviewers = $user->getMandatoryReviewers()) {
+			echo "  <mandatory_reviewers>\n";
+			foreach($mreviewers as $mreviewer) {
+				if((int) $mreviewer['reviewerUserID'])
+					echo "   <user id=\"".$mreviewer['reviewerUserID']."\"></user>\n";
+				elseif((int) $mreviewer['reviewerGroupID'])
+					echo "   <group id=\"".$mreviewer['reviewerGroupID']."\"></group>\n";
+			}
+			echo "  </mandatory_reviewers>\n";
+		}
+		if($mapprovers = $user->getMandatoryApprovers()) {
+			echo "  <mandatory_approvers>\n";
+			foreach($mapprovers as $mapprover) {
+				if((int) $mapprover['approverUserID'])
+					echo "   <user id=\"".$mapprover['approverUserID']."\"></user>\n";
+				elseif((int) $mapprover['approverGroupID'])
+					echo "   <group id=\"".$mapprover['approverGroupID']."\"></group>\n";
+			}
+			echo "  </mandatory_approvers>\n";
+		}
 		echo " </user>\n";
+		$statistic['users']++;
 	}
 	echo "</users>\n";
 }
+}
+/* }}} */
 
+/* Dump groups {{{ */
+if(!$sections || in_array('groups', $sections)) {
 $groups = $dms->getAllGroups();
 if($groups) {
 	echo "<groups>\n";
@@ -359,15 +490,20 @@ if($groups) {
 		if($users) {
 			echo "  <users>\n";
 			foreach ($users as $user) {
-				echo "   <user>".$user->getId()."</user>\n";
+				echo "   <user user=\"".$user->getId()."\"/>\n";
 			}
 			echo "  </users>\n";
 		}
 		echo " </group>\n";
+		$statistic['groups']++;
 	}
 	echo "</groups>\n";
 }
+}
+/* }}} */
 
+/* Dump keywordcategories {{{ */
+if(!$sections || in_array('keywordcategories', $sections)) {
 $categories = $dms->getAllKeywordCategories();
 if($categories) {
 	echo "<keywordcategories>\n";
@@ -386,10 +522,15 @@ if($categories) {
 			echo "  </keywords>\n";
 		}
 		echo " </keywordcategory>\n";
+		$statistic['keywordcategories']++;
 	}
 	echo "</keywordcategories>\n";
 }
+}
+/* }}} */
 
+/* Dump documentcategories {{{ */
+if(!$sections || in_array('documentcategories', $sections)) {
 $categories = $dms->getDocumentCategories();
 if($categories) {
 	echo "<documentcategories>\n";
@@ -397,10 +538,15 @@ if($categories) {
 		echo " <documentcategory id=\"".$category->getId()."\">\n";
 		echo "  <attr name=\"name\">".wrapWithCData($category->getName())."</attr>\n";
 		echo " </documentcategory>\n";
+		$statistic['documentcategories']++;
 	}
 	echo "</documentcategories>\n";
 }
+}
+/* }}} */
 
+/* Dump attributedefinition {{{ */
+if(!$sections || in_array('attributedefinition', $sections)) {
 $attrdefs = $dms->getAllAttributeDefinitions();
 if($attrdefs) {
 	echo "<attrіbutedefinitions>\n";
@@ -427,15 +573,29 @@ if($attrdefs) {
 		echo "  <attr name=\"type\">".$attrdef->getType()."</attr>\n";
 		echo "  <attr name=\"minvalues\">".$attrdef->getMinValues()."</attr>\n";
 		echo "  <attr name=\"maxvalues\">".$attrdef->getMaxValues()."</attr>\n";
+		echo "  <attr name=\"regex\">".wrapWithCData($attrdef->getRegex())."</attr>\n";
 		echo " </attributedefinition>\n";
+		$statistic['attributedefinitions']++;
 	}
 	echo "</attrіbutedefinitions>\n";
 }
+}
+/* }}} */
 
+/* Dump folders and documents {{{ */
 $folder = $dms->getFolder($folderid);
 if($folder) {
-	tree($folder);
+	tree($folder, null, '', $skiproot);
 }
+/* }}} */
+
+/* Dump statistics {{{ */
+echo "<statistics>\n";
+echo " <command><![CDATA[".implode(" ", $argv)."]]></command>\n";
+foreach($statistic as $type=>$count)
+	echo " <".$type.">".$count."</".$type.">\n";
+echo "</statistics>\n";
+/* }}} */
 
 echo "</dms>\n";
 ?>

views/bootstrap/class.ApprovalSummary.php

@@ -34,7 +34,10 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
-		$db = $dms->getDB();
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
 
 		$this->htmlStartPage(getMLText("approval_summary"));
 		$this->globalNavigation();
@@ -54,8 +57,8 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 		$printheader = true;
 		foreach ($approvalStatus["indstatus"] as $st) {
 			$document = $dms->getDocument($st['documentID']);
-			if($document)
+			$version = $document->getContentByVersion($st['version']);
-				$version = $document->getContentByVersion($st['version']);
+			$previewer->createPreview($version);
 			$owner = $document->getOwner();
 			$moduser = $dms->getUser($st['required']);
 
@@ -64,6 +67,7 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 				if ($printheader){
 					print "<table class=\"table-condensed\">";
 					print "<thead>\n<tr>\n";
+					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";
 					print "<th>".getMLText("owner")."</th>\n";
 					print "<th>".getMLText("status")."</th>\n";
@@ -75,6 +79,14 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 				}
 			
 				print "<tr>\n";
+				$previewer->createPreview($version);
+				print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+				if($previewer->hasPreview($version)) {
+					print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				} else {
+					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				}
+				print "</a></td>";
 				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
 				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
 				print "<td>".getOverallStatusText($st["status"])."</td>";
@@ -100,8 +112,7 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 		$printheader = true;
 		foreach ($approvalStatus["grpstatus"] as $st) {
 			$document = $dms->getDocument($st['documentID']);
-			if($document)
+			$version = $document->getContentByVersion($st['version']);
-				$version = $document->getContentByVersion($st['version']);
 			$owner = $document->getOwner();
 			$modgroup = $dms->getGroup($st['required']);
 
@@ -110,6 +121,7 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 				if ($printheader){
 					print "<table class=\"table-condensed\">";
 					print "<thead>\n<tr>\n";
+					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";
 					print "<th>".getMLText("owner")."</th>\n";
 					print "<th>".getMLText("status")."</th>\n";
@@ -121,6 +133,14 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 				}	
 			
 				print "<tr>\n";
+				$previewer->createPreview($version);
+				print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+				if($previewer->hasPreview($version)) {
+					print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				} else {
+					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				}
+				print "</a></td>";
 				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
 				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
 				print "<td>".getOverallStatusText($st["status"])."</td>";

views/bootstrap/class.ApproveDocument.php

@@ -51,7 +51,7 @@ class SeedDMS_View_ApproveDocument extends SeedDMS_Bootstrap_Style {
 		$this->globalNavigation($folder);
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
-		$this->contentHeading(getMLText("submit_approval"));
+		$this->contentHeading(getMLText("add_approval"));
 ?>
 <script language="JavaScript">
 function checkIndForm()
@@ -170,12 +170,20 @@ function checkGrpForm()
 			}
 
 ?>
-	<form method="POST" action="../op/op.ApproveDocument.php" name="form1" onsubmit="return checkGrpForm();">
+	<form method="POST" action="../op/op.ApproveDocument.php" name="form1" enctype="multipart/form-data" onsubmit="return checkGrpForm();">
 	<?php echo createHiddenFieldWithKey('approvedocument'); ?>
 	<table>
 	<tr><td><?php printMLText("comment")?>:</td>
 	<td><textarea name="comment" cols="80" rows="4"></textarea>
 	</td></tr>
+		<tr>
+			<td><?php printMLText("approval_file")?>:</td>
+			<td>
+<?php
+	$this->printFileChooser('approvalfile', false);
+?>
+			</td>
+		</tr>
 	<tr><td><?php printMLText("approval_status")?>:</td>
 	<td>
 	<select name="approvalStatus">

views/bootstrap/class.Bootstrap.php

@@ -243,7 +243,7 @@ $(document).ready(function () {
 		echo "   <a class=\"brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['rootfolderid']."\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n";
 		if(isset($this->params['user']) && $this->params['user']) {
 			echo "   <div class=\"nav-collapse nav-col1\">\n";
-			echo "   <ul id=\"main-menu-admin\"class=\"nav pull-right\">\n";
+			echo "   <ul id=\"main-menu-admin\" class=\"nav pull-right\">\n";
 			echo "    <li class=\"dropdown\">\n";
 			echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".($this->params['session']->getSu() ? getMLText("switched_to") : getMLText("signed_in_as"))." '".htmlspecialchars($this->params['user']->getFullName())."' <i class=\"icon-caret-down\"></i></a>\n";
 			echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
@@ -346,8 +346,6 @@ $(document).ready(function () {
 	function pageNavigation($pageTitle, $pageType=null, $extra=null) { /* {{{ */
 
 		if ($pageType!=null && strcasecmp($pageType, "noNav")) {
-			if($pageType == "view_folder" || $pageType == "view_document")
-				echo $pageTitle."\n";
 			echo "<div class=\"navbar\">\n";
 			echo " <div class=\"navbar-inner\">\n";
 			echo "  <div class=\"container\">\n";
@@ -378,6 +376,8 @@ $(document).ready(function () {
 			echo " 	</div>\n";
 			echo " </div>\n";
 			echo "</div>\n";
+			if($pageType == "view_folder" || $pageType == "view_document")
+				echo $pageTitle."\n";
 		} else {
 			echo "<legend>".$pageTitle."</legend>\n";
 		}
@@ -1196,7 +1196,8 @@ function clearFilename<?php print $formName ?>() {
 	<script language="JavaScript">
 var data = <?php echo json_encode($tree); ?>;
 $(function() {
-  $('#jqtree<?php echo $formid ?>').tree({
+	$('#jqtree<?php echo $formid ?>').tree({
+		saveState: true,
 		data: data,
 		openedIcon: '<i class="icon-minus-sign"></i>',
 		closedIcon: '<i class="icon-plus-sign"></i>',
@@ -1904,6 +1905,7 @@ mayscript>
 	 */
 	protected function printProtocol($latestContent, $type="") { /* {{{ */
 		$dms = $this->params['dms'];
+		$document = $latestContent->getDocument();
 ?>
 		<legend><?php printMLText($type.'_log'); ?></legend>
 		<table class="table condensed">
@@ -1957,13 +1959,13 @@ mayscript>
 			case "review":
 				if($rec['file']) {
 					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$rec['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+					echo "<a href=\"../op/op.Download.php?documentid=".$document->getID()."&reviewlogid=".$rec['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
 				}
 				break;
 			case "approval":
 				if($rec['file']) {
 					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$rec['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+					echo "<a href=\"../op/op.Download.php?documentid=".$document->getID()."&approvelogid=".$rec['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
 				}
 				break;
 			}
@@ -1985,5 +1987,27 @@ mayscript>
 				</table>
 <?php
 	} /* }}} */
+
+	/**
+	 * Show progressbar
+	 *
+	 * @param double $value value
+	 * @param double $max 100% value
+	 */
+	protected function getProgressBar($value, $max=100.0) { /* {{{ */
+		if($max > $value) {
+			$used = (int) ($value/$max*100.0+0.5);
+			$free = 100-$used;
+		} else {
+			$free = 0;
+			$used = 100;
+		}
+		$html = '
+		<div class="progress">
+			<div class="bar bar-danger" style="width: '.$used.'%;"></div>
+		  <div class="bar bar-success" style="width: '.$free.'%;"></div>
+		</div>';
+		return $html;
+	} /* }}} */
 }
 ?>

views/bootstrap/class.Charts.php

@@ -57,9 +57,9 @@ class SeedDMS_View_Charts extends SeedDMS_Bootstrap_Style {
 ?>
 
 <?php
-
 echo "<div class=\"row-fluid\">\n";
-echo "<div class=\"span4\">\n";
+
+echo "<div class=\"span3\">\n";
 $this->contentHeading(getMLText("chart_selection"));
 echo "<div class=\"well\">\n";
 foreach(array('docsperuser', 'sizeperuser', 'docspermimetype', 'docspercategory', 'docsperstatus', 'docspermonth', 'docsaccumulated') as $atype) {
@@ -68,12 +68,29 @@ foreach(array('docsperuser', 'sizeperuser', 'docspermimetype', 'docspercategory'
 echo "</div>\n";
 echo "</div>\n";
 
-echo "<div class=\"span8\">\n";
+if(in_array($type, array('docspermonth', 'docsaccumulated'))) {
+	echo "<div class=\"span9\">\n";
+} else {
+	echo "<div class=\"span6\">\n";
+}
 $this->contentHeading(getMLText('chart_'.$type.'_title'));
 echo "<div class=\"well\">\n";
-
 ?>
 <div id="chart" style="height: 400px;" class="chart"></div>
+<?php
+echo "</div>\n";
+echo "</div>\n";
+
+if(!in_array($type, array('docspermonth', 'docsaccumulated'))) {
+	echo "<div class=\"span3\">\n";
+	$this->contentHeading(getMLText('legend'));
+	echo "<div class=\"well\" id=\"legend\">\n";
+	echo "</div>\n";
+	echo "</div>\n";
+}
+
+echo "</div>\n";
+?>
 <script type="text/javascript">
 	$("<div id='tooltip'></div>").css({
 		position: "absolute",
@@ -112,7 +129,7 @@ if(in_array($type, array('docspermonth'))) {
 		grid: {
 			hoverable: true,
 			clickable: true
-		},
+		}
 	});
 
 	$("#chart").bind("plothover", function (event, pos, item) {
@@ -149,7 +166,7 @@ if(in_array($type, array('docspermonth'))) {
 		grid: {
 			hoverable: true,
 			clickable: true
-		},
+		}
 	});
 
 	$("#chart").bind("plothover", function (event, pos, item) {
@@ -173,6 +190,7 @@ if(in_array($type, array('docspermonth'))) {
 	}
 ?>
 	];
+$(document).ready( function() {
 	$.plot('#chart', data, {
 		series: {
 			pie: { 
@@ -192,6 +210,10 @@ if(in_array($type, array('docspermonth'))) {
 		grid: {
 			hoverable: true,
 			clickable: true
+		},
+		legend: {
+			show: true,
+			container: '#legend'
 		}
 	});
 
@@ -210,15 +232,12 @@ if(in_array($type, array('docspermonth'))) {
 	function labelFormatter(label, series) {
 		return "<div style='font-size:8pt; line-height: 14px; text-align:center; padding:2px; color:black; background: white; border-radius: 5px;'>" + label + "<br/>" + series.data[0][1] + " (" + Math.round(series.percent) + "%)</div>";
 	}
+});
 <?php
 }
 ?>
 </script>
 <?php
-echo "</div>\n";
-echo "</div>\n";
-echo "</div>\n";
-
 
 $this->contentContainerEnd();
 $this->htmlEndPage();

views/bootstrap/class.Indexer.php

@@ -31,22 +31,26 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_Indexer extends SeedDMS_Bootstrap_Style {
 
-	function tree($dms, $index, $folder, $indent='') { /* {{{ */
+	function tree($dms, $index, $indexconf, $folder, $indent='') { /* {{{ */
 		set_time_limit(30);
 		echo $indent."D ".htmlspecialchars($folder->getName())."\n";
 		$subfolders = $folder->getSubFolders();
 		foreach($subfolders as $subfolder) {
-			$this->tree($dms, $index, $subfolder, $indent.'  ');
+			$this->tree($dms, $index, $indexconf, $subfolder, $indent.'  ');
 		}
 		$documents = $folder->getDocuments();
 		foreach($documents as $document) {
 			echo $indent."  ".$document->getId().":".htmlspecialchars($document->getName())." ";
 			/* If the document wasn't indexed before then just add it */
-			if(!($hits = $index->find('document_id:'.$document->getId()))) {
+			$lucenesearch = new $indexconf['Search']($index);
-				$index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, $this->converters ? $this->converters : null));
+			if(!($hit = $lucenesearch->getDocument($document->getId()))) {
-				echo "(document added)";
+				try {
+					$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, $this->converters ? $this->converters : null, false, $this->timeout));
+					echo "(document added)";
+				} catch(Exception $e) {
+					echo $indent."(adding document failed '".$e->getMessage()."')";
+				}
 			} else {
-				$hit = $hits[0];
 				/* Check if the attribute created is set or has a value older
 				 * than the lasted content. Documents without such an attribute
 				 * where added when a new document was added to the dms. In such
@@ -54,7 +58,7 @@ class SeedDMS_View_Indexer extends SeedDMS_Bootstrap_Style {
 				 */
 				try {
 					$created = (int) $hit->getDocument()->getFieldValue('created');
-				} catch (Zend_Search_Lucene_Exception $e) {
+				} catch (/* Zend_Search_Lucene_ */Exception $e) {
 					$created = 0;
 				}
 				$content = $document->getLatestContent();
@@ -62,8 +66,13 @@ class SeedDMS_View_Indexer extends SeedDMS_Bootstrap_Style {
 					echo $indent."(document unchanged)";
 				} else {
 					$index->delete($hit->id);
-					$index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, $this->converters ? $this->converters : null));
+					try {
-					echo $indent."(document updated)";
+						$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, $this->converters ? $this->converters : null, false, $this->timeout));
+						echo $indent."(document updated)";
+					} catch(Exception $e) {
+						print_r($e);
+						echo $indent."(updating document failed)";
+					}
 				}
 			}
 			echo "\n";
@@ -74,9 +83,11 @@ class SeedDMS_View_Indexer extends SeedDMS_Bootstrap_Style {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$index = $this->params['index'];
+		$indexconf = $this->params['indexconf'];
 		$recreate = $this->params['recreate'];
 		$folder = $this->params['folder'];
 		$this->converters = $this->params['converters'];
+		$this->timeout = $this->params['timeout'];
 
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
@@ -85,7 +96,7 @@ class SeedDMS_View_Indexer extends SeedDMS_Bootstrap_Style {
 		$this->contentHeading(getMLText("update_fulltext_index"));
 
 		echo "<pre>";
-		$this->tree($dms, $index, $folder);
+		$this->tree($dms, $index, $indexconf, $folder);
 		echo "</pre>";
 
 		$index->commit();

views/bootstrap/class.MyDocuments.php

@@ -182,7 +182,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 						}
 						foreach ($reviewStatus["grpstatus"] as $st) {
 						
-							if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) {
+							if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) /* && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId() */) {
 								$dList[] = $st["documentID"];
 								$document = $dms->getDocument($st["documentID"]);
 
@@ -232,7 +232,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 					
 					foreach ($approvalStatus["indstatus"] as $st) {
 					
-						if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]])) {
+						if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['status'] == S_DRAFT_APP) {
 							$document = $dms->getDocument($st["documentID"]);
 						
 							if ($printheader){
@@ -268,7 +268,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 					}
 					foreach ($approvalStatus["grpstatus"] as $st) {
 					
-						if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) {
+						if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['status'] == S_DRAFT_APP /* && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId() */) {
 							$document = $dms->getDocument($st["documentID"]);
 							if ($printheader){
 								print "<table class=\"table table-condensed\">";

views/bootstrap/class.ReviewDocument.php

@@ -167,13 +167,21 @@ function checkGrpForm()
 			}
 
 ?>
-	<form method="post" action="../op/op.ReviewDocument.php" name="form1" onsubmit="return checkGrpForm();">
+	<form method="post" action="../op/op.ReviewDocument.php" name="form1" enctype="multipart/form-data" onsubmit="return checkGrpForm();">
 	<?php echo createHiddenFieldWithKey('reviewdocument'); ?>
 	<table class="table-condensed">
 		<tr>
 			<td><?php printMLText("comment")?>:</td>
 			<td><textarea name="comment" cols="80" rows="4"></textarea></td>
 		</tr>
+		<tr>
+			<td><?php printMLText("review_file")?>:</td>
+			<td>
+<?php
+	$this->printFileChooser('reviewfile', false);
+?>
+			</td>
+		</tr>
 		<tr>
 			<td><?php printMLText("review_status")?>:</td>
 			<td>

views/bootstrap/class.ReviewSummary.php

@@ -34,6 +34,10 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
 
 		$this->htmlStartPage(getMLText("my_documents"));
 		$this->globalNavigation();
@@ -56,8 +60,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 		$iRev = array();
 		foreach ($reviewStatus["indstatus"] as $st) {
 			$document = $dms->getDocument($st['documentID']);
-			if($document)
+			$version = $document->getContentByVersion($st['version']);
-				$version = $document->getContentByVersion($st['version']);
 			$owner = $document->getOwner();
 			$moduser = $dms->getUser($st['required']);
 
@@ -66,6 +69,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 				if ($printheader){
 					print "<table class=\"table-condensed\">";
 					print "<thead>\n<tr>\n";
+					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";
 					print "<th>".getMLText("owner")."</th>\n";
 					print "<th>".getMLText("status")."</th>\n";
@@ -77,6 +81,14 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 				}
 			
 				print "<tr>\n";
+				$previewer->createPreview($version);
+				print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+				if($previewer->hasPreview($version)) {
+					print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				} else {
+					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				}
+				print "</a></td>";
 				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
 				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
 				print "<td>".getOverallStatusText($st["status"])."</td>";
@@ -102,8 +114,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 		$printheader=true;
 		foreach ($reviewStatus["grpstatus"] as $st) {
 			$document = $dms->getDocument($st['documentID']);
-			if($document)
+			$version = $document->getContentByVersion($st['version']);
-				$version = $document->getContentByVersion($st['version']);
 			$owner = $document->getOwner();
 			$modgroup = $dms->getGroup($st['required']);
 
@@ -112,6 +123,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 				if ($printheader){
 					print "<table class=\"folderView\">";
 					print "<thead>\n<tr>\n";
+					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";
 					print "<th>".getMLText("owner")."</th>\n";
 					print "<th>".getMLText("status")."</th>\n";
@@ -123,6 +135,14 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 				}		
 			
 				print "<tr>\n";
+				$previewer->createPreview($version);
+				print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+				if($previewer->hasPreview($version)) {
+					print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				} else {
+					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				}
+				print "</a></td>";
 				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
 				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
 				print "<td>".getOverallStatusText($st["status"])."</td>";

views/bootstrap/class.Search.php

@@ -355,7 +355,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 	  	echo "<div class=\"tab-pane ".(($fullsearch == true) ? 'active' : '')."\" id=\"fulltext\">\n";
 	$this->contentContainerStart();
 ?>
-<form action="../op/op.Search.php" name="form2" onsubmit="return checkForm();">
+<form action="../op/op.Search.php" name="form2" onsubmit="return checkForm();" style="min-height: 330px;">
 <input type="hidden" name="fullsearch" value="1" />
 <table class="table-condensed">
 <tr>
@@ -418,9 +418,10 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 <?php
 		echo "</div>\n";
 		echo "<div class=\"span8\">\n";
-// Database search Result {{{
+// Search Result {{{
 		$foldercount = $doccount = 0;
 		if($entries) {
+			/*
 			foreach ($entries as $entry) {
 				if(get_class($entry) == 'SeedDMS_Core_Document') {
 					$doccount++;
@@ -428,6 +429,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 					$foldercount++;
 				}
 			}
+			 */
 			print "<div class=\"alert\">".getMLText("search_report", array("doccount" => $totaldocs, "foldercount" => $totalfolders, 'searchtime'=>$searchTime))."</div>";
 			$this->pageList($pageNumber, $totalpages, "../op/op.Search.php", $urlparams);
 //			$this->contentContainerStart();
@@ -602,7 +604,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 //			$this->contentContainerEnd();
 			$this->pageList($pageNumber, $totalpages, "../op/op.Search.php", $_GET);
 		} else {
-			$numResults = $doccount + $foldercount;
+			$numResults = $totaldocs + $totalfolders;
 			if ($numResults == 0) {
 				print "<div class=\"alert alert-error\">".getMLText("search_no_results")."</div>";
 			}

views/bootstrap/class.SetExpires.php

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

views/bootstrap/class.Settings.php

@@ -31,6 +31,24 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style {
 
+	protected function showTextField($name, $value, $type='', $placeholder='') { /* {{{ */
+		if($type != 'password' && strlen($value) > 80)
+			echo '<textarea class="input-xxlarge" name="'.$name.'">'.$value.'</textarea>';
+		else {
+			if(strlen($value) > 40)
+				$class = 'input-xxlarge';
+			elseif(strlen($value) > 30)
+				$class = 'input-xlarge';
+			elseif(strlen($value) > 18)
+				$class = 'input-large';
+			elseif(strlen($value) > 12)
+				$class = 'input-medium';
+			else
+				$class = 'input-small';
+			echo '<input '.($type=='password' ? 'type="password"' : 'type="text"').'" class="'.$class.'" name="'.$name.'" value="'.$value.'" placeholder="'.$placeholder.'"/>';
+		}
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -80,11 +98,11 @@ if(!is_writeable($settings->_configFilePath)) {
       <tr ><td><b> <?php printMLText("settings_Display");?></b></td> </tr>
       <tr title="<?php printMLText("settings_siteName_desc");?>">
         <td><?php printMLText("settings_siteName");?>:</td>
-        <td><input type="text" name="siteName" value="<?php echo $settings->_siteName ?>"/></td>
+				<td><?php $this->showTextField('siteName', $settings->_siteName); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_footNote_desc");?>">
         <td><?php printMLText("settings_footNote");?>:</td>
-        <td><input type="text" name="footNote" value="<?php echo $settings->_footNote ?>" size="100"/></td>
+				<td><?php $this->showTextField("footNote", $settings->_footNote); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_printDisclaimer_desc");?>">
         <td><?php printMLText("settings_printDisclaimer");?>:</td>
@@ -126,11 +144,11 @@ if(!is_writeable($settings->_configFilePath)) {
       </tr>
       <tr title="<?php printMLText("settings_previewWidthList_desc");?>">
         <td><?php printMLText("settings_previewWidthList");?>:</td>
-        <td><input name="previewWidthList" type="text" value="<?php echo $settings->_previewWidthList ?>" /></td>
+				<td><?php $this->showTextField("previewWidthList", $settings->_previewWidthList); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_previewWidthDetail_desc");?>">
         <td><?php printMLText("settings_previewWidthDetail");?>:</td>
-        <td><input name="previewWidthDetail" type="text" value="<?php echo $settings->_previewWidthDetail ?>" /></td>
+				<td><?php $this->showTextField("previewWidthDetail", $settings->_previewWidthDetail); ?></td>
       </tr>
 
       <!--
@@ -143,7 +161,7 @@ if(!is_writeable($settings->_configFilePath)) {
       </tr>
       <tr title="<?php printMLText("settings_viewOnlineFileTypes_desc");?>">
         <td><?php printMLText("settings_viewOnlineFileTypes");?>:</td>
-        <td><input type="text" name="viewOnlineFileTypes" value="<?php echo $settings->getViewOnlineFileTypesToString() ?>" size="100" /></td>
+				<td><?php $this->showTextField("viewOnlineFileTypes", $settings->getViewOnlineFileTypesToString()); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_enableConverting_desc");?>">
         <td><?php printMLText("settings_enableConverting");?>:</td>
@@ -161,9 +179,18 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_enableFullSearch");?>:</td>
         <td><input name="enableFullSearch" type="checkbox" <?php if ($settings->_enableFullSearch) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_fullSearchEngine_desc");?>">
+        <td><?php printMLText("settings_fullSearchEngine");?>:</td>
+				<td>
+				  <select name="fullSearchEngine">
+					  <option value="lucene" <?php if ($settings->_fullSearchEngine=='lucene') echo "selected" ?>><?php printMLText("settings_fullSearchEngine_vallucene");?></option>
+						<option value="sqlitefts" <?php if ($settings->_fullSearchEngine=='sqlitefts') echo "selected" ?>><?php printMLText("settings_fullSearchEngine_valsqlitefts");?></option>
+					</select>
+				</td>
+      </tr>
       <tr title="<?php printMLText("settings_stopWordsFile_desc");?>">
         <td><?php printMLText("settings_stopWordsFile");?>:</td>
-        <td><input type="text" name="stopWordsFile" value="<?php echo $settings->_stopWordsFile; ?>" size="100" /></td>
+        <td><?php $this->showTextField("stopWordsFile", $settings->_stopWordsFile); ?></td>
       </tr>
 	    <tr title="<?php printMLText("settings_enableClipboard_desc");?>">
         <td><?php printMLText("settings_enableClipboard");?>:</td>
@@ -192,7 +219,7 @@ if(!is_writeable($settings->_configFilePath)) {
       </tr>
       <tr title="<?php printMLText("settings_maxRecursiveCount_desc");?>">
         <td><?php printMLText("settings_maxRecursiveCount");?>:</td>
-        <td><input type="text" name="maxRecursiveCount" value="<?php echo $settings->_maxRecursiveCount ?>" /></td>
+				<td><?php $this->showTextField("maxRecursiveCount", $settings->_maxRecursiveCount); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_enableLanguageSelector_desc");?>">
         <td><?php printMLText("settings_enableLanguageSelector");?>:</td>
@@ -263,31 +290,31 @@ if(!is_writeable($settings->_configFilePath)) {
       <tr ><td><b> <?php printMLText("settings_Server");?></b></td> </tr>
       <tr title="<?php printMLText("settings_rootDir_desc");?>">
         <td><?php printMLText("settings_rootDir");?>:</td>
-        <td><input type="text" name="rootDir" value="<?php echo $settings->_rootDir ?>" size="100" /></td>
+        <td><?php $this->showTextField("rootDir", $settings->_rootDir); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_httpRoot_desc");?>">
         <td><?php printMLText("settings_httpRoot");?>:</td>
-        <td><input type="text" name="httpRoot" value="<?php echo $settings->_httpRoot ?>" size="100" /></td>
+        <td><?php $this->showTextField("httpRoot", $settings->_httpRoot); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_contentDir_desc");?>">
         <td><?php printMLText("settings_contentDir");?>:</td>
-        <td><input type="text" name="contentDir" value="<?php echo $settings->_contentDir ?>" size="100" /></td>
+        <td><?php $this->showTextField("contentDir", $settings->_contentDir); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_cacheDir_desc");?>">
         <td><?php printMLText("settings_cacheDir");?>:</td>
-        <td><input type="text" name="cacheDir" value="<?php echo $settings->_cacheDir ?>" size="100" /></td>
+        <td><?php $this->showTextField("cacheDir", $settings->_cacheDir); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_stagingDir_desc");?>">
         <td><?php printMLText("settings_stagingDir");?>:</td>
-        <td><input type="text" name="stagingDir" value="<?php echo $settings->_stagingDir ?>" size="100" /></td>
+        <td><?php $this->showTextField("stagingDir", $settings->_stagingDir); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_luceneDir_desc");?>">
         <td><?php printMLText("settings_luceneDir");?>:</td>
-        <td><input type="text" name="luceneDir" value="<?php echo $settings->_luceneDir ?>" size="100" /></td>
+        <td><?php $this->showTextField("luceneDir", $settings->_luceneDir); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_dropFolderDir_desc");?>">
         <td><?php printMLText("settings_dropFolderDir");?>:</td>
-        <td><input type="text" name="dropFolderDir" value="<?php echo $settings->_dropFolderDir ?>" size="100" /></td>
+        <td><?php $this->showTextField("dropFolderDir", $settings->_dropFolderDir); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_logFileEnable_desc");?>">
         <td><?php printMLText("settings_logFileEnable");?>:</td>
@@ -308,7 +335,7 @@ if(!is_writeable($settings->_configFilePath)) {
       </tr>
       <tr title="<?php printMLText("settings_partitionSize_desc");?>">
         <td><?php printMLText("settings_partitionSize");?>:</td>
-        <td><input type="text" name="partitionSize" value="<?php echo $settings->_partitionSize ?>" size="100" /></td>
+        <td><?php $this->showTextField("partitionSize", $settings->_partitionSize); ?></td>
       </tr>
       <!--
         -- SETTINGS - SYSTEM - AUTHENTICATION
@@ -336,7 +363,7 @@ if(!is_writeable($settings->_configFilePath)) {
       </tr>
       <tr title="<?php printMLText("settings_passwordStrength_desc");?>">
         <td><?php printMLText("settings_passwordStrength");?>:</td>
-        <td><input type="text" name="passwordStrength" value="<?php echo $settings->_passwordStrength; ?>" size="2" /></td>
+        <td><?php $this->showTextField("passwordStrength", $settings->_passwordStrength); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_passwordStrengthAlgorithm_desc");?>">
         <td><?php printMLText("settings_passwordStrengthAlgorithm");?>:</td>
@@ -349,31 +376,31 @@ if(!is_writeable($settings->_configFilePath)) {
       </tr>
       <tr title="<?php printMLText("settings_passwordExpiration_desc");?>">
         <td><?php printMLText("settings_passwordExpiration");?>:</td>
-        <td><input type="text" name="passwordExpiration" value="<?php echo $settings->_passwordExpiration; ?>" size="3" /></td>
+        <td><?php $this->showTextField("passwordExpiration", $settings->_passwordExpiration); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_passwordHistory_desc");?>">
         <td><?php printMLText("settings_passwordHistory");?>:</td>
-        <td><input type="text" name="passwordHistory" value="<?php echo $settings->_passwordHistory; ?>" size="2" /></td>
+        <td><?php $this->showTextField("passwordHistory", $settings->_passwordHistory); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_loginFailure_desc");?>">
         <td><?php printMLText("settings_loginFailure");?>:</td>
-        <td><input type="text" name="loginFailure" value="<?php echo $settings->_loginFailure; ?>" size="2" /></td>
+        <td><?php $this->showTextField("loginFailure", $settings->_loginFailure); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_quota_desc");?>">
         <td><?php printMLText("settings_quota");?>:</td>
-        <td><input type="text" name="quota" value="<?php echo $settings->_quota; ?>" size="2" /></td>
+        <td><?php $this->showTextField("quota", $settings->_quota); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_undelUserIds_desc");?>">
         <td><?php printMLText("settings_undelUserIds");?>:</td>
-        <td><input type="text" name="undelUserIds" value="<?php echo $settings->_undelUserIds; ?>" size="32" /></td>
+        <td><?php $this->showTextField("undelUserIds", $settings->_undelUserIds); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_encryptionKey_desc");?>">
         <td><?php printMLText("settings_encryptionKey");?>:</td>
-        <td><input type="text" name="encryptionKey" value="<?php echo $settings->_encryptionKey; ?>" size="32" /></td>
+        <td><?php $this->showTextField("encryptionKey", $settings->_encryptionKey); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_cookieLifetime_desc");?>">
         <td><?php printMLText("settings_cookieLifetime");?>:</td>
-        <td><input type="text" name="cookieLifetime" value="<?php echo $settings->_cookieLifetime; ?>" size="32" /></td>
+        <td><?php $this->showTextField("cookieLifetime", $settings->_cookieLifetime); ?></td>
       </tr>
 
       <!-- TODO Connectors -->
@@ -384,23 +411,23 @@ if(!is_writeable($settings->_configFilePath)) {
       <tr ><td><b> <?php printMLText("settings_Database");?></b></td> </tr>
       <tr title="<?php printMLText("settings_dbDriver_desc");?>">
         <td><?php printMLText("settings_dbDriver");?>:</td>
-        <td><input type="text" name="dbDriver" value="<?php echo $settings->_dbDriver ?>" /></td>
+        <td><?php $this->showTextField("dbDriver", $settings->_dbDriver); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_dbHostname_desc");?>">
         <td><?php printMLText("settings_dbHostname");?>:</td>
-        <td><input type="text" name="dbHostname" value="<?php echo $settings->_dbHostname ?>" /></td>
+        <td><?php $this->showTextField("dbHostname", $settings->_dbHostname); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_dbDatabase_desc");?>">
         <td><?php printMLText("settings_dbDatabase");?>:</td>
-        <td><input type="text" name="dbDatabase" value="<?php echo $settings->_dbDatabase ?>" /></td>
+        <td><?php $this->showTextField("dbDatabase", $settings->_dbDatabase); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_dbUser_desc");?>">
         <td><?php printMLText("settings_dbUser");?>:</td>
-        <td><input type="text" name="dbUser" value="<?php echo $settings->_dbUser ?>" /></td>
+        <td><?php $this->showTextField("dbUser", $settings->_dbUser); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_dbPass_desc");?>">
         <td><?php printMLText("settings_dbPass");?>:</td>
-        <td><input type="text" name="dbPass" value="<?php echo $settings->_dbPass ?>" type="password" /></td>
+        <td><?php $this->showTextField("dbPass", $settings->_dbPass, 'password'); ?></td>
       </tr>
 
      <!--
@@ -409,15 +436,15 @@ if(!is_writeable($settings->_configFilePath)) {
       <tr ><td><b> <?php printMLText("settings_SMTP");?></b></td> </tr>
       <tr title="<?php printMLText("settings_smtpServer_desc");?>">
         <td><?php printMLText("settings_smtpServer");?>:</td>
-        <td><input type="text" name="smtpServer" value="<?php echo $settings->_smtpServer ?>" /></td>
+        <td><?php $this->showTextField("smtpServer", $settings->_smtpServer); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_smtpPort_desc");?>">
         <td><?php printMLText("settings_smtpPort");?>:</td>
-        <td><input type="text" name="smtpPort" value="<?php echo $settings->_smtpPort ?>" /></td>
+        <td><?php $this->showTextField("smtpPort", $settings->_smtpPort); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_smtpSendFrom_desc");?>">
         <td><?php printMLText("settings_smtpSendFrom");?>:</td>
-        <td><input type="text" name="smtpSendFrom" value="<?php echo $settings->_smtpSendFrom ?>" /></td>
+        <td><?php $this->showTextField("smtpSendFrom", $settings->_smtpSendFrom); ?></td>
       </tr>
 
     </table>
@@ -433,11 +460,11 @@ if(!is_writeable($settings->_configFilePath)) {
       <tr ><td><b> <?php printMLText("settings_Display");?></b></td> </tr>
       <tr title="<?php printMLText("settings_siteDefaultPage_desc");?>">
         <td><?php printMLText("settings_siteDefaultPage");?>:</td>
-        <td><input type="text" name="siteDefaultPage" value="<?php echo $settings->_siteDefaultPage ?>" size="100" /></td>
+        <td><?php $this->showTextField("siteDefaultPage", $settings->_siteDefaultPage); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_rootFolderID_desc");?>">
         <td><?php printMLText("settings_rootFolderID");?>:</td>
-        <td><input type="text" name="rootFolderID" value="<?php echo $settings->_rootFolderID ?>" /></td>
+        <td><?php $this->showTextField("rootFolderID", $settings->_rootFolderID); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_titleDisplayHack_desc");?>">
         <td><?php printMLText("settings_titleDisplayHack");?>:</td>
@@ -454,11 +481,11 @@ if(!is_writeable($settings->_configFilePath)) {
       <tr ><td><b> <?php printMLText("settings_Authentication");?></b></td> </tr>
       <tr title="<?php printMLText("settings_guestID_desc");?>">
         <td><?php printMLText("settings_guestID");?>:</td>
-        <td><input type="text" name="guestID" value="<?php echo $settings->_guestID ?>" /></td>
+        <td><?php $this->showTextField("guestID", $settings->_guestID); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_adminIP_desc");?>">
         <td><?php printMLText("settings_adminIP");?>:</td>
-        <td><input type="text" name="adminIP" value="<?php echo $settings->_adminIP ?>" /></td>
+        <td><?php $this->showTextField("adminIP", $settings->_adminIP); ?></td>
       </tr>
 
       <!--
@@ -477,11 +504,11 @@ if(!is_writeable($settings->_configFilePath)) {
       </tr>
       <tr title="<?php printMLText("settings_versioningFileName_desc");?>">
         <td><?php printMLText("settings_versioningFileName");?>:</td>
-        <td><input type="text" name="versioningFileName" value="<?php echo $settings->_versioningFileName ?>" /></td>
+        <td><?php $this->showTextField("versioningFileName", $settings->_versioningFileName); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_presetExpirationDate_desc");?>">
         <td><?php printMLText("settings_presetExpirationDate");?>:</td>
-        <td><input name="presetExpirationDate" type="text" value="<?php echo $settings->_presetExpirationDate; ?>" /></td>
+        <td><?php $this->showTextField("presetExpirationDate", $settings->_presetExpirationDate); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_enableAdminRevApp_desc");?>">
         <td><?php printMLText("settings_enableAdminRevApp");?>:</td>
@@ -535,31 +562,35 @@ if(!is_writeable($settings->_configFilePath)) {
       <tr ><td><b> <?php printMLText("settings_Server");?></b></td> </tr>
       <tr title="<?php printMLText("settings_coreDir_desc");?>">
         <td><?php printMLText("settings_coreDir");?>:</td>
-        <td><input type="text" name="coreDir" value="<?php echo $settings->_coreDir ?>" size="100" /></td>
+        <td><?php $this->showTextField("coreDir", $settings->_coreDir); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_luceneClassDir_desc");?>">
         <td><?php printMLText("settings_luceneClassDir");?>:</td>
-        <td><input type="text" name="luceneClassDir" value="<?php echo $settings->_luceneClassDir ?>" size="100" /></td>
+        <td><?php $this->showTextField("luceneClassDir", $settings->_luceneClassDir); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_extraPath_desc");?>">
         <td><?php printMLText("settings_extraPath");?>:</td>
-        <td><input type="text" name="extraPath" value="<?php echo $settings->_extraPath ?>" size="100" /></td>
+        <td><?php $this->showTextField("extraPath", $settings->_extraPath); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_contentOffsetDir_desc");?>">
         <td><?php printMLText("settings_contentOffsetDir");?>:</td>
-        <td><input type="text" name="contentOffsetDir" value="<?php echo $settings->_contentOffsetDir ?>" /></td>
+        <td><?php $this->showTextField("contentOffsetDir", $settings->_contentOffsetDir); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_maxDirID_desc");?>">
         <td><?php printMLText("settings_maxDirID");?>:</td>
-        <td><input type="text" name="maxDirID" value="<?php echo $settings->_maxDirID ?>" /></td>
+        <td><?php $this->showTextField("maxDirID", $settings->_maxDirID); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_updateNotifyTime_desc");?>">
         <td><?php printMLText("settings_updateNotifyTime");?>:</td>
-        <td><input type="text" name="updateNotifyTime" value="<?php echo $settings->_updateNotifyTime ?>" /></td>
+        <td><?php $this->showTextField("updateNotifyTime", $settings->_updateNotifyTime); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_maxExecutionTime_desc");?>">
         <td><?php printMLText("settings_maxExecutionTime");?>:</td>
-        <td><input type="text" name="maxExecutionTime" value="<?php echo $settings->_maxExecutionTime ?>" /></td>
+        <td><?php $this->showTextField("maxExecutionTime", $settings->_maxExecutionTime); ?></td>
+      </tr>
+      <tr title="<?php printMLText("settings_cmdTimeout_desc");?>">
+        <td><?php printMLText("settings_cmdTimeout");?>:</td>
+        <td><?php $this->showTextField("cmdTimeout", $settings->_cmdTimeout); ?></td>
       </tr>
 
       <tr ><td><b> <?php printMLText("index_converters");?></b></td> </tr>
@@ -568,14 +599,14 @@ if(!is_writeable($settings->_configFilePath)) {
 ?>
       <tr title="<?php echo $mimetype;?>">
         <td><?php echo $mimetype;?>:</td>
-        <td><input type="text" name="converters[<?php echo $mimetype;?>]" value="<?php echo htmlspecialchars($cmd) ?>" size="100" /></td>
+        <td><?php $this->showTextField("converters[".$mimetype."]", htmlspecialchars($cmd)); ?></td>
       </tr>
 <?php
 	}
 ?>
       <tr title="">
-        <td><input type="text" name="converters_newmimetype" value="" />:</td>
+        <td><?php $this->showTextField("converters_newmimetype", ""); ?></td>
-        <td><input type="text" name="converters_newcmd" value="" /></td>
+        <td><?php $this->showTextField("converters_newcmd", ""); ?></td>
       </tr>
     </table>
 <?php		$this->contentContainerEnd(); ?>

views/bootstrap/class.UserList.php

@@ -76,27 +76,10 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 			echo "<td>";
 			echo SeedDMS_Core_File::format_filesize($currUser->getUsedDiskSpace());
 			if($quota) {
-				$qt = $currUser->getQuota();
-				if($qt == 0)
-					$qt = $quota;
-				if($qt > $currUser->getUsedDiskSpace()) {
-					$used = (int) ($currUser->getUsedDiskSpace()/$qt*100.0+0.5);
-					$free = 100-$used;
-				} else {
-					$free = 0;
-					$used = 100;
-				}
 				echo " / ";
-				if($currUser->getQuota() != 0)
+				$qt = $currUser->getQuota() ? $currUser->getQuota() : $quota;
-					echo SeedDMS_Core_File::format_filesize($currUser->getQuota())."<br />";
+				echo SeedDMS_Core_File::format_filesize($qt)."<br />";
-				else
+				echo $this->getProgressBar($currUser->getUsedDiskSpace(), $qt);
-					echo SeedDMS_Core_File::format_filesize($quota)."<br />";
-?>
-		<div class="progress">
-			<div class="bar bar-danger" style="width: <?php echo $used; ?>%;"></div>
-		  <div class="bar bar-success" style="width: <?php echo $free; ?>%;"></div>
-		</div>
-<?php
 			}
 			echo "</td>";
 			echo "<td>";

views/bootstrap/class.UsrMgr.php

@@ -31,10 +31,42 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_UsrMgr extends SeedDMS_Bootstrap_Style {
 
+	function info() { /* {{{ */
+		$dms = $this->params['dms'];
+		$seluser = $this->params['seluser'];
+		$quota = $this->params['quota'];
+
+		if($seluser) {
+			$sessionmgr = new SeedDMS_SessionMgr($dms->getDB());
+
+			$this->contentHeading(getMLText("user_info"));
+			echo "<table class=\"table table-condensed\">\n";
+			echo "<tr><td>".getMLText('discspace')."</td><td>";
+			$qt = $seluser->getQuota() ? $seluser->getQuota() : $quota;
+			echo SeedDMS_Core_File::format_filesize($seluser->getUsedDiskSpace())." / ".SeedDMS_Core_File::format_filesize($qt)."<br />";
+			echo $this->getProgressBar($seluser->getUsedDiskSpace(), $qt);
+			echo "</td></tr>\n";
+			$documents = $seluser->getDocuments();
+			echo "<tr><td>".getMLText('documents')."</td><td>".count($documents)."</td></tr>\n";
+			$sessions = $sessionmgr->getUserSessions($seluser);
+			if($sessions) {
+				$session = array_shift($sessions);
+				echo "<tr><td>".getMLText('lastaccess')."</td><td>".getLongReadableDate($session->getLastAccess())."</td></tr>\n";
+			}
+			echo "</table>";
+		}
+	} /* }}} */
+
+	function form() { /* {{{ */
+		$seluser = $this->params['seluser'];
+
+		$this->showUserForm($seluser);
+	} /* }}} */
+
 	function showUserForm($currUser) { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
-		$seluser = $this->params['seluser'];
+		$users = $this->params['allusers'];
 		$groups = $this->params['allgroups'];
 		$passwordstrength = $this->params['passwordstrength'];
 		$passwordexpiration = $this->params['passwordexpiration'];
@@ -370,7 +402,12 @@ function checkForm(num)
 		return true;
 }
 
+function showUser(selectObj) {
+	id = selectObj.options[selectObj.selectedIndex].value;
+	$('div.ajax').trigger('update', {userid: id});
+}
 
+<?php if(0): ?>
 obj = -1;
 function showUser(selectObj) {
 	if (obj != -1)
@@ -383,6 +420,7 @@ function showUser(selectObj) {
 	obj = document.getElementById("keywords" + id);
 	obj.style.display = "";
 }
+<?php endif; ?>
 </script>
 <?php
 		$this->contentHeading(getMLText("user_management"));
@@ -406,10 +444,13 @@ function showUser(selectObj) {
 ?>
 </select>
 </div>
+	<div class="ajax" data-view="UsrMgr" data-action="info"></div>
 </div>
 
 <div class="span8">
 	<div class="well">
+		<div class="ajax" data-view="UsrMgr" data-action="form"></div>
+<?php if(0): ?>
 		<div id="keywords0" style="display : none;">
 		<?php $this->showUserForm(false); ?>
 		</div>
@@ -420,6 +461,7 @@ function showUser(selectObj) {
 			$this->showUserForm($currUser);
 			print "</div>\n";
 		}
+		endif;
 ?>
 	</div>
 	</div>

views/bootstrap/class.ViewDocument.php

@@ -871,7 +871,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<li>".getMLText("uploaded_by")." <a href=\"mailto:".$updatingUser->getEmail()."\">".htmlspecialchars($updatingUser->getFullName())."</a></li>";
 				print "<li>".getLongReadableDate($version->getDate())."</li>";
 				print "</ul>\n";
-				print "<ul class=\"documentDetail\">\n";
+				print "<ul class=\"actions unstyled\">\n";
 				$attributes = $version->getAttributes();
 				if($attributes) {
 					foreach($attributes as $attribute) {