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

2025-07-17 01:48:09 +00:00 · 2020-06-10 10:47:56 +02:00 · 2020-06-10 10:47:56 +02:00 · c48ad87467
commit c48ad87467
parent fad43ba874 bf1d8482d4
60 changed files with 2335 additions and 1362 deletions
--- a/22
+++ b/22
@ -1,12 +1,18 @@
 --------------------------------------------------------------------------------
                     Changes in version 6.1.0
 --------------------------------------------------------------------------------
- merge changes up to 6.0.10
+- merge changes up to 6.0.11
 - add attribute groups and selective output of attributes
 - add support for WebAuthn
 - do not use md5 password hashing anymore, hashes will be updated automatically
  when passwords are reset

+--------------------------------------------------------------------------------
+                     Changes in version 6.0.11
+--------------------------------------------------------------------------------
+- fix access restriction for roles (content of documents was visible even if the
+  role and status didn't allow it)
+
 --------------------------------------------------------------------------------
                     Changes in version 6.0.10
 --------------------------------------------------------------------------------
@ -15,6 +21,7 @@
 - fix uploading files with fine uploader (Closes: #472)
 - clear revision date when all revisors have been deleted
 - improve scheduler task management, tasks can be deleted, fix setting parameters
+- add op.Cron.php for running all scheduled tasks

 --------------------------------------------------------------------------------
                     Changes in version 6.0.9
@ -157,6 +164,14 @@
 - add document list which can be exported as an archive
 - search results can be exported

+--------------------------------------------------------------------------------
+                     Changes in version 5.1.18
+--------------------------------------------------------------------------------
+- various minor improvements of indexer.php script
+- minor fix for better behaviour of folder tree ('plus' signs appears if folder
+  has children)
+- allow to import users from csv file
+
 --------------------------------------------------------------------------------
                     Changes in version 5.1.17
 --------------------------------------------------------------------------------
@ -170,6 +185,11 @@
 - new seeddms logo
 - fix moving clipboard (Closes: #473)
 - show access rights of folder/document if user has write access
+- fix creating preview images of documents in drop folder
+- fix list of expired documents in admin tools (Closes: #474)
+- list of expired documents can be sorted
+- show 'fast upload' always (if turned on), but issue an error msg if the
+  current folder is not writable

 --------------------------------------------------------------------------------
                     Changes in version 5.1.16
--- a/SeedDMS_Core/Core/inc.ClassAttribute.php
+++ b/SeedDMS_Core/Core/inc.ClassAttribute.php
@ -245,7 +245,7 @@ class SeedDMS_Core_Attribute { /* {{{ */
 	 */
 	function validate() { /* {{{ */
 		/** @var SeedDMS_Core_AttributeDefinition $attrdef */
-		$attrdef = $this->_attrdef(); /** @todo check this out, this method is not existing */
+		$attrdef = $this->_attrdef;
 		$result = $attrdef->validate($this->_value);
 		$this->_validation_error = $attrdef->getValidationError();
 		return $result;
@ -1128,11 +1128,6 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 			if(!$success)
 				$this->_validation_error = 3;
 			break;
-		case self::type_boolean: /** @todo: Same case in LINE 966 */
-			foreach($values as $value) {
-				$success &= preg_match('/^[01]$/', $value);
-			}
-			break;
 		case self::type_email:
 			foreach($values as $value) {
 				$success &= preg_match('/^[a-z0-9._-]+@+[a-z0-9._-]+\.+[a-z]{2,4}$/i', $value);
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@ -292,7 +292,7 @@ class SeedDMS_Core_DMS {
 		foreach ($objArr as $obj) {
 			if ($obj->getAccessMode($user) >= $minMode) {
 				$dms = $obj->getDMS();
-				if(get_class($obj) == $dms->getClassname('document')) {
+				if($obj->isType('document')) {
 					if($obj->getLatestContent())
 						array_push($newArr, $obj);
 				} else {
@ -474,7 +474,7 @@ class SeedDMS_Core_DMS {
 		$this->lasterror = '';
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '6.0.9';
+			$this->version = '6.0.11';
 	} /* }}} */

 	/**
@ -740,16 +740,36 @@ class SeedDMS_Core_DMS {
 	/**
 	 * Returns all documents which already expired or will expire in the future
 	 *
+	 * The parameter $date will be relative to the start of the day. It can
+	 * be either a number of days (if an integer is passed) or a date string
+	 * in the format 'YYYY-MM-DD'.
+	 * If the parameter $date is a negative number or a date in the past, then
+	 * all documents from the start of that date till the end of the current
+	 * day will be returned. If $date is a positive integer or $date is a
+	 * date in the future, the all documents from the start of the current
+	 * day till the end of the day of the given date will be returned.
+	 * Passing 0 or the
+	 * current date in $date, will return all documents expiring the current
+	 * day.
 	 * @param string $date date in format YYYY-MM-DD or an integer with the number
 	 *   of days. A negative value will cover the days in the past.
-	 * @param SeedDMS_Core_User $user
+	 * @param SeedDMS_Core_User $user limits the documents on those owned
+	 *   by this user
+	 * @param string $orderby n=name, e=expired
+	 * @param string $orderdir d=desc or a=asc
+	 * @param bool $update update status of document if set to true
 	 * @return bool|SeedDMS_Core_Document[]
 	 */
-	function getDocumentsExpired($date, $user=null) { /* {{{ */
+	function getDocumentsExpired($date, $user=null, $orderby='e', $orderdir='desc', $update=true) { /* {{{ */
 		$db = $this->getDB();

+		if (!$db->createTemporaryTable("ttstatid") || !$db->createTemporaryTable("ttcontentid")) {
+			return false;
+		}
+		
+		$tsnow = mktime(0, 0, 0); /* Start of today */
 		if(is_int($date)) {
-			$ts = mktime(0, 0, 0) + $date * 86400;
+			$ts = $tsnow + $date * 86400;
 		} elseif(is_string($date)) {
 			$tmp = explode('-', $date, 3);
 			if(count($tmp) != 3)
@ -758,11 +778,10 @@ class SeedDMS_Core_DMS {
 		} else
 			return false;

-		$tsnow = mktime(0, 0, 0); /* Start of today */
 		if($ts < $tsnow) { /* Check for docs expired in the past */
 			$startts = $ts;
 			$endts = $tsnow+86400; /* Use end of day */
-			$updatestatus = true;
+			$updatestatus = $update;
 		} else { /* Check for docs which will expire in the future */
 			$startts = $tsnow;
 			$endts = $ts+86400; /* Use end of day */
@ -780,12 +799,12 @@ class SeedDMS_Core_DMS {
 			"LEFT JOIN `ttstatid` ON `ttstatid`.`statusID` = `tblDocumentStatus`.`statusID` ".
 			"LEFT JOIN `tblDocumentStatusLog` ON `tblDocumentStatusLog`.`statusLogID` = `ttstatid`.`maxLogID`";
 		$queryStr .= 
-			" WHERE `tblDocuments`.`expires` > ".$startts." AND `tblDocuments`.`expires` < ".$endts;
+			" WHERE `tblDocuments`.`expires` >= ".$startts." AND `tblDocuments`.`expires` < ".$endts;
 		if($user)
 			$queryStr .=
 				" AND `tblDocuments`.`owner` = '".$user->getID()."' ";
 		$queryStr .= 
-			" ORDER BY `expires` DESC";
+			" ORDER BY ".($orderby == 'e' ? "`expires`" : "`name`")." ".($orderdir == 'd' ? "DESC" : "ASC");

 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && !$resArr)
@ -795,8 +814,9 @@ class SeedDMS_Core_DMS {
 		$documents = array();
 		foreach ($resArr as $row) {
 			$document = $this->getDocument($row["id"]);
-			if($updatestatus)
+			if($updatestatus) {
 				$document->verifyLastestContentExpriry();
+			}
 			$documents[] = $document;
 		}
 		return $documents;
@ -1562,7 +1582,7 @@ class SeedDMS_Core_DMS {
 				$orderdir = 'ASC';
 			/** @noinspection PhpUndefinedConstantInspection */
 			$queryStr .=	"AND `tblDocuments`.`owner` = '".$user->getID()."' ".
-				"AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.", ".S_IN_REVISION.") "; /** @todo S_IN_REVISION is not defined */
+				"AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.", ".S_IN_REVISION.") ";
 			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
 			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
 			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@ -839,11 +839,16 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	/**
 	 * Check if the document has expired
 	 *
+	 * The method expects to database field 'expired' to hold the timestamp
+	 * of the start of day at which end the document expires. The document will
+	 * expire if that day is over. Hence, a document will *not* 
+	 * be expired during the day of expiration but at the end of that day
+	 *
 	 * @return boolean true if document has expired otherwise false
 	 */
 	function hasExpired() { /* {{{ */
 		if (intval($this->_expires) == 0) return false;
-		if (time()>$this->_expires+24*60*60) return true;
+		if (time()>=$this->_expires+24*60*60) return true;
 		return false;
 	} /* }}} */

@ -1816,7 +1821,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		if ((int)$version<1) {
 			$queryStr = "SELECT MAX(`version`) as m from `tblDocumentContent` where `document` = ".$this->_id;
 			$resArr = $db->getResultArray($queryStr);
-			if (is_bool($resArr) && !$res)
+			if (is_bool($resArr) && !$resArr)
 				return false;

 			$version = $resArr[0]['m']+1;
@ -1887,7 +1892,6 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		// a document be rejected.
 		$pendingReview=false;
 		/** @noinspection PhpUnusedLocalVariableInspection */
-		$reviewRes = array(); /** @todo unused variable */
 		foreach (array("i", "g") as $i){
 			if (isset($reviewers[$i])) {
 				foreach ($reviewers[$i] as $reviewerID) {
@ -1906,7 +1910,6 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		// and make a recommendation on its release as an approved version.
 		$pendingApproval=false;
 		/** @noinspection PhpUnusedLocalVariableInspection */
-		$approveRes = array(); /** @todo unused variable */
 		foreach (array("i", "g") as $i){
 			if (isset($approvers[$i])) {
 				foreach ($approvers[$i] as $approverID) {
@ -1948,7 +1951,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		}

 		/** @noinspection PhpMethodParametersCountMismatchInspection */
-		$docResultSet->setStatus($status,$comment,$user); /** @todo parameter count wrong */
+		$docResultSet->setStatus($status);

 		$db->commitTransaction();
 		return $docResultSet;
@ -1986,7 +1989,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		if ((int) $version<1) {
 			$queryStr = "SELECT MAX(`version`) as m from `tblDocumentContent` where `document` = ".$this->_id;
 			$resArr = $db->getResultArray($queryStr);
-			if (is_bool($resArr) && !$res) /** @todo undefined variable */
+			if (is_bool($resArr) && !$resArr)
 				return false;

 			$version = $resArr[0]['m'];
@ -2052,7 +2055,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		if (!isset($this->_content)) {
 			$queryStr = "SELECT * FROM `tblDocumentContent` WHERE `document` = ".$this->_id." ORDER BY `version`";
 			$resArr = $db->getResultArray($queryStr);
-			if (is_bool($resArr) && !$res) /** @todo undefined variable */
+			if (is_bool($resArr) && !$resArr)
 				return false;

 			$this->_content = array();
@ -2098,7 +2101,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		$db = $this->_dms->getDB();
 		$queryStr = "SELECT * FROM `tblDocumentContent` WHERE `document` = ".$this->_id." AND `version` = " . (int) $version;
 		$resArr = $db->getResultArray($queryStr);
-		if (is_bool($resArr) && !$res) /** @todo undefined variable */
+		if (is_bool($resArr) && !$resArr)
 			return false;
 		if (count($resArr) != 1)
 			return false;
@ -2156,7 +2159,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			$db = $this->_dms->getDB();
 			$queryStr = "SELECT * FROM `tblDocumentContent` WHERE `document` = ".$this->_id." ORDER BY `version` DESC";
 			$resArr = $db->getResultArray($queryStr);
-			if (is_bool($resArr) && !$res) /** @todo: $res not defined */
+			if (is_bool($resArr) && !$resArr)
 				return false;

 			$classname = $this->_dms->getClassname('documentcontent');
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@ -555,7 +555,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		$db = $this->_dms->getDB();
 		if (isset($this->_subFolders)) {
 			/** @noinspection PhpUndefinedFieldInspection */
-			return count($this->subFolders); /** @todo not $this->_subFolders? */
+			return count($this->_subFolders);
 		}
 		$queryStr = "SELECT count(*) as c FROM `tblFolders` WHERE `parent` = " . $this->_id;
 		$resArr = $db->getResultArray($queryStr);
@ -757,7 +757,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		$db = $this->_dms->getDB();
 		if (isset($this->_documents)) {
 			/** @noinspection PhpUndefinedFieldInspection */
-			return count($this->documents); /** @todo not $this->_documents? */
+			return count($this->_documents);
 		}
 		$queryStr = "SELECT count(*) as c FROM `tblDocuments` WHERE `folder` = " . $this->_id;
 		$resArr = $db->getResultArray($queryStr);
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@ -12,11 +12,11 @@
  <email>uwe@steinmann.cx</email>
  <active>yes</active>
 </lead>
- <date>2020-05-14</date>
+ <date>2020-06-05</date>
 <time>09:43:12</time>
 <version>
-  <release>6.0.10</release>
-  <api>6.0.10</api>
+  <release>6.0.11</release>
+  <api>6.0.11</api>
 </version>
 <stability>
  <release>stable</release>
@ -24,7 +24,7 @@
 </stability>
 <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
 <notes>
-SeedDMS_Core_DocumentContent::delRevisor() returns -4 if user has already made a revision
+SeedDMS_Core_DMS::filterAccess() properly checks for documents
 </notes>
 <contents>
  <dir baseinstalldir="SeedDMS" name="/">
@ -1766,6 +1766,40 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
 - better error checking in SeedDMS_Core_Document::addDocumentFile()
   </notes>
  </release>
+  <release>
+   <date>2020-05-22</date>
+   <time>09:43:12</time>
+   <version>
+    <release>5.1.17</release>
+    <api>5.1.17</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- add new callback onSetStatus
+- fix SeedDMS_Core_DMS::getExpiredDocuments(), sql statement failed because temp. tables were not created
+- add parameters $orderdir, $orderby, $update to SeedDMS_Core::getExpiredDocuments()
+   </notes>
+  </release>
+  <release>
+   <date>2020-06-05</date>
+   <time>09:43:12</time>
+   <version>
+    <release>5.1.18</release>
+    <api>5.1.18</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- fixed remaining todos
+   </notes>
+  </release>
  <release>
   <date>2017-02-28</date>
   <time>06:34:50</time>
@ -1984,5 +2018,21 @@ remove a user from all its process can also be used to set a new user
 - no changes, just keep same version as seeddms application
   </notes>
  </release>
+  <release>
+   <date>2020-05-22</date>
+   <time>09:43:12</time>
+   <version>
+    <release>6.0.10</release>
+    <api>6.0.10</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+SeedDMS_Core_DocumentContent::delRevisor() returns -4 if user has already made a revision
+   </notes>
+  </release>
 </changelog>
 </package>
--- a/controllers/class.Cron.php
+++ b/controllers/class.Cron.php
@ -0,0 +1,62 @@
+<?php
+/**
+ * Implementation of Cron controller
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2020 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class which does the busines logic for the regular cron job
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2020 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Controller_Cron extends SeedDMS_Controller_Common {
+
+	public function run() { /* {{{ */
+		$dms = $this->params['dms'];
+		$settings = $this->params['settings'];
+		$mode = 'run'; //$this->params['mode'];
+		$db = $dms->getDb();
+
+$scheduler = new SeedDMS_Scheduler($db);
+$tasks = $scheduler->getTasks();
+
+foreach($tasks as $task) {
+	if(isset($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()]) && is_object($taskobj = $GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()])) {
+		switch($mode) {
+		case "run":
+			if(method_exists($taskobj, 'execute')) {
+				if(!$task->getDisabled() && $task->isDue()) {
+					if($user = $dms->getUserByLogin('cli_scheduler')) {
+						if($taskobj->execute($task, $dms, $user, $settings)) {
+							add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." successful.");
+							$task->updateLastNextRun();
+						} else {
+							add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed, task has been disabled.", PEAR_LOG_ERR);
+							$task->setDisabled(1);
+						}
+					} else {
+						add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed because of missing user 'cli_scheduler'. Task has been disabled.", PEAR_LOG_ERR);
+						$task->setDisabled(1);
+					}
+				}
+			}
+			break;
+		}
+	}
+
+}
+	return true;
+	} /* }}} */
+}
+
--- a/doc/README.cron
+++ b/doc/README.cron
@ -0,0 +1,42 @@
+Running the scheduler
+======================
+
+Since version 6 of SeedDMS a scheduler is implemented which runs
+scheduled tasks. Such tasks must be implemented in an extension
+and can be scheduled by the administrator within the user interface.
+
+In order to check frequently for tasks ready to run, a system cron job
+must be installed. On Linux this can be done by adding the following line
+to the crontab
+
+*/5 * * * * /var/www/seeddms60x/seeddms/utils/seeddms-schedulercli --mode=run
+
+(Of course you need to change the path to `seeddms-schedulercli`)
+
+This will install a cronjob running every 5 minutes. `seeddms-schedulercli` will check
+for tasks ready to run and execute them in that case. You can decrease the time between
+two calls of the cronjob, but keep in mind that seeddms tasks may take longer and
+are being started again before the previous task has been ended.
+
+If the configuration file of SeedDMS is not found, its path can be passed
+on the command, though this should not be needed in a regular installation
+obeying the directory structure of the quickstart archive.
+
+*/5 * * * * /var/www/seeddms60x/seeddms/utils/seeddms-schedulercli --config /var/www/seeddms60x/seeddms/conf/settings.xml --mode=run
+
+For testing purposes it may be usefull to run `seeddms-schedulercli` in list mode.
+
+seeddms-schedulercli --mode=list
+
+This will just list all tasks and its scheduled exection time. Tasks ready to run,
+because its scheduled execution time is already in the past will be marked with
+a `*`. Tasks which are disabled will be marked with a `-`.
+
+Executing `seeddms-schedulercli` in `dryrun` mode will behave just like in `run` mode
+but instead of running the task it will just issue a line.
+
+Instead of running utils/seeddms-schedulercli you may as well access
+op/op.Cron.php which also runs all scheduled tasks. On Linux you do this
+by setting up a cronjob like
+
+*/5 * * * * wget -q -O - "http://<your domain>/op/op.Cron.php"
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@ -68,7 +68,7 @@ class SeedDMS_AccessOperation {
 				$version = $document->getContentByVersion($vno);
 			else
 				$version = $document->getLatestContent();
-			if (!isset($this->settings->_editOnlineFileTypes) || !is_array($this->settings->_editOnlineFileTypes) || !in_array(strtolower($version->getFileType()), $this->settings->_editOnlineFileTypes) || !in_array(strtolower($version->getMimeType()), $this->settings->_editOnlineFileTypes))
+			if (!isset($this->settings->_editOnlineFileTypes) || !is_array($this->settings->_editOnlineFileTypes) || (!in_array(strtolower($version->getFileType()), $this->settings->_editOnlineFileTypes) && !in_array(strtolower($version->getMimeType()), $this->settings->_editOnlineFileTypes)))
 				return false;
 			if ($document->getAccessMode($this->user) == M_ALL || $this->user->isAdmin()) {
 				return true;
--- a/inc/inc.ClassSchedulerTaskBase.php
+++ b/inc/inc.ClassSchedulerTaskBase.php
@ -29,7 +29,7 @@
 * @package SeedDMS
 */
 class SeedDMS_SchedulerTaskBase {
-	public function execute($task, $dms, $user) {
+	public function execute($task, $dms, $user, $settings) {
 		return true;
 	}
 }
--- a/inc/inc.DBInit.php
+++ b/inc/inc.DBInit.php
@ -65,3 +65,5 @@ if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) {
 		}
 	}
 }
+
+require_once('inc/inc.Tasks.php');
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@ -0,0 +1,42 @@
+<?php
+
+require_once("inc/inc.ClassSchedulerTaskBase.php");
+
+/**
+ * Class containing methods for running a scheduled task
+ *
+ * @author  Uwe Steinmann <uwe@steinmann.cx>
+ * @package SeedDMS
+ * @subpackage  trash
+ */
+class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
+
+	/**
+	 * Run the task
+	 *
+	 * @param $task task to be executed
+	 * @param $dms dms
+	 * @return boolean true if task was executed succesfully, otherwise false
+	 */
+	public function execute($task, $dms, $user, $settings) {
+		$taskparams = $task->getParameter();
+		$dms->getDocumentsExpired(intval($taskparams['days']));
+		return true;
+	}
+
+	public function getDescription() {
+		return 'Check for expired documents and set the document status';
+	}
+
+	public function getAdditionalParams() {
+		return array(
+			array(
+				'name'=>'days',
+				'type'=>'integer',
+				'description'=> 'Number of days to check for. Negative values will look into the past. 0 will just check for documents expiring the current day. Keep in mind that the document is still valid on the expiration date.',
+			)
+		);
+	}
+} /* }}} */
+
+$GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['expireddocs'] = new SeedDMS_ExpiredDocumentsTask;
--- a/index.php
+++ b/index.php
@ -26,13 +26,13 @@ if(true) {
 	include("inc/inc.Init.php");
 	include("inc/inc.Extension.php");
 	include("inc/inc.DBInit.php");
-	include("inc/inc.Authentication.php");
+//	include("inc/inc.Authentication.php");

 	require "vendor/autoload.php";

 	$c = new \Slim\Container(); //Create Your container
-	$c['notFoundHandler'] = function ($c) use ($settings, $dms, $user, $theme) {
-		return function ($request, $response) use ($c, $settings, $dms, $user, $theme) {
+	$c['notFoundHandler'] = function ($c) use ($settings, $dms) {
+		return function ($request, $response) use ($c, $settings, $dms) {
 			$uri = $request->getUri();
 			if($uri->getBasePath())
 				$file = $uri->getPath();
@ -55,7 +55,7 @@ if(true) {
 	if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) {
 		foreach($GLOBALS['SEEDDMS_HOOKS']['initDMS'] as $hookObj) {
 			if (method_exists($hookObj, 'addRoute')) {
-				$hookObj->addRoute(array('dms'=>$dms, 'user'=>$user, 'app'=>$app, 'settings'=>$settings));
+				$hookObj->addRoute(array('dms'=>$dms, 'app'=>$app, 'settings'=>$settings));
 			}
 		}
 	}
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@ -637,6 +637,8 @@ URL: [url]',
 'import_extension' => 'استيراد إضافات',
 'import_fs' => 'نسخ من ملف النظام',
 'import_fs_warning' => 'تحذير النسخ من ملف النظام',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => 'إضافة المحتوى',
 'include_documents' => 'اشمل مستندات',
 'include_subdirectories' => 'اشمل مجلدات فرعية',
@ -1559,6 +1561,7 @@ URL: [url]',
 'site_brand' => 'مجلس النواب اللبناني',
 'sk_SK' => 'السلوفاكية',
 'sort_by_date' => 'رتب حسب التاريخ',
+'sort_by_expiration_date' => '',
 'sort_by_name' => 'رتب حسب الإسم',
 'sort_by_sequence' => 'رتب حسب التراتبية',
 'space_used_on_data_folder' => 'المساحة المستخدمة لمجلد البيانات',
@ -1691,6 +1694,7 @@ URL: [url]',
 'takeOverIndReviewer' => 'اخذ فهرسة المراجع',
 'takeOverIndReviewers' => '',
 'tasks' => 'مهمات',
+'task_core_expireddocs_days' => '',
 'task_description' => 'تفصيل المهام',
 'task_disabled' => 'تم توقيف المهمة',
 'task_frequency' => 'تردد المهمة',
@ -1726,6 +1730,7 @@ URL: [url]',
 'to' => 'الى',
 'toggle_manager' => 'رجح مدير',
 'toggle_qrcode' => 'toggle toggle',
+'total' => '',
 'to_before_from' => 'إلى قبل من',
 'transfer_content' => 'تحويل المحتوى',
 'transfer_document' => 'تحويل مستند',
@ -1794,6 +1799,7 @@ URL: [url]',
 'uploading_zerosize' => 'تحميل ملف فارغ. عملية التحميل الغيت',
 'used_discspace' => 'المساحة المستخدمة',
 'user' => 'مستخدم',
+'userdata_file' => '',
 'userid_groupid' => 'هوية المجموعة',
 'users' => 'مستخدمين',
 'users_and_groups' => 'مستخدمين ومجموعات',
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@ -566,6 +566,8 @@ $text = array(
 'import_extension' => '',
 'import_fs' => 'добави от файловата система',
 'import_fs_warning' => '',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => '',
 'include_documents' => 'Включи документи',
 'include_subdirectories' => 'Включи под-папки',
@ -1422,6 +1424,7 @@ $text = array(
 'site_brand' => '',
 'sk_SK' => 'Словашки',
 'sort_by_date' => 'Сортирай по дата"',
+'sort_by_expiration_date' => '',
 'sort_by_name' => 'Сортирай по име',
 'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'Размер на каталога с данните',
@ -1554,6 +1557,7 @@ $text = array(
 'takeOverIndReviewer' => '',
 'takeOverIndReviewers' => '',
 'tasks' => '',
+'task_core_expireddocs_days' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@ -1589,6 +1593,7 @@ $text = array(
 'to' => 'към',
 'toggle_manager' => 'Превключи мениджър',
 'toggle_qrcode' => '',
+'total' => '',
 'to_before_from' => '',
 'transfer_content' => '',
 'transfer_document' => 'Прехвърли документ',
@ -1648,6 +1653,7 @@ $text = array(
 'uploading_zerosize' => 'Качване на празен файл/размер=0. Качването прекратено.',
 'used_discspace' => 'Използвано дисково пространство',
 'user' => 'Потребител',
+'userdata_file' => '',
 'userid_groupid' => '',
 'users' => 'Потребители',
 'users_and_groups' => '',
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (752)
+//    Translators: Admin (758)

 $text = array(
 '2_factor_auth' => '',
@ -472,14 +472,14 @@ URL: [url]',
 'expired_at_date' => '',
 'expired_documents' => '',
 'expires' => 'Caduca',
-'expire_by_date' => '',
+'expire_by_date' => 'Expiració segons data',
 'expire_in_1d' => '',
 'expire_in_1h' => '',
-'expire_in_1m' => '',
-'expire_in_1w' => '',
-'expire_in_1y' => '',
+'expire_in_1m' => 'Expira en un mes',
+'expire_in_1w' => 'Expira en una setmana',
+'expire_in_1y' => 'Expira en un any',
 'expire_in_2h' => '',
-'expire_in_2y' => '',
+'expire_in_2y' => 'Expira en dos anys',
 'expire_today' => '',
 'expire_tomorrow' => '',
 'expiry_changed_email' => 'Data de caducitat modificada',
@ -571,6 +571,8 @@ URL: [url]',
 'import_extension' => '',
 'import_fs' => 'Importa del sistema d\'arxius',
 'import_fs_warning' => 'Només funciona arrastrant carpetes.La operació importarà recursivament totes les carpetes i arxius.',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => '',
 'include_documents' => 'Incloure documents',
 'include_subdirectories' => 'Incloure subdirectoris',
@ -645,7 +647,7 @@ URL: [url]',
 'keep' => '',
 'keep_doc_status' => '',
 'keywords' => 'Mots clau',
-'keywords_loading' => '',
+'keywords_loading' => 'Espera fins que la llista de paraules clau s\'hagi carregat...',
 'keyword_exists' => 'El mot clau ja existeix',
 'ko_KR' => 'Coreà',
 'language' => 'Llenguatge',
@ -1427,6 +1429,7 @@ URL: [url]',
 'site_brand' => '',
 'sk_SK' => 'Eslovac',
 'sort_by_date' => '',
+'sort_by_expiration_date' => '',
 'sort_by_name' => '',
 'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'Espai utilitzat a la carpeta de dades',
@ -1559,6 +1562,7 @@ URL: [url]',
 'takeOverIndReviewer' => '',
 'takeOverIndReviewers' => '',
 'tasks' => '',
+'task_core_expireddocs_days' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@ -1594,6 +1598,7 @@ URL: [url]',
 'to' => 'Fins',
 'toggle_manager' => 'Intercanviar manager',
 'toggle_qrcode' => '',
+'total' => '',
 'to_before_from' => '',
 'transfer_content' => '',
 'transfer_document' => 'transferir document',
@ -1653,6 +1658,7 @@ URL: [url]',
 'uploading_zerosize' => '',
 'used_discspace' => 'Espai utilitzat',
 'user' => 'Usuari',
+'userdata_file' => '',
 'userid_groupid' => '',
 'users' => 'Usuaris',
 'users_and_groups' => '',
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@ -668,6 +668,8 @@ URL: [url]',
 'import_extension' => 'Importovat rozšíření',
 'import_fs' => 'Nahrát ze souborového systému',
 'import_fs_warning' => 'To bude fungovat pouze pro složky ve vhazovací složce. Operace rekurzivně importuje všechny složky a soubory. Soubory budou okamžitě uvolněny.',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => 'Včetně obsahu',
 'include_documents' => 'Včetně dokumentů',
 'include_subdirectories' => 'Včetně podadresářů',
@ -1631,6 +1633,7 @@ Jméno: [username]
 'site_brand' => '',
 'sk_SK' => 'Slovenština',
 'sort_by_date' => '',
+'sort_by_expiration_date' => '',
 'sort_by_name' => 'Třídit podle jména',
 'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'Použité místo pro data složky',
@ -1763,6 +1766,7 @@ Jméno: [username]
 'takeOverIndReviewer' => 'Převzít jednotlivého recenzenta z poslední verze.',
 'takeOverIndReviewers' => '',
 'tasks' => 'Úkoly',
+'task_core_expireddocs_days' => '',
 'task_description' => 'Popis',
 'task_disabled' => 'Vypnuto',
 'task_frequency' => 'Frekvence',
@ -1798,6 +1802,7 @@ Jméno: [username]
 'to' => 'Do',
 'toggle_manager' => 'Přepnout správce',
 'toggle_qrcode' => 'Zobrazit / skrýt QR kód',
+'total' => '',
 'to_before_from' => 'Datum ukončení nesmí být před datem zahájení',
 'transfer_content' => '',
 'transfer_document' => 'Přenést dokument',
@ -1866,6 +1871,7 @@ URL: [url]',
 'uploading_zerosize' => 'Nahrávání prázdného souboru. Nahrání zrušeno.',
 'used_discspace' => 'Použité místo na disku',
 'user' => 'Uživatel',
+'userdata_file' => '',
 'userid_groupid' => 'ID uživatel/ID skupiny',
 'users' => 'Uživatel',
 'users_and_groups' => 'Uživatelé / Skupiny',
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2767), dgrutsch (22)
+//    Translators: Admin (2773), dgrutsch (22)

 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@ -668,6 +668,8 @@ URL: [url]',
 'import_extension' => 'Erweiterung importieren',
 'import_fs' => 'Aus Dateisystem importieren',
 'import_fs_warning' => 'Der Import kann nur für Ordner im Ablageordner erfolgen. Alle Ordner und Dateien werden rekursiv importiert. Dateien werden sofort freigegeben.',
+'import_users' => 'Importiere Benutzer',
+'import_users_update' => 'Aktualisiere bestehende Benutzer',
 'include_content' => 'Inhalte mit exportieren',
 'include_documents' => 'Dokumente miteinbeziehen',
 'include_subdirectories' => 'Unterverzeichnisse miteinbeziehen',
@ -1642,6 +1644,7 @@ Name: [username]
 'site_brand' => '',
 'sk_SK' => 'Slovakisch',
 'sort_by_date' => 'Nach Datum sortieren',
+'sort_by_expiration_date' => 'Nach Ablaufdatum sortieren',
 'sort_by_name' => 'Nach Name sortieren',
 'sort_by_sequence' => 'Nach Reihenfolge sortieren',
 'space_used_on_data_folder' => 'Benutzter Plattenplatz',
@ -1774,6 +1777,7 @@ Name: [username]
 'takeOverIndReviewer' => 'Übernehme die Einzelprüfer von der letzten Version.',
 'takeOverIndReviewers' => 'Einzelprüfer übernehmen',
 'tasks' => 'Aufgaben',
+'task_core_expireddocs_days' => 'Tage',
 'task_description' => 'Beschreibung',
 'task_disabled' => 'Deaktiviert',
 'task_frequency' => 'Häufigkeit',
@ -1809,6 +1813,7 @@ Name: [username]
 'to' => 'bis',
 'toggle_manager' => 'Managerstatus wechseln',
 'toggle_qrcode' => 'Zeige/verberge QR-Code',
+'total' => 'Gesamt',
 'to_before_from' => 'Endedatum darf nicht vor dem Startdatum liegen',
 'transfer_content' => 'Inhalt übertragen',
 'transfer_document' => 'Dokument übertragen',
@ -1877,6 +1882,7 @@ URL: [url]',
 'uploading_zerosize' => 'Versuch eine leere Datei hochzuladen. Vorgang wird abgebrochen.',
 'used_discspace' => 'Verbrauchter Speicherplatz',
 'user' => 'Benutzer',
+'userdata_file' => 'Benutzerdaten',
 'userid_groupid' => 'Benutzer-ID/Gruppen-ID',
 'users' => 'Benutzer',
 'users_and_groups' => 'Benutzer/Gruppen',
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@ -566,6 +566,8 @@ $text = array(
 'import_extension' => '',
 'import_fs' => 'Εισαγωγή από το σύστημα',
 'import_fs_warning' => '',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => '',
 'include_documents' => '',
 'include_subdirectories' => '',
@ -1433,6 +1435,7 @@ URL: [url]',
 'site_brand' => '',
 'sk_SK' => 'Σλοβάκικα',
 'sort_by_date' => '',
+'sort_by_expiration_date' => '',
 'sort_by_name' => '',
 'sort_by_sequence' => '',
 'space_used_on_data_folder' => '',
@ -1565,6 +1568,7 @@ URL: [url]',
 'takeOverIndReviewer' => '',
 'takeOverIndReviewers' => '',
 'tasks' => '',
+'task_core_expireddocs_days' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@ -1600,6 +1604,7 @@ URL: [url]',
 'to' => 'Προς',
 'toggle_manager' => '',
 'toggle_qrcode' => '',
+'total' => '',
 'to_before_from' => '',
 'transfer_content' => '',
 'transfer_document' => 'Μεταφορά εγγράφου',
@ -1659,6 +1664,7 @@ URL: [url]',
 'uploading_zerosize' => '',
 'used_discspace' => 'Χώρος',
 'user' => 'Χρήστης',
+'userdata_file' => '',
 'userid_groupid' => '',
 'users' => 'Χρήστες',
 'users_and_groups' => 'Χρήστες/Ομάδες',
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1873), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1879), archonwang (3), dgrutsch (9), netixw (14)

 $text = array(
 '2_factor_auth' => '2-factor authentication',
@ -668,6 +668,8 @@ URL: [url]',
 'import_extension' => 'Import extension',
 'import_fs' => 'Import from filesystem',
 'import_fs_warning' => 'This will only work for folders in the drop folder. The operation recursively imports all folders and files. Files will be released immediately.',
+'import_users' => 'Import users',
+'import_users_update' => 'Update existing users',
 'include_content' => 'Include content',
 'include_documents' => 'Include documents',
 'include_subdirectories' => 'Include subdirectories',
@ -1636,6 +1638,7 @@ Name: [username]
 'site_brand' => '',
 'sk_SK' => 'Slovak',
 'sort_by_date' => 'Sort by date',
+'sort_by_expiration_date' => 'Sort by date of expiration',
 'sort_by_name' => 'Sort by name',
 'sort_by_sequence' => 'Sort by sequence',
 'space_used_on_data_folder' => 'Space used on data folder',
@ -1768,6 +1771,7 @@ Name: [username]
 'takeOverIndReviewer' => 'Take over individual reviewer from last version.',
 'takeOverIndReviewers' => 'Take Over Individual Reviewers',
 'tasks' => 'Tasks',
+'task_core_expireddocs_days' => 'Days',
 'task_description' => 'Description',
 'task_disabled' => 'Disabled',
 'task_frequency' => 'Frequency',
@ -1803,6 +1807,7 @@ Name: [username]
 'to' => 'To',
 'toggle_manager' => 'Toggle manager',
 'toggle_qrcode' => 'Show/hide QR code',
+'total' => 'Total',
 'to_before_from' => 'End date may not be before start date',
 'transfer_content' => 'Transfer content',
 'transfer_document' => 'Transfer document',
@ -1871,6 +1876,7 @@ URL: [url]',
 'uploading_zerosize' => 'Uploading an empty file. Upload is canceled.',
 'used_discspace' => 'Used disk space',
 'user' => 'User',
+'userdata_file' => 'User data file',
 'userid_groupid' => 'User id/Group id',
 'users' => 'Users',
 'users_and_groups' => 'Users/Groups',
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@ -644,6 +644,8 @@ URL: [url]',
 'import_extension' => '',
 'import_fs' => 'Importar desde sistema de archivos',
 'import_fs_warning' => 'Esto funciona únicamente con carpetas dentro de la carpeta destino. La operación importa recursivamente todos los archivos y carpetas. Los archivos serán liberados inmediatamente.',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => '',
 'include_documents' => 'Incluir documentos',
 'include_subdirectories' => 'Incluir subcarpetas',
@ -1574,6 +1576,7 @@ URL: [url]',
 'site_brand' => '',
 'sk_SK' => 'Slovaco',
 'sort_by_date' => 'Ordenar por Fecha',
+'sort_by_expiration_date' => '',
 'sort_by_name' => 'Ordenar por nombre',
 'sort_by_sequence' => 'Ordenar por secuencia',
 'space_used_on_data_folder' => 'Espacio usado en la carpeta de datos',
@ -1706,6 +1709,7 @@ URL: [url]',
 'takeOverIndReviewer' => 'Tomar control de la revisión de la última versión',
 'takeOverIndReviewers' => '',
 'tasks' => 'Tareas',
+'task_core_expireddocs_days' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@ -1741,6 +1745,7 @@ URL: [url]',
 'to' => 'Hasta',
 'toggle_manager' => 'Intercambiar mánager',
 'toggle_qrcode' => '',
+'total' => '',
 'to_before_from' => 'La fecha de finalización no debe ser anterior a la de inicio',
 'transfer_content' => '',
 'transfer_document' => 'Transferir documento',
@ -1809,6 +1814,7 @@ URL: [url]',
 'uploading_zerosize' => 'Subiendo un fichero vacío. -Subida cancelada.',
 'used_discspace' => 'Espacio de disco utilizado',
 'user' => 'Usuario',
+'userdata_file' => '',
 'userid_groupid' => 'ID Usuario/ID Grupo',
 'users' => 'Usuarios',
 'users_and_groups' => 'Usuarios/Grupos',
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@ -668,6 +668,8 @@ URL: [url]',
 'import_extension' => 'Importer l’extension',
 'import_fs' => 'Importer depuis le système de fichiers',
 'import_fs_warning' => 'L’importation peut se faire à partir du dossier de dépôt personnel uniquement. Tous les sous-dossiers et fichiers seront importés. Les fichiers seront immédiatement publiés.',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => 'Inclure le contenu',
 'include_documents' => 'Inclure les documents',
 'include_subdirectories' => 'Inclure les sous-dossiers',
@ -1634,6 +1636,7 @@ Nom : [username]
 'site_brand' => '',
 'sk_SK' => 'Slovaque',
 'sort_by_date' => 'Trier par date',
+'sort_by_expiration_date' => '',
 'sort_by_name' => 'Trier par nom',
 'sort_by_sequence' => 'Trier par position',
 'space_used_on_data_folder' => 'Espace utilisé dans le répertoire de données',
@ -1766,6 +1769,7 @@ Nom : [username]
 'takeOverIndReviewer' => 'Récupérer les examinateurs de la dernière version.',
 'takeOverIndReviewers' => 'Récupérer les examinateurs individuels',
 'tasks' => 'Tâches',
+'task_core_expireddocs_days' => '',
 'task_description' => 'Description',
 'task_disabled' => 'Désactivée',
 'task_frequency' => 'Fréquence',
@ -1801,6 +1805,7 @@ Nom : [username]
 'to' => 'Au',
 'toggle_manager' => 'Basculer \'Responsable\'',
 'toggle_qrcode' => 'Afficher/masquer le QR code',
+'total' => '',
 'to_before_from' => 'La date de fin ne peut pas être avant la date de début.',
 'transfer_content' => 'Transférer le contenu',
 'transfer_document' => 'Transférer le document',
@ -1869,6 +1874,7 @@ URL : [url]',
 'uploading_zerosize' => 'Chargement d\'un fichier vide. Chargement annulé.',
 'used_discspace' => 'Espace disque utilisé',
 'user' => 'Utilisateur',
+'userdata_file' => '',
 'userid_groupid' => 'ID utilisateur/ID groupe',
 'users' => 'Utilisateurs',
 'users_and_groups' => 'Utilisateurs/groupes',
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@ -649,6 +649,8 @@ Internet poveznica: [url]',
 'import_extension' => '',
 'import_fs' => 'Importaj iz FS-a',
 'import_fs_warning' => '',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => 'Uključi sadržaj',
 'include_documents' => 'Sadrži dokumente',
 'include_subdirectories' => 'Sadrži podmape',
@ -1595,6 +1597,7 @@ Internet poveznica: [url]',
 'site_brand' => '',
 'sk_SK' => 'Slovački',
 'sort_by_date' => '',
+'sort_by_expiration_date' => '',
 'sort_by_name' => '',
 'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'Prostor iskorišten na podatkovnoj mapi',
@ -1727,6 +1730,7 @@ Internet poveznica: [url]',
 'takeOverIndReviewer' => 'Preuzimanje pojedinačnog revizora iz zadnje verzije.',
 'takeOverIndReviewers' => '',
 'tasks' => 'Zadaci',
+'task_core_expireddocs_days' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@ -1762,6 +1766,7 @@ Internet poveznica: [url]',
 'to' => 'Do',
 'toggle_manager' => 'Zamjeni upravitelja',
 'toggle_qrcode' => '',
+'total' => '',
 'to_before_from' => 'Datum završetka ne može biti prije datuma početka',
 'transfer_content' => '',
 'transfer_document' => 'Prijenos dokumenta',
@ -1830,6 +1835,7 @@ Internet poveznica: [url]',
 'uploading_zerosize' => 'Datoteka koja se učitava je prazna. Učitavanje je otkazano.',
 'used_discspace' => 'Iskorišteni prostor na disku',
 'user' => 'Korisnik',
+'userdata_file' => '',
 'userid_groupid' => 'ID Korisnika/ID Grupe',
 'users' => 'Korisnici',
 'users_and_groups' => 'Korisnici/Grupe',
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (638), ribaz (1036)
+//    Translators: Admin (639), Kalpy (113), ribaz (1036)

 $text = array(
 '2_factor_auth' => 'Kétfaktoros azonosítás',
@ -89,7 +89,7 @@ URL: [url]',
 'already_subscribed' => 'Már feliratkozott',
 'and' => '-',
 'apply' => 'Elfogad',
-'approvals_accepted' => '',
+'approvals_accepted' => '[no_approvals] már elfogadott jóváhagyások',
 'approvals_accepted_latest' => '',
 'approvals_and_reviews_accepted' => '',
 'approvals_and_reviews_not_touched' => '',
@ -102,7 +102,7 @@ URL: [url]',
 'approvals_without_user' => '',
 'approval_deletion_email' => 'Jóváhagyási kérelem törölve',
 'approval_deletion_email_body' => '',
-'approval_deletion_email_subject' => '',
+'approval_deletion_email_subject' => '[sitename]: [name] - Jóváhagyási kérelem törölve',
 'approval_file' => 'Fájl',
 'approval_group' => 'Jóváhagyó csoport',
 'approval_log' => 'Jóváhagyási napló',
@ -128,10 +128,10 @@ URL: [url]',
 'approval_summary' => 'Jóváhagyási összesítő',
 'approval_update_failed' => 'Hiba történt a jóváhagyási állapot frissítése során. Frissítés sikertelen.',
 'approvers' => 'Jóváhagyók',
-'approver_already_assigned' => '',
+'approver_already_assigned' => 'A felhasználót már jóváhagyóként megjelölték.',
 'approver_already_removed' => '',
 'april' => 'Április',
-'archive' => '',
+'archive' => 'Archívum',
 'archive_creation' => 'Archívum létrehozása',
 'archive_creation_warning' => 'Ezzel a művelettel archívumot hozhat létre, amely tartalmazza az összes DMS mappában található állományokat. A létrehozás követően az archívum a kiszolgáló adat mappájába lesz mentve.<br>FIGYELEM: az archívum értelmezhető formában kerül tárolásra és nem használható kiszolgáló mentésként.',
 'ar_EG' => 'Arab',
@ -142,9 +142,9 @@ URL: [url]',
 'assumed_released' => 'Feltételesen kiadott',
 'attrdefgroup_management' => '',
 'attrdefgrp_show_detail' => '',
-'attrdefgrp_show_list' => '',
+'attrdefgrp_show_list' => 'Lista',
 'attrdefgrp_show_search' => 'Keresés',
-'attrdefgrp_show_searchlist' => '',
+'attrdefgrp_show_searchlist' => 'Keresés eredménye',
 'attrdef_exists' => 'Jellemző meghatározás már létezik',
 'attrdef_info' => 'Információ',
 'attrdef_in_use' => 'Jellemző meghatározás még használatban van',
@ -254,7 +254,7 @@ URL: [url]',
 'choose_attrdefgroup' => '',
 'choose_category' => 'Kérjük válasszon',
 'choose_group' => 'Válasszon csoportot',
-'choose_role' => '',
+'choose_role' => 'Válassz szabályt!',
 'choose_target_category' => 'Válasszon kategóriát',
 'choose_target_document' => 'Válasszon dokumentumot',
 'choose_target_file' => 'Válasszon állományt',
@ -263,13 +263,13 @@ URL: [url]',
 'choose_workflow' => 'Válasszon munkafolyamatot',
 'choose_workflow_action' => 'Válasszon munkafolyamat műveletet',
 'choose_workflow_state' => 'Válasszon munkafolyamat állapotot',
-'class_name' => '',
+'class_name' => 'Osztály neve',
 'clear_cache' => 'Gyorsítótár törlése',
 'clear_clipboard' => 'Vágólap törlése',
 'clear_password' => 'jelszó törlése',
 'clipboard' => 'Vágólap',
 'close' => 'Bezár',
-'command' => '',
+'command' => 'Utasítás',
 'comment' => 'Megjegyzés',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Megjegyzés az aktuális verzióhoz',
@ -345,7 +345,7 @@ URL: [url]',
 'documents_to_revise' => '',
 'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
-'documents_user_expiration' => '',
+'documents_user_expiration' => 'Lejárt dokumentumok',
 'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
@ -644,6 +644,8 @@ URL: [url]',
 'import_extension' => 'Kiterjesztés import',
 'import_fs' => 'Importálás fájlrendszerből',
 'import_fs_warning' => '',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => '',
 'include_documents' => 'Tartalmazó dokumentumok',
 'include_subdirectories' => 'Tartalmazó alkönyvtárak',
@ -793,10 +795,10 @@ URL: [url]',
 'my_documents' => 'Saját dokumentumok',
 'my_transmittals' => '',
 'name' => 'Név',
-'nb_NO' => '',
+'nb_NO' => 'Norvég',
 'needs_correction' => '',
 'needs_workflow_action' => 'Ez a dokumentum az Ön beavatkozására vár. Ellenőrizze a munkafolyamat fület.',
-'network_drive' => '',
+'network_drive' => 'Hálózati meghajtó',
 'never' => 'soha',
 'new' => 'Új',
 'new_attrdef' => 'Jellemző meghatározás hozzáadása',
@ -1573,6 +1575,7 @@ URL: [url]',
 'site_brand' => '',
 'sk_SK' => 'Szlovák',
 'sort_by_date' => '',
+'sort_by_expiration_date' => '',
 'sort_by_name' => '',
 'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'Használt terület az adat mappában',
@ -1705,6 +1708,7 @@ URL: [url]',
 'takeOverIndReviewer' => '',
 'takeOverIndReviewers' => '',
 'tasks' => '',
+'task_core_expireddocs_days' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@ -1740,6 +1744,7 @@ URL: [url]',
 'to' => 'ig',
 'toggle_manager' => 'Kulcs kezelő',
 'toggle_qrcode' => '',
+'total' => '',
 'to_before_from' => 'A lejárati dátum nem előzheti meg a kezdési dátumot',
 'transfer_content' => '',
 'transfer_document' => 'Tulajdonos váltás',
@ -1808,6 +1813,7 @@ URL: [url]',
 'uploading_zerosize' => 'Üres állomány feltöltése. Feltöltés megszakítva.',
 'used_discspace' => 'Felhasznált lemezterület',
 'user' => 'Felhasználó',
+'userdata_file' => '',
 'userid_groupid' => 'Felhasználó ID/Csoport ID',
 'users' => 'Felhasználók',
 'users_and_groups' => 'Felhasználók/Csoportok',
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@ -654,6 +654,8 @@ URL: [url]',
 'import_extension' => 'Importa estensione',
 'import_fs' => 'Importa dalla cartella di sistema',
 'import_fs_warning' => 'Questo funziona solo per le cartelle nella cartella per lasciare. L\'operazione importa in modo ricorsivo tutte le cartelle e file. I file saranno pubblicati immediatamente.',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => 'Includi contenuto',
 'include_documents' => 'Includi documenti',
 'include_subdirectories' => 'Includi sottocartelle',
@ -1622,6 +1624,7 @@ Name: [username]
 'site_brand' => '',
 'sk_SK' => 'Slovacco',
 'sort_by_date' => 'Ordina per data',
+'sort_by_expiration_date' => '',
 'sort_by_name' => 'Ordina per nome',
 'sort_by_sequence' => 'Ordina per sequenza',
 'space_used_on_data_folder' => 'Spazio utilizzato dai dati',
@ -1754,6 +1757,7 @@ Name: [username]
 'takeOverIndReviewer' => 'Riprendi il revisore dall\'ultima versione.',
 'takeOverIndReviewers' => '',
 'tasks' => 'Attività',
+'task_core_expireddocs_days' => '',
 'task_description' => 'Descrizione',
 'task_disabled' => 'Disabilitata',
 'task_frequency' => 'Frequenza',
@ -1789,6 +1793,7 @@ Name: [username]
 'to' => 'A',
 'toggle_manager' => 'Gestore',
 'toggle_qrcode' => 'Mostri/nascondi codice QR',
+'total' => '',
 'to_before_from' => 'La data di fine non può essere antecedente a quella di inizio',
 'transfer_content' => 'Trasferisci contenuto',
 'transfer_document' => 'Trasferisci documento',
@ -1857,6 +1862,7 @@ URL: [url]',
 'uploading_zerosize' => 'Si sta caricando un file vuoto. Operazione abortita.',
 'used_discspace' => 'Spazio su disco occupato',
 'user' => 'Utente',
+'userdata_file' => '',
 'userid_groupid' => 'id Utente/id Gruppo',
 'users' => 'Utenti',
 'users_and_groups' => 'Utenti/Gruppi',
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@ -650,6 +650,8 @@ URL: [url]',
 'import_extension' => '',
 'import_fs' => '파일시스템으로부터 가져오기',
 'import_fs_warning' => '',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => '내용을 포함',
 'include_documents' => '문서 포함',
 'include_subdirectories' => '하위 디렉터리 포함',
@ -1589,6 +1591,7 @@ URL : [url]',
 'site_brand' => '',
 'sk_SK' => '슬로바키아어',
 'sort_by_date' => '',
+'sort_by_expiration_date' => '',
 'sort_by_name' => '',
 'sort_by_sequence' => '',
 'space_used_on_data_folder' => '데이터 폴더에 사용되는 공간',
@ -1721,6 +1724,7 @@ URL : [url]',
 'takeOverIndReviewer' => '최종 버전의 개인별 검수자를 상속합니다.',
 'takeOverIndReviewers' => '',
 'tasks' => '작업',
+'task_core_expireddocs_days' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@ -1756,6 +1760,7 @@ URL : [url]',
 'to' => '마감일',
 'toggle_manager' => '전환 매니저',
 'toggle_qrcode' => 'QR code 보이기/숨기기',
+'total' => '',
 'to_before_from' => '종료일은 시작일 전이 될수 없습니다',
 'transfer_content' => '',
 'transfer_document' => '',
@ -1824,6 +1829,7 @@ URL : [url]',
 'uploading_zerosize' => '빈 파일을 업로드 합니다. 업로드가 취소 됩니다.',
 'used_discspace' => '사용된 디스크 공간',
 'user' => '사용자',
+'userdata_file' => '',
 'userid_groupid' => 'User id/Group id',
 'users' => '사용자',
 'users_and_groups' => '사용자 / 그룹',
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@ -647,6 +647,8 @@ URL: [url]',
 'import_extension' => '',
 'import_fs' => 'ນຳເຂົ້າຈາກຟາຍລະບົບ',
 'import_fs_warning' => 'ຊື່ງຈະໄຊ້ໄດ້ສະເພາະກັບໂຟລເດີໃນໂຟລເດີແບບເລືອນລົງເທົ່ານັ້ນ ການດຳເນີນການນີ້ຈະນຳເຂົ້າໄຟລແລະໂຟລເດີທັງຫມົດໄຟລຈະໄດ້ຮັບການເຜີຍແຜ່ທັນທີ',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => 'ລວມເນື້ອຫາ',
 'include_documents' => 'ລວມເອກະສານ',
 'include_subdirectories' => 'ລວມໄດເລັກທໍລີຍ່ອຍ',
@ -1615,6 +1617,7 @@ URL: [url]',
 'site_brand' => '',
 'sk_SK' => 'ສະໂລວາເກຍ',
 'sort_by_date' => '',
+'sort_by_expiration_date' => '',
 'sort_by_name' => '',
 'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'ຟື້ນທີທີ່ໄຊ້ໃນໂຟລເດີຂໍ້ມູນ',
@ -1747,6 +1750,7 @@ URL: [url]',
 'takeOverIndReviewer' => 'ການກວດສອບແຕ່ລະບຸກຄົນຈາກເວີຊັ້ນລ່າສຸດ',
 'takeOverIndReviewers' => '',
 'tasks' => 'ງານ',
+'task_core_expireddocs_days' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@ -1782,6 +1786,7 @@ URL: [url]',
 'to' => 'ໄປຍັງ',
 'toggle_manager' => 'ສຳລັບຜູ້ຈັດການ',
 'toggle_qrcode' => 'ສະແດງ/ ຊ້ອນລະຫັດ QR',
+'total' => '',
 'to_before_from' => 'ວັນເລີ້ມຕົ້ນຈະບໍ່ຄືກັບວັນສຸດທ້າຍ',
 'transfer_content' => '',
 'transfer_document' => '',
@ -1850,6 +1855,7 @@ URL: [url]',
 'uploading_zerosize' => 'ການອັບໂຫລດໄຟລເປົ່າ, ການອັບໂຫຼດຖຶກຍົກເລີກ',
 'used_discspace' => 'ໄຊ້ເນື້ອທີດິສ',
 'user' => 'ຜູ້ໄຊ້ງານ',
+'userdata_file' => '',
 'userid_groupid' => 'ລະຫັດຜູ້ໄຊ້ / ລະຫັດກຸ່ມ',
 'users' => 'ຜູ້ໄຊ້',
 'users_and_groups' => 'ຜູ້ໄຊ້ / ກຸ່ມ',
--- a/languages/nb_NO/lang.inc
+++ b/languages/nb_NO/lang.inc
@ -668,6 +668,8 @@ URL: [url]',
 'import_extension' => 'Importer utvidelse',
 'import_fs' => 'Import fra filsystem',
 'import_fs_warning' => 'Dette fungerer bare for mapper i slippmappen. Operasjonen importerer rekursivt alle mapper og filer. Filer vil bli gitt ut umiddelbart.',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => 'Inkludere innhold',
 'include_documents' => 'Inkludere dokument',
 'include_subdirectories' => 'Inkludere undermapper',
@ -1628,6 +1630,7 @@ Bruker: [username]
 'site_brand' => 'Nettsted merke/logo',
 'sk_SK' => 'Slovakisk',
 'sort_by_date' => 'Sorter etter dato',
+'sort_by_expiration_date' => '',
 'sort_by_name' => 'Sorter etter navn',
 'sort_by_sequence' => 'Sorter etter sekvens',
 'space_used_on_data_folder' => 'Plass brukt på datamappe',
@ -1760,6 +1763,7 @@ Bruker: [username]
 'takeOverIndReviewer' => 'Ta over individuell anmelder fra forrige versjon.',
 'takeOverIndReviewers' => 'Ta over individuelle korrekturleser',
 'tasks' => 'Oppgaver',
+'task_core_expireddocs_days' => '',
 'task_description' => 'Beskrivelse',
 'task_disabled' => 'Deaktivert',
 'task_frequency' => 'Frekvens',
@ -1795,6 +1799,7 @@ Bruker: [username]
 'to' => 'Til',
 'toggle_manager' => 'Bytt leder',
 'toggle_qrcode' => 'Vis/skjul QR-kode',
+'total' => '',
 'to_before_from' => 'Sluttdato kan ikke være før startdato',
 'transfer_content' => 'Overfør innhold',
 'transfer_document' => 'Overfør dokumentet',
@ -1863,6 +1868,7 @@ URL: [url]',
 'uploading_zerosize' => 'Laster opp en tom fil. Opplastingen er kansellert.',
 'used_discspace' => 'Brukt diskplass',
 'user' => 'Bruker',
+'userdata_file' => '',
 'userid_groupid' => 'Brukernavn/gruppenavn',
 'users' => 'Brukere',
 'users_and_groups' => 'Brukere/grupper',
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@ -642,6 +642,8 @@ URL: [url]',
 'import_extension' => '',
 'import_fs' => 'Importeer van bestandssysteem',
 'import_fs_warning' => 'Dit werkt alleen in de dropfolder. Mappen en bestanden worden recursief geïmporteerd. Bestanden worden direct ter beschikking gesteld.',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => 'inclusief inhoud',
 'include_documents' => 'Inclusief documenten',
 'include_subdirectories' => 'Inclusief submappen',
@ -1612,6 +1614,7 @@ Name: [username]
 'site_brand' => '',
 'sk_SK' => 'Slowaaks',
 'sort_by_date' => 'Sorteren op datum',
+'sort_by_expiration_date' => '',
 'sort_by_name' => 'Sorteren op naam',
 'sort_by_sequence' => 'Sorteer op volgorde',
 'space_used_on_data_folder' => 'Gebruikte diskomvang in data map',
@ -1744,6 +1747,7 @@ Name: [username]
 'takeOverIndReviewer' => 'Onthoud de laatste groep individuele herzieners',
 'takeOverIndReviewers' => '',
 'tasks' => 'taken',
+'task_core_expireddocs_days' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@ -1779,6 +1783,7 @@ Name: [username]
 'to' => 'aan',
 'toggle_manager' => 'Wijzig Beheerder',
 'toggle_qrcode' => 'Tonen/Verbergen QR-code',
+'total' => '',
 'to_before_from' => 'De einddatum mag niet voor de startdatum liggen',
 'transfer_content' => '',
 'transfer_document' => 'Document overdragen',
@ -1847,6 +1852,7 @@ URL: [url]',
 'uploading_zerosize' => 'Uploaden van een leeg bestand. Upload wordt geannuleerd.',
 'used_discspace' => 'Gebruike schijf ruimte',
 'user' => 'Gebruiker',
+'userdata_file' => '',
 'userid_groupid' => 'GebruikerID / Groep ID',
 'users' => 'Gebruikers',
 'users_and_groups' => 'Gebruikers / Groepen',
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@ -637,6 +637,8 @@ URL: [url]',
 'import_extension' => '',
 'import_fs' => 'Import z systemu plików',
 'import_fs_warning' => '',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => '',
 'include_documents' => 'Uwzględnij dokumenty',
 'include_subdirectories' => 'Uwzględnij podkatalogi',
@ -1553,6 +1555,7 @@ URL: [url]',
 'site_brand' => '',
 'sk_SK' => 'słowacki',
 'sort_by_date' => 'Sortuj według daty',
+'sort_by_expiration_date' => '',
 'sort_by_name' => 'Sortuj według nazwy',
 'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'Przestrzeń zajęta przez folder danych',
@ -1685,6 +1688,7 @@ URL: [url]',
 'takeOverIndReviewer' => '',
 'takeOverIndReviewers' => '',
 'tasks' => '',
+'task_core_expireddocs_days' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@ -1720,6 +1724,7 @@ URL: [url]',
 'to' => 'Do',
 'toggle_manager' => 'Przełączanie zarządcy',
 'toggle_qrcode' => '',
+'total' => '',
 'to_before_from' => '',
 'transfer_content' => '',
 'transfer_document' => 'Transfer dokumentu',
@ -1788,6 +1793,7 @@ URL: [url]',
 'uploading_zerosize' => 'Próba przesłania pustego pliku. Przesłanie zostało przerwane.',
 'used_discspace' => 'Użyta przestrzeń dyskowa',
 'user' => 'Użytkownik',
+'userdata_file' => '',
 'userid_groupid' => 'Id Użytkownika/Id Grupy',
 'users' => 'Użytkownicy',
 'users_and_groups' => 'Użytkownicy/Grupy',
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@ -668,6 +668,8 @@ URL: [url]',
 'import_extension' => 'Importar extensão',
 'import_fs' => 'Importar do sistema de arquivos',
 'import_fs_warning' => 'Isso só funcionará para pastas na pasta-alvo. A operação importa recursivamente todas as pastas e arquivos. Os arquivos serão liberados imediatamente.',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => 'Incluir conteúdo',
 'include_documents' => 'Include documents',
 'include_subdirectories' => 'Include subdirectories',
@ -1634,6 +1636,7 @@ Nome: [username]
 'site_brand' => '',
 'sk_SK' => 'Eslovaco',
 'sort_by_date' => 'classificar por data',
+'sort_by_expiration_date' => '',
 'sort_by_name' => 'classificar por nome',
 'sort_by_sequence' => 'classificar por sequencia',
 'space_used_on_data_folder' => 'Espaço usado na pasta de dados',
@ -1766,6 +1769,7 @@ Nome: [username]
 'takeOverIndReviewer' => 'Assuma o revisor individual da última versão.',
 'takeOverIndReviewers' => '',
 'tasks' => 'Tarefas',
+'task_core_expireddocs_days' => '',
 'task_description' => 'Descrição',
 'task_disabled' => 'Desativado',
 'task_frequency' => 'Frequência',
@ -1801,6 +1805,7 @@ Nome: [username]
 'to' => 'Para',
 'toggle_manager' => 'Alternar gerente',
 'toggle_qrcode' => 'Mostrar / ocultar o código QR',
+'total' => '',
 'to_before_from' => 'A data de término não pode ser anterior a data de início',
 'transfer_content' => 'Transferir conteúdo',
 'transfer_document' => 'Transferir documento',
@ -1869,6 +1874,7 @@ URL: [url]',
 'uploading_zerosize' => 'Envio de um arquivo vazio. Envio cancelado.',
 'used_discspace' => 'Espaço em disco usado',
 'user' => 'Usuário',
+'userdata_file' => '',
 'userid_groupid' => 'Id do Usuário/Id do Grupo',
 'users' => 'Usuários',
 'users_and_groups' => 'Usuários/Grupos',
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@ -649,6 +649,8 @@ URL: [url]',
 'import_extension' => '',
 'import_fs' => 'Import din filesystem',
 'import_fs_warning' => '',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => '',
 'include_documents' => 'Include documente',
 'include_subdirectories' => 'Include subfoldere',
@ -1596,6 +1598,7 @@ URL: [url]',
 'site_brand' => '',
 'sk_SK' => 'Slovacă',
 'sort_by_date' => 'Sortare dupa data',
+'sort_by_expiration_date' => '',
 'sort_by_name' => 'Sortare dupa nume',
 'sort_by_sequence' => 'Sortare dupa numar',
 'space_used_on_data_folder' => 'Spatiu folosit în folderul de date',
@ -1728,6 +1731,7 @@ URL: [url]',
 'takeOverIndReviewer' => 'Preia revizuitorul individual din ultima versiune.',
 'takeOverIndReviewers' => '',
 'tasks' => '',
+'task_core_expireddocs_days' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@ -1763,6 +1767,7 @@ URL: [url]',
 'to' => 'La',
 'toggle_manager' => 'Comută Manager',
 'toggle_qrcode' => '',
+'total' => '',
 'to_before_from' => 'Data de încheiere nu poate fi înainte de data de începere',
 'transfer_content' => '',
 'transfer_document' => 'Transfer document',
@ -1831,6 +1836,7 @@ URL: [url]',
 'uploading_zerosize' => 'Se încarcă un fișier gol. Încărcarea este anulată.',
 'used_discspace' => 'Spatiu pe disc folosit',
 'user' => 'Utilizator',
+'userdata_file' => '',
 'userid_groupid' => '',
 'users' => 'Utilizatori',
 'users_and_groups' => 'Utilizatori/Grupuri',
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1681)
+//    Translators: Admin (1682)

 $text = array(
 '2_factor_auth' => 'Двухфакторная аутентификация',
@ -461,7 +461,7 @@ URL: [url]',
 'dump_creation_warning' => 'Эта операция создаст дамп базы данных. После создания, файл будет сохранен в каталоге данных сервера.',
 'dump_list' => 'Существующие дампы',
 'dump_remove' => 'Удалить дамп',
-'duplicates' => '',
+'duplicates' => 'Дубликаты',
 'duplicate_content' => 'Дублированное содержимое',
 'edit' => 'Изменить',
 'edit_attributes' => 'Изменить атрибуты',
@ -649,6 +649,8 @@ URL: [url]',
 'import_extension' => '',
 'import_fs' => 'Импорт из файловой системы',
 'import_fs_warning' => 'Предупреждение импорта из ФС',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => 'Включая содержимое',
 'include_documents' => 'Включая документы',
 'include_subdirectories' => 'Включая подкаталоги',
@ -1603,6 +1605,7 @@ URL: [url]',
 'site_brand' => '',
 'sk_SK' => 'Slovak',
 'sort_by_date' => 'Сортировка по дате',
+'sort_by_expiration_date' => '',
 'sort_by_name' => 'Сортировка по имени',
 'sort_by_sequence' => 'Сортировка по порядку',
 'space_used_on_data_folder' => 'Размер каталога данных',
@ -1735,6 +1738,7 @@ URL: [url]',
 'takeOverIndReviewer' => 'Использовать рецензентов из прошлой версии',
 'takeOverIndReviewers' => '',
 'tasks' => 'Задания',
+'task_core_expireddocs_days' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@ -1770,6 +1774,7 @@ URL: [url]',
 'to' => 'До',
 'toggle_manager' => 'Изменить как менеджера',
 'toggle_qrcode' => '',
+'total' => '',
 'to_before_from' => 'Конечная дата не может быть меньше начальной даты',
 'transfer_content' => '',
 'transfer_document' => 'Передать документ',
@ -1838,6 +1843,7 @@ URL: [url]',
 'uploading_zerosize' => 'Отменена загрузка пустого файла.',
 'used_discspace' => 'Занятое дисковое пространство',
 'user' => 'Пользователь',
+'userdata_file' => '',
 'userid_groupid' => '',
 'users' => 'Пользователи',
 'users_and_groups' => 'Пользователи / группы',
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@ -668,6 +668,8 @@ URL: [url]',
 'import_extension' => 'Import extension',
 'import_fs' => 'Importovanie zo súborového systému',
 'import_fs_warning' => 'This will only work for folders in the drop folder. The operation recursively imports all folders and files. Files will be released immediately.',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => 'Zahrnúť obsah',
 'include_documents' => 'Vrátane súborov',
 'include_subdirectories' => 'Vrátane podzložiek',
@ -1636,6 +1638,7 @@ Meno: [username]
 'site_brand' => '',
 'sk_SK' => 'Slovenčina',
 'sort_by_date' => '',
+'sort_by_expiration_date' => '',
 'sort_by_name' => '',
 'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'Space used on data folder',
@ -1768,6 +1771,7 @@ Meno: [username]
 'takeOverIndReviewer' => 'Take over individual reviewer from last version.',
 'takeOverIndReviewers' => '',
 'tasks' => 'Úlohy',
+'task_core_expireddocs_days' => '',
 'task_description' => 'Description',
 'task_disabled' => 'Disabled',
 'task_frequency' => 'Frequency',
@ -1803,6 +1807,7 @@ Meno: [username]
 'to' => 'Do',
 'toggle_manager' => 'Prepnúť stav manager',
 'toggle_qrcode' => 'Ukázať/skryť QR kód',
+'total' => '',
 'to_before_from' => 'End date may not be before start date',
 'transfer_content' => '',
 'transfer_document' => 'Zmeniť vlastníka',
@ -1871,6 +1876,7 @@ URL: [url]',
 'uploading_zerosize' => 'Nahrávate prázdny súbor. Nahrávanie je zrušené.',
 'used_discspace' => 'Využitý priestor na disku',
 'user' => 'Používateľ',
+'userdata_file' => '',
 'userid_groupid' => 'Používateľ id/Skupina id',
 'users' => 'Používateľ',
 'users_and_groups' => 'Používatelia/Skupiny',
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@ -655,6 +655,8 @@ URL: [url]',
 'import_extension' => '',
 'import_fs' => 'Import från filsystem',
 'import_fs_warning' => 'Detta fungerar endast för kataloger i mellanlagringsmappen. Filer och mappar får godkänd status direkt efter importen.',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => 'Inkudera innehåll',
 'include_documents' => 'Inkludera dokument',
 'include_subdirectories' => 'Inkludera underkataloger',
@ -1609,6 +1611,7 @@ Kommentar: [comment]',
 'site_brand' => '',
 'sk_SK' => 'Slovakiska',
 'sort_by_date' => '',
+'sort_by_expiration_date' => '',
 'sort_by_name' => '',
 'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'Utrymme använt i datakatalogen',
@ -1741,6 +1744,7 @@ Kommentar: [comment]',
 'takeOverIndReviewer' => 'Ta över individuell granskare från senaste version',
 'takeOverIndReviewers' => '',
 'tasks' => 'Uppgifter',
+'task_core_expireddocs_days' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@ -1776,6 +1780,7 @@ Kommentar: [comment]',
 'to' => 'till',
 'toggle_manager' => 'Byt manager',
 'toggle_qrcode' => 'Visa/göm QR-kod',
+'total' => '',
 'to_before_from' => 'Slutdatum får inte vara innan startdatum',
 'transfer_content' => '',
 'transfer_document' => 'Överför dokument',
@ -1844,6 +1849,7 @@ URL: [url]',
 'uploading_zerosize' => 'Uppladdning av tom fil. Uppladdningen avbryts.',
 'used_discspace' => 'Använt lagringsutrymme',
 'user' => 'Användare',
+'userdata_file' => '',
 'userid_groupid' => 'Användar-ID/Grupp-ID',
 'users' => 'Användare',
 'users_and_groups' => 'Användare/Grupper',
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@ -19,10 +19,10 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1095), aydin (83)
+//    Translators: Admin (1107), aydin (83)

 $text = array(
-'2_factor_auth' => '',
+'2_factor_auth' => 'İki faktörlü yetkilendirme',
 '2_factor_auth_info' => '',
 '2_fact_auth_secret' => '',
 'accept' => 'Kabul',
@ -643,6 +643,8 @@ URL: [url]',
 'import_extension' => '',
 'import_fs' => 'dosya sisteminden getir',
 'import_fs_warning' => '',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => '',
 'include_documents' => 'Dokümanları kapsa',
 'include_subdirectories' => 'Alt klasörleri kapsa',
@ -790,7 +792,7 @@ URL: [url]',
 'move_folder' => 'Klasörü Taşı',
 'my_account' => 'Hesabım',
 'my_documents' => 'Dokümanlarım',
-'my_transmittals' => '',
+'my_transmittals' => 'Çevirilerim',
 'name' => 'İsim',
 'nb_NO' => 'Norveç Havayolları',
 'needs_correction' => '',
@ -1111,7 +1113,7 @@ URL: [url]',
 'role_admin' => 'Yönetici',
 'role_guest' => 'Misafir',
 'role_info' => '',
-'role_management' => '',
+'role_management' => 'Rol yönetimi',
 'role_name' => '',
 'role_type' => '',
 'role_user' => 'Kullanıcı',
@ -1134,7 +1136,7 @@ URL: [url]',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
 'scheduler_class_tasks' => '',
-'scheduler_task_mgr' => '',
+'scheduler_task_mgr' => 'Takvim',
 'search' => 'Ara',
 'search_fulltext' => 'Tam metinde ara',
 'search_in' => 'Şurada ara',
@ -1226,7 +1228,7 @@ URL: [url]',
 'settings_contentDir_desc' => 'Yüklenecek dosyaların depolanacağı yer (web üzerinden erişilemeyen bir yer tercih etmeniz önerilir.)',
 'settings_contentOffsetDir' => 'İçerik Ofset Klasörü',
 'settings_contentOffsetDir_desc' => 'Dosya sistemindeki kısıtlamaları aşabilmek için mevcut içerik dizini içerisinde yeni bir dizin yapısı geliştirildi. Bu, başlangıç için temel bir dizin gerektirir. Genellikle bunu varsayılan değer olan 1048576 olarak bırakmanız önerilir fakat İçerik Dizininde mevcut olmayan herhangi bir sayı veya string olabilir.',
-'settings_convertToPdf' => '',
+'settings_convertToPdf' => 'PDF ön görünümden çevir',
 'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => 'Çerez geçerlilik süresi',
 'settings_cookieLifetime_desc' => 'Çerezlerin saniye olarak geçerlilik süresi. 0 olarak ayarlanırsa tarayıcı kapatıldığında çerezler silinir.',
@ -1255,9 +1257,9 @@ URL: [url]',
 'settings_defaultDocPosition_desc' => '',
 'settings_defaultDocPosition_val_end' => '',
 'settings_defaultDocPosition_val_start' => '',
-'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod' => 'Ön tanımlı arama metodu',
 'settings_defaultSearchMethod_desc' => '',
-'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valdatabase' => 'veritabanı',
 'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'SeedDMS kullanabilmeniz için konfigürasyon (conf) dizini içindeki ENABLE_INSTALL_TOOL dosyasını silmelisiniz',
 'settings_disableSelfEdit' => 'Kendi kendine Düzenlemeyi Kapat',
@ -1418,16 +1420,16 @@ URL: [url]',
 'settings_maxDirID_desc' => 'Klasör altında oluşturulabilecek maksimum alt klasör sayısı Varsayılan: 0.',
 'settings_maxExecutionTime' => 'Maksimum çalışma zamanı (s)',
 'settings_maxExecutionTime_desc' => 'Durdurulmadan önce bir betikin en fazla kaç saniye çalışabileceğini ayarlar',
-'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage' => 'Bir sayfadaki en fazla girdi sayısı',
 'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Maks. özyinelemeli doküman/klasör sayısı',
 'settings_maxRecursiveCount_desc' => 'Nesneleri özyinelemeli olarak erişim hakkı kontrolü için sayarken bu değer en fazla sayılacak doküman ve klasör sayısını belirler. Bu sayı aşıldığında klasörün içindeki dosya ve diğer klasörlerin sayısı tahmin yolu ile belirlenecektir.',
-'settings_maxSizeForFullText' => '',
+'settings_maxSizeForFullText' => 'Hızlı indeksleme için maksimum dosya boyu',
 'settings_maxSizeForFullText_desc' => '',
 'settings_maxUploadSize' => '',
 'settings_maxUploadSize_desc' => '',
 'settings_more_settings' => 'Daha fazla ayar yapın. Varsayılan kullanıcı adı/parola: admin/admin',
-'settings_noDocumentFormFields' => '',
+'settings_noDocumentFormFields' => 'Bu alanı gösterme',
 'settings_noDocumentFormFields_desc' => '',
 'settings_notfound' => 'Bulunamadı',
 'settings_Notification' => 'Bildirim ayarları',
@ -1488,7 +1490,7 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'Kök dizinin ID numarası(genelde değiştirilmesine gerek yok)',
 'settings_SaveError' => 'Konfigürasyon dosyası kaydedilemedi',
 'settings_Server' => 'Sunucu ayarları',
-'settings_showFullPreview' => '',
+'settings_showFullPreview' => 'Tam dökümanı göster',
 'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => 'Eksik çevirileri göster',
 'settings_showMissingTranslations_desc' => 'Eksik çevirilerin tamamı sayfanın en altında listelenir. Giriş yapan kullanıclıar yapacakları çevirileri csv formatında gönderebilirler. Gerçekte kullanılan sistemlerde bunu açmamanız önerilir!',
@ -1575,6 +1577,7 @@ URL: [url]',
 'site_brand' => '',
 'sk_SK' => 'Slovakça',
 'sort_by_date' => 'Tarihe göre sırala',
+'sort_by_expiration_date' => '',
 'sort_by_name' => 'Ada göre sırala',
 'sort_by_sequence' => 'Eklenme sırasına göre sırala',
 'space_used_on_data_folder' => 'Data klasörü kullanılan alan',
@ -1707,6 +1710,7 @@ URL: [url]',
 'takeOverIndReviewer' => 'Bir önceki versiyonu kontrol edeni al.',
 'takeOverIndReviewers' => '',
 'tasks' => '',
+'task_core_expireddocs_days' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@ -1742,6 +1746,7 @@ URL: [url]',
 'to' => 'Kime',
 'toggle_manager' => 'Değişim yönetimi',
 'toggle_qrcode' => '',
+'total' => '',
 'to_before_from' => 'Bitiş tarihi başlama tarihinden önce olamaz',
 'transfer_content' => '',
 'transfer_document' => 'Dokumanı gönder',
@ -1810,6 +1815,7 @@ URL: [url]',
 'uploading_zerosize' => 'Boş bir dosya yükleniyor. Yükleme iptal edildi.',
 'used_discspace' => 'Kullanılan disk alanı',
 'user' => 'Kullanıcı',
+'userdata_file' => '',
 'userid_groupid' => '',
 'users' => 'Kullanıcı',
 'users_and_groups' => 'Kullanıcılar/Gruplar',
@ -1832,7 +1838,7 @@ URL: [url]',
 'versioning_file_creation_warning' => 'Bu işlem ile tüm klasörlerdeki versiyon bilgisinin bulunduğu bir dosya oluşturursunuz. Her dosya oluşturulduğunda doküman klasörüne kaydedilir.',
 'versioning_info' => 'Version bilgisi',
 'versiontolow' => 'Versiyon düşük',
-'version_comment' => '',
+'version_comment' => 'Versiyon açıklaması',
 'version_deleted_email' => 'Versiyon silindi',
 'version_deleted_email_body' => 'Versiyon silindi
 Doküman: [name]
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@ -649,6 +649,8 @@ URL: [url]',
 'import_extension' => '',
 'import_fs' => 'Імпортувати з файлової системи',
 'import_fs_warning' => '',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => 'Включно з вмістом',
 'include_documents' => 'Включно з документами',
 'include_subdirectories' => 'Включно з підкаталогами',
@ -1596,6 +1598,7 @@ URL: [url]',
 'site_brand' => '',
 'sk_SK' => 'Slovak',
 'sort_by_date' => '',
+'sort_by_expiration_date' => '',
 'sort_by_name' => '',
 'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'Розмір каталогу даних',
@ -1728,6 +1731,7 @@ URL: [url]',
 'takeOverIndReviewer' => 'Використати рецензентів з попередньої версії',
 'takeOverIndReviewers' => '',
 'tasks' => 'Завдання',
+'task_core_expireddocs_days' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@ -1763,6 +1767,7 @@ URL: [url]',
 'to' => 'До',
 'toggle_manager' => 'Змінити ознаку менеджера',
 'toggle_qrcode' => '',
+'total' => '',
 'to_before_from' => 'Кінцева дата не може бути меншою початкової дати',
 'transfer_content' => '',
 'transfer_document' => '',
@ -1831,6 +1836,7 @@ URL: [url]',
 'uploading_zerosize' => 'Відміна завантаження порожнього файлу.',
 'used_discspace' => 'Зайнятий дисковий простір',
 'user' => 'Користувач',
+'userdata_file' => '',
 'userid_groupid' => '',
 'users' => 'Користувачі',
 'users_and_groups' => 'Користувачі / групи',
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@ -639,6 +639,8 @@ URL: [url]',
 'import_extension' => '',
 'import_fs' => '从文件系统导入',
 'import_fs_warning' => '这将只适用于拖动文件夹。该操作将递归导入所有文件夹和文件。文件将立即释放。',
+'import_users' => '',
+'import_users_update' => '',
 'include_content' => '',
 'include_documents' => '包含文档',
 'include_subdirectories' => '包含子目录',
@ -1571,6 +1573,7 @@ URL: [url]',
 'site_brand' => '',
 'sk_SK' => '斯洛伐克语',
 'sort_by_date' => '日期排序',
+'sort_by_expiration_date' => '',
 'sort_by_name' => '文件名排序',
 'sort_by_sequence' => '顺序排列',
 'space_used_on_data_folder' => '数据文件夹使用空间',
@ -1703,6 +1706,7 @@ URL: [url]',
 'takeOverIndReviewer' => '',
 'takeOverIndReviewers' => '',
 'tasks' => '任务',
+'task_core_expireddocs_days' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@ -1738,6 +1742,7 @@ URL: [url]',
 'to' => '到',
 'toggle_manager' => '角色切换',
 'toggle_qrcode' => '显示/隐藏 QR 码',
+'total' => '',
 'to_before_from' => '结束日期不能早于开始日期',
 'transfer_content' => '',
 'transfer_document' => '共享文档',
@ -1797,6 +1802,7 @@ URL: [url]',
 'uploading_zerosize' => '上传失败！请检查是否没有选择上传的文件。',
 'used_discspace' => '使用磁盘空间',
 'user' => '用户',
+'userdata_file' => '',
 'userid_groupid' => '用户ID/组ID',
 'users' => '用户',
 'users_and_groups' => '用户/组',
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@ -430,7 +430,9 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){

 	if($settings->_overrideMimeType) {
 		$finfo = finfo_open(FILEINFO_MIME_TYPE);
-		$userfiletype = finfo_file($finfo, $userfiletmp);
+		$tmpfiletype = finfo_file($finfo, $userfiletmp);
+		if($tmpfiletype != 'application/octet-stream')
+			$userfiletype = $tmpfiletype;
 	}

 	if ((count($_FILES["userfile"]["tmp_name"])==1)&&($_POST["name"]!=""))
--- a/op/op.Cron.php
+++ b/op/op.Cron.php
@ -0,0 +1,43 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010-2016 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassController.php");
+include("../inc/inc.Scheduler.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$controller = Controller::factory($tmp[1], array('dms'=>$dms));
+
+$controller->setParam('settings', $settings);
+if(!$controller->run()) {
+	echo getMLText("error_occured");
+	exit;
+}
+
+add_log_line();
+exit();
+
--- a/op/op.DropFolderPreview.php
+++ b/op/op.DropFolderPreview.php
@ -48,6 +48,9 @@ $dir = $dropfolderdir.'/'.$user->getLogin();
 if(!file_exists($dir.'/'.$filename))
 	exit;

+$finfo = finfo_open(FILEINFO_MIME_TYPE);
+$mimetype = finfo_file($finfo, $dir.'/'.$filename);
+
 if(!empty($_GET["width"]))
 	$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $_GET["width"]);
 else
@ -55,7 +58,7 @@ else
 $previewer->setConverters($settings->_converters['preview']);
 $previewer->setXsendfile($settings->_enableXsendfile);
 if(!$previewer->hasRawPreview($dir.'/'.$filename, 'dropfolder/'))
-	$previewer->createRawPreview($dir.'/'.$filename, 'dropfolder/');
+	$previewer->createRawPreview($dir.'/'.$filename, 'dropfolder/', $mimetype);
 header('Content-Type: image/png');
 $previewer->getRawPreview($dir.'/'.$filename, 'dropfolder/');

--- a/op/op.ImportUsers.php
+++ b/op/op.ImportUsers.php
@ -0,0 +1,134 @@
+<?php
+//    SeedDMS. Document Management System
+//    Copyright (C) 2010-2016 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+if (isset($_FILES['userdata']) && $_FILES['userdata']['error'] == 0) {
+	if(!is_uploaded_file($_FILES["userdata"]["tmp_name"]))
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
+
+	if($_FILES["userdata"]["size"] == 0)
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("uploading_zerosize"));
+}
+
+function getBaseData($colname, $coldata, $objdata) { /* {{{ */
+	$objdata[$colname] = $coldata;
+	return $objdata;
+} /* }}} */
+
+function getGroupData($colname, $coldata, $objdata) { /* {{{ */
+	global $dms;
+	if($group = $dms->getGroupByName($coldata)) {
+		$objdata['groups'][] = $group;
+	}
+	return $objdata;
+} /* }}} */
+
+function getRoleData($colname, $coldata, $objdata) { /* {{{ */
+	switch($coldata) {
+	case 'admin':
+		$role = 1;
+		break;
+	case 'guest':
+		$role = 2;
+		break;
+	default:
+		$role = 0;
+	}
+	$objdata['role'] = $role;
+	return $objdata;
+} /* }}} */
+
+	$csvdelim = ';';
+	$csvencl = '"';
+	if($fp = fopen($_FILES['userdata']['tmp_name'], 'r')) {
+		$colmap = array();
+		if($header = fgetcsv($fp, 0, $csvdelim, $csvencl)) {
+			foreach($header as $i=>$colname) {
+				$colname = trim($colname);
+				if(substr($colname, 0, 5) == 'group') {
+					$colmap[$i] = array("getGroupData", $colname);
+				} elseif(in_array($colname, array('role'))) {
+					$colmap[$i] = array("getRoleData", $colname);
+				} elseif(in_array($colname, array('login', 'name', 'email', 'comment', 'group'))) {
+					$colmap[$i] = array("getBaseData", $colname);
+				} elseif(substr($colname, 0, 5) == 'attr:') {
+					$kk = explode(':', $colname, 2);
+					if(($attrdef = $dms->getAttributeDefinitionByName($kk[1])) || ($attrdef = $dms->getAttributeDefinition((int) $kk[1]))) {
+						$colmap[$i] = array("getAttributeData", $attrdef);
+					}
+				}
+			}
+		}
+//		echo "<pre>";print_r($colmap);echo "</pre>";
+		if(count($colmap) > 1) {
+			$allusers = $dms->getAllUsers();
+			$userids = array();
+			foreach($allusers as $muser)
+				$userids[$muser->getLogin()] = $muser;
+			$newusers = array();
+			while(!feof($fp)) {
+				if($data = fgetcsv($fp, 0, $csvdelim, $csvencl)) {
+					$md = array();
+					foreach($data as $i=>$coldata) {
+						if(isset($colmap[$i])) {
+							$md = call_user_func($colmap[$i][0], $colmap[$i][1], $coldata, $md);
+						}
+					}
+					if($md)
+						$newusers[] = $md;
+				}
+			}
+//			print_r($newusers);
+			foreach($newusers as $u) {
+				if($eu = $dms->getUserByLogin($u['login'])) {
+					if(!empty($_POST['update'])) {
+						if(isset($u['name']))
+							$eu->setFullName($u['name']);
+						if(isset($u['email']))
+							$eu->setEmail($u['email']);
+						if(isset($u['comment']))
+							$eu->setComment($u['comment']);
+						if(isset($u['language']))
+							$eu->setLanguage($u['language']);
+						if(isset($u['groups'])) {
+							foreach($eu->getGroups() as $g)
+								$eu->leaveGroup($g);
+							foreach($u['groups'] as $g)
+								$eu->joinGroup($g);
+						}
+					}
+				} else {
+					if(!empty($u['login']) && !empty($u['name']) && !empty($u['email'])) {
+						$ret = $dms->addUser($u['login'], '', $u['name'], $u['email'], !empty($u['language']) ? $u['language'] : 'en_GB', 'bootstrap', !empty($u['comment']) ? $u['comment'] : '', $u['role']);
+						var_dump($ret);
+					}
+				}
+			}
+		}
+	}
+
+//header("Location:../out/out.ViewFolder.php?folderid=".$newfolder->getID());
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@ -64,7 +64,7 @@ if ($action == "saveSettings")
 	else
 		$settings->_availablelanguages = $_POST["availablelanguages"];
  $settings->_theme = $_POST["theme"];
-  $settings->_onePageMode = $_POST["onePageMode"];
+  $settings->_onePageMode = getBoolValue("onePageMode");
  $settings->_previewWidthList = $_POST["previewWidthList"];
  $settings->_previewWidthMenuList = $_POST["previewWidthMenuList"];
  $settings->_previewWidthDropFolderList = $_POST["previewWidthDropFolderList"];
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@ -102,7 +102,9 @@ if (isset($_FILES['userfile']) && $_FILES['userfile']['error'] == 0) {

 	if($settings->_overrideMimeType) {
 		$finfo = finfo_open(FILEINFO_MIME_TYPE);
-		$userfiletype = finfo_file($finfo, $userfiletmp);
+		$tmpfiletype = finfo_file($finfo, $userfiletmp);
+		if($tmpfiletype != 'application/octet-stream')
+			$userfiletype = $tmpfiletype;
 	}
 } elseif($settings->_dropFolderDir) {
 	if($_POST['dropfolderfileform1']) {
--- a/op/op.WorkflowStatesMgr.php
+++ b/op/op.WorkflowStatesMgr.php
@ -118,7 +118,7 @@ else if ($action == "editworkflowstate") {
 	if ($editedWorkflowState->getDocumentStatus() != $docstatus)
 		$editedWorkflowState->setDocumentStatus($docstatus);
 	
-	add_log_line(".php&action=editworkflowstate&workflowstateid=".$workflow);
+	add_log_line(".php&action=editworkflowstate&workflowstateid=".$workflowstateid);

 }
 else UI::exitError(getMLText("admin_tools"),getMLText("unknown_command"));
--- a/out/out.ExpiredDocuments.php
+++ b/out/out.ExpiredDocuments.php
@ -40,13 +40,19 @@ if ($user->isGuest()) {
 	UI::exitError(getMLText("expired_documents"),getMLText("access_denied"));
 }

-$orderby='n';
+$orderby='e';
 if (isset($_GET["orderby"]) && strlen($_GET["orderby"])==1 ) {
 	$orderby=$_GET["orderby"];
 }
+$orderdir='d';
+if (isset($_GET["orderdir"]) && strlen($_GET["orderdir"])==1 ) {
+	$orderdir=$_GET["orderdir"];
+}

 if($view) {
+	$view->setParam('showtree', showtree());
 	$view->setParam('orderby', $orderby);
+	$view->setParam('orderdir', $orderdir);
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('timeout', $settings->_cmdTimeout);
--- a/out/out.ImportUsers.php
+++ b/out/out.ImportUsers.php
@ -0,0 +1,40 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010-2016 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+if(!isset($settings))
+	require_once("../inc/inc.Settings.php");
+require_once("inc/inc.LogInit.php");
+require_once("inc/inc.Utils.php");
+require_once("inc/inc.Language.php");
+require_once("inc/inc.Init.php");
+require_once("inc/inc.Extension.php");
+require_once("inc/inc.DBInit.php");
+require_once("inc/inc.ClassUI.php");
+require_once("inc/inc.Authentication.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+if (!$user->isAdmin()) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+}
+
+if($view) {
+	$view($_GET);
+	exit;
+}
--- a/utils/adddoc.php
+++ b/utils/adddoc.php
@ -1,40 +1,47 @@
 <?php
 if(isset($_SERVER['SEEDDMS_HOME'])) {
 	ini_set('include_path', $_SERVER['SEEDDMS_HOME'].'/utils'. PATH_SEPARATOR .ini_get('include_path'));
+	$myincpath = $_SERVER['SEEDDMS_HOME'];
 } else {
 	ini_set('include_path', dirname($argv[0]). PATH_SEPARATOR .ini_get('include_path'));
+	$myincpath = dirname($argv[0]);
 }

 function usage() { /* {{{ */
 	echo "Usage:\n";
-	echo "  seeddms-adddoc [--config <file>] [-c <comment>] [-k <keywords>] [-s <number>] [-n <name>] [-V <version>] [-s <sequence>] [-t <mimetype>] [-a <attribute=value>] [-h] [-v] -F <folder id> -f <filename>\n";
+	echo "  seeddms-adddoc [--config <file>] [-c <comment>] [-k <keywords>] [-s <number>] [-n <name>] [-V <version>] [-s <sequence>] [-t <mimetype>] [-a <attribute=value>] [-h] [-v] -F <folder id> -D <document id> -f <filename>\n";
 	echo "\n";
 	echo "Description:\n";
-	echo "  This program uploads a file into a folder of SeedDMS.\n";
+	echo "  This program uploads a file into a folder or updates a document of SeedDMS.\n";
 	echo "\n";
 	echo "Options:\n";
 	echo "  -h, --help: print usage information and exit.\n";
 	echo "  -v, --version: print version and exit.\n";
 	echo "  --config: set alternative config file.\n";
 	echo "  -F <folder id>: id of folder the file is uploaded to\n";
-	echo "  -c <comment>: set comment for document\n";
+	echo "  -D <document id>: id of document the file is uploaded to.\n";
+	echo "     This will only be used if no folder id is given.\n";
+	echo "  -c <comment>: set comment for document. See [1].\n";
 	echo "  -C <comment>: set comment for version\n";
-	echo "  -k <keywords>: set keywords for file\n";
-	echo "  -K <categories>: set categories for file\n";
-	echo "  -s <number>: set sequence for file (used for ordering files within a folder\n";
+	echo "  -k <keywords>: set keywords for file. See [1].\n";
+	echo "  -K <categories>: set categories for file. See [1].\n";
+	echo "  -s <number>: set sequence for file (used for ordering files within a folder. See [1].\n";
 	echo "  -n <name>: set name of file\n";
-	echo "  -V <version>: set version of file (defaults to 1).\n";
+	echo "  -V <version>: set version of file (defaults to 1). See [2].\n";
 	echo "  -u <user>: login name of user\n";
 	echo "  -f <filename>: upload this file\n";
-	echo "  -s <sequence>: set sequence of file\n";
+	echo "  -s <sequence>: set sequence of file. See [1]\n";
 	echo "  -t <mimetype> set mimetype of file manually. Do not do that unless you know\n";
 	echo "      what you do. If not set, the mimetype will be determined automatically.\n";
-	echo "  -a <attribute=value>: Set a document attribute; can occur multiple times.\n";
+	echo "  -a <attribute=value>: Set a document attribute; can occur multiple times. See [1].\n";
 	echo "  -A <attribute=value>: Set a version attribute; can occur multiple times.\n";
+	echo "\n";
+	echo "[1] This option applies only if a new document is uploaded. It has no effect\n"."    if a new document version is uploaded.\n";
+	echo "[2] If a new document version is uploaded it defaults to the next version number.\n";
 } /* }}} */

 $version = "0.0.1";
-$shortoptions = "F:c:C:k:K:s:V:u:f:n:t:a:A:hv";
+$shortoptions = "D:F:c:C:k:K:s:V:u:f:n:t:a:A:hv";
 $longoptions = array('help', 'version', 'config:');
 if(false === ($options = getopt($shortoptions, $longoptions))) {
 	usage();
@ -58,13 +65,18 @@ if(isset($options['config'])) {
 	define('SEEDDMS_CONFIG_FILE', $options['config']);
 }

-/* Set parent folder */
+/* Set parent folder or document */
+$folderid = $documentid = 0;
 if(isset($options['F'])) {
 	$folderid = (int) $options['F'];
 } else {
-	echo "Missing folder ID\n";
-	usage();
-	exit(1);
+	if(isset($options['D'])) {
+		$documentid = (int) $options['D'];
+	} else {
+		echo "Missing folder/document ID\n";
+		usage();
+		exit(1);
+	}
 }

 /* Set comment of document */
@ -120,13 +132,13 @@ if(isset($options['V'])) {
 if($reqversion<1)
 	$reqversion=1;

-include("../inc/inc.Settings.php");
-include("../inc/inc.Init.php");
-include("../inc/inc.Extension.php");
-include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassNotificationService.php");
-include("../inc/inc.ClassEmailNotify.php");
-include("../inc/inc.ClassController.php");
+include($myincpath."/inc/inc.Settings.php");
+include($myincpath."/inc/inc.Init.php");
+include($myincpath."/inc/inc.Extension.php");
+include($myincpath."/inc/inc.DBInit.php");
+include($myincpath."/inc/inc.ClassNotificationService.php");
+include($myincpath."/inc/inc.ClassEmailNotify.php");
+include($myincpath."/inc/inc.ClassController.php");

 /* Parse categories {{{ */
 $categories = array();
@ -239,25 +251,41 @@ if(is_readable($filename)) {
 		}
 		$filetype = "." . pathinfo($filename, PATHINFO_EXTENSION);
 	} else {
-		echo "File has zero size\n";
+		echo "File '".$filename."' has zero size\n";
 		exit(1);
 	}
 } else {
-	echo "File is not readable\n";
+	echo "File '".$filename."' is not readable\n";
 	exit(1);
 }
 /* }}} */

-$folder = $dms->getFolder($folderid);
+$folder = null;
+$document = null;
+if($folderid) {
+	$folder = $dms->getFolder($folderid);

-if (!is_object($folder)) {
-	echo "Could not find specified folder\n";
-	exit(1);
-}
+	if (!is_object($folder)) {
+		echo "Could not find specified folder\n";
+		exit(1);
+	}

-if ($folder->getAccessMode($user) < M_READWRITE) {
-	echo "Not sufficient access rights\n";
-	exit(1);
+	if ($folder->getAccessMode($user) < M_READWRITE) {
+		echo "Not sufficient access rights\n";
+		exit(1);
+	}
+} elseif($documentid) {
+	$document = $dms->getDocument($documentid);
+
+	if (!is_object($document)) {
+		echo "Could not find specified document\n";
+		exit(1);
+	}
+
+	if ($document->getAccessMode($user) < M_READWRITE) {
+		echo "Not sufficient access rights\n";
+		exit(1);
+	}
 }

 if (!is_numeric($sequence)) {
@ -282,40 +310,62 @@ if($settings->_enableFullSearch) {
 	$indexconf = null;
 }

-$controller = Controller::factory('AddDocument', array('dms'=>$dms, 'user'=>$user));
-$controller->setParam('documentsource', 'script');
-$controller->setParam('folder', $folder);
-$controller->setParam('index', $index);
-$controller->setParam('indexconf', $indexconf);
-$controller->setParam('name', $name);
-$controller->setParam('comment', $comment);
-$controller->setParam('expires', $expires);
-$controller->setParam('keywords', $keywords);
-$controller->setParam('categories', $categories);
-$controller->setParam('owner', $user);
-$controller->setParam('userfiletmp', $filetmp);
-$controller->setParam('userfilename', basename($filename));
-$controller->setParam('filetype', $filetype);
-$controller->setParam('userfiletype', $mimetype);
-$minmax = $folder->getDocumentsMinMax();
-if($settings->_defaultDocPosition == 'start')
-	$controller->setParam('sequence', $minmax['min'] - 1);
-else
-	$controller->setParam('sequence', $minmax['max'] + 1);
-$controller->setParam('reviewers', $reviewers);
-$controller->setParam('approvers', $approvers);
-$controller->setParam('reqversion', $reqversion);
-$controller->setParam('versioncomment', $version_comment);
-$controller->setParam('attributes', $document_attributes);
-$controller->setParam('attributesversion', $version_attributes);
-$controller->setParam('workflow', null);
-$controller->setParam('notificationgroups', array());
-$controller->setParam('notificationusers', array());
-$controller->setParam('maxsizeforfulltext', $settings->_maxSizeForFullText);
-$controller->setParam('defaultaccessdocs', $settings->_defaultAccessDocs);
+if($folder) {
+	$controller = Controller::factory('AddDocument', array('dms'=>$dms, 'user'=>$user));
+	$controller->setParam('documentsource', 'script');
+	$controller->setParam('folder', $folder);
+	$controller->setParam('index', $index);
+	$controller->setParam('indexconf', $indexconf);
+	$controller->setParam('name', $name);
+	$controller->setParam('comment', $comment);
+	$controller->setParam('expires', $expires);
+	$controller->setParam('keywords', $keywords);
+	$controller->setParam('categories', $categories);
+	$controller->setParam('owner', $user);
+	$controller->setParam('userfiletmp', $filetmp);
+	$controller->setParam('userfilename', basename($filename));
+	$controller->setParam('filetype', $filetype);
+	$controller->setParam('userfiletype', $mimetype);
+	$minmax = $folder->getDocumentsMinMax();
+	if($settings->_defaultDocPosition == 'start')
+		$controller->setParam('sequence', $minmax['min'] - 1);
+	else
+		$controller->setParam('sequence', $minmax['max'] + 1);
+	$controller->setParam('reviewers', $reviewers);
+	$controller->setParam('approvers', $approvers);
+	$controller->setParam('reqversion', $reqversion);
+	$controller->setParam('versioncomment', $version_comment);
+	$controller->setParam('attributes', $document_attributes);
+	$controller->setParam('attributesversion', $version_attributes);
+	$controller->setParam('workflow', null);
+	$controller->setParam('notificationgroups', array());
+	$controller->setParam('notificationusers', array());
+	$controller->setParam('maxsizeforfulltext', $settings->_maxSizeForFullText);
+	$controller->setParam('defaultaccessdocs', $settings->_defaultAccessDocs);

-if(!$document = $controller->run()) {
-	echo "Could not add document to folder\n";
-	exit(1);
+	if(!$document = $controller->run()) {
+		echo "Could not add document to folder\n";
+		exit(1);
+	}
+} elseif($document) {
+	$controller = Controller::factory('UpdateDocument', array('dms'=>$dms, 'user'=>$user));
+	$controller->setParam('folder', $document->getFolder());
+	$controller->setParam('document', $document);
+	$controller->setParam('index', $index);
+	$controller->setParam('indexconf', $indexconf);
+	$controller->setParam('comment', $comment);
+	$controller->setParam('userfiletmp', $filetmp);
+	$controller->setParam('userfilename', $filename);
+	$controller->setParam('filetype', $filetype);
+	$controller->setParam('userfiletype', $mimetype);
+	$controller->setParam('reviewers', $reviewers);
+	$controller->setParam('approvers', $approvers);
+	$controller->setParam('attributes', $version_attributes);
+	$controller->setParam('workflow', null);
+
+	if(!$content = $controller->run()) {
+		echo "Could not add version to document\n";
+		exit(1);
+	}
 }
 ?>
--- a/utils/createfolder.php
+++ b/utils/createfolder.php
@ -78,7 +78,7 @@ $db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostn
 //$db->_conn->debug = 1;

 $dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
-if(!$dms->checkVersion()) {
+if(!$settings->_doNotCheckDBVersion && !$dms->checkVersion()) {
 	echo "Database update needed.";
 	exit;
 }
--- a/utils/indexer.php
+++ b/utils/indexer.php
@ -4,20 +4,19 @@ if(isset($_SERVER['SEEDDMS_HOME'])) {
 } else {
 	require_once("../inc/inc.ClassSettings.php");
 }
-require("Log.php");

 function usage() { /* {{{ */
-	echo "Usage:\n";
-	echo "  seeddms-indexer [-h] [-v] [--config <file>]\n";
-	echo "\n";
-	echo "Description:\n";
-	echo "  This program recreates the full text index of SeedDMS.\n";
-	echo "\n";
-	echo "Options:\n";
-	echo "  -h, --help: print usage information and exit.\n";
-	echo "  -v, --version: print version and exit.\n";
-	echo "  -c: recreate index.\n";
-	echo "  --config: set alternative config file.\n";
+	echo "Usage:".PHP_EOL;
+	echo "  seeddms-indexer [-h] [-v] [--config <file>]".PHP_EOL;
+	echo "".PHP_EOL;
+	echo "Description:".PHP_EOL;
+	echo "  This program recreates the full text index of SeedDMS.".PHP_EOL;
+	echo "".PHP_EOL;
+	echo "Options:".PHP_EOL;
+	echo "  -h, --help: print usage information and exit.".PHP_EOL;
+	echo "  -v, --version: print version and exit.".PHP_EOL;
+	echo "  -c: recreate index.".PHP_EOL;
+	echo "  --config: set alternative config file.".PHP_EOL;
 } /* }}} */

 $version = "0.0.2";
@ -36,7 +35,7 @@ if(isset($options['h']) || isset($options['help'])) {

 /* Print version and exit */
 if(isset($options['v']) || isset($options['verѕion'])) {
-	echo $version."\n";
+	echo $version."".PHP_EOL;
 	exit(0);
 }

@ -60,6 +59,7 @@ if(isset($settings->_extraPath))
 require_once("inc/inc.Init.php");
 require_once("inc/inc.Extension.php");
 require_once("inc/inc.DBInit.php");
+require "vendor/autoload.php";

 if($settings->_fullSearchEngine == 'sqlitefts') {
 	$indexconf = array(
@ -80,8 +80,8 @@ if($settings->_fullSearchEngine == 'sqlitefts') {
 }

 function tree($dms, $index, $indexconf, $folder, $indent='') { /* {{{ */
-	global $settings;
-	echo $indent."D ".$folder->getName()."\n";
+	global $settings, $themes;
+	echo $themes->black($indent."D ".$folder->getName()).PHP_EOL;
 	$subfolders = $folder->getSubFolders();
 	foreach($subfolders as $subfolder) {
 		tree($dms, $index, $indexconf, $subfolder, $indent.'  ');
@ -101,9 +101,9 @@ function tree($dms, $index, $indexconf, $folder, $indent='') { /* {{{ */
 					}
 				}
 				$index->addDocument($idoc);
-				echo " (Document added)\n";
+				echo $themes->green(" (Document added)").PHP_EOL;
 			} catch(Exception $e) {
-				echo " (Timeout)\n";
+				echo $themes->error(" (Timeout)").PHP_EOL;
 			}
 		} else {
 			try {
@ -113,7 +113,7 @@ function tree($dms, $index, $indexconf, $folder, $indent='') { /* {{{ */
 			}
 			$content = $document->getLatestContent();
 			if($created > $content->getDate()) {
-				echo " (Document unchanged)\n";
+				echo $themes->italic(" (Document unchanged)").PHP_EOL;
 			} else {
 				$index->delete($hit->id);
 				try {
@ -126,21 +126,23 @@ function tree($dms, $index, $indexconf, $folder, $indent='') { /* {{{ */
 						}
 					}
 					$index->addDocument($idoc);
-					echo " (Document updated)\n";
+					echo $themes->green(" (Document updated)").PHP_EOL;
 				} catch(Exception $e) {
-					echo " (Timeout)\n";
+					echo $themes->error(" (Timeout)").PHP_EOL;
 				}
 			}
 		}
 	}
 } /* }}} */

+$themes = new \AlecRabbit\ConsoleColour\Themes();
+
 $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.\n";
+if(!$settings->_doNotCheckDBVersion && !$dms->checkVersion()) {
+	echo "Database update needed.".PHP_EOL;
 	exit(1);
 }

@ -151,7 +153,7 @@ if($recreate)
 else
 	$index = $indexconf['Indexer']::open($settings->_luceneDir);
 if(!$index) {
-	echo "Could not create index.\n";
+	echo "Could not create index.".PHP_EOL;
 	exit(1);
 }

--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@ -76,7 +76,7 @@ foreach($tasks as $task) {
 				if(!$task->getDisabled() && $task->isDue()) {
 					if($user = $dms->getUserByLogin('cli_scheduler')) {
 						if($mode == 'run') {
-							if($taskobj->execute($task, $dms, $user)) {
+							if($taskobj->execute($task, $dms, $user, $settings)) {
 								add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." successful.");
 								$task->updateLastNextRun();
 							} else {
--- a/utils/seeddms-adddoc
+++ b/utils/seeddms-adddoc
@ -1,8 +1,8 @@
 #!/usr/bin/env bash

 if [ -z "${SEEDDMS_HOME}" ]; then
-	echo 'Please set $SEEDDMS_HOME before running this script'
-	exit 1
+	parentdir=$(dirname "$0")
+	export SEEDDMS_HOME=$(dirname "$parentdir")
 fi

 exec php -f "${SEEDDMS_HOME}/utils/adddoc.php" -- "${@}"
--- a/utils/seeddms-indexer
+++ b/utils/seeddms-indexer
@ -1,8 +1,8 @@
 #!/usr/bin/env bash

 if [ -z "${SEEDDMS_HOME}" ]; then
-	echo 'Please set $SEEDDMS_HOME before running this script'
-	exit 1
+	parentdir=$(dirname "$0")
+	export SEEDDMS_HOME=$(dirname "$parentdir")
 fi

 exec php -f "${SEEDDMS_HOME}/utils/indexer.php" -- "${@}"
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@ -879,10 +879,12 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			$menuitems['backup_log_management']['children'][] = array('link'=>"../out/out.LogManagement.php", 'label'=>'log_management');
 		}

-		if($accessobject->check_view_access(array('Statistic', 'Charts', 'Timeline', 'ObjectCheck', 'ExtensionMgr', 'Info'))) {
+		if($accessobject->check_view_access(array('ImportFS', 'ImportUsers', 'Statistic', 'Charts', 'Timeline', 'ObjectCheck', 'ExtensionMgr', 'Info'))) {
 		$menuitems['misc'] = array('link'=>"#", 'label'=>'misc');
 		if ($accessobject->check_view_access('ImportFS'))
 		$menuitems['misc']['children']['import_fs'] = array('link'=>"../out/out.ImportFS.php", 'label'=>'import_fs');
+		if ($accessobject->check_view_access('ImportUsers'))
+		$menuitems['misc']['children']['import_users'] = array('link'=>"../out/out.ImportUsers.php", 'label'=>'import_users');
 		if ($accessobject->check_view_access('Statistic'))
 		$menuitems['misc']['children']['folders_and_documents_statistic'] = array('link'=>"../out/out.Statistic.php", 'label'=>'folders_and_documents_statistic');
 		if ($accessobject->check_view_access('Charts'))
@ -1878,7 +1880,7 @@ $(document).ready(function() {
 	 * @param boolean $partialtree set to true if the given folder is the start folder
 	 */
 	function printNewTreeNavigationJs($folderid=0, $accessmode=M_READ, $showdocs=0, $formid='form1', $expandtree=0, $orderby='', $partialtree=false) { /* {{{ */
-		function jqtree($obj, $path, $folder, $user, $accessmode, $showdocs=1, $expandtree=0, $orderby='', $level=0) {
+		function jqtree($obj, $path, $folder, $user, $accessmode, $showdocs=1, $expandtree=0, $orderby='', $level=0) { /* {{{ */
 			$orderdir = (isset($orderby[1]) ? ($orderby[1] == 'd' ? 'desc' : 'asc') : 'asc');
 			if($path/* || $expandtree>=$level*/) {
 				if($path)
@ -1891,7 +1893,7 @@ $(document).ready(function() {
 					$subfolders = array($pathfolder);
 				}
 				foreach($subfolders as $subfolder) {
-					$node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>(0 && ($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs))) ? true : false, 'is_folder'=>true);
+					$node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>(1 && ($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs))) ? true : false, 'is_folder'=>true);
 					if(/*$expandtree>=$level ||*/ $pathfolder->getID() == $subfolder->getID()) {
 						$node['children'] = jqtree($obj, $path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1);
 						if($showdocs) {
@ -1919,7 +1921,7 @@ $(document).ready(function() {
 				return $children;
 			}
 			return array();
-		}
+		} /* }}} */

 		$orderdir = (isset($orderby[1]) ? ($orderby[1] == 'd' ? 'desc' : 'asc') : 'asc');
 		if($folderid) {
@ -1963,7 +1965,7 @@ var data = <?php echo json_encode($tree); ?>;
 $(function() {
 	const $tree = $('#jqtree<?php echo $formid ?>');
 	$tree.tree({
-//		saveState: true,
+//		saveState: false,
 		selectable: true,
 		data: data,
 		saveState: 'jqtree<?php echo $formid; ?>',
@ -1986,7 +1988,7 @@ $(function() {
    }
 	});
 	// Unfold node for currently selected folder
-	$('#jqtree<?php echo $formid ?>').tree('selectNode', $('#jqtree<?php echo $formid ?>').tree('getNodeById', <?php echo $folderid ?>), false);
+	$('#jqtree<?php echo $formid ?>').tree('selectNode', $('#jqtree<?php echo $formid ?>').tree('getNodeById', <?php echo $folderid ?>), false, true);
  $('#jqtree<?php echo $formid ?>').on(
 		'tree.click',
 		function(event) {
--- a/views/bootstrap/class.ExpiredDocuments.php
+++ b/views/bootstrap/class.ExpiredDocuments.php
@ -36,14 +36,29 @@ require_once("SeedDMS/Preview.php");
 */
 class SeedDMS_View_ExpiredDocuments extends SeedDMS_Bootstrap_Style {

+	function js() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+
+		header('Content-Type: application/javascript');
+		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
+		$this->printDeleteDocumentButtonJs();
+		/* Add js for catching click on document in one page mode */
+		$this->printClickDocumentJs();
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
+		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
+		$order = $orderby.$orderdir;
+
+		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');

 		$db = $dms->getDB();
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
@ -54,45 +69,30 @@ class SeedDMS_View_ExpiredDocuments extends SeedDMS_Bootstrap_Style {
 		$this->pageNavigation(getMLText("expired_documents"), "admin_tools");

 		$this->contentHeading(getMLText("expired_documents"));
-		$this->contentContainerStart();
+//		$this->contentContainerStart();

-		if($docs = $dms->getDocumentsExpired(-1400)) {
+		if($docs = $dms->getDocumentsExpired(-1400, null, $orderby, $orderdir, true)) {

 			print "<table class=\"table table-condensed\">";
 			print "<thead>\n<tr>\n";
 			print "<th></th>";
-			print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=n\">".getMLText("name")."</a></th>\n";
-			print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=s\">".getMLText("status")."</a></th>\n";
-			print "<th>".getMLText("version")."</th>\n";
-//				print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=u\">".getMLText("last_update")."</a></th>\n";
-			print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=e\">".getMLText("expires")."</a></th>\n";
+			print "<th>".getMLText("name");
+			print " <a href=\"../out/out.ExpiredDocuments.php?".($order=="na"?"&orderby=n&orderdir=d":"&orderby=n&orderdir=a")."\" \"title=\"".getMLText("sort_by_name")."\">".($order=="na"?' <i class="icon-sort-by-alphabet selected"></i>':($order=="nd"?' <i class="icon-sort-by-alphabet-alt selected"></i>':' <i class="icon-sort-by-alphabet"></i>'))."</a>";
+			print " <a href=\"../out/out.ExpiredDocuments.php?".($order=="ea"?"&orderby=e&orderdir=d":"&orderby=e&orderdir=a")."\" \"title=\"".getMLText("sort_by_expiration_date")."\">".($order=="ea"?' <i class="icon-sort-by-order selected"></i>':($order=="ed"?' <i class="icon-sort-by-order-alt selected"></i>':' <i class="icon-sort-by-order"></i>'))."</a>";
+			print "</th>\n";
+			print "<th>".getMLText("status")."</th>\n";
+			print "<th>".getMLText("action")."</th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";

 			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
 			foreach ($docs as $document) {
-				print "<tr>\n";
-				$latestContent = $document->getLatestContent();
-				$previewer->createPreview($latestContent);
-				print "<td><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."\">";
-				if($previewer->hasPreview($latestContent)) {
-					print "<img class=\"mimeicon\" width=\"".$previewwidth."\" src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-				} else {
-					print "<img class=\"mimeicon\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-				}
-				print "</a></td>";
-				print "<td><a href=\"out.ViewDocument.php?documentid=".$document->getID()."\">" . htmlspecialchars($document->getName()) . "</a></td>\n";
-				$status = $latestContent->getStatus();
-				print "<td>".getOverallStatusText($status["status"])."</td>";
-				print "<td>".$latestContent->getVersion()."</td>";
-//					print "<td>".$status["statusDate"]." ". htmlspecialchars($status["statusName"])."</td>";
-				print "<td>".(!$document->getExpires() ? "-":getReadableDate($document->getExpires()))."</td>";				
-				print "</tr>\n";
+				echo $this->documentListRow($document, $previewer);
 			}
 			print "</tbody></table>";
 		}
-		else printMLText("empty_notify_list");
+		else $this->infoMsg("no_docs_expired");
 		
-		$this->contentContainerEnd();
+//		$this->contentContainerEnd();

 		$this->contentEnd();
 		$this->htmlEndPage();
--- a/views/bootstrap/class.ImportUsers.php
+++ b/views/bootstrap/class.ImportUsers.php
@ -0,0 +1,74 @@
+<?php
+/**
+ * Implementation of ImportUsers view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for ImportUsers view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_ImportUsers extends SeedDMS_Bootstrap_Style {
+
+	function js() { /* {{{ */
+		$this->printFileChooserJs();
+		header('Content-Type: application/javascript');
+
+	} /* }}} */
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+
+		$this->htmlStartPage(getMLText("import_users"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
+
+		$this->contentHeading(getMLText("import_users"));
+
+		$this->contentContainerStart();
+		print "<form class=\"form-horizontal\" action=\"../op/op.ImportUsers.php\" name=\"form1\" enctype=\"multipart/form-data\" method=\"post\">";
+		$this->formField(
+			getMLText("userdata_file"),
+			$this->getFileChooserHtml('userdata', false)
+		);
+		$this->formField(
+			getMLText("import_users_update"),
+			array(
+				'element'=>'input',
+				'type'=>'checkbox',
+				'name'=>'update',
+				'value'=>'1'
+			)
+		);
+		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('import'));
+		print "</form>\n";
+		$this->contentContainerEnd();
+
+		$this->contentEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@ -287,8 +287,7 @@ $(document).ready( function() {
 		echo "<table class=\"table _table-condensed\">\n";
 		print "<thead>\n<tr>\n";
 		print "<th>".getMLText('scheduler_class')."</th>\n";	
-		print "<th>".getMLText('task_name')."</th>\n";	
-		print "<th>".getMLText('task_description')."</th>\n";	
+		print "<th>".getMLText('task_name')."/".getMLText('task_description')."</th>\n";	
 		print "<th>".getMLText('task_frequency')."</th>\n";	
 		print "<th>".getMLText('task_next_run')."</th>\n";	
 		print "<th>".getMLText('task_last_run')."</th>\n";	
@ -303,10 +302,8 @@ $(document).ready( function() {
 			echo "<td>";
 			echo $task->getExtension()."::".$task->getTask();
 			echo "</td>";
-			echo "<td>";
-			echo $task->getName();
-			echo "</td>";
 			echo "<td width=\"100%\">";
+			echo "<strong>".$task->getName()."</strong></br>";
 			echo $task->getDescription();
 			echo "</td>";
 			echo "<td>";
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@ -428,7 +428,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					$this->contentHeading(getMLText("preview"));
 ?>
 			<video controls style="width: 100%;">
-			<source  src="../op/op.ViewOnline.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" type="video/mp4">
+			<source  src="../op/op.ViewOnline.php?documentid=<?php echo $latestContent->getDocument()->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" type="video/mp4">
 			</video>
 <?php
 					break;
@ -445,7 +445,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				case 'image/gif':
 					$this->contentHeading(getMLText("preview"));
 ?>
-			<img src="../op/op.ViewOnline.php?documentid=<?php echo $latestContent->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" width="100%">
+			<img src="../op/op.ViewOnline.php?documentid=<?php echo $latestContent->getDocument()->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" width="100%">
 <?php
 					break;
 				default:
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@ -459,9 +459,13 @@ $('body').on('click', '.order-btn', function(ev) {
 		$folder = $this->params['folder'];

 		$this->contentHeading(getMLText("dropupload"), true);
+		if ($folder->getAccessMode($user) >= M_READWRITE) {
 ?>
 <div id="dragandrophandler" class="well alert" data-droptarget="folder_<?php echo $folder->getID(); ?>" data-target="<?php echo $folder->getID(); ?>" data-uploadformtoken="<?php echo createFormKey(''); ?>"><?php printMLText('drop_files_here'); ?></div>
 <?php
+		} else {
+			$this->errorMsg(getMLText('access_denied'));
+		}
 	} /* }}} */

 	function entries() { /* {{{ */
@ -613,7 +617,7 @@ $('body').on('click', '.order-btn', function(ev) {
 		}
 		echo "<div class=\"span".$RightColumnSpan."\">\n";

-		if ($enableDropUpload && $folder->getAccessMode($user) >= M_READWRITE) {
+		if ($enableDropUpload/* && $folder->getAccessMode($user) >= M_READWRITE*/) {
 			echo "<div class=\"row-fluid\">";
 			echo "<div class=\"span8\">";
 		}
@ -622,7 +626,7 @@ $('body').on('click', '.order-btn', function(ev) {
 ?>
 	<div class="ajax" data-view="ViewFolder" data-action="folderInfos" data-no-spinner="true" <?php echo ($folder ? "data-query=\"folderid=".$folder->getID()."\"" : "") ?>></div>
 <?php
-		if ($enableDropUpload && $folder->getAccessMode($user) >= M_READWRITE) {
+		if ($enableDropUpload/* && $folder->getAccessMode($user) >= M_READWRITE*/) {
 			echo "</div>";
 			echo "<div class=\"span4\">";
 //			$this->dropUpload();