From d15f742a4660cd350572969ac4c855d01b9621c4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 14 Aug 2020 08:48:09 +0200
Subject: [PATCH 001/312] sort versions of extension propperly

---
 CHANGELOG                     | 1 +
 inc/inc.ClassExtensionMgr.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 55a100361..a1114218d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
 - better import of users from csv file
 - fix various methods in restapi (Closes: #481)
 - add hooks showDocumentKeywords and showDocumentCategories
+- sort versions of extension in extension manager propperly
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.18
diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index b65cec291..e6bb58466 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -570,6 +570,7 @@ class SeedDMS_Extension_Mgr {
 				}
 			}
 		}
+		uksort($result, function($a, $b){return version_compare($b, $a);});
 		return $result;
 	} /* }}} */
 

From 4a3b7ebe7141ae22d466faafba7ea1cf319b0fd8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 14 Aug 2020 11:11:12 +0200
Subject: [PATCH 002/312] use SeedDMS_Extension_Mgr::cmpVersion() for sorting
 extensions

---
 inc/inc.ClassExtensionMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index e6bb58466..10917adc8 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -570,7 +570,7 @@ class SeedDMS_Extension_Mgr {
 				}
 			}
 		}
-		uksort($result, function($a, $b){return version_compare($b, $a);});
+		uksort($result, function($a, $b){return SeedDMS_Extension_Mgr::cmpVersion($b, $a);});
 		return $result;
 	} /* }}} */
 

From 65c1bccf82631553b2a32812484d3d27c0051387 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 14 Aug 2020 11:11:40 +0200
Subject: [PATCH 003/312] show latest changelog of uninstalled extensions

---
 views/bootstrap/class.ExtensionMgr.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index c67ab8ae4..e9ace2b88 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -94,7 +94,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 		$this->printFileChooserJs();
 	} /* }}} */
 
-	function info() { /* {{{ */
+	function info_versions() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$extmgr = $this->params['extmgr'];
@@ -140,6 +140,19 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 		echo "</tbody></table>\n";
 	} /* }}} */
 
+	function info_changelog() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$extmgr = $this->params['extmgr'];
+		$extname = $this->params['extname'];
+		$extconf = $extmgr->getExtensionConfiguration();
+
+		$list = $extmgr->getExtensionListByName($extname);
+		/* Just show the changelog of the latest version */
+		$re = array_shift($list);
+		echo '<div style="white-space: pre-wrap; font-family: monospace; padding: 0px;">'.$re['changelog']."</div>";
+	} /* }}} */
+
 	function changelog() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -314,7 +327,8 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			echo "<td nowrap>".$re['author']['name']."<br /><small>".$re['author']['company']."</small></td>";
 			echo "<td nowrap>";
 			echo "<div class=\"list-action\">";
-			echo "<a data-target=\"#extensionInfo\" href=\"../out/out.ExtensionMgr.php?action=info&extensionname=".$re['name']."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_version_list')."\"><i class=\"icon-list-ol\"></i></a>\n";
+			echo "<a data-target=\"#extensionInfo\" href=\"../out/out.ExtensionMgr.php?action=info_versions&extensionname=".$re['name']."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_version_list')."\"><i class=\"icon-list-ol\"></i></a>\n";
+			echo "<a data-target=\"#extensionChangelog\" href=\"../out/out.ExtensionMgr.php?action=info_changelog&extensionname=".$re['name']."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_changelog')."\"><i class=\"icon-reorder\"></i></a>\n";
 			if(!$checkmsgs && $extmgr->isWritableExtDir())
 				echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$re['name']."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"currenttab\" value=\"repository\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$re['name']."\" title=\"".getMLText('import_extension')."\"><i class=\"icon-download\"></i></a></form>";
 			echo "</div>";

From 395afcbcd485d0f4d967c4b879bbed26f8b37440 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 Aug 2020 11:49:48 +0200
Subject: [PATCH 004/312] run help of config var through htmlspecialchars()

---
 views/bootstrap/class.Settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 931fecdfe..e581ce8b1 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -124,7 +124,7 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style {
 	protected function showConfigPlain($title, $title_desc, $rawdata) { /* {{{ */
 		$settings = $this->params['settings'];
 ?>
-      <tr title="<?= $title_desc ?>">
+      <tr title="<?= htmlspecialchars($title_desc) ?>">
 				<td><?= $title ?>:</td>
 				<td><?= $rawdata ?></td>
 			</tr>

From eb4d97c8a5ebf4f06bf51a98c3851f22ac624410 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 Aug 2020 11:50:56 +0200
Subject: [PATCH 005/312] add item for 5.1.19

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index a1114218d..626fcb321 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@
 - fix various methods in restapi (Closes: #481)
 - add hooks showDocumentKeywords and showDocumentCategories
 - sort versions of extension in extension manager propperly
+- fix output of help text for config vars in extension
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.18

From 1726d1f1f27b64eb604e8093d07155d6013dc644 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 Aug 2020 13:21:51 +0200
Subject: [PATCH 006/312] configuring a user id in the settings uses a list of
 existing users

---
 CHANGELOG                          |  1 +
 op/op.Settings.php                 |  2 +-
 views/bootstrap/class.Settings.php | 35 +++++++++++++++++++++++++++---
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 626fcb321..7306fe042 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@
 - add hooks showDocumentKeywords and showDocumentCategories
 - sort versions of extension in extension manager propperly
 - fix output of help text for config vars in extension
+- configuring a user id in the settings uses a list of existing users
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.18
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 2c1c9a463..b84c86b6a 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -151,7 +151,7 @@ if ($action == "saveSettings")
   $settings->_loginFailure = intval($_POST["loginFailure"]);
   $settings->_autoLoginUser = intval($_POST["autoLoginUser"]);
   $settings->_quota = intval($_POST["quota"]);
-  $settings->_undelUserIds = strval($_POST["undelUserIds"]);
+  $settings->_undelUserIds = is_array($_POST["undelUserIds"]) ? implode(',', $_POST["undelUserIds"]) : strval($_POST["undelUserIds"]);
   $settings->_encryptionKey = strval($_POST["encryptionKey"]);
   $settings->_cookieLifetime = intval($_POST["cookieLifetime"]);
   $settings->_defaultAccessDocs = intval($_POST["defaultAccessDocs"]);
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index e581ce8b1..9333c8c52 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -175,6 +175,34 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style {
 <?php
 	} /* }}} */
 
+	protected function showConfigUser($title, $name, $allowempty=false, $multiple=false, $size=0) { /* {{{ */
+		$settings = $this->params['settings'];
+		$dms = $this->params['dms'];
+?>
+      <tr title="<?= getMLText($title."_desc") ?>">
+        <td><?= getMLText($title) ?>:</td>
+				<td>
+<?php
+		$users = $dms->getAllUsers();
+		if($users) {
+			$selections = explode(',', $settings->{"_".$name});
+			echo "<select class=\"chzn-select\"".($allowempty ? " data-allow-clear=\"true\"" : "")."\" name=\"".$name.($multiple ? "[]" : "")."\"".($multiple ? "  multiple" : "").($size ? "  size=\"".$size."\"" : "")." data-placeholder=\"".getMLText("select_user")."\">";
+			if($allowempty)
+				echo "<option value=\"\"></option>";
+			foreach($users as $curuser) {
+				echo "<option value=\"".$curuser->getID()."\"";
+				if(in_array($curuser->getID(), $selections))
+					echo " selected";
+				echo ">".htmlspecialchars($curuser->getLogin()." - ".$curuser->getFullName())."</option>";
+			}
+			echo "</select>";
+		}
+?>
+				</td>
+			</tr>
+<?php
+	} /* }}} */
+
 	function js() { /* {{{ */
 		$extmgr = $this->params['extmgr'];
 
@@ -374,7 +402,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
 <?php $this->showConfigText('settings_loginFailure', 'loginFailure'); ?>
 <?php $this->showConfigText('settings_autoLoginUser', 'autoLoginUser'); ?>
 <?php $this->showConfigText('settings_quota', 'quota'); ?>
-<?php $this->showConfigText('settings_undelUserIds', 'undelUserIds'); ?>
+<?php $this->showConfigUser('settings_undelUserIds', 'undelUserIds', true, true); ?>
 <?php $this->showConfigText('settings_encryptionKey', 'encryptionKey'); ?>
 <?php $this->showConfigText('settings_cookieLifetime', 'cookieLifetime'); ?>
 <?php $this->showConfigOption('settings_defaultAccessDocs', 'defaultAccessDocs', array(' 0'=>'inherited', ' '.M_NONE=>'access_mode_none', ' '.M_READ=>'access_mode_read', ' '.M_READWRITE=>'access_mode_readwrite'), false, true); ?>
@@ -419,10 +447,11 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
         -- SETTINGS - ADVANCED - AUTHENTICATION
       -->
 <?php $this->showConfigHeadline('settings_Authentication'); ?>
-<?php $this->showConfigText('settings_guestID', 'guestID'); ?>
+<?php $this->showConfigUser('settings_guestID', 'guestID', true); ?>
 <?php $this->showConfigText('settings_adminIP', 'adminIP'); ?>
 <?php $this->showConfigText('settings_apiKey', 'apiKey'); ?>
-<?php $this->showConfigText('settings_apiUserId', 'apiUserId'); ?>
+<?php //$this->showConfigText('settings_apiUserId', 'apiUserId'); ?>
+<?php $this->showConfigUser('settings_apiUserId', 'apiUserId', true); ?>
 <?php $this->showConfigText('settings_apiOrigin', 'apiOrigin'); ?>
 
       <!--

From d4ae4eed24e4d156c099fb48704f48f35eb0fa18 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 Aug 2020 14:18:01 +0200
Subject: [PATCH 007/312] use user selection for auto login

---
 views/bootstrap/class.Settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 9333c8c52..88f1ed3cf 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -400,7 +400,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
 <?php $this->showConfigText('settings_passwordExpiration', 'passwordExpiration'); ?>
 <?php $this->showConfigText('settings_passwordHistory', 'passwordHistory'); ?>
 <?php $this->showConfigText('settings_loginFailure', 'loginFailure'); ?>
-<?php $this->showConfigText('settings_autoLoginUser', 'autoLoginUser'); ?>
+<?php $this->showConfigUser('settings_autoLoginUser', 'autoLoginUser', true); ?>
 <?php $this->showConfigText('settings_quota', 'quota'); ?>
 <?php $this->showConfigUser('settings_undelUserIds', 'undelUserIds', true, true); ?>
 <?php $this->showConfigText('settings_encryptionKey', 'encryptionKey'); ?>

From 665160199504dc5608b856b96127991be00472b9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 20 Aug 2020 19:58:20 +0200
Subject: [PATCH 008/312] add help to form field, formSubmit can output several
 buttons

---
 views/bootstrap/class.Bootstrap.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 7f7af3277..bff5b6592 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -895,7 +895,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	function formField($title, $value, $params=array()) { /* {{{ */
 		if($title !== null) {
 			echo "<div class=\"control-group\">";
-			echo "	<label class=\"control-label\">".$title.":</label>";
+			echo "	<label class=\"control-label\"".(!empty($params['help']) ? " title=\"".$params['help']."\"" : "").">".$title.":</label>";
 			echo "	<div class=\"controls\">";
 		}
 		if(isset($params['field_wrap'][0]))
@@ -962,7 +962,14 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 	function formSubmit($value, $name='') { /* {{{ */
 		echo "<div class=\"controls\">\n";
-		echo "<button type=\"submit\" class=\"btn btn-primary\"".($name ? ' name="'.$name.'" id="'.$name.'"' : '').">".$value."</button>\n";
+		if(is_string($value)) {
+			echo "<button type=\"submit\" class=\"btn btn-primary\"".($name ? ' name="'.$name.'" id="'.$name.'"' : '').">".$value."</button>\n";
+		} else {
+			if(is_array($value)) {
+				foreach($value as $i=>$v)
+					echo "<button type=\"submit\" class=\"btn btn-primary\"".(!empty($name[$i]) ? ' name="'.$name[$i].'" id="'.$name[$i].'"' : '').">".$v."</button>\n";
+			}
+		}
 		echo "</div>\n";
 	} /* }}} */
 

From eebc1de5aaa872d7e716a063d74a5d4c7e162fa1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Aug 2020 08:00:50 +0200
Subject: [PATCH 009/312] add note for 5.1.19

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 7306fe042..f0753247a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@
 - sort versions of extension in extension manager propperly
 - fix output of help text for config vars in extension
 - configuring a user id in the settings uses a list of existing users
+- form elements can have a help text
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.18

From 991268a18b50c8bdca89d136496cd1a88b2e09c2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Aug 2020 10:03:22 +0200
Subject: [PATCH 010/312] put ClearCache into controller, add hooks when
 clearing the cache

---
 controllers/class.ClearCache.php     | 51 ++++++++++++++++++++++++++++
 op/op.ClearCache.php                 | 19 ++++-------
 views/bootstrap/class.ClearCache.php |  7 ++++
 3 files changed, 64 insertions(+), 13 deletions(-)
 create mode 100644 controllers/class.ClearCache.php

diff --git a/controllers/class.ClearCache.php b/controllers/class.ClearCache.php
new file mode 100644
index 000000000..770abcdea
--- /dev/null
+++ b/controllers/class.ClearCache.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Implementation of ClearCache controller
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class which does the busines logic for clearing the cache
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Controller_ClearCache extends SeedDMS_Controller_Common {
+
+	public function run() {
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$settings = $this->params['settings'];
+		$post = $this->params['post'];
+
+		$ret = '';
+		if(!empty($post['preview'])) {
+			$cmd = 'rm -rf '.$settings->_cacheDir.'/[1-9]*';
+			system($cmd, $ret);
+		}
+
+		if(!empty($post['js'])) {
+			$cmd = 'rm -rf '.$settings->_cacheDir.'/js/*';
+			system($cmd, $ret);
+		}
+
+		if(false === $this->callHook('clear', $post)) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_clear_failed';
+			return false;
+		}
+
+		return true;
+	}
+}
+
diff --git a/op/op.ClearCache.php b/op/op.ClearCache.php
index 921bb713f..77dfcb2ed 100644
--- a/op/op.ClearCache.php
+++ b/op/op.ClearCache.php
@@ -24,8 +24,12 @@ include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
+
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('clearcache')) {
 	UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
@@ -38,19 +42,8 @@ if(!is_dir($settings->_cacheDir)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("error_cleared_cache"));
 }
 
-if(!empty($_POST['preview'])) {
-	$cmd = 'rm -rf '.$settings->_cacheDir.'/[1-9]*';
-	$ret = null;
-	system($cmd, $ret);
-}
-
-if(!empty($_POST['js'])) {
-	$cmd = 'rm -rf '.$settings->_cacheDir.'/js/*';
-	$ret = null;
-	system($cmd, $ret);
-}
-
-if($ret)
+$controller->setParam('post', $_POST);
+if(!$controller->run())
 	$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('error_cleared_cache')));
 else
 	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_cleared_cache')));
diff --git a/views/bootstrap/class.ClearCache.php b/views/bootstrap/class.ClearCache.php
index 1d562d507..c925c04a9 100644
--- a/views/bootstrap/class.ClearCache.php
+++ b/views/bootstrap/class.ClearCache.php
@@ -54,6 +54,13 @@ class SeedDMS_View_ClearCache extends SeedDMS_Bootstrap_Style {
 </p>
 <p>
 <input type="checkbox" name="js" value="1" checked> <?php printMLText('temp_jscode'); ?>
+<?php
+		$addcache = array();
+		if($addcache =  $this->callHook('additionalCache', $addcache)) {
+			foreach($addcache as $c)
+				echo "<p><input type=\"checkbox\" name=\"".$c[0]."\" value=\"1\" checked> ".$c[1]."</p>";
+		}
+?>
 <p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("clear_cache");?></button></p>
 </form>
 <?php

From 990621ae99b3b98888b20050f66b757e233fef2b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Aug 2020 12:34:35 +0200
Subject: [PATCH 011/312] invalidate list of versions after removing a version

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 11 +++++++++++
 SeedDMS_Core/package.xml                |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 054be2674..00e7c24fa 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -1745,6 +1745,10 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			foreach ($resArr as $row) {
 				/** @var SeedDMS_Core_DocumentContent $content */
 				$content = new $classname($row["id"], $this, $row["version"], $row["comment"], $row["date"], $row["createdBy"], $row["dir"], $row["orgFileName"], $row["fileType"], $row["mimeType"], $row['fileSize'], $row['checksum']);
+				/* TODO: Better use content id as key in $this->_content. This
+				 * would allow to remove a single content object in removeContent().
+				 * Currently removeContent() must clear $this->_content completely
+				 */
 				if($user) {
 					if($content->getAccessMode($user) >= M_READ)
 						array_push($this->_content, $content);
@@ -2018,6 +2022,13 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 		}
 
+		/* Invalidate the content list and the latest content of this document,
+		 * otherwise getContent() and getLatestContent()
+		 * will still return the content just deleted.
+		 */
+		$this->_latestContent = null;
+		$this->_content = null;
+
 		/* Check if 'onPostRemoveDocument' callback is set */
 		if(isset($this->_dms->callbacks['onPostRemoveContent'])) {
 			foreach($this->_dms->callbacks['onPostRemoveContent'] as $callback) {
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index f5d232221..ced81b2e8 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -25,6 +25,8 @@
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
 - add method SeedDMS_Core_Document::setParent() as an alias for setFolder()
+- clear the save content list and latest content in SeedDMS_Core_Document after
+  a version has been deleted.
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From ad8a501506316a4d41d2fee8256f05ac45a36de5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Aug 2020 12:35:06 +0200
Subject: [PATCH 012/312] go to right url after deleting a document version

---
 CHANGELOG               |  4 ++++
 op/op.RemoveVersion.php | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index f0753247a..b87a61800 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,10 @@
 - fix output of help text for config vars in extension
 - configuring a user id in the settings uses a list of existing users
 - form elements can have a help text
+- open the right page or tab after a document version has been removed
+  (go to folder page if the whole document was removed, go to previous tab
+  if an old version was removed and there are other older version, otherwise
+  to to current tab)
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.18
diff --git a/op/op.RemoveVersion.php b/op/op.RemoveVersion.php
index 41ce8d429..d3f2eac94 100644
--- a/op/op.RemoveVersion.php
+++ b/op/op.RemoveVersion.php
@@ -63,6 +63,8 @@ if (!is_object($version)) {
 
 require_once("SeedDMS/Preview.php");
 $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
+$folder = $document->getFolder();
+/* Check if there is just one version. In that case remove the document */
 if (count($document->getContent())==1) {
 	$previewer->deleteDocumentPreviews($document);
 	$nl = $document->getNotifyList();
@@ -70,6 +72,7 @@ if (count($document->getContent())==1) {
 	if (!$document->remove()) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 	} else {
+		$nexturl = "../out/out.ViewFolder.php?folderid=".$folder->getId();
 		/* Remove the document from the fulltext index */
 		if($settings->_enableFullSearch) {
 			$index = $indexconf['Indexer']::open($settings->_luceneDir);
@@ -127,9 +130,17 @@ else {
 
 	$previewer->deletePreview($version, $settings->_previewWidthDetail);
 	$previewer->deletePreview($version, $settings->_previewWidthList);
+	/* Check if the version to be delete is the latest version. This is
+	 * later used to set the redirect url.
+	 */
+	$islatest = $version->getVersion() == $document->getLatestContent()->getVersion();
 	if (!$document->removeContent($version)) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 	} else {
+		if($islatest || count($document->getContent()) == 1)
+			$nexturl = "../out/out.ViewDocument.php?documentid=".$documentid;
+		else
+			$nexturl = "../out/out.ViewDocument.php?documentid=".$documentid."&currenttab=previous";
 		/* Remove the document from the fulltext index and reindex latest version */
 		if($settings->_enableFullSearch) {
 			$index = $indexconf['Indexer']::open($settings->_luceneDir);
@@ -183,6 +194,6 @@ else {
 
 add_log_line("?documentid=".$documentid."&version".$version_num);
 
-header("Location:../out/out.ViewDocument.php?documentid=".$documentid."&currenttab=previous");
+header("Location:".$nexturl);
 
 ?>

From b083ebb40e4da6118c19ee04694ac0696503df82 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Aug 2020 13:19:22 +0200
Subject: [PATCH 013/312] add new method
 SeedDMS_Core_Document::isLatestContent()

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 11 +++++++++++
 SeedDMS_Core/package.xml                |  1 +
 2 files changed, 12 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 00e7c24fa..8ad2040a2 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -1806,6 +1806,17 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		}
 	} /* }}} */
 
+	/**
+	 * Check if a given version is the latest version of the document
+	 *
+	 * @param integer $version version number of content element
+	 * @return SeedDMS_Core_DocumentContent|boolean object of class {@link SeedDMS_Core_DocumentContent}
+	 * or false
+	 */
+	function isLatestContent($version) { /* {{{ */
+		return $this->getLatestContent()->getVersion() == $version;
+	} /* }}} */
+
 	/**
 	 * @return bool|null|SeedDMS_Core_DocumentContent
 	 */
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index ced81b2e8..724ee1371 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -27,6 +27,7 @@
 - add method SeedDMS_Core_Document::setParent() as an alias for setFolder()
 - clear the save content list and latest content in SeedDMS_Core_Document after
   a version has been deleted.
+- new method SeedDMS_Core_Document::isLatestVersion()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 2372cb8d09bae5e4a03dac6341e1e8eb55fbbf9f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Aug 2020 13:20:07 +0200
Subject: [PATCH 014/312] no need to pass parameter to hook additionalCache

---
 views/bootstrap/class.ClearCache.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ClearCache.php b/views/bootstrap/class.ClearCache.php
index c925c04a9..91c8f4cd7 100644
--- a/views/bootstrap/class.ClearCache.php
+++ b/views/bootstrap/class.ClearCache.php
@@ -56,7 +56,7 @@ class SeedDMS_View_ClearCache extends SeedDMS_Bootstrap_Style {
 <input type="checkbox" name="js" value="1" checked> <?php printMLText('temp_jscode'); ?>
 <?php
 		$addcache = array();
-		if($addcache =  $this->callHook('additionalCache', $addcache)) {
+		if($addcache = $this->callHook('additionalCache')) {
 			foreach($addcache as $c)
 				echo "<p><input type=\"checkbox\" name=\"".$c[0]."\" value=\"1\" checked> ".$c[1]."</p>";
 		}

From f1904ed7e412099824911d5ad2d043ee9e944548 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 24 Aug 2020 12:52:23 +0200
Subject: [PATCH 015/312] add section on how to use cadave with seeddms

---
 doc/README.WebDAV | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/doc/README.WebDAV b/doc/README.WebDAV
index 12670a283..0f66f8318 100644
--- a/doc/README.WebDAV
+++ b/doc/README.WebDAV
@@ -53,7 +53,7 @@ and possibly add your login data to /etc/davfs2/secrets
 Making applications work with WebDAV
 =====================================
 
-Various programms have differnt strategies to save files to disk and
+Various programms have differnt strategies to save files to disc and
 prevent data lost under all circumstances. Those strategies often don't
 work very well an a WebDAV-Server. The following will list some of those
 strategies.
@@ -91,3 +91,39 @@ set noswapfile
 Creating the backup file in a directory outside of WebDAV doesn't help in
 this case, because it still does the file renaming which is turned of by
 'nowritebackup'.
+
+cdaver
+========
+
+cadaver is a webdav client similar to classical command line based ftp clients.
+It can be used to browse through the folders, downloads and uploads files, and
+also for removing and moving folders and documents (called resources in webdav terminilogy).
+It's also capable of setting and getting properties of folders and documents.
+If webdav access isn't working, this client is probably the best for testing.
+
+Just run
+
+cadaver https://<your-domain>/<your-basedir>/webdav/index.php
+
+It will ask for the user name and password. Once you are logged in just
+type `help` for a list of commands.
+
+SeedDMS stores a lot more properties not covered by the webdav standard.
+Those have its own namespace called 'SeedDMS:'. Just type
+
+propget <resource>
+
+with `resource` being either the name of a folder or document. You will
+get a list of all properties stored for this resource. Setting a property
+requires to set the namespace first
+
+set namespace SeedDMS:
+
+Afterwards, you may set a property, e.g. the comment, with
+
+propset <resource> comment 'Just a comment'
+
+or even delete a property
+
+propdel <resource> comment
+

From 79d118a731e9a09dad348bf0f8089e7a663f3eb5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 24 Aug 2020 12:56:36 +0200
Subject: [PATCH 016/312] expiration date can be set, prefix attributes with
 'attr_'

---
 webdav/webdav.php | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/webdav/webdav.php b/webdav/webdav.php
index 9b2b07fd7..e3ce26d7b 100644
--- a/webdav/webdav.php
+++ b/webdav/webdav.php
@@ -453,9 +453,9 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 				if($valueset && $attrdef->getMultipleValues()) {
 					$valuesetstr = $attrdef->getValueSet();
 					$delimiter = substr($valuesetstr, 0, 1);
-					$info["props"][] = $this->mkprop("SeedDMS:", str_replace(' ', '', $attrdef->getName()), $delimiter.implode($delimiter, $attribute->getValueAsArray()));
+					$info["props"][] = $this->mkprop("SeedDMS:", 'attr_'.str_replace(array(' ', '|'), array('', ''), $attrdef->getName()), $delimiter.implode($delimiter, $attribute->getValueAsArray()));
 				} else
-					$info["props"][] = $this->mkprop("SeedDMS:", str_replace(' ', '', $attrdef->getName()), $attribute->getValue());
+					$info["props"][] = $this->mkprop("SeedDMS:", 'attr_'.str_replace(array(' ','|'), array('', '',''), $attrdef->getName()), $attribute->getValue());
 			}
 		}
 
@@ -1514,6 +1514,25 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 						case "comment":
 							$obj->setComment($val);
 							break;
+						case "expires":
+							if($obj->isType("document")) {
+								if($val) {
+									$ts = strtotime($val);
+									if($ts !== false) {
+										if(!$obj->setExpires($ts))
+											return false;
+									} else {
+										$options["props"][$key]['status'] = "400 Could not parse date";
+										return false;
+									}
+								} else {
+									$obj->setExpires(0);
+								}
+							} else {
+								$options["props"][$key]['status'] = "405 Expiration date cannot be set on folders";
+								return false;
+							}
+							break;
 						default:
 							if($attrdef = $this->dms->getAttributeDefinitionByName($prop["name"])) {
 								$valueset = $attrdef->getValueSetAsArray();
@@ -1538,7 +1557,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			}
 		}
 
-		return "";
+		return true;
 	} /* }}} */
 
 

From 27d22771d7165f45113a8a6424f5a23c96884f0a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 24 Aug 2020 13:51:41 +0200
Subject: [PATCH 017/312] add changes for 5.1.19

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index b87a61800..4e45fcf7e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,8 @@
   (go to folder page if the whole document was removed, go to previous tab
   if an old version was removed and there are other older version, otherwise
   to to current tab)
+- expiration of document can be set through webdav
+- prefix each attribute with 'attr_' when read through webdav
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.18

From e3dea1073c3424642102cef6641fd0d991f6daab Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 25 Aug 2020 15:53:29 +0200
Subject: [PATCH 018/312] actually set owner notified user, not the logged in
 user, check if notified user has access on document not currently logged in
 user.

---
 controllers/class.AddDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/controllers/class.AddDocument.php b/controllers/class.AddDocument.php
index 370cfb253..69259ca9e 100644
--- a/controllers/class.AddDocument.php
+++ b/controllers/class.AddDocument.php
@@ -123,11 +123,11 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 
 			/* Add a default notification for the owner of the document */
 			if($settings->_enableOwnerNotification) {
-				$res = $document->addNotify($user->getID(), true);
+				$res = $document->addNotify($owner->getID(), true);
 			}
 			/* Check if additional notification shall be added */
 			foreach($notificationusers as $notuser) {
-				if($document->getAccessMode($user) >= M_READ)
+				if($document->getAccessMode($notuser) >= M_READ)
 					$res = $document->addNotify($notuser->getID(), true);
 			}
 			foreach($notificationgroups as $notgroup) {

From 1af89c5b75d1b1d6eb20ac992b673929cc5d4fdc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 25 Aug 2020 15:55:31 +0200
Subject: [PATCH 019/312] add notes for 5.1.19

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 4e45fcf7e..b91f39e6f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,8 @@
   to to current tab)
 - expiration of document can be set through webdav
 - prefix each attribute with 'attr_' when read through webdav
+- actually set owner as notified user, not the logged in user,
+  check if notified user has access on document not the logged in user.
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.18

From 8638858d0588678ea026f4a8a8b35a3d1204ef6c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 25 Aug 2020 21:42:24 +0200
Subject: [PATCH 020/312] pass form field name to printFolderChooserJs()

---
 views/bootstrap/class.Settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 88f1ed3cf..1d837ebf5 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -244,7 +244,7 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style {
 						if(!empty($conf['internal'])) {
 							switch($conf['internal']) {
 							case "folders":
-								$this->printFolderChooserJs("form".$extname.$confkey);
+								$this->printFolderChooserJs("form".$extname.$confkey, 'extensions['.$extname."][".$confkey."]");
 								break;
 							}
 						}

From 22fa26bdb7eb4a256261f3bda9f3722c8c147b7e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 25 Aug 2020 21:43:23 +0200
Subject: [PATCH 021/312] user md5 of formname and form for formid in folder
 chooser

---
 views/bootstrap/class.Bootstrap.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index bff5b6592..986ce77cb 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1241,7 +1241,7 @@ function folderSelected<?php echo $formName ?>(id, name) {
 	function getFolderChooserHtml($form, $accessMode, $exclude = -1, $default = false, $formname = '') { /* {{{ */
 		if(!$formname)
 			$formname = "targetid";
-		$formid = $formname.$form;
+		$formid = md5($formname.$form);
 		$content = '';
 		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
 		$content .= "<div class=\"input-append\">\n";
@@ -1273,7 +1273,7 @@ function folderSelected<?php echo $formName ?>(id, name) {
 	function printFolderChooserJs($form, $formname='') { /* {{{ */
 		if(!$formname)
 			$formname = "targetid";
-		$formid = $formname.$form;
+		$formid = md5($formname.$form);
 ?>
 function folderSelected<?php echo $form ?>(id, name) {
 	$('#<?php echo $formid ?>').val(id);

From b1560bb87be46bb6586bb1941b1947153853c7c8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 26 Aug 2020 11:38:25 +0200
Subject: [PATCH 022/312] allways use http only cookie, pass referuri to
 controller

---
 controllers/class.Login.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/controllers/class.Login.php b/controllers/class.Login.php
index 3a66568e1..491fbd6d0 100644
--- a/controllers/class.Login.php
+++ b/controllers/class.Login.php
@@ -36,6 +36,7 @@ class SeedDMS_Controller_Login extends SeedDMS_Controller_Common {
 		$settings = $this->params['settings'];
 		$session = $this->params['session'];
 		$sesstheme = $this->params['sesstheme'];
+		$referuri = $this->params['referuri'];
 		$lang = $this->params['lang'];
 		$login = $this->params['login'];
 		$pwd = $this->params['pwd'];
@@ -199,8 +200,8 @@ class SeedDMS_Controller_Login extends SeedDMS_Controller_Common {
 			$dms_session = $_COOKIE["mydms_session"];
 			if(!$resArr = $session->load($dms_session)) {
 				/* Turn off http only cookies if jumploader is enabled */
-				setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot, null, null, !$settings->_enableLargeFileUpload); //delete cookie
-				header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
+				setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot, null, false, true); //delete cookie
+				header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$referuri);
 				exit;
 			} else {
 				$session->updateAccess($dms_session);
@@ -218,7 +219,7 @@ class SeedDMS_Controller_Login extends SeedDMS_Controller_Common {
 				$lifetime = time() + intval($settings->_cookieLifetime);
 			else
 				$lifetime = 0;
-			setcookie("mydms_session", $id, $lifetime, $settings->_httpRoot, null, null, !$settings->_enableLargeFileUpload);
+			setcookie("mydms_session", $id, $lifetime, $settings->_httpRoot, null, false, true);
 		}
 
 		if($this->callHook('postLogin', $user)) {

From 020c8f0aa8f686e6988252bbacd9bbb4f514091a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 26 Aug 2020 11:39:15 +0200
Subject: [PATCH 023/312] add section on encryption key

---
 doc/README.Install.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/README.Install.md b/doc/README.Install.md
index 39cf13fec..ff16da785 100644
--- a/doc/README.Install.md
+++ b/doc/README.Install.md
@@ -54,7 +54,7 @@ Do not set the DocumentRoot or Alias to
 the `seeddms51x` directory, because this will allow anybody to access
 your `data` and `conf` directory. This is a major security risk.
 
-Make sure that the subdіrectory `seeddms51x/data` and the configuration file
+Make sure that the subdirectory `seeddms51x/data` and the configuration file
 `seeddms51/conf/settings.xml` is writeable by your web server. All other
 directories must just be readable by your web server.
 
@@ -120,6 +120,13 @@ As a hoster you may not want this configuration options being set by a SeedDMS
 administrator. For now you need to make the configuration file `settings.xml`
 unwritable for the web server.
 
+Setting a new encryption key
+------------------------------
+Though this is not related to setting up the web server environment, it is
+important to recreated the encryption key in SeedDMS once SeedDMS is running.
+Just open the settings in the admin tools and empty the currently set
+encryption key on the tab 'System'. Save the settings and check the key again.
+It should be new one. Save the settings again
 
 UPDATING FROM A PREVIOUS VERSION OR SEEDDMS
 =============================================

From 92b049ee6d8811f8992b38434fd169fc40d43904 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 26 Aug 2020 11:39:42 +0200
Subject: [PATCH 024/312] pass referuri to controller

---
 op/op.Login.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/op/op.Login.php b/op/op.Login.php
index ca4a8b714..1e10dd214 100644
--- a/op/op.Login.php
+++ b/op/op.Login.php
@@ -75,6 +75,7 @@ $session = new SeedDMS_Session($db);
 // TODO: by the PHP manual: The superglobals $_GET and $_REQUEST are already decoded.
 // Using urldecode() on an element in $_GET or $_REQUEST could have unexpected and dangerous results.
 
+$referuri = '';
 if (isset($_POST["referuri"]) && strlen($_POST["referuri"])>0) {
 	$referuri = trim(urldecode($_POST["referuri"]));
 }
@@ -88,6 +89,7 @@ $controller->setParam('login', $login);
 $controller->setParam('pwd', $pwd);
 $controller->setParam('lang', $lang);
 $controller->setParam('sesstheme', $sesstheme);
+$controller->setParam('referuri', $referuri);
 $controller->setParam('session', $session);
 if(!$controller->run()) {
 	add_log_line("login failed", PEAR_LOG_ERR);

From 6d881fed60b0888e1811ea62fd9e02c87f7707a9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 26 Aug 2020 11:40:04 +0200
Subject: [PATCH 025/312] take out authentication and secure script with a
 token

---
 op/op.UploadChunks.php              | 10 ++++++----
 views/bootstrap/class.Bootstrap.php |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/op/op.UploadChunks.php b/op/op.UploadChunks.php
index 44c47bae2..a05f18562 100644
--- a/op/op.UploadChunks.php
+++ b/op/op.UploadChunks.php
@@ -26,11 +26,13 @@ include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
-include("../inc/inc.Authentication.php");
+//include("../inc/inc.Authentication.php");
 
-//print_r($_FILES);
-//print_r($_POST);
-//exit;
+if(empty($_GET['formkey']) || $_GET['formkey'] != md5($settings->_encryptionKey.'uploadchunks')) {
+	header("Content-Type: text/plain");
+	echo json_encode(array('success'=>false, 'error'=>'Wrong formkey'));
+	exit;
+}
 
 $file_param_name = 'qqfile';
 $file_name = $_FILES[ $file_param_name ][ 'name' ];
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 986ce77cb..f424305ed 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2752,7 +2752,7 @@ $(document).ready(function() {
 		element: $('#<?php echo $prefix; ?>-fine-uploader')[0],
 		template: 'qq-template',
 		request: {
-			endpoint: '<?php echo $uploadurl; ?>'
+			endpoint: '<?php echo $uploadurl."?formkey=".md5($this->params['settings']->_encryptionKey.'uploadchunks'); ?>'
 		},
 <?php echo ($maxuploadsize > 0 ? '
 		validation: {

From 504c3533f372f73ff3974e23cb1ec440d8136ba5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 26 Aug 2020 15:26:17 +0200
Subject: [PATCH 026/312] add missing option -c in usage informationen

---
 utils/indexer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/indexer.php b/utils/indexer.php
index 172dabb0c..f8eae2010 100644
--- a/utils/indexer.php
+++ b/utils/indexer.php
@@ -7,7 +7,7 @@ if(isset($_SERVER['SEEDDMS_HOME'])) {
 
 function usage() { /* {{{ */
 	echo "Usage:".PHP_EOL;
-	echo "  seeddms-indexer [-h] [-v] [--config <file>]".PHP_EOL;
+	echo "  seeddms-indexer [-h] [-v] [-c] [--config <file>]".PHP_EOL;
 	echo "".PHP_EOL;
 	echo "Description:".PHP_EOL;
 	echo "  This program recreates the full text index of SeedDMS.".PHP_EOL;

From ead75ceea9a7b3c5ecb3b165ee1bbe0d20cd7577 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 26 Aug 2020 19:05:33 +0200
Subject: [PATCH 027/312] new markitup version

---
 styles/bootstrap/markitup/jquery.markitup.js  |  32 +++++++++++-------
 .../markitup/sets/default/images/bold.png     | Bin
 .../markitup/sets/default/images/clean.png    | Bin
 .../markitup/sets/default/images/image.png    | Bin
 .../markitup/sets/default/images/italic.png   | Bin
 .../markitup/sets/default/images/link.png     | Bin
 .../sets/default/images/list-bullet.png       | Bin
 .../sets/default/images/list-numeric.png      | Bin
 .../markitup/sets/default/images/picture.png  | Bin
 .../markitup/sets/default/images/preview.png  | Bin
 .../markitup/sets/default/images/stroke.png   | Bin
 styles/bootstrap/markitup/sets/default/set.js |   4 +--
 .../bootstrap/markitup/sets/default/style.css |   0
 .../skins/markitup/images/bg-container.png    | Bin
 .../markitup/images/bg-editor-bbcode.png      | Bin
 .../markitup/images/bg-editor-dotclear.png    | Bin
 .../skins/markitup/images/bg-editor-html.png  | Bin
 .../skins/markitup/images/bg-editor-json.png  | Bin
 .../markitup/images/bg-editor-markdown.png    | Bin
 .../markitup/images/bg-editor-textile.png     | Bin
 .../skins/markitup/images/bg-editor-wiki.png  | Bin
 .../skins/markitup/images/bg-editor-xml.png   | Bin
 .../skins/markitup/images/bg-editor.png       | Bin
 .../markitup/skins/markitup/images/handle.png | Bin
 .../markitup/skins/markitup/images/menu.png   | Bin
 .../skins/markitup/images/submenu.png         | Bin
 .../markitup/skins/markitup/style.css         |   0
 .../markitup/skins/simple/images/handle.png   | Bin
 .../markitup/skins/simple/images/menu.png     | Bin
 .../markitup/skins/simple/images/submenu.png  | Bin
 .../bootstrap/markitup/skins/simple/style.css |   8 ++---
 .../bootstrap/markitup/templates/preview.css  |   0
 .../bootstrap/markitup/templates/preview.html |   0
 33 files changed, 26 insertions(+), 18 deletions(-)
 mode change 100644 => 100755 styles/bootstrap/markitup/jquery.markitup.js
 mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/images/bold.png
 mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/images/clean.png
 mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/images/image.png
 mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/images/italic.png
 mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/images/link.png
 mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/images/list-bullet.png
 mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/images/list-numeric.png
 mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/images/picture.png
 mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/images/preview.png
 mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/images/stroke.png
 mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/set.js
 mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/style.css
 mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/bg-container.png
 mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/bg-editor-bbcode.png
 mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/bg-editor-dotclear.png
 mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/bg-editor-html.png
 mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/bg-editor-json.png
 mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/bg-editor-markdown.png
 mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/bg-editor-textile.png
 mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/bg-editor-wiki.png
 mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/bg-editor-xml.png
 mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/bg-editor.png
 mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/handle.png
 mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/menu.png
 mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/submenu.png
 mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/style.css
 mode change 100644 => 100755 styles/bootstrap/markitup/skins/simple/images/handle.png
 mode change 100644 => 100755 styles/bootstrap/markitup/skins/simple/images/menu.png
 mode change 100644 => 100755 styles/bootstrap/markitup/skins/simple/images/submenu.png
 mode change 100644 => 100755 styles/bootstrap/markitup/skins/simple/style.css
 mode change 100644 => 100755 styles/bootstrap/markitup/templates/preview.css
 mode change 100644 => 100755 styles/bootstrap/markitup/templates/preview.html

diff --git a/styles/bootstrap/markitup/jquery.markitup.js b/styles/bootstrap/markitup/jquery.markitup.js
old mode 100644
new mode 100755
index b7e2d0395..4ea585c38
--- a/styles/bootstrap/markitup/jquery.markitup.js
+++ b/styles/bootstrap/markitup/jquery.markitup.js
@@ -45,6 +45,7 @@
 					previewParser:			false,
 					previewParserPath:		'',
 					previewParserVar:		'data',
+					previewParserAjaxType:	'POST',
 					resizeHandle:			true,
 					beforeInsert:			'',
 					afterInsert:			'',
@@ -59,7 +60,7 @@
 		// compute markItUp! path
 		if (!options.root) {
 			$('script').each(function(a, tag) {
-				miuScript = $(tag).get(0).src.match(/(.*)jquery\.markitup(\.pack)?\.js$/);
+				var miuScript = $(tag).get(0).src.match(/(.*)jquery\.markitup(\.pack)?\.js$/);
 				if (miuScript !== null) {
 					options.root = miuScript[1];
 				}
@@ -202,7 +203,7 @@
 				$('li:hover > ul', ul).css('display', 'block');
 				$.each(markupSet, function() {
 					var button = this, t = '', title, li, j;
-					title = (button.key) ? (button.name||'')+' [Ctrl+'+button.key+']' : (button.name||'');
+					button.title ? title = (button.key) ? (button.title||'')+' [Ctrl+'+button.key+']' : (button.title||'') : title = (button.key) ? (button.name||'')+' [Ctrl+'+button.key+']' : (button.name||'');
 					key   = (button.key) ? 'accesskey="'+button.key+'"' : '';
 					if (button.separator) {
 						li = $('<li class="markItUpSeparator">'+(button.separator||'')+'</li>').appendTo(ul);
@@ -211,16 +212,16 @@
 						for (j = levels.length -1; j >= 0; j--) {
 							t += levels[j]+"-";
 						}
-						li = $('<li class="markItUpButton markItUpButton'+t+(i)+' '+(button.className||'')+'"><a href="" '+key+' title="'+title+'">'+(button.name||'')+'</a></li>')
+						li = $('<li class="markItUpButton markItUpButton'+t+(i)+' '+(button.className||'')+'"><a href="#" '+key+' title="'+title+'">'+(button.name||'')+'</a></li>')
 						.bind("contextmenu.markItUp", function() { // prevent contextmenu on mac and allow ctrl+click
 							return false;
 						}).bind('click.markItUp', function(e) {
 							e.preventDefault();
 						}).bind("focusin.markItUp", function(){
                             $$.focus();
-						}).bind('mouseup', function() {
+						}).bind('mouseup', function(e) {
 							if (button.call) {
-								eval(button.call)();
+								eval(button.call)(e); // Pass the mouseup event to custom delegate
 							}
 							setTimeout(function() { markup(button) },1);
 							return false;
@@ -537,18 +538,19 @@
 
 			function renderPreview() {
 				var phtml;
+				var parsedData = $$.val();
+				if (options.previewParser && typeof options.previewParser === 'function') {
+					parsedData = options.previewParser(parsedData); 
+				}
 				if (options.previewHandler && typeof options.previewHandler === 'function') {
-					options.previewHandler( $$.val() );
-				} else if (options.previewParser && typeof options.previewParser === 'function') {
-					var data = options.previewParser( $$.val() );
-					writeInPreview(localize(data, 1) ); 
+					options.previewHandler(parsedData);
 				} else if (options.previewParserPath !== '') {
 					$.ajax({
-						type: 'POST',
+						type: options.previewParserAjaxType,
 						dataType: 'text',
 						global: false,
 						url: options.previewParserPath,
-						data: options.previewParserVar+'='+encodeURIComponent($$.val()),
+						data: options.previewParserVar+'='+encodeURIComponent(parsedData),
 						success: function(data) {
 							writeInPreview( localize(data, 1) ); 
 						}
@@ -560,7 +562,7 @@
 							dataType: 'text',
 							global: false,
 							success: function(data) {
-								writeInPreview( localize(data, 1).replace(/<!-- content -->/g, $$.val()) );
+								writeInPreview( localize(data, 1).replace(/<!-- content -->/g, parsedData) );
 							}
 						});
 					}
@@ -636,6 +638,12 @@
 			function remove() {
 				$$.unbind(".markItUp").removeClass('markItUpEditor');
 				$$.parent('div').parent('div.markItUp').parent('div').replaceWith($$);
+
+				var relativeRef = $$.parent('div').parent('div.markItUp').parent('div');
+				if (relativeRef.length) {
+				    relativeRef.replaceWith($$);
+				}
+				
 				$$.data('markItUp', null);
 			}
 
diff --git a/styles/bootstrap/markitup/sets/default/images/bold.png b/styles/bootstrap/markitup/sets/default/images/bold.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/sets/default/images/clean.png b/styles/bootstrap/markitup/sets/default/images/clean.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/sets/default/images/image.png b/styles/bootstrap/markitup/sets/default/images/image.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/sets/default/images/italic.png b/styles/bootstrap/markitup/sets/default/images/italic.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/sets/default/images/link.png b/styles/bootstrap/markitup/sets/default/images/link.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/sets/default/images/list-bullet.png b/styles/bootstrap/markitup/sets/default/images/list-bullet.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/sets/default/images/list-numeric.png b/styles/bootstrap/markitup/sets/default/images/list-numeric.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/sets/default/images/picture.png b/styles/bootstrap/markitup/sets/default/images/picture.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/sets/default/images/preview.png b/styles/bootstrap/markitup/sets/default/images/preview.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/sets/default/images/stroke.png b/styles/bootstrap/markitup/sets/default/images/stroke.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/sets/default/set.js b/styles/bootstrap/markitup/sets/default/set.js
old mode 100644
new mode 100755
index c1fbde920..b7fdf8182
--- a/styles/bootstrap/markitup/sets/default/set.js
+++ b/styles/bootstrap/markitup/sets/default/set.js
@@ -24,7 +24,7 @@ var mySettings = {
 		{name:'Picture', key:'P', replaceWith:'<img src="[![Source:!:http://]!]" alt="[![Alternative text]!]" />' },
 		{name:'Link', key:'L', openWith:'<a href="[![Link:!:http://]!]"(!( title="[![Title]!]")!)>', closeWith:'</a>', placeHolder:'Your text to link...' },
 		{separator:'---------------' },
-		{name:'Clean', className:'clean', replaceWith:function(markitup) { return markitup.selection.replace(/<(.*?)>/g, "") } }/*,		
-		{name:'Preview', className:'preview',  call:'preview'}*/
+		{name:'Clean', className:'clean', replaceWith:function(markitup) { return markitup.selection.replace(/<(.*?)>/g, "") } },		
+		{name:'Preview', className:'preview',  call:'preview'}
 	]
 }
diff --git a/styles/bootstrap/markitup/sets/default/style.css b/styles/bootstrap/markitup/sets/default/style.css
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/skins/markitup/images/bg-container.png b/styles/bootstrap/markitup/skins/markitup/images/bg-container.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/skins/markitup/images/bg-editor-bbcode.png b/styles/bootstrap/markitup/skins/markitup/images/bg-editor-bbcode.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/skins/markitup/images/bg-editor-dotclear.png b/styles/bootstrap/markitup/skins/markitup/images/bg-editor-dotclear.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/skins/markitup/images/bg-editor-html.png b/styles/bootstrap/markitup/skins/markitup/images/bg-editor-html.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/skins/markitup/images/bg-editor-json.png b/styles/bootstrap/markitup/skins/markitup/images/bg-editor-json.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/skins/markitup/images/bg-editor-markdown.png b/styles/bootstrap/markitup/skins/markitup/images/bg-editor-markdown.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/skins/markitup/images/bg-editor-textile.png b/styles/bootstrap/markitup/skins/markitup/images/bg-editor-textile.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/skins/markitup/images/bg-editor-wiki.png b/styles/bootstrap/markitup/skins/markitup/images/bg-editor-wiki.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/skins/markitup/images/bg-editor-xml.png b/styles/bootstrap/markitup/skins/markitup/images/bg-editor-xml.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/skins/markitup/images/bg-editor.png b/styles/bootstrap/markitup/skins/markitup/images/bg-editor.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/skins/markitup/images/handle.png b/styles/bootstrap/markitup/skins/markitup/images/handle.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/skins/markitup/images/menu.png b/styles/bootstrap/markitup/skins/markitup/images/menu.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/skins/markitup/images/submenu.png b/styles/bootstrap/markitup/skins/markitup/images/submenu.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/skins/markitup/style.css b/styles/bootstrap/markitup/skins/markitup/style.css
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/skins/simple/images/handle.png b/styles/bootstrap/markitup/skins/simple/images/handle.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/skins/simple/images/menu.png b/styles/bootstrap/markitup/skins/simple/images/menu.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/skins/simple/images/submenu.png b/styles/bootstrap/markitup/skins/simple/images/submenu.png
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/skins/simple/style.css b/styles/bootstrap/markitup/skins/simple/style.css
old mode 100644
new mode 100755
index 2a0c89d5d..fe3753c02
--- a/styles/bootstrap/markitup/skins/simple/style.css
+++ b/styles/bootstrap/markitup/skins/simple/style.css
@@ -12,7 +12,7 @@
 	text-decoration:none;
 }
 .markItUp  {
-	width:100%;
+	width:700px;
 	margin:5px 0 5px 0;
 }
 .markItUpContainer  {
@@ -20,9 +20,9 @@
 }
 .markItUpEditor {
 	font:12px 'Courier New', Courier, monospace;
-	padding:0px;
-	width:100%;
-	_height:320px;
+	padding:5px;
+	width:690px;
+	height:320px;
 	clear:both;
 	line-height:18px;
 	overflow:auto;
diff --git a/styles/bootstrap/markitup/templates/preview.css b/styles/bootstrap/markitup/templates/preview.css
old mode 100644
new mode 100755
diff --git a/styles/bootstrap/markitup/templates/preview.html b/styles/bootstrap/markitup/templates/preview.html
old mode 100644
new mode 100755

From e962a33133bfc9719a522b5a51585f1ac8eea253 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 26 Aug 2020 19:07:17 +0200
Subject: [PATCH 028/312] use npm and grunt for getting js packages

---
 Gruntfile.js | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++
 package.json |  28 +++++++
 2 files changed, 230 insertions(+)
 create mode 100644 Gruntfile.js
 create mode 100644 package.json

diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000000000..6a10f89dc
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,202 @@
+module.exports = function (grunt) {
+    'use strict';
+
+    var vendorDir = 'views/bootstrap/vendors',
+        nodeDir = 'node_modules';
+
+    grunt.initConfig({
+        clean: {
+            vendors: [ vendorDir ]
+        },
+        copy: {
+					'jquery': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/jquery/dist/*'
+								],
+								dest: vendorDir + '/jquery',
+								flatten: true
+						}]
+					},
+					'chartjs': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/chartjs/chart.js',
+										nodeDir + '/chartjs/README.md',
+										nodeDir + '/chartjs/LICENSE'
+								],
+								dest: vendorDir + '/chartjs',
+								flatten: true
+						}]
+					},
+					'jqtree': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/jqtree/tree.jquery.js',
+										nodeDir + '/jqtree/jqtree.css'
+								],
+								dest: vendorDir + '/jqtree',
+								flatten: true
+						}]
+					},
+					'noty': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/noty/js/noty/jquery.noty.js'
+								],
+								dest: vendorDir + '/noty',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/noty/js/noty/themes/*'
+								],
+								dest: vendorDir + '/noty/themes',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/noty/js/noty/layouts/*'
+								],
+								dest: vendorDir + '/noty/layouts',
+								flatten: true
+						}]
+					},
+					'select2': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/select2/dist/js/*'
+								],
+								dest: vendorDir + '/select2/js',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/select2/dist/css/*'
+								],
+								dest: vendorDir + '/select2/css',
+								flatten: true
+						}]
+					},
+					'fine-uploader': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/fine-uploader/jquery.fine-uploader/*'
+								],
+								dest: vendorDir + '/fine-uploader',
+								flatten: true
+						}]
+					},
+					'jquery-validation': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/jquery-validation/dist/*'
+								],
+								dest: vendorDir + '/jquery-validation',
+								flatten: true
+						}]
+					},
+					'fullcalendar': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/fullcalendar/LICENSE.txt',
+										nodeDir + '/fullcalendar/dist/*'
+								],
+								dest: vendorDir + '/fullcalendar',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/fullcalendar/dist/locale/*'
+								],
+								dest: vendorDir + '/fullcalendar/locale',
+								flatten: true
+						}]
+					},
+					'moment': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/moment/LICENSE.txt',
+										nodeDir + '/moment/min/*'
+								],
+								dest: vendorDir + '/moment',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/moment/dist/locale/*'
+								],
+								dest: vendorDir + '/moment/locale',
+								flatten: true
+						}]
+					},
+					'bootstrap-datepicker': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/bootstrap-datepicker/dist/js/*'
+								],
+								dest: vendorDir + '/bootstrap-datepicker/js',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/bootstrap-datepicker/dist/css/*'
+								],
+								dest: vendorDir + '/bootstrap-datepicker/css',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/bootstrap-datepicker/dist/locales/*'
+								],
+								dest: vendorDir + '/bootstrap-datepicker/locales',
+								flatten: true
+						}]
+					},
+					'coreui': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/@coreui/coreui/dist/js/*'
+								],
+								dest: vendorDir + '/coreui/js',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/@coreui/coreui/dist/css/*'
+								],
+								dest: vendorDir + '/coreui/css',
+								flatten: true
+						}]
+					}
+				}
+    });
+
+    grunt.registerTask('createVendorDir', 'Creates the necessary vendor directory', function() {
+        // Create the vendorDir when it doesn't exists.
+        if (!grunt.file.isDir(vendorDir)) {
+            grunt.file.mkdir(vendorDir);
+
+            // Output a success message
+            grunt.log.oklns(grunt.template.process(
+                'Directory "<%= directory %>" was created successfully.',
+                { data: { directory: vendorDir } }
+            ));
+        }
+    });
+
+    grunt.registerTask('default', [ 'clean', 'createVendorDir', 'copy' ]);
+    grunt.loadNpmTasks('grunt-contrib-clean');
+    grunt.loadNpmTasks('grunt-contrib-copy');
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000000000..d0b223bea
--- /dev/null
+++ b/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "seeddms",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "Uwe Steinmann",
+  "license": "ISC",
+  "dependencies": {
+    "@coreui/coreui": "^3.2.2",
+    "bootstrap-datepicker": "^1.9.0",
+    "chartjs": "^0.3.24",
+    "cytoscape": "^3.15.2",
+    "fine-uploader": "^5.16.2",
+    "fullcalendar": "^3.*",
+    "grunt": "^1.3.0",
+    "grunt-contrib-clean": "^2.0.0",
+    "grunt-contrib-copy": "^1.0.0",
+    "jqtree": "^1.4.12",
+    "jquery": "^1.12.4",
+    "jquery-validation": "^1.19.2",
+    "moment": "^2.17.1",
+    "noty": "^2.4.1",
+    "select2": "^4.0.13"
+  }
+}

From 547ba8366e3e4f7ac67d9a528c3b200a643ebec3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Aug 2020 07:49:20 +0200
Subject: [PATCH 029/312] add flot and font-awesome

---
 Gruntfile.js | 29 +++++++++++++++++++++++++++++
 package.json |  2 ++
 2 files changed, 31 insertions(+)

diff --git a/Gruntfile.js b/Gruntfile.js
index 6a10f89dc..4551eb372 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -103,6 +103,35 @@ module.exports = function (grunt) {
 								flatten: true
 						}]
 					},
+					'flot': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/flot/source/jquery.canvaswrapper.js',
+										nodeDir + '/flot/source/jquery.colorhelpers.js',
+										nodeDir + '/flot/source/jquery.flot.*'
+								],
+								dest: vendorDir + '/flot',
+								flatten: true
+						}]
+					},
+					'font-awesome': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/font-awesome/fonts/*'
+								],
+								dest: vendorDir + '/font-awesome/fonts',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/font-awesome/css/*'
+								],
+								dest: vendorDir + '/font-awesome/css',
+								flatten: true
+						}]
+					},
 					'fullcalendar': {
 						files: [{
 								expand: true,
diff --git a/package.json b/package.json
index d0b223bea..055aa90d5 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,8 @@
     "chartjs": "^0.3.24",
     "cytoscape": "^3.15.2",
     "fine-uploader": "^5.16.2",
+    "flot": "^4.2.1",
+    "font-awesome": "^4.7.0",
     "fullcalendar": "^3.*",
     "grunt": "^1.3.0",
     "grunt-contrib-clean": "^2.0.0",

From d4db6a2ba02c571604d6650e81d8a7e4ccd3f937 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Aug 2020 07:52:52 +0200
Subject: [PATCH 030/312] new version of font-awesome (4.7.1)

---
 styles/bootstrap/application.css              |   2 +-
 styles/bootstrap/application.js               |  32 ++---
 views/bootstrap/class.AddDocument.php         |   6 +-
 views/bootstrap/class.AddFile.php             |   4 +-
 views/bootstrap/class.AddSubFolder.php        |   4 +-
 views/bootstrap/class.AdminTools.php          |  10 +-
 views/bootstrap/class.AttributeMgr.php        |   6 +-
 views/bootstrap/class.BackupTools.php         |   4 +-
 views/bootstrap/class.Bootstrap.php           | 109 +++++++++---------
 views/bootstrap/class.Calendar.php            |  16 +--
 views/bootstrap/class.Categories.php          |   4 +-
 views/bootstrap/class.ClearCache.php          |   2 +-
 views/bootstrap/class.Clipboard.php           |  10 +-
 views/bootstrap/class.DefaultKeywords.php     |  10 +-
 views/bootstrap/class.DocumentAccess.php      |  18 +--
 views/bootstrap/class.DocumentNotify.php      |   8 +-
 .../bootstrap/class.DocumentVersionDetail.php |  20 ++--
 views/bootstrap/class.DropFolderChooser.php   |   2 +-
 views/bootstrap/class.EditAttributes.php      |   2 +-
 views/bootstrap/class.EditComment.php         |   2 +-
 views/bootstrap/class.EditDocument.php        |   4 +-
 views/bootstrap/class.EditDocumentFile.php    |   2 +-
 views/bootstrap/class.EditEvent.php           |   6 +-
 views/bootstrap/class.EditFolder.php          |   4 +-
 views/bootstrap/class.EditOnline.php          |   2 +-
 views/bootstrap/class.EditUserData.php        |   4 +-
 views/bootstrap/class.ExtensionMgr.php        |  24 ++--
 views/bootstrap/class.FolderAccess.php        |  18 +--
 views/bootstrap/class.FolderNotify.php        |   8 +-
 views/bootstrap/class.GroupMgr.php            |  10 +-
 views/bootstrap/class.GroupView.php           |   2 +-
 views/bootstrap/class.ImportFS.php            |   2 +-
 views/bootstrap/class.ImportUsers.php         |   6 +-
 views/bootstrap/class.LogManagement.php       |  10 +-
 views/bootstrap/class.Login.php               |   2 +-
 views/bootstrap/class.ManageNotify.php        |   8 +-
 .../bootstrap/class.OverrideContentStatus.php |   2 +-
 views/bootstrap/class.RemoveArchive.php       |   2 +-
 views/bootstrap/class.RemoveDocument.php      |   2 +-
 views/bootstrap/class.RemoveDocumentFile.php  |   2 +-
 views/bootstrap/class.RemoveDump.php          |   2 +-
 views/bootstrap/class.RemoveEvent.php         |   2 +-
 views/bootstrap/class.RemoveFolder.php        |   2 +-
 views/bootstrap/class.RemoveGroup.php         |   2 +-
 views/bootstrap/class.RemoveLog.php           |   2 +-
 views/bootstrap/class.RemoveUser.php          |   2 +-
 .../class.RemoveUserFromProcesses.php         |   2 +-
 views/bootstrap/class.RemoveVersion.php       |   2 +-
 views/bootstrap/class.RemoveWorkflow.php      |   2 +-
 .../class.RemoveWorkflowFromDocument.php      |   2 +-
 views/bootstrap/class.Search.php              |  12 +-
 views/bootstrap/class.SearchForm.php          |  12 +-
 views/bootstrap/class.SendLoginData.php       |   2 +-
 views/bootstrap/class.Session.php             |   4 +-
 views/bootstrap/class.SetExpires.php          |   2 +-
 views/bootstrap/class.Settings.php            |   2 +-
 views/bootstrap/class.SubstituteUser.php      |   2 +-
 views/bootstrap/class.Tasks.php               |  12 +-
 views/bootstrap/class.Timeline.php            |   6 +-
 views/bootstrap/class.TransferDocument.php    |   2 +-
 views/bootstrap/class.TransferObjects.php     |   2 +-
 views/bootstrap/class.UpdateDocument.php      |   4 +-
 views/bootstrap/class.UserDefaultKeywords.php |   8 +-
 views/bootstrap/class.UserList.php            |   4 +-
 views/bootstrap/class.UsrMgr.php              |  12 +-
 views/bootstrap/class.ViewDocument.php        |  68 +++++------
 views/bootstrap/class.ViewEvent.php           |   4 +-
 views/bootstrap/class.ViewFolder.php          |  12 +-
 views/bootstrap/class.WorkflowActionsMgr.php  |   8 +-
 views/bootstrap/class.WorkflowGraph.php       |  12 +-
 views/bootstrap/class.WorkflowMgr.php         |  20 ++--
 views/bootstrap/class.WorkflowStatesMgr.php   |   8 +-
 72 files changed, 314 insertions(+), 315 deletions(-)

diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css
index fe7a512ca..7181d1e07 100644
--- a/styles/bootstrap/application.css
+++ b/styles/bootstrap/application.css
@@ -30,7 +30,7 @@ span.list-details {
 #admin-tools i {
 	font-size: 300%;
 	line-height: 110%;
-	min-height: 100px;
+/*	min-height: 100px; */
 }
 
 #admin-tools a {
diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 47d4da737..45b9e2122 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -12,13 +12,13 @@ chzn_template_func =  function (state) {
 	if($(state.element).data('warning'))
 		warning = $(state.element).data('warning')+''; /* make sure it is a string */
 	var html = '<span>';
-	if($(state.element).data('icon-before'))
-		html += '<i class="icon-'+$(state.element).data('icon-before')+'"></i> ';
+	if($(state.element).data('fa fa-before'))
+		html += '<i class="fa fa-'+$(state.element).data('fa fa-before')+'"></i> ';
 	html += state.text.replace(/</g, '&lt;')+'';
 	if(subtitle)
 		html += '<br /><i>'+subtitle.replace(/</g, '&lt;')+'</i>';
 	if(warning)
-		html += '<br /><span class="label label-warning"><i class="icon-warning-sign"></i></span> '+warning+'';
+		html += '<br /><span class="label label-warning"><i class="fa fa-warning"></i></span> '+warning+'';
 	html += '</span>';
 	var $newstate = $(html);
 	return $newstate;
@@ -39,7 +39,7 @@ $(document).ready( function() {
 	 * remove icon
 	 */
 	$('html').on('click', function(e) {
-		if (typeof $(e.target).data('original-title') == 'undefined' && !$(e.target).parents().is('.popover.in') && !$(e.target).is('.icon-remove')) {
+		if (typeof $(e.target).data('original-title') == 'undefined' && !$(e.target).parents().is('.popover.in') && !$(e.target).is('.fa fa-remove')) {
 			$('[data-original-title]').popover('hide');
 		}
 	});
@@ -104,11 +104,11 @@ $(document).ready( function() {
 		},
 		highlighter : function (item) {
 			if(item.charAt(0) == 'D')
-				return '<i class="icon-file"></i> ' + item.substring(1).replace(/</g, '&lt;');
+				return '<i class="fa fa-file"></i> ' + item.substring(1).replace(/</g, '&lt;');
 			else if(item.charAt(0) == 'F')
-				return '<i class="icon-folder-close-alt"></i> ' + item.substring(1).replace(/</g, '&lt;');
+				return '<i class="fa fa-folder-o"></i> ' + item.substring(1).replace(/</g, '&lt;');
 			else
-				return '<i class="icon-search"></i> ' + item.substring(1).replace(/</g, '&lt;');
+				return '<i class="fa fa-search"></i> ' + item.substring(1).replace(/</g, '&lt;');
 		}
 	}); /* }}} */
 
@@ -136,7 +136,7 @@ $(document).ready( function() {
 		},
 		highlighter : function (item) {
 			strarr = item.split("#");
-			return '<i class="icon-file"></i> ' + strarr[1].replace(/</g, '&lt;');
+			return '<i class="fa fa-file"></i> ' + strarr[1].replace(/</g, '&lt;');
 		}
 	}); /* }}} */
 
@@ -165,7 +165,7 @@ $(document).ready( function() {
 		},
 		highlighter : function (item) {
 			strarr = item.split("#");
-			return '<i class="icon-folder-close-alt"></i> ' + strarr[1].replace(/</g, '&lt;');
+			return '<i class="fa fa-folder-o"></i> ' + strarr[1].replace(/</g, '&lt;');
 		}
 	}); /* }}} */
 
@@ -784,9 +784,9 @@ $(document).ready(function() { /* {{{ */
 				if(source_type == 'document') {
 					var bootbox_message = trans.confirm_move_document;
 					if(source_info.name)
-						bootbox_message += "<p> "+escapeHtml(source_info.name)+' <i class="icon-arrow-right"></i> '+escapeHtml(target_name)+"</p>";
+						bootbox_message += "<p> "+escapeHtml(source_info.name)+' <i class="fa fa-arrow-right"></i> '+escapeHtml(target_name)+"</p>";
 					bootbox.dialog(bootbox_message, [{
-						"label" : "<i class='icon-remove'></i> "+trans.move_document,
+						"label" : "<i class='fa fa-remove'></i> "+trans.move_document,
 						"class" : "btn-danger",
 						"callback": function() {
 							$.get('../op/op.Ajax.php',
@@ -828,9 +828,9 @@ $(document).ready(function() { /* {{{ */
 				} else if(source_type == 'folder' && source_id != target_id) {
 					var bootbox_message = trans.confirm_move_folder;
 					if(source_info.name)
-						bootbox_message += "<p> "+escapeHtml(source_info.name)+' <i class="icon-arrow-right"></i> '+escapeHtml(target_name)+"</p>";
+						bootbox_message += "<p> "+escapeHtml(source_info.name)+' <i class="fa fa-arrow-right"></i> '+escapeHtml(target_name)+"</p>";
 					bootbox.dialog(bootbox_message, [{
-						"label" : "<i class='icon-remove'></i> "+trans.move_folder,
+						"label" : "<i class='fa fa-remove'></i> "+trans.move_folder,
 						"class" : "btn-danger",
 						"callback": function() {
 							$.get('../op/op.Ajax.php',
@@ -885,7 +885,7 @@ $(document).ready(function() { /* {{{ */
 				if(source_type == 'document') {
 					if(source_id != target_id) {
 						bootbox.dialog(trans.confirm_transfer_link_document, [{
-							"label" : "<i class='icon-remove'></i> "+trans.transfer_content,
+							"label" : "<i class='fa fa-remove'></i> "+trans.transfer_content,
 							"class" : "btn-danger",
 							"callback": function() {
 								$.get('../op/op.Ajax.php',
@@ -1050,7 +1050,7 @@ $(document).ready(function() { /* {{{ */
 		formtoken = source_info.formtoken;
 		if(source_type == 'document') {
 			bootbox.dialog(trans.confirm_move_document, [{
-				"label" : "<i class='icon-remove'></i> "+trans.move_document,
+				"label" : "<i class='fa fa-remove'></i> "+trans.move_document,
 				"class" : "btn-danger",
 				"callback": function() {
 					$.get('../op/op.Ajax.php',
@@ -1091,7 +1091,7 @@ $(document).ready(function() { /* {{{ */
 //			document.location = url;
 		} else if(source_type == 'folder' && source_id != target_id) {
 			bootbox.dialog(trans.confirm_move_folder, [{
-				"label" : "<i class='icon-remove'></i> "+trans.move_folder,
+				"label" : "<i class='fa fa-remove'></i> "+trans.move_folder,
 				"class" : "btn-danger",
 				"callback": function() {
 					$.get('../op/op.Ajax.php',
diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index a90011fd4..9cb7027d8 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -164,9 +164,9 @@ $(document).ready(function() {
 		$orderby = $this->params['orderby'];
 		$folderid = $folder->getId();
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 		if($enablelargefileupload) {
-			$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/fine-uploader/jquery.fine-uploader.min.js"></script>'."\n", 'js');
+			$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/fine-uploader/jquery.fine-uploader.min.js"></script>'."\n", 'js');
 			$this->htmlAddHeader($this->getFineUploaderTemplate(), 'js');
 		}
 
@@ -684,7 +684,7 @@ $(document).ready(function() {
 			)
 		);
 		}
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('add_document'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('add_document'));
 ?>
 		</form>
 <?php
diff --git a/views/bootstrap/class.AddFile.php b/views/bootstrap/class.AddFile.php
index 114c2aa7b..3df9f3861 100644
--- a/views/bootstrap/class.AddFile.php
+++ b/views/bootstrap/class.AddFile.php
@@ -128,9 +128,9 @@ $(document).ready( function() {
 		$enablelargefileupload = $this->params['enablelargefileupload'];
 		$maxuploadsize = $this->params['maxuploadsize'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 		if($enablelargefileupload) {
-			$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/fine-uploader/jquery.fine-uploader.min.js"></script>'."\n", 'js');
+			$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/fine-uploader/jquery.fine-uploader.min.js"></script>'."\n", 'js');
 			$this->htmlAddHeader($this->getFineUploaderTemplate(), 'js');
 		}
 
diff --git a/views/bootstrap/class.AddSubFolder.php b/views/bootstrap/class.AddSubFolder.php
index 158644a91..e2778d2b9 100644
--- a/views/bootstrap/class.AddSubFolder.php
+++ b/views/bootstrap/class.AddSubFolder.php
@@ -69,7 +69,7 @@ $(document).ready( function() {
 		$strictformcheck = $this->params['strictformcheck'];
 		$orderby = $this->params['orderby'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
 		$this->globalNavigation($folder);
@@ -128,7 +128,7 @@ $(document).ready( function() {
 			echo $arrs;
 		}
 
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('add_subfolder'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('add_subfolder'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.AdminTools.php b/views/bootstrap/class.AdminTools.php
index d94a5e086..bf4238759 100644
--- a/views/bootstrap/class.AdminTools.php
+++ b/views/bootstrap/class.AdminTools.php
@@ -44,7 +44,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 	} /* }}} */
 
 	static function rowButton($link, $icon, $label) { /* {{{ */
-		return '<a href="'.$link.'" class="span2 btn btn-medium"><i class="icon-'.$icon.'"></i><br />'.getMLText($label).'</a>';
+		return '<a href="'.$link.'" class="span2 btn btn-medium"><i class="fa fa-'.$icon.'"></i><br />'.getMLText($label).'</a>';
 	} /* }}} */
 
 	function show() { /* {{{ */
@@ -70,7 +70,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 	<?= self::endRow(); ?>
 	<?= self::startRow(); ?>
 		<?php echo $this->callHook('startOfRow', 2); ?>
-		<?= self::rowButton("../out/out.BackupTools.php", "hdd", "backup_tools"); ?>
+		<?= self::rowButton("../out/out.BackupTools.php", "life-saver", "backup_tools"); ?>
 <?php		
 		if ($logfileenable)
 			echo self::rowButton("../out/out.LogManagement.php", "list", "log_management");
@@ -102,7 +102,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 		<?php echo $this->callHook('startOfRow', 5); ?>
 		<?= self::rowButton("../out/out.Indexer.php", "refresh", "update_fulltext_index"); ?>
 		<?= self::rowButton("../out/out.CreateIndex.php", "search", "create_fulltext_index"); ?>
-		<?= self::rowButton("../out/out.IndexInfo.php", "info-sign", "fulltext_info"); ?>
+		<?= self::rowButton("../out/out.IndexInfo.php", "info-circle", "fulltext_info"); ?>
 		<?php echo $this->callHook('endOfRow', 5); ?>
 	<?= self::endRow(); ?>
 <?php
@@ -113,14 +113,14 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 		<?= self::rowButton("../out/out.Statistic.php", "tasks", "folders_and_documents_statistic"); ?>
 		<?= self::rowButton("../out/out.Charts.php", "bar-chart", "charts"); ?>
 		<?= self::rowButton("../out/out.ObjectCheck.php", "check", "objectcheck"); ?>
-		<?= self::rowButton("../out/out.Timeline.php", "time", "timeline"); ?>
+		<?= self::rowButton("../out/out.Timeline.php", "clock-o", "timeline"); ?>
 		<?php echo $this->callHook('endOfRow', 6); ?>
 	<?= self::endRow(); ?>
 	<?= self::startRow(); ?>
 		<?php echo $this->callHook('startOfRow', 7); ?>
 		<?= self::rowButton("../out/out.Settings.php", "wrench", "settings"); ?>
 		<?= self::rowButton("../out/out.ExtensionMgr.php", "cogs", "extension_manager"); ?>
-		<?= self::rowButton("../out/out.Info.php", "info-sign", "version_info"); ?>
+		<?= self::rowButton("../out/out.Info.php", "info-circle", "version_info"); ?>
 		<?php echo $this->callHook('endOfRow', 7); ?>
 	<?= self::endRow(); ?>
 	<?php echo $this->callHook('afterRows'); ?>
diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index 0327e2a96..1c235a97e 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -110,7 +110,7 @@ $(document).ready( function() {
 							if($user->isAdmin()) {
 								$content .= $this->printDeleteAttributeValueButton($selattrdef, implode(';', $value), 'splash_rm_attr_value', true);
 							} else {
-								$content .= '<span style="padding: 2px; color: #CCC;"><i class="icon-remove"></i></span>';
+								$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-remove"></i></span>';
 							}
 							$content .= "</div>";
 							$content .= "</td>";
@@ -171,7 +171,7 @@ $(document).ready( function() {
 				<?php echo createHiddenFieldWithKey('removeattrdef'); ?>
 				<input type="hidden" name="attrdefid" value="<?php echo $selattrdef->getID()?>">
 				<input type="hidden" name="action" value="removeattrdef">
-				<button type="submit" class="btn"><i class="icon-remove"></i> <?php echo getMLText("rm_attrdef")?></button>
+				<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php echo getMLText("rm_attrdef")?></button>
 			</form>
 <?php
 		}
@@ -288,7 +288,7 @@ $(document).ready( function() {
 				'value'=>($attrdef ? $attrdef->getRegex() : ''),
 			)
 		);
-		$this->formSubmit('<i class="icon-save"></i> '.getMLText('save'));
+		$this->formSubmit('<i class="fa fa-save"></i> '.getMLText('save'));
 ?>
 			</form>
 <?php
diff --git a/views/bootstrap/class.BackupTools.php b/views/bootstrap/class.BackupTools.php
index 6ec1754bc..9fa8c6beb 100644
--- a/views/bootstrap/class.BackupTools.php
+++ b/views/bootstrap/class.BackupTools.php
@@ -121,7 +121,7 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 					print "<td>".getLongReadableDate(filectime($backupdir.$entry))."</td>\n";
 					print "<td>".SeedDMS_Core_File::format_filesize(filesize($backupdir.$entry))."</td>\n";
 					print "<td>";
-					print "<a href=\"out.RemoveArchive.php?arkname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("backup_remove")."</a>";
+					print "<a href=\"out.RemoveArchive.php?arkname=".$entry."\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("backup_remove")."</a>";
 					print "</td>\n";	
 					print "</tr>\n";
 				}
@@ -171,7 +171,7 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 					print "<td>".getLongReadableDate(filectime($backupdir.$entry))."</td>\n";
 					print "<td>".SeedDMS_Core_File::format_filesize(filesize($backupdir.$entry))."</td>\n";
 					print "<td>";
-					print "<a href=\"out.RemoveDump.php?dumpname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("dump_remove")."</a>";
+					print "<a href=\"out.RemoveDump.php?dumpname=".$entry."\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("dump_remove")."</a>";
 					print "</td>\n";	
 					print "</tr>\n";
 				}
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index f424305ed..69014059e 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -92,11 +92,10 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 			echo '<link rel="search" type="application/opensearchdescription+xml" href="../out/out.OpensearchDesc.php" title="'.(strlen($sitename)>0 ? $sitename : "SeedDMS").'"/>'."\n";
 		echo '<link href="../styles/'.$this->theme.'/bootstrap/css/bootstrap.css" rel="stylesheet">'."\n";
 		echo '<link href="../styles/'.$this->theme.'/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">'."\n";
-		echo '<link href="../styles/'.$this->theme.'/font-awesome/css/font-awesome.css" rel="stylesheet">'."\n";
-//		echo '<link href="../styles/'.$this->theme.'/datepicker/css/datepicker.css" rel="stylesheet">'."\n";
-		echo '<link href="../styles/'.$this->theme.'/datepicker/css/bootstrap-datepicker.css" rel="stylesheet">'."\n";
+		echo '<link href="../views/'.$this->theme.'/vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">'."\n";
+		echo '<link href="../views/'.$this->theme.'/vendors/bootstrap-datepicker/css/bootstrap-datepicker.css" rel="stylesheet">'."\n";
 		echo '<link href="../styles/'.$this->theme.'/chosen/css/chosen.css" rel="stylesheet">'."\n";
-		echo '<link href="../styles/'.$this->theme.'/select2/css/select2.min.css" rel="stylesheet">'."\n";
+		echo '<link href="../views/'.$this->theme.'/vendors/select2/css/select2.min.css" rel="stylesheet">'."\n";
 		echo '<link href="../styles/'.$this->theme.'/select2/css/select2-bootstrap.css" rel="stylesheet">'."\n";
 		echo '<link href="../styles/'.$this->theme.'/jqtree/jqtree.css" rel="stylesheet">'."\n";
 		echo '<link href="../styles/'.$this->theme.'/application.css" rel="stylesheet">'."\n";
@@ -105,14 +104,14 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 		if(method_exists($this, 'css'))
 			echo '<link href="'.$this->params['absbaseprefix'].'out/out.'.$this->params['class'].'.php?action=css'.(!empty($_SERVER['QUERY_STRING']) ? '&'.$_SERVER['QUERY_STRING'] : '').'" rel="stylesheet">'."\n";
 
-		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jquery/jquery.min.js"></script>'."\n";
+		echo '<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery/jquery.min.js"></script>'."\n";
 		if($this->extraheader['js'])
 			echo $this->extraheader['js'];
 		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/passwordstrength/jquery.passwordstrength.js"></script>'."\n";
-		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/noty/jquery.noty.js"></script>'."\n";
-		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/noty/layouts/topRight.js"></script>'."\n";
-		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/noty/layouts/topCenter.js"></script>'."\n";
-		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/noty/themes/default.js"></script>'."\n";
+		echo '<script type="text/javascript" src="../views/'.$this->theme.'/vendors/noty/jquery.noty.js"></script>'."\n";
+		echo '<script type="text/javascript" src="../views/'.$this->theme.'/vendors/noty/layouts/topRight.js"></script>'."\n";
+		echo '<script type="text/javascript" src="../views/'.$this->theme.'/vendors/noty/layouts/topCenter.js"></script>'."\n";
+		echo '<script type="text/javascript" src="../views/'.$this->theme.'/vendors/noty/themes/default.js"></script>'."\n";
 		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jqtree/tree.jquery.js"></script>'."\n";
 //		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jquery-cookie/jquery.cookie.js"></script>'."\n";
 		echo '<link rel="shortcut icon" href="../styles/'.$this->theme.'/favicon.ico" type="image/x-icon"/>'."\n";
@@ -161,9 +160,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			}
 		}
 		echo '<script src="../styles/'.$this->theme.'/bootstrap/js/bootstrap.min.js"></script>'."\n";
-		echo '<script src="../styles/'.$this->theme.'/datepicker/js/bootstrap-datepicker.js"></script>'."\n";
+		echo '<script src="../views/'.$this->theme.'/vendors/bootstrap-datepicker/js/bootstrap-datepicker.js"></script>'."\n";
 		foreach(array('de', 'es', 'ar', 'el', 'bg', 'ru', 'hr', 'hu', 'ko', 'pl', 'ro', 'sk', 'tr', 'uk', 'ca', 'nl', 'fi', 'cs', 'it', 'fr', 'sv', 'sl', 'pt-BR', 'zh-CN', 'zh-TW') as $lang)
-			echo '<script src="../styles/'.$this->theme.'/datepicker/locales/bootstrap-datepicker.'.$lang.'.min.js"></script>'."\n";
+			echo '<script src="../views/'.$this->theme.'/vendors/bootstrap-datepicker/locales/bootstrap-datepicker.'.$lang.'.min.js"></script>'."\n";
 		echo '<script src="../styles/'.$this->theme.'/chosen/js/chosen.jquery.min.js"></script>'."\n";
 		echo '<script src="../styles/'.$this->theme.'/select2/js/select2.min.js"></script>'."\n";
 		parse_str($_SERVER['QUERY_STRING'], $tmp);
@@ -287,16 +286,16 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo " <div class=\"navbar-inner\">\n";
 		echo "  <div class=\"container-fluid\">\n";
 		echo "   <a class=\"btn btn-navbar\" data-toggle=\"collapse\" data-target=\".nav-col1\">\n";
-		echo "     <span class=\"icon-bar\"></span>\n";
-		echo "     <span class=\"icon-bar\"></span>\n";
-		echo "     <span class=\"icon-bar\"></span>\n";
+		echo "     <span class=\"fa fa-bar\"></span>\n";
+		echo "     <span class=\"fa fa-bar\"></span>\n";
+		echo "     <span class=\"fa fa-bar\"></span>\n";
 		echo "   </a>\n";
 		echo "   <a class=\"brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['rootfolderid']."\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n";
 		if(isset($this->params['user']) && $this->params['user']) {
 			echo "   <div class=\"nav-collapse nav-col1\">\n";
 			echo "   <ul id=\"main-menu-admin\" class=\"nav pull-right\">\n";
 			echo "    <li class=\"dropdown\">\n";
-			echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".($this->params['session']->getSu() ? getMLText("switched_to") : getMLText("signed_in_as"))." '".htmlspecialchars($this->params['user']->getFullName())."' <i class=\"icon-caret-down\"></i></a>\n";
+			echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".($this->params['session']->getSu() ? getMLText("switched_to") : getMLText("signed_in_as"))." '".htmlspecialchars($this->params['user']->getFullName())."' <i class=\"fa fa-caret-down\"></i></a>\n";
 			echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 			if (!$this->params['user']->isGuest()) {
 				$menuitems = array();
@@ -396,7 +395,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			foreach($menuitems as $menuitem) {
 				if(!empty($menuitem['children'])) {
 					echo "    <li class=\"dropdown\">\n";
-					echo "     <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText($menuitem['label'])." <i class=\"icon-caret-down\"></i></a>\n";
+					echo "     <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText($menuitem['label'])." <i class=\"fa fa-caret-down\"></i></a>\n";
 					echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 					foreach($menuitem['children'] as $submenuitem) {
 						echo "      <li><a href=\"".$submenuitem['link']."\"".(isset($submenuitem['target']) ? ' target="'.$submenuitem['target'].'"' : '').">".getMLText($submenuitem['label'])."</a></li>\n";
@@ -456,9 +455,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			echo " <div class=\"navbar-inner\">\n";
 			echo "  <div class=\"container\">\n";
 			echo "   <a class=\"btn btn-navbar\" data-toggle=\"collapse\" data-target=\".col2\">\n";
-			echo " 		<span class=\"icon-bar\"></span>\n";
-			echo " 		<span class=\"icon-bar\"></span>\n";
-			echo " 		<span class=\"icon-bar\"></span>\n";
+			echo " 		<span class=\"fa fa-bar\"></span>\n";
+			echo " 		<span class=\"fa fa-bar\"></span>\n";
+			echo " 		<span class=\"fa fa-bar\"></span>\n";
 			echo "   </a>\n";
 			switch ($pageType) {
 				case "view_folder":
@@ -505,7 +504,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		foreach($menuitems as $menuitem) {
 			if(!empty($menuitem['children'])) {
 				echo "    <li class=\"dropdown\">\n";
-				echo "     <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText($menuitem['label'])." <i class=\"icon-caret-down\"></i></a>\n";
+				echo "     <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText($menuitem['label'])." <i class=\"fa fa-caret-down\"></i></a>\n";
 				echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 				foreach($menuitem['children'] as $submenuitem) {
 					echo "      <li><a href=\"".$submenuitem['link']."\"".(isset($submenuitem['target']) ? ' target="'.$submenuitem['target'].'"' : '').">".getMLText($submenuitem['label'])."</a></li>\n";
@@ -1111,7 +1110,7 @@ $(document).ready(function() {
 		$content = '
 			<span class="input-append date span12 datepicker" id="'.$varName.'date" data-date="'.$defDate.'" data-selectmenu="presetexpdate" data-date-format="'.$dateformat.'"'.($lang ? ' data-date-language="'.str_replace('_', '-', $lang).'"' : '').($startdate ? ' data-date-start-date="'.$startdate.'"' : '').($enddate ? ' data-date-end-date="'.$enddate.'"' : '').'>
 				<input class="span6" size="16" name="'.$varName.'" id="'.$varName.'" type="text" value="'.$defDate.'" autocomplete="off">
-				<span class="add-on"><i class="icon-calendar"></i></span>
+				<span class="add-on"><i class="fa fa-calendar"></i></span>
 			</span>';
 		return $content;
 	} /* }}} */
@@ -1246,7 +1245,7 @@ function folderSelected<?php echo $formName ?>(id, name) {
 		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
 		$content .= "<div class=\"input-append\">\n";
 		$content .= "<input type=\"text\" id=\"choosefoldersearch".$form."\" data-target=\"".$formid."\" data-provide=\"typeahead\"  name=\"targetname".$form."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" target=\"".$formid."\"/>";
-		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfolder".$form."\"><i class=\"icon-remove\"></i></button>";
+		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfolder".$form."\"><i class=\"fa fa-remove\"></i></button>";
 		$content .= "<a data-target=\"#folderChooser".$form."\" href=\"../out/out.FolderChooser.php?form=".$form."&mode=".$accessMode."&exclude=".$exclude."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("folder")."…</a>\n";
 		$content .= "</div>\n";
 		$content .= '
@@ -1335,7 +1334,7 @@ $(document).ready(function() {
 		print "<input type=\"hidden\" name=\"categoryid".$formName."\" value=\"".implode(',', $ids)."\">";
 		print "<div class=\"input-append\">\n";
 		print "<input type=\"text\" disabled name=\"categoryname".$formName."\" value=\"".implode(' ', $names)."\">";
-		print "<button type=\"button\" class=\"btn\" onclick=\"javascript:clearCategory".$formName."();\"><i class=\"icon-remove\"></i></button>";
+		print "<button type=\"button\" class=\"btn\" onclick=\"javascript:clearCategory".$formName."();\"><i class=\"fa fa-remove\"></i></button>";
 		print "<a data-target=\"#categoryChooser\" href=\"../out/out.CategoryChooser.php?form=form1&cats=".implode(',', $ids)."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("category")."…</a>\n";
 		print "</div>\n";
 ?>
@@ -1349,7 +1348,7 @@ $(document).ready(function() {
   </div>
   <div class="modal-footer">
     <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true"><?php printMLText("close") ?></button>
-    <button class="btn" data-dismiss="modal" aria-hidden="true" onClick="acceptCategories();"><i class="icon-save"></i> <?php printMLText("save") ?></button>
+    <button class="btn" data-dismiss="modal" aria-hidden="true" onClick="acceptCategories();"><i class="fa fa-save"></i> <?php printMLText("save") ?></button>
   </div>
 </div>
 <?php
@@ -1377,7 +1376,7 @@ $(document).ready(function() {
   </div>
   <div class="modal-footer">
     <button class="btn" data-dismiss="modal" aria-hidden="true">'. getMLText("close").'</button>
-    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true" id="acceptkeywords"><i class="icon-save"></i> '.getMLText("save").'</button>
+    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true" id="acceptkeywords"><i class="fa fa-save"></i> '.getMLText("save").'</button>
   </div>
 </div>';
 		return $content;
@@ -1419,7 +1418,7 @@ $(document).ready(function() {
 				$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
         $content .= '<span class="input-append date datepicker" data-date="'.date('Y-m-d').'" data-date-format="yyyy-mm-dd" data-date-language="'.str_replace('_', '-', $this->params['session']->getLanguage()).'">
 					<input id="'.$fieldname.'_'.$attrdef->getId().'" class="span9" size="16" name="'.$fieldname.'['.$attrdef->getId().']" type="text" value="'.($objvalue ? $objvalue : '').'">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
 				</span>';
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_email:
@@ -1475,7 +1474,7 @@ $(document).ready(function() {
 	function getDropFolderChooserHtml($formName, $dropfolderfile="", $showfolders=0) { /* {{{ */
 		$content =  "<div class=\"input-append\">\n";
 		$content .= "<input readonly type=\"text\" id=\"dropfolderfile".$formName."\" name=\"dropfolderfile".$formName."\" value=\"".$dropfolderfile."\">";
-		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfilename".$formName."\"><i class=\"icon-remove\"></i></button>";
+		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfilename".$formName."\"><i class=\"fa fa-remove\"></i></button>";
 		$content .= "<a data-target=\"#dropfolderChooser\" href=\"../out/out.DropFolderChooser.php?form=".$formName."&dropfolderfile=".urlencode($dropfolderfile)."&showfolders=".$showfolders."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))."…</a>\n";
 		$content .= "</div>\n";
 		$content .= '
@@ -1734,8 +1733,8 @@ $(function() {
 		selectable: true,
 		data: data,
 		saveState: 'jqtree<?php echo $formid; ?>',
-		openedIcon: $('<i class="icon-minus-sign"></i>'),
-		closedIcon: $('<i class="icon-plus-sign"></i>'),
+		openedIcon: $('<i class="fa fa-minus-circle"></i>'),
+		closedIcon: $('<i class="fa fa-plus-circle"></i>'),
 		_onCanSelectNode: function(node) {
 			if(node.is_folder) {
 				folderSelected<?php echo $formid ?>(node.id, node.name);
@@ -1747,9 +1746,9 @@ $(function() {
     onCreateLi: function(node, $li) {
         // Add 'icon' span before title
 				if(node.is_folder)
-					$li.find('.jqtree-title').before('<i class="icon-folder-close-alt table-row-folder droptarget" data-droptarget="folder_' + node.id + '" rel="folder_' + node.id + '"></i> ').attr('rel', 'folder_' + node.id).attr('formtoken', '<?php echo createFormKey(''); ?>').attr('data-uploadformtoken', '<?php echo createFormKey(''); ?>');
+					$li.find('.jqtree-title').before('<i class="fa fa-folder-o table-row-folder droptarget" data-droptarget="folder_' + node.id + '" rel="folder_' + node.id + '"></i> ').attr('rel', 'folder_' + node.id).attr('formtoken', '<?php echo createFormKey(''); ?>').attr('data-uploadformtoken', '<?php echo createFormKey(''); ?>');
 				else
-					$li.find('.jqtree-title').before('<i class="icon-file"></i> ');
+					$li.find('.jqtree-title').before('<i class="fa fa-file"></i> ');
     }
 	});
 	// Unfold node for currently selected folder
@@ -1840,7 +1839,7 @@ $(function() {
 	 */
 	function __printTreeNavigation($folderid, $showtree){ /* {{{ */
 		if ($showtree==1){
-			$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=0\"><i class=\"icon-minus-sign\"></i></a>", true);
+			$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=0\"><i class=\"fa fa-minus-circle\"></i></a>", true);
 			$this->contentContainerStart();
 ?>
 	<script language="JavaScript">
@@ -1852,7 +1851,7 @@ $(function() {
 			$this->printNewTreeNavigation($folderid, M_READ, 0, '');
 			$this->contentContainerEnd();
 		} else {
-			$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=1\"><i class=\"icon-plus-sign\"></i></a>", true);
+			$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=1\"><i class=\"fa fa-plus-circle\"></i></a>", true);
 		}
 	} /* }}} */
 
@@ -1863,7 +1862,7 @@ $(function() {
 	 */
 	function printClipboard($clipboard, $previewer){ /* {{{ */
 		echo "<div id=\"clipboard-container\" class=\"_clipboard-container\">\n";
-		$this->contentHeading(getMLText("clipboard").'<span id="clipboard-float"><i class="icon-sort"></i></span>', true);
+		$this->contentHeading(getMLText("clipboard").'<span id="clipboard-float"><i class="fa fa-sort"></i></span>', true);
 		echo "<div id=\"main-clipboard\">\n";
 ?>
 		<div class="ajax" data-view="Clipboard" data-action="mainClipboard"></div>
@@ -1893,7 +1892,7 @@ $(function() {
 	function printDeleteDocumentButton($document, $msg, $return=false){ /* {{{ */
 		$docid = $document->getID();
 		$content = '';
-    $content .= '<a class="delete-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_document", array ("documentname" => $document->getName())), ENT_QUOTES).'"><i class="icon-remove"></i></a>';
+    $content .= '<a class="delete-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_document", array ("documentname" => $document->getName())), ENT_QUOTES).'"><i class="fa fa-remove"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -1912,7 +1911,7 @@ $(function() {
 				msg = $(ev.currentTarget).attr('msg');
 				formtoken = '".createFormKey('removedocument')."';
 				bootbox.dialog(confirmmsg, [{
-					\"label\" : \"<i class='icon-remove'></i> ".getMLText("rm_document")."\",
+					\"label\" : \"<i class='fa fa-remove'></i> ".getMLText("rm_document")."\",
 					\"class\" : \"btn-danger\",
 					\"callback\": function() {
 						$.get('../op/op.Ajax.php',
@@ -1967,7 +1966,7 @@ $(function() {
 	function printDeleteFolderButton($folder, $msg, $return=false){ /* {{{ */
 		$folderid = $folder->getID();
 		$content = '';
-		$content .= '<a class="delete-folder-btn" rel="'.$folderid.'" msg="'.getMLText($msg).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_folder", array ("foldername" => $folder->getName())), ENT_QUOTES).'"><i class="icon-remove"></i></a>';
+		$content .= '<a class="delete-folder-btn" rel="'.$folderid.'" msg="'.getMLText($msg).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_folder", array ("foldername" => $folder->getName())), ENT_QUOTES).'"><i class="fa fa-remove"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -1986,7 +1985,7 @@ $(function() {
 				msg = $(ev.currentTarget).attr('msg');
 				formtoken = '".createFormKey('removefolder')."';
 				bootbox.dialog(confirmmsg, [{
-					\"label\" : \"<i class='icon-remove'></i> ".getMLText("rm_folder")."\",
+					\"label\" : \"<i class='fa fa-remove'></i> ".getMLText("rm_folder")."\",
 					\"class\" : \"btn-danger\",
 					\"callback\": function() {
 						$.get('../op/op.Ajax.php',
@@ -2039,7 +2038,7 @@ $(function() {
 			$title = 'lock_document';
 		}
 		$content = '';
-    $content .= '<a class="lock-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" title="'.getMLText($title).'"><i class="icon-'.$icon.'"></i></a>';
+    $content .= '<a class="lock-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" title="'.getMLText($title).'"><i class="fa fa-'.$icon.'"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -2058,7 +2057,7 @@ $(function() {
 	 * @param array $ids list of option values
 	 */
 	function getSelectPresetButtonHtml($name, $ids) { /* {{{ */
-		return '<span id="'.$name.'_btn" class="selectpreset_btn" style="cursor: pointer;" title="'.getMLText("takeOver".$name).'" data-ref="'.$name.'" data-ids="'.implode(",", $ids).'"><i class="icon-arrow-left"></i></span>';
+		return '<span id="'.$name.'_btn" class="selectpreset_btn" style="cursor: pointer;" title="'.getMLText("takeOver".$name).'" data-ref="'.$name.'" data-ids="'.implode(",", $ids).'"><i class="fa fa-arrow-left"></i></span>';
 	} /* }}} */
 
 	/**
@@ -2110,7 +2109,7 @@ $(document).ready( function() {
 	 * @param string $text text
 	 */
 	function getInputPresetButtonHtml($name, $text, $sep='') { /* {{{ */
-		return '<span id="'.$name.'_btn" class="inputpreset_btn" style="cursor: pointer;" title="'.getMLText("takeOverAttributeValue").'" data-ref="'.$name.'" data-text="'.(is_array($text) ? implode($sep, $text) : htmlspecialchars($text)).'"'.($sep ? " data-sep=\"".$sep."\"" : "").'><i class="icon-arrow-left"></i></span>';
+		return '<span id="'.$name.'_btn" class="inputpreset_btn" style="cursor: pointer;" title="'.getMLText("takeOverAttributeValue").'" data-ref="'.$name.'" data-text="'.(is_array($text) ? implode($sep, $text) : htmlspecialchars($text)).'"'.($sep ? " data-sep=\"".$sep."\"" : "").'><i class="fa fa-arrow-left"></i></span>';
 	} /* }}} */
 
 	/**
@@ -2167,7 +2166,7 @@ $(document).ready( function() {
 	 */
 	function getCheckboxPresetButtonHtml($name, $text) { /* {{{ */
 ?>
-		return '<span id="'.$name.'_btn" class="checkboxpreset_btn" style="cursor: pointer;" title="'.getMLText("takeOverAttributeValue").'" data-ref="'.$name.'" data-text="'.(is_array($text) ? implode($sep, $text) : htmlspecialchars($text)).'"'.($sep ? " data-sep=\"".$sep."\"" : "").'><i class="icon-arrow-left"></i></span>';
+		return '<span id="'.$name.'_btn" class="checkboxpreset_btn" style="cursor: pointer;" title="'.getMLText("takeOverAttributeValue").'" data-ref="'.$name.'" data-text="'.(is_array($text) ? implode($sep, $text) : htmlspecialchars($text)).'"'.($sep ? " data-sep=\"".$sep."\"" : "").'><i class="fa fa-arrow-left"></i></span>';
 <?php
 	} /* }}} */
 
@@ -2228,7 +2227,7 @@ $(document).ready( function() {
 	 */
 	function printDeleteAttributeValueButton($attrdef, $value, $msg, $return=false){ /* {{{ */
 		$content = '';
-    $content .= '<a class="delete-attribute-value-btn" rel="'.$attrdef->getID().'" msg="'.getMLText($msg).'" attrvalue="'.htmlspecialchars($value, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_attr_value", array ("attrdefname" => $attrdef->getName())), ENT_QUOTES).'"><i class="icon-remove"></i></a>';
+    $content .= '<a class="delete-attribute-value-btn" rel="'.$attrdef->getID().'" msg="'.getMLText($msg).'" attrvalue="'.htmlspecialchars($value, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_attr_value", array ("attrdefname" => $attrdef->getName())), ENT_QUOTES).'"><i class="fa fa-remove"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -2247,7 +2246,7 @@ $(document).ready( function() {
 				msg = $(ev.currentTarget).attr('msg');
 				formtoken = '".createFormKey('removeattrvalue')."';
 				bootbox.dialog(confirmmsg, [{
-					\"label\" : \"<i class='icon-remove'></i> ".getMLText("rm_attr_value")."\",
+					\"label\" : \"<i class='fa fa-remove'></i> ".getMLText("rm_attr_value")."\",
 					\"class\" : \"btn-danger\",
 					\"callback\": function() {
 						$.post('../op/op.AttributeMgr.php',
@@ -2457,18 +2456,18 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 			if($document->getAccessMode($user) >= M_ALL) {
 				$content .= $this->printDeleteDocumentButton($document, 'splash_rm_document', true);
 			} else {
-				$content .= '<span style="padding: 2px; color: #CCC;"><i class="icon-remove"></i></span>';
+				$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-remove"></i></span>';
 			}
 			if($document->getAccessMode($user) >= M_READWRITE) {
-				$content .= '<a href="../out/out.EditDocument.php?documentid='.$docID.'" title="'.getMLText("edit_document_props").'"><i class="icon-edit"></i></a>';
+				$content .= '<a href="../out/out.EditDocument.php?documentid='.$docID.'" title="'.getMLText("edit_document_props").'"><i class="fa fa-edit"></i></a>';
 			} else {
-				$content .= '<span style="padding: 2px; color: #CCC;"><i class="icon-edit"></i></span>';
+				$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
 			}
 			if($document->getAccessMode($user) >= M_READWRITE) {
 				$content .= $this->printLockButton($document, 'splash_document_locked', 'splash_document_unlocked', true);
 			}
 			if($enableClipboard) {
-				$content .= '<a class="addtoclipboard" rel="D'.$docID.'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="icon-copy"></i></a>';
+				$content .= '<a class="addtoclipboard" rel="D'.$docID.'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="fa fa-copy"></i></a>';
 			}
 			if(!empty($extracontent['end_action_list']))
 				$content .= $extracontent['end_action_list'];
@@ -2587,15 +2586,15 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 		if($subFolderAccessMode >= M_ALL) {
 			$content .= $this->printDeleteFolderButton($subFolder, 'splash_rm_folder', true);
 		} else {
-			$content .= '<span style="padding: 2px; color: #CCC;"><i class="icon-remove"></i></span>';
+			$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-remove"></i></span>';
 		}
 		if($subFolderAccessMode >= M_READWRITE) {
-			$content .= '<a class_="btn btn-mini" href="../out/out.EditFolder.php?folderid='.$subFolder->getID().'" title="'.getMLText("edit_folder_props").'"><i class="icon-edit"></i></a>';
+			$content .= '<a class_="btn btn-mini" href="../out/out.EditFolder.php?folderid='.$subFolder->getID().'" title="'.getMLText("edit_folder_props").'"><i class="fa fa-edit"></i></a>';
 		} else {
-			$content .= '<span style="padding: 2px; color: #CCC;"><i class="icon-edit"></i></span>';
+			$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
 		}
 		if($enableClipboard) {
-			$content .= '<a class="addtoclipboard" rel="F'.$subFolder->getID().'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="icon-copy"></i></a>';
+			$content .= '<a class="addtoclipboard" rel="F'.$subFolder->getID().'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="fa fa-copy"></i></a>';
 		}
 		if(!empty($extracontent['end_action_list']))
 			$content .= $extracontent['end_action_list'];
@@ -2860,13 +2859,13 @@ $(document).ready(function() {
 			case "review":
 				if($rec['file']) {
 					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$document->getID()."&reviewlogid=".$rec['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+					echo "<a href=\"../op/op.Download.php?documentid=".$document->getID()."&reviewlogid=".$rec['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
 				}
 				break;
 			case "approval":
 				if($rec['file']) {
 					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$document->getID()."&approvelogid=".$rec['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+					echo "<a href=\"../op/op.Download.php?documentid=".$document->getID()."&approvelogid=".$rec['approveLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
 				}
 				break;
 			}
@@ -2998,7 +2997,7 @@ $("body").on("click", "span.openpopupbox", function(e) {
 		<span class="openpopupbox" data-href="#'.$id.'">'.$title.'</span>
 		<div id="'.$id.'" class="popupbox" style="display: none;">
 		'.$content.'
-			<span class="closepopupbox"><i class="icon-remove"></i></span>
+			<span class="closepopupbox"><i class="fa fa-remove"></i></span>
 		</div>';
 		if($ret)
 			return $html;
diff --git a/views/bootstrap/class.Calendar.php b/views/bootstrap/class.Calendar.php
index 9410c3f02..7529ad3ea 100644
--- a/views/bootstrap/class.Calendar.php
+++ b/views/bootstrap/class.Calendar.php
@@ -100,7 +100,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style {
 					'required'=>$strictformcheck
 				)
 			);
-			$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
@@ -112,7 +112,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style {
   <?php echo createHiddenFieldWithKey('removeevent'); ?>
 	<input type="hidden" name="eventid" value="<?php echo intval($event["id"]); ?>">
 	<p><?php printMLText("confirm_rm_event", array ("name" => htmlspecialchars($event["name"])));?></p>
-	<button class="btn" type="submit"><i class="icon-remove"></i> <?php printMLText("delete");?></button>
+	<button class="btn" type="submit"><i class="fa fa-remove"></i> <?php printMLText("delete");?></button>
 </form>
 <?php
 			$this->contentContainerEnd();
@@ -381,12 +381,12 @@ $(document).ready(function() {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/fullcalendar/lib/moment.min.js"></script>'."\n", 'js');
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/fullcalendar/fullcalendar.min.js"></script>'."\n", 'js');
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/fullcalendar/locale-all.js"></script>'."\n", 'js');
-		$this->htmlAddHeader('<link href="../styles/'.$this->theme.'/fullcalendar/fullcalendar.min.css" rel="stylesheet"></link>'."\n", 'css');
-		$this->htmlAddHeader('<link href="../styles/'.$this->theme.'/fullcalendar/fullcalendar.print.min.css" rel="stylesheet" media="print"></link>'."\n", 'css');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/moment/moment.min.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/fullcalendar/fullcalendar.min.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/fullcalendar/locale-all.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<link href="../views/'.$this->theme.'/vendors/fullcalendar/fullcalendar.min.css" rel="stylesheet"></link>'."\n", 'css');
+		$this->htmlAddHeader('<link href="../views/'.$this->theme.'/vendors/fullcalendar/fullcalendar.print.min.css" rel="stylesheet" media="print"></link>'."\n", 'css');
 
 		$this->htmlStartPage(getMLText("calendar"));
 		$this->globalNavigation();
diff --git a/views/bootstrap/class.Categories.php b/views/bootstrap/class.Categories.php
index d9bb247a9..29045f79b 100644
--- a/views/bootstrap/class.Categories.php
+++ b/views/bootstrap/class.Categories.php
@@ -97,7 +97,7 @@ $(document).ready( function() {
 						<?php echo createHiddenFieldWithKey('removecategory'); ?>
 						<input type="hidden" name="categoryid" value="<?php echo $selcat->getID()?>">
 						<input type="hidden" name="action" value="removecategory">
-						<button class="btn" type="submit"><i class="icon-remove"></i> <?php echo getMLText("rm_document_category")?></button>
+						<button class="btn" type="submit"><i class="fa fa-remove"></i> <?php echo getMLText("rm_document_category")?></button>
 						</form>
 <?php
 		}
@@ -124,7 +124,7 @@ $(document).ready( function() {
 					'value'=>($category ? htmlspecialchars($category->getName()) : '')
 				)
 			);
-			$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 				</form>
 
diff --git a/views/bootstrap/class.ClearCache.php b/views/bootstrap/class.ClearCache.php
index 91c8f4cd7..3699c04ce 100644
--- a/views/bootstrap/class.ClearCache.php
+++ b/views/bootstrap/class.ClearCache.php
@@ -61,7 +61,7 @@ class SeedDMS_View_ClearCache extends SeedDMS_Bootstrap_Style {
 				echo "<p><input type=\"checkbox\" name=\"".$c[0]."\" value=\"1\" checked> ".$c[1]."</p>";
 		}
 ?>
-<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("clear_cache");?></button></p>
+<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("clear_cache");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.Clipboard.php b/views/bootstrap/class.Clipboard.php
index 053b3df1e..ec711b891 100644
--- a/views/bootstrap/class.Clipboard.php
+++ b/views/bootstrap/class.Clipboard.php
@@ -53,15 +53,15 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
 		$content = '';
 		$content .= "   <ul id=\"main-menu-clipboard\" class=\"nav pull-right\">\n";
 		$content .= "    <li class=\"dropdown add-clipboard-area\">\n";
-		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-clipboard-area\">".getMLText('clipboard')." (".count($clipboard['folders'])."/".count($clipboard['docs']).") <i class=\"icon-caret-down\"></i></a>\n";
+		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-clipboard-area\">".getMLText('clipboard')." (".count($clipboard['folders'])."/".count($clipboard['docs']).") <i class=\"fa fa-caret-down\"></i></a>\n";
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		foreach($clipboard['folders'] as $folderid) {
 			if($folder = $this->params['dms']->getFolder($folderid))
-				$content .= "    <li><a href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\" class=\"table-row-folder droptarget\" data-droptarget=\"folder_".$folder->getID()."\" rel=\"folder_".$folder->getID()."\" data-name=\"".htmlspecialchars($folder->getName(), ENT_QUOTES)."\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\"><i class=\"icon-folder-close-alt\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
+				$content .= "    <li><a href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\" class=\"table-row-folder droptarget\" data-droptarget=\"folder_".$folder->getID()."\" rel=\"folder_".$folder->getID()."\" data-name=\"".htmlspecialchars($folder->getName(), ENT_QUOTES)."\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\"><i class=\"fa fa-folder-o\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
 		}
 		foreach($clipboard['docs'] as $docid) {
 			if($document = $this->params['dms']->getDocument($docid))
-				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\" class=\"table-row-document droptarget\" data-droptarget=\"document_".$document->getID()."\" rel=\"document_".$document->getID()."\" data-name=\"".htmlspecialchars($document->getName(), ENT_QUOTES)."\" formtoken=\"".createFormKey('')."\"><i class=\"icon-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
+				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\" class=\"table-row-document droptarget\" data-droptarget=\"document_".$document->getID()."\" rel=\"document_".$document->getID()."\" data-name=\"".htmlspecialchars($document->getName(), ENT_QUOTES)."\" formtoken=\"".createFormKey('')."\"><i class=\"fa fa-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
 		}
 		$content .= "    <li class=\"divider\"></li>\n";
 		if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) {
@@ -112,7 +112,7 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
 		}
 		$content .= "</td>\n";
 		$content .= "<td>\n";
-		$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folder->getID()."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
+		$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folder->getID()."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"fa fa-remove\"></i></a></div>";
 		$content .= "</td>\n";
 		$content .= "</tr>\n";
 
@@ -158,7 +158,7 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
 			}
 			$content .= "</td>\n";
 			$content .= "<td>\n";
-			$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"D".$document->getID()."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$document->getID()."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
+			$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"D".$document->getID()."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$document->getID()."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"fa fa-remove\"></i></a></div>";
 			$content .= "</td>\n";
 			$content .= "</tr>";
 		}
diff --git a/views/bootstrap/class.DefaultKeywords.php b/views/bootstrap/class.DefaultKeywords.php
index 5aa4e4198..f2b61e03f 100644
--- a/views/bootstrap/class.DefaultKeywords.php
+++ b/views/bootstrap/class.DefaultKeywords.php
@@ -128,7 +128,7 @@ $(document).ready( function() {
 						<?php echo createHiddenFieldWithKey('removecategory'); ?>
 						<input type="hidden" name="categoryid" value="<?php echo $selcategoryid?>">
 						<input type="hidden" name="action" value="removecategory">
-						<button class="btn" type="submit"><i class="icon-remove"></i> <?php echo getMLText("rm_default_keyword_category")?></button>
+						<button class="btn" type="submit"><i class="fa fa-remove"></i> <?php echo getMLText("rm_default_keyword_category")?></button>
 						</form>
 <?php
 		}
@@ -159,7 +159,7 @@ $(document).ready( function() {
 					'value'=>''
 				)
 			);
-			$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('new_default_keyword_category'));
+			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('new_default_keyword_category'));
 ?>
 			</form>
 <?php
@@ -175,7 +175,7 @@ $(document).ready( function() {
 							<input type="hidden" name="action" value="editcategory">
 							<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
 							<input name="name" class="name" type="text" value="<?php echo htmlspecialchars($category->getName()) ?>">
-							<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button>
+							<button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText("save");?></button>
 						</form>
 					</div>
 				</div>
@@ -196,7 +196,7 @@ $(document).ready( function() {
 									<input type="Hidden" name="keywordsid" value="<?php echo $list["id"]?>">
 									<input type="Hidden" name="action" value="editkeywords">
 									<input name="keywords" class="keywords" type="text" value="<?php echo htmlspecialchars($list["keywords"]) ?>">
-									<button class="btn" title="<?php echo getMLText("save")?>"><i class="icon-save"></i> <?php echo getMLText("save")?></button>
+									<button class="btn" title="<?php echo getMLText("save")?>"><i class="fa fa-save"></i> <?php echo getMLText("save")?></button>
 									<!--	 <input name="action" value="removekeywords" type="Image" src="images/del.gif" title="<?php echo getMLText("delete")?>" border="0"> &nbsp; -->
 									</form>
 									<form style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php" >
@@ -204,7 +204,7 @@ $(document).ready( function() {
 									<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
 									<input type="hidden" name="keywordsid" value="<?php echo $list["id"]?>">
 									<input type="hidden" name="action" value="removekeywords">
-									<button class="btn" title="<?php echo getMLText("delete")?>"><i class="icon-remove"></i> <?php echo getMLText("delete")?></button>
+									<button class="btn" title="<?php echo getMLText("delete")?>"><i class="fa fa-remove"></i> <?php echo getMLText("delete")?></button>
 									</form>
 									<br>
 						<?php }  ?>
diff --git a/views/bootstrap/class.DocumentAccess.php b/views/bootstrap/class.DocumentAccess.php
index f45241a4a..3471dc6b4 100644
--- a/views/bootstrap/class.DocumentAccess.php
+++ b/views/bootstrap/class.DocumentAccess.php
@@ -120,7 +120,7 @@ $(document).ready( function() {
 				'options'=>$options
 			)
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 	</form>
 <?php
@@ -180,7 +180,7 @@ $(document).ready( function() {
 			getMLText("default_access"),
 			$this->getAccessModeSelection($document->getDefaultAccess())
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 
@@ -234,7 +234,7 @@ $(document).ready( function() {
 			getMLText("access_mode"),
 			$this->getAccessModeSelection(M_READ)
 		);
-		$this->formSubmit("<i class=\"icon-plus\"></i> ".getMLText('add'));
+		$this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add'));
 ?>
 </form>
 <?php
@@ -255,7 +255,7 @@ $(document).ready( function() {
 				$userObj = $userAccess->getUser();
 				$memusers[] = $userObj->getID();
 				print "<tr>\n";
-				print "<td><i class=\"icon-user\"></i></td>\n";
+				print "<td><i class=\"fa fa-user\"></i></td>\n";
 				print "<td>". htmlspecialchars($userObj->getFullName()) . "</td>\n";
 				print "<form action=\"../op/op.DocumentAccess.php\">\n";
 				print "<td>\n";
@@ -266,7 +266,7 @@ $(document).ready( function() {
 				print "<input type=\"Hidden\" name=\"documentid\" value=\"".$document->getId()."\">\n";
 				print "<input type=\"hidden\" name=\"action\" value=\"editaccess\">\n";
 				print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
-				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-save\"></i> ".getMLText("save")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
 				print "</td>\n";
 				print "</form>\n";
 				print "<form action=\"../op/op.DocumentAccess.php\">\n";
@@ -275,7 +275,7 @@ $(document).ready( function() {
 				print "<input type=\"Hidden\" name=\"documentid\" value=\"".$document->getId()."\">\n";
 				print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
 				print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
-				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 				print "<span></td>\n";
 				print "</form>\n";
 				print "</tr>\n";
@@ -286,7 +286,7 @@ $(document).ready( function() {
 				$memgroups[] = $groupObj->getID();
 				$mode = $groupAccess->getMode();
 				print "<tr>";
-				print "<td><i class=\"icon-group\"></i></td>";
+				print "<td><i class=\"fa fa-group\"></i></td>";
 				print "<td>". htmlspecialchars($groupObj->getName()) . "</td>";
 				print "<form action=\"../op/op.DocumentAccess.php\">";
 				print "<td>";
@@ -297,7 +297,7 @@ $(document).ready( function() {
 				print "<input type=\"hidden\" name=\"documentid\" value=\"".$document->getId()."\">";
 				print "<input type=\"hidden\" name=\"action\" value=\"editaccess\">";
 				print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">";
-				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-save\"></i> ".getMLText("save")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
 				print "</span></td>\n";
 				print "</form>";
 				print "<form action=\"../op/op.DocumentAccess.php\">\n";
@@ -306,7 +306,7 @@ $(document).ready( function() {
 				print "<input type=\"hidden\" name=\"documentid\" value=\"".$document->getId()."\">\n";
 				print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
 				print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">\n";
-				print "<button type=\"submit\" class=\"btn btn-mini\"\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 				print "</form>";
 				print "</span></td>\n";
 				print "</tr>\n";
diff --git a/views/bootstrap/class.DocumentNotify.php b/views/bootstrap/class.DocumentNotify.php
index 8d7317b0e..de9096b65 100644
--- a/views/bootstrap/class.DocumentNotify.php
+++ b/views/bootstrap/class.DocumentNotify.php
@@ -151,7 +151,7 @@ $(document).ready( function() {
 		else {
 			foreach ($notifyList["users"] as $userNotify) {
 				print "<tr>";
-				print "<td><i class=\"icon-user\"></i></td>";
+				print "<td><i class=\"fa fa-user\"></i></td>";
 				print "<td>" . htmlspecialchars($userNotify->getLogin() . " - " . $userNotify->getFullName()) . "</td>";
 				if ($user->isAdmin() || $user->getID() == $userNotify->getID()) {
 					print "<form action=\"../op/op.DocumentNotify.php\" method=\"post\">\n";
@@ -160,7 +160,7 @@ $(document).ready( function() {
 					print "<input type=\"hidden\" name=\"action\" value=\"delnotify\">\n";
 					print "<input type=\"hidden\" name=\"userid\" value=\"".$userNotify->getID()."\">\n";
 					print "<td>";
-					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 					print "</td>";
 					print "</form>\n";
 				}else print "<td></td>";
@@ -168,7 +168,7 @@ $(document).ready( function() {
 			}
 			foreach ($notifyList["groups"] as $groupNotify) {
 				print "<tr>";
-				print "<td><i class=\"icon-group\"></i></td>";
+				print "<td><i class=\"fa fa-group\"></i></td>";
 				print "<td>" . htmlspecialchars($groupNotify->getName()) . "</td>";
 				if ($user->isAdmin() || $groupNotify->isMember($user,true)) {
 					print "<form action=\"../op/op.DocumentNotify.php\" method=\"post\">\n";
@@ -177,7 +177,7 @@ $(document).ready( function() {
 					print "<input type=\"hidden\" name=\"action\" value=\"delnotify\">\n";
 					print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupNotify->getID()."\">\n";
 					print "<td>";
-					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 					print "</td>";
 					print "</form>\n";
 				}else print "<td></td>";
diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index 91b1781be..9313f30af 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -236,26 +236,26 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		//if (($document->getAccessMode($user) >= M_READWRITE)) {
 		print "<ul class=\"actions unstyled\">";
 		if ($file_exists){
-			print "<li><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$version->getVersion()."\" title=\"".htmlspecialchars($version->getMimeType())."\"><i class=\"icon-download\"></i> ".getMLText("download")."</a>";
+			print "<li><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$version->getVersion()."\" title=\"".htmlspecialchars($version->getMimeType())."\"><i class=\"fa fa-download\"></i> ".getMLText("download")."</a>";
 			if ($viewonlinefiletypes && (in_array(strtolower($version->getFileType()), $viewonlinefiletypes) || in_array(strtolower($version->getMimeType()), $viewonlinefiletypes)))
-				print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-star\"></i> " . getMLText("view_online") . "</a>";
+				print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"fa fa-star\"></i> " . getMLText("view_online") . "</a>";
 			print "</ul>";
 			print "<ul class=\"actions unstyled\">";
 		}
 
 		if (($enableversionmodification && ($document->getAccessMode($user) >= M_READWRITE)) || $user->isAdmin()) {
-			print "<li><a href=\"out.RemoveVersion.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-remove\"></i> ".getMLText("rm_version")."</a></li>";
+			print "<li><a href=\"out.RemoveVersion.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"fa fa-remove\"></i> ".getMLText("rm_version")."</a></li>";
 		}
 		if (($enableversionmodification && ($document->getAccessMode($user) == M_ALL)) || $user->isAdmin()) {
 			if ( $status["status"]==S_RELEASED || $status["status"]==S_OBSOLETE ){
-				print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$document->getID()."&version=".$version->getVersion()."'><i class=\"icon-align-justify\"></i>".getMLText("change_status")."</a></li>";
+				print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$document->getID()."&version=".$version->getVersion()."'><i class=\"fa fa-align-justify\"></i>".getMLText("change_status")."</a></li>";
 			}
 		}
 		if (($enableversionmodification && ($document->getAccessMode($user) >= M_READWRITE)) || $user->isAdmin()) {
 			if($status["status"] != S_OBSOLETE)
-				print "<li><a href=\"out.EditComment.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-comment\"></i> ".getMLText("edit_comment")."</a></li>";
+				print "<li><a href=\"out.EditComment.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"fa fa-comment\"></i> ".getMLText("edit_comment")."</a></li>";
 			if ( $status["status"] == S_DRAFT_REV){
-				print "<li><a href=\"out.EditAttributes.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-edit\"></i> ".getMLText("edit_attributes")."</a></li>";
+				print "<li><a href=\"out.EditAttributes.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"fa fa-edit\"></i> ".getMLText("edit_attributes")."</a></li>";
 		}
 			print "</ul>";
 		}
@@ -435,15 +435,15 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 			
 				print "<td><ul class=\"unstyled actions\">";
 				if ($file_exists) {
-					print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&file=".$file->getID()."\"><i class=\"icon-download\"></i>".getMLText('download')."</a></li>";
+					print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&file=".$file->getID()."\"><i class=\"fa fa-download\"></i>".getMLText('download')."</a></li>";
 					if ($viewonlinefiletypes && (in_array(strtolower($file->getFileType()), $viewonlinefiletypes) || in_array(strtolower($file->getMimeType()), $viewonlinefiletypes))) {
-						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a></li>";
+						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\"><i class=\"fa fa-star\"></i>" . getMLText("view_online") . "</a></li>";
 					}
 				} else print "<li><img class=\"mimeicon\" src=\"images/icons/".$this->getMimeIcon($file->getFileType())."\" title=\"".htmlspecialchars($file->getMimeType())."\">";
 				echo "</ul><ul class=\"unstyled actions\">";
 				if (($document->getAccessMode($user) == M_ALL)||($file->getUserID()==$user->getID())) {
-					print "<li><a href=\"out.RemoveDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"icon-remove\"></i>".getMLText("delete")."</a></li>";
-					print "<li><a href=\"out.EditDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"icon-edit\"></i>".getMLText("edit")."</a></li>";
+					print "<li><a href=\"out.RemoveDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"fa fa-remove\"></i>".getMLText("delete")."</a></li>";
+					print "<li><a href=\"out.EditDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"fa fa-edit\"></i>".getMLText("edit")."</a></li>";
 				}
 				print "</ul></td>";		
 				
diff --git a/views/bootstrap/class.DropFolderChooser.php b/views/bootstrap/class.DropFolderChooser.php
index e23e1d7ce..d668fae80 100644
--- a/views/bootstrap/class.DropFolderChooser.php
+++ b/views/bootstrap/class.DropFolderChooser.php
@@ -100,7 +100,7 @@ $('.folderselect').click(function(ev) {
 		if($c) {
 			$content .= "   <ul id=\"main-menu-dropfolderlist\" class=\"nav pull-right\">\n";
 			$content .= "    <li class=\"dropdown add-dropfolderlist-area\">\n";
-			$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-dropfolderlist-area\">".getMLText('menu_dropfolder')." (".$c.") <i class=\"icon-caret-down\"></i></a>\n";
+			$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-dropfolderlist-area\">".getMLText('menu_dropfolder')." (".$c.") <i class=\"fa fa-caret-down\"></i></a>\n";
 			$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 			$content .= $filecontent;
 			$content .= "     </ul>\n";
diff --git a/views/bootstrap/class.EditAttributes.php b/views/bootstrap/class.EditAttributes.php
index 83616a1b3..2c98436f4 100644
--- a/views/bootstrap/class.EditAttributes.php
+++ b/views/bootstrap/class.EditAttributes.php
@@ -75,7 +75,7 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style {
 		} elseif(is_string($arrs)) {
 			echo $arrs;
 		}
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.EditComment.php b/views/bootstrap/class.EditComment.php
index bc131ee27..8f049b377 100644
--- a/views/bootstrap/class.EditComment.php
+++ b/views/bootstrap/class.EditComment.php
@@ -99,7 +99,7 @@ $(document).ready(function() {
 				'value'=>htmlspecialchars($version->getComment())
 			)
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php
index 31f281d15..d05626805 100644
--- a/views/bootstrap/class.EditDocument.php
+++ b/views/bootstrap/class.EditDocument.php
@@ -74,7 +74,7 @@ $(document).ready( function() {
 		$nodocumentformfields = $this->params['nodocumentformfields'];
 		$orderby = $this->params['orderby'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
@@ -231,7 +231,7 @@ $(document).ready( function() {
 		} elseif(is_string($arrs)) {
 			echo $arrs;
 		}
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.EditDocumentFile.php b/views/bootstrap/class.EditDocumentFile.php
index f0d015505..7fa5691ac 100644
--- a/views/bootstrap/class.EditDocumentFile.php
+++ b/views/bootstrap/class.EditDocumentFile.php
@@ -96,7 +96,7 @@ class SeedDMS_View_EditDocumentFile extends SeedDMS_Bootstrap_Style {
 		);
 ?>
 <?php
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.EditEvent.php b/views/bootstrap/class.EditEvent.php
index 229526cbc..061a1b803 100644
--- a/views/bootstrap/class.EditEvent.php
+++ b/views/bootstrap/class.EditEvent.php
@@ -95,7 +95,7 @@ $(document).ready(function() {
 				<?php //$this->printDateChooser($event["start"], "from");?>
 	    		<span class="input-append date span12" id="fromdate" data-date="<?php echo date('Y-m-d', $event["start"]); ?>" data-date-format="yyyy-mm-dd">
 	      		<input class="span6" size="16" name="from" type="text" value="<?php echo date('Y-m-d', $event["start"]); ?>">
-	      		<span class="add-on"><i class="icon-calendar"></i>
+	      		<span class="add-on"><i class="fa fa-calendar"></i>
 	    		</span>
 	    	</div>
 		</div>
@@ -105,7 +105,7 @@ $(document).ready(function() {
 				<?php //$this->printDateChooser($event["stop"], "to");?>
 	    		<span class="input-append date span12" id="todate" data-date="<?php echo date('Y-m-d', $event["stop"]); ?>" data-date-format="yyyy-mm-dd">
 	      		<input class="span6" size="16" name="to" type="text" value="<?php echo date('Y-m-d', $event["stop"]); ?>">
-	      		<span class="add-on"><i class="icon-calendar"></i></span>
+	      		<span class="add-on"><i class="fa fa-calendar"></i></span>
 	    		</span>
 			</div>
 		</div>
@@ -122,7 +122,7 @@ $(document).ready(function() {
 			</div>
 		</div>
 		<div class="controls">
-			<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
+			<button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText("save")?></button>
 		</div>
 </form>
 <?php
diff --git a/views/bootstrap/class.EditFolder.php b/views/bootstrap/class.EditFolder.php
index 59c2ac858..9cf48d6e5 100644
--- a/views/bootstrap/class.EditFolder.php
+++ b/views/bootstrap/class.EditFolder.php
@@ -71,7 +71,7 @@ $(document).ready(function() {
 		$strictformcheck = $this->params['strictformcheck'];
 		$orderby = $this->params['orderby'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
 		$this->globalNavigation($folder);
@@ -132,7 +132,7 @@ $(document).ready(function() {
 		} elseif(is_string($arrs)) {
 			echo $arrs;
 		}
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.EditOnline.php b/views/bootstrap/class.EditOnline.php
index 04f3b3f06..f9b7de66a 100644
--- a/views/bootstrap/class.EditOnline.php
+++ b/views/bootstrap/class.EditOnline.php
@@ -126,7 +126,7 @@ $this->contentHeading(getMLText("content"));
 <?php
 	echo $this->warningMsg(getMLText('edit_online_warning'));
 ?>
-<button id="update" type="submit" class="btn btn-primary"><i class="icon-save"></i> <?php printMLText("save"); ?></button>
+<button id="update" type="submit" class="btn btn-primary"><i class="fa fa-save"></i> <?php printMLText("save"); ?></button>
 </form>
 <?php
 		echo "</div>\n";
diff --git a/views/bootstrap/class.EditUserData.php b/views/bootstrap/class.EditUserData.php
index 241386089..f33ab90e6 100644
--- a/views/bootstrap/class.EditUserData.php
+++ b/views/bootstrap/class.EditUserData.php
@@ -92,7 +92,7 @@ $(document).ready( function() {
 		$passwordstrength = $this->params['passwordstrength'];
 		$httproot = $this->params['httproot'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("edit_user_details"));
 		$this->globalNavigation();
@@ -205,7 +205,7 @@ $(document).ready( function() {
 				)
 			);
 		}
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 
diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index e9ace2b88..6c7f5f0e9 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -132,7 +132,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			echo "<td nowrap>";
 			echo "<div class=\"list-action\">";
 			if(!$checkmsgs && $extmgr->isWritableExtDir())
-				echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$re['name']."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"currenttab\" value=\"repository\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$re['name']."\" title=\"".getMLText('import_extension')."\"><i class=\"icon-download\"></i></a></form>";
+				echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$re['name']."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"currenttab\" value=\"repository\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$re['name']."\" title=\"".getMLText('import_extension')."\"><i class=\"fa fa-download\"></i></a></form>";
 			echo "</div>";
 			echo "</td>";
 			echo "</tr>";
@@ -216,15 +216,15 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			echo "<td nowrap>";
 			echo "<div class=\"list-action\">";
 			if(!empty($extconf['changelog']) && file_exists($extdir."/".$extname."/".$extconf['changelog'])) {
-				echo "<a data-target=\"#extensionChangelog\" href=\"../out/out.ExtensionMgr.php?action=changelog&extensionname=".$extname."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_changelog')."\"><i class=\"icon-reorder\"></i></a>\n";
+				echo "<a data-target=\"#extensionChangelog\" href=\"../out/out.ExtensionMgr.php?action=changelog&extensionname=".$extname."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_changelog')."\"><i class=\"fa fa-reorder\"></i></a>\n";
 			}
 			if($extconf['config'])
-				echo "<a href=\"../out/out.Settings.php?currenttab=extensions#".$extname."\" title=\"".getMLText('configure_extension')."\"><i class=\"icon-cogs\"></i></a>";
-			echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$extname."-download\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"download\" /><input type=\"hidden\" name=\"extname\" value=\"".$extname."\" /><a class=\"download\" data-extname=\"".$extname."\" title=\"".getMLText('download_extension')."\"><i class=\"icon-download\"></i></a></form>";
+				echo "<a href=\"../out/out.Settings.php?currenttab=extensions#".$extname."\" title=\"".getMLText('configure_extension')."\"><i class=\"fa fa-cogs\"></i></a>";
+			echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$extname."-download\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"download\" /><input type=\"hidden\" name=\"extname\" value=\"".$extname."\" /><a class=\"download\" data-extname=\"".$extname."\" title=\"".getMLText('download_extension')."\"><i class=\"fa fa-download\"></i></a></form>";
 			if(!$settings->extensionIsDisabled($extname)) {
-				echo ' <a href="#" class="toggle" data-extname="'.$extname.'"><i class="icon-check"</i></a>';
+				echo ' <a href="#" class="toggle" data-extname="'.$extname.'"><i class="fa fa-check"</i></a>';
 			} else {
-				echo ' <a href="#" class="toggle" data-extname="'.$extname.'"><i class="icon-check-minus"></i></a>';
+				echo ' <a href="#" class="toggle" data-extname="'.$extname.'"><i class="fa fa-check-minus"></i></a>';
 			}
 			echo "</div>";
 			echo "</td>";
@@ -264,7 +264,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 				getMLText("extension_archive"),
 				$this->getFileChooserHtml('userfile', false)
 			);
-			$this->formSubmit("<i class=\"icon-upload\"></i> ".getMLText('import_extension'));
+			$this->formSubmit("<i class=\"fa fa-upload\"></i> ".getMLText('import_extension'));
 ?>
 		</form>
 <?php
@@ -288,7 +288,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 <form action="../op/op.ExtensionMgr.php" name="form1" method="post">
   <?php echo createHiddenFieldWithKey('extensionmgr'); ?>
 	<input type="hidden" name="action" value="refresh" />
-	<p><button type="submit" class="btn"><i class="icon-refresh"></i> <?php printMLText("refresh");?></button></p>
+	<p><button type="submit" class="btn"><i class="fa fa-refresh"></i> <?php printMLText("refresh");?></button></p>
 </form>
 			</div>
 
@@ -327,10 +327,10 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			echo "<td nowrap>".$re['author']['name']."<br /><small>".$re['author']['company']."</small></td>";
 			echo "<td nowrap>";
 			echo "<div class=\"list-action\">";
-			echo "<a data-target=\"#extensionInfo\" href=\"../out/out.ExtensionMgr.php?action=info_versions&extensionname=".$re['name']."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_version_list')."\"><i class=\"icon-list-ol\"></i></a>\n";
-			echo "<a data-target=\"#extensionChangelog\" href=\"../out/out.ExtensionMgr.php?action=info_changelog&extensionname=".$re['name']."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_changelog')."\"><i class=\"icon-reorder\"></i></a>\n";
+			echo "<a data-target=\"#extensionInfo\" href=\"../out/out.ExtensionMgr.php?action=info_versions&extensionname=".$re['name']."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_version_list')."\"><i class=\"fa fa-list-ol\"></i></a>\n";
+			echo "<a data-target=\"#extensionChangelog\" href=\"../out/out.ExtensionMgr.php?action=info_changelog&extensionname=".$re['name']."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_changelog')."\"><i class=\"fa fa-reorder\"></i></a>\n";
 			if(!$checkmsgs && $extmgr->isWritableExtDir())
-				echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$re['name']."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"currenttab\" value=\"repository\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$re['name']."\" title=\"".getMLText('import_extension')."\"><i class=\"icon-download\"></i></a></form>";
+				echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$re['name']."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"currenttab\" value=\"repository\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$re['name']."\" title=\"".getMLText('import_extension')."\"><i class=\"fa fa-download\"></i></a></form>";
 			echo "</div>";
 			echo "</td>";
 			echo "</tr>";
@@ -343,7 +343,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 					<input type="hidden" name="action" value="getlist" />
 					<input type="hidden" name="currenttab" value="repository" />
 					<input type="hidden" name="forceupdate" value="1" />
-          <button type="submit" class="btn btn-delete"><i class="icon-refresh"></i> <?= getMLText('force_update')?></button>
+          <button type="submit" class="btn btn-delete"><i class="fa fa-refresh"></i> <?= getMLText('force_update')?></button>
 					</form>
 </div>
 			</div>
diff --git a/views/bootstrap/class.FolderAccess.php b/views/bootstrap/class.FolderAccess.php
index bf3905d05..8bca2fd16 100644
--- a/views/bootstrap/class.FolderAccess.php
+++ b/views/bootstrap/class.FolderAccess.php
@@ -117,7 +117,7 @@ $(document).ready(function() {
 				'options'=>$options
 			)
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 	</form>
 <?php
@@ -180,7 +180,7 @@ $(document).ready(function() {
 			getMLText("default_access"),
 			$this->getAccessModeSelection($folder->getDefaultAccess())
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 
@@ -225,7 +225,7 @@ $(document).ready(function() {
 			getMLText("access_mode"),
 			$this->getAccessModeSelection(M_READ)
 		);
-		$this->formSubmit("<i class=\"icon-plus\"></i> ".getMLText('add'));
+		$this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add'));
 ?>
 </form>
 <?php
@@ -242,7 +242,7 @@ $(document).ready(function() {
 			foreach ($accessList["users"] as $userAccess) {
 				$userObj = $userAccess->getUser();
 				print "<tr>\n";
-				print "<td><i class=\"icon-user\"></i></td>\n";
+				print "<td><i class=\"fa fa-user\"></i></td>\n";
 				print "<td>". htmlspecialchars($userObj->getFullName()) . "</td>\n";
 				print "<form action=\"../op/op.FolderAccess.php\">\n";
 				echo createHiddenFieldWithKey('folderaccess')."\n";
@@ -253,7 +253,7 @@ $(document).ready(function() {
 				$this->printAccessModeSelection($userAccess->getMode());
 				print "</td>\n";
 				print "<td>\n";
-				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-save\"></i> ".getMLText("save")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
 				print "</td>\n";
 				print "</form>\n";
 				print "<form action=\"../op/op.FolderAccess.php\">\n";
@@ -262,7 +262,7 @@ $(document).ready(function() {
 				print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
 				print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
 				print "<td>\n";
-				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 				print "</td>\n";
 				print "</form>\n";
 				print "</tr>\n";
@@ -272,7 +272,7 @@ $(document).ready(function() {
 				$groupObj = $groupAccess->getGroup();
 				$mode = $groupAccess->getMode();
 				print "<tr>";
-				print "<td><i class=\"icon-group\"></i></td>";
+				print "<td><i class=\"fa fa-group\"></i></td>";
 				print "<td>". htmlspecialchars($groupObj->getName()) . "</td>";
 				print "<form action=\"../op/op.FolderAccess.php\">";
 				echo createHiddenFieldWithKey('folderaccess')."\n";
@@ -283,7 +283,7 @@ $(document).ready(function() {
 				$this->printAccessModeSelection($groupAccess->getMode());
 				print "</td>\n";
 				print "<td><span class=\"actions\">\n";
-				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-save\"></i> ".getMLText("save")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
 				print "</span></td>\n";
 				print "</form>";
 				print "<form action=\"../op/op.FolderAccess.php\">\n";
@@ -292,7 +292,7 @@ $(document).ready(function() {
 				print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
 				print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">\n";
 				print "<td>";
-				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 				print "</td>\n";
 				print "</form>";
 				print "</tr>\n";
diff --git a/views/bootstrap/class.FolderNotify.php b/views/bootstrap/class.FolderNotify.php
index de62b5b7a..cae14942f 100644
--- a/views/bootstrap/class.FolderNotify.php
+++ b/views/bootstrap/class.FolderNotify.php
@@ -151,7 +151,7 @@ $(document).ready(function() {
 		else {
 			foreach ($notifyList["users"] as $userNotify) {
 				print "<tr>";
-				print "<td><i class=\"icon-user\"></i></td>";
+				print "<td><i class=\"fa fa-user\"></i></td>";
 				print "<td>" . htmlspecialchars($userNotify->getLogin() . " - " . $userNotify->getFullName()) . "</td>";
 				if ($user->isAdmin() || $user->getID() == $userNotify->getID()) {
 					print "<form action=\"../op/op.FolderNotify.php\" method=\"post\">\n";
@@ -160,7 +160,7 @@ $(document).ready(function() {
 					print "<input type=\"Hidden\" name=\"action\" value=\"delnotify\">\n";
 					print "<input type=\"Hidden\" name=\"userid\" value=\"".$userNotify->getID()."\">\n";
 					print "<td>";
-					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 					print "</td>";
 					print "</form>\n";
 				}else print "<td></td>";
@@ -168,7 +168,7 @@ $(document).ready(function() {
 			}
 			foreach ($notifyList["groups"] as $groupNotify) {
 				print "<tr>";
-				print "<td><i class=\"icon-group\"></i></td>";
+				print "<td><i class=\"fa fa-group\"></i></td>";
 				print "<td>" . htmlspecialchars($groupNotify->getName()) . "</td>";
 				if ($user->isAdmin() || $groupNotify->isMember($user,true)) {
 					print "<form action=\"../op/op.FolderNotify.php\" method=\"post\">\n";
@@ -177,7 +177,7 @@ $(document).ready(function() {
 					print "<input type=\"Hidden\" name=\"action\" value=\"delnotify\">\n";
 					print "<input type=\"Hidden\" name=\"groupid\" value=\"".$groupNotify->getID()."\">\n";
 					print "<td>";
-					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 					print "</td>";
 					print "</form>\n";
 				}else print "<td></td>";
diff --git a/views/bootstrap/class.GroupMgr.php b/views/bootstrap/class.GroupMgr.php
index a189c31b0..b0dfc8759 100644
--- a/views/bootstrap/class.GroupMgr.php
+++ b/views/bootstrap/class.GroupMgr.php
@@ -163,7 +163,7 @@ $(document).ready( function() {
   </a>
   <ul class="dropdown-menu">
 <?php
-			echo '<li><a href="../out/out.RemoveGroup.php?groupid='.$selgroup->getID().'"><i class="icon-remove"></i> '.getMLText("rm_group").'</a><li>';
+			echo '<li><a href="../out/out.RemoveGroup.php?groupid='.$selgroup->getID().'"><i class="fa fa-remove"></i> '.getMLText("rm_group").'</a><li>';
 ?>
 	</ul>
 </div>
@@ -211,7 +211,7 @@ $(document).ready( function() {
 				'value'=>($group ? htmlspecialchars($group->getComment()) : '')
 			)
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 	</form>
 <?php
@@ -228,13 +228,13 @@ $(document).ready( function() {
 				foreach ($members as $member) {
 				
 					print "<tr>";
-					print "<td><i class=\"icon-user\"></i></td>";
+					print "<td><i class=\"fa fa-user\"></i></td>";
 					print "<td>" . htmlspecialchars($member->getFullName()) . "</td>";
 					print "<td>" . ($group->isMember($member,true)?getMLText("manager"):"&nbsp;") . "</td>";
 					print "<td>";
-					print "<form action=\"../op/op.GroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"action\" value=\"rmmember\" /><input type=\"hidden\" name=\"groupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"userid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('rmmember')."<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button></form>";
+					print "<form action=\"../op/op.GroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"action\" value=\"rmmember\" /><input type=\"hidden\" name=\"groupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"userid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('rmmember')."<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button></form>";
 					print "&nbsp;";
-					print "<form action=\"../op/op.GroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"groupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"action\" value=\"tmanager\" /><input type=\"hidden\" name=\"userid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('tmanager')."<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-random\"></i> ".getMLText("toggle_manager")."</button></form>";
+					print "<form action=\"../op/op.GroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"groupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"action\" value=\"tmanager\" /><input type=\"hidden\" name=\"userid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('tmanager')."<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-random\"></i> ".getMLText("toggle_manager")."</button></form>";
 					print "</td></tr>";
 				}
 			}
diff --git a/views/bootstrap/class.GroupView.php b/views/bootstrap/class.GroupView.php
index 44b89fddf..cf955a5d7 100644
--- a/views/bootstrap/class.GroupView.php
+++ b/views/bootstrap/class.GroupView.php
@@ -86,7 +86,7 @@ $(document).ready( function() {
 					if($manager->getId() == $member->getId())
 						echo ", ".getMLText("manager");
 				if($ismanager) {
-					echo ' <a href="../op/op.GroupView.php?action=del&groupid='.$group->getId().'&userid='.$member->getId().'" class="btn btn-mini"><i class="icon-remove"></i> '.getMLText("rm_user").'</a>';
+					echo ' <a href="../op/op.GroupView.php?action=del&groupid='.$group->getId().'&userid='.$member->getId().'" class="btn btn-mini"><i class="fa fa-remove"></i> '.getMLText("rm_user").'</a>';
 				}
 				echo "</li>";
 			}
diff --git a/views/bootstrap/class.ImportFS.php b/views/bootstrap/class.ImportFS.php
index 00c5d0208..36387e615 100644
--- a/views/bootstrap/class.ImportFS.php
+++ b/views/bootstrap/class.ImportFS.php
@@ -90,7 +90,7 @@ class SeedDMS_View_ImportFS extends SeedDMS_Bootstrap_Style {
 					'value'=>'1'
 				)
 			);
-			$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('import'));
+			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('import'));
 			print "</form>\n";
 			$this->contentContainerEnd();
 		} else {
diff --git a/views/bootstrap/class.ImportUsers.php b/views/bootstrap/class.ImportUsers.php
index fd0b036fe..5886caccf 100644
--- a/views/bootstrap/class.ImportUsers.php
+++ b/views/bootstrap/class.ImportUsers.php
@@ -77,7 +77,7 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Bootstrap_Style {
 				'value'=>'1'
 			)
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('import'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('import'));
 		print "</form>\n";
 		$this->contentContainerEnd();
 
@@ -102,12 +102,12 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Bootstrap_Style {
 				if(isset($newuser['__logs__'])) {
 					foreach($newuser['__logs__'] as $item) {
 						$class = $item['type'] == 'success' ? 'success' : 'error';
-						echo "<i class=\"icon-circle ".$class."\"></i> ".htmlspecialchars($item['msg'])."<br />";
+						echo "<i class=\"fa fa-circle ".$class."\"></i> ".htmlspecialchars($item['msg'])."<br />";
 					}
 				}
 				foreach($log[$uhash] as $item) {
 					$class = $item['type'] == 'success' ? 'success' : 'error';
-					echo "<i class=\"icon-circle ".$class."\"></i> ".htmlspecialchars($item['msg'])."<br />";
+					echo "<i class=\"fa fa-circle ".$class."\"></i> ".htmlspecialchars($item['msg'])."<br />";
 				}
 				echo "</td>";
 				echo "</tr>\n";
diff --git a/views/bootstrap/class.LogManagement.php b/views/bootstrap/class.LogManagement.php
index b10156f6d..ed6e14103 100644
--- a/views/bootstrap/class.LogManagement.php
+++ b/views/bootstrap/class.LogManagement.php
@@ -56,24 +56,24 @@ class SeedDMS_View_LogManagement extends SeedDMS_Bootstrap_Style {
 			print "<td>".SeedDMS_Core_File::format_filesize(filesize($this->logdir.$entry))."</td>\n";
 			print "<td>";
 			
-			print "<a href=\"out.RemoveLog.php?mode=".$mode."&logname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("rm_file")."</a>";
+			print "<a href=\"out.RemoveLog.php?mode=".$mode."&logname=".$entry."\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("rm_file")."</a>";
 			print "&nbsp;";
-			print "<a href=\"../op/op.Download.php?logname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText("download")."</a>";
+			print "<a href=\"../op/op.Download.php?logname=".$entry."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText("download")."</a>";
 			print "&nbsp;";
-			print "<a data-target=\"#logViewer\" data-cache=\"false\" href=\"out.LogManagement.php?logname=".$entry."\" role=\"button\" class=\"btn btn-mini\" data-toggle=\"modal\"><i class=\"icon-eye-open\"></i> ".getMLText('view')." …</a>";
+			print "<a data-target=\"#logViewer\" data-cache=\"false\" href=\"out.LogManagement.php?logname=".$entry."\" role=\"button\" class=\"btn btn-mini\" data-toggle=\"modal\"><i class=\"fa fa-eye-open\"></i> ".getMLText('view')." …</a>";
 			print "</td>\n";	
 			print "</tr>\n";
 		}
 
 		if ($print_header) printMLText("empty_list");
-		else print "<tr><td><i class=\"icon-arrow-up\"></i></td><td colspan=\"2\"><button type=\"submit\" class=\"btn\"><i class=\"icon-remove\"></i> ".getMLText('remove_marked_files')."</button></td></tr></table></form>\n";
+		else print "<tr><td><i class=\"fa fa-arrow-up\"></i></td><td colspan=\"2\"><button type=\"submit\" class=\"btn\"><i class=\"fa fa-remove\"></i> ".getMLText('remove_marked_files')."</button></td></tr></table></form>\n";
 	} /* }}} */
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript');
 ?>
 $(document).ready( function() {
-	$('i.icon-arrow-up').on('click', function(e) {
+	$('i.fa fa-arrow-up').on('click', function(e) {
 //var checkBoxes = $("input[type=checkbox]");
 //checkBoxes.prop("checked", !checkBoxes.prop("checked"));
 		$('input[type=checkbox]').prop('checked', true);
diff --git a/views/bootstrap/class.Login.php b/views/bootstrap/class.Login.php
index 68f5c37f4..26305aba9 100644
--- a/views/bootstrap/class.Login.php
+++ b/views/bootstrap/class.Login.php
@@ -110,7 +110,7 @@ $(document).ready( function() {
 		$enableLanguageSelector = $this->params['enablelanguageselector'];
 		$enableThemeSelector = $this->params['enablethemeselector'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("sign_in"), "login");
 		$this->globalBanner();
diff --git a/views/bootstrap/class.ManageNotify.php b/views/bootstrap/class.ManageNotify.php
index 2416a1706..08f142754 100644
--- a/views/bootstrap/class.ManageNotify.php
+++ b/views/bootstrap/class.ManageNotify.php
@@ -82,7 +82,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 						echo $this->folderListRow($fld, true);
 					}
 					print "<td>";
-					if ($deleteaction) print "<a href='../op/op.ManageNotify.php?id=".$fld->getID()."&type=folder&action=del' class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</a>";
+					if ($deleteaction) print "<a href='../op/op.ManageNotify.php?id=".$fld->getID()."&type=folder&action=del' class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</a>";
 					else print "<a href='../out/out.FolderNotify.php?folderid=".$fld->getID()."' class=\"btn btn-mini\">".getMLText("edit")."</a>";
 					print "</td>";
 					echo $this->folderListRowEnd($fld);
@@ -120,7 +120,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 						echo $this->documentListRow($doc, $previewer, true);
 					}
 					print "<td>";
-					if ($deleteaction) print "<a href='../op/op.ManageNotify.php?id=".$doc->getID()."&type=document&action=del' class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</a>";
+					if ($deleteaction) print "<a href='../op/op.ManageNotify.php?id=".$doc->getID()."&type=document&action=del' class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</a>";
 					else print "<a href='../out/out.DocumentNotify.php?documentid=".$doc->getID()."' class=\"btn btn-mini\">".getMLText("edit")."</a>";
 					print "</td>\n";
 					echo $this->documentListRowEnd($doc);
@@ -178,7 +178,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 				'value'=>1
 			)
 		);
-		$this->formSubmit("<i class=\"icon-plus\"></i> ".getMLText('add'));
+		$this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add'));
 		print "</form>";
 		$this->contentContainerEnd();
 		echo "</div>";
@@ -190,7 +190,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 		/* 'form1' must be passed to printDocumentChooser() because the typeahead
 		 * function is currently hardcoded on this value */
 		$this->formField(getMLText("choose_target_document"), $this->getDocumentChooserHtml("form2"));
-		$this->formSubmit("<i class=\"icon-plus\"></i> ".getMLText('add'));
+		$this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add'));
 		print "</form>";
 
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.OverrideContentStatus.php b/views/bootstrap/class.OverrideContentStatus.php
index d05d1ba4e..133148e82 100644
--- a/views/bootstrap/class.OverrideContentStatus.php
+++ b/views/bootstrap/class.OverrideContentStatus.php
@@ -110,7 +110,7 @@ $(document).ready(function() {
 				'options'=>$options,
 			)
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('update'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('update'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.RemoveArchive.php b/views/bootstrap/class.RemoveArchive.php
index 69b8cbfe3..2b264be20 100644
--- a/views/bootstrap/class.RemoveArchive.php
+++ b/views/bootstrap/class.RemoveArchive.php
@@ -48,7 +48,7 @@ class SeedDMS_View_RemoveArchive extends SeedDMS_Bootstrap_Style {
 	<input type="hidden" name="arkname" value="<?php echo htmlspecialchars($arkname); ?>">
   <?php echo createHiddenFieldWithKey('removearchive'); ?>
 	<p><?php printMLText("confirm_rm_backup", array ("arkname" => htmlspecialchars($arkname)));?></p>
-	<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("backup_remove");?></button></p>
+	<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("backup_remove");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveDocument.php b/views/bootstrap/class.RemoveDocument.php
index 2340827fd..ae692667d 100644
--- a/views/bootstrap/class.RemoveDocument.php
+++ b/views/bootstrap/class.RemoveDocument.php
@@ -52,7 +52,7 @@ class SeedDMS_View_RemoveDocument extends SeedDMS_Bootstrap_Style {
 <p>
 <?php printMLText("confirm_rm_document", array ("documentname" => htmlspecialchars($document->getName())));?>
 </p>
-<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_document");?></button></p>
+<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_document");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveDocumentFile.php b/views/bootstrap/class.RemoveDocumentFile.php
index d30d95516..5528c751b 100644
--- a/views/bootstrap/class.RemoveDocumentFile.php
+++ b/views/bootstrap/class.RemoveDocumentFile.php
@@ -51,7 +51,7 @@ class SeedDMS_View_RemoveDocumentFile extends SeedDMS_Bootstrap_Style {
 	<input type="Hidden" name="documentid" value="<?php echo $document->getID()?>">
 	<input type="Hidden" name="fileid" value="<?php echo $file->getID()?>">
 	<p><?php printMLText("confirm_rm_file", array ("documentname" => htmlspecialchars($document->getName()), "name" => htmlspecialchars($file->getName())));?></p>
-	<button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_file");?></button>
+	<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_file");?></button>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveDump.php b/views/bootstrap/class.RemoveDump.php
index 359ff84b7..73361c904 100644
--- a/views/bootstrap/class.RemoveDump.php
+++ b/views/bootstrap/class.RemoveDump.php
@@ -47,7 +47,7 @@ class SeedDMS_View_RemoveDump extends SeedDMS_Bootstrap_Style {
 	<input type="Hidden" name="dumpname" value="<?php echo htmlspecialchars($dumpname); ?>">
   <?php echo createHiddenFieldWithKey('removedump'); ?>
 	<p><?php printMLText("confirm_rm_dump", array ("dumpname" => htmlspecialchars($dumpname)));?></p>
-	<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("dump_remove");?></button></p>
+	<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("dump_remove");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveEvent.php b/views/bootstrap/class.RemoveEvent.php
index e3281ca4f..27748211d 100644
--- a/views/bootstrap/class.RemoveEvent.php
+++ b/views/bootstrap/class.RemoveEvent.php
@@ -49,7 +49,7 @@ class SeedDMS_View_RemoveEvent extends SeedDMS_Bootstrap_Style {
   <?php echo createHiddenFieldWithKey('removeevent'); ?>
 	<input type="hidden" name="eventid" value="<?php echo intval($event["id"]); ?>">
 	<p><?php printMLText("confirm_rm_event", array ("name" => htmlspecialchars($event["name"])));?></p>
-	<button class="btn" type="submit"><i class="icon-remove"></i> <?php printMLText("delete");?></button>
+	<button class="btn" type="submit"><i class="fa fa-remove"></i> <?php printMLText("delete");?></button>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveFolder.php b/views/bootstrap/class.RemoveFolder.php
index d34ea9551..ce0ed12b7 100644
--- a/views/bootstrap/class.RemoveFolder.php
+++ b/views/bootstrap/class.RemoveFolder.php
@@ -50,7 +50,7 @@ class SeedDMS_View_RemoveFolder extends SeedDMS_Bootstrap_Style {
 	<p>
 	<?php printMLText("confirm_rm_folder", array ("foldername" => htmlspecialchars($folder->getName())));?>
 	</p>
-	<p><button class="btn" type="submit"><i class="icon-remove"></i> <?php printMLText("rm_folder");?></button></p>
+	<p><button class="btn" type="submit"><i class="fa fa-remove"></i> <?php printMLText("rm_folder");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveGroup.php b/views/bootstrap/class.RemoveGroup.php
index b90b58907..09efdacb5 100644
--- a/views/bootstrap/class.RemoveGroup.php
+++ b/views/bootstrap/class.RemoveGroup.php
@@ -51,7 +51,7 @@ class SeedDMS_View_RemoveGroup extends SeedDMS_Bootstrap_Style {
 <p>
 <?php printMLText("confirm_rm_group", array ("groupname" => htmlspecialchars($group->getName())));?>
 </p>
-<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_group");?></button></p>
+<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_group");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveLog.php b/views/bootstrap/class.RemoveLog.php
index fc8d88205..96b400a2f 100644
--- a/views/bootstrap/class.RemoveLog.php
+++ b/views/bootstrap/class.RemoveLog.php
@@ -54,7 +54,7 @@ class SeedDMS_View_RemoveLog extends SeedDMS_Bootstrap_Style {
 		}
 ?>
 	<p><?php printMLText("confirm_rm_log", array ("logname" => implode(', ', $lognames)));?></p>
-	<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_file");?></button></p>
+	<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_file");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveUser.php b/views/bootstrap/class.RemoveUser.php
index 355788dd7..c8534df93 100644
--- a/views/bootstrap/class.RemoveUser.php
+++ b/views/bootstrap/class.RemoveUser.php
@@ -76,7 +76,7 @@ class SeedDMS_View_RemoveUser extends SeedDMS_Bootstrap_Style {
 
 <div class="control-group">
 	<div class="controls">
-		<button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_user");?></button>
+		<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_user");?></button>
 	</div>
 </div>
 
diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php
index c28dcdcfd..5f0cb1393 100644
--- a/views/bootstrap/class.RemoveUserFromProcesses.php
+++ b/views/bootstrap/class.RemoveUserFromProcesses.php
@@ -201,7 +201,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 			)
 		);
 		 */
-		$this->formSubmit("<i class=\"icon-remove\"></i> ".getMLText('rm_user_from_processes'));
+		$this->formSubmit("<i class=\"fa fa-remove\"></i> ".getMLText('rm_user_from_processes'));
 ?>
 
 </form>
diff --git a/views/bootstrap/class.RemoveVersion.php b/views/bootstrap/class.RemoveVersion.php
index 50beed15c..c655bcbf1 100644
--- a/views/bootstrap/class.RemoveVersion.php
+++ b/views/bootstrap/class.RemoveVersion.php
@@ -50,7 +50,7 @@ class SeedDMS_View_RemoveVersion extends SeedDMS_Bootstrap_Style {
 	<input type="hidden" name="documentid" value="<?php echo $document->getID()?>">
 	<input type="hidden" name="version" value="<?php echo $version->getVersion()?>">
 	<p><?php printMLText("confirm_rm_version", array ("documentname" => htmlspecialchars($document->getName()), "version" => $version->getVersion()));?></p>
-  <p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_version");?></button></p>
+  <p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_version");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveWorkflow.php b/views/bootstrap/class.RemoveWorkflow.php
index 474ea3939..465d771eb 100644
--- a/views/bootstrap/class.RemoveWorkflow.php
+++ b/views/bootstrap/class.RemoveWorkflow.php
@@ -50,7 +50,7 @@ class SeedDMS_View_RemoveWorkflow extends SeedDMS_Bootstrap_Style {
 	<form method="post" action="../op/op.RemoveWorkflow.php" name="form1">
 	<?php echo createHiddenFieldWithKey('removeworkflow'); ?>
 	<input type='hidden' name='workflowid' value='<?php echo $workflow->getId(); ?>'/>
-	<button type='submit' class="btn"><i class="icon-remove"></i> <?php printMLText("rm_workflow"); ?></button>
+	<button type='submit' class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_workflow"); ?></button>
 	</form>
 	</div>
 	<div id="workflowgraph" class="span8">
diff --git a/views/bootstrap/class.RemoveWorkflowFromDocument.php b/views/bootstrap/class.RemoveWorkflowFromDocument.php
index 1793f27f0..9de6c747a 100644
--- a/views/bootstrap/class.RemoveWorkflowFromDocument.php
+++ b/views/bootstrap/class.RemoveWorkflowFromDocument.php
@@ -73,7 +73,7 @@ class SeedDMS_View_RemoveWorkflowFromDocument extends SeedDMS_Bootstrap_Style {
 	<?php echo createHiddenFieldWithKey('removeworkflowfromdocument'); ?>
 	<input type='hidden' name='documentid' value='<?php echo $document->getId(); ?>'/>
 	<input type='hidden' name='version' value='<?php echo $latestContent->getVersion(); ?>'/>
-	<button type='submit' class="btn"><i class="icon-remove"></i> <?php printMLText("rm_workflow"); ?></button>
+	<button type='submit' class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_workflow"); ?></button>
 	</form>
 	</div>
 	<div id="workflowgraph" class="span8">
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 51a8fabc3..920cea858 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -189,12 +189,12 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
         </label><br />
         <span class="input-append date" style="display: inline;" id="createstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span4" size="16" name="createstart" type="text" value="<?php if($startdate) printf("%04d-%02d-%02d", $startdate['year'], $startdate['month'], $startdate['day']); else echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>&nbsp;
 				<?php printMLText("and"); ?>
         <span class="input-append date" style="display: inline;" id="createenddate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span4" size="16" name="createend" type="text" value="<?php if($stopdate) printf("%04d-%02d-%02d", $stopdate['year'], $stopdate['month'], $stopdate['day']); else echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>
 </td>
 </tr>
@@ -217,7 +217,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 ?>
 
 <tr>
-<td></td><td><button type="submit" class="btn"><i class="icon-search"></i> <?php printMLText("search"); ?></button></td>
+<td></td><td><button type="submit" class="btn"><i class="fa fa-search"></i> <?php printMLText("search"); ?></button></td>
 </tr>
 
 </table>
@@ -297,12 +297,12 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
         </label><br />
         <span class="input-append date" style="display: inline;" id="expirationstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span4" size="16" name="expirationstart" type="text" value="<?php if($expstartdate) printf("%04d-%02d-%02d", $expstartdate['year'], $expstartdate['month'], $expstartdate['day']); else echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>&nbsp;
 				<?php printMLText("and"); ?>
         <span class="input-append date" style="display: inline;" id="expirationenddate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span4" size="16" name="expirationend" type="text" value="<?php if($expstopdate) printf("%04d-%02d-%02d", $expstopdate['year'], $expstopdate['month'], $expstopdate['day']); else echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>
 </td>
 </tr>
@@ -431,7 +431,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 </td>
 </tr>
 <tr>
-<td></td><td><button type="submit" class="btn"><i class="icon-search"></i> <?php printMLText("search"); ?></button></td>
+<td></td><td><button type="submit" class="btn"><i class="fa fa-search"></i> <?php printMLText("search"); ?></button></td>
 </tr>
 </table>
 
diff --git a/views/bootstrap/class.SearchForm.php b/views/bootstrap/class.SearchForm.php
index a53dc3893..24ce015ee 100644
--- a/views/bootstrap/class.SearchForm.php
+++ b/views/bootstrap/class.SearchForm.php
@@ -182,12 +182,12 @@ $(document).ready(function() {
         </label>
         <span class="input-append date" id="createstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span3" size="16" name="createstart" type="text" value="<?php echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>&nbsp;
 				<?php printMLText("and"); ?>
         <span class="input-append date" id="createenddate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span3" size="16" name="createend" type="text" value="<?php echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>
 </td>
 </tr>
@@ -199,17 +199,17 @@ $(document).ready(function() {
         </label>
         <span class="input-append date" id="expirationstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span3" size="16" name="expirationstart" type="text" value="<?php echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>&nbsp;
 				<?php printMLText("and"); ?>
         <span class="input-append date" id="expirationenddate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span3" size="16" name="expirationend" type="text" value="<?php echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>
 </td>
 </tr>
 <tr>
-<td></td><td><button type="submit" class="btn"><i class="icon-search"> <?php printMLText("search"); ?></button></td>
+<td></td><td><button type="submit" class="btn"><i class="fa fa-search"> <?php printMLText("search"); ?></button></td>
 </tr>
 
 </table>
@@ -271,7 +271,7 @@ $(document).ready(function() {
 </td>
 </tr>
 <tr>
-<td></td><td><button type="submit" class="btn"><i class="icon-search"> <?php printMLText("search"); ?></button></td>
+<td></td><td><button type="submit" class="btn"><i class="fa fa-search"> <?php printMLText("search"); ?></button></td>
 </tr>
 </table>
 
diff --git a/views/bootstrap/class.SendLoginData.php b/views/bootstrap/class.SendLoginData.php
index 7d1d7d22b..86363bfbb 100644
--- a/views/bootstrap/class.SendLoginData.php
+++ b/views/bootstrap/class.SendLoginData.php
@@ -54,7 +54,7 @@ class SeedDMS_View_SendLoginData extends SeedDMS_Bootstrap_Style {
 				'name'=>'comment',
 			)
 		);
-		$this->formSubmit("<i class=\"icon-envelope-alt\"></i> ".getMLText('send_email'));
+		$this->formSubmit("<i class=\"fa fa-envelope-o\"></i> ".getMLText('send_email'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.Session.php b/views/bootstrap/class.Session.php
index ed477034c..7c29b5431 100644
--- a/views/bootstrap/class.Session.php
+++ b/views/bootstrap/class.Session.php
@@ -63,14 +63,14 @@ class SeedDMS_View_Session extends SeedDMS_Bootstrap_Style {
 				if(!$sesuser->isHidden()) {
 					$c++;
 					$hasuser = true;
-					$ucontent .= "    <li><a _href=\"\"><i class=\"icon-user\"></i> ".htmlspecialchars($sesuser->getFullName())." ".getReadableDuration(time()-$session->getLastAccess())."</a></li>\n";
+					$ucontent .= "    <li><a _href=\"\"><i class=\"fa fa-user\"></i> ".htmlspecialchars($sesuser->getFullName())." ".getReadableDuration(time()-$session->getLastAccess())."</a></li>\n";
 				}
 		}
 		if($c) {
 			$content = '';
 			$content .= "   <ul id=\"main-menu-session\" class=\"nav pull-right\">\n";
 			$content .= "    <li class=\"dropdown add-session-area\">\n";
-			$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-session-area\">".getMLText('sessions')." (".$c.") <i class=\"icon-caret-down\"></i></a>\n";
+			$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-session-area\">".getMLText('sessions')." (".$c.") <i class=\"fa fa-caret-down\"></i></a>\n";
 			$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 			$content .= $ucontent;
 			$content .= "     </ul>\n";
diff --git a/views/bootstrap/class.SetExpires.php b/views/bootstrap/class.SetExpires.php
index cd4df87ba..3aa15ddd6 100644
--- a/views/bootstrap/class.SetExpires.php
+++ b/views/bootstrap/class.SetExpires.php
@@ -87,7 +87,7 @@ $(document).ready( function() {
 			getMLText("expires"),
 			$this->getDateChooser($expdate, "expdate", $this->params['session']->getLanguage())
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 1d837ebf5..94b95f7ab 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -626,7 +626,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
 <?php
 if(is_writeable($settings->_configFilePath)) {
 ?>
-  <button type="submit" class="btn btn-primary"><i class="icon-save"></i> <?php printMLText("save")?></button>
+  <button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> <?php printMLText("save")?></button>
 <?php
 }
 ?>
diff --git a/views/bootstrap/class.SubstituteUser.php b/views/bootstrap/class.SubstituteUser.php
index e4560c635..fd193b367 100644
--- a/views/bootstrap/class.SubstituteUser.php
+++ b/views/bootstrap/class.SubstituteUser.php
@@ -97,7 +97,7 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 			echo "</td>";
 			echo "<td>";
 			if($currUser->getID() != $user->getID()) {
-				echo "<a class=\"btn\" href=\"../op/op.SubstituteUser.php?userid=".((int) $currUser->getID())."&formtoken=".createFormKey('substituteuser')."\"><i class=\"icon-exchange\"></i> ".getMLText('substitute_user')."</a> ";
+				echo "<a class=\"btn\" href=\"../op/op.SubstituteUser.php?userid=".((int) $currUser->getID())."&formtoken=".createFormKey('substituteuser')."\"><i class=\"fa fa-exchange\"></i> ".getMLText('substitute_user')."</a> ";
 			}
 			echo "</td>";
 			echo "</tr>";
diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index ce7b83011..6de76c080 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -155,7 +155,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= implode('/', $ct);
 		$content .= ")";
 		if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['workflow'])) {
-		$content .= " <i class=\"icon-caret-down\"></i></a>\n";
+		$content .= " <i class=\"fa fa-caret-down\"></i></a>\n";
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		if(!empty($tasks['review'])) {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
@@ -217,15 +217,15 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content = '';
 		$content .= "   <ul id=\"main-menu-clipboard\" class=\"nav pull-right\">\n";
 		$content .= "    <li class=\"dropdown add-clipboard-area\">\n";
-		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-clipboard-area\">".getMLText('clipboard')." (".count($clipboard['folders'])."/".count($clipboard['docs']).") <i class=\"icon-caret-down\"></i></a>\n";
+		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-clipboard-area\">".getMLText('clipboard')." (".count($clipboard['folders'])."/".count($clipboard['docs']).") <i class=\"fa fa-caret-down\"></i></a>\n";
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		foreach($clipboard['folders'] as $folderid) {
 			if($folder = $this->params['dms']->getFolder($folderid))
-				$content .= "    <li><a href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><i class=\"icon-folder-close-alt\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
+				$content .= "    <li><a href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><i class=\"fa fa-folder-o\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
 		}
 		foreach($clipboard['docs'] as $docid) {
 			if($document = $this->params['dms']->getDocument($docid))
-				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\"><i class=\"icon-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
+				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\"><i class=\"fa fa-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
 		}
 		$content .= "    <li class=\"divider\"></li>\n";
 		if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) {
@@ -271,7 +271,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 					}
 					$content .= "</td>\n";
 					$content .= "<td>\n";
-					$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folderid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$folderid."&type=folder\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
+					$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folderid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$folderid."&type=folder\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"fa fa-remove\"></i></a></div>";
 					$content .= "</td>\n";
 					//$content .= "</tr>\n";
 					$content .= $this->folderListRowEnd($folder);
@@ -309,7 +309,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 						}
 						$content .= "</td>\n";
 						$content .= "<td>\n";
-						$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"D".$docid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$docid."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
+						$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"D".$docid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$docid."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"fa fa-remove\"></i></a></div>";
 						$content .= "</td>\n";
 						$content .= "</tr>";
 						$doccount++;
diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php
index ce6a7cef5..908d979e8 100644
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@@ -243,11 +243,11 @@ div.timeline-event-selected {
 		$html = '
        <span class="input-append date" style="display: inline;" id="fromdate" data-date="'.date('Y-m-d', $from).'" data-date-format="yyyy-mm-dd" data-date-language="'.str_replace('_', '-', $this->params['session']->getLanguage()).'">
 			 <input type="text" class="input-small" name="fromdate" value="'.date('Y-m-d', $from).'"/>
-				<span class="add-on"><i class="icon-calendar"></i></span>
+				<span class="add-on"><i class="fa fa-calendar"></i></span>
 			</span> -
       <span class="input-append date" style="display: inline;" id="todate" data-date="'.date('Y-m-d', $to).'" data-date-format="yyyy-mm-dd" data-date-language="'.str_replace('_', '-', $this->params['session']->getLanguage()).'">
 			<input type="text" class="input-small" name="todate" value="'.date('Y-m-d', $to).'"/>
-				<span class="add-on"><i class="icon-calendar"></i></span>
+				<span class="add-on"><i class="fa fa-calendar"></i></span>
 			</span>';
 		$this->formField(
 			getMLText("date"),
@@ -274,7 +274,7 @@ div.timeline-event-selected {
 			getMLText("exclude_items"),
 			$html
 		);
-		$this->formSubmit('<i class="icon-search"></i> '.getMLText('update'), 'update');
+		$this->formSubmit('<i class="fa fa-search"></i> '.getMLText('update'), 'update');
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.TransferDocument.php b/views/bootstrap/class.TransferDocument.php
index 941526dcc..fb4f51f16 100644
--- a/views/bootstrap/class.TransferDocument.php
+++ b/views/bootstrap/class.TransferDocument.php
@@ -63,7 +63,7 @@ class SeedDMS_View_TransferDocument extends SeedDMS_Bootstrap_Style {
 			getMLText("transfer_to_user"),
 			$html
 		);
-		$this->formSubmit("<i class=\"icon-exchange\"></i> ".getMLText('transfer_document'));
+		$this->formSubmit("<i class=\"fa fa-exchange\"></i> ".getMLText('transfer_document'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.TransferObjects.php b/views/bootstrap/class.TransferObjects.php
index 2baba8902..09a19d18c 100644
--- a/views/bootstrap/class.TransferObjects.php
+++ b/views/bootstrap/class.TransferObjects.php
@@ -68,7 +68,7 @@ class SeedDMS_View_TransferObjects extends SeedDMS_Bootstrap_Style {
 				'options'=>$options
 			)
 		);
-		$this->formSubmit("<i class=\"icon-share-alt\"></i> ".getMLText('transfer_objects'));
+		$this->formSubmit("<i class=\"fa fa-share-alt\"></i> ".getMLText('transfer_objects'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 43e396a3c..c4ad359dc 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -153,9 +153,9 @@ console.log(element);
 		$presetexpiration = $this->params['presetexpiration'];
 		$documentid = $document->getId();
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 		if($enablelargefileupload) {
-			$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/fine-uploader/jquery.fine-uploader.min.js"></script>'."\n", 'js');
+			$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/fine-uploader/jquery.fine-uploader.min.js"></script>'."\n", 'js');
 			$this->htmlAddHeader($this->getFineUploaderTemplate(), 'js');
 		}
 
diff --git a/views/bootstrap/class.UserDefaultKeywords.php b/views/bootstrap/class.UserDefaultKeywords.php
index 4b86166fe..f731fec6b 100644
--- a/views/bootstrap/class.UserDefaultKeywords.php
+++ b/views/bootstrap/class.UserDefaultKeywords.php
@@ -138,7 +138,7 @@ $(document).ready(function() {
 					<?php echo createHiddenFieldWithKey('removecategory'); ?>
 						<input type="hidden" name="action" value="removecategory">
 						<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
-						<button type="submit" class="btn" title="<?php echo getMLText("delete")?>"><i class="icon-remove"></i> <?php printMLText("rm_default_keyword_category");?></button>
+						<button type="submit" class="btn" title="<?php echo getMLText("delete")?>"><i class="fa fa-remove"></i> <?php printMLText("rm_default_keyword_category");?></button>
 					</form>
 				</div>
 
@@ -150,7 +150,7 @@ $(document).ready(function() {
 							<input type="hidden" name="action" value="editcategory">
 							<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
 							<input name="name" type="text" value="<?php echo htmlspecialchars($category->getName())?>">
-  						<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
+  						<button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText("save")?></button>
 					</div>
 				</div>
 				</form>
@@ -169,14 +169,14 @@ $(document).ready(function() {
 									<input type="hidden" name="keywordsid" value="<?php echo $list["id"]?>">
 									<input type="hidden" name="action" value="editkeywords">
 									<input type="text" name="keywords" value="<?php echo htmlspecialchars($list["keywords"]) ?>">
-									<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
+									<button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText("save")?></button>
 									</form>
 									<form style="display: inline-block;" method="post" action="../op/op.UserDefaultKeywords.php" >
   								<?php echo createHiddenFieldWithKey('removekeywords'); ?>
 									<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
 									<input type="hidden" name="keywordsid" value="<?php echo $list["id"]?>">
 									<input type="hidden" name="action" value="removekeywords">
-									<button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("delete")?></button>
+									<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("delete")?></button>
 									</form>
 									<br>
 						<?php }  ?>
diff --git a/views/bootstrap/class.UserList.php b/views/bootstrap/class.UserList.php
index 5c5063d2f..49350275b 100644
--- a/views/bootstrap/class.UserList.php
+++ b/views/bootstrap/class.UserList.php
@@ -115,8 +115,8 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 			echo "</td>";
 			echo "<td>";
 			echo "<div class=\"list-action\">";
-     	echo "<a href=\"../out/out.UsrMgr.php?userid=".$currUser->getID()."\"><i class=\"icon-edit\"></i></a> ";
-     	echo "<a href=\"../out/out.RemoveUser.php?userid=".$currUser->getID()."\"><i class=\"icon-remove\"></i></a>";
+     	echo "<a href=\"../out/out.UsrMgr.php?userid=".$currUser->getID()."\"><i class=\"fa fa-edit\"></i></a> ";
+     	echo "<a href=\"../out/out.RemoveUser.php?userid=".$currUser->getID()."\"><i class=\"fa fa-remove\"></i></a>";
 			echo "</div>";
 			echo "</td>";
 			echo "</tr>";
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 2fd60daaa..ba94536ae 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -182,14 +182,14 @@ $(document).ready( function() {
   <ul class="dropdown-menu">
 <?php
 			if(!in_array($seluser->getID(), $undeluserids)) {
-				echo '<li><a href="../out/out.RemoveUser.php?userid='.$seluser->getID().'"><i class="icon-remove"></i> '.getMLText("rm_user").'</a><li>';
+				echo '<li><a href="../out/out.RemoveUser.php?userid='.$seluser->getID().'"><i class="fa fa-remove"></i> '.getMLText("rm_user").'</a><li>';
 			}
-			echo '<li><a href="../out/out.RemoveUserFromProcesses.php?userid='.$seluser->getID().'"><i class="icon-remove"></i> '.getMLText("rm_user_from_processes").'</a></li>';
-			echo '<li><a href="../out/out.TransferObjects.php?userid='.$seluser->getID().'"><i class="icon-share-alt"></i> '.getMLText("transfer_objects").'</a></li>';
+			echo '<li><a href="../out/out.RemoveUserFromProcesses.php?userid='.$seluser->getID().'"><i class="fa fa-remove"></i> '.getMLText("rm_user_from_processes").'</a></li>';
+			echo '<li><a href="../out/out.TransferObjects.php?userid='.$seluser->getID().'"><i class="fa fa-share-alt"></i> '.getMLText("transfer_objects").'</a></li>';
 			if($user->isAdmin() && $seluser->getID() != $user->getID())
-				echo "<li><a href=\"../op/op.SubstituteUser.php?userid=".$seluser->getID()."&formtoken=".createFormKey('substituteuser')."\"><i class=\"icon-exchange\"></i> ".getMLText("substitute_user")."</a></li>\n";
+				echo "<li><a href=\"../op/op.SubstituteUser.php?userid=".$seluser->getID()."&formtoken=".createFormKey('substituteuser')."\"><i class=\"fa fa-exchange\"></i> ".getMLText("substitute_user")."</a></li>\n";
 			if($enableemail)
-				echo '<li><a href="../out/out.SendLoginData.php?userid='.$seluser->getID().'"><i class="icon-envelope-alt"></i> '.getMLText("send_login_data").'</a></li>';
+				echo '<li><a href="../out/out.SendLoginData.php?userid='.$seluser->getID().'"><i class="fa fa-envelope-o"></i> '.getMLText("send_login_data").'</a></li>';
 ?>
 	</ul>
 </div>
@@ -508,7 +508,7 @@ $(document).ready( function() {
 				);
 			}
 		}
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText($currUser ? "save" : "add_user"));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText($currUser ? "save" : "add_user"));
 ?>
 	</form>
 <?php
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 8555a8cc1..4790211cc 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -664,48 +664,48 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 		print "<ul class=\"unstyled actions\">";
 		if ($file_exists){
-			print "<li><a href=\"../op/op.Download.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"icon-download\"></i>".getMLText("download")."</a></li>";
+			print "<li><a href=\"../op/op.Download.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"fa fa-download\"></i>".getMLText("download")."</a></li>";
 			if ($viewonlinefiletypes && (in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes) || in_array(strtolower($latestContent->getMimeType()), $viewonlinefiletypes)))
-				print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$latestContent->getDocument()->getId()."&version=". $latestContent->getVersion()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a></li>";
+				print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$latestContent->getDocument()->getId()."&version=". $latestContent->getVersion()."\"><i class=\"fa fa-star\"></i>" . getMLText("view_online") . "</a></li>";
 		}
 		print "</ul>";
 		print "<ul class=\"unstyled actions\">";
 		if ($file_exists){
 			if($accessop->mayEditVersion()) {
-				print "<li><a href=\"../out/out.EditOnline.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"icon-edit\"></i>".getMLText("edit_version")."</a></li>";
+				print "<li><a href=\"../out/out.EditOnline.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"fa fa-edit\"></i>".getMLText("edit_version")."</a></li>";
 			}
 		}
 		/* Only admin has the right to remove version in any case or a regular
 		 * user if enableVersionDeletion is on
 		 */
 		if($accessop->mayRemoveVersion()) {
-			print "<li><a href=\"../out/out.RemoveVersion.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"icon-remove\"></i>".getMLText("rm_version")."</a></li>";
+			print "<li><a href=\"../out/out.RemoveVersion.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"fa fa-remove\"></i>".getMLText("rm_version")."</a></li>";
 		}
 		if($accessop->mayOverwriteStatus()) {
-			print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."'><i class=\"icon-align-justify\"></i>".getMLText("change_status")."</a></li>";
+			print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."'><i class=\"fa fa-align-justify\"></i>".getMLText("change_status")."</a></li>";
 		}
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			// Allow changing reviewers/approvals only if not reviewed
 			if($accessop->maySetReviewersApprovers()) {
-				print "<li><a href='../out/out.SetReviewersApprovers.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."'><i class=\"icon-edit\"></i>".getMLText("change_assignments")."</a></li>";
+				print "<li><a href='../out/out.SetReviewersApprovers.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."'><i class=\"fa fa-edit\"></i>".getMLText("change_assignments")."</a></li>";
 			}
 		} elseif($workflowmode == 'advanced') {
 			if($accessop->maySetWorkflow()) {
 				if(!$workflow) {
-					print "<li><a href='../out/out.SetWorkflow.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."'><i class=\"icon-random\"></i>".getMLText("set_workflow")."</a></li>";
+					print "<li><a href='../out/out.SetWorkflow.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."'><i class=\"fa fa-random\"></i>".getMLText("set_workflow")."</a></li>";
 				}
 			}
 		}
 		/*
 		if($accessop->maySetExpires()) {
-			print "<li><a href='../out/out.SetExpires.php?documentid=".$documentid."'><i class=\"icon-time\"></i>".getMLText("set_expiry")."</a></li>";
+			print "<li><a href='../out/out.SetExpires.php?documentid=".$documentid."'><i class=\"fa fa-clock-o\"></i>".getMLText("set_expiry")."</a></li>";
 		}
 		*/
 		if($accessop->mayEditComment()) {
-			print "<li><a href=\"out.EditComment.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"icon-comment\"></i>".getMLText("edit_comment")."</a></li>";
+			print "<li><a href=\"out.EditComment.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"fa fa-comment\"></i>".getMLText("edit_comment")."</a></li>";
 		}
 		if($accessop->mayEditAttributes()) {
-			print "<li><a href=\"out.EditAttributes.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"icon-edit\"></i>".getMLText("edit_attributes")."</a></li>";
+			print "<li><a href=\"out.EditAttributes.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"fa fa-edit\"></i>".getMLText("edit_attributes")."</a></li>";
 		}
 
 		$items = $this->callHook('extraVersionActions', $latestContent);
@@ -714,7 +714,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				if(is_string($item))
 					echo "<li>".$item."</li>";
 				elseif(is_array($item))
-					echo "<li><a href=\"".$item['link']."\">".(!empty($item['icon']) ? "<i class=\"icon-".$item['icon']."\"></i>" : "").getMLText($item['label'])."</a></li>";
+					echo "<li><a href=\"".$item['link']."\">".(!empty($item['icon']) ? "<i class=\"fa fa-".$item['icon']."\"></i>" : "").getMLText($item['label'])."</a></li>";
 			}
 		}
 
@@ -800,7 +800,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
 						}
 						else {
-							$reqName = "<i class=\"icon-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+							$reqName = "<i class=\"fa fa-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
 							if($user->isAdmin()) {
 								if($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ)
 									$accesserr = getMLText("access_denied");
@@ -817,7 +817,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_group")." '".$r["required"]."'";
 						}
 						else {
-							$reqName = "<i class=\"icon-group\"></i> ".htmlspecialchars($required->getName());
+							$reqName = "<i class=\"fa fa-group\"></i> ".htmlspecialchars($required->getName());
 							if($user->isAdmin()) {
 								$grpusers = $required->getUsers();
 								if(!$grpusers)
@@ -837,7 +837,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print htmlspecialchars($r["comment"]);
 				if($r['file']) {
 					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$r['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$r['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
 				}
 				print "</td>\n";
 				print "<td>".getReviewStatusText($r["status"])."</td>\n";
@@ -888,7 +888,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_user")." '".$a["required"]."'";
 						}
 						else {
-							$reqName = "<i class=\"icon-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+							$reqName = "<i class=\"fa fa-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
 							if($user->isAdmin()) {
 								if($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ)
 									$accesserr = getMLText("access_denied");
@@ -905,7 +905,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_group")." '".$a["required"]."'";
 						}
 						else {
-							$reqName = "<i class=\"icon-group\"></i> ".htmlspecialchars($required->getName());
+							$reqName = "<i class=\"fa fa-group\"></i> ".htmlspecialchars($required->getName());
 							if($user->isAdmin()) {
 								$grpusers = $required->getUsers();
 								if(!$grpusers)
@@ -925,7 +925,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print htmlspecialchars($a["comment"]);
 				if($a['file']) {
 					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
 				}
 				echo "</td>\n";
 				print "<td>".getApprovalStatusText($a["status"])."</td>\n";
@@ -1000,9 +1000,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			$this->contentContainerStart();
 			if($user->isAdmin()) {
 				if(SeedDMS_Core_DMS::checkIfEqual($workflow->getInitState(), $latestContent->getWorkflowState())) {
-					print "<form action=\"../out/out.RemoveWorkflowFromDocument.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn\"><i class=\"icon-remove\"></i> ".getMLText('rm_workflow')."</button></form>";
+					print "<form action=\"../out/out.RemoveWorkflowFromDocument.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn\"><i class=\"fa fa-remove\"></i> ".getMLText('rm_workflow')."</button></form>";
 				} else {
-					print "<form action=\"../out/out.RewindWorkflow.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn\"><i class=\"icon-refresh\"></i> ".getMLText('rewind_workflow')."</button></form>";
+					print "<form action=\"../out/out.RewindWorkflow.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn\"><i class=\"fa fa-refresh\"></i> ".getMLText('rewind_workflow')."</button></form>";
 				}
 			}
 
@@ -1017,7 +1017,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			foreach($transitions as $transition) {
 				$nextstate = $transition->getNextState();
 				$docstatus = $nextstate->getDocumentStatus();
-				echo "<td><i class=\"icon-circle".($docstatus == S_RELEASED ? " released" : ($docstatus == S_REJECTED ? " rejected" : " in-workflow"))."\"></i> ".htmlspecialchars($nextstate->getName())."</td>";
+				echo "<td><i class=\"fa fa-circle".($docstatus == S_RELEASED ? " released" : ($docstatus == S_REJECTED ? " rejected" : " in-workflow"))."\"></i> ".htmlspecialchars($nextstate->getName())."</td>";
 			}
 			echo "</tr>";
 			echo "<tr>";
@@ -1270,9 +1270,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td>";
 				print "<ul class=\"actions unstyled\">";
 				if ($file_exists){
-					print "<li><a href=\"../op/op.Download.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"icon-download\"></i>".getMLText("download")."</a>";
+					print "<li><a href=\"../op/op.Download.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"fa fa-download\"></i>".getMLText("download")."</a>";
 					if ($viewonlinefiletypes && (in_array(strtolower($version->getFileType()), $viewonlinefiletypes) || in_array(strtolower($version->getMimeType()), $viewonlinefiletypes)))
-						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a>";
+						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"fa fa-star\"></i>" . getMLText("view_online") . "</a>";
 					print "</ul>";
 					print "<ul class=\"actions unstyled\">";
 				}
@@ -1280,22 +1280,22 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				 * user if enableVersionDeletion is on
 				 */
 				if($accessop->mayRemoveVersion()) {
-					print "<li><a href=\"out.RemoveVersion.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"icon-remove\"></i>".getMLText("rm_version")."</a></li>";
+					print "<li><a href=\"out.RemoveVersion.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"fa fa-remove\"></i>".getMLText("rm_version")."</a></li>";
 				}
 				if($accessop->mayEditComment()) {
-					print "<li><a href=\"out.EditComment.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"icon-comment\"></i>".getMLText("edit_comment")."</a></li>";
+					print "<li><a href=\"out.EditComment.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"fa fa-comment\"></i>".getMLText("edit_comment")."</a></li>";
 				}
 				if($accessop->mayEditAttributes()) {
-					print "<li><a href=\"out.EditAttributes.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"icon-edit\"></i>".getMLText("edit_attributes")."</a></li>";
+					print "<li><a href=\"out.EditAttributes.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"fa fa-edit\"></i>".getMLText("edit_attributes")."</a></li>";
 				}
-				print "<li><a href='../out/out.DocumentVersionDetail.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."'><i class=\"icon-info-sign\"></i>".getMLText("details")."</a></li>";
+				print "<li><a href='../out/out.DocumentVersionDetail.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."'><i class=\"fa fa-info-circle\"></i>".getMLText("details")."</a></li>";
 				$items = $this->callHook('extraVersionActions', $version);
 				if($items) {
 					foreach($items as $item) {
 						if(is_string($item))
 							echo "<li>".$item."</li>";
 						elseif(is_array($item))
-							echo "<li><a href=\"".$item['link']."\">".(!empty($item['icon']) ? "<i class=\"icon-".$item['icon']."\"></i>" : "").getMLText($item['label'])."</a></li>";
+							echo "<li><a href=\"".$item['link']."\">".(!empty($item['icon']) ? "<i class=\"fa fa-".$item['icon']."\"></i>" : "").getMLText($item['label'])."</a></li>";
 					}
 				}
 				print "</ul>";
@@ -1365,14 +1365,14 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			
 				print "<td><ul class=\"unstyled actions\">";
 				if ($file_exists) {
-					print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&file=".$file->getID()."\"><i class=\"icon-download\"></i>".getMLText('download')."</a>";
+					print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&file=".$file->getID()."\"><i class=\"fa fa-download\"></i>".getMLText('download')."</a>";
 					if ($viewonlinefiletypes && (in_array(strtolower($file->getFileType()), $viewonlinefiletypes) || in_array(strtolower($file->getMimeType()), $viewonlinefiletypes)))
-						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a></li>";
+						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\"><i class=\"fa fa-star\"></i>" . getMLText("view_online") . "</a></li>";
 				}
 				echo "</ul><ul class=\"unstyled actions\">";
 				if (($document->getAccessMode($user) == M_ALL)||($file->getUserID()==$user->getID())) {
-					print "<li><a href=\"out.RemoveDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"icon-remove\"></i>".getMLText("delete")."</a></li>";
-					print "<li><a href=\"out.EditDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"icon-edit\"></i>".getMLText("edit")."</a></li>";
+					print "<li><a href=\"out.RemoveDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"fa fa-remove\"></i>".getMLText("delete")."</a></li>";
+					print "<li><a href=\"out.EditDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"fa fa-edit\"></i>".getMLText("edit")."</a></li>";
 				}
 				print "</ul></td>";		
 				
@@ -1421,7 +1421,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
 					print "<br />".getMLText("document_link_public").": ".(($link->isPublic()) ? getMLText("yes") : getMLText("no"));
 				if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
-					print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button></form>";
+					print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button></form>";
 				print "</span></td>";
 				echo $this->documentListRowEnd($targetDoc);
 			}
@@ -1449,7 +1449,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					)
 				);
 			}
-			$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 			</form>
 <?php
@@ -1486,7 +1486,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print getMLText("document_link_by")." ".htmlspecialchars($responsibleUser->getFullName());
 				if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
 					print "<br />".getMLText("document_link_public").": ".(($link->isPublic()) ? getMLText("yes") : getMLText("no"));
-					print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$sourceDoc->getId()."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button></form>";
+					print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$sourceDoc->getId()."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button></form>";
 				print "</span></td>";
 				echo $this->documentListRowEnd($sourceDoc);
 			}
diff --git a/views/bootstrap/class.ViewEvent.php b/views/bootstrap/class.ViewEvent.php
index 35a270e93..85eb4ac29 100644
--- a/views/bootstrap/class.ViewEvent.php
+++ b/views/bootstrap/class.ViewEvent.php
@@ -82,8 +82,8 @@ class SeedDMS_View_ViewEvent extends SeedDMS_Bootstrap_Style {
 			echo "<tr>";
 			echo "<td></td>";
 			echo "<td>";
-			print "<a href=\"../out/out.RemoveEvent.php?id=".$event["id"]."\" class=\"btn\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</a> ";
-			print "<a href=\"../out/out.EditEvent.php?id=".$event["id"]."\" class=\"btn\"><i class=\"icon-edit\"></i> ".getMLText("edit")."</a>";
+			print "<a href=\"../out/out.RemoveEvent.php?id=".$event["id"]."\" class=\"btn\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</a> ";
+			print "<a href=\"../out/out.EditEvent.php?id=".$event["id"]."\" class=\"btn\"><i class=\"fa fa-edit\"></i> ".getMLText("edit")."</a>";
 			echo "</tr>";
 		}
 
diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index fa0ebd8d7..7aec058e9 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -356,11 +356,11 @@ $('body').on('click', '.order-btn', function(ev) {
 			else {
 				print "<table id=\"viewfolder-table\" class=\"table table-condensed table-hover\">";
 				print "<thead>\n<tr>\n";
-				print "<th>".($parent ? '<button class="btn btn-mini btn-default" id="goto-parent" data-parentid="'.$parent->getID().'"><i class="icon-arrow-up"></i></button>' : '')."</th>\n";	
+				print "<th>".($parent ? '<button class="btn btn-mini btn-default" id="goto-parent" data-parentid="'.$parent->getID().'"><i class="fa fa-arrow-up"></i></button>' : '')."</th>\n";	
 				print "<th>".getMLText("name");
-				print " <a class=\"order-btn\" href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="n"||$orderby=="na"?"&orderby=nd":"&orderby=n")."\" data-orderby=\"".($orderby=="n"||$orderby=="na"?"nd":"n")."\"title=\"".getMLText("sort_by_name")."\">".($orderby=="n"||$orderby=="na"?' <i class="icon-sort-by-alphabet selected"></i>':($orderby=="nd"?' <i class="icon-sort-by-alphabet-alt selected"></i>':' <i class="icon-sort-by-alphabet"></i>'))."</a>";
-				print " <a class=\"order-btn\" href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="s"||$orderby=="sa"?"&orderby=sd":"&orderby=s")."\" data-orderby=\"".($orderby=="s"||$orderby=="sa"?"sd":"s")."\" title=\"".getMLText("sort_by_sequence")."\">".($orderby=="s"||$orderby=="sa"?' <i class="icon-sort-by-order selected"></i>':($orderby=="sd"?' <i class="icon-sort-by-order-alt selected"></i>':' <i class="icon-sort-by-order"></i>'))."</a>";
-				print " <a class=\"order-btn\" href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="d"||$orderby=="da"?"&orderby=dd":"&orderby=d")."\" data-orderby=\"".($orderby=="d"||$orderby=="da"?"dd":"d")."\" title=\"".getMLText("sort_by_date")."\">".($orderby=="d"||$orderby=="da"?' <i class="icon-sort-by-attributes selected"></i>':($orderby=="dd"?' <i class="icon-sort-by-attributes-alt selected"></i>':' <i class="icon-sort-by-attributes"></i>'))."</a>";
+				print " <a class=\"order-btn\" href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="n"||$orderby=="na"?"&orderby=nd":"&orderby=n")."\" data-orderby=\"".($orderby=="n"||$orderby=="na"?"nd":"n")."\"title=\"".getMLText("sort_by_name")."\">".($orderby=="n"||$orderby=="na"?' <i class="fa fa-sort-alpha-asc selected"></i>':($orderby=="nd"?' <i class="fa fa-sort-alpha-desc selected"></i>':' <i class="fa fa-sort-alpha-asc"></i>'))."</a>";
+				print " <a class=\"order-btn\" href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="s"||$orderby=="sa"?"&orderby=sd":"&orderby=s")."\" data-orderby=\"".($orderby=="s"||$orderby=="sa"?"sd":"s")."\" title=\"".getMLText("sort_by_sequence")."\">".($orderby=="s"||$orderby=="sa"?' <i class="fa fa-sort-numeric-asc selected"></i>':($orderby=="sd"?' <i class="fa fa-sort-numeric-desc selected"></i>':' <i class="fa fa-sort-numeric-asc"></i>'))."</a>";
+				print " <a class=\"order-btn\" href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="d"||$orderby=="da"?"&orderby=dd":"&orderby=d")."\" data-orderby=\"".($orderby=="d"||$orderby=="da"?"dd":"d")."\" title=\"".getMLText("sort_by_date")."\">".($orderby=="d"||$orderby=="da"?' <i class="fa fa-sort-amount-asc selected"></i>':($orderby=="dd"?' <i class="fa fa-sort-amount-desc selected"></i>':' <i class="fa fa-sort-amount-asc"></i>'))."</a>";
 				print "</th>\n";
 	//			print "<th>".getMLText("owner")."</th>\n";
 				print "<th>".getMLText("status")."</th>\n";
@@ -575,7 +575,7 @@ $('body').on('click', '.order-btn', function(ev) {
 
 			if ($enableFolderTree) {
 				if ($showtree==1){
-					$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=0\"><i class=\"icon-minus-sign\"></i></a>", true);
+					$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=0\"><i class=\"fa fa-minus-circle\"></i></a>", true);
 					$this->contentContainerStart();
 					/*
 					 * access expandFolderTree with $this->params because it can
@@ -584,7 +584,7 @@ $('body').on('click', '.order-btn', function(ev) {
 					$this->printNewTreeNavigationHtml($folderid, M_READ, 0, '', ($this->params['expandFolderTree'] == 1) ? -1 : 3, $orderby);
 					$this->contentContainerEnd();
 				} else {
-					$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=1\"><i class=\"icon-plus-sign\"></i></a>", true);
+					$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=1\"><i class=\"fa fa-plus-circle\"></i></a>", true);
 				}
 			}
 
diff --git a/views/bootstrap/class.WorkflowActionsMgr.php b/views/bootstrap/class.WorkflowActionsMgr.php
index 55bf3aeab..758673dbe 100644
--- a/views/bootstrap/class.WorkflowActionsMgr.php
+++ b/views/bootstrap/class.WorkflowActionsMgr.php
@@ -88,9 +88,9 @@ $(document).ready( function() {
 						echo "<td>";
 						echo htmlspecialchars($workflow->getName());
 						echo "</td><td>";
-						echo '<i class="icon-circle'.($workflow->getInitState()->getId() == $state->getId() ? ' initstate' : ' in-workflow').'"></i> '.htmlspecialchars($state->getName());
+						echo '<i class="fa fa-circle'.($workflow->getInitState()->getId() == $state->getId() ? ' initstate' : ' in-workflow').'"></i> '.htmlspecialchars($state->getName());
 						echo "</td><td>";
-						echo '<i class="icon-circle'.($docstatus == S_RELEASED ? ' released' : ($docstatus == S_REJECTED ? ' rejected' : ' in-workflow')).'"></i> '.htmlspecialchars($nextstate->getName());
+						echo '<i class="fa fa-circle'.($docstatus == S_RELEASED ? ' released' : ($docstatus == S_REJECTED ? ' rejected' : ' in-workflow')).'"></i> '.htmlspecialchars($nextstate->getName());
 						echo "</td></tr>";
 					}
 					echo "</tbody>";
@@ -115,7 +115,7 @@ $(document).ready( function() {
   <ul class="dropdown-menu">
 <?php
 			if(!$selworkflowaction->isUsed()) {
-				echo '<li><a href="../op/op.RemoveWorkflowAction.php?workflowactionid='.$selworkflowaction->getID().'&formtoken='.createFormKey('removeworkflowaction').'"><i class="icon-remove"></i> '.getMLText("rm_workflow_action").'</a><li>';
+				echo '<li><a href="../op/op.RemoveWorkflowAction.php?workflowactionid='.$selworkflowaction->getID().'&formtoken='.createFormKey('removeworkflowaction').'"><i class="fa fa-remove"></i> '.getMLText("rm_workflow_action").'</a><li>';
 			}
 ?>
 	</ul>
@@ -156,7 +156,7 @@ $(document).ready( function() {
 				'value'=>($action ? htmlspecialchars($action->getName()) : '')
 			)
 		);
-		$this->formSubmit('<i class="icon-save"></i> '.getMLText("save"));
+		$this->formSubmit('<i class="fa fa-save"></i> '.getMLText("save"));
 ?>
 	</form>
 	<?php	$this->contentContainerEnd(); ?>
diff --git a/views/bootstrap/class.WorkflowGraph.php b/views/bootstrap/class.WorkflowGraph.php
index f9b5cbd0c..387b6a1f5 100644
--- a/views/bootstrap/class.WorkflowGraph.php
+++ b/views/bootstrap/class.WorkflowGraph.php
@@ -154,7 +154,7 @@ cy.on('tap', 'node', function(evt) {
 	var scratch = node.scratch('app');
 	if(typeof scratch !== 'undefined') {
 	noty({
-		text: (scratch.users ? '<p><?= '<i class="icon-user"></i> ' ?> ' + scratch.users + '</p>' : '') + (scratch.groups ? '<?= '<i class="icon-group"></i> ' ?> ' + scratch.groups + '</p>' : ''),
+		text: (scratch.users ? '<p><?= '<i class="fa fa-user"></i> ' ?> ' + scratch.users + '</p>' : '') + (scratch.groups ? '<?= '<i class="fa fa-group"></i> ' ?> ' + scratch.groups + '</p>' : ''),
 		type: 'information',
 		dismissQueue: true,
 		layout: 'topCenter',
@@ -335,11 +335,11 @@ div.buttons #zoom {margin: 3px; _float: right;}
 <div id="preview">
 	<img id="png" />
 	<div id="legend">
-		<i class="icon-circle initstate"></i> <?php printMLText("workflow_initstate"); ?><br />
-		<i class="icon-circle released"></i> <?php echo getOverallStatusText(S_RELEASED); ?><br />
-		<i class="icon-circle rejected"></i> <?php echo getOverallStatusText(S_REJECTED); ?><br />
-		<i class="icon-circle in-workflow"></i> <?php echo getOverallStatusText(S_IN_WORKFLOW); ?><br />
-		<i class="icon-sign-blank workflow-action"></i> <?php echo printMLText('global_workflow_actions'); ?>
+		<i class="fa fa-circle initstate"></i> <?php printMLText("workflow_initstate"); ?><br />
+		<i class="fa fa-circle released"></i> <?php echo getOverallStatusText(S_RELEASED); ?><br />
+		<i class="fa fa-circle rejected"></i> <?php echo getOverallStatusText(S_REJECTED); ?><br />
+		<i class="fa fa-circle in-workflow"></i> <?php echo getOverallStatusText(S_IN_WORKFLOW); ?><br />
+		<i class="fa fa-sign-blank workflow-action"></i> <?php echo printMLText('global_workflow_actions'); ?>
 	</div>
 	<div class="buttons">
 		<div id="zoom"><button class="btn btn-mini btn-default">Zoom</button></div>
diff --git a/views/bootstrap/class.WorkflowMgr.php b/views/bootstrap/class.WorkflowMgr.php
index d918b728d..d8b1c0535 100644
--- a/views/bootstrap/class.WorkflowMgr.php
+++ b/views/bootstrap/class.WorkflowMgr.php
@@ -97,7 +97,7 @@ $(document).ready(function() {
   <ul class="dropdown-menu">
 <?php
 			if(!$selworkflow->isUsed()) {
-				echo '<li><a href="../out/out.RemoveWorkflow.php?workflowid='.$selworkflow->getID().'"><i class="icon-remove"></i> '.getMLText("rm_workflow").'</a><li>';
+				echo '<li><a href="../out/out.RemoveWorkflow.php?workflowid='.$selworkflow->getID().'"><i class="fa fa-remove"></i> '.getMLText("rm_workflow").'</a><li>';
 			}
 ?>
 	</ul>
@@ -119,7 +119,7 @@ $(document).ready(function() {
 				foreach($path as $state) {
 					$names[] = htmlspecialchars($state->getName());
 				}
-				$this->errorMsg(getMLText('workflow_has_cycle').": ".implode(' <i class="icon-arrow-right"></i> ', $names));
+				$this->errorMsg(getMLText('workflow_has_cycle').": ".implode(' <i class="fa fa-arrow-right"></i> ', $names));
 			}
 
 			$transitions = $workflow->getTransitions();
@@ -197,7 +197,7 @@ $(document).ready(function() {
 				'options'=>$options
 			)
 		);
-		$this->formSubmit('<i class="icon-save"></i> '.getMLText("save"));
+		$this->formSubmit('<i class="fa fa-save"></i> '.getMLText("save"));
 ?>
 	</form>
 	<?php	$this->contentContainerEnd(); ?>
@@ -219,23 +219,23 @@ $(document).ready(function() {
 				if(!$transusers && !$transgroups) {
 					echo " class=\"error\"";
 				}
-				echo "><td>".'<i class="icon-circle'.($workflow->getInitState()->getId() == $state->getId() ? ' initstate' : ' in-workflow').'"></i> '.htmlspecialchars($state->getName())."<br />";
+				echo "><td>".'<i class="fa fa-circle'.($workflow->getInitState()->getId() == $state->getId() ? ' initstate' : ' in-workflow').'"></i> '.htmlspecialchars($state->getName())."<br />";
 				$docstatus = $nextstate->getDocumentStatus();
-				echo '<i class="icon-circle'.($docstatus == S_RELEASED ? ' released' : ($docstatus == S_REJECTED ? ' rejected' : ' in-workflow')).'"></i> '.htmlspecialchars($nextstate->getName());
+				echo '<i class="fa fa-circle'.($docstatus == S_RELEASED ? ' released' : ($docstatus == S_REJECTED ? ' rejected' : ' in-workflow')).'"></i> '.htmlspecialchars($nextstate->getName());
 				if($docstatus == S_RELEASED || $docstatus == S_REJECTED) {
-					echo "<br /><i class=\"icon-arrow-right\"></i> ".getOverallStatusText($docstatus);
+					echo "<br /><i class=\"fa fa-arrow-right\"></i> ".getOverallStatusText($docstatus);
 				}
 				echo "</td>";
-				echo "<td><i class=\"icon-sign-blank workflow-action\"></i> ".htmlspecialchars($action->getName())."</td>";
+				echo "<td><i class=\"fa fa-sign-blank workflow-action\"></i> ".htmlspecialchars($action->getName())."</td>";
 				echo "<td>";
 				foreach($transusers as $transuser) {
 					$u = $transuser->getUser();
-					echo '<i class="icon-user"></i> '.htmlspecialchars($u->getLogin()." - ".$u->getFullName());
+					echo '<i class="fa fa-user"></i> '.htmlspecialchars($u->getLogin()." - ".$u->getFullName());
 					echo "<br />";
 				}
 				foreach($transgroups as $transgroup) {
 					$g = $transgroup->getGroup();
-					echo '<i class="icon-group"></i> '.getMLText('at_least_n_users_of_group',
+					echo '<i class="fa fa-group"></i> '.getMLText('at_least_n_users_of_group',
 						array("number_of_users" => $transgroup->getNumOfUsers(),
 							"group" => htmlspecialchars($g->getName())));
 					echo "<br />";
@@ -247,7 +247,7 @@ $(document).ready(function() {
   <?php echo createHiddenFieldWithKey('removetransitionfromworkflow'); ?>
 	<input type="hidden" name="workflow" value="<?php print $workflow->getID();?>">
 	<input type="hidden" name="transition" value="<?php print $transition->getID(); ?>">
-	<button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("delete");?></button>
+	<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("delete");?></button>
 </form>
 <?php
 				echo "</td>";
diff --git a/views/bootstrap/class.WorkflowStatesMgr.php b/views/bootstrap/class.WorkflowStatesMgr.php
index a4da2478d..04e685890 100644
--- a/views/bootstrap/class.WorkflowStatesMgr.php
+++ b/views/bootstrap/class.WorkflowStatesMgr.php
@@ -89,9 +89,9 @@ $(document).ready(function() {
 						echo "<td>";
 						echo htmlspecialchars($workflow->getName());
 						echo "</td><td>";
-						echo '<i class="icon-circle'.($workflow->getInitState()->getId() == $state->getId() ? ' initstate' : ' in-workflow').'"></i> '.htmlspecialchars($state->getName());
+						echo '<i class="fa fa-circle'.($workflow->getInitState()->getId() == $state->getId() ? ' initstate' : ' in-workflow').'"></i> '.htmlspecialchars($state->getName());
 						echo "</td><td>";
-						echo '<i class="icon-circle'.($docstatus == S_RELEASED ? ' released' : ($docstatus == S_REJECTED ? ' rejected' : ' in-workflow')).'"></i> '.htmlspecialchars($nextstate->getName());
+						echo '<i class="fa fa-circle'.($docstatus == S_RELEASED ? ' released' : ($docstatus == S_REJECTED ? ' rejected' : ' in-workflow')).'"></i> '.htmlspecialchars($nextstate->getName());
 						echo "</td></tr>";
 					}
 					echo "</tbody>";
@@ -116,7 +116,7 @@ $(document).ready(function() {
   <ul class="dropdown-menu">
 <?php
 			if(!$selworkflowstate->isUsed()) {
-				echo '<li><a href="../op/op.RemoveWorkflowState.php?workflowstateid='.$selworkflowstate->getID().'&formtoken='.createFormKey('removeworkflowstate').'"><i class="icon-remove"></i> '.getMLText("rm_workflow_state").'</a><li>';
+				echo '<li><a href="../op/op.RemoveWorkflowState.php?workflowstateid='.$selworkflowstate->getID().'&formtoken='.createFormKey('removeworkflowstate').'"><i class="fa fa-remove"></i> '.getMLText("rm_workflow_state").'</a><li>';
 			}
 ?>
 	</ul>
@@ -169,7 +169,7 @@ $(document).ready(function() {
 				'options'=>$options
 			)
 		);
-		$this->formSubmit('<i class="icon-save"></i> '.getMLText("save"));
+		$this->formSubmit('<i class="fa fa-save"></i> '.getMLText("save"));
 ?>
 	</form>
 	<?php	$this->contentContainerEnd(); ?>

From 983c90ee23fce75e7428cd4db401521fc423c0ed Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Aug 2020 07:53:22 +0200
Subject: [PATCH 031/312] all rewrite rule for all views, not just bootstrap

---
 .htaccess | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.htaccess b/.htaccess
index d83443d97..f1ec9a858 100644
--- a/.htaccess
+++ b/.htaccess
@@ -14,7 +14,7 @@ RewriteRule "^doc/.*$" "" [F]
 
 # Anything below the following dirs will never be rewritten
 RewriteRule "^pdfviewer/.*$" "-" [L]
-RewriteRule "^views/bootstrap/images.*$" "-" [L]
+RewriteRule "^views/.*/images.*$" "-" [L]
 RewriteRule "^out/images.*$" "-" [L]
 RewriteRule "^styles/.*$" "-" [L]
 

From 1fb30caf25148f1d70e36ca10e1e671eae66d233 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Aug 2020 08:00:49 +0200
Subject: [PATCH 032/312] fix getting group for notification when transition
 has fired (Closes: #483)

---
 op/op.TriggerWorkflow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.TriggerWorkflow.php b/op/op.TriggerWorkflow.php
index 330b525cc..f2701d004 100644
--- a/op/op.TriggerWorkflow.php
+++ b/op/op.TriggerWorkflow.php
@@ -126,7 +126,7 @@ if($version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) {
 					}
 				}
 				foreach($ntransition->getGroups() as $tuser) {
-					if(!in_array($tuser->getUser()->getID(), $groupsinformed)) {
+					if(!in_array($tuser->getGroup()->getID(), $groupsinformed)) {
 						$groupsinformed[] = $tuser->getGroup()->getID();
 						$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params);
 					}

From 36f6d7aab9499c5f2a703ef62a84c0e0f045a4f1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Aug 2020 08:03:05 +0200
Subject: [PATCH 033/312] more changes for 5.1.19

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index b91f39e6f..a94a041a6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,10 @@
 - prefix each attribute with 'attr_' when read through webdav
 - actually set owner as notified user, not the logged in user,
   check if notified user has access on document not the logged in user.
+- fix getting group for notification when transition has fired (Closes: #483)
+- move lots of javascript packages into views/bootstrap/vendors and update
+  them with npm and grunt
+- update to font-awesome 4.7.1
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.18

From b231b3f5f11bdc4664ca3c963b65a3a08b90abc9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Aug 2020 08:13:14 +0200
Subject: [PATCH 034/312] add cytoscape and cytoscape-grid-guide

---
 Gruntfile.js | 11 +++++++++++
 package.json |  1 +
 2 files changed, 12 insertions(+)

diff --git a/Gruntfile.js b/Gruntfile.js
index 4551eb372..fe0ce1ae4 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -31,6 +31,17 @@ module.exports = function (grunt) {
 								flatten: true
 						}]
 					},
+					'cytoscape': {
+						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/cytoscape/dist/*',
+										nodeDir + '/cytoscape-grid-guide/cytoscape-grid-guide.js'
+								],
+								dest: vendorDir + '/cytoscape',
+								flatten: true
+						}]
+					},
 					'jqtree': {
 						files: [{
 								expand: true,
diff --git a/package.json b/package.json
index 055aa90d5..f1243efb9 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "bootstrap-datepicker": "^1.9.0",
     "chartjs": "^0.3.24",
     "cytoscape": "^3.15.2",
+    "cytoscape-grid-guide": "^2.3.2",
     "fine-uploader": "^5.16.2",
     "flot": "^4.2.1",
     "font-awesome": "^4.7.0",

From 76ed086f5d69d0110b12690ddd28e612f0196a31 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Aug 2020 08:13:34 +0200
Subject: [PATCH 035/312] use cytoscape in views/bootstrap/vendors

---
 views/bootstrap/class.WorkflowGraph.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.WorkflowGraph.php b/views/bootstrap/class.WorkflowGraph.php
index 387b6a1f5..5c723c6d2 100644
--- a/views/bootstrap/class.WorkflowGraph.php
+++ b/views/bootstrap/class.WorkflowGraph.php
@@ -313,9 +313,9 @@ $(document).ready(function() {
 		}
 
 		$this->htmlAddHeader(
-			'<script type="text/javascript" src="../styles/bootstrap/cytoscape/cytoscape.min.js"></script>'."\n");
+			'<script type="text/javascript" src="../views/bootstrap/vendors/cytoscape/cytoscape.min.js"></script>'."\n");
 		$this->htmlAddHeader(
-			'<script type="text/javascript" src="../styles/bootstrap/cytoscape/cytoscape-grid-guide.js"></script>'."\n");
+			'<script type="text/javascript" src="../views/bootstrap/vendors/cytoscape/cytoscape-grid-guide.js"></script>'."\n");
 		$this->htmlAddHeader('
 <style type="text/css">
 body {padding: 0px;}

From aa3384f28b5ef6d8b784ce98977ac5467483b0c5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Aug 2020 08:48:43 +0200
Subject: [PATCH 036/312] update icons from font-awesome 3.2.x to 4.7.x

---
 views/bootstrap/class.Acl.php               | 14 +++++++-------
 views/bootstrap/class.AddToTransmittal.php  |  2 +-
 views/bootstrap/class.Bootstrap.php         |  6 +++---
 views/bootstrap/class.CheckInDocument.php   |  2 +-
 views/bootstrap/class.MyDocuments.php       |  4 ++--
 views/bootstrap/class.ObjectCheck.php       |  4 ++--
 views/bootstrap/class.RemoveTransmittal.php |  2 +-
 views/bootstrap/class.RoleMgr.php           |  8 ++++----
 views/bootstrap/class.SchedulerTaskMgr.php  | 14 +++++++-------
 views/bootstrap/class.Search.php            |  2 +-
 views/bootstrap/class.SetRevisors.php       |  2 +-
 views/bootstrap/class.Timeline.php          |  2 +-
 views/bootstrap/class.TransmittalMgr.php    | 14 +++++++-------
 views/bootstrap/class.ViewDocument.php      |  8 ++++----
 14 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/views/bootstrap/class.Acl.php b/views/bootstrap/class.Acl.php
index 8ccd96601..70e830b27 100644
--- a/views/bootstrap/class.Acl.php
+++ b/views/bootstrap/class.Acl.php
@@ -36,20 +36,20 @@ class SeedDMS_View_Acl extends SeedDMS_Bootstrap_Style {
 $('#acostree').tree({
 	autoOpen: 0,
 	saveState: 'acostree<?php echo ($selrole ? $selrole->getID() : ''); ?>',
-	openedIcon: $('<i class="icon-minus-sign"></i>'),
-	closedIcon: $('<i class="icon-plus-sign"></i>'),
+	openedIcon: $('<i class="fa fa-minus-circle"></i>'),
+	closedIcon: $('<i class="fa fa-plus-circle"></i>'),
 	onCreateLi: function(node, $li) {
 		switch(node.permission) {
 			case -1:
-				$li.find('.jqtree-element span:last-child').after('<span style="position: absolute; right:10px;" class="jqtree-remove-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-minus-sign"></i></span> <span style="position: absolute; right:50px;" class="jqtree-toggle-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-exchange"></i></span>');
+				$li.find('.jqtree-element span:last-child').after('<span style="position: absolute; right:10px;" class="jqtree-remove-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="fa fa-minus-circle"></i></span> <span style="position: absolute; right:50px;" class="jqtree-toggle-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="fa fa-exchange"></i></span>');
 				$li.attr('style', 'background-color:#FDD');
 				break;
 			case 1:
-				$li.find('.jqtree-element span:last-child').after('<span style="position: absolute; right:10px;" class="jqtree-remove-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-minus-sign"></i></span> <span style="position: absolute; right:50px;" class="jqtree-toggle-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-exchange"></i></span>');
+				$li.find('.jqtree-element span:last-child').after('<span style="position: absolute; right:10px;" class="jqtree-remove-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="fa fa-minus-circle"></i></span> <span style="position: absolute; right:50px;" class="jqtree-toggle-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="fa fa-exchange"></i></span>');
 				$li.attr('style', 'background-color:#DFD');
 				break;
 			default:
-				$li.find('.jqtree-element span:last-child').after('<span style="position: absolute; right:10px;" class="jqtree-add-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-plus-sign"></i></span>');
+				$li.find('.jqtree-element span:last-child').after('<span style="position: absolute; right:10px;" class="jqtree-add-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="fa fa-plus-circle"></i></span>');
 		}
  }
 });
@@ -152,9 +152,9 @@ $(document).ready( function() {
 					if($accessobject->check_view_access(array('UsrMgr', 'RemoveUser'))) {
 						echo "<div class=\"list-action\">";
 						if($accessobject->check_view_access('UsrMgr'))
-							echo "<a href=\"../out/out.UsrMgr.php?userid=".$currUser->getID()."\"><i class=\"icon-edit\"></i></a> ";
+							echo "<a href=\"../out/out.UsrMgr.php?userid=".$currUser->getID()."\"><i class=\"fa fa-edit\"></i></a> ";
 						if($accessobject->check_view_access('RemoveUser'))
-							echo "<a href=\"../out/out.RemoveUser.php?userid=".$currUser->getID()."\"><i class=\"icon-remove\"></i></a>";
+							echo "<a href=\"../out/out.RemoveUser.php?userid=".$currUser->getID()."\"><i class=\"fa fa-remove\"></i></a>";
 						echo "</div>";
 					}
 					echo "</td>";
diff --git a/views/bootstrap/class.AddToTransmittal.php b/views/bootstrap/class.AddToTransmittal.php
index fd11ad092..dd9c665a9 100644
--- a/views/bootstrap/class.AddToTransmittal.php
+++ b/views/bootstrap/class.AddToTransmittal.php
@@ -62,7 +62,7 @@ class SeedDMS_View_AddToTransmittal extends SeedDMS_Bootstrap_Style {
 </select>
 </p>
 
-<p><button type="submit" class="btn"><i class="icon-plus"></i> <?php printMLText("add");?></button></p>
+<p><button type="submit" class="btn"><i class="fa fa-plus"></i> <?php printMLText("add");?></button></p>
 
 </form>
 <?php
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 5c2f36a44..994f8c256 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -298,7 +298,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$content = '';
 //		$content .= "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
 //		$content .= "    <li class=\"dropdown\">\n";
-		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." (".count($tasks['review'])."/".count($tasks['approval'])."/".count($tasks['receipt'])."/".count($tasks['revision']).") <i class=\"icon-caret-down\"></i></a>\n";
+		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." (".count($tasks['review'])."/".count($tasks['approval'])."/".count($tasks['receipt'])."/".count($tasks['revision']).") <i class=\"fa fa-caret-down\"></i></a>\n";
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		if($tasks['review']) {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
@@ -2707,8 +2707,8 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 				if($totalreceipts) {
 					$content .= "
 <div class=\"progress\">
-<div class=\"bar bar-success\" style=\"width: ".round($rstat['1']/$totalreceipts*100)."%;\">".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '').($allcomments['1'] ? " ".$this->printPopupBox('<i class="icon-comment"></i>', implode('<br />', formatComment($allcomments['1'])), true) : "")."</div>
-	<div class=\"bar bar-danger\" style=\"width: ".round($rstat['-1']/$totalreceipts*100)."%;\">".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '').($allcomments['-1'] ? " ".$this->printPopupBox('<i class="icon-comment"></i>', implode('<br />', formatComment($allcomments['-1'])), true) : "")."</div>
+<div class=\"bar bar-success\" style=\"width: ".round($rstat['1']/$totalreceipts*100)."%;\">".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '').($allcomments['1'] ? " ".$this->printPopupBox('<i class="fa fa-comment"></i>', implode('<br />', formatComment($allcomments['1'])), true) : "")."</div>
+	<div class=\"bar bar-danger\" style=\"width: ".round($rstat['-1']/$totalreceipts*100)."%;\">".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '').($allcomments['-1'] ? " ".$this->printPopupBox('<i class="fa fa-comment"></i>', implode('<br />', formatComment($allcomments['-1'])), true) : "")."</div>
 </div>";
 				}
 			}
diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index 8589abc45..e98d1000e 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -193,7 +193,7 @@ $(document).ready(function() {
 			<td class="standardText">
         <span class="input-append date span12" id="expirationdate" data-date="<?php echo ($expts ? date('Y-m-d', $expts) : ''); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span3" size="16" name="expdate" type="text" value="<?php echo ($expts ? date('Y-m-d', $expts) : ''); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>
 			</td>
 		</tr>
diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 64e610b31..089c9da3f 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -64,11 +64,11 @@ $(document).ready( function() {
 		print "<thead>\n<tr>\n";
 		print "<th></th>\n";
 		if($order)
-			print "<th><a data-action=\"".$order."\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> ".($orderby == 'u' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a> ".($orderby == 'e' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')."</th>\n";
+			print "<th><a data-action=\"".$order."\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> ".($orderby == 'u' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a> ".($orderby == 'e' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')."</th>\n";
 		else
 			print "<th>".getMLText("name")."</th>\n";
 		if($order)
-			print "<th><a data-action=\"".$order."\" data-orderby=\"s\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("status")."</a>".($orderby == 's' ? " ".($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')."</th>\n";
+			print "<th><a data-action=\"".$order."\" data-orderby=\"s\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("status")."</a>".($orderby == 's' ? " ".($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')."</th>\n";
 		else
 			print "<th>".getMLText("status")."</th>\n";
 		print "<th>".getMLText("action")."</th>\n";
diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index 0ab02b195..8078024e4 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -44,11 +44,11 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 			$orderby = ''; //$this->params['orderby'];
 			$orderdir = ''; //$this->params['orderdir'];
 
-			print "<th><a data-action=\"".$order."\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> ".($orderby == 'u' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a> ".($orderby == 'e' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')."</th>\n";
+			print "<th><a data-action=\"".$order."\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> ".($orderby == 'u' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a> ".($orderby == 'e' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')."</th>\n";
 		} else
 			print "<th>".getMLText("name")."</th>\n";
 		if($order)
-			print "<th><a data-action=\"".$order."\" data-orderby=\"s\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("status")."</a>".($orderby == 's' ? " ".($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')."</th>\n";
+			print "<th><a data-action=\"".$order."\" data-orderby=\"s\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("status")."</a>".($orderby == 's' ? " ".($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')."</th>\n";
 		else
 			print "<th>".getMLText("status")."</th>\n";
 		print "<th>".getMLText("action")."</th>\n";
diff --git a/views/bootstrap/class.RemoveTransmittal.php b/views/bootstrap/class.RemoveTransmittal.php
index d766de17c..c448ab042 100644
--- a/views/bootstrap/class.RemoveTransmittal.php
+++ b/views/bootstrap/class.RemoveTransmittal.php
@@ -52,7 +52,7 @@ class SeedDMS_View_RemoveTransmittal extends SeedDMS_Bootstrap_Style {
 <?php printMLText("confirm_rm_transmittal", array ("name" => htmlspecialchars($rmtransmittal->getName())));?>
 </p>
 
-<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_transmittal");?></button></p>
+<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_transmittal");?></button></p>
 
 </form>
 <?php
diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index 4efa415ea..1072f4929 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -92,8 +92,8 @@ $(document).ready( function() {
 					echo "<td>";
 					if($accessobject->check_view_access(array('UsrMgr', 'RemoveUser'))) {
 						echo "<div class=\"list-action\">";
-						echo $this->html_link('UsrMgr', array('userid'=>$currUser->getID()), array(), '<i class="icon-edit"></i>', false);
-						echo $this->html_link('RemoveUser', array('userid'=>$currUser->getID()), array(), '<i class="icon-remove"></i>', false);
+						echo $this->html_link('UsrMgr', array('userid'=>$currUser->getID()), array(), '<i class="fa fa-edit"></i>', false);
+						echo $this->html_link('RemoveUser', array('userid'=>$currUser->getID()), array(), '<i class="fa fa-remove"></i>', false);
 						echo "</div>";
 					}
 					echo "</td>";
@@ -117,7 +117,7 @@ $(document).ready( function() {
 				<?php echo createHiddenFieldWithKey('removerole'); ?>
 				<input type="hidden" name="roleid" value="<?php echo $selrole->getID()?>">
 				<input type="hidden" name="action" value="removerole">
-				<button type="submit" class="btn"><i class="icon-remove"></i> <?php echo getMLText("rm_role")?></button>
+				<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php echo getMLText("rm_role")?></button>
 			</form>
 <?php
 			}
@@ -175,7 +175,7 @@ $(document).ready( function() {
 ?>
 		<tr>
 			<td></td>
-			<td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText($currRole ? "save" : "add_role")?></button></td>
+			<td><button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText($currRole ? "save" : "add_role")?></button></td>
 		</tr>
 <?php
 		}
diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 8e7c51802..e2cb2cd38 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -53,7 +53,7 @@ $(document).ready( function() {
 		msg = $(ev.currentTarget).attr('msg');
 		formtoken = '<?= createFormKey('removetask') ?>';
 		bootbox.dialog(confirmmsg, [{
-			"label" : "<i class='icon-remove'></i> <?= getMLText("rm_task") ?>",
+			"label" : "<i class='fa fa-remove'></i> <?= getMLText("rm_task") ?>",
 			"class" : "btn-danger",
 			"callback": function() {
 				$.post('../op/op.SchedulerTaskMgr.php',
@@ -202,7 +202,7 @@ $(document).ready( function() {
 	<div class="control-group">
 		<label class="control-label" for="login"></label>
 		<div class="controls">
-			<button type="submit" class="btn btn-primary"><i class="icon-save"></i> <?php printMLText("save")?></button>
+			<button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> <?php printMLText("save")?></button>
 		</div>
 	</div>
 	</form>
@@ -316,7 +316,7 @@ $(document).ready( function() {
 	<div class="control-group">
 		<label class="control-label" for="login"></label>
 		<div class="controls">
-			<button type="submit" class="btn btn-primary"><i class="icon-save"></i> <?php printMLText("save")?></button>
+			<button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> <?php printMLText("save")?></button>
 		</div>
 	</div>
 	</form>
@@ -371,9 +371,9 @@ $(document).ready( function() {
 			echo "</td>";
 			echo "<td nowrap>";
 			print "<div class=\"list-action\">";
-			print "<a class=\"removetask\" rel=\"".$task->getID()."\" msg=\"".getMLText('remove_task')."\" confirmmsg=\"".htmlspecialchars(getMLText("confirm_rm_task"), ENT_QUOTES)."\" title=\"".getMLText("remove_task")."\"><i class=\"icon-remove\"></i></a>";
+			print "<a class=\"removetask\" rel=\"".$task->getID()."\" msg=\"".getMLText('remove_task')."\" confirmmsg=\"".htmlspecialchars(getMLText("confirm_rm_task"), ENT_QUOTES)."\" title=\"".getMLText("remove_task")."\"><i class=\"fa fa-remove\"></i></a>";
 			if(isset($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()])) {
-				print "<a class=\"edittask\" data-action=\"edittask\" data-id=\"".$task->getID()."\" href=\"../out/out.SchedulerTaskMgr.php?action=edittask\" title=\"".getMLText("edit_task")."\"><i class=\"icon-edit\"></i></a>";
+				print "<a class=\"edittask\" data-action=\"edittask\" data-id=\"".$task->getID()."\" href=\"../out/out.SchedulerTaskMgr.php?action=edittask\" title=\"".getMLText("edit_task")."\"><i class=\"fa fa-edit\"></i></a>";
 			}
 			print "</div>";
 			echo "</td>";
@@ -432,9 +432,9 @@ $(document).ready( function() {
 					print "<div class=\"list-action\">";
 					$t = $scheduler->getTasksByExtension($extname, $taskname);
 					if($t) {
-						print "<a class=\"listtasks\" data-extension=\"".$extname."\" data-task=\"".$taskname."\" href=\"../out/out.SchedulerTaskMgr.php?extension=".$extname."&task=".$taskname."\" title=\"".getMLText("list_tasks")."\"><i class=\"icon-list\"></i></a>";
+						print "<a class=\"listtasks\" data-extension=\"".$extname."\" data-task=\"".$taskname."\" href=\"../out/out.SchedulerTaskMgr.php?extension=".$extname."&task=".$taskname."\" title=\"".getMLText("list_tasks")."\"><i class=\"fa fa-list\"></i></a>";
 					}
-					print "<a class=\"addtask\" data-extension=\"".$extname."\" data-task=\"".$taskname."\" href=\"../out/out.SchedulerTaskMgr.php?extension=".$extname."&task=".$taskname."\" title=\"".getMLText("add_task")."\"><i class=\"icon-plus\"></i></a>";
+					print "<a class=\"addtask\" data-extension=\"".$extname."\" data-task=\"".$taskname."\" href=\"../out/out.SchedulerTaskMgr.php?extension=".$extname."&task=".$taskname."\" title=\"".getMLText("add_task")."\"><i class=\"fa fa-plus\"></i></a>";
 					print "</div>";
 					echo "</td>";
 					echo "</tr>";
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 0e1d65be5..b74eb0740 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -328,7 +328,7 @@ $(document).ready( function() {
 <td><?= getMLText('content') ?></td><td><label class="checkbox inline"><input id="includecontent" type="checkbox" name="includecontent" value="1"> <?php printMLText("include_content"); ?></label></td>
 </tr>
 <tr>
-<td></td><td><a id="export" class="btn" href="<?= $_SERVER['REQUEST_URI']."&action=export" ?>"><i class="icon-download"></i> Export</a></td>
+<td></td><td><a id="export" class="btn" href="<?= $_SERVER['REQUEST_URI']."&action=export" ?>"><i class="fa fa-download"></i> Export</a></td>
 </tr>
 </table>
       </div>
diff --git a/views/bootstrap/class.SetRevisors.php b/views/bootstrap/class.SetRevisors.php
index 010693bc2..10f2391fc 100644
--- a/views/bootstrap/class.SetRevisors.php
+++ b/views/bootstrap/class.SetRevisors.php
@@ -79,7 +79,7 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Bootstrap_Style {
 		<div class="controls">
 			<span class="input-append date" style="display: inline;" id="revisionstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
 				<input class="span4" size="16" name="startdate" type="text" value="<?php if($startdate) echo $startdate; else echo date('Y-m-d'); ?>">
-				<span class="add-on"><i class="icon-calendar"></i></span>
+				<span class="add-on"><i class="fa fa-calendar"></i></span>
 			</span>
 		</div>
 	</div>
diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php
index c2a530ff1..5dcbe1213 100644
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@@ -282,7 +282,7 @@ div.timeline-event-selected {
 		$this->formSubmit('<i class="fa fa-search"></i> '.getMLText('update'), 'update');
 ?>
 </form>
-<a href="out.TimelineFeed.php"><i class="icon-rss"></i> <?php printMLText('subsribe_timelinefeed'); ?></a>
+<a href="out.TimelineFeed.php"><i class="fa fa-rss"></i> <?php printMLText('subsribe_timelinefeed'); ?></a>
 <?php
 		$this->contentContainerEnd();
 		echo "<div class=\"ajax\" data-view=\"Timeline\" data-action=\"iteminfo\" ></div>";
diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
index faaf12b90..d2305fc0e 100644
--- a/views/bootstrap/class.TransmittalMgr.php
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -62,7 +62,7 @@ $(document).ready( function() {
 	protected function printUpdateItemButton($item, $msg, $return=false){ /* {{{ */
 		$itemid = $item->getID();
 		$content = '';
-    $content .= '<a class="update-transmittalitem-btn" transmittal="'.$item->getTransmittal()->getID().'" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_update_transmittalitem"), ENT_QUOTES).'"><i class="icon-refresh"></i></a>';
+    $content .= '<a class="update-transmittalitem-btn" transmittal="'.$item->getTransmittal()->getID().'" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_update_transmittalitem"), ENT_QUOTES).'"><i class="fa fa-refresh"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -80,7 +80,7 @@ $(document).ready( function() {
 				msg = $(ev.currentTarget).attr('msg');
 				formtoken = '".createFormKey('updatetransmittalitem')."';
 				bootbox.dialog(confirmmsg, [{
-					\"label\" : \"<i class='icon-refresh'></i> ".getMLText("update_transmittalitem")."\",
+					\"label\" : \"<i class='fa fa-refresh'></i> ".getMLText("update_transmittalitem")."\",
 					\"class\" : \"btn-danger\",
 					\"callback\": function() {
 						$.ajax('../op/op.TransmittalMgr.php', {
@@ -140,7 +140,7 @@ $(document).ready( function() {
 	protected function printDeleteItemButton($item, $msg, $return=false){ /* {{{ */
 		$itemid = $item->getID();
 		$content = '';
-    $content .= '<a class="delete-transmittalitem-btn" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_transmittalitem"), ENT_QUOTES).'"><i class="icon-remove"></i></a>';
+    $content .= '<a class="delete-transmittalitem-btn" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_transmittalitem"), ENT_QUOTES).'"><i class="fa fa-remove"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -157,7 +157,7 @@ $(document).ready( function() {
 				msg = $(ev.currentTarget).attr('msg');
 				formtoken = '".createFormKey('removetransmittalitem')."';
 				bootbox.dialog(confirmmsg, [{
-					\"label\" : \"<i class='icon-remove'></i> ".getMLText("rm_transmittalitem")."\",
+					\"label\" : \"<i class='fa fa-remove'></i> ".getMLText("rm_transmittalitem")."\",
 					\"class\" : \"btn-danger\",
 					\"callback\": function() {
 						$.ajax('../op/op.TransmittalMgr.php', {
@@ -230,7 +230,7 @@ $(document).ready( function() {
 ?>
 		<tr>
 			<td></td>
-			<td><a class="standardText btn" href="../out/out.RemoveTransmittal.php?transmittalid=<?php print $transmittal->getID();?>"><i class="icon-remove"></i> <?php printMLText("rm_transmittal");?></a></td>
+			<td><a class="standardText btn" href="../out/out.RemoveTransmittal.php?transmittalid=<?php print $transmittal->getID();?>"><i class="fa fa-remove"></i> <?php printMLText("rm_transmittal");?></a></td>
 		</tr>
 <?php
 	}
@@ -248,7 +248,7 @@ $(document).ready( function() {
 ?>
 		<tr>
 			<td></td>
-			<td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText($transmittal ? "save" : "add_transmittal")?></button></td>
+			<td><button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText($transmittal ? "save" : "add_transmittal")?></button></td>
 		</tr>
 <?php
 		}
@@ -357,7 +357,7 @@ $(document).ready( function() {
 				print "<td>".count($items)." <em>(".SeedDMS_Core_File::format_filesize($transmittal->getSize()).")</em></td>";
 				print "<td>";
 				print "<div class=\"list-action\">";
-				print "<a class=\"selecttransmittal\" data-transmittalid=\"".$transmittal->getID()."\" href=\"../out/out.TransmittalMgr.php?transmittalid=".$transmittal->getID()."\" title=\"".getMLText("edit_transmittal_props")."\"><i class=\"icon-edit\"></i></a>";
+				print "<a class=\"selecttransmittal\" data-transmittalid=\"".$transmittal->getID()."\" href=\"../out/out.TransmittalMgr.php?transmittalid=".$transmittal->getID()."\" title=\"".getMLText("edit_transmittal_props")."\"><i class=\"fa fa-edit\"></i></a>";
 				print "</div>";
 				print "</td>";
 				print "</tr>\n";
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index f5ad40d4d..2a0683cca 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1274,7 +1274,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						if (!is_object($required)) {
 							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
 						} else {
-							$reqName = "<i class=\"icon-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+							$reqName = "<i class=\"fa fa-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
 							if($user->isAdmin()) {
 								if($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ)
 									$accesserr = getMLText("access_denied");
@@ -1291,7 +1291,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_group")." '".$r["required"]."'";
 						}
 						else {
-							$reqName = "<i class=\"icon-group\"></i> ".htmlspecialchars($required->getName());
+							$reqName = "<i class=\"fa fa-group\"></i> ".htmlspecialchars($required->getName());
 							if($user->isAdmin()) {
 								$grpusers = $required->getUsers();
 								if(!$grpusers)
@@ -1405,7 +1405,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						if (!is_object($required)) {
 							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
 						} else {
-							$reqName = "<i class=\"icon-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+							$reqName = "<i class=\"fa fa-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
 							if($user->isAdmin()) {
 								if($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ)
 									$accesserr = getMLText("access_denied");
@@ -1422,7 +1422,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_group")." '".$r["required"]."'";
 						}
 						else {
-							$reqName = "<i class=\"icon-group\"></i> ".htmlspecialchars($required->getName());
+							$reqName = "<i class=\"fa fa-group\"></i> ".htmlspecialchars($required->getName());
 							if($required->isMember($user)/* && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)*/)
 								$is_recipient = true;
 						}

From fc2682f5de31bb364ab1d7d5f5555be52698d91a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Aug 2020 08:52:35 +0200
Subject: [PATCH 037/312] add columns for hidden and disabled

---
 controllers/class.UserListCsv.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/controllers/class.UserListCsv.php b/controllers/class.UserListCsv.php
index 7d321849c..ad8690788 100644
--- a/controllers/class.UserListCsv.php
+++ b/controllers/class.UserListCsv.php
@@ -33,12 +33,12 @@ class SeedDMS_Controller_UserListCsv extends SeedDMS_Controller_Common {
 			$m = max($m, count($u->getGroups()));
 		}
 		$fp = fopen("php://temp/maxmemory", 'r+');
-		$header = array('login', 'passenc', 'name', 'email', 'comment', 'role', 'quota', 'homefolder');
+		$header = array('login', 'passenc', 'name', 'email', 'comment', 'role', 'quota', 'homefolder', 'hidden', 'disabled');
 		for($i=1; $i<=$m; $i++)
 			$header[] = 'group_'.$i;
 		fputcsv($fp, $header, ';');
 		foreach($allUsers as $u) {
-			$data = array($u->getLogin(), $u->getPwd(), $u->getFullName(), $u->getEmail(), $u->getComment(), $u->isAdmin() ? 'admin' : ($u->isGuest() ? 'guest' : 'user'), $u->getQuota(), $u->getHomeFolder() ? $u->getHomeFolder() : '');
+			$data = array($u->getLogin(), $u->getPwd(), $u->getFullName(), $u->getEmail(), $u->getComment(), $u->isAdmin() ? 'admin' : ($u->isGuest() ? 'guest' : 'user'), $u->getQuota(), $u->getHomeFolder() ? $u->getHomeFolder() : '', $u->isHidden() ? '1' : 0, $u->isDisabled() ? '1' : '0');
 			foreach($u->getGroups() as $g)
 				$data[] = $g->getName();
 			fputcsv($fp, $data, ';');

From c2e50623c684755afcf8488c24452c7ff396f652 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Aug 2020 09:19:13 +0200
Subject: [PATCH 038/312] explain how to update js packages in views

---
 doc/README.npm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 doc/README.npm

diff --git a/doc/README.npm b/doc/README.npm
new file mode 100644
index 000000000..382f1785b
--- /dev/null
+++ b/doc/README.npm
@@ -0,0 +1,16 @@
+Installation of external js packages
+-------------------------------------
+
+All javascript was located in styles/bootstrap until SeedDMS 5.1.18 and 6.0.11.
+Since 5.1.19 and 6.0.12 most of it has moved into the view at views/boostrap/vendors
+and is no longer placed in git but must be installed by npm and grunt.
+
+Run
+
+`npm install`
+
+and afterwards
+
+`grunt`
+
+to download the js packages and copy them into the new location.

From b34486d70194ee2e69714e3303c6d86bd13362f5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Aug 2020 12:15:21 +0200
Subject: [PATCH 039/312] two more specific error msg when uploading new
 extension

---
 op/op.ExtensionMgr.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.ExtensionMgr.php b/op/op.ExtensionMgr.php
index e2f15f9a6..706764640 100644
--- a/op/op.ExtensionMgr.php
+++ b/op/op.ExtensionMgr.php
@@ -76,10 +76,10 @@ elseif ($action == "upload") { /* {{{ */
 		UI::exitError(getMLText("admin_tools"),getMLText("extension_mgr_no_upload"));
 	}
 	if($_FILES['userfile']['error']) {
-		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
+		UI::exitError(getMLText("admin_tools"),getMLText("extension_mgr_error_upload"));
 	}
 	if(!in_array($_FILES['userfile']['type'], array('application/zip', 'application/x-zip-compressed'))) {
-		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
+		UI::exitError(getMLText("admin_tools"),getMLText("extension_mgr_no_zipfile"));
 	}
 //	$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
 	$controller->setParam('extmgr', $extMgr);

From bcf7d2f2d861758a0b818df701703913e65b5e24 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Aug 2020 12:15:59 +0200
Subject: [PATCH 040/312] set err msg of controller if uploading an extension
 fails

---
 controllers/class.ExtensionMgr.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/controllers/class.ExtensionMgr.php b/controllers/class.ExtensionMgr.php
index e28f4dab7..306e521f8 100644
--- a/controllers/class.ExtensionMgr.php
+++ b/controllers/class.ExtensionMgr.php
@@ -57,10 +57,12 @@ class SeedDMS_Controller_ExtensionMgr extends SeedDMS_Controller_Common {
 		$extmgr = $this->params['extmgr'];
 		$file = $this->params['file'];
 
-		if($extmgr->updateExtension($file))
+		if($extmgr->updateExtension($file)) {
 			$extmgr->createExtensionConf();
-		else
+		} else {
+			$this->setErrorMsg($extmgr->getErrorMsg());
 			return false;
+		}
 		return true;
 	} /* }}} */
 

From 619f90b4df584d919009f08e238fd1efc705bbeb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Aug 2020 07:39:16 +0200
Subject: [PATCH 041/312] do not pass parent folder to hook
 add[Folder|Document]Attribute

---
 views/bootstrap/class.AddDocument.php  |  2 +-
 views/bootstrap/class.AddSubFolder.php | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 9cb7027d8..fa5c53a18 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -322,7 +322,7 @@ $(document).ready(function() {
 				}
 			}
 		}
-		$arrs = $this->callHook('addDocumentAttributes', $folder);
+		$arrs = $this->callHook('addDocumentAttributes', null);
 		if(is_array($arrs)) {
 			foreach($arrs as $arr) {
 				$this->formField($arr[0], $arr[1]);
diff --git a/views/bootstrap/class.AddSubFolder.php b/views/bootstrap/class.AddSubFolder.php
index e2778d2b9..eb097de90 100644
--- a/views/bootstrap/class.AddSubFolder.php
+++ b/views/bootstrap/class.AddSubFolder.php
@@ -109,6 +109,10 @@ $(document).ready( function() {
 		$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_folder, SeedDMS_Core_AttributeDefinition::objtype_all));
 		if($attrdefs) {
 			foreach($attrdefs as $attrdef) {
+				/* The second parameter is null, to make this function call equal
+				 * to 'editFolderAttribute', which expects the folder as the second
+				 * parameter.
+				 */
 				$arr = $this->callHook('addFolderAttribute', null, $attrdef);
 				if(is_array($arr)) {
 					if($arr) {
@@ -119,7 +123,11 @@ $(document).ready( function() {
 				}
 			}
 		}
-		$arrs = $this->callHook('addFolderAttributes', $folder);
+		/* The second parameter is null, to make this function call equal
+		 * to 'editFolderAttributes', which expects the folder as the second
+		 * parameter.
+		 */
+		$arrs = $this->callHook('addFolderAttributes', null);
 		if(is_array($arrs)) {
 			foreach($arrs as $arr) {
 				$this->formField($arr[0], $arr[1]);

From 9117f8f64a317dbd2d714789636eb5bba1c79df0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Aug 2020 11:45:37 +0200
Subject: [PATCH 042/312] add new attribute types 'document', 'folder', 'user',
 'group'

---
 SeedDMS_Core/Core/inc.ClassAttribute.php | 66 +++++++++++++++++-------
 SeedDMS_Core/Core/inc.ClassObject.php    |  5 +-
 SeedDMS_Core/package.xml                 |  1 +
 3 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassAttribute.php b/SeedDMS_Core/Core/inc.ClassAttribute.php
index 89842171a..857b15ab4 100644
--- a/SeedDMS_Core/Core/inc.ClassAttribute.php
+++ b/SeedDMS_Core/Core/inc.ClassAttribute.php
@@ -130,7 +130,8 @@ class SeedDMS_Core_Attribute { /* {{{ */
 			 * the value set and later turned into a multi value attribute.
 			 */
 			$sep = substr($this->_value, 0, 1);
-			$vsep = $this->_attrdef->getValueSetSeparator();
+			if(!($vsep = $this->_attrdef->getValueSetSeparator()))
+				$vsep = $sep;
 			if($sep == $vsep)
 				return(explode($sep, substr($this->_value, 1)));
 			else
@@ -156,38 +157,54 @@ class SeedDMS_Core_Attribute { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		if($this->_attrdef->getMultipleValues()) {
+			$valuesetstr = $this->_attrdef->getValueSet();
 			/* Multiple values without a value set is not allowed */
-			if(!$valuesetstr = $this->_attrdef->getValueSet())
+			/* No need to have valueset anymore. If none is given, the values are
+			 * expected to be separated by ','
+			if(!$valuesetstr)
 				return false;
+			 */
 			$valueset = $this->_attrdef->getValueSetAsArray();
 
 			if(is_array($values)) {
 				if($values) {
-					$error = false;
-					foreach($values as $v) {
-						if(!in_array($v, $valueset)) { $error = true; break; }
+					if($valueset) {
+						$error = false;
+						foreach($values as $v) {
+							if(!in_array($v, $valueset)) { $error = true; break; }
+						}
+						if($error)
+							return false;
+						$valuesetstr = $this->_attrdef->getValueSet();
+						$value = $valuesetstr[0].implode($valuesetstr[0], $values);
+					} else {
+						$value = ','.implode(',', $values);
 					}
-					if($error)
-						return false;
-					$valuesetstr = $this->_attrdef->getValueSet();
-					$value = $valuesetstr[0].implode($valuesetstr[0], $values);
 				} else {
 					$value = '';
 				}
 			} else {
 				if($values) {
-					if($valuesetstr[0] != $values[0])
-						$values = explode($valuesetstr[0], $values);
-					else
-						$values = explode($valuesetstr[0], substr($values, 1));
-
-					$error = false;
-					foreach($values as $v) {
-						if(!in_array($v, $valueset)) { $error = true; break; }
+					if($valuesetstr) {
+						if($valuesetstr[0] != $values[0])
+							$values = explode($valuesetstr[0], $values);
+						else
+							$values = explode($valuesetstr[0], substr($values, 1));
+					} else {
+						$values = explode(',', substr($values, 1));
+					}
+
+					if($valueset) {
+						$error = false;
+						foreach($values as $v) {
+							if(!in_array($v, $valueset)) { $error = true; break; }
+						}
+						if($error)
+							return false;
+						$value = $valuesetstr[0].implode($valuesetstr[0], $values);
+					} else {
+						$value = ','.implode(',', $values);
 					}
-					if($error)
-						return false;
-					$value = $valuesetstr[0].implode($valuesetstr[0], $values);
 				} else {
 					$value = $values;
 				}
@@ -395,6 +412,15 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 	const type_email = '6';
 	const type_date = '7';
 
+	/*
+	 * Addtional data types of an attribute representing objects in seeddms
+	 */
+	const type_folder = '101';
+	const type_document = '102';
+	//const type_documentcontent = '103';
+	const type_user = '104';
+	const type_group = '105';
+
 	/*
 	 * The object type for which a attribute may be used
 	 */
diff --git a/SeedDMS_Core/Core/inc.ClassObject.php b/SeedDMS_Core/Core/inc.ClassObject.php
index 101f3bf2c..ed5daa457 100644
--- a/SeedDMS_Core/Core/inc.ClassObject.php
+++ b/SeedDMS_Core/Core/inc.ClassObject.php
@@ -238,7 +238,10 @@ class SeedDMS_Core_Object { /* {{{ */
 			break;
 		}
 		if($attrdef->getMultipleValues() && is_array($value)) {
-			$sep = substr($attrdef->getValueSet(), 0, 1);
+			if(in_array($attrdef->getType(), array(SeedDMS_Core_AttributeDefinition::type_user, SeedDMS_Core_AttributeDefinition::type_group)))
+				$sep = ',';
+			else
+				$sep = substr($attrdef->getValueSet(), 0, 1);
 			$value = $sep.implode($sep, $value);
 		}
 		if(!isset($this->_attributes[$attrdef->getId()])) {
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 724ee1371..d5b025a3f 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -28,6 +28,7 @@
 - clear the save content list and latest content in SeedDMS_Core_Document after
   a version has been deleted.
 - new method SeedDMS_Core_Document::isLatestVersion()
+- add new attribute types 'document', 'folder', 'user', 'group'
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From af792b52ad0e1e3f22a96c6d7aacbf80450227c8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Aug 2020 11:46:46 +0200
Subject: [PATCH 043/312] add support for new attribute types

---
 op/op.AttributeMgr.php                 |  4 ++--
 views/bootstrap/class.AttributeMgr.php | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/op/op.AttributeMgr.php b/op/op.AttributeMgr.php
index 9b15139f1..918ae29d7 100644
--- a/op/op.AttributeMgr.php
+++ b/op/op.AttributeMgr.php
@@ -71,7 +71,7 @@ if ($action == "addattrdef") {
 	if($minvalues > $maxvalues) {
 		UI::exitError(getMLText("admin_tools"),getMLText("attrdef_min_greater_max"));
 	}
-	if($multiple && $valueset == '') {
+	if($multiple && $valueset == '' && !in_array($type, array(SeedDMS_Core_AttributeDefinition::type_user, SeedDMS_Core_AttributeDefinition::type_group))) {
 		UI::exitError(getMLText("admin_tools"),getMLText("attrdef_multiple_needs_valueset"));
 	}
 
@@ -148,7 +148,7 @@ else if ($action == "editattrdef") {
 	if($minvalues > $maxvalues) {
 		UI::exitError(getMLText("admin_tools"),getMLText("attrdef_min_greater_max"));
 	}
-	if($multiple && $valueset == '') {
+	if($multiple && $valueset == '' && !in_array($type, array(SeedDMS_Core_AttributeDefinition::type_user, SeedDMS_Core_AttributeDefinition::type_group))) {
 		UI::exitError(getMLText("admin_tools"),getMLText("attrdef_multiple_needs_valueset"));
 	}
 
diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index 1c235a97e..ae264bcbf 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -57,6 +57,7 @@ $(document).ready( function() {
 		$this->printDeleteDocumentButtonJs();
 		$this->printDeleteAttributeValueButtonJs();
 		$this->printClickDocumentJs();
+		$this->printClickFolderJs();
 	} /* }}} */
 
 	function info() { /* {{{ */
@@ -217,6 +218,7 @@ $(document).ready( function() {
 						<label class="control-label"><?php printMLText("attrdef_type");?>:</label>
 						<div class="controls">
 							<select name="type">
+								<optgroup label="<?= getMLText('types_generic') ?>">
 								<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_int ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int) echo "selected"; ?>><?php printMLText('attrdef_type_int'); ?></option>
 								<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_float ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_float) echo "selected"; ?>><?php printMLText('attrdef_type_float'); ?></option>
 								<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_string ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_string) echo "selected"; ?>><?php printMLText('attrdef_type_string'); ?></option>
@@ -224,6 +226,13 @@ $(document).ready( function() {
 								<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_date ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date) echo "selected"; ?>><?php printMLText('attrdef_type_date'); ?></option>
 								<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_email ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_email) echo "selected"; ?>><?php printMLText('attrdef_type_email'); ?></option>
 								<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_url ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_url) echo "selected"; ?>><?php printMLText('attrdef_type_url'); ?></option>
+								</optgroup>
+								<optgroup label="SeedDMS">
+								<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_folder ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_folder) echo "selected"; ?>><?php printMLText('attrdef_type_folder'); ?></option>
+								<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_document ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_document) echo "selected"; ?>><?php printMLText('attrdef_type_document'); ?></option>
+								<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_user ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_user) echo "selected"; ?>><?php printMLText('attrdef_type_user'); ?></option>
+								<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_group ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_group) echo "selected"; ?>><?php printMLText('attrdef_type_group'); ?></option>
+								</optgroup>
 <?php
 		if($moreoptions = $this->callHook('additionalTypes', $attrdef)) {
 			foreach($moreoptions as $option) {
@@ -354,6 +363,18 @@ $(document).ready( function() {
 					case SeedDMS_Core_AttributeDefinition::type_boolean:
 						$t = getMLText("attrdef_type_boolean");
 						break;
+					case SeedDMS_Core_AttributeDefinition::type_folder:
+						$t = getMLText("attrdef_type_folder");
+						break;
+					case SeedDMS_Core_AttributeDefinition::type_document:
+						$t = getMLText("attrdef_type_document");
+						break;
+					case SeedDMS_Core_AttributeDefinition::type_user:
+						$t = getMLText("attrdef_type_user");
+						break;
+					case SeedDMS_Core_AttributeDefinition::type_group:
+						$t = getMLText("attrdef_type_group");
+						break;
 				}
 				print "<option value=\"".$attrdef->getID()."\" ".($selattrdef && $attrdef->getID()==$selattrdef->getID() ? 'selected' : '')." data-subtitle=\"".htmlspecialchars($ot.", ".$t)."\">" . htmlspecialchars($attrdef->getName()/* ." (".$ot.", ".$t.")"*/);
 			}

From 4539c4a461c5c46081a4de27efbbbc61a6e48563 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Aug 2020 11:47:47 +0200
Subject: [PATCH 044/312] add generic functions called when clicking on a
 folder, document in a tree add click event for removing document, folder from
 input field

---
 styles/bootstrap/application.js | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 45b9e2122..476dfa141 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -34,6 +34,19 @@ function escapeHtml(text) {
 
   return text.replace(/[&<>"']/g, function(m) { return map[m]; });
 }
+
+function treeFolderSelected(formid, nodeid, nodename) {
+	$('#targetid'+formid).val(nodeid);
+	$('#choosefoldersearch'+formid).val(nodename);
+	$('#folderChooser'+formid).modal('hide');
+}
+
+function treeDocumentSelected(formid, nodeid, nodename) {
+	$('#docid'+formid).val(nodeid);
+	$('#choosedocsearch'+formid).val(nodename);
+	$('#docChooser'+formid).modal('hide');
+}
+
 $(document).ready( function() {
 	/* close popovers when clicking somewhere except in the popover or the
 	 * remove icon
@@ -169,6 +182,22 @@ $(document).ready( function() {
 		}
 	}); /* }}} */
 
+	$('body').on('click', '[id^=clearfolder]', function(ev) { /* {{{ */
+		ev.preventDefault();
+		ev.stopPropagation();
+		target = $(this).data('target');
+		$('#choosefoldersearch'+target).val('');
+		$('#'+target).val('');
+	}); /* }}} */
+
+	$('body').on('click', '[id^=cleardocument]', function(ev) { /* {{{ */
+		ev.preventDefault();
+		ev.stopPropagation();
+		target = $(this).data('target');
+		$('#choosedocsearch'+target).val('');
+		$('#'+target).val('');
+	}); /* }}} */
+
 	$('body').on('click', '#clipboard-float', function(ev) { /* {{{ */
 		ev.preventDefault();
 		ev.stopPropagation();

From d58100c6780ca49af6825a8efcfc559fff1bc294 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Aug 2020 11:50:29 +0200
Subject: [PATCH 045/312] edit and show new attribute types, major overhaul of
 folder tree to make several trees on a page possible

---
 views/bootstrap/class.Bootstrap.php | 239 +++++++++++++++++++++++-----
 1 file changed, 201 insertions(+), 38 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 69014059e..2cb993576 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1186,15 +1186,22 @@ $(document).ready(function() {
 		return $content;
 	} /* }}} */
 
-	function getDocumentChooserHtml($formName) { /* {{{ */
+	function getDocumentChooserHtml($form, $default=false, $formname='', $skiptree=false) { /* {{{ */
+		if(!$formname)
+			$formname = "docid";
+		$formid = md5($formname.$form);
+
 		$content = '';
-		$content .= "<input type=\"hidden\" id=\"docid".$formName."\" name=\"docid\" value=\"\">";
+		$content .= "<input type=\"hidden\" id=\"docid".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
 		$content .= "<div class=\"input-append\">\n";
-		$content .= "<input type=\"text\" id=\"choosedocsearch".$formName."\" data-target=\"docid".$formName."\" data-provide=\"typeahead\" name=\"docname".$formName."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" />";
-		$content .= "<a data-target=\"#docChooser".$formName."\" href=\"../out/out.DocumentChooser.php?form=".$formName."&folderid=".$this->params['rootfolderid']."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("document")."…</a>\n";
+		$content .= "<input type=\"text\" id=\"choosedocsearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"docname".$formid."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" value=\"" . (($default) ? htmlspecialchars($default->getName()) : "") ."\"/>";
+		$content .= "<button type=\"button\" class=\"btn\" id=\"cleardocument".$form."\" data-target=\"".$formid."\"><i class=\"fa fa-remove\"></i></button>";
+		if(!$skiptree)
+			$content .= "<a data-target=\"#docChooser".$formid."\" href=\"../out/out.DocumentChooser.php?form=".$formid."&folderid=".$this->params['rootfolderid']."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("document")."…</a>\n";
 		$content .= "</div>\n";
-		$content .= '
-<div class="modal hide" id="docChooser'.$formName.'" tabindex="-1" role="dialog" aria-labelledby="docChooserLabel" aria-hidden="true">
+		if(!$skiptree)
+			$content .= '
+<div class="modal hide" id="docChooser'.$formid.'" tabindex="-1" role="dialog" aria-labelledby="docChooserLabel" aria-hidden="true">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
     <h3 id="docChooserLabel">'.getMLText("choose_target_document").'</h3>
@@ -1214,45 +1221,56 @@ $(document).ready(function() {
 		echo self::getDocumentChooserHtml($formName);
 	} /* }}} */
 
-	function printDocumentChooserJs($formName) { /* {{{ */
+	/**
+	 * This function is deprecated. Don't use it anymore. There is a generic
+	 * folderSelected and documentSelected function in application.js
+	 * If you extra functions to be called then define them in your own js code
+	 */
+	function printDocumentChooserJs($form, $formname='') { /* {{{ */
+		if(!$formname)
+			$formname = "docid";
+		$formid = md5($formname.$form);
 ?>
-function documentSelected<?php echo $formName ?>(id, name) {
-	$('#docid<?php echo $formName ?>').val(id);
-	$('#choosedocsearch<?php echo $formName ?>').val(name);
-	$('#docChooser<?php echo $formName ?>').modal('hide');
+function documentSelected<?php echo $formid ?>(id, name) {
+	$('#docid<?php echo $formid ?>').val(id);
+	$('#choosedocsearch<?php echo $formid ?>').val(name);
+	$('#docChooser<?php echo $formid ?>').modal('hide');
 }
-function folderSelected<?php echo $formName ?>(id, name) {
+function folderSelected<?php echo $formid ?>(id, name) {
 }
 <?php
 	} /* }}} */
 
-	function printDocumentChooser($formName) { /* {{{ */
-		$this->printDocumentChooserHtml($formName);
+	function printDocumentChooser($form) { /* {{{ */
+		$this->printDocumentChooserHtml($form);
 ?>
 		<script language="JavaScript">
 <?php
-		$this->printDocumentChooserJs($formName);
+		$this->printDocumentChooserJs($form);
 ?>
 		</script>
 <?php
 	} /* }}} */
 
-	function getFolderChooserHtml($form, $accessMode, $exclude = -1, $default = false, $formname = '') { /* {{{ */
+	function getFolderChooserHtml($form, $accessMode, $exclude = -1, $default = false, $formname = '', $skiptree = false) { /* {{{ */
 		if(!$formname)
 			$formname = "targetid";
 		$formid = md5($formname.$form);
 		$content = '';
-		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
+		$content .= "<input type=\"hidden\" id=\"targetid".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
 		$content .= "<div class=\"input-append\">\n";
-		$content .= "<input type=\"text\" id=\"choosefoldersearch".$form."\" data-target=\"".$formid."\" data-provide=\"typeahead\"  name=\"targetname".$form."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" target=\"".$formid."\"/>";
-		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfolder".$form."\"><i class=\"fa fa-remove\"></i></button>";
-		$content .= "<a data-target=\"#folderChooser".$form."\" href=\"../out/out.FolderChooser.php?form=".$form."&mode=".$accessMode."&exclude=".$exclude."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("folder")."…</a>\n";
+		$content .= "<input type=\"text\" id=\"choosefoldersearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"targetname".$formid."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" target=\"".$formid."\"/>";
+		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfolder".$formid."\" data-target=\"".$formid."\"><i class=\"fa fa-remove\"></i></button>";
+		if(!$skiptree) {
+			$content .= "<a data-target=\"#folderChooser".$formid."\" href=\"../out/out.FolderChooser.php?form=".$formid."&mode=".$accessMode."&exclude=".$exclude."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("folder")."…</a>\n";
+		}
 		$content .= "</div>\n";
-		$content .= '
-<div class="modal hide" id="folderChooser'.$form.'" tabindex="-1" role="dialog" aria-labelledby="folderChooser'.$form.'Label" aria-hidden="true">
+		if(!$skiptree) {
+			$content .= '
+<div class="modal hide" id="folderChooser'.$formid.'" tabindex="-1" role="dialog" aria-labelledby="folderChooser'.$formid.'Label" aria-hidden="true">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="folderChooser'.$form.'Label">'.getMLText("choose_target_folder").'</h3>
+    <h3 id="folderChooser'.$formid.'Label">'.getMLText("choose_target_folder").'</h3>
   </div>
   <div class="modal-body">
 		<p>'.getMLText('tree_loading').'</p>
@@ -1262,6 +1280,7 @@ function folderSelected<?php echo $formName ?>(id, name) {
   </div>
 </div>
 ';
+		}
 		return $content;
 	} /* }}} */
 
@@ -1269,22 +1288,29 @@ function folderSelected<?php echo $formName ?>(id, name) {
 		echo self::getFolderChooserHtml($form, $accessMode, $exclude, $default, $formname);
 	} /* }}} */
 
+	/**
+	 * This function is deprecated. Don't use it anymore. There is a generic
+	 * folderSelected and documentSelected function in application.js
+	 * If you extra functions to be called then define them in your own js code
+	 */
 	function printFolderChooserJs($form, $formname='') { /* {{{ */
 		if(!$formname)
 			$formname = "targetid";
 		$formid = md5($formname.$form);
 ?>
-function folderSelected<?php echo $form ?>(id, name) {
-	$('#<?php echo $formid ?>').val(id);
-	$('#choosefoldersearch<?php echo $form ?>').val(name);
-	$('#folderChooser<?php echo $form ?>').modal('hide');
+function folderSelected<?php echo $formid ?>(id, name) {
+	$('#targetid<?php echo $formid ?>').val(id);
+	$('#choosefoldersearch<?php echo $formid ?>').val(name);
+	$('#folderChooser<?php echo $formid ?>').modal('hide');
 }
+/*
 $(document).ready(function() {
-	$('#clearfolder<?php print $form ?>').click(function(ev) {
-		$('#choosefoldersearch<?php echo $form ?>').val('');
-		$('#<?php echo $formid ?>').val('');
+	$('#clearfolder<?php print $formid ?>').click(function(ev) {
+		$('#choosefoldersearch<?php echo $formid ?>').val('');
+		$('#targetid<?php echo $formid ?>').val('');
 	});
 });
+*/
 <?php
 	} /* }}} */
 
@@ -1403,11 +1429,77 @@ $(document).ready(function() {
 <?php
 	} /* }}} */
 
+	function printAttributeValue($attribute) { /* {{{ */
+		echo self::getAttributeValue($attribute);
+	} /* }}} */
+
+	function getAttributeValue($attribute) { /* {{{ */
+		$dms = $this->params['dms'];
+		$attrdef = $attribute->getAttributeDefinition();
+		switch($attrdef->getType()) {
+		case SeedDMS_Core_AttributeDefinition::type_url:
+			$attrs = $attribute->getValueAsArray();
+			$tmp = array();
+			foreach($attrs as $attr) {
+				$tmp[] = '<a href="'.htmlspecialchars($attr).'">'.htmlspecialchars($attr).'</a>';
+			}
+			return implode('<br />', $tmp);
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_email:
+			$attrs = $attribute->getValueAsArray();
+			$tmp = array();
+			foreach($attrs as $attr) {
+				$tmp[] = '<a mailto="'.htmlspecialchars($attr).'">'.htmlspecialchars($attr).'</a>';
+			}
+			return implode('<br />', $tmp);
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_folder:
+			$attrs = $attribute->getValueAsArray();
+			$tmp = array();
+			foreach($attrs as $attr) {
+				if($targetfolder = $dms->getFolder(intval($attr)))
+					$tmp[] = '<a href="../out/out.ViewFolder.php?folderid='.$targetfolder->getId().'">'.htmlspecialchars($targetfolder->getName()).'</a>';
+			}
+			return implode('<br />', $tmp);
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_document:
+			$attrs = $attribute->getValueAsArray();
+			$tmp = array();
+			foreach($attrs as $attr) {
+				if($targetdoc = $dms->getDocument(intval($attr)))
+					$tmp[] = '<a href="../out/out.ViewDocument.php?documentid='.$targetdoc->getId().'">'.htmlspecialchars($targetdoc->getName()).'</a>';
+			}
+			return implode('<br />', $tmp);
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_user:
+			$attrs = $attribute->getValueAsArray();
+			$tmp = array();
+			foreach($attrs as $attr) {
+				$curuser = $dms->getUser((int) $attr);
+				$tmp[] = $curuser->getFullname()." (".$curuser->getLogin().")";
+			}
+			return implode('<br />', $tmp);
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_group:
+			$attrs = $attribute->getValueAsArray();
+			$tmp = array();
+			foreach($attrs as $attr) {
+				$curgroup = $dms->getGroup((int) $attr);
+				$tmp[] = $curgroup->getName();
+			}
+			return implode('<br />', $tmp);
+			break;
+		default:
+			return htmlspecialchars(implode(', ', $attribute->getValueAsArray()));
+		}
+	} /* }}} */
+
 	function printAttributeEditField($attrdef, $attribute, $fieldname='attributes', $norequire=false) { /* {{{ */
 		echo self::getAttributeEditField($attrdef, $attribute, $fieldname, $norequire);
 	} /* }}} */
 
 	function getAttributeEditField($attrdef, $attribute, $fieldname='attributes', $norequire=false) { /* {{{ */
+		$dms = $this->params['dms'];
 		$content = '';
 		switch($attrdef->getType()) {
 		case SeedDMS_Core_AttributeDefinition::type_boolean:
@@ -1429,6 +1521,58 @@ $(document).ready(function() {
 			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
 			$content .= "<input type=\"text\" id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '')." data-rule-number=\"true\"/>";
 			break;
+		case SeedDMS_Core_AttributeDefinition::type_folder:
+			$objvalue = $attribute ? (is_object($attribute) ? (int) $attribute->getValue() : (int) $attribute) : 0;
+			if($objvalue)
+				$target = $dms->getFolder($objvalue);
+			else
+				$target = null;
+			$content .= $this->getFolderChooserHtml("attr".$attrdef->getId(), M_READWRITE, -1, $target, $fieldname."[".$attrdef->getId()."]", false);
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_document:
+			$objvalue = $attribute ? (is_object($attribute) ? (int) $attribute->getValue() : (int) $attribute) : 0;
+			if($objvalue)
+				$target = $dms->getDocument($objvalue);
+			else
+				$target = null;
+			$content .= $this->getDocumentChooserHtml("attr".$attrdef->getId(), $target, $fieldname."[".$attrdef->getId()."]");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_user:
+			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValueAsArray() : $attribute) : array();
+			$users = $dms->getAllUsers();
+			if($users) {
+				$allowempty = $attrdef->getMinValues() == 0;
+				$allowmultiple = $attrdef->getMultipleValues();
+				$content .= "<select class=\"chzn-select\"".($allowempty ? " data-allow-clear=\"true\"" : "")."\" name=\"".$fieldname."[".$attrdef->getId()."]".($allowmultiple ? '[]' : '')."\"".($allowmultiple ? " multiple" : "")." data-placeholder=\"".getMLText("select_user")."\">";
+				if($allowempty)
+					$content .= "<option value=\"\"></option>";
+				foreach($users as $curuser) {
+					$content .= "<option value=\"".$curuser->getID()."\"";
+					if(in_array($curuser->getID(), $objvalue))
+						$content .= " selected";
+					$content .= ">".htmlspecialchars($curuser->getLogin()." - ".$curuser->getFullName())."</option>";
+				}
+				$content .= "</select>";
+			}
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_group:
+			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValueAsArray() : $attribute) : array();
+			$groups = $dms->getAllGroups();
+			if($groups) {
+				$allowempty = $attrdef->getMinValues() == 0;
+				$allowmultiple = $attrdef->getMultipleValues();
+				$content .= "<select class=\"chzn-select\"".($allowempty ? " data-allow-clear=\"true\"" : "")."\" name=\"".$fieldname."[".$attrdef->getId()."]".($allowmultiple ? '[]' : '')."\"".($allowmultiple ? " multiple" : "")." data-placeholder=\"".getMLText("select_group")."\">";
+				if($allowempty)
+					$content .= "<option value=\"\"></option>";
+				foreach($groups as $curgroup) {
+					$content .= "<option value=\"".$curgroup->getID()."\"";
+					if(in_array($curgroup->getID(), $objvalue))
+						$content .= " selected";
+					$content .= ">".htmlspecialchars($curgroup->getName())."</option>";
+				}
+				$content .= "</select>";
+			}
+			break;
 		default:
 			if($valueset = $attrdef->getValueSetAsArray()) {
 				$content .= "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"\"/>";
@@ -1735,12 +1879,17 @@ $(function() {
 		saveState: 'jqtree<?php echo $formid; ?>',
 		openedIcon: $('<i class="fa fa-minus-circle"></i>'),
 		closedIcon: $('<i class="fa fa-plus-circle"></i>'),
+/*
 		_onCanSelectNode: function(node) {
 			if(node.is_folder) {
-				folderSelected<?php echo $formid ?>(node.id, node.name);
-			} else
-				documentSelected<?php echo $formid ?>(node.id, node.name);
+				folderSelected<?= $formid ?>(node.id, node.name);
+				treeFolderSelected('<?= $formid ?>', node.id, node.name);
+			} else {
+				documentSelected<?= $formid ?>(node.id, node.name);
+				treeDocumentSelected('<?= $formid ?>', node.id, node.name);
+			}
 		},
+*/
 		autoOpen: false,
 		drapAndDrop: true,
     onCreateLi: function(node, $li) {
@@ -1759,18 +1908,32 @@ $(function() {
 			var node = event.node;
 			if(!node)
 				return;
-			$('#jqtree<?php echo $formid ?>').tree('openNode', node);
-//			event.preventDefault();
 			if(node.is_folder) {
+<?php if($showdocs) { ?>
+				$('#jqtree<?php echo $formid ?>').tree('openNode', node);
+//			event.preventDefault();
 				if(typeof node.fetched == 'undefined') {
 					node.fetched = true;
 					$(this).tree('loadDataFromUrl', node, function () {
 						$(this).tree('openNode', node);
 					});
 				}
-				folderSelected<?php echo $formid ?>(node.id, node.name);
-			} else
-				documentSelected<?php echo $formid ?>(node.id, node.name);
+<?php } ?>
+				/* folderSelectedXXXX() can still be set, e.g. for the main tree
+				 * to update the folder list.
+				 */
+				if (typeof folderSelected<?= $formid ?> === 'function') { 
+					folderSelected<?= $formid ?>(node.id, node.name);
+				}
+				treeFolderSelected('<?= $formid ?>', node.id, node.name);
+			} else {
+<?php if($showdocs) { ?>
+				if (typeof documentSelected<?= $formid ?> === 'function') { 
+					documentSelected<?= $formid ?>(node.id, node.name);
+				}
+				treeDocumentSelected('<?= $formid ?>', node.id, node.name);
+<?php } ?>
+			}
 		}
 	);
 	$('#jqtree<?php echo $formid ?>').on(

From f1d1c01c7084c37e77ccd52ebae88ad4c503da12 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Aug 2020 11:52:36 +0200
Subject: [PATCH 046/312] take out js from html code

---
 views/bootstrap/class.UsrMgr.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index ba94536ae..2cdfc5e63 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -335,9 +335,6 @@ $(document).ready( function() {
 			)
 		);
 		$this->formField(getMLText("home_folder"), $this->getFolderChooserHtml("form".($currUser ? $currUser->getId() : '0'), M_READ, -1, $currUser ? $dms->getFolder($currUser->getHomeFolder()) : 0, 'homefolder'));
-		echo '<script language="JavaScript">';
-		$this->printFolderChooserJs("form".($currUser ? $currUser->getId() : '0'));
-		echo '</script>';
 
 		$this->formField(
 			getMLText("quota"),

From d7fe2087d12966e72e194212900a65beb8a6746e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Aug 2020 11:53:34 +0200
Subject: [PATCH 047/312] move code into getAttributeValue()

---
 views/bootstrap/class.ViewDocument.php | 27 ++------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 4790211cc..2149d122b 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -93,30 +93,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 ?>
 		    <tr>
 					<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-					<td>
-<?php
-		switch($attrdef->getType()) {
-		case SeedDMS_Core_AttributeDefinition::type_url:
-			$attrs = $attribute->getValueAsArray();
-			$tmp = array();
-			foreach($attrs as $attr) {
-				$tmp[] = '<a href="'.htmlspecialchars($attr).'">'.htmlspecialchars($attr).'</a>';
-			}
-			echo implode('<br />', $tmp);
-			break;
-		case SeedDMS_Core_AttributeDefinition::type_email:
-			$attrs = $attribute->getValueAsArray();
-			$tmp = array();
-			foreach($attrs as $attr) {
-				$tmp[] = '<a mailto="'.htmlspecialchars($attr).'">'.htmlspecialchars($attr).'</a>';
-			}
-			echo implode('<br />', $tmp);
-			break;
-		default:
-			echo htmlspecialchars(implode(', ', $attribute->getValueAsArray()));
-		}
-?>
-					</td>
+					<td><?php echo $this->getAttributeValue($attribute); ?></td>
 		    </tr>
 <?php
 	} /* }}} */
@@ -192,7 +169,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				$latestContent = $document->getLatestContent();
 			$this->printTimelineJs('out.ViewDocument.php?action=timelinedata&documentid='.$latestContent->getDocument()->getID(), 300, '', date('Y-m-d'));
 		}
-		$this->printDocumentChooserJs("form1");
+//		$this->printDocumentChooserJs("form1");
 		$this->printDeleteDocumentButtonJs();
 		/* Add js for catching click on document in one page mode */
 		$this->printClickDocumentJs();

From f3c0c1847c04b572de242d5de3740f00f1c893f9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Aug 2020 11:54:12 +0200
Subject: [PATCH 048/312] give folder tree a unique id

---
 views/bootstrap/class.ViewFolder.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index 7aec058e9..27acd6e74 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -118,7 +118,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 		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'));
 ?>
 seeddms_folder = <?= $folder->getID() ?>;
-function folderSelected(id, name) {
+function folderSelectedmaintree(id, name) {
 <?php if(!$onepage) { ?>
 	window.location = '../out/out.ViewFolder.php?folderid=' + id;
 <?php } else { ?>
@@ -177,7 +177,7 @@ console.log(JSON.stringify(event.state));
 /* catch click on 'goto parent button' */
 $('body').on('click', '#goto-parent', function(ev) {
 	attr_id = $(ev.currentTarget).data('parentid');
-	folderSelected(attr_id, '');
+	folderSelectedmaintree(attr_id, '');
 	$([document.documentElement, document.body]).animate({
 	scrollTop: 200
 	}, 200);
@@ -192,7 +192,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 	attr_id = $(ev.currentTarget).parent().data('target-id');
 	if(typeof attr_id == 'undefined')
 		attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3];
-	folderSelected(attr_id, '');
+	folderSelectedmaintree(attr_id, '');
 	$([document.documentElement, document.body]).animate({
 	scrollTop: 200
 	}, 200);
@@ -209,7 +209,7 @@ $('body').on('click', '.order-btn', function(ev) {
 <?php } ?>
 <?php
 		if($showtree == 1)
-			$this->printNewTreeNavigationJs($folder->getID(), M_READ, 0, '', ($expandFolderTree == 1) ? -1 : 3, $orderby);
+			$this->printNewTreeNavigationJs($folder->getID(), M_READ, 0, 'maintree', ($expandFolderTree == 1) ? -1 : 3, $orderby);
 
 		if ($enableDropUpload && $folder->getAccessMode($user) >= M_READWRITE) {
 			echo "SeedDMSUpload.setUrl('../op/op.Ajax.php');";
@@ -299,7 +299,7 @@ $('body').on('click', '.order-btn', function(ev) {
 			?>
 					<tr>
 					<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-					<td><?php echo htmlspecialchars(implode(', ', $attribute->getValueAsArray())); ?></td>
+					<td><?php echo $this->getAttributeValue($attribute); ?></td>
 					</tr>
 <?php
 					}
@@ -581,7 +581,7 @@ $('body').on('click', '.order-btn', function(ev) {
 					 * access expandFolderTree with $this->params because it can
 					 * be changed by preContent hook.
 					 */
-					$this->printNewTreeNavigationHtml($folderid, M_READ, 0, '', ($this->params['expandFolderTree'] == 1) ? -1 : 3, $orderby);
+					$this->printNewTreeNavigationHtml($folderid, M_READ, 0, 'maintree', ($this->params['expandFolderTree'] == 1) ? -1 : 3, $orderby);
 					$this->contentContainerEnd();
 				} else {
 					$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=1\"><i class=\"fa fa-plus-circle\"></i></a>", true);

From b977d7c7fd692c392a6065f4b7af610059d39a9f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Aug 2020 11:54:52 +0200
Subject: [PATCH 049/312] no need to call printFolderChooserJs() anymore

---
 views/bootstrap/class.BackupTools.php  |  6 +++---
 views/bootstrap/class.ImportFS.php     |  2 +-
 views/bootstrap/class.ManageNotify.php |  4 ++--
 views/bootstrap/class.MoveDocument.php |  2 +-
 views/bootstrap/class.MoveFolder.php   |  2 +-
 views/bootstrap/class.Search.php       |  2 +-
 views/bootstrap/class.SearchForm.php   |  2 +-
 views/bootstrap/class.Settings.php     | 22 ++++------------------
 8 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/views/bootstrap/class.BackupTools.php b/views/bootstrap/class.BackupTools.php
index 9fa8c6beb..d2567ba58 100644
--- a/views/bootstrap/class.BackupTools.php
+++ b/views/bootstrap/class.BackupTools.php
@@ -34,9 +34,9 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript');
 
-		$this->printFolderChooserJs("form1");
-		$this->printFolderChooserJs("form2");
-		$this->printFolderChooserJs("form3");
+//		$this->printFolderChooserJs("form1");
+//		$this->printFolderChooserJs("form2");
+//		$this->printFolderChooserJs("form3");
 	} /* }}} */
 
 	function show() { /* {{{ */
diff --git a/views/bootstrap/class.ImportFS.php b/views/bootstrap/class.ImportFS.php
index 36387e615..e6d500f68 100644
--- a/views/bootstrap/class.ImportFS.php
+++ b/views/bootstrap/class.ImportFS.php
@@ -34,7 +34,7 @@ class SeedDMS_View_ImportFS extends SeedDMS_Bootstrap_Style {
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript');
 
-		$this->printFolderChooserJs("form1");
+//		$this->printFolderChooserJs("form1");
 		$this->printDropFolderChooserJs("form1", 1);
 	} /* }}} */
 
diff --git a/views/bootstrap/class.ManageNotify.php b/views/bootstrap/class.ManageNotify.php
index 08f142754..236570370 100644
--- a/views/bootstrap/class.ManageNotify.php
+++ b/views/bootstrap/class.ManageNotify.php
@@ -133,8 +133,8 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript');
 
-		$this->printFolderChooserJs("form1");
-		$this->printDocumentChooserJs("form2");
+//		$this->printFolderChooserJs("form1");
+//		$this->printDocumentChooserJs("form2");
 		$this->printClickDocumentJs();
 		$this->printClickFolderJs();
 	} /* }}} */
diff --git a/views/bootstrap/class.MoveDocument.php b/views/bootstrap/class.MoveDocument.php
index 286428e6f..8862db301 100644
--- a/views/bootstrap/class.MoveDocument.php
+++ b/views/bootstrap/class.MoveDocument.php
@@ -34,7 +34,7 @@ class SeedDMS_View_MoveDocument extends SeedDMS_Bootstrap_Style {
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript');
 
-		$this->printFolderChooserJs("form1");
+//		$this->printFolderChooserJs("form1");
 	} /* }}} */
 
 	function show() { /* {{{ */
diff --git a/views/bootstrap/class.MoveFolder.php b/views/bootstrap/class.MoveFolder.php
index fc741e40a..f9091fe31 100644
--- a/views/bootstrap/class.MoveFolder.php
+++ b/views/bootstrap/class.MoveFolder.php
@@ -34,7 +34,7 @@ class SeedDMS_View_MoveFolder extends SeedDMS_Bootstrap_Style {
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript');
 
-		$this->printFolderChooserJs("form1");
+//		$this->printFolderChooserJs("form1");
 	} /* }}} */
 
 	function show() { /* {{{ */
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 920cea858..4e91d4301 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -57,7 +57,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 
 		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
 
-		$this->printFolderChooserJs("form1");
+//		$this->printFolderChooserJs("form1");
 		$this->printDeleteFolderButtonJs();
 		$this->printDeleteDocumentButtonJs();
 		/* Add js for catching click on document in one page mode */
diff --git a/views/bootstrap/class.SearchForm.php b/views/bootstrap/class.SearchForm.php
index 24ce015ee..1e89729f6 100644
--- a/views/bootstrap/class.SearchForm.php
+++ b/views/bootstrap/class.SearchForm.php
@@ -66,7 +66,7 @@ $(document).ready(function() {
 	});
 });
 <?php
-		$this->printFolderChooserJs("form1");
+//		$this->printFolderChooserJs("form1");
 	} /* }}} */
 
 	function show() { /* {{{ */
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 94b95f7ab..ea7c37582 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -236,23 +236,6 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style {
 			});
 		});
 <?php
-		foreach($extmgr->getExtensionConfiguration() as $extname=>$extconf) {
-			if($extconf['config']) {
-				foreach($extconf['config'] as $confkey=>$conf) {
-					switch($conf['type']) {
-					case 'select':
-						if(!empty($conf['internal'])) {
-							switch($conf['internal']) {
-							case "folders":
-								$this->printFolderChooserJs("form".$extname.$confkey, 'extensions['.$extname."][".$confkey."]");
-								break;
-							}
-						}
-						break;
-					}
-				}
-			}
-		}
 	} /* }}} */
 
 	function show() { /* {{{ */
@@ -587,7 +570,10 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
 										}
 										break;
 									case "attributedefinitions":
-										$recs = $dms->getAllAttributeDefinitions();
+										if(empty($conf['objtype']))
+											$recs = $dms->getAllAttributeDefinitions();
+										else
+											$recs = $dms->getAllAttributeDefinitions(explode(',', $conf['objtype']));
 										if($recs) {
 											echo "<select class=\"chzn-select\"".($allowempty ? " data-allow-clear=\"true\"" : "")."\" name=\"extensions[".$extname."][".$confkey."][]\"".(!empty($conf['multiple']) ? "  multiple" : "").(!empty($conf['size']) ? "  size=\"".$conf['size']."\"" : "")." data-placeholder=\"".getMLText("select_attribute_value")."\">";
 											if($allowempty)

From c1f138956012b4fec910dd2d538cd19e72ee784e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Aug 2020 11:55:57 +0200
Subject: [PATCH 050/312] take out another view

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f10892e27..bb9b3e979 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ VERSION=$(shell php -r 'include("inc/inc.Version.php"); $$v=new SeedDMS_Version(
 SRC=CHANGELOG inc conf utils index.php .htaccess languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer
 # webapp
 
-NODISTFILES=utils/importmail.php utils/seedddms-importmail utils/remote-email-upload utils/remote-upload utils/da-bv-reminder.php utils/seeddms-da-bv-reminder .svn .gitignore styles/blue styles/hc styles/clean views/blue views/hc views/clean views/pca
+NODISTFILES=utils/importmail.php utils/seedddms-importmail utils/remote-email-upload utils/remote-upload utils/da-bv-reminder.php utils/seeddms-da-bv-reminder .svn .gitignore styles/blue styles/hc styles/clean views/blue views/hc views/clean views/pca views/tdk
 
 EXTENSIONS := \
 	dynamic_content.tar.gz\

From 6e665abcf4a7689308542dbb7d54c32a7e2c3172 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Aug 2020 11:56:09 +0200
Subject: [PATCH 051/312] more changes in 5.1.19

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index a94a041a6..295a4bd9f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,6 +22,8 @@
 - move lots of javascript packages into views/bootstrap/vendors and update
   them with npm and grunt
 - update to font-awesome 4.7.1
+- add new attribute types 'document', 'folder', 'user', 'group'
+- overhaul of folder tree which can now be used more than once on a page
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.18

From b15c47117e96a599ac6eeee3de0d64dcd6a9fce4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Aug 2020 13:11:05 +0200
Subject: [PATCH 052/312] out message if no groups/users are available

---
 views/bootstrap/class.Bootstrap.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 2cb993576..1c32912b2 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1553,6 +1553,8 @@ $(document).ready(function() {
 					$content .= ">".htmlspecialchars($curuser->getLogin()." - ".$curuser->getFullName())."</option>";
 				}
 				$content .= "</select>";
+			} else {
+				$content .= getMLText('no_users');
 			}
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_group:
@@ -1571,6 +1573,8 @@ $(document).ready(function() {
 					$content .= ">".htmlspecialchars($curgroup->getName())."</option>";
 				}
 				$content .= "</select>";
+			} else {
+				$content .= getMLText('no_groups');
 			}
 			break;
 		default:

From 031408fdae10ff4686b7df52566ddcdd5a1b8a81 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Aug 2020 15:33:59 +0200
Subject: [PATCH 053/312] remove duplicate release 5.1.17

---
 SeedDMS_Core/package.xml | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 823d7ab15..8bc578879 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -28,7 +28,6 @@
 - clear the save content list and latest content in SeedDMS_Core_Document after
   a version has been deleted.
 - new method SeedDMS_Core_Document::isLatestVersion()
-- add new attribute types 'document', 'folder', 'user', 'group'
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1852,22 +1851,6 @@ log entry first
 - add new method SeedDMS_Core_DMS::getDocumentsExpired()
    </notes>
   </release>
-  <release>
-   <date>2020-05-14</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
-   </notes>
-  </release>
   <release>
    <date>2017-05-28</date>
    <time>06:34:50</time>

From d1ad6383d20ffe2f804c7457e89ac0cdb53aaf11 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Aug 2020 15:37:02 +0200
Subject: [PATCH 054/312] update notes for 5.1.19

---
 SeedDMS_Core/package.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 8bc578879..2db2e696a 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -1788,7 +1788,7 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
    </notes>
   </release>
   <release>
-   <date>2020-06-05</date>
+   <date>2020-05-28</date>
    <time>09:43:12</time>
    <version>
     <release>5.1.18</release>
@@ -1818,6 +1818,11 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
+- add method SeedDMS_Core_Document::setParent() as an alias for setFolder()
+- clear the save content list and latest content in SeedDMS_Core_Document after
+  a version has been deleted.
+- new method SeedDMS_Core_Document::isLatestVersion()
+- add new attribute types 'document', 'folder', 'user', 'group'
    </notes>
   </release>
   <release>

From 52f6d0a803021fa6726ef79d0950891a77533e0c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Aug 2020 09:50:39 +0200
Subject: [PATCH 055/312] fix typo

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 295a4bd9f..0ae6ea5d3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,7 +13,7 @@
 - open the right page or tab after a document version has been removed
   (go to folder page if the whole document was removed, go to previous tab
   if an old version was removed and there are other older version, otherwise
-  to to current tab)
+  go to current tab)
 - expiration of document can be set through webdav
 - prefix each attribute with 'attr_' when read through webdav
 - actually set owner as notified user, not the logged in user,

From ee87a6a3848e29c4fe160242ae513210184a4412 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Aug 2020 09:50:51 +0200
Subject: [PATCH 056/312] put all js libs for bootstrap view into one copy task

---
 Gruntfile.js | 179 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 100 insertions(+), 79 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index fe0ce1ae4..1beeb3cc4 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,205 +1,191 @@
 module.exports = function (grunt) {
     'use strict';
 
-    var vendorDir = 'views/bootstrap/vendors',
+    var bootstrapDir = 'views/bootstrap/vendors',
+        tdkDir = 'views/tdk/vendors',
         nodeDir = 'node_modules';
 
     grunt.initConfig({
         clean: {
-            vendors: [ vendorDir ]
+            vendors: [ bootstrapDir ]
         },
         copy: {
-					'jquery': {
+					'bootstrap': {
 						files: [{
 								expand: true,
 								src: [
 										nodeDir + '/jquery/dist/*'
 								],
-								dest: vendorDir + '/jquery',
+								dest: bootstrapDir + '/jquery',
 								flatten: true
-						}]
-					},
-					'chartjs': {
-						files: [{
+						}, {
 								expand: true,
 								src: [
 										nodeDir + '/chartjs/chart.js',
 										nodeDir + '/chartjs/README.md',
 										nodeDir + '/chartjs/LICENSE'
 								],
-								dest: vendorDir + '/chartjs',
+								dest: bootstrapDir + '/chartjs',
 								flatten: true
-						}]
-					},
-					'cytoscape': {
-						files: [{
+						},{
 								expand: true,
 								src: [
 										nodeDir + '/cytoscape/dist/*',
 										nodeDir + '/cytoscape-grid-guide/cytoscape-grid-guide.js'
 								],
-								dest: vendorDir + '/cytoscape',
+								dest: bootstrapDir + '/cytoscape',
 								flatten: true
-						}]
-					},
-					'jqtree': {
-						files: [{
+						},{
 								expand: true,
 								src: [
 										nodeDir + '/jqtree/tree.jquery.js',
 										nodeDir + '/jqtree/jqtree.css'
 								],
-								dest: vendorDir + '/jqtree',
+								dest: bootstrapDir + '/jqtree',
 								flatten: true
-						}]
-					},
-					'noty': {
-						files: [{
+						},{
 								expand: true,
 								src: [
 										nodeDir + '/noty/js/noty/jquery.noty.js'
 								],
-								dest: vendorDir + '/noty',
+								dest: bootstrapDir + '/noty',
 								flatten: true
 						},{
 								expand: true,
 								src: [
 										nodeDir + '/noty/js/noty/themes/*'
 								],
-								dest: vendorDir + '/noty/themes',
+								dest: bootstrapDir + '/noty/themes',
 								flatten: true
 						},{
 								expand: true,
 								src: [
 										nodeDir + '/noty/js/noty/layouts/*'
 								],
-								dest: vendorDir + '/noty/layouts',
+								dest: bootstrapDir + '/noty/layouts',
 								flatten: true
-						}]
-					},
-					'select2': {
-						files: [{
+						},{
 								expand: true,
 								src: [
 										nodeDir + '/select2/dist/js/*'
 								],
-								dest: vendorDir + '/select2/js',
+								dest: bootstrapDir + '/select2/js',
 								flatten: true
 						},{
 								expand: true,
 								src: [
 										nodeDir + '/select2/dist/css/*'
 								],
-								dest: vendorDir + '/select2/css',
+								dest: bootstrapDir + '/select2/css',
 								flatten: true
-						}]
-					},
-					'fine-uploader': {
-						files: [{
+						},{
 								expand: true,
 								src: [
 										nodeDir + '/fine-uploader/jquery.fine-uploader/*'
 								],
-								dest: vendorDir + '/fine-uploader',
+								dest: bootstrapDir + '/fine-uploader',
 								flatten: true
-						}]
-					},
-					'jquery-validation': {
-						files: [{
+						},{
 								expand: true,
 								src: [
 										nodeDir + '/jquery-validation/dist/*'
 								],
-								dest: vendorDir + '/jquery-validation',
+								dest: bootstrapDir + '/jquery-validation',
 								flatten: true
-						}]
-					},
-					'flot': {
-						files: [{
+						},{
 								expand: true,
 								src: [
 										nodeDir + '/flot/source/jquery.canvaswrapper.js',
 										nodeDir + '/flot/source/jquery.colorhelpers.js',
 										nodeDir + '/flot/source/jquery.flot.*'
 								],
-								dest: vendorDir + '/flot',
+								dest: bootstrapDir + '/flot',
 								flatten: true
-						}]
-					},
-					'font-awesome': {
-						files: [{
+						},{
 								expand: true,
 								src: [
 										nodeDir + '/font-awesome/fonts/*'
 								],
-								dest: vendorDir + '/font-awesome/fonts',
+								dest: bootstrapDir + '/font-awesome/fonts',
 								flatten: true
 						},{
 								expand: true,
 								src: [
 										nodeDir + '/font-awesome/css/*'
 								],
-								dest: vendorDir + '/font-awesome/css',
+								dest: bootstrapDir + '/font-awesome/css',
 								flatten: true
-						}]
-					},
-					'fullcalendar': {
-						files: [{
+						},{
 								expand: true,
 								src: [
 										nodeDir + '/fullcalendar/LICENSE.txt',
 										nodeDir + '/fullcalendar/dist/*'
 								],
-								dest: vendorDir + '/fullcalendar',
+								dest: bootstrapDir + '/fullcalendar',
 								flatten: true
 						},{
 								expand: true,
 								src: [
 										nodeDir + '/fullcalendar/dist/locale/*'
 								],
-								dest: vendorDir + '/fullcalendar/locale',
+								dest: bootstrapDir + '/fullcalendar/locale',
 								flatten: true
-						}]
-					},
-					'moment': {
-						files: [{
+						},{
 								expand: true,
 								src: [
 										nodeDir + '/moment/LICENSE.txt',
 										nodeDir + '/moment/min/*'
 								],
-								dest: vendorDir + '/moment',
+								dest: bootstrapDir + '/moment',
 								flatten: true
 						},{
 								expand: true,
 								src: [
 										nodeDir + '/moment/dist/locale/*'
 								],
-								dest: vendorDir + '/moment/locale',
+								dest: bootstrapDir + '/moment/locale',
 								flatten: true
-						}]
-					},
-					'bootstrap-datepicker': {
-						files: [{
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/perfect-scrollbar/dist/*'
+								],
+								dest: bootstrapDir + '/perfect-scrollbar',
+								flatten: true
+						},{
 								expand: true,
 								src: [
 										nodeDir + '/bootstrap-datepicker/dist/js/*'
 								],
-								dest: vendorDir + '/bootstrap-datepicker/js',
+								dest: bootstrapDir + '/bootstrap-datepicker/js',
 								flatten: true
 						},{
 								expand: true,
 								src: [
 										nodeDir + '/bootstrap-datepicker/dist/css/*'
 								],
-								dest: vendorDir + '/bootstrap-datepicker/css',
+								dest: bootstrapDir + '/bootstrap-datepicker/css',
 								flatten: true
 						},{
 								expand: true,
 								src: [
 										nodeDir + '/bootstrap-datepicker/dist/locales/*'
 								],
-								dest: vendorDir + '/bootstrap-datepicker/locales',
+								dest: bootstrapDir + '/bootstrap-datepicker/locales',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/@coreui/coreui/dist/js/*'
+								],
+								dest: bootstrapDir + '/coreui/js',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/@coreui/coreui/dist/css/*'
+								],
+								dest: bootstrapDir + '/coreui/css',
 								flatten: true
 						}]
 					},
@@ -209,29 +195,64 @@ module.exports = function (grunt) {
 								src: [
 										nodeDir + '/@coreui/coreui/dist/js/*'
 								],
-								dest: vendorDir + '/coreui/js',
+								dest: tdkDir + '/coreui/js',
 								flatten: true
 						},{
 								expand: true,
 								src: [
 										nodeDir + '/@coreui/coreui/dist/css/*'
 								],
-								dest: vendorDir + '/coreui/css',
+								dest: tdkDir + '/coreui/css',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/perfect-scrollbar/dist/*'
+								],
+								dest: tdkDir + '/perfect-scrollbar',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/bootstrap/dist/js/*'
+								],
+								dest: tdkDir + '/bootstrap/js',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/bootstrap/dist/css/*'
+								],
+								dest: tdkDir + '/bootstrap/css',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/font-awesome/fonts/*'
+								],
+								dest: tdkDir + '/font-awesome/fonts',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/font-awesome/css/*'
+								],
+								dest: tdkDir + '/font-awesome/css',
 								flatten: true
 						}]
-					}
+					},
 				}
     });
 
     grunt.registerTask('createVendorDir', 'Creates the necessary vendor directory', function() {
-        // Create the vendorDir when it doesn't exists.
-        if (!grunt.file.isDir(vendorDir)) {
-            grunt.file.mkdir(vendorDir);
+        // Create the bootstrapDir when it doesn't exists.
+        if (!grunt.file.isDir(bootstrapDir)) {
+            grunt.file.mkdir(bootstrapDir);
 
             // Output a success message
             grunt.log.oklns(grunt.template.process(
                 'Directory "<%= directory %>" was created successfully.',
-                { data: { directory: vendorDir } }
+                { data: { directory: bootstrapDir } }
             ));
         }
     });

From 0db704e44f9a026819983b97ded3f7037e8dba66 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Aug 2020 09:51:50 +0200
Subject: [PATCH 057/312] add @popperjs/core, bootstrap and perfect-scrollbar

---
 package.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package.json b/package.json
index f1243efb9..8378da1e4 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,8 @@
   "license": "ISC",
   "dependencies": {
     "@coreui/coreui": "^3.2.2",
+    "@popperjs/core": "^2.4.4",
+    "bootstrap": "^4.5.2",
     "bootstrap-datepicker": "^1.9.0",
     "chartjs": "^0.3.24",
     "cytoscape": "^3.15.2",
@@ -26,6 +28,7 @@
     "jquery-validation": "^1.19.2",
     "moment": "^2.17.1",
     "noty": "^2.4.1",
+    "perfect-scrollbar": "^1.5.0",
     "select2": "^4.0.13"
   }
 }

From b9ea04658b9a1a5e61c827fca1fdde61696e5b74 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Aug 2020 12:58:48 +0200
Subject: [PATCH 058/312] check for existence of paramter command

---
 op/op.Ajax.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 5b798ffa5..e01f9a267 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -88,7 +88,7 @@ if (isset($_COOKIE["mydms_session"])) {
  */
 header("Cache-Control: no-cache,no-store");
 
-$command = $_REQUEST["command"];
+$command = isset($_REQUEST["command"]) ? $_REQUEST["command"] : '';
 switch($command) {
 	case 'checkpwstrength': /* {{{ */
 		$ps = new Password_Strength();

From 49321d2dbe2f7f779695eabba579a3d6a8072eba Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Aug 2020 12:59:14 +0200
Subject: [PATCH 059/312] check for $fieldwrap[1]

---
 views/bootstrap/class.UpdateDocument.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index c4ad359dc..8fbf44dc9 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -402,7 +402,10 @@ console.log(element);
 						}
 					}
 					if($tmp) {
-						$fieldwrap[1] .= '<div class="mandatories"><span>'.getMLText('mandatory_reviewers').':</span> '.implode(', ', $tmp)."</div>\n";
+						if(isset($fieldwrap[1]))
+							$fieldwrap[1] .= '<div class="mandatories"><span>'.getMLText('mandatory_reviewers').':</span> '.implode(', ', $tmp)."</div>\n";
+						else
+							$fieldwrap[1] = '<div class="mandatories"><span>'.getMLText('mandatory_reviewers').':</span> '.implode(', ', $tmp)."</div>\n";
 					}
 				}
 

From a328984b3d0433602184353822040f4acb6a0d51 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Aug 2020 12:59:39 +0200
Subject: [PATCH 060/312] add version by ->version() instead of ->_number

---
 op/op.CreateDump.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.CreateDump.php b/op/op.CreateDump.php
index f96fe84af..787e53383 100644
--- a/op/op.CreateDump.php
+++ b/op/op.CreateDump.php
@@ -36,7 +36,7 @@ if (!$settings->_backupDir) {
 }
 
 $v = new SeedDMS_Version;
-$dump_name = addDirSep($settings->_backupDir).date('Y-m-d\TH-i-s')."_".$v->_number.".sql";
+$dump_name = addDirSep($settings->_backupDir).date('Y-m-d\TH-i-s')."_".$v->version().".sql";
 if(!$dms->createDump($dump_name))
 	UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
 

From 9e5224a661b7935989287b561009cae74e34146c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Aug 2020 13:01:40 +0200
Subject: [PATCH 061/312] fix typo in var name

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 24adb30f2..3bf68f12d 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -5480,7 +5480,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return -2;
 		}
 		$status = array_pop($receiptStatus["status"]);
-		if ($tatus["status"]!=0) {
+		if ($status["status"]!=0) {
 			// User has already submitted a receipt or has already been deleted;
 			// return an error.
 			return -3;

From 10ecff61427888e033b613bedf0d51121dcb8754 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Aug 2020 13:18:05 +0200
Subject: [PATCH 062/312] better check fro repair parameter

---
 out/out.ObjectCheck.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index f4514164e..81e8183f8 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -102,7 +102,7 @@ $processwithoutusergroup = array();
 foreach(array('review', 'approval', 'receipt', 'revision') as $process) {
 	foreach(array('user', 'group') as $ug) {
 		if(!isset($_GET['action']) || $_GET['action'] == 'list'.ucfirst($process).'Without'.ucfirst($ug)) {
-			if($_GET['repair'])
+			if(isset($_GET['repair']) && $_GET['repair'])
 				$dms->removeProcessWithoutUserGroup($process, $ug, isset($_GET['required']) ? $_GET['required'] : '');
 			$processwithoutusergroup[$process][$ug] = $dms->getProcessWithoutUserGroup($process, $ug);
 		}

From 012dbeaf27e54ead5d1d28f89d78e532a74face3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Aug 2020 15:31:29 +0200
Subject: [PATCH 063/312] fix access on workflow object

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 3bf68f12d..72ad2850a 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3902,7 +3902,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			if($this->_workflow) {
 				if (!$this->_workflowState)
 					$this->getWorkflowState();
-				$transitions = $this->_workflow->getNextTransitions($this->_workflowState);
+				$transitions = $this->_workflow['workflow']->getNextTransitions($this->_workflowState);
 				foreach($transitions as $transition) {
 					if($this->triggerWorkflowTransitionIsAllowed($u, $transition))
 						return M_READ;
@@ -6428,7 +6428,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 		$workflowlogs = array();
 		$i = 0;
-		$workflowlog = new SeedDMS_Core_Workflow_Log($resArr[$i]["id"], $this->_document->getDMS()->getDocument($resArr[$i]["document"]), $resArr[$i]["version"], $this->_workflow, $this->_document->getDMS()->getUser($resArr[$i]["userid"]), $this->_workflow->getTransition($resArr[$i]["transition"]), $resArr[$i]["date"], $resArr[$i]["comment"]);
+		$workflowlog = new SeedDMS_Core_Workflow_Log($resArr[$i]["id"], $this->_document->getDMS()->getDocument($resArr[$i]["document"]), $resArr[$i]["version"], $this->_workflow, $this->_document->getDMS()->getUser($resArr[$i]["userid"]), $this->_workflow['workflow']->getTransition($resArr[$i]["transition"]), $resArr[$i]["date"], $resArr[$i]["comment"]);
 		$workflowlog->setDMS($this);
 
 		return $workflowlog;

From 8865f61a5440a4dd81324b7d66f28124e5d66d9b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Aug 2020 15:35:54 +0200
Subject: [PATCH 064/312] show menu tasks in legacy mode (Closes #485)

---
 inc/inc.ClassAccessOperation.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 4e57a2a16..a01abd2f4 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -500,6 +500,7 @@ class SeedDMS_AccessOperation {
 				'SetRevisors',
 				'SetWorkflow',
 				'SubstituteUser',
+				'Tasks',
 				'TransmittalMgr',
 				'TriggerWorkflow',
 				'UpdateDocument',

From ac81ce43353583a161916e093867d2e06d4baaaf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Aug 2020 15:41:24 +0200
Subject: [PATCH 065/312] add changes for 6.0.12

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 620cf47a2..7ed2414d8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
                      Changes in version 6.0.12
 --------------------------------------------------------------------------------
 - merge changes up to 5.1.19
+- fix various errors concerning workflows
+- show menu tasks even if not admin (Closes: #485)
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.11

From 051fac82817fbdf046a6e26c20a8e4e94773bc4b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Sep 2020 09:22:48 +0200
Subject: [PATCH 066/312] add validation and parsing of new types (user, group,
 etc.)

---
 SeedDMS_Core/Core/inc.ClassAttribute.php | 90 +++++++++++++++++++++++-
 1 file changed, 87 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassAttribute.php b/SeedDMS_Core/Core/inc.ClassAttribute.php
index 857b15ab4..2e9e6d11c 100644
--- a/SeedDMS_Core/Core/inc.ClassAttribute.php
+++ b/SeedDMS_Core/Core/inc.ClassAttribute.php
@@ -800,12 +800,52 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 			$sep = substr($value, 0, 1);
 			$vsep = $this->getValueSetSeparator();
 			if($sep == $vsep)
-				return(explode($sep, substr($value, 1)));
+				$values = explode($sep, substr($value, 1));
 			else
-				return(array($value));
+				$values = array($value);
 		} else {
-			return array($value);
+			$values = array($value);
 		}
+
+		switch((string) $this->getType()) {
+		case self::type_document:
+			foreach($values as $value) {
+				if($u = $this->_dms->getDocument((int) $value))
+					$tmp[] = $u->getName();
+				else
+					$tmp[] = '???';
+			}
+			$values = $tmp;	
+			break;
+		case self::type_folder:
+			foreach($values as $value) {
+				if($u = $this->_dms->getFolder((int) $value))
+					$tmp[] = $u->getName();
+				else
+					$tmp[] = '???';
+			}
+			$values = $tmp;	
+			break;
+		case self::type_user:
+			foreach($values as $value) {
+				if($u = $this->_dms->getUser((int) $value))
+					$tmp[] = $u->getLogin();
+				else
+					$tmp[] = '???';
+			}
+			$values = $tmp;	
+			break;
+		case self::type_group:
+			foreach($values as $value) {
+				if($u = $this->_dms->getGroup((int) $value))
+					$tmp[] = $u->getName();
+				else
+					$tmp[] = '???';
+			}
+			$values = $tmp;	
+			break;
+		}
+		return $values;
 	} /* }}} */
 
 	/**
@@ -1084,6 +1124,12 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 			}
 		}
 
+		/* Turn $attrvalue into an array of values. Checks if $attrvalue starts
+		 * with a separator char as set in the value set and uses it to explode
+		 * the $attrvalue. If the separator doesn't match or this attribute
+		 * definition doesn't have a value set, then just create a one element
+		 * array. if $attrvalue is empty, then create an empty array.
+		 */
 		if($this->getMultipleValues()) {
 			if(is_string($attrvalue)) {
 				$sep = $attrvalue[0];
@@ -1100,11 +1146,13 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 			$values = array();
 		}
 
+		/* Check if attribute value has at least the minimum number of values */
 		$this->_validation_error = 0;
 		if($this->getMinValues() > count($values)) {
 			$this->_validation_error = 1;
 			return false;
 		}
+		/* Check if attribute value has not more than maximum number of values */
 		if($this->getMaxValues() && $this->getMaxValues() < count($values)) {
 			$this->_validation_error = 2;
 			return false;
@@ -1163,6 +1211,42 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 			if(!$success)
 				$this->_validation_error = 4;
 			break;
+		case self::type_document:
+			foreach($values as $value) {
+				$success = true;
+				if(!$this->_dms->getDocument((int) $value))
+					$success = false;
+			}
+			if(!$success)
+				$this->_validation_error = 10;
+			break;
+		case self::type_folder:
+			foreach($values as $value) {
+				$success = true;
+				if(!$this->_dms->getFolder((int) $value))
+					$success = false;
+			}
+			if(!$success)
+				$this->_validation_error = 11;
+			break;
+		case self::type_user:
+			foreach($values as $value) {
+				$success = true;
+				if(!$this->_dms->getUser((int) $value))
+					$success = false;
+			}
+			if(!$success)
+				$this->_validation_error = 12;
+			break;
+		case self::type_group:
+			foreach($values as $value) {
+				$success = true;
+				if(!$this->_dms->getGroup((int) $value))
+					$success = false;
+			}
+			if(!$success)
+				$this->_validation_error = 13;
+			break;
 		}
 
 		if(!$success)

From d5d70e4802a746d5ee56c2316db66f11664888c8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Sep 2020 09:23:32 +0200
Subject: [PATCH 067/312] some more help text, show propper type in list of
 attributes

---
 views/bootstrap/class.AttributeMgr.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index ae264bcbf..b3f90356c 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -261,7 +261,8 @@ $(document).ready( function() {
 				'type'=>'text',
 				'name'=>'minvalues',
 				'value'=>($attrdef ? $attrdef->getMinValues() : ''),
-			)
+			),
+			['help'=>getMLText('attrdef_minvalues_help')]
 		);
 		$this->formField(
 			getMLText("attrdef_maxvalues"),
@@ -286,7 +287,8 @@ $(document).ready( function() {
 				'type'=>'text',
 				'name'=>'valueset',
 				'value'=>($attrdef ? $attrdef->getValueSet() : ''),
-			))
+			)),
+			['help'=>getMLText('attrdef_valueset_help')]
 		);
 		$this->formField(
 			getMLText("attrdef_regex"),
@@ -295,7 +297,8 @@ $(document).ready( function() {
 				'type'=>'text',
 				'name'=>'regex',
 				'value'=>($attrdef ? $attrdef->getRegex() : ''),
-			)
+			),
+			['help'=>getMLText('attrdef_regex_help')]
 		);
 		$this->formSubmit('<i class="fa fa-save"></i> '.getMLText('save'));
 ?>
@@ -357,9 +360,18 @@ $(document).ready( function() {
 					case SeedDMS_Core_AttributeDefinition::type_string:
 						$t = getMLText("attrdef_type_string");
 						break;
+					case SeedDMS_Core_AttributeDefinition::type_boolean:
+						$t = getMLText("attrdef_type_boolean");
+						break;
 					case SeedDMS_Core_AttributeDefinition::type_date:
 						$t = getMLText("attrdef_type_date");
 						break;
+					case SeedDMS_Core_AttributeDefinition::type_email:
+						$t = getMLText("attrdef_type_email");
+						break;
+					case SeedDMS_Core_AttributeDefinition::type_url:
+						$t = getMLText("attrdef_type_url");
+						break;
 					case SeedDMS_Core_AttributeDefinition::type_boolean:
 						$t = getMLText("attrdef_type_boolean");
 						break;

From dad650fb9be2fb7939695b555f81249eb0500d49 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Sep 2020 09:24:17 +0200
Subject: [PATCH 068/312] show help cursor on form field label if help is
 available

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 1c32912b2..97eac8898 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -894,7 +894,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	function formField($title, $value, $params=array()) { /* {{{ */
 		if($title !== null) {
 			echo "<div class=\"control-group\">";
-			echo "	<label class=\"control-label\"".(!empty($params['help']) ? " title=\"".$params['help']."\"" : "").">".$title.":</label>";
+			echo "	<label class=\"control-label\"".(!empty($params['help']) ? " title=\"".$params['help']."\" style=\"cursor: help;\"" : "").">".$title.":</label>";
 			echo "	<div class=\"controls\">";
 		}
 		if(isset($params['field_wrap'][0]))

From 6025ae731cb51b2490fcbb28dc96be2ba7101887 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Sep 2020 11:16:14 +0200
Subject: [PATCH 069/312] various updates

---
 languages/ar_EG/lang.inc | 10 ++++++++++
 languages/bg_BG/lang.inc | 10 ++++++++++
 languages/ca_ES/lang.inc | 10 ++++++++++
 languages/cs_CZ/lang.inc | 10 ++++++++++
 languages/de_DE/lang.inc | 12 +++++++++++-
 languages/el_GR/lang.inc | 10 ++++++++++
 languages/en_GB/lang.inc | 14 ++++++++++++--
 languages/es_ES/lang.inc | 10 ++++++++++
 languages/fr_FR/lang.inc | 10 ++++++++++
 languages/hr_HR/lang.inc | 10 ++++++++++
 languages/hu_HU/lang.inc | 10 ++++++++++
 languages/it_IT/lang.inc | 10 ++++++++++
 languages/ko_KR/lang.inc | 10 ++++++++++
 languages/lo_LA/lang.inc | 10 ++++++++++
 languages/nb_NO/lang.inc | 10 ++++++++++
 languages/nl_NL/lang.inc | 10 ++++++++++
 languages/pl_PL/lang.inc | 10 ++++++++++
 languages/pt_BR/lang.inc | 10 ++++++++++
 languages/ro_RO/lang.inc | 10 ++++++++++
 languages/ru_RU/lang.inc | 10 ++++++++++
 languages/sk_SK/lang.inc | 10 ++++++++++
 languages/sv_SE/lang.inc | 10 ++++++++++
 languages/tr_TR/lang.inc | 10 ++++++++++
 languages/uk_UA/lang.inc | 10 ++++++++++
 languages/zh_CN/lang.inc | 10 ++++++++++
 languages/zh_TW/lang.inc | 10 ++++++++++
 26 files changed, 263 insertions(+), 3 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index d5767745e..b7cb5cb26 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -144,6 +144,7 @@ URL: [url]',
 'attrdef_management' => 'ادارة تعريف السمات',
 'attrdef_maxvalues' => 'اكبر عدد من القيم',
 'attrdef_minvalues' => 'اقل عدد من القيم',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => 'الأقل اكبر من الأكبر',
 'attrdef_multiple' => 'السماح باكثر من قيمة',
 'attrdef_multiple_needs_valueset' => 'يحتاج أكثر من قيمة',
@@ -152,15 +153,21 @@ URL: [url]',
 'attrdef_noname' => 'لا يوجد اسم',
 'attrdef_objtype' => 'نوع الورقة',
 'attrdef_regex' => 'attrdef_regex',
+'attrdef_regex_help' => '',
 'attrdef_type' => 'نوع',
 'attrdef_type_boolean' => 'boolean',
 'attrdef_type_date' => 'تاريخ',
+'attrdef_type_document' => '',
 'attrdef_type_email' => 'بريد إلكتروني',
 'attrdef_type_float' => 'رقم مع فواصل',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => 'رقم صحيح',
 'attrdef_type_string' => 'نص',
 'attrdef_type_url' => 'رابط',
+'attrdef_type_user' => '',
 'attrdef_valueset' => 'مجموعة القيم',
+'attrdef_valueset_help' => '',
 'attributes' => 'السمات',
 'attribute_changed_email_body' => 'تم تغيير سمة
 Document: [name]
@@ -540,8 +547,10 @@ URL: [url]',
 'extension_changelog' => 'سجل التعديلات',
 'extension_loading' => 'تحميل الإضافات',
 'extension_manager' => 'إدارة الإضافات',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => 'تثبيت إدارة الإضافات',
 'extension_mgr_no_upload' => 'لا يمكن تحميل إضافات جديدة لأن دليل الإضافات غير قابل للكتابة.',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => 'مستودع إدارة الإضافات',
 'extension_version_list' => 'لائحة الإضافات حسب الإصدار',
 'february' => 'فبراير',
@@ -1783,6 +1792,7 @@ URL: [url]',
 'tr_TR' => 'التركية',
 'tuesday' => 'الثلاثاء',
 'tuesday_abbr' => 'ث',
+'types_generic' => '',
 'type_of_hook' => 'نوع المسار',
 'type_to_filter' => '',
 'type_to_search' => 'اكتب لتبحث',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 079bf34c1..1de27655d 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -135,6 +135,7 @@ $text = array(
 'attrdef_management' => 'Управление дефинирането на атрибути',
 'attrdef_maxvalues' => 'Max. брой стойности',
 'attrdef_minvalues' => 'Min. брой стойности',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => '',
 'attrdef_multiple' => 'ПОзволи няколко стойности',
 'attrdef_multiple_needs_valueset' => '',
@@ -143,15 +144,21 @@ $text = array(
 'attrdef_noname' => '',
 'attrdef_objtype' => 'Тип на обекта',
 'attrdef_regex' => '',
+'attrdef_regex_help' => '',
 'attrdef_type' => 'Тип',
 'attrdef_type_boolean' => '',
 'attrdef_type_date' => 'Дата',
+'attrdef_type_document' => '',
 'attrdef_type_email' => '',
 'attrdef_type_float' => '',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => '',
 'attrdef_type_string' => '',
 'attrdef_type_url' => '',
+'attrdef_type_user' => '',
 'attrdef_valueset' => 'Набор стойности',
+'attrdef_valueset_help' => '',
 'attributes' => 'Атрибути',
 'attribute_changed_email_body' => '',
 'attribute_changed_email_subject' => '',
@@ -489,8 +496,10 @@ $text = array(
 'extension_changelog' => '',
 'extension_loading' => '',
 'extension_manager' => 'управление на добавките',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => '',
 'extension_version_list' => '',
 'february' => 'Февруари',
@@ -1637,6 +1646,7 @@ $text = array(
 'tr_TR' => 'Турски',
 'tuesday' => 'вторник',
 'tuesday_abbr' => '',
+'types_generic' => '',
 'type_of_hook' => '',
 'type_to_filter' => '',
 'type_to_search' => 'Тип за търсене',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 0c68ef1ae..b97a8492c 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -140,6 +140,7 @@ URL: [url]',
 'attrdef_management' => '',
 'attrdef_maxvalues' => '',
 'attrdef_minvalues' => '',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => '',
 'attrdef_multiple' => '',
 'attrdef_multiple_needs_valueset' => '',
@@ -148,15 +149,21 @@ URL: [url]',
 'attrdef_noname' => '',
 'attrdef_objtype' => '',
 'attrdef_regex' => '',
+'attrdef_regex_help' => '',
 'attrdef_type' => '',
 'attrdef_type_boolean' => '',
 'attrdef_type_date' => 'Data',
+'attrdef_type_document' => '',
 'attrdef_type_email' => '',
 'attrdef_type_float' => '',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => '',
 'attrdef_type_string' => '',
 'attrdef_type_url' => '',
+'attrdef_type_user' => '',
 'attrdef_valueset' => '',
+'attrdef_valueset_help' => '',
 'attributes' => 'Atributs',
 'attribute_changed_email_body' => '',
 'attribute_changed_email_subject' => '',
@@ -494,8 +501,10 @@ URL: [url]',
 'extension_changelog' => '',
 'extension_loading' => '',
 'extension_manager' => 'Gestiona les Extensions',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => '',
 'extension_version_list' => '',
 'february' => 'Febrer',
@@ -1642,6 +1651,7 @@ URL: [url]',
 'tr_TR' => 'Turc',
 'tuesday' => 'Dimarts',
 'tuesday_abbr' => '',
+'types_generic' => '',
 'type_of_hook' => '',
 'type_to_filter' => '',
 'type_to_search' => 'Cerca',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 1ab587929..339ea1550 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -156,6 +156,7 @@ URL: [url]',
 'attrdef_management' => 'Správa definic atributů',
 'attrdef_maxvalues' => 'Max. počet hodnot',
 'attrdef_minvalues' => 'Min. počet hodnot',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => 'Minimální počet hodnot je větší, než maximální počet hodnot',
 'attrdef_multiple' => 'Povolit více hodnot',
 'attrdef_multiple_needs_valueset' => 'Definice atributu s více hodnotami potřebuje nastavit hodnoty.',
@@ -164,15 +165,21 @@ URL: [url]',
 'attrdef_noname' => 'Chybí název definice atributu',
 'attrdef_objtype' => 'Typ objektu',
 'attrdef_regex' => 'Regulární výraz',
+'attrdef_regex_help' => '',
 'attrdef_type' => 'Typ',
 'attrdef_type_boolean' => 'Boolean',
 'attrdef_type_date' => 'Datum',
+'attrdef_type_document' => '',
 'attrdef_type_email' => 'Email',
 'attrdef_type_float' => 'Float',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => 'Integer',
 'attrdef_type_string' => 'Řetězec',
 'attrdef_type_url' => 'URL',
+'attrdef_type_user' => '',
 'attrdef_valueset' => 'Soubor hodnot',
+'attrdef_valueset_help' => '',
 'attributes' => 'Atributy',
 'attribute_changed_email_body' => 'Atributy změněny
 Dokument: [name]
@@ -564,8 +571,10 @@ URL: [url]',
 'extension_changelog' => 'Changelog',
 'extension_loading' => 'Načítání rozšíření',
 'extension_manager' => 'Správa rozšíření',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => 'Instalováno',
 'extension_mgr_no_upload' => 'Nahrání nového rozšíření není možné, jelikož do složky rozšíření nelze zapisovat.',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => 'Dostupný',
 'extension_version_list' => 'Verze',
 'february' => 'Únor',
@@ -1855,6 +1864,7 @@ URL: [url]',
 'tr_TR' => 'Turečtina',
 'tuesday' => 'Úterý',
 'tuesday_abbr' => 'Út',
+'types_generic' => '',
 'type_of_hook' => 'Typ hooku',
 'type_to_filter' => '',
 'type_to_search' => 'Zadejte hledaný výraz',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index cdf0e9430..fcf90519c 100644
--- 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 (2794), dgrutsch (22)
+//    Translators: Admin (2804), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -156,6 +156,7 @@ URL: [url]',
 'attrdef_management' => 'Attributdefinitions-Management',
 'attrdef_maxvalues' => 'Max. Anzahl Werte',
 'attrdef_minvalues' => 'Min. Anzahl Werte',
+'attrdef_minvalues_help' => 'Minimale Anzahl der Werte. Setzen Sie diesen Wert auf 1, wenn ein Attribut gesetzt werden muss.',
 'attrdef_min_greater_max' => 'Zahl der minimalen Werte ist größer als Zahl der maximalen Werte',
 'attrdef_multiple' => 'Mehrfachwerte erlaubt',
 'attrdef_multiple_needs_valueset' => 'Attributdefinition mit Mehrfachwerten erfordert eine Werteliste.',
@@ -164,15 +165,21 @@ URL: [url]',
 'attrdef_noname' => 'Kein Name für die Attributedefinition eingegeben',
 'attrdef_objtype' => 'Objekttyp',
 'attrdef_regex' => 'Regulärer Ausdruck',
+'attrdef_regex_help' => 'Regulärer Ausdruck, der beim Typ Zeichenkette auf den Wert zutreffen muss.',
 'attrdef_type' => 'Typ',
 'attrdef_type_boolean' => 'Boolean',
 'attrdef_type_date' => 'Datum',
+'attrdef_type_document' => 'Dokument',
 'attrdef_type_email' => 'E-Mail',
 'attrdef_type_float' => 'Dezimalzahl',
+'attrdef_type_folder' => 'Ordner',
+'attrdef_type_group' => 'Gruppe',
 'attrdef_type_int' => 'Ganzahlig',
 'attrdef_type_string' => 'Zeichenkette',
 'attrdef_type_url' => 'URL',
+'attrdef_type_user' => 'Benutzer',
 'attrdef_valueset' => 'Werteauswahl',
+'attrdef_valueset_help' => 'Eine Liste von Werten, durch ein beliebiges Zeichen getrennt, welches auch am Anfang dieer Zeichenkette stehen muss, z.B. #ja#nein#vielleicht',
 'attributes' => 'Attribute',
 'attribute_changed_email_body' => 'Attribut geändert
 Dokument: [name]
@@ -564,8 +571,10 @@ URL: [url]',
 'extension_changelog' => 'Versionshistorie',
 'extension_loading' => 'Lade Erweiterungen ...',
 'extension_manager' => 'Erweiterungen verwalten',
+'extension_mgr_error_upload' => 'Beim Hochladen der Extension ist ein Fehler aufgetreten.',
 'extension_mgr_installed' => 'Installiert',
 'extension_mgr_no_upload' => 'Der Upload neuer Erweiterungen ist nicht möglich, weil das Verzeichnis für Erweiterungen nicht beschreibbar ist.',
+'extension_mgr_no_zipfile' => 'Die hochgeladene Erweiterung ist keine Zip-Datei',
 'extension_mgr_repository' => 'Verfügbar',
 'extension_version_list' => 'Versionen',
 'february' => 'Februar',
@@ -1866,6 +1875,7 @@ URL: [url]',
 'tr_TR' => 'Türkisch',
 'tuesday' => 'Dienstag',
 'tuesday_abbr' => 'Di',
+'types_generic' => 'Generische Typen',
 'type_of_hook' => 'Typ',
 'type_to_filter' => 'Hier tippen zum Filtern der Liste',
 'type_to_search' => 'Hier tippen zum Suchen',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index c6b8831ef..039210e27 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -135,6 +135,7 @@ $text = array(
 'attrdef_management' => '',
 'attrdef_maxvalues' => 'Μέγιστος αριθμός τιμών',
 'attrdef_minvalues' => 'Ελάχιστος αριθμός τιμών',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => '',
 'attrdef_multiple' => '',
 'attrdef_multiple_needs_valueset' => '',
@@ -143,15 +144,21 @@ $text = array(
 'attrdef_noname' => '',
 'attrdef_objtype' => '',
 'attrdef_regex' => '',
+'attrdef_regex_help' => '',
 'attrdef_type' => '',
 'attrdef_type_boolean' => '',
 'attrdef_type_date' => '',
+'attrdef_type_document' => '',
 'attrdef_type_email' => '',
 'attrdef_type_float' => '',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => '',
 'attrdef_type_string' => '',
 'attrdef_type_url' => '',
+'attrdef_type_user' => '',
 'attrdef_valueset' => '',
+'attrdef_valueset_help' => '',
 'attributes' => '',
 'attribute_changed_email_body' => '',
 'attribute_changed_email_subject' => '',
@@ -489,8 +496,10 @@ $text = array(
 'extension_changelog' => '',
 'extension_loading' => '',
 'extension_manager' => 'Διαχείριση πρόσθετων',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => '',
 'extension_version_list' => '',
 'february' => 'Φεβρουάριος',
@@ -1648,6 +1657,7 @@ URL: [url]',
 'tr_TR' => 'Τούρκικα',
 'tuesday' => 'Τρίτη',
 'tuesday_abbr' => '',
+'types_generic' => '',
 'type_of_hook' => '',
 'type_to_filter' => '',
 'type_to_search' => 'Πληκτρολόγησε για αναζήτηση',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 6653618ab..8a08b1abd 100644
--- 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 (1900), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1912), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -156,6 +156,7 @@ URL: [url]',
 'attrdef_management' => 'Attribute definition management',
 'attrdef_maxvalues' => 'Max. number of values',
 'attrdef_minvalues' => 'Min. number of values',
+'attrdef_minvalues_help' => 'Minimum number of values. Set to 1 if attribute must be set.',
 'attrdef_min_greater_max' => 'Minimum number of values is larger than maximum number of values',
 'attrdef_multiple' => 'Allow multiple values',
 'attrdef_multiple_needs_valueset' => 'Attribute definition with multiple values needs value set.',
@@ -164,15 +165,21 @@ URL: [url]',
 'attrdef_noname' => 'Missing name for attribute definition',
 'attrdef_objtype' => 'Object type',
 'attrdef_regex' => 'Regular expression',
+'attrdef_regex_help' => 'Regular expression which must match the attribute value if type is string.',
 'attrdef_type' => 'Type',
 'attrdef_type_boolean' => 'Boolean',
 'attrdef_type_date' => 'Date',
+'attrdef_type_document' => 'Document',
 'attrdef_type_email' => 'Email',
 'attrdef_type_float' => 'Float',
+'attrdef_type_folder' => 'Folder',
+'attrdef_type_group' => 'Group',
 'attrdef_type_int' => 'Integer',
 'attrdef_type_string' => 'String',
 'attrdef_type_url' => 'URL',
+'attrdef_type_user' => 'User',
 'attrdef_valueset' => 'Set of values',
+'attrdef_valueset_help' => 'A list of values separated by an arbitrary char, which also must be the first char of this string, e.g. #yes#no#maybe',
 'attributes' => 'Attributes',
 'attribute_changed_email_body' => 'Attribute changed
 Document: [name]
@@ -319,7 +326,7 @@ URL: [url]',
 'current_version' => 'Current version',
 'daily' => 'Daily',
 'databasesearch' => 'Database search',
-'database_schema_version' => 'Version of database scheman',
+'database_schema_version' => 'Version of database schema',
 'date' => 'Date',
 'days' => 'days',
 'debug' => 'Debug',
@@ -564,8 +571,10 @@ URL: [url]',
 'extension_changelog' => 'Changelog',
 'extension_loading' => 'Loading extensions ...',
 'extension_manager' => 'Manage extensions',
+'extension_mgr_error_upload' => 'Error while uploading the extension.',
 'extension_mgr_installed' => 'Installed',
 'extension_mgr_no_upload' => 'Uploading new extensions is not possible because the extentension directory is not writable.',
+'extension_mgr_no_zipfile' => 'The uploaded extension is not a zip file',
 'extension_mgr_repository' => 'Available',
 'extension_version_list' => 'Versions',
 'february' => 'February',
@@ -1860,6 +1869,7 @@ URL: [url]',
 'tr_TR' => 'Turkish',
 'tuesday' => 'Tuesday',
 'tuesday_abbr' => 'Tu',
+'types_generic' => 'Generic types',
 'type_of_hook' => 'Type',
 'type_to_filter' => 'Type to filter list',
 'type_to_search' => 'Type to search',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 7e2e33365..de48c3f26 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -151,6 +151,7 @@ URL: [url]',
 'attrdef_management' => 'Gestión de definición de atributos',
 'attrdef_maxvalues' => 'Núm. máximo de valores',
 'attrdef_minvalues' => 'Núm. mínimo de valores',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => 'El número mínimo de valores es mayor que el numero máximo de valores',
 'attrdef_multiple' => 'Permitir múltiples valores',
 'attrdef_multiple_needs_valueset' => '',
@@ -159,15 +160,21 @@ URL: [url]',
 'attrdef_noname' => 'Ingrese el nombre del atributo',
 'attrdef_objtype' => 'Tipo de objeto',
 'attrdef_regex' => 'Expresión regular',
+'attrdef_regex_help' => '',
 'attrdef_type' => 'Tipo',
 'attrdef_type_boolean' => 'Lógico (booleano)',
 'attrdef_type_date' => 'Fecha',
+'attrdef_type_document' => '',
 'attrdef_type_email' => 'E-mail',
 'attrdef_type_float' => 'Número decimal',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => 'Número entero',
 'attrdef_type_string' => 'Texto',
 'attrdef_type_url' => 'URL',
+'attrdef_type_user' => '',
 'attrdef_valueset' => 'Conjunto de valores',
+'attrdef_valueset_help' => '',
 'attributes' => 'Atributos',
 'attribute_changed_email_body' => 'Atributo modificado
 Documento: [name]
@@ -547,8 +554,10 @@ URL: [url]',
 'extension_changelog' => 'Log de Cambios',
 'extension_loading' => 'Cargando extensiones',
 'extension_manager' => 'Administrar extensiones',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => 'Instalada',
 'extension_mgr_no_upload' => 'No es posible cargar mas extensiones porque el directorio de extensiones no se puede escribir',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => 'Disponible',
 'extension_version_list' => 'Versiones',
 'february' => 'Febrero',
@@ -1798,6 +1807,7 @@ URL: [url]',
 'tr_TR' => 'Turco',
 'tuesday' => 'Martes',
 'tuesday_abbr' => 'M',
+'types_generic' => '',
 'type_of_hook' => '',
 'type_to_filter' => '',
 'type_to_search' => 'Tipo de búsqueda',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 0b5a06061..24706a3c0 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -156,6 +156,7 @@ URL : [url]',
 'attrdef_management' => 'Gestion des définitions d\'attributs',
 'attrdef_maxvalues' => 'Nombre maximum de valeurs',
 'attrdef_minvalues' => 'Nombre minimum de valeurs',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => 'Le nombre minimum de valeurs est supérieur au maximum',
 'attrdef_multiple' => 'Permettre des valeurs multiples',
 'attrdef_multiple_needs_valueset' => 'Une définition d’attribut à valeurs multiples nécessite un ensemble de valeurs.',
@@ -164,15 +165,21 @@ URL : [url]',
 'attrdef_noname' => 'Le nom d\'attribut est manquant',
 'attrdef_objtype' => 'Type objet',
 'attrdef_regex' => 'Expression régulière',
+'attrdef_regex_help' => '',
 'attrdef_type' => 'Type',
 'attrdef_type_boolean' => 'Valeur booléenne',
 'attrdef_type_date' => 'Date',
+'attrdef_type_document' => '',
 'attrdef_type_email' => 'E-mail',
 'attrdef_type_float' => 'Décimal',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => 'Entier',
 'attrdef_type_string' => 'Chaîne',
 'attrdef_type_url' => 'URL',
+'attrdef_type_user' => '',
 'attrdef_valueset' => 'Ensemble de valeurs',
+'attrdef_valueset_help' => '',
 'attributes' => 'Attributs',
 'attribute_changed_email_body' => 'Attribut changé
 Document: [name]
@@ -564,8 +571,10 @@ URL : [url]',
 'extension_changelog' => 'Journal des modifications',
 'extension_loading' => 'Chargement des extensions…',
 'extension_manager' => 'Gestionnaire d\'extensions',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => 'Installées',
 'extension_mgr_no_upload' => 'L’ajout de nouvelles extensions n’est pas possible car le répertoire des extensions n’est pas accessible en écriture.',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => 'Disponibles',
 'extension_version_list' => 'Versions',
 'february' => 'Février',
@@ -1858,6 +1867,7 @@ URL : [url]',
 'tr_TR' => 'Turc',
 'tuesday' => 'Mardi',
 'tuesday_abbr' => 'Mar.',
+'types_generic' => '',
 'type_of_hook' => 'Type',
 'type_to_filter' => 'Filtrer dans la liste',
 'type_to_search' => 'Effectuer une recherche',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 919785b4b..e65d2e221 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -156,6 +156,7 @@ Internet poveznica: [url]',
 'attrdef_management' => 'Upravljanje definicijama atributa',
 'attrdef_maxvalues' => 'Max. broj vrijednosti',
 'attrdef_minvalues' => 'Min. broj vrijednosti',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => 'Minimalni broj vrijednosti je veći od maksimalnog broja vrijednosti',
 'attrdef_multiple' => 'Dozvoli više vrijednosti',
 'attrdef_multiple_needs_valueset' => '',
@@ -164,15 +165,21 @@ Internet poveznica: [url]',
 'attrdef_noname' => 'Nedostaje naziv za definiciju atributa',
 'attrdef_objtype' => 'Vrsta objekta',
 'attrdef_regex' => 'Pravilni izraz',
+'attrdef_regex_help' => '',
 'attrdef_type' => 'Vrsta',
 'attrdef_type_boolean' => 'Boolean',
 'attrdef_type_date' => 'Datum',
+'attrdef_type_document' => '',
 'attrdef_type_email' => 'Email',
 'attrdef_type_float' => 'Float',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => 'Integer',
 'attrdef_type_string' => 'String',
 'attrdef_type_url' => 'URL',
+'attrdef_type_user' => '',
 'attrdef_valueset' => 'Skup vrijednosti',
+'attrdef_valueset_help' => '',
 'attributes' => 'Atributi',
 'attribute_changed_email_body' => 'Promijenjen atribut
 Dokument: [name]
@@ -552,8 +559,10 @@ Internet poveznica: [url]',
 'extension_changelog' => 'Popis promjena',
 'extension_loading' => 'Učitavanje dodataka…',
 'extension_manager' => 'Upravljanje ekstenzijama',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => 'Upload novih ekstenzija nije moguć pošto mapa ekstenzija nema dozvolu pisanja',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => 'Dostupno',
 'extension_version_list' => 'Inačice',
 'february' => 'Veljača',
@@ -1819,6 +1828,7 @@ Internet poveznica: [url]',
 'tr_TR' => 'Turski',
 'tuesday' => 'Utorak',
 'tuesday_abbr' => 'Ut',
+'types_generic' => '',
 'type_of_hook' => '',
 'type_to_filter' => '',
 'type_to_search' => 'Unesi za pretragu',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 85b02a7a9..f300f89b5 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -151,6 +151,7 @@ URL: [url]',
 'attrdef_management' => 'Jellemző meghatározás kezelése',
 'attrdef_maxvalues' => 'Legnagyobb érték',
 'attrdef_minvalues' => 'Legkisebb érték',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => 'A minimum érték magasabb mint a maximum érték',
 'attrdef_multiple' => 'Több érték is megadható',
 'attrdef_multiple_needs_valueset' => '',
@@ -159,15 +160,21 @@ URL: [url]',
 'attrdef_noname' => 'Hiányzó név a tulajdonság megadásánál',
 'attrdef_objtype' => 'Objektum típus',
 'attrdef_regex' => 'Szabályos kifejezés',
+'attrdef_regex_help' => '',
 'attrdef_type' => 'Típus',
 'attrdef_type_boolean' => 'Logikai',
 'attrdef_type_date' => 'Dátum',
+'attrdef_type_document' => '',
 'attrdef_type_email' => 'Email',
 'attrdef_type_float' => 'Szám tizedesjeggyel',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => 'Egész szám',
 'attrdef_type_string' => 'Szöveg',
 'attrdef_type_url' => 'URL',
+'attrdef_type_user' => '',
 'attrdef_valueset' => 'Értékek beállítása',
+'attrdef_valueset_help' => '',
 'attributes' => 'Jellemzők',
 'attribute_changed_email_body' => 'Jellemző módosult
 Dokumentum: [name]
@@ -547,8 +554,10 @@ URL: [url]',
 'extension_changelog' => 'Változásnapló',
 'extension_loading' => 'Kiterjesztések betöltése ...',
 'extension_manager' => 'Bővítmények kezelése',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => 'Telepített',
 'extension_mgr_no_upload' => '',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => 'Telepíthető',
 'extension_version_list' => 'Verziók',
 'february' => 'Február',
@@ -1797,6 +1806,7 @@ URL: [url]',
 'tr_TR' => 'Török',
 'tuesday' => 'Kedd',
 'tuesday_abbr' => 'Ke',
+'types_generic' => '',
 'type_of_hook' => '',
 'type_to_filter' => '',
 'type_to_search' => 'Adja meg a keresendő kifejezést',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 991eca2ac..f5847422b 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -156,6 +156,7 @@ URL: [url]',
 'attrdef_management' => 'Gestione attributi',
 'attrdef_maxvalues' => 'Numero di valori max.',
 'attrdef_minvalues' => 'Numero di valori min.',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => 'Il numero minimo di valori è maggiore del massimo',
 'attrdef_multiple' => 'Permetti valori multipli',
 'attrdef_multiple_needs_valueset' => 'Attributo definizione con i molteplici valori  esigenze un valore impostato.',
@@ -164,15 +165,21 @@ URL: [url]',
 'attrdef_noname' => 'Nella definizione dell\'attributo manca il nome',
 'attrdef_objtype' => 'Tipo di oggetto',
 'attrdef_regex' => 'Espressione regolare',
+'attrdef_regex_help' => '',
 'attrdef_type' => 'Tipo',
 'attrdef_type_boolean' => 'Booleano',
 'attrdef_type_date' => 'Data',
+'attrdef_type_document' => '',
 'attrdef_type_email' => 'Email',
 'attrdef_type_float' => 'Virgola mobile',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => 'Intero',
 'attrdef_type_string' => 'Stringa',
 'attrdef_type_url' => 'URL',
+'attrdef_type_user' => '',
 'attrdef_valueset' => 'Set di valori',
+'attrdef_valueset_help' => '',
 'attributes' => 'Attributi',
 'attribute_changed_email_body' => 'Attributo modificato
 Documento: [name]
@@ -557,8 +564,10 @@ URL: [url]',
 'extension_changelog' => 'Registro delle modifiche delle estensioni',
 'extension_loading' => 'Caricamento estensioni...',
 'extension_manager' => 'Gestisci le estensioni dei files',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => 'Installato',
 'extension_mgr_no_upload' => 'Il caricamento della nuova estensione non è possibile perchè la cartella delle estensioni non ha diritti di scrittura',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => 'Disponibile',
 'extension_version_list' => 'Versioni',
 'february' => 'Febbraio',
@@ -1846,6 +1855,7 @@ URL: [url]',
 'tr_TR' => 'Turco',
 'tuesday' => 'Martedì',
 'tuesday_abbr' => 'Mar',
+'types_generic' => '',
 'type_of_hook' => 'Tipo',
 'type_to_filter' => '',
 'type_to_search' => 'Digitare per cercare',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 303cfea70..19d80b0bf 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -156,6 +156,7 @@ URL: [url]',
 'attrdef_management' => '속성 관리',
 'attrdef_maxvalues' => '최대수',
 'attrdef_minvalues' => '최소수',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => '최소값은 최대 값 보다 큽니다',
 'attrdef_multiple' => '여러 값 허용',
 'attrdef_multiple_needs_valueset' => '정의된 복수의 속성',
@@ -164,15 +165,21 @@ URL: [url]',
 'attrdef_noname' => '속성 정의명이 없습',
 'attrdef_objtype' => '개체 유형',
 'attrdef_regex' => '정규 표현식',
+'attrdef_regex_help' => '',
 'attrdef_type' => '유형',
 'attrdef_type_boolean' => 'Boolean',
 'attrdef_type_date' => '날짜',
+'attrdef_type_document' => '',
 'attrdef_type_email' => '전자우편',
 'attrdef_type_float' => 'Float',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => '정수',
 'attrdef_type_string' => '문자열',
 'attrdef_type_url' => 'URL',
+'attrdef_type_user' => '',
 'attrdef_valueset' => '값 설정',
+'attrdef_valueset_help' => '',
 'attributes' => '속성',
 'attribute_changed_email_body' => '속성 변경
 문서: [name]
@@ -553,8 +560,10 @@ URL: [url]',
 'extension_changelog' => '',
 'extension_loading' => '',
 'extension_manager' => '확장자 관리',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => '',
 'extension_version_list' => '',
 'february' => '2월',
@@ -1813,6 +1822,7 @@ URL : [url]',
 'tr_TR' => '터키어',
 'tuesday' => '화요일',
 'tuesday_abbr' => '화',
+'types_generic' => '',
 'type_of_hook' => '유형',
 'type_to_filter' => '',
 'type_to_search' => '유형 검색',
diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc
index 305326a49..b12185090 100644
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@@ -156,6 +156,7 @@ URL: [url]',
 'attrdef_management' => 'ການຈັດການຄວາມຫມາຍຂອງຄຳວ່າລັກສະນະ',
 'attrdef_maxvalues' => 'ຈຳນວນ ມູນຄ່າຫຼາຍສຸດ',
 'attrdef_minvalues' => 'ຈຳນວນ ມູນຄ່ານ້ອຍສຸດ',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => 'ຈຳນວນມູນຄ່ານ້ອຍສຸດຫຼາຍກວ່າມູນຄ່າຫຼາຍສຸດ',
 'attrdef_multiple' => 'ອະນຸຍາດຄ່າຫຼາຍຄ່າ',
 'attrdef_multiple_needs_valueset' => 'ນິຍາມແອັດທີບິວທີ່ມີຫຼາຍຄ່າຕ້ອງມີການຕັ້ງຄ່າ',
@@ -164,15 +165,21 @@ URL: [url]',
 'attrdef_noname' => 'ບໍ່ມີຊືຄຳນິຍາມຂອງຄຳວ່າລັກສະນະ',
 'attrdef_objtype' => 'ຊະນຶດຂອງວັດຖຸ',
 'attrdef_regex' => 'ໂດຍທົ່ວໄປແລ້ວ',
+'attrdef_regex_help' => '',
 'attrdef_type' => 'ຊະນຶດ',
 'attrdef_type_boolean' => 'ບູລຶນ',
 'attrdef_type_date' => 'ວັນທີ',
+'attrdef_type_document' => '',
 'attrdef_type_email' => 'ອີເມວ',
 'attrdef_type_float' => 'ລອຍ',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => 'ຈຳນວນເຕັມ',
 'attrdef_type_string' => 'ເຊື່ອກ',
 'attrdef_type_url' => 'ຢູ່ອາແອວ',
+'attrdef_type_user' => '',
 'attrdef_valueset' => 'ກຳນົດຄ່າຕ່າງ',
+'attrdef_valueset_help' => '',
 'attributes' => 'ແອັດທີບິວ',
 'attribute_changed_email_body' => 'ປ່ຽນແອັດທີບິວແລ້ວ
 ເອກະສານ: [name]
@@ -550,8 +557,10 @@ URL: [url]',
 'extension_changelog' => '',
 'extension_loading' => '',
 'extension_manager' => 'ການຈັດການສ່ວນຂະຫຍາຍ',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => '',
 'extension_version_list' => '',
 'february' => 'ເດືອນ ກຸມພາ',
@@ -1839,6 +1848,7 @@ URL: [url]',
 'tr_TR' => 'ຕວກກີ',
 'tuesday' => 'ວັນອັງຄານ',
 'tuesday_abbr' => 'ວັນອັງຄານ',
+'types_generic' => '',
 'type_of_hook' => 'ຊະນິດ',
 'type_to_filter' => '',
 'type_to_search' => 'ພິມເພື່ອຄົ້ນຫາ',
diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc
index b287e8a3b..7c988f298 100644
--- a/languages/nb_NO/lang.inc
+++ b/languages/nb_NO/lang.inc
@@ -156,6 +156,7 @@ URL: [url]',
 'attrdef_management' => 'Styring av egenskaps definisjon',
 'attrdef_maxvalues' => 'Maks. antall verdier',
 'attrdef_minvalues' => 'Min. antall verdier',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => 'Verdien av minste tall er større en verdien av maksimum tall',
 'attrdef_multiple' => 'Tillat flere verdier',
 'attrdef_multiple_needs_valueset' => 'Egenskaps definisjon med flere verdier trenger verdisettes.',
@@ -164,15 +165,21 @@ URL: [url]',
 'attrdef_noname' => 'Mangler navn for egenskapsdefinisjon',
 'attrdef_objtype' => 'Objekt type',
 'attrdef_regex' => 'Standard uttrykk',
+'attrdef_regex_help' => '',
 'attrdef_type' => 'Type',
 'attrdef_type_boolean' => 'Logisk',
 'attrdef_type_date' => 'Dato',
+'attrdef_type_document' => '',
 'attrdef_type_email' => 'E-post',
 'attrdef_type_float' => 'Flyttall',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => 'Heltall',
 'attrdef_type_string' => 'Tekststreng',
 'attrdef_type_url' => 'URL',
+'attrdef_type_user' => '',
 'attrdef_valueset' => 'Verdisett',
+'attrdef_valueset_help' => '',
 'attributes' => 'Egenskap',
 'attribute_changed_email_body' => 'Endret egenskap
 Dokument: [name]
@@ -564,8 +571,10 @@ URL: [url]',
 'extension_changelog' => 'Endringslogg',
 'extension_loading' => 'Laster inn utvidelser ...',
 'extension_manager' => 'Administrer utvidelser',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => 'Innstallert',
 'extension_mgr_no_upload' => 'Det er ikke mulig å laste opp nye utvidelser fordi utvidelseskatalogen ikke kan skrives til.',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => 'Tilgjengelig',
 'extension_version_list' => 'Versjon',
 'february' => 'Februar',
@@ -1852,6 +1861,7 @@ URL: [url]',
 'tr_TR' => 'Tyrkisk',
 'tuesday' => 'Tirsdag',
 'tuesday_abbr' => 'Ti',
+'types_generic' => '',
 'type_of_hook' => 'Type',
 'type_to_filter' => 'Skriv for filter liste',
 'type_to_search' => 'Skriv for å søke',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index e23bd1843..7ab79d98f 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -149,6 +149,7 @@ URL: [url]',
 'attrdef_management' => 'Kenmerkdefinitie-beheer',
 'attrdef_maxvalues' => 'Max. aantal waarden',
 'attrdef_minvalues' => 'Min. aantal waarden',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => 'Het minimum aantal is groter dan het maximum aantal',
 'attrdef_multiple' => 'Meerdere waarden toegestaan',
 'attrdef_multiple_needs_valueset' => 'Meerdere waarden nodig',
@@ -157,15 +158,21 @@ URL: [url]',
 'attrdef_noname' => 'Geen naam voor attribuut definitie',
 'attrdef_objtype' => 'Object type',
 'attrdef_regex' => 'Veelgebruikte uitdrukking',
+'attrdef_regex_help' => '',
 'attrdef_type' => 'Type',
 'attrdef_type_boolean' => 'attribuut: boolean',
 'attrdef_type_date' => 'attribuut: datum',
+'attrdef_type_document' => '',
 'attrdef_type_email' => 'attribuut: email',
 'attrdef_type_float' => 'attribuut: decimaal getal',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => 'attribuut: geheel getal',
 'attrdef_type_string' => 'attribuut: string',
 'attrdef_type_url' => 'attribuut: url',
+'attrdef_type_user' => '',
 'attrdef_valueset' => 'Verzameling waarden',
+'attrdef_valueset_help' => '',
 'attributes' => 'Attributen',
 'attribute_changed_email_body' => 'Attribuut gewijzigd
 Document: [name]
@@ -545,8 +552,10 @@ URL: [url]',
 'extension_changelog' => 'Overzicht wijzigingen',
 'extension_loading' => 'Laden van extensies ...',
 'extension_manager' => 'Beheer uitbreidingen',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => 'Geïnstalleerd',
 'extension_mgr_no_upload' => 'Installeren nieuwe extensies is niet mogelijk omdat de extensies map niet schrijfbaar is.',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => 'Beschikbaar',
 'extension_version_list' => 'Versies',
 'february' => 'februari',
@@ -1836,6 +1845,7 @@ URL: [url]',
 'tr_TR' => 'Turks',
 'tuesday' => 'dinsdag',
 'tuesday_abbr' => 'di',
+'types_generic' => '',
 'type_of_hook' => 'Soort hook',
 'type_to_filter' => '',
 'type_to_search' => 'zoeken naar',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 97dfbb8a3..ff96f8c99 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -144,6 +144,7 @@ URL: [url]',
 'attrdef_management' => 'Zarządzanie definicją atrybutu',
 'attrdef_maxvalues' => 'Max. ilość wartości',
 'attrdef_minvalues' => 'Min. ilość wartości',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => 'Minimalna ilość wartości jest większa od ich maksymalnej ilości',
 'attrdef_multiple' => 'Pozwól na wiele wartości',
 'attrdef_multiple_needs_valueset' => 'Definiowanie atrybutów z wieloma wartościami wymaga podania tych wartości',
@@ -152,15 +153,21 @@ URL: [url]',
 'attrdef_noname' => 'Brak nazwy dla definicji atrybutu',
 'attrdef_objtype' => 'Typ obiektu',
 'attrdef_regex' => 'Wyrażenie regularne',
+'attrdef_regex_help' => '',
 'attrdef_type' => 'Typ',
 'attrdef_type_boolean' => 'Boolean',
 'attrdef_type_date' => 'Data',
+'attrdef_type_document' => '',
 'attrdef_type_email' => 'Email',
 'attrdef_type_float' => 'Liczna zmiennoprzecinkowa',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => 'Liczba całkowita',
 'attrdef_type_string' => 'Ciąg znaków',
 'attrdef_type_url' => 'URL',
+'attrdef_type_user' => '',
 'attrdef_valueset' => 'Zestaw wartości',
+'attrdef_valueset_help' => '',
 'attributes' => 'Atrybuty',
 'attribute_changed_email_body' => 'Zmiana atrybutu
 Dokument: [name]
@@ -540,8 +547,10 @@ URL: [url]',
 'extension_changelog' => 'Log Zmian',
 'extension_loading' => 'Wgrywam dodatki...',
 'extension_manager' => 'Zarządzanie rozszerzeniami',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => 'Zainstalowane',
 'extension_mgr_no_upload' => 'Wgrywanie nowych rozszerzeń jest niemożliwe ponieważ folder rozszerzeń jest zablokowany do zapisu',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => 'Dostępne',
 'extension_version_list' => 'Wersje',
 'february' => 'Luty',
@@ -1782,6 +1791,7 @@ URL: [url]',
 'tr_TR' => 'Turecki',
 'tuesday' => 'Wtorek',
 'tuesday_abbr' => 'Wt',
+'types_generic' => '',
 'type_of_hook' => 'Typ',
 'type_to_filter' => 'Wpisz, aby przefiltrować listę',
 'type_to_search' => 'Wpisz wyszukiwane',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 4dedcb9f9..89d29f7f7 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -156,6 +156,7 @@ URL: [url]',
 'attrdef_management' => 'Gerência de definição de atributo',
 'attrdef_maxvalues' => 'Max. número de valores',
 'attrdef_minvalues' => 'Min. número de valores',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => 'Número mínimo de valores é maior do que o número máximo de valores',
 'attrdef_multiple' => 'Permitir múltiplos valores',
 'attrdef_multiple_needs_valueset' => 'A definição de atributo com vários valores precisa de um conjunto de valores.',
@@ -164,15 +165,21 @@ URL: [url]',
 'attrdef_noname' => 'Está faltando o nome de definição de atributo',
 'attrdef_objtype' => 'Tipo de objeto',
 'attrdef_regex' => 'Expressão regular',
+'attrdef_regex_help' => '',
 'attrdef_type' => 'Tipo',
 'attrdef_type_boolean' => 'Binário',
 'attrdef_type_date' => 'Data',
+'attrdef_type_document' => '',
 'attrdef_type_email' => 'E-mail',
 'attrdef_type_float' => 'Flutuante',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => 'Inteiro',
 'attrdef_type_string' => 'Texto',
 'attrdef_type_url' => 'URL',
+'attrdef_type_user' => '',
 'attrdef_valueset' => 'Conjunto de valores',
+'attrdef_valueset_help' => '',
 'attributes' => 'Atributos',
 'attribute_changed_email_body' => 'Atributo alterado
 Documento: [name]
@@ -564,8 +571,10 @@ URL: [url]',
 'extension_changelog' => 'Alterações no Log',
 'extension_loading' => 'Carregando Extensões',
 'extension_manager' => 'Gerenciar extensões',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => 'Instalado',
 'extension_mgr_no_upload' => 'O envio de novas extensões não esta disponível pois o diretório Extensões recebeu a atribuição de Somente Leitura.',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => 'Disponível',
 'extension_version_list' => 'Versões',
 'february' => 'Fevereiro',
@@ -1858,6 +1867,7 @@ URL: [url]',
 'tr_TR' => 'Turco',
 'tuesday' => 'Terça-feira',
 'tuesday_abbr' => 'Te',
+'types_generic' => '',
 'type_of_hook' => 'tipo de gancho',
 'type_to_filter' => '',
 'type_to_search' => 'Tipo de pesquisa',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 1864ddf50..4438d18a8 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -156,6 +156,7 @@ URL: [url]',
 'attrdef_management' => 'Management definitii atribute',
 'attrdef_maxvalues' => 'Numar maxim de valori',
 'attrdef_minvalues' => 'Numar minim de valori',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => 'Numărul minim de valori este mai mare decât numărul maxim de valori',
 'attrdef_multiple' => 'Permiteți valori multiple',
 'attrdef_multiple_needs_valueset' => '',
@@ -164,15 +165,21 @@ URL: [url]',
 'attrdef_noname' => 'Lipsește numele pentru definirea atributului',
 'attrdef_objtype' => 'Tip obiect',
 'attrdef_regex' => 'Expresie regulată',
+'attrdef_regex_help' => '',
 'attrdef_type' => 'Tip',
 'attrdef_type_boolean' => 'Boolean',
 'attrdef_type_date' => 'Data',
+'attrdef_type_document' => '',
 'attrdef_type_email' => 'Email',
 'attrdef_type_float' => 'Float',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => 'Intreg',
 'attrdef_type_string' => 'String',
 'attrdef_type_url' => 'URL',
+'attrdef_type_user' => '',
 'attrdef_valueset' => 'Set de valori',
+'attrdef_valueset_help' => '',
 'attributes' => 'Atribute',
 'attribute_changed_email_body' => 'Atribut schimbat
 Document: [name]
@@ -552,8 +559,10 @@ URL: [url]',
 'extension_changelog' => '',
 'extension_loading' => 'Se incarca extensiile',
 'extension_manager' => 'Gestionați extensiile',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => 'Instalata',
 'extension_mgr_no_upload' => 'Nu se poate incarca o extensie noua pentru ca directorul nu are drepturi de scriere',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => 'Disponibila',
 'extension_version_list' => 'Versiuni',
 'february' => 'Februarie',
@@ -1820,6 +1829,7 @@ URL: [url]',
 'tr_TR' => 'Turcă',
 'tuesday' => 'Marți',
 'tuesday_abbr' => 'Ma',
+'types_generic' => '',
 'type_of_hook' => '',
 'type_to_filter' => '',
 'type_to_search' => 'Tastați pentru a căuta',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 47d78a90b..6dc99b3a5 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -156,6 +156,7 @@ URL: [url]',
 'attrdef_management' => 'Управление определениями атрибутов',
 'attrdef_maxvalues' => 'Макс. количество значений',
 'attrdef_minvalues' => 'Мин. количество значений',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => 'Минимальное значений превышает максимальное значение',
 'attrdef_multiple' => 'Несколько значений',
 'attrdef_multiple_needs_valueset' => 'Атрибут с несколькими значениями нуждается в установке значений',
@@ -164,15 +165,21 @@ URL: [url]',
 'attrdef_noname' => 'Отсутствует имя для определения атрибута',
 'attrdef_objtype' => 'Тип объекта',
 'attrdef_regex' => 'Регулярное выражение',
+'attrdef_regex_help' => '',
 'attrdef_type' => 'Тип',
 'attrdef_type_boolean' => 'Булево',
 'attrdef_type_date' => 'Дата',
+'attrdef_type_document' => '',
 'attrdef_type_email' => 'E-mail',
 'attrdef_type_float' => 'Вещественное',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => 'Целое',
 'attrdef_type_string' => 'Строка',
 'attrdef_type_url' => 'URL',
+'attrdef_type_user' => '',
 'attrdef_valueset' => 'Набор значений',
+'attrdef_valueset_help' => '',
 'attributes' => 'Атрибуты',
 'attribute_changed_email_body' => 'Изменён атрибут
 Документ: [name]
@@ -552,8 +559,10 @@ URL: [url]',
 'extension_changelog' => '',
 'extension_loading' => '',
 'extension_manager' => 'Управление расширениями',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => 'Установленные',
 'extension_version_list' => '',
 'february' => 'Февраль',
@@ -1827,6 +1836,7 @@ URL: [url]',
 'tr_TR' => 'Турецкий',
 'tuesday' => 'Вторник',
 'tuesday_abbr' => 'Вт',
+'types_generic' => '',
 'type_of_hook' => '',
 'type_to_filter' => '',
 'type_to_search' => 'Введите запрос',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 2f2005bfe..953ac0ff0 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -156,6 +156,7 @@ URL: [url]',
 'attrdef_management' => 'Správa definície atribútu',
 'attrdef_maxvalues' => 'Max. počet hodnôt',
 'attrdef_minvalues' => 'Min. počet hodnôt',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => 'Minimum number of values is larger than maximum number of values',
 'attrdef_multiple' => 'Allow multiple values',
 'attrdef_multiple_needs_valueset' => 'Attribute definition with multiple values needs value set.',
@@ -164,15 +165,21 @@ URL: [url]',
 'attrdef_noname' => 'Chýba názov definície atribútu',
 'attrdef_objtype' => 'Typ objektu',
 'attrdef_regex' => 'Regulárny výraz',
+'attrdef_regex_help' => '',
 'attrdef_type' => 'Typ',
 'attrdef_type_boolean' => 'Boolean',
 'attrdef_type_date' => 'Dátum',
+'attrdef_type_document' => '',
 'attrdef_type_email' => 'E-mail',
 'attrdef_type_float' => 'Float',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => 'Integer',
 'attrdef_type_string' => 'String',
 'attrdef_type_url' => 'URL',
+'attrdef_type_user' => '',
 'attrdef_valueset' => 'Nastaviť hodnoty',
+'attrdef_valueset_help' => '',
 'attributes' => 'Atribúty',
 'attribute_changed_email_body' => 'Zmenené atribúty
 Dokumentu: [name]
@@ -564,8 +571,10 @@ URL: [url]',
 'extension_changelog' => 'Denník zmien',
 'extension_loading' => 'Nahrávajú sa rozšírenia ...',
 'extension_manager' => 'Spravovať rozšírenia',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => 'Inštalované',
 'extension_mgr_no_upload' => 'Uploading new extensions is not possible because the extentension directory is not writable.',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => 'Available',
 'extension_version_list' => 'Versions',
 'february' => 'Február',
@@ -1860,6 +1869,7 @@ URL: [url]',
 'tr_TR' => 'Turecky',
 'tuesday' => 'Utorok',
 'tuesday_abbr' => 'Ut',
+'types_generic' => '',
 'type_of_hook' => 'Zadajte',
 'type_to_filter' => '',
 'type_to_search' => 'Zadajte na vyhľadanie',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 60c504eb0..837b2b31e 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -157,6 +157,7 @@ URL: [url]',
 'attrdef_management' => 'Hantering av attributdefinitioner',
 'attrdef_maxvalues' => 'Max tillåtna värde',
 'attrdef_minvalues' => 'Min tillåtna värde',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => 'Minimum antal värden är större än maximum antal värden',
 'attrdef_multiple' => 'Tillåt flera värden',
 'attrdef_multiple_needs_valueset' => 'Attribut med flera värden behöver definieras.',
@@ -165,15 +166,21 @@ URL: [url]',
 'attrdef_noname' => 'Namn för definition av attribut saknas',
 'attrdef_objtype' => 'Objekttyp',
 'attrdef_regex' => 'Regulär uttryck',
+'attrdef_regex_help' => '',
 'attrdef_type' => 'Typ',
 'attrdef_type_boolean' => 'Logisk',
 'attrdef_type_date' => 'Datum',
+'attrdef_type_document' => '',
 'attrdef_type_email' => 'E-post',
 'attrdef_type_float' => 'Flyttal',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => 'Heltal',
 'attrdef_type_string' => 'Textsträng',
 'attrdef_type_url' => 'URL',
+'attrdef_type_user' => '',
 'attrdef_valueset' => 'Värden',
+'attrdef_valueset_help' => '',
 'attributes' => 'Attribut',
 'attribute_changed_email_body' => 'Ändrat attribut
 Dokument: [name]
@@ -558,8 +565,10 @@ URL: [url]',
 'extension_changelog' => '',
 'extension_loading' => '',
 'extension_manager' => 'Hantera tillägg',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => '',
 'extension_version_list' => '',
 'february' => 'februari',
@@ -1833,6 +1842,7 @@ URL: [url]',
 'tr_TR' => 'Turkiska',
 'tuesday' => 'Tisdag',
 'tuesday_abbr' => 'Ti',
+'types_generic' => '',
 'type_of_hook' => 'Typ',
 'type_to_filter' => '',
 'type_to_search' => 'Skriv för att söka',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 3e40e8e8a..9c48a6822 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -150,6 +150,7 @@ URL: [url]',
 'attrdef_management' => 'Nitelik tanımı yönetimi',
 'attrdef_maxvalues' => 'Maks. değer',
 'attrdef_minvalues' => 'Min. değer',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => 'Minimum değer maksimum değerden büyük',
 'attrdef_multiple' => 'Birden fazla değere izin ver',
 'attrdef_multiple_needs_valueset' => '',
@@ -158,15 +159,21 @@ URL: [url]',
 'attrdef_noname' => 'Nitelik tanımlamada isim eksik',
 'attrdef_objtype' => 'Nesne türü',
 'attrdef_regex' => 'Düzenli ifade (Regular expression)',
+'attrdef_regex_help' => '',
 'attrdef_type' => 'Tür',
 'attrdef_type_boolean' => 'Mantık',
 'attrdef_type_date' => 'Tarih',
+'attrdef_type_document' => '',
 'attrdef_type_email' => '',
 'attrdef_type_float' => '',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => 'TamSayı',
 'attrdef_type_string' => 'Dizi',
 'attrdef_type_url' => '',
+'attrdef_type_user' => '',
 'attrdef_valueset' => 'Değer',
+'attrdef_valueset_help' => '',
 'attributes' => 'Nitelik',
 'attribute_changed_email_body' => 'Değer değişti
 Doküman: [name]
@@ -546,8 +553,10 @@ URL: [url]',
 'extension_changelog' => 'Değişiklik Listesi',
 'extension_loading' => 'Uzantı yüklendi',
 'extension_manager' => 'Uzantıları düzenle',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => 'Yüklendi',
 'extension_mgr_no_upload' => '',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => 'Mevcut',
 'extension_version_list' => 'Veysionlar',
 'february' => 'Şubat',
@@ -1799,6 +1808,7 @@ URL: [url]',
 'tr_TR' => 'Türkçe',
 'tuesday' => 'Salı',
 'tuesday_abbr' => 'Sa',
+'types_generic' => '',
 'type_of_hook' => '',
 'type_to_filter' => '',
 'type_to_search' => 'Aranacak sözcük yazınız',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 0f8ff26ff..e5b66b847 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -156,6 +156,7 @@ URL: [url]',
 'attrdef_management' => 'Керування визначенням атрибутів',
 'attrdef_maxvalues' => 'Макс. кількість значень',
 'attrdef_minvalues' => 'Мін. кількість значень',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => 'Мінімальна кількість значень більша за максимальну кількість значень',
 'attrdef_multiple' => 'Декілька значень',
 'attrdef_multiple_needs_valueset' => 'Атрибут з кількома значеннями потребує встановлення значень',
@@ -164,15 +165,21 @@ URL: [url]',
 'attrdef_noname' => 'Відсутня назва для визначення атрибуту',
 'attrdef_objtype' => 'Тип об\'єкту',
 'attrdef_regex' => 'Регулярний вираз',
+'attrdef_regex_help' => '',
 'attrdef_type' => 'Тип',
 'attrdef_type_boolean' => 'Логічне',
 'attrdef_type_date' => 'Дата',
+'attrdef_type_document' => '',
 'attrdef_type_email' => 'Електронна пошта',
 'attrdef_type_float' => 'З плаваючою комою',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => 'Ціле',
 'attrdef_type_string' => 'Текстовий рядок',
 'attrdef_type_url' => 'Посилання',
+'attrdef_type_user' => '',
 'attrdef_valueset' => 'Набір значень',
+'attrdef_valueset_help' => '',
 'attributes' => 'Атрибути',
 'attribute_changed_email_body' => 'Змінено атрибут
 Документ: [name]
@@ -552,8 +559,10 @@ URL: [url]',
 'extension_changelog' => '',
 'extension_loading' => '',
 'extension_manager' => 'Керування розширеннями',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => '',
 'extension_version_list' => '',
 'february' => 'Лютий',
@@ -1820,6 +1829,7 @@ URL: [url]',
 'tr_TR' => 'Turkish',
 'tuesday' => 'Вівторок',
 'tuesday_abbr' => 'Вв',
+'types_generic' => '',
 'type_of_hook' => '',
 'type_to_filter' => '',
 'type_to_search' => 'Введіть запит',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 733005e46..4f4a698ff 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -156,6 +156,7 @@ URL: [url]',
 'attrdef_management' => '属性定义管理',
 'attrdef_maxvalues' => '最大值',
 'attrdef_minvalues' => '最小值',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => '',
 'attrdef_multiple' => '允许多个值',
 'attrdef_multiple_needs_valueset' => '',
@@ -164,15 +165,21 @@ URL: [url]',
 'attrdef_noname' => '',
 'attrdef_objtype' => '类别',
 'attrdef_regex' => '正则表达式',
+'attrdef_regex_help' => '',
 'attrdef_type' => '类型',
 'attrdef_type_boolean' => '布尔',
 'attrdef_type_date' => '日期',
+'attrdef_type_document' => '',
 'attrdef_type_email' => 'Email',
 'attrdef_type_float' => '浮点',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => '整数',
 'attrdef_type_string' => '字符串',
 'attrdef_type_url' => 'URL',
+'attrdef_type_user' => '',
 'attrdef_valueset' => '属性值',
+'attrdef_valueset_help' => '',
 'attributes' => '属性',
 'attribute_changed_email_body' => '',
 'attribute_changed_email_subject' => '',
@@ -542,8 +549,10 @@ URL: [url]',
 'extension_changelog' => '更新日志',
 'extension_loading' => '加载扩展',
 'extension_manager' => '扩展管理器',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => '已安装',
 'extension_mgr_no_upload' => '上传新扩展名是不可能的，因为extentension目录不可写',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => '可得到',
 'extension_version_list' => '版本列表',
 'february' => '二 月',
@@ -1786,6 +1795,7 @@ URL: [url]',
 'tr_TR' => '土耳其',
 'tuesday' => 'Tuesday',
 'tuesday_abbr' => '',
+'types_generic' => '',
 'type_of_hook' => '钩子类型',
 'type_to_filter' => '',
 'type_to_search' => '搜索类型',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 33e83d4d3..846b76517 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -156,6 +156,7 @@ URL: [url]',
 'attrdef_management' => '屬性定義管理',
 'attrdef_maxvalues' => '最大值',
 'attrdef_minvalues' => '最小值',
+'attrdef_minvalues_help' => '',
 'attrdef_min_greater_max' => '最小數值大於最大數值',
 'attrdef_multiple' => '允許多個值',
 'attrdef_multiple_needs_valueset' => '具有多個值的屬性定義需要設置值。',
@@ -164,15 +165,21 @@ URL: [url]',
 'attrdef_noname' => '屬性定義的名稱遺失',
 'attrdef_objtype' => '類別',
 'attrdef_regex' => '規則運算式',
+'attrdef_regex_help' => '',
 'attrdef_type' => '類型',
 'attrdef_type_boolean' => '布林數',
 'attrdef_type_date' => '日期',
+'attrdef_type_document' => '',
 'attrdef_type_email' => '信箱',
 'attrdef_type_float' => '浮點數',
+'attrdef_type_folder' => '',
+'attrdef_type_group' => '',
 'attrdef_type_int' => '整數',
 'attrdef_type_string' => '字串',
 'attrdef_type_url' => '網址',
+'attrdef_type_user' => '',
 'attrdef_valueset' => '屬性值',
+'attrdef_valueset_help' => '',
 'attributes' => '屬性',
 'attribute_changed_email_body' => '屬性已更改
 文件：[name]
@@ -564,8 +571,10 @@ URL: [url]',
 'extension_changelog' => '修改紀錄',
 'extension_loading' => '擴充套件讀取中',
 'extension_manager' => '擴充套件的管理',
+'extension_mgr_error_upload' => '',
 'extension_mgr_installed' => '已安裝',
 'extension_mgr_no_upload' => '無法上傳新的套件因為套件目錄無法寫入',
+'extension_mgr_no_zipfile' => '',
 'extension_mgr_repository' => '可用',
 'extension_version_list' => '版本',
 'february' => '二 月',
@@ -1858,6 +1867,7 @@ URL: [url]',
 'tr_TR' => '土耳其語',
 'tuesday' => 'Tuesday',
 'tuesday_abbr' => 'Tu',
+'types_generic' => '',
 'type_of_hook' => '類型',
 'type_to_filter' => '鍵入到篩選列表',
 'type_to_search' => '搜索類型',

From ce2ee995fc4e9c07e0a50864b1b51f23366dd81e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Sep 2020 14:59:16 +0200
Subject: [PATCH 070/312] getValueSetSeparator() returns ',' for type_user and
 type_group

---
 SeedDMS_Core/Core/inc.ClassAttribute.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassAttribute.php b/SeedDMS_Core/Core/inc.ClassAttribute.php
index 2e9e6d11c..8090c915b 100644
--- a/SeedDMS_Core/Core/inc.ClassAttribute.php
+++ b/SeedDMS_Core/Core/inc.ClassAttribute.php
@@ -168,6 +168,7 @@ class SeedDMS_Core_Attribute { /* {{{ */
 
 			if(is_array($values)) {
 				if($values) {
+					$vsep = $this->getValueSetSeparator();
 					if($valueset) {
 						$error = false;
 						foreach($values as $v) {
@@ -176,9 +177,9 @@ class SeedDMS_Core_Attribute { /* {{{ */
 						if($error)
 							return false;
 						$valuesetstr = $this->_attrdef->getValueSet();
-						$value = $valuesetstr[0].implode($valuesetstr[0], $values);
+						$value = $vsep.implode($vsep, $values);
 					} else {
-						$value = ','.implode(',', $values);
+						$value = $vsep.implode($vsep, $values);
 					}
 				} else {
 					$value = '';
@@ -649,10 +650,16 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 	 * @return string separator or an empty string if a value set is not set
 	 */
 	function getValueSetSeparator() { /* {{{ */
-		if(strlen($this->_valueset) > 1)
+		if(strlen($this->_valueset) > 1) {
 			return $this->_valueset[0];
-		else
+		} elseif($this->_multiple) {
+			if($this->_type == SeedDMS_Core_AttributeDefinition::type_user || $this->_type == SeedDMS_Core_AttributeDefinition::type_group)
+				return ',';
+			else
+				return '';
+		} else {
 			return '';
+		}
 	} /* }}} */
 
 	/**

From dd94bb0bae6304033b801d910aa1a0d221b83ea9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Sep 2020 14:59:50 +0200
Subject: [PATCH 071/312] fix searching within attributes of document contents

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 1874db859..169ee3bb1 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1664,30 +1664,33 @@ class SeedDMS_Core_DMS {
 			if ($attributes) {
 				foreach($attributes as $attrdefid=>$attribute) {
 					if($attribute) {
+						$lsearchAttributes = [];
 						$attrdef = $this->getAttributeDefinition($attrdefid);
 						if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document || $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_all) {
 							if($valueset = $attrdef->getValueSet()) {
 								if($attrdef->getMultipleValues()) {
 									if(is_string($attribute))
 										$attribute = array($attribute);
-									$searchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentAttributes` WHERE `tblDocumentAttributes`.`attrdef`=".$attrdefid." AND (`tblDocumentAttributes`.`value` like '%".$valueset[0].implode("%' OR `tblDocumentAttributes`.`value` like '%".$valueset[0], $attribute)."%') AND `tblDocumentAttributes`.`document` = `tblDocuments`.`id`)";
+									$lsearchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentAttributes` WHERE `tblDocumentAttributes`.`attrdef`=".$attrdefid." AND (`tblDocumentAttributes`.`value` like '%".$valueset[0].implode("%' OR `tblDocumentAttributes`.`value` like '%".$valueset[0], $attribute)."%') AND `tblDocumentAttributes`.`document` = `tblDocuments`.`id`)";
 								} else
-									$searchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentAttributes` WHERE `tblDocumentAttributes`.`attrdef`=".$attrdefid." AND `tblDocumentAttributes`.`value`='".$attribute."' AND `tblDocumentAttributes`.`document` = `tblDocuments`.`id`)";
+									$lsearchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentAttributes` WHERE `tblDocumentAttributes`.`attrdef`=".$attrdefid." AND `tblDocumentAttributes`.`value`='".$attribute."' AND `tblDocumentAttributes`.`document` = `tblDocuments`.`id`)";
 							} else
-								$searchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentAttributes` WHERE `tblDocumentAttributes`.`attrdef`=".$attrdefid." AND `tblDocumentAttributes`.`value` like '%".$attribute."%' AND `tblDocumentAttributes`.`document` = `tblDocuments`.`id`)";
-						} elseif($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent) {
+								$lsearchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentAttributes` WHERE `tblDocumentAttributes`.`attrdef`=".$attrdefid." AND `tblDocumentAttributes`.`value` like '%".$attribute."%' AND `tblDocumentAttributes`.`document` = `tblDocuments`.`id`)";
+						}
+						if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent || $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_all) {
 							if($attrdef->getValueSet()) {
 								if($attrdef->getMultipleValues()) {
 									/** @noinspection PhpUndefinedVariableInspection */
 									if(is_string($attribute))
 										$attribute = array($attribute);
-									$searchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentContentAttributes` WHERE `tblDocumentContentAttributes`.`attrdef`=".$attrdefid." AND (`tblDocumentContentAttributes`.`value` like '%".$valueset[0].implode("%' OR `tblDocumentContentAttributes`.`value` like '%".$valueset[0], $attribute)."%') AND `tblDocumentContentAttributes`.`document` = `tblDocumentContent`.`id`)";
+									$lsearchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentContentAttributes` WHERE `tblDocumentContentAttributes`.`attrdef`=".$attrdefid." AND (`tblDocumentContentAttributes`.`value` like '%".$valueset[0].implode("%' OR `tblDocumentContentAttributes`.`value` like '%".$valueset[0], $attribute)."%') AND `tblDocumentContentAttributes`.`content` = `tblDocumentContent`.`id`)";
 								} else {
-									$searchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentContentAttributes` WHERE `tblDocumentContentAttributes`.`attrdef`=".$attrdefid." AND `tblDocumentContentAttributes`.`value`='".$attribute."' AND `tblDocumentContentAttributes`.content = `tblDocumentContent`.id)";
+									$lsearchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentContentAttributes` WHERE `tblDocumentContentAttributes`.`attrdef`=".$attrdefid." AND `tblDocumentContentAttributes`.`value`='".$attribute."' AND `tblDocumentContentAttributes`.content = `tblDocumentContent`.id)";
 								}
 							} else
-								$searchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentContentAttributes` WHERE `tblDocumentContentAttributes`.`attrdef`=".$attrdefid." AND `tblDocumentContentAttributes`.`value` like '%".$attribute."%' AND `tblDocumentContentAttributes`.content = `tblDocumentContent`.id)";
+								$lsearchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentContentAttributes` WHERE `tblDocumentContentAttributes`.`attrdef`=".$attrdefid." AND `tblDocumentContentAttributes`.`value` like '%".$attribute."%' AND `tblDocumentContentAttributes`.content = `tblDocumentContent`.id)";
 						}
+						$searchAttributes[] = "(".implode(" OR ", $lsearchAttributes).")";
 					}
 				}
 			}

From c0ad305d69c9cfabf502edcd41eb21488272dd8e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Sep 2020 15:00:44 +0200
Subject: [PATCH 072/312] new entry for 5.1.19

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 0ae6ea5d3..6ac46100e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,7 @@
 - update to font-awesome 4.7.1
 - add new attribute types 'document', 'folder', 'user', 'group'
 - overhaul of folder tree which can now be used more than once on a page
+- fix search of values in attributes of document content
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.18

From e21850c92f69e5ade76b470cad64ddad8cf234b0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Sep 2020 15:17:49 +0200
Subject: [PATCH 073/312] make buttons primary

---
 views/bootstrap/class.Search.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 4e91d4301..d17e18c10 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -217,7 +217,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 ?>
 
 <tr>
-<td></td><td><button type="submit" class="btn"><i class="fa fa-search"></i> <?php printMLText("search"); ?></button></td>
+<td></td><td><button type="submit" class="btn btn-primary"><i class="fa fa-search"></i> <?php printMLText("search"); ?></button></td>
 </tr>
 
 </table>
@@ -431,7 +431,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 </td>
 </tr>
 <tr>
-<td></td><td><button type="submit" class="btn"><i class="fa fa-search"></i> <?php printMLText("search"); ?></button></td>
+<td></td><td><button type="submit" class="btn btn-primary"><i class="fa fa-search"></i> <?php printMLText("search"); ?></button></td>
 </tr>
 </table>
 

From a29c0f35aa2dae5dfbde5f9cfe2f6f18a9711ed8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 2 Sep 2020 08:57:07 +0200
Subject: [PATCH 074/312] index users with read access on a document, start
 version 1.1.14

---
 SeedDMS_Lucene/Lucene/IndexedDocument.php | 12 +++++++++++
 SeedDMS_Lucene/Lucene/Search.php          |  9 +++++++-
 SeedDMS_Lucene/package.xml                | 26 ++++++++++++++++++-----
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/SeedDMS_Lucene/Lucene/IndexedDocument.php b/SeedDMS_Lucene/Lucene/IndexedDocument.php
index df93e4a35..f3938df8c 100644
--- a/SeedDMS_Lucene/Lucene/IndexedDocument.php
+++ b/SeedDMS_Lucene/Lucene/IndexedDocument.php
@@ -138,6 +138,18 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 			}
 			$this->addField(Zend_Search_Lucene_Field::Text('category', implode(' ', $names), 'utf-8'));
 		}
+		if($acllist = $document->getReadAccessList(1, 1, 1)) {
+			$allu = [];
+			foreach($acllist['users'] as $u)
+				$allu[] = $u->getLogin();
+			$this->addField(Zend_Search_Lucene_Field::Text('users', implode(' ', $allu), 'utf-8'));
+			/*
+			$allg = [];
+			foreach($acllist['groups'] as $g)
+				$allg[] = $g->getName();
+			$this->addField(Zend_Search_Lucene_Field::Text('groups', implode(' ', $allg), 'utf-8'));
+			 */
+		}
 		if($attributes = $document->getAttributes()) {
 			foreach($attributes as $attribute) {
 				$attrdef = $attribute->getAttributeDefinition();
diff --git a/SeedDMS_Lucene/Lucene/Search.php b/SeedDMS_Lucene/Lucene/Search.php
index 857d23ceb..604c1549c 100644
--- a/SeedDMS_Lucene/Lucene/Search.php
+++ b/SeedDMS_Lucene/Lucene/Search.php
@@ -59,7 +59,7 @@ class SeedDMS_Lucene_Search {
 	 * @param object $index lucene index
 	 * @return object instance of SeedDMS_Lucene_Search
 	 */
-	function search($term, $owner, $status='', $categories=array(), $fields=array()) { /* {{{ */
+	function search($term, $owner, $status='', $categories=array(), $fields=array(), $users=array()) { /* {{{ */
 		$querystr = '';
 		if($fields) {
 		} else {
@@ -78,6 +78,13 @@ class SeedDMS_Lucene_Search {
 			$querystr .= implode('" || category:"', $categories);
 			$querystr .= '")';
 		}
+		if($users) {
+			if($querystr)
+				$querystr .= ' && ';
+			$querystr .= '(users:"';
+			$querystr .= implode('" || users:"', $users);
+			$querystr .= '")';
+		}
 		try {
 			$query = Zend_Search_Lucene_Search_QueryParser::parse($querystr);
 			try {
diff --git a/SeedDMS_Lucene/package.xml b/SeedDMS_Lucene/package.xml
index 4f55862ad..2780d31cd 100644
--- a/SeedDMS_Lucene/package.xml
+++ b/SeedDMS_Lucene/package.xml
@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2018-04-11</date>
- <time>10:58:13</time>
+ <date>2020-09-02</date>
+ <time>08:55:43</time>
  <version>
-  <release>1.1.13</release>
-  <api>1.1.13</api>
+  <release>1.1.14</release>
+  <api>1.1.14</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-IndexedDocument() remembers cmd and mimetype
+Index users with at least read access on the document
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -299,5 +299,21 @@ allow conversion commands for mimetypes with wildcards
 execWithTimeout() reads data from stderr and saves it into error msg
    </notes>
   </release>
+  <release>
+   <date>2018-04-11</date>
+   <time>10:58:13</time>
+   <version>
+    <release>1.1.13</release>
+    <api>1.1.13</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+IndexedDocument() remembers cmd and mimetype
+   </notes>
+  </release>
  </changelog>
 </package>

From 89795a7c31eedc68a40c08b0f86541585dfcd5dd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 2 Sep 2020 08:59:24 +0200
Subject: [PATCH 075/312] index users with read access on a document, start
 version 1.1.12

---
 .../SQLiteFTS/IndexedDocument.php             | 12 ++++++++
 SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php       |  9 +++---
 SeedDMS_SQLiteFTS/SQLiteFTS/Search.php        | 10 ++++++-
 SeedDMS_SQLiteFTS/package.xml                 | 28 +++++++++++++++----
 4 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
index 5e9fb08a1..237cf8576 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
@@ -150,6 +150,18 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 		if($comment = $document->getComment()) {
 			$this->addField('comment', $comment);
 		}
+		if($acllist = $document->getReadAccessList(1, 1, 1)) {
+			$allu = [];
+			foreach($acllist['users'] as $u)
+				$allu[] = $u->getLogin();
+			$this->addField('users', implode(' ', $allu));
+			/*
+			$allg = [];
+			foreach($acllist['groups'] as $g)
+				$allg[] = $g->getName();
+			$this->addField('groups', implode(' ', $allg));
+			 */
+		}
 		if($version && !$nocontent) {
 			$path = $dms->contentDir . $version->getPath();
 			if(file_exists($path)) {
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
index 7cac5d7e9..f4791f5f2 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
@@ -63,9 +63,9 @@ class SeedDMS_SQLiteFTS_Indexer {
 		 */
 		$version = SQLite3::version();
 		if($version['versionNumber'] >= 3008000)
-			$sql = 'CREATE VIRTUAL TABLE docs USING fts4(title, comment, keywords, category, mimetype, origfilename, owner, content, created, notindexed=created, matchinfo=fts3)';
+			$sql = 'CREATE VIRTUAL TABLE docs USING fts4(title, comment, keywords, category, mimetype, origfilename, owner, content, created, users, notindexed=created, matchinfo=fts3)';
 		else
-			$sql = 'CREATE VIRTUAL TABLE docs USING fts4(title, comment, keywords, category, mimetype, origfilename, owner, content, created, matchinfo=fts3)';
+			$sql = 'CREATE VIRTUAL TABLE docs USING fts4(title, comment, keywords, category, mimetype, origfilename, owner, content, created, users, matchinfo=fts3)';
 		$res = $index->_conn->exec($sql);
 		if($res === false) {
 			return null;
@@ -96,7 +96,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 		if(!$this->_conn)
 			return false;
 
-		$sql = "INSERT INTO docs (docid, title, comment, keywords, category, owner, content, mimetype, origfilename, created) VALUES(".$doc->getFieldValue('document_id').", ".$this->_conn->quote($doc->getFieldValue('title')).", ".$this->_conn->quote($doc->getFieldValue('comment')).", ".$this->_conn->quote($doc->getFieldValue('keywords')).", ".$this->_conn->quote($doc->getFieldValue('category')).", ".$this->_conn->quote($doc->getFieldValue('owner')).", ".$this->_conn->quote($doc->getFieldValue('content')).", ".$this->_conn->quote($doc->getFieldValue('mimetype')).", ".$this->_conn->quote($doc->getFieldValue('origfilename')).", ".$doc->getFieldValue('created')/*time()*/.")";
+		$sql = "INSERT INTO docs (docid, title, comment, keywords, category, owner, content, mimetype, origfilename, created, users) VALUES(".$doc->getFieldValue('document_id').", ".$this->_conn->quote($doc->getFieldValue('title')).", ".$this->_conn->quote($doc->getFieldValue('comment')).", ".$this->_conn->quote($doc->getFieldValue('keywords')).", ".$this->_conn->quote($doc->getFieldValue('category')).", ".$this->_conn->quote($doc->getFieldValue('owner')).", ".$this->_conn->quote($doc->getFieldValue('content')).", ".$this->_conn->quote($doc->getFieldValue('mimetype')).", ".$this->_conn->quote($doc->getFieldValue('origfilename')).", ".$doc->getFieldValue('created').", ".$this->_conn->quote($doc->getFieldValue('users'))/*time()*/.")";
 		$res = $this->_conn->exec($sql);
 		if($res === false) {
 			return false;
@@ -189,7 +189,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 		if(!$this->_conn)
 			return false;
 
-		$sql = "SELECT title, comment, owner, keywords, category, mimetype, origfilename, created FROM docs WHERE docid=".(int) $id;
+		$sql = "SELECT title, comment, owner, keywords, category, mimetype, origfilename, created, users FROM docs WHERE docid=".(int) $id;
 		$res = $this->_conn->query($sql);
 		$doc = false;
 		if($res) {
@@ -203,6 +203,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 			$doc->addField('origfilename', $rec['origfilename']);
 			$doc->addField('owner', $rec['owner']);
 			$doc->addField('created', $rec['created']);
+			$doc->addField('users', $rec['users']);
 		}
 		return $doc;
 	} /* }}} */
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
index 18b20fdaf..511783539 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
@@ -59,7 +59,7 @@ class SeedDMS_SQliteFTS_Search {
 	 * @param object $index SQlite FTS index
 	 * @return object instance of SeedDMS_Lucene_Search
 	 */
-	function search($term, $owner, $status='', $categories=array(), $fields=array()) { /* {{{ */
+	function search($term, $owner, $status='', $categories=array(), $fields=array(), $users=array()) { /* {{{ */
 		$querystr = '';
 		if($fields) {
 		} else {
@@ -81,6 +81,14 @@ class SeedDMS_SQliteFTS_Search {
 			$querystr .= implode(' OR category:', $categories);
 			$querystr .= '';
 		}
+		if($users) {
+			if($querystr)
+				$querystr .= ' ';
+				//$querystr .= ' AND ';
+			$querystr .= 'users:';
+			$querystr .= implode(' OR users:', $users);
+			$querystr .= '';
+		}
 		try {
 			$hits = $this->index->find($querystr);
 			$recs = array();
diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml
index fdac846ba..c5fc5eacc 100644
--- a/SeedDMS_SQLiteFTS/package.xml
+++ b/SeedDMS_SQLiteFTS/package.xml
@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2019-11-28</date>
- <time>11:00:40</time>
+ <date>2020-09-02</date>
+ <time>08:57:44</time>
  <version>
-  <release>1.0.11</release>
-  <api>1.0.11</api>
+  <release>1.0.12</release>
+  <api>1.0.12</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,8 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-Set 'created' in index to creation date of indexed content (was set to current
-timestamp)
+Index users with at least read access on a document
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -243,5 +242,22 @@ execWithTimeout() reads data from stderr and saves it into error msg
 IndexedDocument() remembers cmd and mimetype
    </notes>
   </release>
+  <release>
+   <date>2019-11-28</date>
+   <time>11:00:40</time>
+   <version>
+    <release>1.0.11</release>
+    <api>1.0.11</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+Set 'created' in index to creation date of indexed content (was set to current
+timestamp)
+   </notes>
+  </release>
  </changelog>
 </package>

From c4c77fc499fc874a9eb586f3ec515e3ba25ffaf5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 2 Sep 2020 08:59:42 +0200
Subject: [PATCH 076/312] pass current logged in user to fulltext search in
 order to restrict hits on readable documents

---
 out/out.Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index c37f7531b..74d47fb35 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -128,7 +128,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 		$startTime = getTime();
 		$index = $indexconf['Indexer']::open($settings->_luceneDir);
 		$lucenesearch = new $indexconf['Search']($index);
-		$hits = $lucenesearch->search($query, $owner ? $owner->getLogin() : '', '', $categorynames);
+		$hits = $lucenesearch->search($query, $owner ? $owner->getLogin() : '', '', $categorynames, array(), $user->isAdmin() ? [] : [$user->getLogin()]);
 		if($hits === false) {
 			$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('splash_invalid_searchterm')));
 			$totalPages = 0;

From e13ca878430dba56bff5db76295792b8cbb154ab Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 2 Sep 2020 10:15:55 +0200
Subject: [PATCH 077/312] add note for 5.1.19

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 6ac46100e..a13946f79 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -25,6 +25,7 @@
 - add new attribute types 'document', 'folder', 'user', 'group'
 - overhaul of folder tree which can now be used more than once on a page
 - fix search of values in attributes of document content
+- fulltext search finds only documents for which the logged in user has read access
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.18

From fef827a7dbb4aceb75f4a6f3ad2fa45ba3edd596 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Sep 2020 14:17:23 +0200
Subject: [PATCH 078/312] start new version 5.1.20

---
 CHANGELOG                          |  5 +++++
 SeedDMS_Core/Core/inc.ClassDMS.php |  2 +-
 SeedDMS_Core/package.xml           | 31 ++++++++++++++++++++++--------
 inc/inc.Version.php                |  2 +-
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a13946f79..6c4afb60a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.20
+--------------------------------------------------------------------------------
+- fix import of users
+
 --------------------------------------------------------------------------------
                      Changes in version 5.1.19
 --------------------------------------------------------------------------------
diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 169ee3bb1..e6bb4cbba 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -396,7 +396,7 @@ class SeedDMS_Core_DMS {
 		$this->lasterror = '';
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '5.1.19';
+			$this->version = '5.1.20';
 	} /* }}} */
 
 	/**
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index d5b025a3f..74b586b61 100644
--- 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-07-28</date>
+ <date>2020-09-04</date>
  <time>09:43:12</time>
  <version>
-  <release>5.1.19</release>
-  <api>5.1.19</api>
+  <release>5.1.20</release>
+  <api>5.1.20</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,11 +24,6 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- add method SeedDMS_Core_Document::setParent() as an alias for setFolder()
-- clear the save content list and latest content in SeedDMS_Core_Document after
-  a version has been deleted.
-- new method SeedDMS_Core_Document::isLatestVersion()
-- add new attribute types 'document', 'folder', 'user', 'group'
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1803,5 +1798,25 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
 - fix SeedDMS_Core_DMS::getDocumentByOriginalFilename()
    </notes>
   </release>
+  <release>
+   <date>2020-07-28</date>
+   <time>09:43:12</time>
+   <version>
+    <release>5.1.19</release>
+    <api>5.1.19</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- add method SeedDMS_Core_Document::setParent() as an alias for setFolder()
+- clear the save content list and latest content in SeedDMS_Core_Document after
+  a version has been deleted.
+- new method SeedDMS_Core_Document::isLatestVersion()
+- add new attribute types 'document', 'folder', 'user', 'group'
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index 62a0c65a1..6e4476b08 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version { /* {{{ */
 
-	const _number = "5.1.19";
+	const _number = "5.1.20";
 	const _string = "SeedDMS";
 
 	function __construct() {

From 7a886b9693d927715030ef987fb95ab50d5e3579 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Sep 2020 14:17:40 +0200
Subject: [PATCH 079/312] fix import of users, add groups

---
 op/op.ImportUsers.php | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/op/op.ImportUsers.php b/op/op.ImportUsers.php
index c2c1e94de..b5f39128a 100644
--- a/op/op.ImportUsers.php
+++ b/op/op.ImportUsers.php
@@ -70,12 +70,17 @@ function renderFolderData($colname, $objdata) { /* {{{ */
 
 function getGroupData($colname, $coldata, $objdata) { /* {{{ */
 	global $dms;
+	$kk = explode('_', $colname);
+	if(count($kk) == 2)
+		$gn = $kk[1];
+	else
+		$gn = '1';
 	if(!isset($objdata['groups']))
 		$objdata['groups'] = [];
 	if($group = $dms->getGroupByName($coldata)) {
-		$objdata['groups'][] = $group;
+		$objdata['groups'][$gn] = $group;
 	} else {
-		$objdata['groups'] = [];
+		$objdata['groups'][$gn] = null;
 		$objdata['__logs__'][] = array('type'=>'error', 'msg'=> "No such group with name '".$coldata."'");
 	}
 	return $objdata;
@@ -83,8 +88,13 @@ function getGroupData($colname, $coldata, $objdata) { /* {{{ */
 
 function renderGroupData($colname, $objdata) { /* {{{ */
 	$html = '';
-	foreach($objdata[$colname] as $g)
-		$html .= $g->getName().';';
+	$kk = explode('_', $colname);
+	if(count($kk) == 2)
+		$gn = $kk[1];
+	else
+		$gn = '1';
+	if($objdata['groups'][$gn])
+		$html .= $objdata['groups'][$gn]->getName();
 	return $html;
 } /* }}} */
 
@@ -127,6 +137,7 @@ if (isset($_FILES['userdata']) && $_FILES['userdata']['error'] == 0) {
 
 	$csvdelim = ';';
 	$csvencl = '"';
+	$colmap = array();
 	if($fp = fopen($_FILES['userdata']['tmp_name'], 'r')) {
 		/* First of all build up a column map, which contains for each columen
 		 * the column name
@@ -138,7 +149,6 @@ if (isset($_FILES['userdata']) && $_FILES['userdata']['error'] == 0) {
 		 * Unknown columns will be skipped and the index in the column map will
 		 * be left out.
 		 */
-		$colmap = array();
 		if($csvheader = fgetcsv($fp, 0, $csvdelim, $csvencl)) {
 			foreach($csvheader as $i=>$colname) {
 				$colname = trim($colname);
@@ -245,10 +255,14 @@ if (isset($_FILES['userdata']) && $_FILES['userdata']['error'] == 0) {
 				} else {
 					if(!empty($u['login']) && !empty($u['name']) && !empty($u['email'])) {
 						if(!empty($_POST['addnew'])) {
-							$ret = $dms->addUser($u['login'], '', $u['name'], $u['email'], !empty($u['language']) ? $u['language'] : 'en_GB', 'bootstrap', !empty($u['comment']) ? $u['comment'] : '', $u['role']);
-							if($ret)
+							$ret = $dms->addUser($u['login'], !empty($u['passenc']) ? $u['passenc'] : '', $u['name'], $u['email'], !empty($u['language']) ? $u['language'] : 'en_GB', 'bootstrap', !empty($u['comment']) ? $u['comment'] : '', $u['role']);
+							if($ret) {
 								$log[$uhash][] = array('id'=>$u['login'], 'type'=>'success', 'msg'=> "User '".$u['name']."' added.");
-							else
+								foreach($u['groups'] as $g) {
+									if($g)
+										$ret->joinGroup($g);
+								}
+							} else
 								$log[$uhash][] = array('id'=>$u['login'], 'type'=>'error', 'msg'=> "User '".$u['name']."' could not be added.");
 						} else {
 //							$log[$uhash][] = array('id'=>$u['login'], 'type'=>'success', 'msg'=> "User '".$u['name']."' can be added.");

From 480a13018085aac874c98ccc7e4035084adda77f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Sep 2020 14:22:11 +0200
Subject: [PATCH 080/312] fix import of role

---
 op/op.ImportUsers.php | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/op/op.ImportUsers.php b/op/op.ImportUsers.php
index b5f39128a..d59e3be82 100644
--- a/op/op.ImportUsers.php
+++ b/op/op.ImportUsers.php
@@ -99,26 +99,21 @@ function renderGroupData($colname, $objdata) { /* {{{ */
 } /* }}} */
 
 function getRoleData($colname, $coldata, $objdata) { /* {{{ */
-	switch($coldata) {
-	case 'admin':
-		$role = 1;
-		break;
-	case 'guest':
-		$role = 2;
-		break;
-	case 'user':
-		$role = 0;
-		break;
-	default:
-		$role = 0;
+	global $dms;
+	if($role = $dms->getRoleByName($coldata)) {
+		$objdata['role'] = $role;
+	} else {
+		$objdata['role'] = null;
 		$objdata['__logs__'][] = array('type'=>'error', 'msg'=> "No such role with name '".$coldata."'");
 	}
-	$objdata['role'] = $role;
 	return $objdata;
 } /* }}} */
 
 function renderRoleData($colname, $objdata) { /* {{{ */
-	return ($objdata[$colname] == 1 ? 'admin' : ($objdata[$colname] == 2 ? 'guest' : 'user'));
+	$html = '';
+	if($objdata[$colname])
+		$html .= $objdata[$colname]->getName();
+	return $html;
 } /* }}} */
 
 if (!$user->isAdmin()) {

From 3d40b1469147bb472eca2bf8cc7c2de1bccb0019 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Sep 2020 16:04:57 +0200
Subject: [PATCH 081/312] read env var SEEDDMS_CONFIG_FILE

---
 utils/schedulercli.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index d609909d9..3dcf4a4d4 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -45,6 +45,8 @@ if(isset($options['v']) || isset($options['verѕion'])) {
 /* Set alternative config file */
 if(isset($options['config'])) {
 	define('SEEDDMS_CONFIG_FILE', $options['config']);
+} elseif(isset($_SERVER['SEEDDMS_CONFIG_FILE'])) {
+	define('SEEDDMS_CONFIG_FILE', $_SERVER['SEEDDMS_CONFIG_FILE']);
 }
 
 $mode = 'list';

From 1ffcfdeb81a86c11eace802821cf174f0d3f1eb7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Sep 2020 20:09:41 +0200
Subject: [PATCH 082/312] getDocumentList() returns false, if an unknown list
 passed

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index e6bb4cbba..bde9fb114 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1341,6 +1341,9 @@ class SeedDMS_Core_DMS {
 			else $queryStr .= "ORDER BY `name`";
 			$queryStr .= " ".$orderdir;
 			break; // }}}
+		default:
+			return false;
+			break; // }}}
 		}
 
 		if($queryStr) {

From a75fe94d95def0fcc29633663b9a7e4ccf58ac13 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Sep 2020 20:10:41 +0200
Subject: [PATCH 083/312] add notes for 5.1.20

---
 SeedDMS_Core/package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 74b586b61..e02f8a5b9 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,6 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
+- SeedDMS_Core_DMS::getDocumentList() returns false, if an unknown list passed
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 4e3922627b05dba4f63ac204d1a4bf272f68bbc7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Sep 2020 20:11:15 +0200
Subject: [PATCH 084/312] unified checking for settings.xml and accessing dms

---
 utils/adddoc.php       |   3 +-
 utils/createfolder.php | 119 +++++++++++++++++++++++++++++++----------
 utils/indexer.php      |  25 ++++-----
 utils/xmldump.php      |  31 ++++-------
 utils/xmlimport.php    |  31 ++++++-----
 5 files changed, 133 insertions(+), 76 deletions(-)

diff --git a/utils/adddoc.php b/utils/adddoc.php
index c0a2912b5..763da6cee 100644
--- a/utils/adddoc.php
+++ b/utils/adddoc.php
@@ -63,6 +63,8 @@ if(isset($options['v']) || isset($options['verѕion'])) {
 /* Set alternative config file */
 if(isset($options['config'])) {
 	define('SEEDDMS_CONFIG_FILE', $options['config']);
+} elseif(isset($_SERVER['SEEDDMS_CONFIG_FILE'])) {
+	define('SEEDDMS_CONFIG_FILE', $_SERVER['SEEDDMS_CONFIG_FILE']);
 }
 
 /* Set parent folder or document */
@@ -368,4 +370,3 @@ if($folder) {
 		exit(1);
 	}
 }
-?>
diff --git a/utils/createfolder.php b/utils/createfolder.php
index d5233e602..7d629ace9 100644
--- a/utils/createfolder.php
+++ b/utils/createfolder.php
@@ -1,5 +1,11 @@
 <?php
-include("../inc/inc.ClassSettings.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";
@@ -12,6 +18,7 @@ function usage() { /* {{{ */
 	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 "  -u <user>: login name of user\n";
 	echo "  -F <parent id>: id of parent folder\n";
 	echo "  -c <comment>: set comment for file\n";
 	echo "  -n <name>: set name of the folder\n";
@@ -19,7 +26,7 @@ function usage() { /* {{{ */
 } /* }}} */
 
 $version = "0.0.1";
-$shortoptions = "F:c:s:n:hv";
+$shortoptions = "F:u:c:s:n:hv";
 $longoptions = array('help', 'version', 'config:');
 if(false === ($options = getopt($shortoptions, $longoptions))) {
 	usage();
@@ -40,16 +47,11 @@ if(isset($options['v']) || isset($options['verѕion'])) {
 
 /* Set alternative config file */
 if(isset($options['config'])) {
-	$settings = new Settings($options['config']);
-} else {
-	$settings = new Settings();
+	define('SEEDDMS_CONFIG_FILE', $options['config']);
+} elseif(isset($_SERVER['SEEDDMS_CONFIG_FILE'])) {
+	define('SEEDDMS_CONFIG_FILE', $_SERVER['SEEDDMS_CONFIG_FILE']);
 }
 
-if(isset($settings->_extraPath))
-	ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path'));
-
-require_once("SeedDMS/Core.php");
-
 if(isset($options['F'])) {
 	$folderid = (int) $options['F'];
 } else {
@@ -58,6 +60,11 @@ if(isset($options['F'])) {
 	exit(1);
 }
 
+$username = '';
+if(isset($options['u'])) {
+	$username = $options['u'];
+}
+
 $comment = '';
 if(isset($options['c'])) {
 	$comment = $options['c'];
@@ -73,23 +80,49 @@ if(isset($options['n'])) {
 	$name = $options['n'];
 }
 
-$db = new SeedDMS_Core_DatabaseAccess($settings->_dbDriver, $settings->_dbHostname, $settings->_dbUser, $settings->_dbPass, $settings->_dbDatabase);
-$db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostname . "\"");
-//$db->_conn->debug = 1;
+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");
 
-$dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
-if(!$settings->_doNotCheckDBVersion && !$dms->checkVersion()) {
-	echo "Database update needed.";
-	exit;
+/* Create a global user object {{{ */
+if($username) {
+	if(!($user = $dms->getUserByLogin($username))) {
+		echo "No such user '".$username."'.";
+		exit;
+	}
+} else
+	$user = $dms->getUser(1);
+
+$dms->setUser($user);
+/* }}} */
+
+/* Create a global notifier object {{{ */
+$notifier = new SeedDMS_NotificationService();
+
+if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
+	foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
+		if(method_exists($notificationObj, 'preAddService')) {
+			$notificationObj->preAddService($dms, $notifier);
+		}
+	}
 }
 
-$dms->setRootFolderID($settings->_rootFolderID);
-$dms->setMaxDirID($settings->_maxDirID);
-$dms->setEnableConverting($settings->_enableConverting);
-$dms->setViewOnlineFileTypes($settings->_viewOnlineFileTypes);
+if($settings->_enableEmail) {
+	$notifier->addService(new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword));
+}
 
-/* Create a global user object */
-$user = $dms->getUser(1);
+if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
+	foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
+		if(method_exists($notificationObj, 'postAddService')) {
+			$notificationObj->postAddService($dms, $notifier);
+		}
+	}
+}
+/* }}} */
 
 $folder = $dms->getFolder($folderid);
 
@@ -108,11 +141,41 @@ if (!is_numeric($sequence)) {
 	exit(1);
 }
 
-$res = $folder->addSubFolder($name, $comment, $user, $sequence);
+$controller = Controller::factory('AddSubFolder', array('dms'=>$dms, 'user'=>$user));
+$controller->setParam('folder', $folder);
+$controller->setParam('name', $name);
+$controller->setParam('comment', $comment);
+$controller->setParam('sequence', $sequence);
+$controller->setParam('attributes', array());
+$controller->setParam('notificationgroups', array());
+$controller->setParam('notificationusers', array());
+if(!$subFolder = $controller->run()) {
+	echo "Could not add subfolder to folder\n";
+} else {
+	// Send notification to subscribers.
+	if($notifier) {
+		$fnl = $folder->getNotifyList();
+		$snl = $subFolder->getNotifyList();
+		$nl = array(
+			'users'=>array_unique(array_merge($snl['users'], $fnl['users']), SORT_REGULAR),
+			'groups'=>array_unique(array_merge($snl['groups'], $fnl['groups']), SORT_REGULAR)
+		);
 
-if (is_bool($res) && !$res) {
-	echo "Could not add folder\n";
-	exit(1);
+		$subject = "new_subfolder_email_subject";
+		$message = "new_subfolder_email_body";
+		$params = array();
+		$params['name'] = $subFolder->getName();
+		$params['folder_name'] = $folder->getName();
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['username'] = $user->getFullName();
+		$params['comment'] = $comment;
+		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$subFolder->getID();
+		$params['sitename'] = $settings->_siteName;
+		$params['http_root'] = $settings->_httpRoot;
+		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		foreach ($nl["groups"] as $grp) {
+			$notifier->toGroup($user, $grp, $subject, $message, $params);
+		}
+	}
 }
-?>
 
diff --git a/utils/indexer.php b/utils/indexer.php
index f8eae2010..d0b911ba9 100644
--- a/utils/indexer.php
+++ b/utils/indexer.php
@@ -1,8 +1,10 @@
 <?php
 if(isset($_SERVER['SEEDDMS_HOME'])) {
-	require_once($_SERVER['SEEDDMS_HOME']."/inc/inc.ClassSettings.php");
+	ini_set('include_path', $_SERVER['SEEDDMS_HOME'].'/utils'. PATH_SEPARATOR .ini_get('include_path'));
+	$myincpath = $_SERVER['SEEDDMS_HOME'];
 } else {
-	require_once("../inc/inc.ClassSettings.php");
+	ini_set('include_path', dirname($argv[0]). PATH_SEPARATOR .ini_get('include_path'));
+	$myincpath = dirname($argv[0]);
 }
 
 function usage() { /* {{{ */
@@ -41,9 +43,9 @@ if(isset($options['v']) || isset($options['verѕion'])) {
 
 /* Set alternative config file */
 if(isset($options['config'])) {
-	$settings = new Settings($options['config']);
-} else {
-	$settings = new Settings();
+	define('SEEDDMS_CONFIG_FILE', $options['config']);
+} elseif(isset($_SERVER['SEEDDMS_CONFIG_FILE'])) {
+	define('SEEDDMS_CONFIG_FILE', $_SERVER['SEEDDMS_CONFIG_FILE']);
 }
 
 /* recreate index */
@@ -52,14 +54,10 @@ if(isset($options['c'])) {
 	$recreate = true;
 }
 
-if(isset($settings->_extraPath))
-	ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path'));
-//ini_set('include_path', $settings->_rootDir. PATH_SEPARATOR .ini_get('include_path'));
-
-require_once("inc/inc.Init.php");
-require_once("inc/inc.Extension.php");
-require_once("inc/inc.DBInit.php");
-require "vendor/autoload.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");
 
 if($settings->_fullSearchEngine == 'sqlitefts') {
 	$indexconf = array(
@@ -164,4 +162,3 @@ tree($dms, $index, $indexconf, $folder);
 
 $index->commit();
 $index->optimize();
-?>
diff --git a/utils/xmldump.php b/utils/xmldump.php
index 192c85cae..f02282f98 100644
--- a/utils/xmldump.php
+++ b/utils/xmldump.php
@@ -1,8 +1,10 @@
 <?php
 if(isset($_SERVER['SEEDDMS_HOME'])) {
-	require_once($_SERVER['SEEDDMS_HOME']."/inc/inc.ClassSettings.php");
+	ini_set('include_path', $_SERVER['SEEDDMS_HOME'].'/utils'. PATH_SEPARATOR .ini_get('include_path'));
+	$myincpath = $_SERVER['SEEDDMS_HOME'];
 } else {
-	require_once("../inc/inc.ClassSettings.php");
+	ini_set('include_path', dirname($argv[0]). PATH_SEPARATOR .ini_get('include_path'));
+	$myincpath = dirname($argv[0]);
 }
 
 function usage() { /* {{{ */
@@ -54,9 +56,9 @@ if(isset($options['v']) || isset($options['verѕion'])) {
 
 /* Set alternative config file */
 if(isset($options['config'])) {
-	$settings = new Settings($options['config']);
-} else {
-	$settings = new Settings();
+	define('SEEDDMS_CONFIG_FILE', $options['config']);
+} elseif(isset($_SERVER['SEEDDMS_CONFIG_FILE'])) {
+	define('SEEDDMS_CONFIG_FILE', $_SERVER['SEEDDMS_CONFIG_FILE']);
 }
 
 /* Set maximum size of files included in xml file */
@@ -85,11 +87,6 @@ if(isset($options['sections'])) {
 	$sections = explode(',', $options['sections']);
 }
 
-if(isset($settings->_extraPath))
-	ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path'));
-
-require_once("SeedDMS/Core.php");
-
 if(isset($options['folder'])) {
 	$folderid = intval($options['folder']);
 } else {
@@ -462,16 +459,10 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
 	}
 } /* }}} */
 
-$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(!$settings->_doNotCheckDBVersion && !$dms->checkVersion()) {
-	echo "Database update needed.";
-	exit;
-}
-
-$dms->setRootFolderID($settings->_rootFolderID);
+include($myincpath."/inc/inc.Settings.php");
+include($myincpath."/inc/inc.Init.php");
+include($myincpath."/inc/inc.Extension.php");
+include($myincpath."/inc/inc.DBInit.php");
 
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
 echo "<dms dbversion=\"".implode('.', array_slice($dms->getDBVersion(), 1, 3))."\" date=\"".date('Y-m-d H:i:s')."\">\n";
diff --git a/utils/xmlimport.php b/utils/xmlimport.php
index f429dfd80..5e4392f26 100644
--- a/utils/xmlimport.php
+++ b/utils/xmlimport.php
@@ -1,10 +1,11 @@
 <?php
 if(isset($_SERVER['SEEDDMS_HOME'])) {
-	require_once($_SERVER['SEEDDMS_HOME']."/inc/inc.ClassSettings.php");
+	ini_set('include_path', $_SERVER['SEEDDMS_HOME'].'/utils'. PATH_SEPARATOR .ini_get('include_path'));
+	$myincpath = $_SERVER['SEEDDMS_HOME'];
 } else {
-	require_once("../inc/inc.ClassSettings.php");
+	ini_set('include_path', dirname($argv[0]). PATH_SEPARATOR .ini_get('include_path'));
+	$myincpath = dirname($argv[0]);
 }
-require("Log.php");
 
 function usage() { /* {{{ */
 	echo "Usage:\n";
@@ -1621,12 +1622,6 @@ if(isset($options['v']) || isset($options['verѕion'])) {
 	exit(0);
 }
 
-$logfile = "xmlimport.log";
-$logconf = array();
-$logconf['timeformat'] = '%Y-%m-%d %H:%M:%S';
-$logconf['lineFormat'] = '%{timestamp} %{priority} xmlimport: %{ident} %{message}';
-$logger = Log::factory('file', $logfile, '', $logconf);
-
 /* Check for debug mode */
 $debug = false;
 if(isset($options['debug'])) {
@@ -1635,11 +1630,22 @@ if(isset($options['debug'])) {
 
 /* Set alternative config file */
 if(isset($options['config'])) {
-	$settings = new Settings($options['config']);
-} else {
-	$settings = new Settings();
+	define('SEEDDMS_CONFIG_FILE', $options['config']);
+} elseif(isset($_SERVER['SEEDDMS_CONFIG_FILE'])) {
+	define('SEEDDMS_CONFIG_FILE', $_SERVER['SEEDDMS_CONFIG_FILE']);
 }
 
+include($myincpath."/inc/inc.Settings.php");
+include($myincpath."/inc/inc.Init.php");
+include($myincpath."/inc/inc.Extension.php");
+include($myincpath."/inc/inc.DBInit.php");
+
+$logfile = "xmlimport.log";
+$logconf = array();
+$logconf['timeformat'] = '%Y-%m-%d %H:%M:%S';
+$logconf['lineFormat'] = '%{timestamp} %{priority} xmlimport: %{ident} %{message}';
+$logger = Log::factory('file', $logfile, '', $logconf);
+
 if(isset($options['folder'])) {
 	$folderid = intval($options['folder']);
 } else {
@@ -1765,4 +1771,3 @@ if($exportmapping) {
 		$logger->err("Could not open mapping file '".$exportmapping."'");
 	}
 }
-?>

From e10ce3dc4b1935597a214b43c2233ea0f39e2735 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Sep 2020 09:21:40 +0200
Subject: [PATCH 085/312] =?UTF-8?q?replace=20all=20=CB=9D\n"=20by=20PHP=5F?=
 =?UTF-8?q?EOL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/adddoc.php           | 92 +++++++++++++++++++-------------------
 utils/createfolder.php     | 42 ++++++++---------
 utils/indexer.php          | 21 +++------
 utils/seeddms-createfolder |  4 +-
 utils/xmldump.php          | 38 ++++++++--------
 utils/xmlimport.php        | 44 +++++++++---------
 6 files changed, 115 insertions(+), 126 deletions(-)

diff --git a/utils/adddoc.php b/utils/adddoc.php
index 763da6cee..925d86d59 100644
--- a/utils/adddoc.php
+++ b/utils/adddoc.php
@@ -8,36 +8,36 @@ if(isset($_SERVER['SEEDDMS_HOME'])) {
 }
 
 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> -D <document id> -f <filename>\n";
-	echo "\n";
-	echo "Description:\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 "  -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. 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). 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. 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. 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";
+	echo "Usage:".PHP_EOL;
+	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>".PHP_EOL;
+	echo PHP_EOL;
+	echo "Description:".PHP_EOL;
+	echo "  This program uploads a file into a folder or updates a document 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 "  --config: set alternative config file.".PHP_EOL;
+	echo "  -F <folder id>: id of folder the file is uploaded to".PHP_EOL;
+	echo "  -D <document id>: id of document the file is uploaded to.".PHP_EOL;
+	echo "     This will only be used if no folder id is given.".PHP_EOL;
+	echo "  -c <comment>: set comment for document. See [1].".PHP_EOL;
+	echo "  -C <comment>: set comment for version".PHP_EOL;
+	echo "  -k <keywords>: set keywords for file. See [1].".PHP_EOL;
+	echo "  -K <categories>: set categories for file. See [1].".PHP_EOL;
+	echo "  -s <number>: set sequence for file (used for ordering files within a folder. See [1].".PHP_EOL;
+	echo "  -n <name>: set name of file".PHP_EOL;
+	echo "  -V <version>: set version of file (defaults to 1). See [2].".PHP_EOL;
+	echo "  -u <user>: login name of user".PHP_EOL;
+	echo "  -f <filename>: upload this file".PHP_EOL;
+	echo "  -s <sequence>: set sequence of file. See [1]".PHP_EOL;
+	echo "  -t <mimetype> set mimetype of file manually. Do not do that unless you know".PHP_EOL;
+	echo "      what you do. If not set, the mimetype will be determined automatically.".PHP_EOL;
+	echo "  -a <attribute=value>: Set a document attribute; can occur multiple times. See [1].".PHP_EOL;
+	echo "  -A <attribute=value>: Set a version attribute; can occur multiple times.".PHP_EOL;
+	echo PHP_EOL;
+	echo "[1] This option applies only if a new document is uploaded. It has no effect".PHP_EOL."    if a new document version is uploaded.".PHP_EOL;
+	echo "[2] If a new document version is uploaded it defaults to the next version number.".PHP_EOL;
 } /* }}} */
 
 $version = "0.0.1";
@@ -56,7 +56,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);
 }
 
@@ -75,7 +75,7 @@ if(isset($options['F'])) {
 	if(isset($options['D'])) {
 		$documentid = (int) $options['D'];
 	} else {
-		echo "Missing folder/document ID\n";
+		echo "Missing folder/document ID".PHP_EOL;
 		usage();
 		exit(1);
 	}
@@ -151,7 +151,7 @@ if(isset($options['K'])) {
 		if($cat) {
 			$categories[] = $cat;
 		} else {
-			echo "Category '".$categoryname."' not found\n";
+			echo "Category '".$categoryname."' not found".PHP_EOL;
 		}
 	}
 } /* }}} */
@@ -170,12 +170,12 @@ if (isset($options['a'])) {
 		$attrKey = strstr($thisAttribute, '=', true);
 		$attrVal = substr(strstr($thisAttribute, '='), 1);
 		if (empty($attrKey) || empty($attrVal)) {
-			echo "Document attribute $thisAttribute not understood\n";
+			echo "Document attribute $thisAttribute not understood".PHP_EOL;
 			exit(1);
 		}
 		$attrdef = $dms->getAttributeDefinitionByName($attrKey);
 		if (!$attrdef) {
-			echo "Document attribute $attrKey unknown\n";
+			echo "Document attribute $attrKey unknown".PHP_EOL;
 			exit(1);
 		}
 		$document_attributes[$attrdef->getID()] = $attrVal;
@@ -196,12 +196,12 @@ if (isset($options['A'])) {
 		$attrKey = strstr($thisAttribute, '=', true);
 		$attrVal = substr(strstr($thisAttribute, '='), 1);
 		if (empty($attrKey) || empty($attrVal)) {
-			echo "Version attribute $thisAttribute not understood\n";
+			echo "Version attribute $thisAttribute not understood".PHP_EOL;
 			exit(1);
 		}
 		$attrdef = $dms->getAttributeDefinitionByName($attrKey);
 		if (!$attrdef) {
-			echo "Version attribute $attrKey unknown\n";
+			echo "Version attribute $attrKey unknown".PHP_EOL;
 			exit(1);
 		}
 		$version_attributes[$attrdef->getID()] = $attrVal;
@@ -253,11 +253,11 @@ if(is_readable($filename)) {
 		}
 		$filetype = "." . pathinfo($filename, PATHINFO_EXTENSION);
 	} else {
-		echo "File '".$filename."' has zero size\n";
+		echo "File '".$filename."' has zero size".PHP_EOL;
 		exit(1);
 	}
 } else {
-	echo "File '".$filename."' is not readable\n";
+	echo "File '".$filename."' is not readable".PHP_EOL;
 	exit(1);
 }
 /* }}} */
@@ -268,30 +268,30 @@ if($folderid) {
 	$folder = $dms->getFolder($folderid);
 
 	if (!is_object($folder)) {
-		echo "Could not find specified folder\n";
+		echo "Could not find specified folder".PHP_EOL;
 		exit(1);
 	}
 
 	if ($folder->getAccessMode($user) < M_READWRITE) {
-		echo "Not sufficient access rights\n";
+		echo "Not sufficient access rights".PHP_EOL;
 		exit(1);
 	}
 } elseif($documentid) {
 	$document = $dms->getDocument($documentid);
 
 	if (!is_object($document)) {
-		echo "Could not find specified document\n";
+		echo "Could not find specified document".PHP_EOL;
 		exit(1);
 	}
 
 	if ($document->getAccessMode($user) < M_READWRITE) {
-		echo "Not sufficient access rights\n";
+		echo "Not sufficient access rights".PHP_EOL;
 		exit(1);
 	}
 }
 
 if (!is_numeric($sequence)) {
-	echo "Sequence must be numeric\n";
+	echo "Sequence must be numeric".PHP_EOL;
 	exit(1);
 }
 
@@ -346,7 +346,7 @@ if($folder) {
 	$controller->setParam('defaultaccessdocs', $settings->_defaultAccessDocs);
 
 	if(!$document = $controller->run()) {
-		echo "Could not add document to folder\n";
+		echo "Could not add document to folder".PHP_EOL;
 		exit(1);
 	}
 } elseif($document) {
@@ -366,7 +366,7 @@ if($folder) {
 	$controller->setParam('workflow', null);
 
 	if(!$content = $controller->run()) {
-		echo "Could not add version to document\n";
+		echo "Could not add version to document".PHP_EOL;
 		exit(1);
 	}
 }
diff --git a/utils/createfolder.php b/utils/createfolder.php
index 7d629ace9..57c68be20 100644
--- a/utils/createfolder.php
+++ b/utils/createfolder.php
@@ -8,21 +8,21 @@ if(isset($_SERVER['SEEDDMS_HOME'])) {
 }
 
 function usage() { /* {{{ */
-	echo "Usage:\n";
-	echo "  seeddms-createfolder [--config <file>] [-c <comment>] [-n <name>] [-s <sequence>] [-h] [-v] -F <parent id>\n";
-	echo "\n";
-	echo "Description:\n";
-	echo "  This program creates a new folder in 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 "  -u <user>: login name of user\n";
-	echo "  -F <parent id>: id of parent folder\n";
-	echo "  -c <comment>: set comment for file\n";
-	echo "  -n <name>: set name of the folder\n";
-	echo "  -s <sequence>: set sequence of folder\n";
+	echo "Usage:".PHP_EOL;
+	echo "  seeddms-createfolder [--config <file>] [-c <comment>] [-n <name>] [-s <sequence>] [-h] [-v] -F <parent id>".PHP_EOL;
+	echo PHP_EOL;
+	echo "Description:".PHP_EOL;
+	echo "  This program creates a new folder in 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 "  --config: set alternative config file.".PHP_EOL;
+	echo "  -u <user>: login name of user".PHP_EOL;
+	echo "  -F <parent id>: id of parent folder".PHP_EOL;
+	echo "  -c <comment>: set comment for file".PHP_EOL;
+	echo "  -n <name>: set name of the folder".PHP_EOL;
+	echo "  -s <sequence>: set sequence of folder".PHP_EOL;
 } /* }}} */
 
 $version = "0.0.1";
@@ -41,7 +41,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);
 }
 
@@ -55,7 +55,7 @@ if(isset($options['config'])) {
 if(isset($options['F'])) {
 	$folderid = (int) $options['F'];
 } else {
-	echo "Missing parent folder ID\n";
+	echo "Missing parent folder ID".PHP_EOL;
 	usage();
 	exit(1);
 }
@@ -127,17 +127,17 @@ if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
 $folder = $dms->getFolder($folderid);
 
 if (!is_object($folder)) {
-	echo "Could not find specified folder\n";
+	echo "Could not find specified folder".PHP_EOL;
 	exit(1);
 }
 
 if ($folder->getAccessMode($user) < M_READWRITE) {
-	echo "Not sufficient access rights\n";
+	echo "Not sufficient access rights".PHP_EOL;
 	exit(1);
 }
 
 if (!is_numeric($sequence)) {
-	echo "Sequence must be numeric\n";
+	echo "Sequence must be numeric".PHP_EOL;
 	exit(1);
 }
 
@@ -150,7 +150,7 @@ $controller->setParam('attributes', array());
 $controller->setParam('notificationgroups', array());
 $controller->setParam('notificationusers', array());
 if(!$subFolder = $controller->run()) {
-	echo "Could not add subfolder to folder\n";
+	echo "Could not add subfolder to folder".PHP_EOL;
 } else {
 	// Send notification to subscribers.
 	if($notifier) {
diff --git a/utils/indexer.php b/utils/indexer.php
index d0b911ba9..f0f2daf1b 100644
--- a/utils/indexer.php
+++ b/utils/indexer.php
@@ -10,10 +10,10 @@ if(isset($_SERVER['SEEDDMS_HOME'])) {
 function usage() { /* {{{ */
 	echo "Usage:".PHP_EOL;
 	echo "  seeddms-indexer [-h] [-v] [-c] [--config <file>]".PHP_EOL;
-	echo "".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 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;
@@ -37,7 +37,7 @@ if(isset($options['h']) || isset($options['help'])) {
 
 /* Print version and exit */
 if(isset($options['v']) || isset($options['verѕion'])) {
-	echo $version."".PHP_EOL;
+	echo $version.PHP_EOL;
 	exit(0);
 }
 
@@ -86,7 +86,7 @@ function tree($dms, $index, $indexconf, $folder, $indent='') { /* {{{ */
 	}
 	$documents = $folder->getDocuments();
 	foreach($documents as $document) {
-		echo $indent."  ".$document->getId().":".$document->getName()." ";
+		echo $themes->black($indent."  ".$document->getId().":".$document->getName()." ");
 		$lucenesearch = new $indexconf['Search']($index);
 		if(!($hit = $lucenesearch->getDocument($document->getId()))) {
 			try {
@@ -135,23 +135,12 @@ function tree($dms, $index, $indexconf, $folder, $indent='') { /* {{{ */
 
 $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(!$settings->_doNotCheckDBVersion && !$dms->checkVersion()) {
-	echo "Database update needed.".PHP_EOL;
-	exit(1);
-}
-
-$dms->setRootFolderID($settings->_rootFolderID);
-
 if($recreate)
 	$index = $indexconf['Indexer']::create($settings->_luceneDir);
 else
 	$index = $indexconf['Indexer']::open($settings->_luceneDir);
 if(!$index) {
-	echo "Could not create index.".PHP_EOL;
+	echo $themes->error("Could not create index.").PHP_EOL;
 	exit(1);
 }
 
diff --git a/utils/seeddms-createfolder b/utils/seeddms-createfolder
index 962ff5822..5ebad54b1 100755
--- a/utils/seeddms-createfolder
+++ b/utils/seeddms-createfolder
@@ -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/createfolder.php" -- "${@}"
diff --git a/utils/xmldump.php b/utils/xmldump.php
index f02282f98..54a14bf09 100644
--- a/utils/xmldump.php
+++ b/utils/xmldump.php
@@ -8,23 +8,23 @@ if(isset($_SERVER['SEEDDMS_HOME'])) {
 }
 
 function usage() { /* {{{ */
-	echo "Usage:\n";
-	echo "  seeddms-xmldump [-h] [-v] [--config <file>]\n";
-	echo "\n";
-	echo "Description:\n";
-	echo "  This program creates an xml dump of the whole or parts of the dms.\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 "  --folder: set start folder.\n";
-	echo "  --skip-root: do not export the root folder itself.\n";
-	echo "  --sections <sections>: comma seperated list of sections to export.\n";
-	echo "  --maxsize: maximum size of files to be included in output\n";
-	echo "    (defaults to 100000)\n";
-	echo "  --contentdir: directory where all document versions are stored\n";
-	echo "    which are larger than maxsize.\n";
+	echo "Usage:".PHP_EOL;
+	echo "  seeddms-xmldump [-h] [-v] [--config <file>]".PHP_EOL;
+	echo PHP_EOL;
+	echo "Description:".PHP_EOL;
+	echo "  This program creates an xml dump of the whole or parts of the dms.".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 "  --config: set alternative config file.".PHP_EOL;
+	echo "  --folder: set start folder.".PHP_EOL;
+	echo "  --skip-root: do not export the root folder itself.".PHP_EOL;
+	echo "  --sections <sections>: comma seperated list of sections to export.".PHP_EOL;
+	echo "  --maxsize: maximum size of files to be included in output".PHP_EOL;
+	echo "    (defaults to 100000)".PHP_EOL;
+	echo "  --contentdir: directory where all document versions are stored".PHP_EOL;
+	echo "    which are larger than maxsize.".PHP_EOL;
 } /* }}} */
 
 function wrapWithCData($text) { /* {{{ */
@@ -50,7 +50,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);
 }
 
@@ -75,7 +75,7 @@ if(isset($options['contentdir'])) {
 		if(substr($contentdir, -1, 1) != DIRECTORY_SEPARATOR)
 			$contentdir .= DIRECTORY_SEPARATOR;
 	} else {
-		echo "Directory ".$options['contentdir']." does not exists\n";
+		echo "Directory ".$options['contentdir']." does not exists".PHP_EOL;
 		exit(1);
 	}
 } else {
diff --git a/utils/xmlimport.php b/utils/xmlimport.php
index 5e4392f26..b1e373d01 100644
--- a/utils/xmlimport.php
+++ b/utils/xmlimport.php
@@ -8,26 +8,26 @@ if(isset($_SERVER['SEEDDMS_HOME'])) {
 }
 
 function usage() { /* {{{ */
-	echo "Usage:\n";
-	echo "  seeddms-xmlimport [-h] [-v] [--config <file>]\n";
-	echo "\n";
-	echo "Description:\n";
-	echo "  This program imports an xml dump into the dms.\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 <config file>: set alternative config file.\n";
-	echo "  --folder <folder id>: set import folder.\n";
-	echo "  --file <file>: file containing the dump.\n";
-	echo "  --sections <sections>: comma seperated list of sections to read from dump.\n";
-	echo "     can be: users, groups, documents, folders, keywordcategories, or\n";
-	echo "     documentcategories\n";
-	echo "  --contentdir <dir>: directory where all document versions are stored\n";
-	echo "    which are not included in the xml file.\n";
-	echo "  --default-user <user id>: use this user if user could not be found.\n";
-	echo "  --export-mapping <file>: write object mapping into file\n";
-	echo "  --debug: turn debug output on\n";
+	echo "Usage:".PHP_EOL;
+	echo "  seeddms-xmlimport [-h] [-v] [--config <file>]".PHP_EOL;
+	echo PHP_EOL;
+	echo "Description:".PHP_EOL;
+	echo "  This program imports an xml dump into the dms.".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 "  --config <config file>: set alternative config file.".PHP_EOL;
+	echo "  --folder <folder id>: set import folder.".PHP_EOL;
+	echo "  --file <file>: file containing the dump.".PHP_EOL;
+	echo "  --sections <sections>: comma seperated list of sections to read from dump.".PHP_EOL;
+	echo "     can be: users, groups, documents, folders, keywordcategories, or".PHP_EOL;
+	echo "     documentcategories".PHP_EOL;
+	echo "  --contentdir <dir>: directory where all document versions are stored".PHP_EOL;
+	echo "    which are not included in the xml file.".PHP_EOL;
+	echo "  --default-user <user id>: use this user if user could not be found.".PHP_EOL;
+	echo "  --export-mapping <file>: write object mapping into file".PHP_EOL;
+	echo "  --debug: turn debug output on".PHP_EOL;
 } /* }}} */
 
 function dateToTimestamp($date, $format='Y-m-d H:i:s') { /* {{{ */
@@ -515,7 +515,7 @@ function insert_document($document) { /* {{{ */
 			copy($contentdir.$initversion['fileref'], $filename);
 		} else {
 			if(!isset($initversion['data']))
-				echo $document['attributes']['name']."\n";
+				echo $document['attributes']['name'].PHP_EOL;
 			$filecontents = base64_decode($initversion['data']);
 			if(strlen($filecontents) != $initversion['data_length']) {
 				$logger->warning("File length (".strlen($filecontents).") doesn't match expected length (".$initversion['data_length'].").");
@@ -1618,7 +1618,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);
 }
 

From 85edac373406238351371d73072426852575e1ec Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Sep 2020 09:34:45 +0200
Subject: [PATCH 086/312] get SEEDMS_HOME from parent dir if not set

---
 utils/seeddms-xmldump | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/seeddms-xmldump b/utils/seeddms-xmldump
index 2ac863e49..c9eb1fdb1 100755
--- a/utils/seeddms-xmldump
+++ b/utils/seeddms-xmldump
@@ -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/xmldump.php" -- "${@}"

From 4c64b316db423803088a7e99d6f69eb2ed269140 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Sep 2020 09:43:18 +0200
Subject: [PATCH 087/312] create download file in system tmp, better error
 checking (Closes: #487)

---
 controllers/class.TransmittalDownload.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/controllers/class.TransmittalDownload.php b/controllers/class.TransmittalDownload.php
index 88534641a..7af1b226b 100644
--- a/controllers/class.TransmittalDownload.php
+++ b/controllers/class.TransmittalDownload.php
@@ -46,16 +46,18 @@ class SeedDMS_Controller_TransmittalDownload extends SeedDMS_Controller_Common {
 				}
 			}
 
-			$filename = tempnam('/tmp', '');
-			$downmgr->createArchive($filename);
-			header("Content-Transfer-Encoding: binary");
-			header("Content-Length: " . filesize($filename));
-			header("Content-Disposition: attachment; filename=\"export-" .date('Y-m-d') . ".zip\"");
-			header("Content-Type: application/zip");
-			header("Cache-Control: must-revalidate");
+			$filename = tempnam(sys_get_temp_dir(), 'transmittal-download');
+			if($filename) {
+				$downmgr->createArchive($filename);
+				header("Content-Transfer-Encoding: binary");
+				header("Content-Length: " . filesize($filename));
+				header("Content-Disposition: attachment; filename=\"export-" .date('Y-m-d') . ".zip\"");
+				header("Content-Type: application/zip");
+				header("Cache-Control: must-revalidate");
 
-			readfile($filename);
-			unlink($filename);
+				readfile($filename);
+				unlink($filename);
+			}
 			exit;
 		}
 	}

From 131d2b464529dec8b9990738c56d39eb7ba1ecf8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Sep 2020 09:44:49 +0200
Subject: [PATCH 088/312] close bug #487 in 6.0.13

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 13fd41306..5e043f061 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 6.0.13
 --------------------------------------------------------------------------------
 - merge changes up to 5.1.20
+- create download file for transmittal in system tmp (Closes: #478)
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.12

From 955f2b7309ff357929f02af94fc840a146f07d10 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Sep 2020 13:23:08 +0200
Subject: [PATCH 089/312] add changes for 5.1.20

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 6c4afb60a..4bb1a1ab9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 5.1.20
 --------------------------------------------------------------------------------
 - fix import of users
+- major rework of scripts in utils, unify reading of settings, use PHP_EOL
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.19

From a736d60df59cd11c38d028a2f471f82d68d96f1f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Sep 2020 14:09:53 +0200
Subject: [PATCH 090/312] fix creation of zip files, create temp file in
 sys_get_temp_dir()

---
 inc/inc.ClassDownloadMgr.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassDownloadMgr.php b/inc/inc.ClassDownloadMgr.php
index 8e30b9ed1..2c4ac4f52 100644
--- a/inc/inc.ClassDownloadMgr.php
+++ b/inc/inc.ClassDownloadMgr.php
@@ -174,13 +174,16 @@ class SeedDMS_Download_Mgr {
 			return false;
 		}
 
-		$file = tempnam("/tmp", "export-list-");
+		$file = tempnam(sys_get_temp_dir(), "export-list-");
+		if(!$file)
+			return false;
 		$this->createToc($file);
 
 		$zip = new ZipArchive();
 		$prefixdir = date('Y-m-d', time());
 
-		if($zip->open($filename, ZipArchive::CREATE) !== TRUE) {
+		if(($errcode = $zip->open($filename, ZipArchive::OVERWRITE)) !== TRUE) {
+			echo $errcode;
 			return false;
 		}
 
@@ -204,5 +207,6 @@ class SeedDMS_Download_Mgr {
 		$zip->addFile($file, $prefixdir."/metadata.xls");
 		$zip->close();
 		unlink($file);
+		return true;
 	} /* }}} */
 }

From 8ec772c5047d29cc9d12d4264d8db4ca361bdfcc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Sep 2020 14:10:24 +0200
Subject: [PATCH 091/312] check if download file can be created

---
 controllers/class.TransmittalDownload.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/controllers/class.TransmittalDownload.php b/controllers/class.TransmittalDownload.php
index 7af1b226b..13ab05f4d 100644
--- a/controllers/class.TransmittalDownload.php
+++ b/controllers/class.TransmittalDownload.php
@@ -46,16 +46,18 @@ class SeedDMS_Controller_TransmittalDownload extends SeedDMS_Controller_Common {
 				}
 			}
 
-			$filename = tempnam(sys_get_temp_dir(), 'transmittal-download');
+			$filename = tempnam(sys_get_temp_dir(), 'transmittal-download-');
 			if($filename) {
-				$downmgr->createArchive($filename);
-				header("Content-Transfer-Encoding: binary");
-				header("Content-Length: " . filesize($filename));
-				header("Content-Disposition: attachment; filename=\"export-" .date('Y-m-d') . ".zip\"");
-				header("Content-Type: application/zip");
-				header("Cache-Control: must-revalidate");
+				if($downmgr->createArchive($filename)) {
+					header("Content-Transfer-Encoding: binary");
+					header("Content-Length: " . filesize($filename));
+					header("Content-Disposition: attachment; filename=\"export-" .date('Y-m-d') . ".zip\"");
+					header("Content-Type: application/zip");
+					header("Cache-Control: must-revalidate");
 
-				readfile($filename);
+					readfile($filename);
+				} else {
+				}
 				unlink($filename);
 			}
 			exit;

From 973ef339bbf889443a738a68d5d14213e3988f15 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 6 Sep 2020 07:26:45 +0200
Subject: [PATCH 092/312] disregard group if not exists but issue error msg

---
 op/op.ImportUsers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.ImportUsers.php b/op/op.ImportUsers.php
index b5f39128a..c5a98999b 100644
--- a/op/op.ImportUsers.php
+++ b/op/op.ImportUsers.php
@@ -80,7 +80,7 @@ function getGroupData($colname, $coldata, $objdata) { /* {{{ */
 	if($group = $dms->getGroupByName($coldata)) {
 		$objdata['groups'][$gn] = $group;
 	} else {
-		$objdata['groups'][$gn] = null;
+//		$objdata['groups'][$gn] = null;
 		$objdata['__logs__'][] = array('type'=>'error', 'msg'=> "No such group with name '".$coldata."'");
 	}
 	return $objdata;

From 1eee3f13351462e2350dd76fdc31e165fec915df Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 6 Sep 2020 07:32:08 +0200
Subject: [PATCH 093/312] check if group was found when rendering groups

---
 op/op.ImportUsers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.ImportUsers.php b/op/op.ImportUsers.php
index c5a98999b..062ae128a 100644
--- a/op/op.ImportUsers.php
+++ b/op/op.ImportUsers.php
@@ -93,7 +93,7 @@ function renderGroupData($colname, $objdata) { /* {{{ */
 		$gn = $kk[1];
 	else
 		$gn = '1';
-	if($objdata['groups'][$gn])
+	if(!empty($objdata['groups'][$gn]))
 		$html .= $objdata['groups'][$gn]->getName();
 	return $html;
 } /* }}} */

From ab0dfee213932b848406e8df8d0cb2425bf4cc38 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 6 Sep 2020 07:46:31 +0200
Subject: [PATCH 094/312] init $colmap early

---
 op/op.ImportUsers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.ImportUsers.php b/op/op.ImportUsers.php
index 062ae128a..40d8b3453 100644
--- a/op/op.ImportUsers.php
+++ b/op/op.ImportUsers.php
@@ -128,6 +128,7 @@ if (!$user->isAdmin()) {
 $log = array();
 $newusers = array();
 $csvheader = array();
+$colmap = array();
 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"));
@@ -137,7 +138,6 @@ if (isset($_FILES['userdata']) && $_FILES['userdata']['error'] == 0) {
 
 	$csvdelim = ';';
 	$csvencl = '"';
-	$colmap = array();
 	if($fp = fopen($_FILES['userdata']['tmp_name'], 'r')) {
 		/* First of all build up a column map, which contains for each columen
 		 * the column name

From dd1057128d5e16bd94d16ffbfbfb02982652942c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 6 Sep 2020 07:58:43 +0200
Subject: [PATCH 095/312] add 'user' to list of terms

---
 SeedDMS_SQLiteFTS/SQLiteFTS/Term.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Term.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Term.php
index ae768b245..01b35429b 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Term.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Term.php
@@ -56,7 +56,8 @@ class SeedDMS_SQLiteFTS_Term {
 			5 => 'origfilename',
 			6 => 'owner',
 			7 => 'content',
-			8 => 'created'
+			8 => 'created',
+			9 => 'user'
 		);
 		$this->field = $fields[$col];
 		$this->_occurrence = $occurrence;

From fc9e424b75de73b52e391a281780e69d98e68472 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 6 Sep 2020 07:59:46 +0200
Subject: [PATCH 096/312] start new version 1.0.13

---
 SeedDMS_SQLiteFTS/package.xml | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml
index c5fc5eacc..61845de9a 100644
--- a/SeedDMS_SQLiteFTS/package.xml
+++ b/SeedDMS_SQLiteFTS/package.xml
@@ -14,8 +14,8 @@
  <date>2020-09-02</date>
  <time>08:57:44</time>
  <version>
-  <release>1.0.12</release>
-  <api>1.0.12</api>
+  <release>1.0.13</release>
+  <api>1.0.13</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-Index users with at least read access on a document
+add user to list of terms
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -259,5 +259,21 @@ Set 'created' in index to creation date of indexed content (was set to current
 timestamp)
    </notes>
   </release>
+  <release>
+   <date>2020-09-02</date>
+   <time>08:57:44</time>
+   <version>
+    <release>1.0.12</release>
+    <api>1.0.12</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+Index users with at least read access on a document
+   </notes>
+  </release>
  </changelog>
 </package>

From a75257c7c2710658ea10b7d1e1ceee7581eccc56 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 7 Sep 2020 11:45:11 +0200
Subject: [PATCH 097/312] add title to enable/disable button of extension

---
 views/bootstrap/class.ExtensionMgr.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index 6c7f5f0e9..1f7f32619 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -222,9 +222,9 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 				echo "<a href=\"../out/out.Settings.php?currenttab=extensions#".$extname."\" title=\"".getMLText('configure_extension')."\"><i class=\"fa fa-cogs\"></i></a>";
 			echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$extname."-download\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"download\" /><input type=\"hidden\" name=\"extname\" value=\"".$extname."\" /><a class=\"download\" data-extname=\"".$extname."\" title=\"".getMLText('download_extension')."\"><i class=\"fa fa-download\"></i></a></form>";
 			if(!$settings->extensionIsDisabled($extname)) {
-				echo ' <a href="#" class="toggle" data-extname="'.$extname.'"><i class="fa fa-check"</i></a>';
+				echo ' <a href="#" class="toggle" data-extname="'.$extname.'" title="'.getMLText('disable_extension').'"><i class="fa fa-check"</i></a>';
 			} else {
-				echo ' <a href="#" class="toggle" data-extname="'.$extname.'"><i class="fa fa-check-minus"></i></a>';
+				echo ' <a href="#" class="toggle" data-extname="'.$extname.'" title="'.getMLText('enable_extension').'"><i class="fa fa-minus"></i></a>';
 			}
 			echo "</div>";
 			echo "</td>";

From c6d0a1d3450fad934f28179ed61f5e6f8c9b16b9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 7 Sep 2020 16:20:37 +0200
Subject: [PATCH 098/312] allow inline editing on document details page

---
 CHANGELOG                              |  1 +
 inc/inc.ClassSettings.php              |  4 ++++
 op/op.Ajax.php                         | 24 ++++++++++++++++++++++++
 op/op.Settings.php                     |  1 +
 styles/bootstrap/application.css       |  5 +++++
 styles/bootstrap/application.js        | 24 ++++++++++++++++++++++++
 views/bootstrap/class.Bootstrap.php    | 16 ++++++++++++++++
 views/bootstrap/class.Settings.php     |  1 +
 views/bootstrap/class.ViewDocument.php |  2 +-
 9 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4bb1a1ab9..c2a089277 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 --------------------------------------------------------------------------------
 - fix import of users
 - major rework of scripts in utils, unify reading of settings, use PHP_EOL
+- allow inline editing of document name
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.19
diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index d040cbb02..9b5180cf2 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -74,6 +74,8 @@ class Settings { /* {{{ */
 	var $_apiUserId = 0;
 	// api allowed origins for restapi
 	var $_apiOrigin = '';
+	// allow inline editing of document/folder names
+	var $_inlineEditing = false;
 	// Strict form checking
 	var $_strictFormCheck = false;
 	// list of form fields which are visible by default but can be explixitly
@@ -472,6 +474,7 @@ class Settings { /* {{{ */
 		$node = $xml->xpath('/configuration/site/edition');
 		$tab = $node[0]->attributes();
 		$this->_strictFormCheck = Settings::boolVal($tab["strictFormCheck"]);
+		$this->_inlineEditing = Settings::boolVal($tab["inlineEditing"]);
 		if(trim(strval($tab["noDocumentFormFields"])))
 			$this->_noDocumentFormFields = explode(',',strval($tab["noDocumentFormFields"]));
 		$this->setViewOnlineFileTypesFromString(strval($tab["viewOnlineFileTypes"]));
@@ -835,6 +838,7 @@ class Settings { /* {{{ */
     // XML Path: /configuration/site/edition
     $node = $this->getXMLNode($xml, '/configuration/site', 'edition');
     $this->setXMLAttributValue($node, "strictFormCheck", $this->_strictFormCheck);
+    $this->setXMLAttributValue($node, "inlineEditing", $this->_inlineEditing);
     $this->setXMLAttributValue($node, "noDocumentFormFields", implode(',', $this->_noDocumentFormFields));
     $this->setXMLAttributValue($node, "viewOnlineFileTypes", $this->getViewOnlineFileTypesToString());
     $this->setXMLAttributValue($node, "editOnlineFileTypes", $this->getEditOnlineFileTypesToString());
diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index e01f9a267..4f30ab91b 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -600,6 +600,30 @@ switch($command) {
 		}
 		break; /* }}} */
 
+	case 'setdocumentname': /* {{{ */
+		if(1||$user) {
+			$document = $dms->getDocument($_REQUEST['id']);
+			if($document) {
+				if ($document->getAccessMode($user) >= M_READWRITE) {
+					if (!$document->setName($_REQUEST['name'])) {
+						header('Content-Type: application/json');
+						echo json_encode(array('success'=>false, 'message'=>'Error setting name', 'data'=>''));
+					} else {
+						header('Content-Type: application/json');
+						echo json_encode(array('success'=>true, 'message'=>getMLText('splash_document_name_changed'), 'data'=>''));
+						add_log_line();
+					}
+				} else {
+					header('Content-Type: application/json');
+					echo json_encode(array('success'=>false, 'message'=>getMLText('access_denied'), 'data'=>''));
+				}
+			} else {
+				header('Content-Type: application/json');
+				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id'), 'data'=>''));
+			}
+		}
+		break; /* }}} */
+
 	case 'submittranslation': /* {{{ */
 		if($settings->_showMissingTranslations) {
 			if($user && !empty($_POST['phrase'])) {
diff --git a/op/op.Settings.php b/op/op.Settings.php
index b84c86b6a..34387ddf3 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -76,6 +76,7 @@ if ($action == "saveSettings")
 
   // SETTINGS - SITE - EDITION
   $settings->_strictFormCheck = getBoolValue("strictFormCheck");
+  $settings->_inlineEditing = getBoolValue("inlineEditing");
 	if(empty($_POST["noDocumentFormFields"]))
 		$settings->_noDocumentFormFields = array();
 	else
diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css
index 7181d1e07..87b864374 100644
--- a/styles/bootstrap/application.css
+++ b/styles/bootstrap/application.css
@@ -225,6 +225,11 @@ i.in-workflow {color: #11479e;}
 i.workflow-action {color: #91479e;}
 i.selected {border: 1px solid #d4d4d4;padding:3px;border-radius:3px;background-color:#fafafa;background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);}
 
+span.editable:after {
+	font: normal normal normal 14px/1 FontAwesome;
+	content: " \f044";
+}
+
 span.openpopupbox {
 	cursor: pointer;
 }
diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 476dfa141..57da9c124 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -518,6 +518,30 @@ $(document).ready( function() {
 	$('button.history-back').on('click', function(event) { /* {{{ */
 		window.history.back();
 	}); /* }}} */
+
+	$("body").on("blur", "span.editable", function(e) { /* {{{ */
+		console.log($(this).data('document'));
+		console.log('Hallo'+$(this).text());
+		e.preventDefault();
+		$.post( "../op/op.Ajax.php", { command: "setdocumentname", id: $(this).data('document'), name: $(this).text() })
+			.done(function( data ) {
+				noty({
+					text: data.message,
+					type: data.success ? 'success' : 'error',
+					dismissQueue: true,
+					layout: 'topRight',
+					theme: 'defaultTheme',
+					timeout: 1500,
+				});
+		});
+	}); /* }}} */
+
+	$("body").on("keypress", "span.editable", function(e) { /* {{{ */
+		if(e.which == 13) {
+			$(this).blur();
+		}
+		return e.which != 13;
+	}); /* }}} */
 });
 
 function onAddClipboard(ev) { /* {{{ */
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 97eac8898..4cf4b2a4d 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2038,6 +2038,22 @@ $(function() {
 		echo "</div>\n";
 	} /* }}} */
 
+	/**
+	 * Wrap text in inline editing tags
+	 *
+	 * @param string text
+	 */
+	function printInlineEdit($text, $object){ /* {{{ */
+		if(!empty($this->params['settings']->_inlineEditing)) {
+			echo "<span class=\"editable\" contenteditable=\"true\"";
+			if($object->isType('document'))
+				echo " data-document=\"".$object->getId()."\"";
+			echo ">".$text;
+			echo "</span>\n";
+		} else
+			echo $text;
+	} /* }}} */
+
 	/**
 	 * Print button with link for deleting a document
 	 *
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index ea7c37582..c7cf18323 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -299,6 +299,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
       -->
 <?php $this->showConfigHeadline('settings_Edition'); ?>
 <?php $this->showConfigCheckbox('settings_strictFormCheck', 'strictFormCheck'); ?>
+<?php $this->showConfigCheckbox('settings_inlineEditing', 'inlineEditing'); ?>
 <?php $this->showConfigOption('settings_noDocumentFormFields', 'noDocumentFormFields', array('comment', 'keywords', 'categories', 'sequence', 'expires', 'version', 'version_comment', 'notification'), true, true); ?>
 <?php $this->showConfigText('settings_viewOnlineFileTypes', 'viewOnlineFileTypes', 'array'); ?>
 <?php $this->showConfigText('settings_editOnlineFileTypes', 'editOnlineFileTypes', 'array'); ?>
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 2149d122b..f048b1173 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -201,7 +201,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 ?>
 		<tr>
 		<td><?php printMLText("name");?>:</td>
-		<td><?php print htmlspecialchars($document->getName());?></td>
+		<td><?php $this->printInlineEdit(htmlspecialchars($document->getName()), $document);?></td>
 		</tr>
 		<tr>
 		<td><?php printMLText("owner");?>:</td>

From c555354f358f0b95716bda0b87a92c39941811e7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 8 Sep 2020 13:44:19 +0200
Subject: [PATCH 099/312] check if return value of hook addFolderAttribute is a
 string

---
 views/bootstrap/class.AddSubFolder.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/views/bootstrap/class.AddSubFolder.php b/views/bootstrap/class.AddSubFolder.php
index eb097de90..e7542bdf8 100644
--- a/views/bootstrap/class.AddSubFolder.php
+++ b/views/bootstrap/class.AddSubFolder.php
@@ -118,6 +118,8 @@ $(document).ready( function() {
 					if($arr) {
 						$this->formField($arr[0], $arr[1]);
 					}
+				} elseif(is_string($arr)) {
+					echo $arr;
 				} else {
 					$this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, ''));
 				}

From 84a849a28fcf014e75ad82058cdc835fbd491d80 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 8 Sep 2020 13:44:56 +0200
Subject: [PATCH 100/312] check if $_POST["undelUserIds"] is set at all

---
 op/op.Settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.Settings.php b/op/op.Settings.php
index 34387ddf3..007620307 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -152,7 +152,7 @@ if ($action == "saveSettings")
   $settings->_loginFailure = intval($_POST["loginFailure"]);
   $settings->_autoLoginUser = intval($_POST["autoLoginUser"]);
   $settings->_quota = intval($_POST["quota"]);
-  $settings->_undelUserIds = is_array($_POST["undelUserIds"]) ? implode(',', $_POST["undelUserIds"]) : strval($_POST["undelUserIds"]);
+  $settings->_undelUserIds = !empty($_POST["undelUserIds"]) ? (is_array($_POST["undelUserIds"]) ? implode(',', $_POST["undelUserIds"]) : strval($_POST["undelUserIds"])) : '';
   $settings->_encryptionKey = strval($_POST["encryptionKey"]);
   $settings->_cookieLifetime = intval($_POST["cookieLifetime"]);
   $settings->_defaultAccessDocs = intval($_POST["defaultAccessDocs"]);

From 3945ae54b9159920d53f4d57e9e8753849653f78 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Sep 2020 10:40:00 +0200
Subject: [PATCH 101/312] import of users does not issue an error if a group
 column isn't set

---
 CHANGELOG             |  1 +
 op/op.ImportUsers.php | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c2a089277..da048d8fa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 - fix import of users
 - major rework of scripts in utils, unify reading of settings, use PHP_EOL
 - allow inline editing of document name
+- import of users does not issue an error if a group column isn't set
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.19
diff --git a/op/op.ImportUsers.php b/op/op.ImportUsers.php
index 40d8b3453..5cd2ac6e2 100644
--- a/op/op.ImportUsers.php
+++ b/op/op.ImportUsers.php
@@ -70,6 +70,10 @@ function renderFolderData($colname, $objdata) { /* {{{ */
 
 function getGroupData($colname, $coldata, $objdata) { /* {{{ */
 	global $dms;
+	/* explode column name to extract index of group. Actually, the whole column
+	 * name could be used as well, as it is just a unique index in the array
+	 * of groups.
+	 */
 	$kk = explode('_', $colname);
 	if(count($kk) == 2)
 		$gn = $kk[1];
@@ -77,11 +81,15 @@ function getGroupData($colname, $coldata, $objdata) { /* {{{ */
 		$gn = '1';
 	if(!isset($objdata['groups']))
 		$objdata['groups'] = [];
-	if($group = $dms->getGroupByName($coldata)) {
-		$objdata['groups'][$gn] = $group;
-	} else {
-//		$objdata['groups'][$gn] = null;
-		$objdata['__logs__'][] = array('type'=>'error', 'msg'=> "No such group with name '".$coldata."'");
+	/* $coldata can be empty, if an imported users is assigned to less groups
+	 * than group columns exists.
+	 */
+	if($coldata) {
+		if($group = $dms->getGroupByName($coldata)) {
+			$objdata['groups'][$gn] = $group;
+		} else {
+			$objdata['__logs__'][] = array('type'=>'error', 'msg'=> "No such group with name '".$coldata."'");
+		}
 	}
 	return $objdata;
 } /* }}} */

From d5b53ff22d2f999e0089a34c752441e3ba019332 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Sep 2020 13:07:58 +0200
Subject: [PATCH 102/312] add doc to PHONY, new path phpdocumentor

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index bb9b3e979..cedfde6e9 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ EXTENSIONS := \
 	example.tar.gz\
 	tbs_template.tar.gz
 
-PHPDOC=~/Downloads/phpDocumentor-2.8.1/bin/phpdoc
+PHPDOC=~/Downloads/phpDocumentor.phar
 
 dist:
 	mkdir -p tmp/seeddms-$(VERSION)
@@ -69,4 +69,4 @@ doc:
 apidoc:
 	apigen  generate -s SeedDMS_Core --exclude tests -d html
 
-.PHONY: webdav webapp repository
+.PHONY: doc webdav webapp repository

From 124c3c70a39c8a694cac9ac63e44d7bbd395856c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Sep 2020 13:10:01 +0200
Subject: [PATCH 103/312] replace icon with svg

---
 ext/example/conf.php |   2 +-
 ext/example/icon.png | Bin 845 -> 0 bytes
 ext/example/icon.svg | 111 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 112 insertions(+), 1 deletion(-)
 delete mode 100644 ext/example/icon.png
 create mode 100644 ext/example/icon.svg

diff --git a/ext/example/conf.php b/ext/example/conf.php
index 1046fd6b0..33abc377d 100644
--- a/ext/example/conf.php
+++ b/ext/example/conf.php
@@ -51,7 +51,7 @@ $EXT_CONF['example'] = array(
 	'constraints' => array(
 		'depends' => array('php' => '5.6.40-', 'seeddms' => '5.1.0-'),
 	),
-	'icon' => 'icon.png',
+	'icon' => 'icon.svg',
 	'changelog' => 'changelog.md',
 	'class' => array(
 		'file' => 'class.example.php',
diff --git a/ext/example/icon.png b/ext/example/icon.png
deleted file mode 100644
index c89493d0bb5afc7130a860400905113dbcd51b1e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 845
zcmV-T1G4;yP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm0008)0008)0qrxi`Tzg`8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10?J85K~z|U#aCHR6HydC_x4UZ)1iQr(m-2N_C-LAC<IK52E&ty
zi4Vr;zcBIt_(%+IJ`iH!3L<G_31HaDPFiZQcAd4?2gA?-k?C}_=k1=H<vaTf;y7-D
z=Xo2HfijtlN_d{PO-_ZX%K>0$urGnj;kb~@13&;NF+&7ZD5-p;ScR?Ff#cim0ojSh
z@!IZpY$q6+{hs_~PmMa*)gkf@r}|F-P@rgLeT5r)`;}4Dyv7$K6_&ygycCY$+4Vj0
z@b-1Ftv(<cwQH;d2w-Av);annq;r0nBJm`8IX=lolX1pU09&yG$HesVnQVD$T@+)a
z<K;vJ#zPCNN>y}P{!e761fi9%off>C{O<h7&2FjDTQ4WlDceGLn|VF8s6{=$x{vSl
zMC?J2@4`}Cm;s9NXft}Gi)QFbi_+>1hy+N!w&Id}_v*E5SJ11g&0!*CD7zPCASI*-
z20#rS7XScotetlF{ZgR}q5wV30cCkBYCq=1l4)xIRI*j_^G6SoIwnQ*w45Nxx-4-F
zIU{2V08oJ6F`iG!T$+Sdwsp1wb#6oZpyXAYk+Qb2PhYtG!-STBnrfc<+-}8)e$kt-
zkWxaLjK2TOEpJA(K%6WC&xZR2Cu3|Qn$Ccnm+`BQ(>mui8-}O%`^8{wgY-9DO90HQ
zt+I<75uN_y;Tv+NFDMja#}ojCD)__vny!2!1D#4=Q+u{pTc!Z)#bYFPl-8QgS64;v
z_4ek#(BN4B;AbYQ)2nw^QU){UUn#2rNV1|^I#m@;Q_cZQj$w!2C%<@dvS>Jm<NpG1
zvApWy_>(y|QTvhr%x$l;?`BuE^E=Sps0_4p6+Ho_0pvsl?L>ZPebC$FGh+q-EVu=w
zlBo>XFoH_naq=eE(C3$B0B*Im=la{)bH{H=!E_^<yM`1|T0-X+QrUZ;>;O=?f6spb
Xy;T5Lt1itW00000NkvXXu0mjf>yw9e

diff --git a/ext/example/icon.svg b/ext/example/icon.svg
new file mode 100644
index 000000000..38c978cb7
--- /dev/null
+++ b/ext/example/icon.svg
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="46.396889mm"
+   height="46.075855mm"
+   viewBox="0 0 46.396889 46.075855"
+   version="1.1"
+   id="svg2387"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="seeddms-favicon-final.svg"
+   inkscape:export-filename="/tmp/favicon.png"
+   inkscape:export-xdpi="17.640476"
+   inkscape:export-ydpi="17.640476">
+  <defs
+     id="defs2381" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.1251953"
+     inkscape:cx="-19.788292"
+     inkscape:cy="24.95827"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="1"
+     fit-margin-left="1"
+     fit-margin-right="1"
+     fit-margin-bottom="1"
+     inkscape:window-width="1920"
+     inkscape:window-height="1023"
+     inkscape:window-x="0"
+     inkscape:window-y="33"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2384">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-48.520586,-109.36103)">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000e7c;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect1143-3-6-4"
+       width="17.821022"
+       height="17.821022"
+       x="50.185322"
+       y="110.70477"
+       inkscape:tile-cx="-545.75183"
+       inkscape:tile-cy="425.55311"
+       inkscape:tile-w="17.821023"
+       inkscape:tile-h="17.821023"
+       inkscape:tile-x0="-554.66234"
+       inkscape:tile-y0="416.6426"
+       ry="3.1053059" />
+    <rect
+       ry="3.1053059"
+       inkscape:tile-y0="416.6426"
+       inkscape:tile-x0="-554.66234"
+       y="127.37463"
+       x="67.362831"
+       height="17.821022"
+       width="17.821022"
+       id="use2251"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f57800;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       transform="rotate(7)" />
+    <rect
+       ry="3.1053059"
+       inkscape:tile-y0="416.6426"
+       inkscape:tile-x0="-554.66234"
+       y="105.35081"
+       x="82.280334"
+       height="17.821022"
+       width="17.821022"
+       id="use2255"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.9;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f57800;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       transform="rotate(3.5)" />
+    <rect
+       ry="3.1053059"
+       inkscape:tile-y0="416.6426"
+       inkscape:tile-x0="-554.66234"
+       y="117.91738"
+       x="100.07223"
+       height="17.821022"
+       width="17.821022"
+       id="use2257"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.9;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f57800;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       transform="rotate(10.5)" />
+  </g>
+</svg>

From f0d5821bd1ad4ea71af988b46272f53133987559 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 15 Sep 2020 12:13:51 +0200
Subject: [PATCH 104/312] add new function createNonce()

---
 inc/inc.Utils.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 1a7f810d1..750d9226c 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -632,6 +632,22 @@ function seed_pass_verify($password, $hash) { /* {{{ */
 	return $hash == md5($password);
 } /* }}} */
 
+/**
+ * Return nonce for CSP
+ *
+ * @return string
+ */
+function createNonce() { /* {{{ */
+	$length = 16;
+	$usable = true;
+	$bytes = openssl_random_pseudo_bytes($length, $usable);
+	if ($usable === false) {
+			// weak
+			// @TODO do something?
+	}
+	return base64_encode($bytes);
+} /* }}} */
+
 /**
  * Class for creating encrypted api keys
  *

From b9748576dc56b717eef93c4541c0f0caea8b6f17 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 15 Sep 2020 12:14:15 +0200
Subject: [PATCH 105/312] add new method htmlAddJsHeader() which adds script
 with nonces

---
 views/bootstrap/class.Bootstrap.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 4cf4b2a4d..e67cb25cf 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -33,6 +33,7 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 		parent::__construct($params, $theme);
 		$this->extraheader = array('js'=>'', 'css'=>'');
 		$this->footerjs = array();
+		$this->nonces = array();
 	}
 
 	/**
@@ -57,11 +58,16 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 			 * Content-Security-Policy since version 23+
 			 * 'worker-src blob:' is needed for cytoscape
 			 */
-			$csp_rules = "script-src 'self' 'unsafe-eval';";
-			$csp_rules .= "worker-src blob:;";
+			$csp_rules = '';
+			$csp_rules .= "script-src 'self' 'unsafe-eval'";
+			if($this->nonces) {
+				$csp_rules .= " 'nonce-".implode("' 'nonce-", $this->nonces)."'";
+			}
+			$csp_rules .= ";";
+			$csp_rules .= " worker-src blob:;";
 			//$csp_rules .= "style-src 'self';";
 			/* Do not allow to embed myself into frames on foreigns pages */
-			$csp_rules .= "frame-ancestors 'self';";
+			$csp_rules .= " frame-ancestors 'self';";
 			foreach (array("X-WebKit-CSP", "X-Content-Security-Policy", "Content-Security-Policy") as $csp) {
 				header($csp . ": " . $csp_rules);
 			}
@@ -145,6 +151,12 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$this->extraheader[$type] .= $head;
 	} /* }}} */
 
+	function htmlAddJsHeader($script) { /* {{{ */
+		$nonce = createNonce();
+		$this->nonces[] = $nonce;
+		$this->extraheader['js'] .= '<script type="text/javascript" src="'.$script.'" nonce="'.$nonce.'"></script>'."\n";
+	} /* }}} */
+
 	function htmlEndPage($nofooter=false) { /* {{{ */
 		if(!$nofooter) {
 			$hookObjs = $this->getHookObjects('SeedDMS_View_Bootstrap');

From 3efc58417736358389760b794bac6d06cde5cab3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 17 Sep 2020 09:13:29 +0200
Subject: [PATCH 106/312] add some more mimetypes

---
 doc/README.Converters   | 6 ++++--
 op/op.RemoveVersion.php | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/README.Converters b/doc/README.Converters
index 784922b4c..b908854e0 100644
--- a/doc/README.Converters
+++ b/doc/README.Converters
@@ -34,7 +34,7 @@ text/csv
 application/vnd.oasis.opendocument.text
 application/msword
 application/vnd.wordperfect
-application/rtf
+text/rtf
   unoconv -d document -f pdf --stdout -v '%f' > '%o'
 
 image/png
@@ -44,10 +44,12 @@ image/jpeg
 
 application/vnd.ms-powerpoint
 application/vnd.openxmlformats-officedocument.presentationml.presentation
+application/vnd.oasis.opendocument.presentation
   unoconv -d presentation -f pdf --stdout -v '%f' > '%o'
 
 application/vnd.ms-excel
 application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+application/vnd.oasis.opendocument.spreadsheet
   unoconv -d spreadsheet -f pdf --stdout -v '%f' > '%o'
 
 Conversion to png for preview images
@@ -78,7 +80,7 @@ application/vnd.oasis.opendocument.text
 application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
 application/vnd.ms-excel
 application/vnd.openxmlformats-officedocument.wordprocessingml.document
-application/rtf
+text/rtf
 application/vnd.ms-powerpoint
 text/csv
 application/vnd.wordperfect
diff --git a/op/op.RemoveVersion.php b/op/op.RemoveVersion.php
index d3f2eac94..d13a52359 100644
--- a/op/op.RemoveVersion.php
+++ b/op/op.RemoveVersion.php
@@ -194,6 +194,6 @@ else {
 
 add_log_line("?documentid=".$documentid."&version".$version_num);
 
-header("Location:".$nexturl);
+//header("Location:".$nexturl);
 
 ?>

From 3d5aec62ce52e55696884c37c3d47c35979f19e4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 17 Sep 2020 09:23:06 +0200
Subject: [PATCH 107/312] add redirect again, which was removed by accident

---
 op/op.RemoveVersion.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/op/op.RemoveVersion.php b/op/op.RemoveVersion.php
index d13a52359..0dd0e2287 100644
--- a/op/op.RemoveVersion.php
+++ b/op/op.RemoveVersion.php
@@ -194,6 +194,4 @@ else {
 
 add_log_line("?documentid=".$documentid."&version".$version_num);
 
-//header("Location:".$nexturl);
-
-?>
+header("Location:".$nexturl);

From 999f4f76c9a4bf3a9237cf81b3afb40cc0d2357f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 17 Sep 2020 09:26:08 +0200
Subject: [PATCH 108/312] removing a document version will not remove
 attachments of the document anymore

---
 CHANGELOG                               |  1 +
 SeedDMS_Core/Core/inc.ClassDocument.php | 15 ++++++++++-----
 SeedDMS_Core/package.xml                |  2 ++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index da048d8fa..b5c649518 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
 - major rework of scripts in utils, unify reading of settings, use PHP_EOL
 - allow inline editing of document name
 - import of users does not issue an error if a group column isn't set
+- removing a document version will not remove attachments of the document anymore
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.19
diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 8ad2040a2..e5ad94261 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -1994,8 +1994,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 		}
 
-		// remove document files attached to version
-		$res = $this->getDocumentFiles($version->getVersion());
+		// remove only those document files attached to version
+		$res = $this->getDocumentFiles($version->getVersion(), false);
 		if (is_bool($res) && !$res) {
 			$db->rollbackTransaction();
 			return false;
@@ -2217,15 +2217,20 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	/**
 	 * Get list of files attached to document
 	 *
+	 * @param integer $version get only attachments for this version
+		*@param boolean $incnoversion include attachments without a version
 	 * @return array list of files, false in case of an sql error
 	 */
-	function getDocumentFiles($version=0) { /* {{{ */
+	function getDocumentFiles($version=0, $incnoversion=true) { /* {{{ */
 		if (!isset($this->_documentFiles)) {
 			$db = $this->_dms->getDB();
 
 			$queryStr = "SELECT * FROM `tblDocumentFiles` WHERE `document` = " . $this->_id;
 			if($version) {
-				$queryStr .= " AND (`version`=0 OR `version`=".(int) $version.")";
+				if($incnoversion)
+					$queryStr .= " AND (`version`=0 OR `version`=".(int) $version.")";
+				else
+					$queryStr .= " AND (`version`=".(int) $version.")";
 			}
 			$queryStr .= " ORDER BY ";
 			if($version) {
@@ -2347,7 +2352,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			}
 		}
 
-		// remove document file
+		// remove all document files
 		$res = $this->getDocumentFiles();
 		if (is_bool($res) && !$res) {
 			$db->rollbackTransaction();
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index e02f8a5b9..77fca8e06 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -25,6 +25,8 @@
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
 - SeedDMS_Core_DMS::getDocumentList() returns false, if an unknown list passed
+- SeedDMS_Core_Document::getDocumentFiles() has new parameter to select only those files attached to a specific version of the document
+- removing a document version will not remove attachments of the document anymore
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From db1db1787cc3b0b09d8671e58d8695c6a0fba1f2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 17 Sep 2020 10:51:37 +0200
Subject: [PATCH 109/312] major update to make it look like the view document
 page, fixed preview

---
 out/out.DocumentVersionDetail.php             |   2 +
 .../bootstrap/class.DocumentVersionDetail.php | 307 +++++++++++-------
 2 files changed, 199 insertions(+), 110 deletions(-)

diff --git a/out/out.DocumentVersionDetail.php b/out/out.DocumentVersionDetail.php
index e2ef756b5..b0809c996 100644
--- a/out/out.DocumentVersionDetail.php
+++ b/out/out.DocumentVersionDetail.php
@@ -77,6 +77,8 @@ if($view) {
 	$view->setParam('viewonlinefiletypes', $settings->_viewOnlineFileTypes);
 	$view->setParam('enableversionmodification', $settings->_enableVersionModification);
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
+	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
+	$view->setParam('pdfConverters', isset($settings->_converters['pdf']) ? $settings->_converters['pdf'] : array());
 	$view->setParam('showFullPreview', $settings->_showFullPreview);
 	$view->setParam('convertToPdf', $settings->_convertToPdf);
 	$view->setParam('cachedir', $settings->_cacheDir);
diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index 9313f30af..6d96e0299 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -36,50 +36,100 @@ require_once("SeedDMS/Preview.php");
  */
 class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 
+	/**
+	 * Output a single attribute in the document info section
+	 *
+	 * @param object $attribute attribute
+	 */
+	protected function printAttribute($attribute) { /* {{{ */
+		$attrdef = $attribute->getAttributeDefinition();
+?>
+		    <tr>
+					<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
+					<td><?php echo $this->getAttributeValue($attribute); ?></td>
+		    </tr>
+<?php
+	} /* }}} */
+
 	function preview() { /* {{{ */
+		$dms = $this->params['dms'];
 		$document = $this->params['document'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 		$showfullpreview = $this->params['showFullPreview'];
 		$converttopdf = $this->params['convertToPdf'];
+		$pdfconverters = $this->params['pdfConverters'];
 		$cachedir = $this->params['cachedir'];
 		$version = $this->params['version'];
 		if(!$showfullpreview)
 			return;
 
-		switch($version->getMimeType()) {
-		case 'audio/mpeg':
-		case 'audio/mp3':
-		case 'audio/ogg':
-		case 'audio/wav':
-			$this->contentHeading(getMLText("preview"));
-?>
-		<audio controls style="width: 100%;">
-		<source  src="../op/op.Download.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $version->getVersion(); ?>" type="audio/mpeg">
-		</audio>
-<?php
-			break;
-		case 'application/pdf':
-			$this->contentHeading(getMLText("preview"));
-?>
-			<iframe src="../pdfviewer/web/viewer.html?file=<?php echo urlencode('../../op/op.Download.php?documentid='.$document->getID().'&version='.$version->getVersion()); ?>" width="100%" height="700px"></iframe>
-<?php
-			break;
-		case 'image/svg+xml':
-			$this->contentHeading(getMLText("preview"));
-?>
-			<img src="../op/op.Download.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $version->getVersion(); ?>" width="100%">
-<?php
-			break;
-		default:
-			break;
+		$txt = $this->callHook('preDocumentPreview', $version);
+		if(is_string($txt))
+			echo $txt;
+		$txt = $this->callHook('documentPreview', $version);
+		if(is_string($txt))
+			echo $txt;
+		else {
+			switch($version->getMimeType()) {
+			case 'audio/mpeg':
+			case 'audio/mp3':
+			case 'audio/ogg':
+			case 'audio/wav':
+				$this->contentHeading(getMLText("preview"));
+	?>
+			<audio controls style="width: 100%;">
+			<source  src="../op/op.ViewOnline.php?documentid=<?php echo $version->getDocument()->getID(); ?>&version=<?php echo $version->getVersion(); ?>" type="audio/mpeg">
+			</audio>
+	<?php
+				break;
+			case 'video/webm':
+			case 'video/mp4':
+			case 'video/avi':
+			case 'video/msvideo':
+			case 'video/x-msvideo':
+			case 'video/x-matroska':
+				$this->contentHeading(getMLText("preview"));
+	?>
+			<video controls style="width: 100%;">
+			<source  src="../op/op.ViewOnline.php?documentid=<?php echo $version->getDocument()->getID(); ?>&version=<?php echo $version->getVersion(); ?>" type="video/mp4">
+			</video>
+	<?php
+				break;
+			case 'application/pdf':
+				$this->contentHeading(getMLText("preview"));
+	?>
+				<iframe src="../pdfviewer/web/viewer.html?file=<?php echo urlencode('../../op/op.ViewOnline.php?documentid='.$version->getDocument()->getID().'&version='.$version->getVersion()); ?>" width="100%" height="700px"></iframe>
+	<?php
+				break;
+			case 'image/svg+xml':
+			case 'image/jpg':
+			case 'image/jpeg':
+			case 'image/png':
+			case 'image/gif':
+				$this->contentHeading(getMLText("preview"));
+	?>
+				<img src="../op/op.ViewOnline.php?documentid=<?php echo $version->getDocument()->getID(); ?>&version=<?php echo $version->getVersion(); ?>" width="100%">
+	<?php
+				break;
+			default:
+				$txt = $this->callHook('additionalDocumentPreview', $version);
+				if(is_string($txt))
+					echo $txt;
+				break;
+			}
 		}
+		$txt = $this->callHook('postDocumentPreview', $version);
+		if(is_string($txt))
+			echo $txt;
+
 		if($converttopdf) {
 			$pdfpreviewer = new SeedDMS_Preview_PdfPreviewer($cachedir, $timeout, $xsendfile);
+			$pdfpreviewer->setConverters($pdfconverters);
 			if($pdfpreviewer->hasConverter($version->getMimeType())) {
-				$this->contentHeading(getMLText("preview"));
+				$this->contentHeading(getMLText("preview_pdf"));
 ?>
-				<iframe src="../pdfviewer/web/viewer.html?file=<?php echo urlencode('../../op/op.PdfPreview.php?documentid='.$document->getID().'&version='.$version->getVersion()); ?>" width="100%" height="700px"></iframe>
+				<iframe src="../pdfviewer/web/viewer.html?file=<?php echo urlencode('../../op/op.PdfPreview.php?documentid='.$version->getDocument()->getID().'&version='.$version->getVersion()); ?>" width="100%" height="700px"></iframe>
 <?php
 			}
 		}
@@ -90,6 +140,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
 		$document = $this->params['document'];
+		$accessop = $this->params['accessobject'];
 		$version = $this->params['version'];
 		$viewonlinefiletypes = $this->params['viewonlinefiletypes'];
 		$enableversionmodification = $this->params['enableversionmodification'];
@@ -174,13 +225,17 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		$attributes = $document->getAttributes();
 		if($attributes) {
 			foreach($attributes as $attribute) {
-				$attrdef = $attribute->getAttributeDefinition();
-?>
-		    <tr>
-					<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-					<td><?php echo htmlspecialchars(implode(', ', $attribute->getValueAsArray())); ?></td>
-		    </tr>
-<?php
+				$arr = $this->callHook('showDocumentAttribute', $document, $attribute);
+				if(is_array($arr)) {
+					echo "<tr>";
+					echo "<td>".$arr[0].":</td>";
+					echo "<td>".$arr[1]."</td>";
+					echo "</tr>";
+				} elseif(is_string($arr)) {
+					echo $arr;
+				} else {
+					$this->printAttribute($attribute);
+				}
 			}
 		}
 ?>
@@ -200,11 +255,10 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerStart();
 		print "<table class=\"table table-condensed\">";
 		print "<thead>\n<tr>\n";
-		print "<th width='10%'></th>\n";
-		print "<th width='30%'>".getMLText("file")."</th>\n";
-		print "<th width='25%'>".getMLText("comment")."</th>\n";
-		print "<th width='15%'>".getMLText("status")."</th>\n";
-		print "<th width='20%'></th>\n";
+		print "<th colspan=\"2\">".htmlspecialchars($version->getOriginalFileName())."</th>\n";
+//		print "<th width='25%'>".getMLText("comment")."</th>\n";
+		print "<th width='20%'>".getMLText("status")."</th>\n";
+		print "<th width='25%'></th>\n";
 		print "</tr>\n</thead>\n<tbody>\n";
 		print "<tr>\n";
 		print "<td><ul class=\"unstyled\">";
@@ -218,68 +272,94 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		print "</td>\n";
 
 		print "<td><ul class=\"unstyled\">\n";
-		print "<li>".$version->getOriginalFileName()."</li>\n";
 		print "<li>".getMLText('version').": ".$version->getVersion()."</li>\n";
 
-		if ($file_exists) print "<li>". formatted_size(filesize($dms->contentDir . $version->getPath())) ." ".htmlspecialchars($version->getMimeType())."</li>";
+		if ($file_exists)
+			print "<li>". SeedDMS_Core_File::format_filesize($version->getFileSize()) .", ".htmlspecialchars($version->getMimeType())."</li>";
 		else print "<li><span class=\"warning\">".getMLText("document_deleted")."</span></li>";
 
 		$updatingUser = $version->getUser();
 		print "<li>".getMLText("uploaded_by")." <a href=\"mailto:".$updatingUser->getEmail()."\">".htmlspecialchars($updatingUser->getFullName())."</a></li>";
 		print "<li>".getLongReadableDate($version->getDate())."</li>";
+
+		print "</ul>\n";
+		$txt = $this->callHook('showVersionComment', $version);
+		if($txt) {
+			echo $txt;
+		} else {
+			if($version->getComment())
+				print "<p style=\"font-style: italic;\">".htmlspecialchars($version->getComment())."</p>";
+		}
+		print "<ul class=\"actions unstyled\">\n";
+		$attributes = $version->getAttributes();
+		if($attributes) {
+			foreach($attributes as $attribute) {
+				$arr = $this->callHook('showDocumentContentAttribute', $version, $attribute);
+				if(is_array($arr)) {
+					print "<li>".$arr[0].": ".$arr[1]."</li>\n";
+				} else {
+					$attrdef = $attribute->getAttributeDefinition();
+					print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $attribute->getValueAsArray()))."</li>\n";
+				}
+			}
+		}
 		print "</ul></td>\n";
 
-		print "<td>".htmlspecialchars($version->getComment())."</td>";
-		print "<td>".getOverallStatusText($status["status"])."</td>";
+		print "<td width='10%'>";
+		print getOverallStatusText($status["status"]);
+		if ( $status["status"]==S_DRAFT_REV || $status["status"]==S_DRAFT_APP || $status["status"]==S_IN_WORKFLOW || $status["status"]==S_EXPIRED ){
+			print "<br><span".($document->hasExpired()?" class=\"warning\" ":"").">".(!$document->getExpires() ? getMLText("does_not_expire") : getMLText("expires").": ".getReadableDate($document->getExpires()))."</span>";
+		}
+		print "</td>";
+
 		print "<td>";
 
 		//if (($document->getAccessMode($user) >= M_READWRITE)) {
-		print "<ul class=\"actions unstyled\">";
 		if ($file_exists){
+			print "<ul class=\"actions unstyled\">";
 			print "<li><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$version->getVersion()."\" title=\"".htmlspecialchars($version->getMimeType())."\"><i class=\"fa fa-download\"></i> ".getMLText("download")."</a>";
 			if ($viewonlinefiletypes && (in_array(strtolower($version->getFileType()), $viewonlinefiletypes) || in_array(strtolower($version->getMimeType()), $viewonlinefiletypes)))
 				print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"fa fa-star\"></i> " . getMLText("view_online") . "</a>";
 			print "</ul>";
-			print "<ul class=\"actions unstyled\">";
 		}
 
-		if (($enableversionmodification && ($document->getAccessMode($user) >= M_READWRITE)) || $user->isAdmin()) {
-			print "<li><a href=\"out.RemoveVersion.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"fa fa-remove\"></i> ".getMLText("rm_version")."</a></li>";
-		}
-		if (($enableversionmodification && ($document->getAccessMode($user) == M_ALL)) || $user->isAdmin()) {
-			if ( $status["status"]==S_RELEASED || $status["status"]==S_OBSOLETE ){
-				print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$document->getID()."&version=".$version->getVersion()."'><i class=\"fa fa-align-justify\"></i>".getMLText("change_status")."</a></li>";
+		print "<ul class=\"actions unstyled\">";
+		if ($file_exists){
+			if($accessop->mayEditVersion()) {
+				print "<li><a href=\"../out/out.EditOnline.php?documentid=".$document->getId()."&version=".$version->getVersion()."\"><i class=\"fa fa-edit\"></i>".getMLText("edit_version")."</a></li>";
 			}
 		}
-		if (($enableversionmodification && ($document->getAccessMode($user) >= M_READWRITE)) || $user->isAdmin()) {
-			if($status["status"] != S_OBSOLETE)
-				print "<li><a href=\"out.EditComment.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"fa fa-comment\"></i> ".getMLText("edit_comment")."</a></li>";
-			if ( $status["status"] == S_DRAFT_REV){
-				print "<li><a href=\"out.EditAttributes.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"fa fa-edit\"></i> ".getMLText("edit_attributes")."</a></li>";
+		if($accessop->mayRemoveVersion()) {
+			print "<li><a href=\"out.RemoveVersion.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"fa fa-remove\"></i> ".getMLText("rm_version")."</a></li>";
 		}
-			print "</ul>";
+		if($accessop->mayOverwriteStatus()) {
+			print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$document->getID()."&version=".$version->getVersion()."'><i class=\"fa fa-align-justify\"></i>".getMLText("change_status")."</a></li>";
 		}
-		else {
-			print "&nbsp;";
+		if($accessop->mayEditComment()) {
+			print "<li><a href=\"out.EditComment.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"fa fa-comment\"></i> ".getMLText("edit_comment")."</a></li>";
 		}
+		if($accessop->mayEditAttributes()) {
+			print "<li><a href=\"out.EditAttributes.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"fa fa-edit\"></i> ".getMLText("edit_attributes")."</a></li>";
+		}
+		print "</ul>";
 
 		echo "</td>";
 		print "</tr></tbody>\n</table>\n";
 
+		$this->contentContainerEnd();
 
-		print "<table class=\"table-condensed\">\n";
+		print "<div class=\"row-fluid\">";
+		print "<div class=\"span6\">";
 
-		if (is_array($reviewStatus) && count($reviewStatus)>0) {
+		if (is_array($reviewStatus) && count($reviewStatus)>0) { /* {{{ */
 
-			print "<tr><td colspan=4>\n";
-			$this->contentSubHeading(getMLText("reviewers"));
-			print "</td></tr>\n";
-			
+			print "<legend>".getMLText('reviewers')."</legend>";
+			print "<table class=\"table table-condensed\">\n";
 			print "<tr>\n";
-			print "<td width='20%'><b>".getMLText("name")."</b></td>\n";
-			print "<td width='20%'><b>".getMLText("last_update")."</b></td>\n";
-			print "<td width='25%'><b>".getMLText("comment")."</b></td>";
-			print "<td width='35%'><b>".getMLText("status")."</b></td>\n";
+			print "<td><b>".getMLText("name")."</b></td>\n";
+			print "<td><b>".getMLText("last_update")."</b></td>\n";
+//			print "<td width='25%'><b>".getMLText("comment")."</b></td>";
+			print "<td><b>".getMLText("status")."</b></td>\n";
 			print "</tr>\n";
 
 			foreach ($reviewStatus as $r) {
@@ -291,7 +371,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
 						}
 						else {
-							$reqName = htmlspecialchars($required->getFullName());
+							$reqName = "<i class=\"fa fa-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
 						}
 						break;
 					case 1: // Reviewer is a group.
@@ -300,32 +380,40 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_group")." '".$r["required"]."'";
 						}
 						else {
-							$reqName = htmlspecialchars($required->getName());
+							$reqName = "<i class=\"fa fa-group\"></i> ".htmlspecialchars($required->getName());
 						}
 						break;
 				}
-				print "<tr>\n";
+				print "<tr".($r['status'] == 1 ? ' class="success"' : ($r['status'] == -1 ? ' class="error"' : '')).">\n";
 				print "<td>".$reqName."</td>\n";
-				print "<td><ul class=\"unstyled\"><li>".$r["date"]."</li>";
+				print "<td><i style=\"font-size: 80%;\">".$r["date"]." - ";
+				/* $updateUser is the user who has done the review */
 				$updateUser = $dms->getUser($r["userID"]);
-				print "<li>".(is_object($updateUser) ? $updateUser->getFullName() : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
-				print "<td>".$r["comment"]."</td>\n";
+				print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</i><br />";
+				print htmlspecialchars($r["comment"]);
+				if($r['file']) {
+					echo "<br />";
+					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$r['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
+				}
+				print "</td>\n";
 				print "<td>".getReviewStatusText($r["status"])."</td>\n";
 				print "</tr>\n";
 			}
-		}
+			print "</table>\n";
+		} /* }}} */
 
-		if (is_array($approvalStatus) && count($approvalStatus)>0) {
+		print "</div>\n";
+		print "<div class=\"span6\">";
 
-			print "<tr><td colspan=4>\n";
-			$this->contentSubHeading(getMLText("approvers"));
-			print "</td></tr>\n";
-				
+		if (is_array($approvalStatus) && count($approvalStatus)>0) { /* {{{ */
+
+			print "<legend>".getMLText('approvers')."</legend>";
+			print "<table class=\"table table-condensed\">\n";
 			print "<tr>\n";
-			print "<td width='20%'><b>".getMLText("name")."</b></td>\n";
-			print "<td width='20%'><b>".getMLText("last_update")."</b></td>\n";
-			print "<td width='25%'><b>".getMLText("comment")."</b></td>";
-			print "<td width='35%'><b>".getMLText("status")."</b></td>\n";
+			print "<td><b>".getMLText("name")."</b></td>\n";
+			print "<td><b>".getMLText("last_update")."</b></td>\n";
+//			print "<td width='25%'><b>".getMLText("comment")."</b></td>";
+			print "<td><b>".getMLText("status")."</b></td>\n";
 			print "</tr>\n";
 
 			foreach ($approvalStatus as $a) {
@@ -337,7 +425,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
 						}
 						else {
-							$reqName = htmlspecialchars($required->getFullName());
+							$reqName = "<i class=\"fa fa-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
 						}
 						break;
 					case 1: // Approver is a group.
@@ -346,38 +434,39 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_group")." '".$r["required"]."'";
 						}
 						else {
-							$reqName = htmlspecialchars($required->getName());
+							$reqName = "<i class=\"fa fa-group\"></i> ".htmlspecialchars($required->getName());
 						}
 						break;
 				}
-				print "<tr>\n";
+				print "<tr".($a['status'] == 1 ? ' class="success"' : ($a['status'] == -1 ? ' class="error"' : ($a['status'] == -2 ? ' class=""' : ''))).">\n";
 				print "<td>".$reqName."</td>\n";
-				print "<td><ul class=\"documentDetail\"><li>".$a["date"]."</li>";
+				print "<td><i style=\"font-size: 80%;\">".$a["date"]." - ";
+				/* $updateUser is the user who has done the approval */
 				$updateUser = $dms->getUser($a["userID"]);
-				print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()) : "unknown user id '".$a["userID"]."'")."</li></ul></td>";
-				print "<td>".$a["comment"]."</td>\n";
+				print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$a["userID"]."'")."</i><br />";	
+				print htmlspecialchars($a["comment"]);
+				if($a['file']) {
+					echo "<br />";
+					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
+				}
+				echo "</td>\n";
 				print "<td>".getApprovalStatusText($a["status"])."</td>\n";
 				print "</tr>\n";
 			}
-		}
+			print "</table>\n";
+		} /* }}} */
 
-		print "</table>\n";
+		print "</div>\n";
+		print "</div>\n";
 
-		$this->contentContainerEnd();
-
-		$tmpfiles = $document->getDocumentFiles($version->getVersion());
-		/* Do the regular filtering by isPublic and access rights */
-		$tmpfiles = SeedDMS_Core_DMS::filterDocumentFiles($user, $tmpfiles);
-		/* Also filter only those files belonging to this version and skip files
-		 * belonging to the document (version = 0)
+		/* Get attachments exclusively for this version, without those
+		 * attached to the document
 		 */
-		$files = array();
-		foreach($tmpfiles as $file) {
-			if($file->getVersion() == $version->getVersion())
-				$files[] = $file;
-		}
+		$files = $document->getDocumentFiles($version->getVersion(), false);
+		/* Do the regular filtering by isPublic and access rights */
+		$files = SeedDMS_Core_DMS::filterDocumentFiles($user, $files);
 
-		if (count($files) > 0) {
+		if (count($files) > 0) { /* {{{ */
 			$this->contentHeading(getMLText("linked_files"));
 			$this->contentContainerStart();
 
@@ -392,8 +481,6 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 			print "</tr>\n</thead>\n<tbody>\n";
 
 			foreach($files as $file) {
-				if($file->getVersion() != $version->getVersion())
-					continue;
 
 				$file_exists=file_exists($dms->contentDir . $file->getPath());
 
@@ -452,7 +539,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 			print "</tbody>\n</table>\n";	
 
 			$this->contentContainerEnd();
-		}
+		} /* }}} */
 
 		if($user->isAdmin()) {
 			$this->contentHeading(getMLText("status"));

From b39f84e67c965bd179c26fe1495b79bd840f8845 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 17 Sep 2020 10:52:27 +0200
Subject: [PATCH 110/312] fix html tags for version actions

---
 views/bootstrap/class.ViewDocument.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index f048b1173..ace2be200 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -628,8 +628,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		}
 		print "</ul></td>\n";
 
-//		print "<td>".htmlspecialchars($latestContent->getComment())."</td>";
-
 		print "<td width='10%'>";
 		print getOverallStatusText($status["status"]);
 		if ( $status["status"]==S_DRAFT_REV || $status["status"]==S_DRAFT_APP || $status["status"]==S_IN_WORKFLOW || $status["status"]==S_EXPIRED ){
@@ -639,13 +637,14 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 		print "<td>";
 
-		print "<ul class=\"unstyled actions\">";
 		if ($file_exists){
+			print "<ul class=\"unstyled actions\">";
 			print "<li><a href=\"../op/op.Download.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"fa fa-download\"></i>".getMLText("download")."</a></li>";
 			if ($viewonlinefiletypes && (in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes) || in_array(strtolower($latestContent->getMimeType()), $viewonlinefiletypes)))
 				print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$latestContent->getDocument()->getId()."&version=". $latestContent->getVersion()."\"><i class=\"fa fa-star\"></i>" . getMLText("view_online") . "</a></li>";
+			print "</ul>";
 		}
-		print "</ul>";
+
 		print "<ul class=\"unstyled actions\">";
 		if ($file_exists){
 			if($accessop->mayEditVersion()) {

From 6d7c86ffe97bc70063f50487aac3341cdacc399d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 17 Sep 2020 10:52:44 +0200
Subject: [PATCH 111/312] add entry for 5.1.20

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index b5c649518..39f6c5a41 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
 - allow inline editing of document name
 - import of users does not issue an error if a group column isn't set
 - removing a document version will not remove attachments of the document anymore
+- make document details page like like view document page
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.19

From 245a103b35ec6b3f29f69608871745be9dfd4eb9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 17 Sep 2020 13:01:14 +0200
Subject: [PATCH 112/312] fix selection of documents/folders

---
 CHANGELOG                           |  1 +
 styles/bootstrap/application.js     |  4 ++--
 views/bootstrap/class.Bootstrap.php | 10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 39f6c5a41..dab7be4af 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@
 - import of users does not issue an error if a group column isn't set
 - removing a document version will not remove attachments of the document anymore
 - make document details page like like view document page
+- fix selection of documents/folders
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.19
diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 57da9c124..ebb26c879 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -36,13 +36,13 @@ function escapeHtml(text) {
 }
 
 function treeFolderSelected(formid, nodeid, nodename) {
-	$('#targetid'+formid).val(nodeid);
+	$('#'+formid).val(nodeid);
 	$('#choosefoldersearch'+formid).val(nodename);
 	$('#folderChooser'+formid).modal('hide');
 }
 
 function treeDocumentSelected(formid, nodeid, nodename) {
-	$('#docid'+formid).val(nodeid);
+	$('#'+formid).val(nodeid);
 	$('#choosedocsearch'+formid).val(nodename);
 	$('#docChooser'+formid).modal('hide');
 }
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index e67cb25cf..3a51b5315 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1204,7 +1204,7 @@ $(document).ready(function() {
 		$formid = md5($formname.$form);
 
 		$content = '';
-		$content .= "<input type=\"hidden\" id=\"docid".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
+		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
 		$content .= "<div class=\"input-append\">\n";
 		$content .= "<input type=\"text\" id=\"choosedocsearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"docname".$formid."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" value=\"" . (($default) ? htmlspecialchars($default->getName()) : "") ."\"/>";
 		$content .= "<button type=\"button\" class=\"btn\" id=\"cleardocument".$form."\" data-target=\"".$formid."\"><i class=\"fa fa-remove\"></i></button>";
@@ -1244,7 +1244,7 @@ $(document).ready(function() {
 		$formid = md5($formname.$form);
 ?>
 function documentSelected<?php echo $formid ?>(id, name) {
-	$('#docid<?php echo $formid ?>').val(id);
+	$('#<?php echo $formid ?>').val(id);
 	$('#choosedocsearch<?php echo $formid ?>').val(name);
 	$('#docChooser<?php echo $formid ?>').modal('hide');
 }
@@ -1269,7 +1269,7 @@ function folderSelected<?php echo $formid ?>(id, name) {
 			$formname = "targetid";
 		$formid = md5($formname.$form);
 		$content = '';
-		$content .= "<input type=\"hidden\" id=\"targetid".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
+		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
 		$content .= "<div class=\"input-append\">\n";
 		$content .= "<input type=\"text\" id=\"choosefoldersearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"targetname".$formid."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" target=\"".$formid."\"/>";
 		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfolder".$formid."\" data-target=\"".$formid."\"><i class=\"fa fa-remove\"></i></button>";
@@ -1311,7 +1311,7 @@ function folderSelected<?php echo $formid ?>(id, name) {
 		$formid = md5($formname.$form);
 ?>
 function folderSelected<?php echo $formid ?>(id, name) {
-	$('#targetid<?php echo $formid ?>').val(id);
+	$('#<?php echo $formid ?>').val(id);
 	$('#choosefoldersearch<?php echo $formid ?>').val(name);
 	$('#folderChooser<?php echo $formid ?>').modal('hide');
 }
@@ -1319,7 +1319,7 @@ function folderSelected<?php echo $formid ?>(id, name) {
 $(document).ready(function() {
 	$('#clearfolder<?php print $formid ?>').click(function(ev) {
 		$('#choosefoldersearch<?php echo $formid ?>').val('');
-		$('#targetid<?php echo $formid ?>').val('');
+		$('#<?php echo $formid ?>').val('');
 	});
 });
 */

From aead80ee5cc7e9181cd30a978452ab2bae395b33 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 17 Sep 2020 15:45:47 +0200
Subject: [PATCH 113/312] update trigger can handle arrays passed as parameter

---
 styles/bootstrap/application.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index ebb26c879..f9b2cf93c 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -446,12 +446,18 @@ $(document).ready( function() {
 			for(var key in param1) {
 				if(key == 'callback')
 					callback = param1[key];
-				else
-					url += "&"+key+"="+param1[key];
+				else {
+					if($.isArray(param1[key])) {
+						if(param1[key].length > 0)
+							url += "&"+key+"[]="+param1[key].join("&"+key+"[]=");
+					} else
+						url += "&"+key+"="+param1[key];
+				}
 			}
 		} else {
 			url += "&"+param1;
 		}
+		console.log(url);
 		if(!element.data('no-spinner'))
 			element.prepend('<div style="position: absolute; overflow: hidden; background: #f7f7f7; z-index: 1000; height: '+element.height()+'px; width: '+element.width()+'px; opacity: 0.7; display: table;"><div style="display: table-cell;text-align: center; vertical-align: middle; "><img src="../views/bootstrap/images/ajax-loader.gif"></div>');
 		$.get(url, function(data) {

From 8d0b5019789cae7033b857c6003e157fc781ef49 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 17 Sep 2020 19:57:54 +0200
Subject: [PATCH 114/312] add application/csv

---
 doc/README.Converters | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/README.Converters b/doc/README.Converters
index b908854e0..8993c6fc8 100644
--- a/doc/README.Converters
+++ b/doc/README.Converters
@@ -3,6 +3,7 @@ Conversion to text for fulltext search
 
 text/plain
 text/csv
+application/csv
   cat '%s'
 
 application/pdf
@@ -31,6 +32,7 @@ Conversion to pdf for pdf preview
 
 text/plain
 text/csv
+application/csv
 application/vnd.oasis.opendocument.text
 application/msword
 application/vnd.wordperfect
@@ -83,6 +85,7 @@ application/vnd.openxmlformats-officedocument.wordprocessingml.document
 text/rtf
 application/vnd.ms-powerpoint
 text/csv
+application/csv
 application/vnd.wordperfect
   unoconv -d document -e PageRange=1 -f pdf --stdout -v '%f' | gs -dBATCH -dNOPAUSE -sDEVICE=pngalpha -dPDFFitPage -r72x72 -sOutputFile=- -dFirstPage=1 -dLastPage=1 -q - | convert -resize %wx png:- '%o'
 

From 0649815e560df06a912921da7e9df150fbdfabc2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 18 Sep 2020 19:11:25 +0200
Subject: [PATCH 115/312] new hooks on view document page

---
 CHANGELOG                              |  1 +
 views/bootstrap/class.ViewDocument.php | 27 ++++++++++++++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index dab7be4af..92b048cae 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@
 - removing a document version will not remove attachments of the document anymore
 - make document details page like like view document page
 - fix selection of documents/folders
+- new hooks SeedDMS_View_Document::[startRightColumn|extraVersionsViews]
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.19
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index ace2be200..8ebbdaa45 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -515,6 +515,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 ?>
 </div>
 <div class="span8">
+<?php
+		$txt = $this->callHook('startRightColumn', $document);
+		if(is_string($txt))
+			echo $txt;
+?>
     <ul class="nav nav-tabs" id="docinfotab">
 		  <li class="<?php if(!$currenttab || $currenttab == 'docinfo') echo 'active'; ?>"><a data-target="#docinfo" data-toggle="tab"><?php printMLText('current_version'); ?></a></li>
 			<?php if (count($versions)>1) { ?>
@@ -642,6 +647,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "<li><a href=\"../op/op.Download.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"fa fa-download\"></i>".getMLText("download")."</a></li>";
 			if ($viewonlinefiletypes && (in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes) || in_array(strtolower($latestContent->getMimeType()), $viewonlinefiletypes)))
 				print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$latestContent->getDocument()->getId()."&version=". $latestContent->getVersion()."\"><i class=\"fa fa-star\"></i>" . getMLText("view_online") . "</a></li>";
+			$items = $this->callHook('extraVersionViews', $latestContent);
+			if($items) {
+				foreach($items as $item) {
+					if(is_string($item))
+						echo "<li>".$item."</li>";
+					elseif(is_array($item))
+						echo "<li><a href=\"".$item['link']."\">".(!empty($item['icon']) ? "<i class=\"fa fa-".$item['icon']."\"></i>" : "").getMLText($item['label'])."</a></li>";
+				}
+			}
 			print "</ul>";
 		}
 
@@ -1244,14 +1258,23 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 //				print "<td>".htmlspecialchars($version->getComment())."</td>";
 				print "<td>".getOverallStatusText($vstat["status"])."</td>";
 				print "<td>";
-				print "<ul class=\"actions unstyled\">";
 				if ($file_exists){
+					print "<ul class=\"actions unstyled\">";
 					print "<li><a href=\"../op/op.Download.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"fa fa-download\"></i>".getMLText("download")."</a>";
 					if ($viewonlinefiletypes && (in_array(strtolower($version->getFileType()), $viewonlinefiletypes) || in_array(strtolower($version->getMimeType()), $viewonlinefiletypes)))
 						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"fa fa-star\"></i>" . getMLText("view_online") . "</a>";
+					$items = $this->callHook('extraVersionViews', $version);
+					if($items) {
+						foreach($items as $item) {
+							if(is_string($item))
+								echo "<li>".$item."</li>";
+							elseif(is_array($item))
+								echo "<li><a href=\"".$item['link']."\">".(!empty($item['icon']) ? "<i class=\"fa fa-".$item['icon']."\"></i>" : "").getMLText($item['label'])."</a></li>";
+						}
+					}
 					print "</ul>";
-					print "<ul class=\"actions unstyled\">";
 				}
+				print "<ul class=\"actions unstyled\">";
 				/* Only admin has the right to remove version in any case or a regular
 				 * user if enableVersionDeletion is on
 				 */

From 0a4fcb4c0051fe6d6f5a4656ec6ffe725930eaa7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 18 Sep 2020 19:24:18 +0200
Subject: [PATCH 116/312] add new hooks prePreviousVersionsTab and
 preLatestVersionTab

---
 CHANGELOG                              | 2 +-
 views/bootstrap/class.ViewDocument.php | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 92b048cae..3a75dc5bb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,7 +8,7 @@
 - removing a document version will not remove attachments of the document anymore
 - make document details page like like view document page
 - fix selection of documents/folders
-- new hooks SeedDMS_View_Document::[startRightColumn|extraVersionsViews]
+- new hooks SeedDMS_View_Document::[startRightColumn|extraVersionsViews|prePreviousVersionsTab|preLatestVersionTab]
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.19
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 8ebbdaa45..516501d67 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -564,6 +564,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			exit;
 		}
 
+		$txt = $this->callHook('preLatestVersionTab', $latestContent);
+		if(is_string($txt))
+			echo $txt;
+
 		// verify if file exists
 		$file_exists=file_exists($dms->contentDir . $latestContent->getPath());
 
@@ -1188,6 +1192,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 ?>
 		  <div class="tab-pane <?php if($currenttab == 'previous') echo 'active'; ?>" id="previous">
 <?php
+			$txt = $this->callHook('prePreviousVersionsTab', $versions);
+			if(is_string($txt))
+				echo $txt;
+
 			$this->contentContainerStart();
 
 			print "<table class=\"table\">";

From 1de3bf1d41e6cd7a7b80e2bd98fbff60e13e1fd4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Sep 2020 11:03:19 +0200
Subject: [PATCH 117/312] init $menuitems for menu earlier

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 3dcd4c5d0..c953e93f5 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -830,8 +830,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "<div class=\"nav-collapse col2\">\n";
 		echo "   <ul class=\"nav\">\n";
 
-		if($accessobject->check_view_access(array('UsrMgr', 'RoleMgr', 'GroupMgr', 'UserList', 'Acl'))) {
 		$menuitems = array();
+		if($accessobject->check_view_access(array('UsrMgr', 'RoleMgr', 'GroupMgr', 'UserList', 'Acl'))) {
 		$menuitems['user_group_management'] = array('link'=>"#", 'label'=>'user_group_management');
 		if ($accessobject->check_view_access('UsrMgr'))
 		$menuitems['user_group_management']['children']['user_management'] = array('link'=>"../out/out.UsrMgr.php", 'label'=>'user_management');

From 62cf4f3fbad9eee3515bfcd1e1c7a563fe1a3dd8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Sep 2020 18:00:34 +0200
Subject: [PATCH 118/312] add missing access check for FolderNotify

---
 views/bootstrap/class.Bootstrap.php | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index c953e93f5..98b6f9cc1 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -654,6 +654,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			if ($accessMode == M_ALL) {
 				$menuitems['edit_folder_access'] = array('link'=>"../out/out.FolderAccess.php?folderid=".$folderID."&showtree=".showtree(), 'label'=>'edit_folder_access');
 			}
+			if ($accessobject->check_view_access('FolderNotify'))
 			$menuitems['edit_existing_notify'] = array('link'=>"../out/out.FolderNotify.php?folderid=". $folderID ."&showtree=". showtree(), 'label'=>'edit_existing_notify');
 		}
 		if ($accessobject->check_view_access('Indexer') && $this->params['enablefullsearch']) {
@@ -682,7 +683,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 		if ($accessMode >= M_READWRITE) {
 			if (!$document->isLocked()) {
-				$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>'update_document');
+				if($accessobject->check_controller_access('UpdateDocument'))
+					$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>'update_document');
 				if($accessobject->check_controller_access('LockDocument'))
 					$menuitems['lock_document'] = array('link'=>"../op/op.LockDocument".$docid, 'label'=>'lock_document');
 				if($document->isCheckedOut())
@@ -692,13 +694,15 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 						$menuitems['checkout_document'] = array('link'=>"../op/op.CheckOutDocument".$docid, 'label'=>'checkout_document');
 					}
 				}
-				$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid , 'label'=>'edit_document_props');
+				if($accessobject->check_controller_access('EditDocument'))
+					$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid , 'label'=>'edit_document_props');
 				$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>'move_document');
 			}
 			else {
 				$lockingUser = $document->getLockingUser();
 				if (($lockingUser->getID() == $this->params['user']->getID()) || ($document->getAccessMode($this->params['user']) == M_ALL)) {
-					$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>'update_document');
+					if($accessobject->check_controller_access('UpdateDocument'))
+						$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>'update_document');
 					if($accessobject->check_controller_access('UnlockDocument'))
 						$menuitems['unlock_document'] = array('link'=>"../op/op.UnlockDocument".$docid, 'label'=>'unlock_document');
 					if($document->isCheckedOut()) {
@@ -708,7 +712,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 							$menuitems['checkout_document'] = array('link'=>"../op/op.CheckOutDocument".$docid, 'label'=>'checkout_document');
 						}
 					}
-					$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid, 'label'=>'edit_document_props');
+					if($accessobject->check_controller_access('EditDocument'))
+						$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid, 'label'=>'edit_document_props');
 					$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>'move_document');
 				}
 			}
@@ -2275,9 +2280,11 @@ $(function() {
 	 * @return string html content if $return is true, otherwise an empty string
 	 */
 	function printDeleteDocumentButton($document, $msg, $return=false){ /* {{{ */
+		$accessobject = $this->params['accessobject'];
 		$docid = $document->getID();
 		$content = '';
-    $content .= '<a class="delete-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_document", array ("documentname" => $document->getName())), ENT_QUOTES).'"><i class="fa fa-remove"></i></a>';
+		if ($accessobject->check_view_access('RemoveDocument'))
+			$content .= '<a class="delete-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_document", array ("documentname" => $document->getName())), ENT_QUOTES).'"><i class="fa fa-remove"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -2412,12 +2419,17 @@ $(function() {
 	} /* }}} */
 
 	function printLockButton($document, $msglock, $msgunlock, $return=false) { /* {{{ */
+		$accessobject = $this->params['accessobject'];
 		$docid = $document->getID();
 		if($document->isLocked()) {
+			if(!$accessobject->check_controller_access('UnlockDocument'))
+				return '';
 			$icon = 'unlock';
 			$msg = $msgunlock;
 			$title = 'unlock_document';
 		} else {
+			if(!$accessobject->check_controller_access('LockDocument'))
+				return '';
 			$icon = 'lock';
 			$msg = $msglock;
 			$title = 'lock_document';

From 505f0f97b72c43a8d2bb4f6fa508a50aef74da58 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Sep 2020 06:59:20 +0200
Subject: [PATCH 119/312] check for access on view FolderAccess

---
 views/bootstrap/class.Bootstrap.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 98b6f9cc1..9f378c8f2 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -652,6 +652,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 					$menuitems['rm_folder'] = array('link'=>"../out/out.RemoveFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'rm_folder');
 			}
 			if ($accessMode == M_ALL) {
+				if ($accessobject->check_view_access('FolderAccess'))
 				$menuitems['edit_folder_access'] = array('link'=>"../out/out.FolderAccess.php?folderid=".$folderID."&showtree=".showtree(), 'label'=>'edit_folder_access');
 			}
 			if ($accessobject->check_view_access('FolderNotify'))

From 83fc0a59b1632a54f8cadb81f50115e9b7e61d19 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Sep 2020 10:03:30 +0200
Subject: [PATCH 120/312] add expiration in 3 years

---
 op/op.SetExpires.php                 | 4 ++++
 views/bootstrap/class.SetExpires.php | 1 +
 2 files changed, 5 insertions(+)

diff --git a/op/op.SetExpires.php b/op/op.SetExpires.php
index a1dad52b1..20fc29011 100644
--- a/op/op.SetExpires.php
+++ b/op/op.SetExpires.php
@@ -68,6 +68,10 @@ case "2y":
 	$tmp = explode('-', date('Y-m-d'));
 	$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]+2);
 	break;
+case "3y":
+	$tmp = explode('-', date('Y-m-d'));
+	$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]+3);
+	break;
 case "never":
 default:
 	$expires = null;
diff --git a/views/bootstrap/class.SetExpires.php b/views/bootstrap/class.SetExpires.php
index 3aa15ddd6..426388f2e 100644
--- a/views/bootstrap/class.SetExpires.php
+++ b/views/bootstrap/class.SetExpires.php
@@ -74,6 +74,7 @@ $(document).ready( function() {
 		$options[] = array('1m', getMLText('expire_in_1m'));
 		$options[] = array('1y', getMLText('expire_in_1y'));
 		$options[] = array('2y', getMLText('expire_in_2y'));
+		$options[] = array('3y', getMLText('expire_in_3y'));
 		$this->formField(
 			getMLText("preset_expires"),
 			array(

From 4074c43a149997384d034aaa3f51b86afad1c1c0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Sep 2020 10:03:44 +0200
Subject: [PATCH 121/312] update changelog for 5.1.20

---
 CHANGELOG | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3a75dc5bb..c9ff31b28 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,9 +6,10 @@
 - allow inline editing of document name
 - import of users does not issue an error if a group column isn't set
 - removing a document version will not remove attachments of the document anymore
-- make document details page like like view document page
+- make document details page look like view document page
 - fix selection of documents/folders
 - new hooks SeedDMS_View_Document::[startRightColumn|extraVersionsViews|prePreviousVersionsTab|preLatestVersionTab]
+- add expiration of documents in 3 years
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.19

From 28d45c0270d8f326df91b87dae7550ff6603d57d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Sep 2020 11:25:44 +0200
Subject: [PATCH 122/312] use 'text-xxx' class from bootstrap instead of own
 classes

---
 views/bootstrap/class.ImportUsers.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ImportUsers.php b/views/bootstrap/class.ImportUsers.php
index 5886caccf..cff4b508f 100644
--- a/views/bootstrap/class.ImportUsers.php
+++ b/views/bootstrap/class.ImportUsers.php
@@ -102,12 +102,12 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Bootstrap_Style {
 				if(isset($newuser['__logs__'])) {
 					foreach($newuser['__logs__'] as $item) {
 						$class = $item['type'] == 'success' ? 'success' : 'error';
-						echo "<i class=\"fa fa-circle ".$class."\"></i> ".htmlspecialchars($item['msg'])."<br />";
+						echo "<i class=\"fa fa-circle text-".$class."\"></i> ".htmlspecialchars($item['msg'])."<br />";
 					}
 				}
 				foreach($log[$uhash] as $item) {
 					$class = $item['type'] == 'success' ? 'success' : 'error';
-					echo "<i class=\"fa fa-circle ".$class."\"></i> ".htmlspecialchars($item['msg'])."<br />";
+					echo "<i class=\"fa fa-circle text-".$class."\"></i> ".htmlspecialchars($item['msg'])."<br />";
 				}
 				echo "</td>";
 				echo "</tr>\n";

From 467e76b5b0f0989c18d41b7b837fc2a52f6946ba Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Sep 2020 11:26:21 +0200
Subject: [PATCH 123/312] make button primary

---
 views/bootstrap/class.ReceiptDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ReceiptDocument.php b/views/bootstrap/class.ReceiptDocument.php
index 534de2dcb..de126c47f 100644
--- a/views/bootstrap/class.ReceiptDocument.php
+++ b/views/bootstrap/class.ReceiptDocument.php
@@ -154,7 +154,7 @@ $(document).ready(function() {
 		<input type="hidden" name="receiptStatus" value="1" />
 <?php } ?>
 		<div class="controls">
-			<input type='submit' class="btn" name='<?= $receipttype ?>Receipt' value='<?php printMLText("submit_receipt")?>'/>
+			<input type='submit' class="btn btn-primary" name='<?= $receipttype ?>Receipt' value='<?php printMLText("submit_receipt")?>'/>
 		<div>
 		<input type='hidden' name='receiptType' value='<?= $receipttype ?>'/>
 		<?php if($receipttype == 'grp'): ?>

From dfad2e581b9c5fb847dab2269058176a5cccca5b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Sep 2020 07:25:31 +0200
Subject: [PATCH 124/312] nicer layout for list of revisors and recepients

---
 views/bootstrap/class.ViewDocument.php | 104 +++++++++++++++++--------
 1 file changed, 72 insertions(+), 32 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index f91ed2cea..9ed04e789 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -851,6 +851,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "</tr>\n";
 
 			foreach ($reviewStatus as $r) {
+				$class = '';
+				switch($r['status']) {
+				case '-1':
+					$class = 'error';
+					break;
+				case '1':
+					$class = 'success';
+					break;
+				}
 				$required = null;
 				$is_reviewer = false;
 				$accesserr = '';
@@ -890,7 +899,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						break;
 				}
 				if($user->isAdmin() || $r["status"] > -2) {
-					print "<tr".($r['status'] == 1 ? ' class="success"' : ($r['status'] == -1 ? ' class="error"' : '')).">\n";
+					print "<tr>\n";
 					print "<td>".$reqName."</td>\n";
 					print "<td><i style=\"font-size: 80%;\">".$r["date"]." - ";
 					/* $updateUser is the user who has done the review */
@@ -904,17 +913,20 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						}
 					}
 					print "</td>\n";
-					print "<td>".getReviewStatusText($r["status"])."</td>\n";
+					print "<td>";
+					if($class)
+						echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
+					print getReviewStatusText($r["status"])."</td>\n";
 					print "<td><ul class=\"unstyled\">";
 					if($accesserr)
-						echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
+						echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
 
 					if($accessobject->mayReview($latestContent->getDocument())) {
 						if ($is_reviewer) {
 							if ($r["status"]==0) {
-								print "<li>".$this->html_link('ReviewDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini'), getMLText("add_review"), false, true)."</li>";
+								print "<li>".$this->html_link('ReviewDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_review"), false, true)."</li>";
 							} elseif ($accessobject->mayUpdateReview($latestContent->getDocument(), $updateUser) && (($r["status"]==1)||($r["status"]==-1))){
-								print "<li>".$this->html_link('ReviewDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
+								print "<li>".$this->html_link('ReviewDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true)."</li>";
 							}
 						}
 					}
@@ -943,6 +955,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "</tr>\n";
 
 			foreach ($approvalStatus as $a) {
+				$class = '';
+				switch($a['status']) {
+				case '-1':
+					$class = 'error';
+					break;
+				case '1':
+					$class = 'success';
+					break;
+				}
 				$required = null;
 				$is_approver = false;
 				$accesserr = '';
@@ -982,7 +1003,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						break;
 				}
 				if($user->isAdmin() || $a["status"] > -2) {
-					print "<tr".($a['status'] == 1 ? ' class="success"' : ($a['status'] == -1 ? ' class="error"' : ($a['status'] == -2 ? ' class=""' : ''))).">\n";
+					print "<tr>\n";
 					print "<td>".$reqName."</td>\n";
 					print "<td><ul class=\"unstyled\"><li>".$a["date"]."</li>";
 					/* $updateUser is the user who has done the approval */
@@ -996,17 +1017,20 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						}
 					}
 					echo "</td>\n";
-					print "<td>".getApprovalStatusText($a["status"])."</td>\n";
+					print "<td>";
+					if($class)
+						echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
+					print getApprovalStatusText($a["status"])."</td>\n";
 					print "<td><ul class=\"unstyled\">";
 					if($accesserr)
-						echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
+						echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
 
 					if($accessobject->mayApprove($latestContent->getDocument())) {
 						if ($is_approver) {
 							if ($a['status'] == 0) {
-								print "<li>".$this->html_link('ApproveDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini'), getMLText("add_approval"), false, true)."</li>";
+								print "<li>".$this->html_link('ApproveDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_approval"), false, true)."</li>";
 							} elseif ($accessobject->mayUpdateApproval($latestContent->getDocument(), $updateUser) && (($a["status"]==1)||($a["status"]==-1))){
-								print "<li>".$this->html_link('ApproveDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
+								print "<li>".$this->html_link('ApproveDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true)."</li>";
 							}
 						}
 					}
@@ -1270,12 +1294,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 <?php
 			if($status["status"]!=S_RELEASED)
 				echo "<div class=\"alert alert-warning\">".getMLText('info_recipients_tab_not_released')."</div>";
-			$this->contentContainerStart();
-			print "<table class=\"table-condensed\">\n";
-
-			print "<tr><td colspan=5>\n";
-			$this->contentSubHeading(getMLText("recipients"));
-			print "</tr>";
+//			$this->contentContainerStart();
+			print "<table class=\"table table-condensed\">\n";
 
 			print "<tr>\n";
 			print "<td width='20%'><b>".getMLText("name")."</b></td>\n";
@@ -1329,6 +1349,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				 * unless admin is logged in.
 				 */
 				if($user->isAdmin() || $r["status"] > -2) {
+					$class = '';
+					switch($r['status']) {
+					case '-1':
+						$class = 'error';
+						break;
+					case '1':
+						$class = 'success';
+						break;
+					}
 					print "<tr>\n";
 					print "<td>".$reqName."</td>\n";
 					print "<td><ul class=\"unstyled\"><li>".$r["date"]."</li>";
@@ -1336,16 +1365,19 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					$updateUser = $dms->getUser($r["userID"]);
 					print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
 					print "<td>".htmlspecialchars($r["comment"])."</td>\n";
-					print "<td>".getReceiptStatusText($r["status"])."</td>\n";
+					print "<td>";
+					if($class)
+						echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
+					print getReceiptStatusText($r["status"])."</td>\n";
 					print "<td><ul class=\"unstyled\">";
 					if($accesserr)
-						echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
+						echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
 					if($accessobject->mayReceipt($document)) {
 						if ($is_recipient) {
 							if($r["status"]==0) {
-								print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("add_receipt"), false, true)."</li>";
+								print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_receipt"), false, true)."</li>";
 							} elseif ($accessobject->mayUpdateReceipt($document, $updateUser) && (($r["status"]==1 && $enablereceiptreject)||($r["status"]==-1))) {
-								print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
+								print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true)."</li>";
 							}
 						}
 					}
@@ -1357,7 +1389,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 ?>
 		</table>
 <?php
-			$this->contentContainerEnd();
+//			$this->contentContainerEnd();
 			if($accessobject->check_view_access('ViewDocument', array('action'=>'receptionBar'))/* $user->isAdmin() || $user->getId() == $document->getOwner()->getId()*/) {
 				/* Do not count entries '-2' as they are removed userѕ */
 				$totalreceipts = $stat['-1'] + $stat['0'] + $stat['1'];
@@ -1403,12 +1435,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				<div class="alert alert-info"><?= getMLText('no_revision_planed') ?></div>
 <?php
 				} */
-			$this->contentContainerStart();
-			print "<table class=\"table-condensed\">\n";
-
-			print "<tr><td colspan=5>\n";
-			$this->contentSubHeading(getMLText("revisors"));
-			print "</tr>";
+//			$this->contentContainerStart();
+			print "<table class=\"table table-condensed\">\n";
 
 			print "<tr>\n";
 			print "<td width='20%'><b>".getMLText("name")."</b></td>\n";
@@ -1419,6 +1447,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "</tr>\n";
 
 			foreach ($revisionStatus as $r) {
+				$class = '';
+				switch($r['status']) {
+				case '-1':
+					$class = 'error';
+					break;
+				case '1':
+					$class = 'success';
+					break;
+				}
 				$required = null;
 				$is_recipient = false;
 				$accesserr = '';
@@ -1462,15 +1499,18 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					}
 					print "</ul></td>";
 					print "<td>".htmlspecialchars($r["comment"])."</td>\n";
-					print "<td>".getRevisionStatusText($r["status"])."</td>\n";
+					print "<td>";
+					if($class)
+						echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
+					print getRevisionStatusText($r["status"])."</td>\n";
 					print "<td><ul class=\"unstyled\">";
 					if($accesserr)
-						echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
+						echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
 					if($accessobject->mayRevise($document)) {
 						if ($is_recipient && $r["status"]==0) {
-							print "<li>".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini'), getMLText("add_revision"), false, true)."</li>";
+							print "<li>".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_revision"), false, true)."</li>";
 						} elseif (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
-							print "<li>".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
+							print "<li>".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true)."</li>";
 						}
 					}
 
@@ -1481,7 +1521,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 ?>
 		</table>
 <?php
-		$this->contentContainerEnd();
+//		$this->contentContainerEnd();
 		if($user->isAdmin() || $user->getId() == $document->getOwner()->getId()) {
 ?>
 			<div class="row-fluid">

From fe4e0c644c61d781fb1ee8a071915bef6ccbb2ca Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Sep 2020 07:27:12 +0200
Subject: [PATCH 125/312] do not redirect ajax calls

---
 index.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/index.php b/index.php
index 7123a957b..98b5511f3 100644
--- a/index.php
+++ b/index.php
@@ -42,6 +42,9 @@ if(true) {
 				include($file);
 				exit;
 			}
+			if($request->isXhr()) {
+				exit;
+			}
 //			print_r($request->getUri());
 //			exit;
 			return $c['response']

From ca1dce466d76d62bca968ef25b1865054a7e0ae0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Sep 2020 08:37:51 +0200
Subject: [PATCH 126/312] backport printVersionAttributes(), nicer output of
 reviewers and approvers

---
 views/bootstrap/class.ViewDocument.php | 84 ++++++++++++++++----------
 1 file changed, 52 insertions(+), 32 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 516501d67..d785f73cf 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -98,6 +98,23 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 <?php
 	} /* }}} */
 
+	protected function printVersionAttributes($folder, $version) { /* {{{ */
+			$attributes = $version->getAttributes();
+			if($attributes) {
+				foreach($attributes as $attribute) {
+					$arr = $this->callHook('showDocumentContentAttribute', $version, $attribute);
+					if(is_array($arr)) {
+						print "<li>".$arr[0].": ".$arr[1]."</li>\n";
+					} else {
+						$attrdef = $attribute->getAttributeDefinition();
+						print "<li>".htmlspecialchars($attrdef->getName()).": ";
+						$this->printAttributeValue($attribute);
+						echo "</li>\n";
+					}
+				}
+			}
+	} /* }}} */
+
 	function documentListItem() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -623,18 +640,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<p style=\"font-style: italic;\">".htmlspecialchars($latestContent->getComment())."</p>";
 		}
 		print "<ul class=\"actions unstyled\">\n";
-		$attributes = $latestContent->getAttributes();
-		if($attributes) {
-			foreach($attributes as $attribute) {
-				$arr = $this->callHook('showDocumentContentAttribute', $latestContent, $attribute);
-				if(is_array($arr)) {
-					print "<li>".$arr[0].": ".$arr[1]."</li>\n";
-				} else {
-					$attrdef = $attribute->getAttributeDefinition();
-					print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $attribute->getValueAsArray()))."</li>\n";
-				}
-			}
-		}
+		$this->printVersionAttributes($folder, $latestContent);
 		print "</ul></td>\n";
 
 		print "<td width='10%'>";
@@ -784,6 +790,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "</tr>\n";
 
 			foreach ($reviewStatus as $r) {
+				$class = '';
+				switch($r['status']) {
+				case '-1':
+					$class = 'error';
+					break;
+				case '1':
+					$class = 'success';
+					break;
+				}
 				$required = null;
 				$is_reviewer = false;
 				$accesserr = '';
@@ -822,7 +837,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						}
 						break;
 				}
-				print "<tr".($r['status'] == 1 ? ' class="success"' : ($r['status'] == -1 ? ' class="error"' : '')).">\n";
+				print "<tr>\n";
 				print "<td>".$reqName."</td>\n";
 				print "<td><i style=\"font-size: 80%;\">".$r["date"]." - ";
 				/* $updateUser is the user who has done the review */
@@ -834,10 +849,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$r['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
 				}
 				print "</td>\n";
-				print "<td>".getReviewStatusText($r["status"])."</td>\n";
+					print "<td>";
+					if($class)
+						echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
+					print getReviewStatusText($r["status"])."</td>\n";
 				print "<td><ul class=\"unstyled\">";
 				if($accesserr)
-					echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
+						echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
 
 				if($accessop->mayReview()) {
 					if ($is_reviewer) {
@@ -872,6 +890,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "</tr>\n";
 
 			foreach ($approvalStatus as $a) {
+				$class = '';
+				switch($a['status']) {
+				case '-1':
+					$class = 'error';
+					break;
+				case '1':
+					$class = 'success';
+					break;
+				}
 				$required = null;
 				$is_approver = false;
 				$accesserr = '';
@@ -910,7 +937,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						}
 						break;
 				}
-				print "<tr".($a['status'] == 1 ? ' class="success"' : ($a['status'] == -1 ? ' class="error"' : ($a['status'] == -2 ? ' class=""' : ''))).">\n";
+				print "<tr>\n";
 				print "<td>".$reqName."</td>\n";
 				print "<td><i style=\"font-size: 80%;\">".$a["date"]." - ";
 				/* $updateUser is the user who has done the approval */
@@ -922,10 +949,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
 				}
 				echo "</td>\n";
-				print "<td>".getApprovalStatusText($a["status"])."</td>\n";
+					print "<td>";
+					if($class)
+						echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
+					print getApprovalStatusText($a["status"])."</td>\n";
 				print "<td><ul class=\"unstyled\">";
 				if($accesserr)
-					echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
+						echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
 
 				if($accessop->mayApprove()) {
 					if ($is_approver) {
@@ -938,7 +968,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				}
 
 				print "</ul>";
-				print "</td>\n</tr>\n";
+				print "</td>\n";
+				print "</tr>\n";
 			}
 		}
 
@@ -947,7 +978,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		print "</div>";
 		print "</div>";
 
-		if($user->isAdmin()) {
+		if($user->isAdmin() || $user->getId() == $document->getOwner()->getId()) {
 ?>
 			<div class="row-fluid">
 <?php
@@ -1250,18 +1281,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						print "<p style=\"font-style: italic;\">".htmlspecialchars($version->getComment())."</p>";
 				}
 				print "<ul class=\"actions unstyled\">\n";
-				$attributes = $version->getAttributes();
-				if($attributes) {
-					foreach($attributes as $attribute) {
-						$arr = $this->callHook('showDocumentContentAttribute', $version, $attribute);
-						if(is_array($arr)) {
-							print "<li>".$arr[0].": ".$arr[1]."</li>\n";
-						} else {
-							$attrdef = $attribute->getAttributeDefinition();
-							print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $attribute->getValueAsArray()))."</li>\n";
-						}
-					}
-				}
+				$this->printVersionAttributes($folder, $version);
 				print "</ul></td>\n";
 //				print "<td>".htmlspecialchars($version->getComment())."</td>";
 				print "<td>".getOverallStatusText($vstat["status"])."</td>";

From 76c02d89c762f16efa8eb049b24fba7b20cc1ccd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Sep 2020 08:44:47 +0200
Subject: [PATCH 127/312] remove old code for getting timeline items

---
 views/bootstrap/class.ViewDocument.php | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index d785f73cf..5cc4a685a 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1534,30 +1534,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		</div>
 <?php
 		if($user->isAdmin()) {
-			$timeline = $latestContent->getDocument()->getTimeline();
-			if($timeline) {
-				$this->contentHeading(getMLText("timeline"));
-				foreach($timeline as &$item) {
-					switch($item['type']) {
-					case 'add_version':
-						$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version']));
-						break;
-					case 'add_file':
-						$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName()));
-						break;
-					case 'status_change':
-						$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
-						break;
-					default:
-						$msg = $this->callHook('getTimelineMsg', $latestContent->getDocument(), $item);
-						if(!is_string($msg))
-							$msg = '???';
-					}
-					$item['msg'] = $msg;
-				}
-//				$this->printTimeline('out.ViewDocument.php?action=timelinedata&documentid='.$document->getID(), 300, '', date('Y-m-d'));
-				$this->printTimelineHtml(300);
-			}
+			$this->contentHeading(getMLText("timeline"));
+			$this->printTimelineHtml(300);
 		}
 ?>
 		  </div>

From 0f9ac271cef11ab7b568427b31ae8efbf535b54f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Sep 2020 08:53:05 +0200
Subject: [PATCH 128/312] do not show removed approvers/reviewers unless admin

---
 views/bootstrap/class.ViewDocument.php | 122 +++++++++++++------------
 1 file changed, 63 insertions(+), 59 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 5cc4a685a..7cf62e8a4 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -837,38 +837,40 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						}
 						break;
 				}
-				print "<tr>\n";
-				print "<td>".$reqName."</td>\n";
-				print "<td><i style=\"font-size: 80%;\">".$r["date"]." - ";
-				/* $updateUser is the user who has done the review */
-				$updateUser = $dms->getUser($r["userID"]);
-				print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</i><br />";
-				print htmlspecialchars($r["comment"]);
-				if($r['file']) {
-					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$r['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
-				}
-				print "</td>\n";
-					print "<td>";
-					if($class)
-						echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
-					print getReviewStatusText($r["status"])."</td>\n";
-				print "<td><ul class=\"unstyled\">";
-				if($accesserr)
-						echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
-
-				if($accessop->mayReview()) {
-					if ($is_reviewer) {
-						if ($r["status"]==0) {
-							print "<li><a href=\"../out/out.ReviewDocument.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."&reviewid=".$r['reviewID']."\" class=\"btn btn-primary btn-mini\">".getMLText("add_review")."</a></li>";
-						} elseif ($accessop->mayUpdateReview($updateUser) && (($r["status"]==1)||($r["status"]==-1))) {
-							print "<li><a href=\"../out/out.ReviewDocument.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."&reviewid=".$r['reviewID']."\" class=\"btn btn-primary btn-mini\">".getMLText("edit")."</a></li>";
+				if($user->isAdmin() || $r["status"] > -2) {
+					print "<tr>\n";
+					print "<td>".$reqName."</td>\n";
+					print "<td><i style=\"font-size: 80%;\">".$r["date"]." - ";
+					/* $updateUser is the user who has done the review */
+					$updateUser = $dms->getUser($r["userID"]);
+					print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</i><br />";
+					print htmlspecialchars($r["comment"]);
+					if($r['file']) {
+						echo "<br />";
+						echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$r['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
+					}
+					print "</td>\n";
+						print "<td>";
+						if($class)
+							echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
+						print getReviewStatusText($r["status"])."</td>\n";
+					print "<td><ul class=\"unstyled\">";
+					if($accesserr)
+							echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
+	
+					if($accessop->mayReview()) {
+						if ($is_reviewer) {
+							if ($r["status"]==0) {
+								print "<li><a href=\"../out/out.ReviewDocument.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."&reviewid=".$r['reviewID']."\" class=\"btn btn-primary btn-mini\">".getMLText("add_review")."</a></li>";
+							} elseif ($accessop->mayUpdateReview($updateUser) && (($r["status"]==1)||($r["status"]==-1))) {
+								print "<li><a href=\"../out/out.ReviewDocument.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."&reviewid=".$r['reviewID']."\" class=\"btn btn-primary btn-mini\">".getMLText("edit")."</a></li>";
+							}
 						}
 					}
+	
+					print "</ul></td>\n";	
+					print "</tr>\n";
 				}
-
-				print "</ul></td>\n";	
-				print "</tr>\n";
 			}
 			print "</table>";
 //		$this->contentContainerEnd();
@@ -937,39 +939,41 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						}
 						break;
 				}
-				print "<tr>\n";
-				print "<td>".$reqName."</td>\n";
-				print "<td><i style=\"font-size: 80%;\">".$a["date"]." - ";
-				/* $updateUser is the user who has done the approval */
-				$updateUser = $dms->getUser($a["userID"]);
-				print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$a["userID"]."'")."</i><br />";	
-				print htmlspecialchars($a["comment"]);
-				if($a['file']) {
-					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
-				}
-				echo "</td>\n";
-					print "<td>";
-					if($class)
-						echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
-					print getApprovalStatusText($a["status"])."</td>\n";
-				print "<td><ul class=\"unstyled\">";
-				if($accesserr)
-						echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
-
-				if($accessop->mayApprove()) {
-					if ($is_approver) {
-						if ($a['status'] == 0) {
-							print "<li><a class=\"btn btn-primary btn-mini\" href=\"../out/out.ApproveDocument.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."&approveid=".$a['approveID']."\">".getMLText("add_approval")."</a></li>";
-						} elseif ($accessop->mayUpdateApproval($updateUser) && (($a["status"]==1)||($a["status"]==-1))) {
-							print "<li><a class=\"btn btn-primary btn-mini\" href=\"../out/out.ApproveDocument.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."&approveid=".$a['approveID']."\">".getMLText("edit")."</a></li>";
+				if($user->isAdmin() || $a["status"] > -2) {
+					print "<tr>\n";
+					print "<td>".$reqName."</td>\n";
+					print "<td><i style=\"font-size: 80%;\">".$a["date"]." - ";
+					/* $updateUser is the user who has done the approval */
+					$updateUser = $dms->getUser($a["userID"]);
+					print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$a["userID"]."'")."</i><br />";	
+					print htmlspecialchars($a["comment"]);
+					if($a['file']) {
+						echo "<br />";
+						echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
+					}
+					echo "</td>\n";
+						print "<td>";
+						if($class)
+							echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
+						print getApprovalStatusText($a["status"])."</td>\n";
+					print "<td><ul class=\"unstyled\">";
+					if($accesserr)
+							echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
+	
+					if($accessop->mayApprove()) {
+						if ($is_approver) {
+							if ($a['status'] == 0) {
+								print "<li><a class=\"btn btn-primary btn-mini\" href=\"../out/out.ApproveDocument.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."&approveid=".$a['approveID']."\">".getMLText("add_approval")."</a></li>";
+							} elseif ($accessop->mayUpdateApproval($updateUser) && (($a["status"]==1)||($a["status"]==-1))) {
+								print "<li><a class=\"btn btn-primary btn-mini\" href=\"../out/out.ApproveDocument.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."&approveid=".$a['approveID']."\">".getMLText("edit")."</a></li>";
+							}
 						}
 					}
-				}
 
-				print "</ul>";
-				print "</td>\n";
-				print "</tr>\n";
+					print "</ul>";
+					print "</td>\n";
+					print "</tr>\n";
+				}
 			}
 		}
 

From 34c88aadd30fb499ae88ab225d554ac1a450ff3b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Sep 2020 10:35:57 +0200
Subject: [PATCH 129/312] fix setting quota when importing users

---
 CHANGELOG             | 1 +
 op/op.ImportUsers.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index c9ff31b28..a252a6290 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@
 - fix selection of documents/folders
 - new hooks SeedDMS_View_Document::[startRightColumn|extraVersionsViews|prePreviousVersionsTab|preLatestVersionTab]
 - add expiration of documents in 3 years
+- fix setting quota when importing users
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.19
diff --git a/op/op.ImportUsers.php b/op/op.ImportUsers.php
index 5cd2ac6e2..de10c8527 100644
--- a/op/op.ImportUsers.php
+++ b/op/op.ImportUsers.php
@@ -242,7 +242,7 @@ if (isset($_FILES['userdata']) && $_FILES['userdata']['error'] == 0) {
 					if(isset($u['quota']) && $u['quota'] != $eu->getQuota()) {
 						$log[$uhash][] = array('id'=>$eu->getLogin(), 'type'=>'success', 'msg'=> "Quota of user updated. '".$u['quota']."' != '".$eu->getQuota()."'");
 						if($makeupdate)
-							$eu->setQuota($u['language']);
+							$eu->setQuota($u['quota']);
 					}
 					if(isset($u['homefolder']) && $u['homefolder']->getId() != $eu->getHomeFolder()) {
 						$log[$uhash][] = array('id'=>$eu->getLogin(), 'type'=>'success', 'msg'=> "Homefolder of user updated. '".(is_object($u['homefolder']) ? $u['homefolder']->getId() : '')."' != '".($eu->getHomeFolder() ? $eu->getHomeFolder() : '')."'");

From ad9afab6e0448cc71bd16e3115bfca8c2c22e6fb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Sep 2020 11:39:00 +0200
Subject: [PATCH 130/312] set dms of user instances

---
 SeedDMS_Core/Core/inc.ClassGroup.php | 4 +++-
 SeedDMS_Core/package.xml             | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassGroup.php b/SeedDMS_Core/Core/inc.ClassGroup.php
index 8bcbf253e..e024b6cc1 100644
--- a/SeedDMS_Core/Core/inc.ClassGroup.php
+++ b/SeedDMS_Core/Core/inc.ClassGroup.php
@@ -196,6 +196,7 @@ class SeedDMS_Core_Group { /* {{{ */
 			foreach ($resArr as $row) {
 				/** @var SeedDMS_Core_User $user */
 				$user = new $classname($row["id"], $row["login"], $row["pwd"], $row["fullName"], $row["email"], $row["language"], $row["theme"], $row["comment"], $row["role"], $row['hidden']);
+				$user->setDMS($this->_dms);
 				array_push($this->_users, $user);
 			}
 		}
@@ -221,6 +222,7 @@ class SeedDMS_Core_Group { /* {{{ */
 		foreach ($resArr as $row) {
 			/** @var SeedDMS_Core_User $user */
 			$user = new $classname($row["id"], $row["login"], $row["pwd"], $row["fullName"], $row["email"], $row["language"], $row["theme"], $row["comment"], $row["role"], $row['hidden']);
+			$user->setDMS($this->_dms);
 			array_push($managers, $user);
 		}
 		return $managers;
@@ -497,7 +499,7 @@ class SeedDMS_Core_Group { /* {{{ */
 		$notifications = array();
 		foreach ($resArr as $row) {
 			$not = new SeedDMS_Core_Notification($row["target"], $row["targetType"], $row["userID"], $row["groupID"]);
-			$not->setDMS($this);
+			$not->setDMS($this->_dms);
 			array_push($notifications, $not);
 		}
 
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 77fca8e06..13a02922b 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -27,6 +27,7 @@
 - SeedDMS_Core_DMS::getDocumentList() returns false, if an unknown list passed
 - SeedDMS_Core_Document::getDocumentFiles() has new parameter to select only those files attached to a specific version of the document
 - removing a document version will not remove attachments of the document anymore
+- set dms of new user instances in SeedDMS_Core_Group
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From df313d316c611560ebeba039b684e0d649bad760 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Sep 2020 11:39:19 +0200
Subject: [PATCH 131/312] export users of a group as csv file

---
 CHANGELOG                          | 1 +
 controllers/class.UserListCsv.php  | 7 ++++++-
 op/op.UserListCsv.php              | 6 ++++++
 views/bootstrap/class.GroupMgr.php | 1 +
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index a252a6290..21bc53d18 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@
 - new hooks SeedDMS_View_Document::[startRightColumn|extraVersionsViews|prePreviousVersionsTab|preLatestVersionTab]
 - add expiration of documents in 3 years
 - fix setting quota when importing users
+- export csv file of users of a group
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.19
diff --git a/controllers/class.UserListCsv.php b/controllers/class.UserListCsv.php
index ad8690788..bb6659cd2 100644
--- a/controllers/class.UserListCsv.php
+++ b/controllers/class.UserListCsv.php
@@ -26,8 +26,13 @@ class SeedDMS_Controller_UserListCsv extends SeedDMS_Controller_Common {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$settings = $this->params['settings'];
+		$group = $this->params['group'];
 
-		$allUsers = $dms->getAllUsers($settings->_sortUsersInList);
+		if($group) {
+			$allUsers = $group->getUsers();
+		} else {
+			$allUsers = $dms->getAllUsers($settings->_sortUsersInList);
+		}
 		$m = 0;
 		foreach($allUsers as $u) {
 			$m = max($m, count($u->getGroups()));
diff --git a/op/op.UserListCsv.php b/op/op.UserListCsv.php
index 7a7ed3e8a..7e48c6dce 100644
--- a/op/op.UserListCsv.php
+++ b/op/op.UserListCsv.php
@@ -34,9 +34,15 @@ if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
+if(!empty($_GET['groupid'])) {
+	$group = $dms->getGroup((int) $_GET['groupid']);
+} else {
+	$group = null;
+}
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
+$controller->setParam('group', $group);
 if(!$controller->run()) {
 	if ($controller->getErrorMsg() != '')
 		$errormsg = $controller->getErrorMsg();
diff --git a/views/bootstrap/class.GroupMgr.php b/views/bootstrap/class.GroupMgr.php
index b0dfc8759..144f59f3c 100644
--- a/views/bootstrap/class.GroupMgr.php
+++ b/views/bootstrap/class.GroupMgr.php
@@ -164,6 +164,7 @@ $(document).ready( function() {
   <ul class="dropdown-menu">
 <?php
 			echo '<li><a href="../out/out.RemoveGroup.php?groupid='.$selgroup->getID().'"><i class="fa fa-remove"></i> '.getMLText("rm_group").'</a><li>';
+			echo '<li><a href="../op/op.UserListCsv.php?groupid='.$selgroup->getID().'"><i class="fa fa-download"></i> '.getMLText("export_user_list_csv").'</a><li>';
 ?>
 	</ul>
 </div>

From 3f399dfcea9c020e42a5ec7e7e13a467054ac543 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Sep 2020 13:42:03 +0200
Subject: [PATCH 132/312] concat data-query to url on trigger update

---
 styles/bootstrap/application.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index f9b2cf93c..f59fddf76 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -438,9 +438,13 @@ $(document).ready( function() {
 			base = '';
 		var view = element.data('view');
 		var action = element.data('action');
-		if(view && action)
+		var query = element.data('query');
+		if(view && action) {
 			url = seeddms_webroot+base+"out/out."+view+".php?action="+action;
-		else
+			if(query) {
+				url += "&"+query;
+			}
+		} else
 			url = href;
 		if(typeof param1 === 'object') {
 			for(var key in param1) {

From ab464b633d1e511f06896b86a17691e90cf09fd2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Sep 2020 15:56:29 +0200
Subject: [PATCH 133/312] pass update user to callback onSetStatus

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index e5ad94261..5a0d00bcc 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3171,7 +3171,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		/* Check if 'onSetStatus' callback is set */
 		if(isset($this->_dms->callbacks['onSetStatus'])) {
 			foreach($this->_dms->callbacks['onSetStatus'] as $callback) {
-				$ret = call_user_func($callback[0], $callback[1], $this, $this->_status["status"], $status);
+				$ret = call_user_func($callback[0], $callback[1], $this, $updateUser, $this->_status["status"], $status);
 				if(is_bool($ret)) {
 					unset($this->_status);
 					if($ret)

From e2f2021b196971dfec478f5cc90de2382703f659 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Sep 2020 08:32:09 +0200
Subject: [PATCH 134/312] use same edit attributes code as for add document

---
 views/bootstrap/class.UpdateDocument.php | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 8fbf44dc9..b58e14391 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -283,22 +283,10 @@ console.log(element);
 				if(is_array($arr)) {
 					if($arr)
 						$this->formField($arr[0], $arr[1]);
+				} elseif(is_string($arr)) {
+					echo $arr;
 				} else {
-					$presetbtnhtml = '';
-					if($latestContent->getAttributeValue($attrdef)) {
-						switch($attrdef->getType()) {
-						case SeedDMS_Core_AttributeDefinition::type_string:
-						case SeedDMS_Core_AttributeDefinition::type_date:
-						case SeedDMS_Core_AttributeDefinition::type_int:
-						case SeedDMS_Core_AttributeDefinition::type_float:
-							$presetbtnhtml = $this->getInputPresetButtonHtml('attributes_version_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef), $attrdef->getValueSetSeparator());
-							break;
-						case SeedDMS_Core_AttributeDefinition::type_boolean:
-							$presetbtnhtml = $this->gettCheckboxPresetButtonHtml('attributes_version_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef));
-							break;
-						}
-					}
-					$this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, '', 'attributes_version')." ".$presetbtnhtml);
+					$this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $document->getAttribute($attrdef)));
 				}
 			}
 		}

From 76f6500fd40cf7c715f828b21e5a5fb5472e88ee Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Sep 2020 08:55:30 +0200
Subject: [PATCH 135/312] sync checkin code with update document code

---
 out/out.CheckInDocument.php               |   1 +
 views/bootstrap/class.CheckInDocument.php | 703 +++++++++++-----------
 2 files changed, 352 insertions(+), 352 deletions(-)

diff --git a/out/out.CheckInDocument.php b/out/out.CheckInDocument.php
index 1544eccd8..07d9cc31b 100644
--- a/out/out.CheckInDocument.php
+++ b/out/out.CheckInDocument.php
@@ -68,6 +68,7 @@ if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
 	$view->setParam('strictformcheck', $settings->_strictFormCheck);
+	$view->setParam('nodocumentformfields', $settings->_noDocumentFormFields);
 	$view->setParam('enablelargefileupload', $settings->_enableLargeFileUpload);
 	$view->setParam('enableadminrevapp', $settings->_enableAdminRevApp);
 	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index e98d1000e..5fa945742 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -80,6 +80,7 @@ $(document).ready(function() {
 		$folder = $this->params['folder'];
 		$document = $this->params['document'];
 		$strictformcheck = $this->params['strictformcheck'];
+		$nodocumentformfields = $this->params['nodocumentformfields'];
 		$enablelargefileupload = $this->params['enablelargefileupload'];
 		$enableadminrevapp = $this->params['enableadminrevapp'];
 		$enableownerrevapp = $this->params['enableownerrevapp'];
@@ -157,118 +158,137 @@ $(document).ready(function() {
 		$this->contentContainerStart();
 ?>
 
-<form action="../op/op.CheckInDocument.php" method="post" id="form1" name="form1">
+<form class="form-horizontal" action="../op/op.CheckInDocument.php" method="post" id="form1" name="form1">
+	<?php echo createHiddenFieldWithKey('checkindocument'); ?>
 	<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
-	<table class="table-condensed">
-	
-		<tr>
-			<td><?php printMLText("comment");?>:</td>
-			<td class="standardText">
-				<textarea name="comment" rows="4" cols="80"<?php echo $strictformcheck ? ' required' : ''; ?>></textarea>
-			</td>
-		</tr>
-<?php
-			if($presetexpiration) {
-				if(!($expts = strtotime($presetexpiration)))
-					$expts = false;
-			} else {
+<?php	
+		if(!$nodocumentformfields || !in_array('version_comment', $nodocumentformfields)) {
+		$this->formField(
+			getMLText("comment"),
+			array(
+				'element'=>'textarea',
+				'name'=>'comment',
+				'rows'=>4,
+				'cols'=>80
+			)
+		);
+		}
+		if(!$nodocumentformfields || !in_array('expires', $nodocumentformfields)) {
+		if($presetexpiration) {
+			if(!($expts = strtotime($presetexpiration)))
 				$expts = false;
-			}
-?>
-		<tr>
-			<td><?php printMLText("preset_expires");?>:</td>
-			<td>
-				<select class="span6" name="presetexpdate" id="presetexpdate">
-					<option value="never"><?php printMLText('does_not_expire');?></option>
-					<option value="date"<?php echo ($expts != '' ? " selected" : ""); ?>><?php printMLText('expire_by_date');?></option>
-					<option value="1w"><?php printMLText('expire_in_1w');?></option>
-					<option value="1m"><?php printMLText('expire_in_1m');?></option>
-					<option value="1y"><?php printMLText('expire_in_1y');?></option>
-					<option value="2y"><?php printMLText('expire_in_2y');?></option>
-				</select>
-			</td>
-		</tr>
-		<tr id="control_expdate" <?php echo ($expts == false ? 'style="display: none;"' : ''); ?>>
-			<td><?php printMLText("expires");?>:</td>
-			<td class="standardText">
-        <span class="input-append date span12" id="expirationdate" data-date="<?php echo ($expts ? date('Y-m-d', $expts) : ''); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
-          <input class="span3" size="16" name="expdate" type="text" value="<?php echo ($expts ? date('Y-m-d', $expts) : ''); ?>">
-          <span class="add-on"><i class="fa fa-calendar"></i></span>
-        </span>
-			</td>
-		</tr>
-<?php
-	$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all));
-	if($attrdefs) {
-		foreach($attrdefs as $attrdef) {
-			$arr = $this->callHook('editDocumentContentAttribute', $document, $attrdef);
-			if(is_array($arr)) {
-				if($arr) {
-					echo "<tr>";
-					echo "<td>".$arr[0].":</td>";
-					echo "<td>".$arr[1]."</td>";
-					echo "</tr>";
+		} else {
+			$expts = false;
+		}
+		$options = array();
+		$options[] = array('never', getMLText('does_not_expire'));
+		$options[] = array('date', getMLText('expire_by_date'), $expts);
+		$options[] = array('1w', getMLText('expire_in_1w'));
+		$options[] = array('1m', getMLText('expire_in_1m'));
+		$options[] = array('1y', getMLText('expire_in_1y'));
+		$options[] = array('2y', getMLText('expire_in_2y'));
+		$this->formField(
+			getMLText("preset_expires"),
+			array(
+				'element'=>'select',
+				'id'=>'presetexpdate',
+				'name'=>'presetexpdate',
+				'options'=>$options
+			)
+		);
+		$this->formField(
+			getMLText("expires"),
+			$this->getDateChooser(($expts ? date('Y-m-d', $expts) : ''), "expdate", $this->params['session']->getLanguage())
+		);
+		}
+		$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all));
+		if($attrdefs) {
+			foreach($attrdefs as $attrdef) {
+				$arr = $this->callHook('editDocumentContentAttribute', $document, $attrdef);
+				if(is_array($arr)) {
+					if($arr)
+						$this->formField($arr[0], $arr[1]);
+				} elseif(is_string($arr)) {
+					echo $arr;
+				} else {
+					$this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $document->getAttribute($attrdef)));
 				}
-			} else {
-?>
-    <tr>
-	    <td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-	    <td><?php $this->printAttributeEditField($attrdef, '', 'attributes') ?>
-<?php
-			if($latestContent->getAttributeValue($attrdef)) {
-				switch($attrdef->getType()) {
-				case SeedDMS_Core_AttributeDefinition::type_string:
-				case SeedDMS_Core_AttributeDefinition::type_date:
-				case SeedDMS_Core_AttributeDefinition::type_int:
-				case SeedDMS_Core_AttributeDefinition::type_float:
-					$this->printInputPresetButtonHtml('attributes_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef), $attrdef->getValueSetSeparator());
-					break;
-				case SeedDMS_Core_AttributeDefinition::type_boolean:
-					$this->printCheckboxPresetButtonHtml('attributes_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef));
-					break;
-				}
-//				print_r($latestContent->getAttributeValue($attrdef));
-			}
-?></td>
-    </tr>
-<?php
 			}
 		}
-	}
-	if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
-		// Retrieve a list of all users and groups that have review / approve
-		// privileges.
-		$docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp);
-		if($workflowmode != 'traditional_only_approval') {
-?>
-		<tr>
-			<td colspan="2">
-				<?php $this->contentSubHeading(getMLText("assign_reviewers")); ?>
-      </td>
-    </tr>
-    <tr>
-      <td>
-				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
-      </td>
-			<td>
-        <select id="IndReviewer" class="chzn-select span9" name="indReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_reviewers'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
-<?php
+		$arrs = $this->callHook('addDocumentContentAttributes', $folder);
+		if(is_array($arrs)) {
+			foreach($arrs as $arr) {
+				$this->formField($arr[0], $arr[1]);
+			}
+		} elseif(is_string($arrs)) {
+			echo $arrs;
+		}
+
+		if($workflowmode == 'advanced') {
+			$mandatoryworkflows = $user->getMandatoryWorkflows();
+			if($mandatoryworkflows) {
+				if(count($mandatoryworkflows) == 1) {
+					$this->formField(
+						getMLText("workflow"),
+						htmlspecialchars($mandatoryworkflows[0]->getName()).'<input type="hidden" name="workflow" value="'.$mandatoryworkflows[0]->getID().'">'
+					);
+				} else {
+					$options = array();
+					$curworkflow = $latestContent->getWorkflow();
+					foreach ($mandatoryworkflows as $workflow) {
+						$options[] = array($workflow->getID(), htmlspecialchars($workflow->getName()), $curworkflow && $curworkflow->getID() == $workflow->getID());
+					}
+					$this->formField(
+						getMLText("workflow"),
+						array(
+							'element'=>'select',
+							'id'=>'workflow',
+							'name'=>'workflow',
+							'class'=>'chzn-select',
+							'attributes'=>array(array('data-placeholder', getMLText('select_workflow'))),
+							'options'=>$options
+						)
+					);
+				}
+			} else {
+				$options = array();
+				$options[] = array('', '');
+				$workflows=$dms->getAllWorkflows();
+				foreach ($workflows as $workflow) {
+					$options[] = array($workflow->getID(), htmlspecialchars($workflow->getName()));
+				}
+				$this->formField(
+					getMLText("workflow"),
+					array(
+						'element'=>'select',
+						'id'=>'workflow',
+						'name'=>'workflow',
+						'class'=>'chzn-select',
+						'attributes'=>array(array('data-allow-clear', 'true'), array('data-placeholder', getMLText('select_workflow'))),
+						'options'=>$options
+					)
+				);
+			}
+			$this->warningMsg(getMLText("add_doc_workflow_warning"));
+		} elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
+			$docAccess = $document->getReadAccessList($enableadminrevapp, $enableownerrevapp);
+			if($workflowmode == 'traditional') {
+				$this->contentSubHeading(getMLText("assign_reviewers"));
 				$res=$user->getMandatoryReviewers();
+				$options = array();
 				foreach ($docAccess["users"] as $usr) {
 					if (!$enableselfrevapp && $usr->getID()==$user->getID()) continue; 
 					$mandatory=false;
 					foreach ($res as $r) if ($r['reviewerUserID']==$usr->getID()) $mandatory=true;
 
-					if ($mandatory) print "<option disabled=\"disabled\" value=\"".$usr->getID()."\">". htmlspecialchars($usr->getLogin()." - ".$usr->getFullName())."</option>";
-					else print "<option value=\"".$usr->getID()."\">". htmlspecialchars($usr->getLogin()." - ".$usr->getFullName())."</option>";
+					$option = array($usr->getID(), htmlspecialchars($usr->getLogin()." - ".$usr->getFullName()), null);
+					if ($mandatory) $option[] = array(array('disabled', 'disabled'));
+					$options[] = $option;
 				}
-?>
-				</select>
-<?php
 				$tmp = array();
 				foreach($reviewStatus as $r) {
 					if($r['type'] == 0) {
-					 	if($res) {
+						if($res) {
 							$mandatory=false;
 							foreach ($res as $rr)
 								if ($rr['reviewerUserID']==$r['required']) {
@@ -281,8 +301,9 @@ $(document).ready(function() {
 						}
 					}
 				}
+				$fieldwrap = array();
 				if($tmp) {
-					$this->printSelectPresetButtonHtml("IndReviewer", $tmp);
+					$fieldwrap = array('', $this->getSelectPresetButtonHtml("IndReviewers", $tmp));
 				}
 				/* List all mandatory reviewers */
 				if($res) {
@@ -294,11 +315,27 @@ $(document).ready(function() {
 						}
 					}
 					if($tmp) {
-						echo '<div class="mandatories"><span>'.getMLText('mandatory_reviewers').':</span> ';
-						echo implode(', ', $tmp);
-						echo "</div>\n";
+						if(isset($fieldwrap[1]))
+							$fieldwrap[1] .= '<div class="mandatories"><span>'.getMLText('mandatory_reviewers').':</span> '.implode(', ', $tmp)."</div>\n";
+						else
+							$fieldwrap[1] = '<div class="mandatories"><span>'.getMLText('mandatory_reviewers').':</span> '.implode(', ', $tmp)."</div>\n";
 					}
 				}
+
+				$this->formField(
+					getMLText("individuals"),
+					array(
+						'element'=>'select',
+						'name'=>'indReviewers[]',
+						'id'=>'IndReviewers',
+						'class'=>'chzn-select',
+						'attributes'=>array(array('data-placeholder', getMLText('select_ind_reviewers'))),
+						'multiple'=>true,
+						'options'=>$options
+					),
+					array('field_wrap'=>$fieldwrap)
+				);
+
 				/* Check for mandatory reviewer without access */
 				foreach($res as $r) {
 					if($r['reviewerUserID']) {
@@ -309,45 +346,38 @@ $(document).ready(function() {
 						}
 						if(!$hasAccess) {
 							$noAccessUser = $dms->getUser($r['reviewerUserID']);
-							echo "<div class=\"alert alert-warning\">".getMLText("mandatory_reviewer_no_access", array('user'=>htmlspecialchars($noAccessUser->getFullName()." (".$noAccessUser->getLogin().")")))."</div>";
+							$this->warningMsg(getMLText("mandatory_reviewer_no_access", array('user'=>htmlspecialchars($noAccessUser->getFullName()." (".$noAccessUser->getLogin().")"))));
 						}
 					}
 				}
-?>
-      </td>
-    </tr>
-      <tr>
-        <td>
-			<div class="cbSelectTitle"><?php printMLText("individuals_in_groups");?>:</div>
-        </td>
-        <td>
-        <select class="chzn-select span9" name="grpIndReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_reviewers'); ?>">
-<?php
-			foreach ($docAccess["groups"] as $grp) {
-				print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
-			}
-?>
-			</select>
-			</td>
-			</tr>
-    <tr>
-      <td>
-				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
-      </td>
-      <td>
-        <select id="GrpReviewer" class="chzn-select span9" name="grpReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_reviewers'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
-<?php
+
+				$options = array();
+				foreach ($docAccess["groups"] as $grp) {
+					$options[] = array($grp->getID(), htmlspecialchars($grp->getName()));
+				}
+				$this->formField(
+					getMLText("individuals_in_groups"),
+					array(
+						'element'=>'select',
+						'name'=>'grpIndReviewers[]',
+						'id'=>'GrpIndReviewers',
+						'class'=>'chzn-select',
+						'attributes'=>array(array('data-placeholder', getMLText('select_grp_ind_reviewers'))),
+						'multiple'=>true,
+						'options'=>$options
+					)
+				);
+
+				$options = array();
 				foreach ($docAccess["groups"] as $grp) {
 				
 					$mandatory=false;
 					foreach ($res as $r) if ($r['reviewerGroupID']==$grp->getID()) $mandatory=true;	
 
-					if ($mandatory || !$grp->getUsers()) print "<option value=\"".$grp->getID()."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
-					else print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
+					$option = array($grp->getID(), htmlspecialchars($grp->getName()), null);
+					if ($mandatory || !$grp->getUsers()) $option[] = array(array('disabled', 'disabled'));
+					$options[] = $option;
 				}
-?>
-			</select>
-<?php
 				$tmp = array();
 				foreach($reviewStatus as $r) {
 					if($r['type'] == 1) {
@@ -364,8 +394,9 @@ $(document).ready(function() {
 						}
 					}
 				}
+				$fieldwrap = array('', '');
 				if($tmp) {
-					$this->printSelectPresetButtonHtml("GrpReviewer", $tmp);
+					$fieldwrap = array('', $this->getSelectPresetButtonHtml("GrpReviewers", $tmp));
 				}
 				/* List all mandatory groups of reviewers */
 				if($res) {
@@ -377,11 +408,22 @@ $(document).ready(function() {
 						}
 					}
 					if($tmp) {
-						echo '<div class="mandatories"><span>'.getMLText('mandatory_reviewergroups').':</span> ';
-						echo implode(', ', $tmp);
-						echo "</div>\n";
+						$fieldwrap[1] .= '<div class="mandatories"><span>'.getMLText('mandatory_reviewergroups').':</span> '.implode(', ', $tmp)."</div>\n";
 					}
 				}
+				$this->formField(
+					getMLText("groups"),
+					array(
+						'element'=>'select',
+						'name'=>'grpReviewers[]',
+						'id'=>'GrpReviewers',
+						'class'=>'chzn-select',
+						'attributes'=>array(array('data-placeholder', getMLText('select_grp_reviewers'))),
+						'multiple'=>true,
+						'options'=>$options
+					),
+					array('field_wrap'=>$fieldwrap)
+				);
 
 				/* Check for mandatory reviewer group without access */
 				foreach($res as $r) {
@@ -393,73 +435,72 @@ $(document).ready(function() {
 						}
 						if(!$hasAccess) {
 							$noAccessGroup = $dms->getGroup($r['reviewerGroupID']);
-							echo "<div class=\"alert alert-warning\">".getMLText("mandatory_reviewergroup_no_access", array('group'=>htmlspecialchars($noAccessGroup->getName())))."</div>";
+							$this->warningMsg(getMLText("mandatory_reviewergroup_no_access", array('group'=>htmlspecialchars($noAccessGroup->getName()))));
 						}
 					}
 				}
-?>
-      </td>
-		</tr>
-<?php } ?>
-    <tr>
-			<td colspan=2>
-				<?php $this->contentSubHeading(getMLText("assign_approvers")); ?>	
-      </td>
-    </tr>
-    <tr>
-      <td>
-				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
-      </td>
-      <td>
-        <select id="IndApprover" class="chzn-select span9" name="indApprovers[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_approvers'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
-<?php
-				$res=$user->getMandatoryApprovers();
-				foreach ($docAccess["users"] as $usr) {
-					if (!$enableselfrevapp && $usr->getID()==$user->getID()) continue; 
+			}
 
-					$mandatory=false;
-					foreach ($res as $r) if ($r['approverUserID']==$usr->getID()) $mandatory=true;
-					
-					if ($mandatory) print "<option value=\"". $usr->getID() ."\" disabled='disabled'>". htmlspecialchars($usr->getFullName())."</option>";
-					else print "<option value=\"". $usr->getID() ."\">". htmlspecialchars($usr->getLogin()." - ".$usr->getFullName())."</option>";
-				}
-?>
-        </select>
-<?php
-				$tmp = array();
-				foreach($approvalStatus as $r) {
-					if($r['type'] == 0) {
-						if($res) {
-							$mandatory=false;
-							foreach ($res as $rr)
-								if ($rr['approverUserID']==$r['required']) {
-									$mandatory=true;
-								}
-							if(!$mandatory)
-								$tmp[] = $r['required'];
-						} else {
+			$this->contentSubHeading(getMLText("assign_approvers"));
+			$options = array();
+			$res=$user->getMandatoryApprovers();
+			foreach ($docAccess["users"] as $usr) {
+				if (!$enableselfrevapp && $usr->getID()==$user->getID()) continue; 
+
+				$mandatory=false;
+				foreach ($res as $r) if ($r['approverUserID']==$usr->getID()) $mandatory=true;
+				
+				$option = array($usr->getID(), htmlspecialchars($usr->getLogin()." - ".$usr->getFullName()), null);
+				if ($mandatory) $option[] = array(array('disabled', 'disabled'));
+				$options[] = $option;
+			}
+			$tmp = array();
+			foreach($approvalStatus as $r) {
+				if($r['type'] == 0) {
+					if($res) {
+						$mandatory=false;
+						foreach ($res as $rr)
+							if ($rr['approverUserID']==$r['required']) {
+								$mandatory=true;
+							}
+						if(!$mandatory)
 							$tmp[] = $r['required'];
-						}
+					} else {
+						$tmp[] = $r['required'];
+					}
+				}
+			}
+			$fieldwrap = array();
+			if($tmp) {
+				$fieldwrap = array('', $this->getSelectPresetButtonHtml("IndApprovers", $tmp));
+			}
+			/* List all mandatory approvers */
+			if($res) {
+				$tmp = array();
+				foreach ($res as $r) {
+					if($r['approverUserID'] > 0) {
+						$u = $dms->getUser($r['approverUserID']);
+						$tmp[] =  htmlspecialchars($u->getFullName().' ('.$u->getLogin().')');
 					}
 				}
 				if($tmp) {
-					$this->printSelectPresetButtonHtml("IndApprover", $tmp);
-				}
-				/* List all mandatory approvers */
-				if($res) {
-					$tmp = array();
-					foreach ($res as $r) {
-						if($r['approverUserID'] > 0) {
-							$u = $dms->getUser($r['approverUserID']);
-							$tmp[] =  htmlspecialchars($u->getFullName().' ('.$u->getLogin().')');
-						}
-					}
-					if($tmp) {
-						echo '<div class="mandatories"><span>'.getMLText('mandatory_approvers').':</span> ';
-						echo implode(', ', $tmp);
-						echo "</div>\n";
-					}
+					$fieldwrap[1] .= '<div class="mandatories"><span>'.getMLText('mandatory_approvers').':</span> '.implode(', ', $tmp)."</div>\n";
 				}
+			}
+
+			$this->formField(
+				getMLText("individuals"),
+				array(
+					'element'=>'select',
+					'name'=>'indApprovers[]',
+					'id'=>'IndApprovers',
+					'class'=>'chzn-select',
+					'attributes'=>array(array('data-placeholder', getMLText('select_ind_approvers'))),
+					'multiple'=>true,
+					'options'=>$options
+				),
+				array('field_wrap'=>$fieldwrap)
+			);
 
 				/* Check for mandatory approvers without access */
 				foreach($res as $r) {
@@ -471,46 +512,39 @@ $(document).ready(function() {
 						}
 						if(!$hasAccess) {
 							$noAccessUser = $dms->getUser($r['approverUserID']);
-							echo "<div class=\"alert alert-warning\">".getMLText("mandatory_approver_no_access", array('user'=>htmlspecialchars($noAccessUser->getFullName()." (".$noAccessUser->getLogin().")")))."</div>";
+							$this->warningMsg(getMLText("mandatory_approver_no_access", array('user'=>htmlspecialchars($noAccessUser->getFullName()." (".$noAccessUser->getLogin().")"))));
 						}
 					}
 				}
-?>
-      </td>
-		</tr>
-		  <tr>	
-        <td>
-			<div class="cbSelectTitle"><?php printMLText("individuals_in_groups");?>:</div>
-        </td>
-        <td>
-      <select class="chzn-select span9" name="grpIndApprovers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_approvers'); ?>">
-<?php
-			foreach ($docAccess["groups"] as $grp) {
-				print "<option value=\"". $grp->getID() ."\">".htmlspecialchars($grp->getName())."</option>";
-			}
-?>
-			</select>
-				</td>
-			</tr>	
-		<tr>
-      <td>
-				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
-      </td>
-      <td>
-        <select id="GrpApprover" class="chzn-select span9" name="grpApprovers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_approvers'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
-<?php
+
+				$options = array();
+				foreach ($docAccess["groups"] as $grp) {
+					$options[] = array($grp->getID(), htmlspecialchars($grp->getName()));
+				}
+				$this->formField(
+					getMLText("individuals_in_groups"),
+					array(
+						'element'=>'select',
+						'name'=>'grpIndApprovers[]',
+						'id'=>'GrpIndApprovers',
+						'class'=>'chzn-select',
+						'attributes'=>array(array('data-placeholder', getMLText('select_grp_ind_approvers'))),
+						'multiple'=>true,
+						'options'=>$options
+					)
+				);
+
+				$options = array();
 				foreach ($docAccess["groups"] as $grp) {
 				
 					$mandatory=false;
 					foreach ($res as $r) if ($r['approverGroupID']==$grp->getID()) $mandatory=true;	
 
-					if ($mandatory || !$grp->getUsers()) print "<option value=\"". $grp->getID() ."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
-					else print "<option value=\"". $grp->getID() ."\">".htmlspecialchars($grp->getName())."</option>";
+					$option = array($grp->getID(), htmlspecialchars($grp->getName()), null);
+					if ($mandatory || !$grp->getUsers()) $option[] = array(array('disabled', 'disabled'));
 
+					$options[] = $option;
 				}
-?>
-        </select>
-<?php
 				$tmp = array();
 				foreach($approvalStatus as $r) {
 					if($r['type'] == 1) {
@@ -527,8 +561,9 @@ $(document).ready(function() {
 						}
 					}
 				}
+				$fieldwrap = array('', '');
 				if($tmp) {
-					$this->printSelectPresetButtonHtml("GrpApprover", $tmp);
+					$fieldwrap = array('', $this->getSelectPresetButtonHtml("GrpApprovers", $tmp));
 				}
 				/* List all mandatory groups of approvers */
 				if($res) {
@@ -540,12 +575,24 @@ $(document).ready(function() {
 						}
 					}
 					if($tmp) {
-						echo '<div class="mandatories"><span>'.getMLText('mandatory_approvergroups').':</span> ';
-						echo implode(', ', $tmp);
-						echo "</div>\n";
+						$fieldwrap[1] .= '<div class="mandatories"><span>'.getMLText('mandatory_approvergroups').':</span> '.implode(', ', $tmp)."</div>\n";
 					}
 				}
 
+				$this->formField(
+					getMLText("groups"),
+					array(
+						'element'=>'select',
+						'name'=>'grpApprovers[]',
+						'id'=>'GrpApprovers',
+						'class'=>'chzn-select',
+						'attributes'=>array(array('data-placeholder', getMLText('select_grp_approvers'))),
+						'multiple'=>true,
+						'options'=>$options
+					),
+					array('field_wrap'=>$fieldwrap)
+				);
+
 				/* Check for mandatory approver groups without access */
 				foreach($res as $r) {
 					if ($r['approverGroupID']) {
@@ -556,138 +603,90 @@ $(document).ready(function() {
 						}
 						if(!$hasAccess) {
 							$noAccessGroup = $dms->getGroup($r['approverGroupID']);
-							echo "<div class=\"alert alert-warning\">".getMLText("mandatory_approvergroup_no_access", array('group'=>htmlspecialchars($noAccessGroup->getName())))."</div>";
+							$this->warningMsg(getMLText("mandatory_approvergroup_no_access", array('group'=>htmlspecialchars($noAccessGroup->getName()))));
 						}
 					}
 				}
-?>
-			</td>
-			</tr>
-		<tr>
-			<td colspan="2"><div class="alert"><?php printMLText("add_doc_reviewer_approver_warning")?></div></td>
-		</tr>
-<?php
-	} else {
-?>
-		<tr>	
-      <td>
-			<div class="cbSelectTitle"><?php printMLText("workflow");?>:</div>
-      </td>
-      <td>
-<?php
-				$mandatoryworkflow = $user->getMandatoryWorkflow();
-				if($mandatoryworkflow) {
-?>
-				<?php echo $mandatoryworkflow->getName(); ?>
-				<input type="hidden" name="workflow" value="<?php echo $mandatoryworkflow->getID(); ?>">
-<?php
-				} else {
-?>
-        <select class="_chzn-select-deselect span9" name="workflow" data-placeholder="<?php printMLText('select_workflow'); ?>">
-<?php
-					$workflows=$dms->getAllWorkflows();
-					print "<option value=\"\">"."</option>";
-					foreach ($workflows as $workflow) {
-						print "<option value=\"".$workflow->getID()."\"";
-						if($mandatoryworkflow && $mandatoryworkflow->getID() == $workflow->getID())
-							echo " selected=\"selected\"";
-						print ">". htmlspecialchars($workflow->getName())."</option>";
-					}
-?>
-        </select>
-<?php
-				}
-?>
-      </td>
-    </tr>
-		<tr>	
-      <td colspan="2">
-			<?php $this->warningMsg(getMLText("add_doc_workflow_warning")); ?>
-      </td>
-		</tr>	
-<?php
-	}
-	if($enablereceiptworkflow) {
-		$docAccess = $folder->getReadAccessList();
-?>
-		<tr>
-			<td colspan="2">
-				<?php $this->contentSubHeading(getMLText("assign_recipients")); ?>
-      </td>
-    </tr>
-    <tr>
-      <td>
-				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
-      </td>
-			<td>
-        <select id="IndRecipient" class="chzn-select span9" name="indRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
-<?php
-				foreach ($docAccess["users"] as $usr) {
-					if (!$enableselfreceipt && $usr->getID()==$user->getID()) continue; 
-					print "<option value=\"".$usr->getID()."\">". htmlspecialchars($usr->getLogin()." - ".$usr->getFullName())."</option>";
-				}
-?>
-				</select>
-<?php
-				$tmp = array();
-				foreach($receiptStatus as $r) {
-					if($r['type'] == 0) {
-						$tmp[] = $r['required'];
-					}
-				}
-				if($tmp) {
-					$this->printSelectPresetButtonHtml("IndRecipient", $tmp);
-				}
-?>
-      </td>
-    </tr>
-      <tr>
-        <td>
-			<div class="cbSelectTitle"><?php printMLText("individuals_in_groups");?>:</div>
-        </td>
-        <td>
-        <select class="chzn-select span9" name="grpIndRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_recipients'); ?>">
-<?php
-			foreach ($docAccess["groups"] as $grp) {
-				print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
+			$this->warningMsg(getMLText("add_doc_reviewer_approver_warning"));
+		}
+		if($enablereceiptworkflow) {
+			$options = array();
+			foreach ($docAccess["users"] as $usr) {
+				if (!$enableselfreceipt && $usr->getID()==$user->getID()) continue; 
+				$options[] = array($usr->getID(), htmlspecialchars($usr->getLogin()." - ".$usr->getFullName()));
 			}
-?>
-			</select>
-			</td>
-			</tr>
-    <tr>
-      <td>
-				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
-      </td>
-      <td>
-        <select id="GrpRecipient" class="chzn-select span9" name="grpRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
-<?php
-				foreach ($docAccess["groups"] as $grp) {
-					print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
+			$tmp = array();
+			foreach($receiptStatus as $r) {
+				if($r['type'] == 0) {
+					$tmp[] = $r['required'];
 				}
-?>
-			</select>
-<?php
-				$tmp = array();
-				foreach($receiptStatus as $r) {
-					if($r['type'] == 1) {
-						$tmp[] = $r['required'];
-					}
-				}
-				if($tmp) {
-					$this->printSelectPresetButtonHtml("GrpRecipient", $tmp);
+			}
+			$fieldwrap = array();
+			if($tmp) {
+				$fieldwrap = array('', $this->getSelectPresetButtonHtml("IndRecipient", $tmp));
+			}
+			$this->formField(
+				getMLText("assign_recipients"),
+				array(
+					'element'=>'select',
+					'name'=>'indRecipients[]',
+					'id'=>'IndRecipient',
+					'class'=>'chzn-select',
+					'attributes'=>array(array('data-placeholder', getMLText('select_ind_recipients')), array('data-no_results_text', getMLText('unknown_owner'))),
+					'multiple'=>true,
+					'options'=>$options
+				),
+				array('field_wrap'=>$fieldwrap)
+			);
+
+			$options = array();
+			foreach ($docAccess["groups"] as $grp) {
+				$options[] = array($grp->getID(), htmlspecialchars($grp->getName()));
+			}
+			$this->formField(
+				getMLText("individuals_in_groups"),
+				array(
+					'element'=>'select',
+					'name'=>'grpIndRecipients[]',
+					'id'=>'GrpIndRecipient',
+					'class'=>'chzn-select',
+					'attributes'=>array(array('data-placeholder', getMLText('select_grp_ind_recipients'))),
+					'multiple'=>true,
+					'options'=>$options
+				)
+			);
+
+			$options = array();
+			foreach ($docAccess["groups"] as $grp) {
+				$options[] = array($grp->getID(), htmlspecialchars($grp->getName()));
+			}
+			$tmp = array();
+			foreach($receiptStatus as $r) {
+				if($r['type'] == 1) {
+					$tmp[] = $r['required'];
 				}
+			}
+			$fieldwrap = array();
+			if($tmp) {
+				$fieldwrap = array('', $this->getSelectPresetButtonHtml("GrpRecipient", $tmp));
+			}
+			$this->formField(
+				getMLText("assign_recipients"),
+				array(
+					'element'=>'select',
+					'name'=>'grpRecipients[]',
+					'id'=>'GrpRecipient',
+					'class'=>'chzn-select',
+					'attributes'=>array(array('data-placeholder', getMLText('select_grp_recipients')), array('data-no_results_text', getMLText('unknown_owner'))),
+					'multiple'=>true,
+					'options'=>$options
+				),
+				array('field_wrap'=>$fieldwrap)
+			);
+
+		}
+		$this->formSubmit(getMLText('checkin_document'));
 ?>
-      </td>
-		</tr>
-<?php
-	}
-?>
-		<tr>
-			<td></td>
-			<td><input type="submit" class="btn" value="<?php printMLText("checkin_document")?>"></td>
-		</tr>
-	</table>
 </form>
 
 <?php

From d9c1d2f5af613ac17a6633a46881631d58a6f992 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Sep 2020 08:56:58 +0200
Subject: [PATCH 136/312] add item for 6.0.13

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 9511a7433..cfbf81b94 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 --------------------------------------------------------------------------------
 - merge changes up to 5.1.20
 - create download file for transmittal in system tmp (Closes: #478)
+- sync source code of checkin with update document
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.12

From 5148f27a01a723e3510fa759a25d8270f597011b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Sep 2020 11:42:54 +0200
Subject: [PATCH 137/312] set propper id of input field for library document to
 fix validation

---
 views/bootstrap/class.AddDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 89e18a431..ee5feb453 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -113,10 +113,10 @@ $(document).ready(function() {
 		} else {
 ?>
 			'userfile[]': {
-				alternatives: [$('#dropfolderfileadddocform'), $('#choosedocsearchadddocform')]
+				alternatives: [$('#dropfolderfileadddocform'), $('#choosedocsearch<?= md5('librarydoc'.'adddocform') ?>')]
 			},
 			dropfolderfileadddocform: {
-				 alternatives: [$("#userfile"), $('#choosedocsearchadddocform')]
+				 alternatives: [$("#userfile"), $('#choosedocsearch<?= md5('librarydoc'.'adddocform') ?>')]
 			}
 <?php
 		}

From 656cc5843f36d331cfd71cb3b459451d57b7563d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Sep 2020 11:55:40 +0200
Subject: [PATCH 138/312] keep .htaccess file when downloading an extension

---
 inc/inc.ClassExtensionMgr.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index 10917adc8..f3f1d1487 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -256,7 +256,8 @@ class SeedDMS_Extension_Mgr {
 				if( in_array(substr($file, strrpos($file, '/')+1), array('.', '..')) )
 					continue;
 				// Ignore all files and directories starting with a '.'
-				if( preg_match('#/\\.#', $file) )
+				// but keep an .htaccess file
+				if( !preg_match('#\\.htaccess$#', $file) && preg_match('#/\\.#', $file) )
 					continue;
 
 				$file = realpath($file);

From 05a69171026bcd3c716499202fcca23fa31a04c4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Sep 2020 16:50:50 +0200
Subject: [PATCH 139/312] add simple task manager in js

---
 styles/bootstrap/application.js     | 67 ++++++++++++++++++-----------
 views/bootstrap/class.Bootstrap.php |  4 +-
 2 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index f59fddf76..255c8f410 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -1227,32 +1227,49 @@ $(document).ready(function() { /* {{{ */
 	});
 }); /* }}} */
 
+(function( SeedDMSTask, $, undefined ) { /* {{{ */
 	var approval_count, review_count, workflow_count;
-	var checkTasks = function() {
-		$.ajax({url: '../out/out.Tasks.php',
-			type: 'GET',
-			dataType: "json",
-			data: {action: 'mytasks'},
-			success: function(data) {
-				if(data) {
-					if((typeof data.data.approval != 'undefined' && approval_count != data.data.approval.length) ||
-						 (typeof data.data.review != 'undefined' && review_count != data.data.review.length) ||
-						 (typeof data.data.workflow != 'undefined' && workflow_count != data.data.workflow.length)) {
-//						$("#menu-tasks").html('Loading').hide().load('../out/out.Tasks.php?action=menutasks').fadeIn('500')
-						$('#menu-tasks > div.ajax').trigger('update', {folderid: seeddms_folder});
-						approval_count = typeof data.data.approval != 'undefined' ? data.data.approval.length : 0;
-						review_count = typeof data.data.review != 'undefined' ? data.data.review.length : 0;
-						workflow_count = typeof data.data.workflow != 'undefined' ? data.data.workflow.length : 0;
-					}
-				}
-			},
-			timeout: 3000
-		}); 
-		timeOutId = setTimeout(checkTasks, 30000);
+	var timeout = 1000;
+	var counter = 0;
+	var tasks = Array(
+		{name: 'checktasks', interval: 15, func: 
+			checkTasks = function() {
+				$.ajax({url: '../out/out.Tasks.php',
+					type: 'GET',
+					dataType: "json",
+					data: {action: 'mytasks'},
+					success: function(data) {
+						if(data) {
+							if((typeof data.data.approval != 'undefined' && approval_count != data.data.approval.length) ||
+								 (typeof data.data.review != 'undefined' && review_count != data.data.review.length) ||
+								 (typeof data.data.workflow != 'undefined' && workflow_count != data.data.workflow.length)) {
+		//						$("#menu-tasks").html('Loading').hide().load('../out/out.Tasks.php?action=menutasks').fadeIn('500')
+								$('#menu-tasks > div.ajax').trigger('update', {folderid: seeddms_folder});
+								approval_count = typeof data.data.approval != 'undefined' ? data.data.approval.length : 0;
+								review_count = typeof data.data.review != 'undefined' ? data.data.review.length : 0;
+								workflow_count = typeof data.data.workflow != 'undefined' ? data.data.workflow.length : 0;
+							}
+						}
+					},
+					timeout: 3000
+				}); 
+			}
+		}
+	);
+
+	SeedDMSTask.add = function(task) {
+		tasks.push(task);
 	}
 
-	var updateDropFolder = function() {
-		$('#menu-dropfolder > div.ajax').trigger('update', {folderid: seeddms_folder});
-		timeOutId = setTimeout(updateDropFolder, 60000);
+	SeedDMSTask.run = function() {
+		for(let task of tasks) {
+			if(counter % task.interval == 0) {
+//			console.log("Running task '" + task.name + "'");
+				task.func();
+			}
+		}
+		//console.log(counter);
+		counter++;
+		timeOutId = setTimeout(SeedDMSTask.run, timeout);
 	}
-
+}( window.SeedDMSTask = window.SeedDMSTask || {}, jQuery )); /* }}} */
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 3a51b5315..3a5240084 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -182,10 +182,10 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo '<script src="'.$this->params['absbaseprefix'].'out/out.'.$this->params['class'].'.php?'.http_build_query($tmp).'"></script>'."\n";
 		echo '<script src="../styles/'.$this->theme.'/application.js"></script>'."\n";
 		if($this->params['enablemenutasks'] && isset($this->params['user']) && $this->params['user']) {
-			$this->addFooterJS('checkTasks();');
+			$this->addFooterJS('SeedDMSTask.run();');
 		}
 		if($this->params['enabledropfolderlist'] && isset($this->params['user']) && $this->params['user']) {
-			$this->addFooterJS('updateDropFolder();');
+			$this->addFooterJS("SeedDMSTask.add({name: 'dropfolder', interval: 15, func: function(){\$('#menu-dropfolder > div.ajax').trigger('update', {folderid: seeddms_folder});}});");
 		}
 		if($this->footerjs) {
 			$jscode = "$(document).ready(function () {\n";

From 08e04e3170a7d6f7c86c0208ddd026882252ca51 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 25 Sep 2020 08:58:02 +0200
Subject: [PATCH 140/312] new icon for TransferObjects and RemoveFromProcesses

---
 views/bootstrap/class.UsrMgr.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 2cdfc5e63..78756f756 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -184,8 +184,8 @@ $(document).ready( function() {
 			if(!in_array($seluser->getID(), $undeluserids)) {
 				echo '<li><a href="../out/out.RemoveUser.php?userid='.$seluser->getID().'"><i class="fa fa-remove"></i> '.getMLText("rm_user").'</a><li>';
 			}
-			echo '<li><a href="../out/out.RemoveUserFromProcesses.php?userid='.$seluser->getID().'"><i class="fa fa-remove"></i> '.getMLText("rm_user_from_processes").'</a></li>';
-			echo '<li><a href="../out/out.TransferObjects.php?userid='.$seluser->getID().'"><i class="fa fa-share-alt"></i> '.getMLText("transfer_objects").'</a></li>';
+			echo '<li><a href="../out/out.RemoveUserFromProcesses.php?userid='.$seluser->getID().'"><i class="fa fa-unlink"></i> '.getMLText("rm_user_from_processes").'</a></li>';
+			echo '<li><a href="../out/out.TransferObjects.php?userid='.$seluser->getID().'"><i class="fa fa-share-square-o"></i> '.getMLText("transfer_objects").'</a></li>';
 			if($user->isAdmin() && $seluser->getID() != $user->getID())
 				echo "<li><a href=\"../op/op.SubstituteUser.php?userid=".$seluser->getID()."&formtoken=".createFormKey('substituteuser')."\"><i class=\"fa fa-exchange\"></i> ".getMLText("substitute_user")."</a></li>\n";
 			if($enableemail)

From 6fedb19490482be3bbf49d3d61332f7df02f6239 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 27 Sep 2020 10:34:10 +0200
Subject: [PATCH 141/312] header and footer of body can be skipped

---
 inc/inc.ClassEmailNotify.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/inc/inc.ClassEmailNotify.php b/inc/inc.ClassEmailNotify.php
index 5980b6159..674043faa 100644
--- a/inc/inc.ClassEmailNotify.php
+++ b/inc/inc.ClassEmailNotify.php
@@ -76,10 +76,14 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 	 * @param string $message key of string containing the body of the mail
 	 * @param array $params list of parameters which replaces placeholder in
 	 *        the subject and body
+	 *        This may contain the special keys
+	 *        __lang__: use this language for the email
+	 *        __skip_header__: do not include the standard body header
+	 *        __skip_footer__: do not include the standard body footer
 	 * @param array $attachments list of attachments
 	 * @return false or -1 in case of error, otherwise true
 	 */
-	function toIndividual($sender, $recipient, $subject, $message, $params=array(), $attachments=array()) { /* {{{ */
+	function toIndividual($sender, $recipient, $subject, $messagekey, $params=array(), $attachments=array()) { /* {{{ */
 		if(is_object($recipient) && !strcasecmp(get_class($recipient), $this->_dms->getClassname('user')) && !$recipient->isDisabled() && $recipient->getEmail()!="") {
 			$to = $recipient->getEmail();
 			$lang = $recipient->getLanguage();
@@ -107,8 +111,12 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 		}
 
 
-		$message = getMLText("email_header", $params, "", $lang)."\r\n\r\n".getMLText($message, $params, "", $lang);
-		$message .= "\r\n\r\n".getMLText("email_footer", $params, "", $lang);
+		$message = '';
+		if(!isset($params['__skip_header__']) || !$params['__skip_header__'])
+			$message .= getMLText("email_header", $params, "", $lang)."\r\n\r\n";
+		$message .= getMLText($messagekey, $params, "", $lang);
+		if(!isset($params['__skip_footer__']) || !$params['__skip_footer__'])
+			$message .= "\r\n\r\n".getMLText("email_footer", $params, "", $lang);
 
 		$mime = new Mail_mime(array('eol' => "\n"));
 

From 2ff0979275eb728db830cc4978a0397a2a1fce9c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 28 Sep 2020 17:28:47 +0200
Subject: [PATCH 142/312] log user who failed to login

---
 webdav/webdav.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webdav/webdav.php b/webdav/webdav.php
index e3ce26d7b..c147a10d0 100644
--- a/webdav/webdav.php
+++ b/webdav/webdav.php
@@ -171,7 +171,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 
 		if(!$userobj) {
 			if($this->logger)
-				$this->logger->log('check_auth: No such user', PEAR_LOG_NOTICE);
+				$this->logger->log('check_auth: No such user'.$user, PEAR_LOG_NOTICE);
 			return false;
 		}
 

From 9d2fba4fc614f0cab0b3d799c1c9f7a910f0559f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 28 Sep 2020 19:15:00 +0200
Subject: [PATCH 143/312] log failed authentication at ldap server

---
 controllers/class.Login.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/controllers/class.Login.php b/controllers/class.Login.php
index 491fbd6d0..ef96153ee 100644
--- a/controllers/class.Login.php
+++ b/controllers/class.Login.php
@@ -104,6 +104,9 @@ class SeedDMS_Controller_Login extends SeedDMS_Controller_Common {
 			require_once("../inc/inc.ClassLdapAuthentication.php");
 			$authobj = new SeedDMS_LdapAuthentication($dms, $settings);
 			$user = $authobj->authenticate($login, $pwd);
+			if(!$user) {
+				add_log_line('Authentication against LDAP failed for user '.$login);
+			}
 		} /* }}} */
 
 		/* Authenticate against SeedDMS database {{{ */

From d323c33b35d457e5495e2a401a8c697ad652cae2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 29 Sep 2020 09:56:38 +0200
Subject: [PATCH 144/312] more translations and phrases

---
 languages/ar_EG/lang.inc | 15 ++++++++++++---
 languages/bg_BG/lang.inc |  9 +++++++++
 languages/ca_ES/lang.inc |  9 +++++++++
 languages/cs_CZ/lang.inc |  9 +++++++++
 languages/de_DE/lang.inc | 11 ++++++++++-
 languages/el_GR/lang.inc | 19 ++++++++++++++-----
 languages/en_GB/lang.inc | 11 ++++++++++-
 languages/es_ES/lang.inc |  9 +++++++++
 languages/fr_FR/lang.inc | 37 +++++++++++++++++++++++--------------
 languages/hr_HR/lang.inc | 13 +++++++++++--
 languages/hu_HU/lang.inc | 13 +++++++++++--
 languages/it_IT/lang.inc | 15 ++++++++++++---
 languages/ko_KR/lang.inc |  9 +++++++++
 languages/lo_LA/lang.inc |  9 +++++++++
 languages/nb_NO/lang.inc |  9 +++++++++
 languages/nl_NL/lang.inc |  9 +++++++++
 languages/pl_PL/lang.inc |  9 +++++++++
 languages/pt_BR/lang.inc |  9 +++++++++
 languages/ro_RO/lang.inc |  9 +++++++++
 languages/ru_RU/lang.inc | 17 +++++++++++++----
 languages/sk_SK/lang.inc |  9 +++++++++
 languages/sv_SE/lang.inc |  9 +++++++++
 languages/tr_TR/lang.inc | 13 +++++++++++--
 languages/uk_UA/lang.inc |  9 +++++++++
 languages/zh_CN/lang.inc | 13 +++++++++++--
 languages/zh_TW/lang.inc |  9 +++++++++
 26 files changed, 273 insertions(+), 39 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index b7cb5cb26..c305f1d63 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2264)
+//    Translators: Admin (2266)
 
 $text = array(
 '2_factor_auth' => 'توثيق ذو عاملين',
@@ -326,6 +326,7 @@ URL: [url]',
 'details' => 'تفاصيل',
 'details_version' => 'تفاصيل هذا الاصدار: [version]',
 'de_DE' => 'الألمانية',
+'disable_extension' => '',
 'disclaimer' => 'هذه المنطقة محظورة. الدخول فقط مسموح للموظفين المعتمدين. اي اختراق سيتم التعامل معه وفقا للقوانين المحلية والدولية.',
 'discspace' => 'مساحة القرص',
 'docs_in_reception_no_access' => 'الدخول مرفوض الى المستندات في الإستقبال',
@@ -494,6 +495,7 @@ URL: [url]',
 'empty_folder_list' => 'لايوجد مستندات او مجلدات',
 'empty_list' => 'الائحة خالية',
 'empty_notify_list' => 'لايوجد مدخلات',
+'enable_extension' => '',
 'en_GB' => 'الإنكليزية (GB)',
 'equal_transition_states' => 'حالة البداية والنهاية متشابهة',
 'error' => 'خطأ',
@@ -532,6 +534,7 @@ URL: [url]',
 'expire_in_1y' => 'تنتهي صلاحيته بعد سنة',
 'expire_in_2h' => 'تنتهي صلاحيته بعد ساعتين',
 'expire_in_2y' => 'تنتهي صلاحيته بعد سنتين',
+'expire_in_3y' => '',
 'expire_today' => 'تنتهي صلاحيته اليوم',
 'expire_tomorrow' => 'تنتهي صلاحيته غدا',
 'expiry_changed_email' => 'تم تغيير تاريخ الصلاحية',
@@ -650,7 +653,7 @@ URL: [url]',
 'import_extension' => 'استيراد إضافات',
 'import_fs' => 'نسخ من ملف النظام',
 'import_fs_warning' => 'تحذير النسخ من ملف النظام',
-'import_users' => '',
+'import_users' => 'ﺎﺴﺘﻳﺭﺍﺩ ﻢﺴﺘﺧﺪﻤﻴﻧ',
 'import_users_addnew' => '',
 'import_users_update' => '',
 'include_content' => 'إضافة المحتوى',
@@ -782,6 +785,7 @@ URL: [url]',
 'may' => 'مايو',
 'menu_dropfolder' => 'صفحة المجلد',
 'menu_upload_from_dropfolder' => 'صفحة التحميل من المجلد',
+'message' => '',
 'mimetype' => 'نوع الملف',
 'minutes' => 'دقائق',
 'misc' => 'متنوعات',
@@ -1140,7 +1144,7 @@ URL: [url]',
 'scheduler_class_description' => 'تفصيل جدول الصف',
 'scheduler_class_parameter' => 'معامل جدول الصف',
 'scheduler_class_tasks' => 'مهام جدول الصف',
-'scheduler_task_mgr' => '',
+'scheduler_task_mgr' => 'ﺎﻠﺟﺩﻮﻟﺓ',
 'search' => 'البحث',
 'search_fulltext' => 'بحث في النص الكامل',
 'search_in' => 'بحث في',
@@ -1181,7 +1185,9 @@ URL: [url]',
 'select_ind_recipients' => 'اختيار مستلم فردي',
 'select_ind_reviewers' => 'اضغط لاختيار مراجع فردي',
 'select_ind_revisors' => 'اضغط لإختيار مراجعين فرديين',
+'select_mimetype' => '',
 'select_one' => 'اختر واحد',
+'select_owner' => '',
 'select_user' => 'اختر مستخدم',
 'select_users' => 'اضغط لاختيار المستخدم',
 'select_value' => 'ًاختار قيمة',
@@ -1406,6 +1412,8 @@ URL: [url]',
 'settings_initialDocumentStatus_desc' => 'حالة المستند الأولي',
 'settings_initialDocumentStatus_draft' => 'حالة المستند الأولي, المسودة',
 'settings_initialDocumentStatus_released' => 'حالة المستند الأولي, صدر',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => 'تثبيت ADOdb',
 'settings_install_disabled' => 'توقيف المثبت',
 'settings_install_pear_package_log' => 'تثبيت سجل الحزمة',
@@ -1611,6 +1619,7 @@ URL: [url]',
 'splash_document_edited' => 'تم تحرير المستند',
 'splash_document_indexed' => 'تم فهرسة المستند',
 'splash_document_locked' => 'تم قفل المستند',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => 'تم الغاء قفل المستند',
 'splash_edit_access' => 'تحرير الدخول',
 'splash_edit_attribute' => 'تحرير السمة',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 1de27655d..0ea74b0ed 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -309,6 +309,7 @@ $text = array(
 'details' => 'Детайли',
 'details_version' => 'Детайли за версия: [version]',
 'de_DE' => 'Немски',
+'disable_extension' => '',
 'disclaimer' => 'Работим аккуратно и задълбочено. От това зависи бъдeщето на нашата страна и благополучието на народа.nПетилетката за три години!nДа не оставим неодрусана слива в наше село!',
 'discspace' => '',
 'docs_in_reception_no_access' => '',
@@ -447,6 +448,7 @@ $text = array(
 'empty_folder_list' => 'Няма документи или папки',
 'empty_list' => '',
 'empty_notify_list' => 'Няма записи',
+'enable_extension' => '',
 'en_GB' => 'Английски (Великобритания)',
 'equal_transition_states' => 'Началното и крайно състояние са еднакви',
 'error' => 'Грешка',
@@ -485,6 +487,7 @@ $text = array(
 'expire_in_1y' => 'Изтича след 1 година',
 'expire_in_2h' => '',
 'expire_in_2y' => 'Изтича след 2 години',
+'expire_in_3y' => '',
 'expire_today' => '',
 'expire_tomorrow' => '',
 'expiry_changed_email' => 'Датата на изтичане променена',
@@ -711,6 +714,7 @@ $text = array(
 'may' => 'май',
 'menu_dropfolder' => '',
 'menu_upload_from_dropfolder' => '',
+'message' => '',
 'mimetype' => 'Mime тип',
 'minutes' => 'минути',
 'misc' => 'Разни',
@@ -1044,7 +1048,9 @@ $text = array(
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Кликни да избереш рецензент',
 'select_ind_revisors' => '',
+'select_mimetype' => '',
 'select_one' => 'Избери един',
+'select_owner' => '',
 'select_user' => '',
 'select_users' => 'Кликни да избереш потребители',
 'select_value' => 'Избери стойност',
@@ -1269,6 +1275,8 @@ $text = array(
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
 'settings_initialDocumentStatus_released' => '',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => 'Инсталирай ADOdb',
 'settings_install_disabled' => 'ENABLE_INSTALL_TOOL изтрит. Сега може да влезете за последваща конфигурация на системата.',
 'settings_install_pear_package_log' => 'Инсталирай пакета Pear \'Log\'',
@@ -1474,6 +1482,7 @@ $text = array(
 'splash_document_edited' => '',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Документът е заключен',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => 'Документа е отключен',
 'splash_edit_access' => '',
 'splash_edit_attribute' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index b97a8492c..fc90c92f5 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -314,6 +314,7 @@ URL: [url]',
 'details' => 'Detalls',
 'details_version' => 'Detalls de la versió: [version]',
 'de_DE' => 'Alemany',
+'disable_extension' => '',
 'disclaimer' => 'Aquesta és una àrea restringida. Només es permet l\'accés a usuaris autoritzats. Qualsevol intrusió es perseguirà d\'acord amb les lleis internacionals.',
 'discspace' => '',
 'docs_in_reception_no_access' => '',
@@ -452,6 +453,7 @@ URL: [url]',
 'empty_folder_list' => 'Sense documents o carpetes',
 'empty_list' => '',
 'empty_notify_list' => 'No hi ha entrades',
+'enable_extension' => '',
 'en_GB' => 'Anglès (Regne Unit)',
 'equal_transition_states' => '',
 'error' => '',
@@ -490,6 +492,7 @@ URL: [url]',
 'expire_in_1y' => 'Expira en un any',
 'expire_in_2h' => '',
 'expire_in_2y' => 'Expira en dos anys',
+'expire_in_3y' => '',
 'expire_today' => '',
 'expire_tomorrow' => '',
 'expiry_changed_email' => 'Data de caducitat modificada',
@@ -716,6 +719,7 @@ URL: [url]',
 'may' => 'Maig',
 'menu_dropfolder' => '',
 'menu_upload_from_dropfolder' => '',
+'message' => '',
 'mimetype' => '',
 'minutes' => '',
 'misc' => 'Miscelànea',
@@ -1049,7 +1053,9 @@ URL: [url]',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => '',
 'select_ind_revisors' => '',
+'select_mimetype' => '',
 'select_one' => 'Seleccionar un',
+'select_owner' => '',
 'select_user' => '',
 'select_users' => 'Prem per seleccionar els usuaris',
 'select_value' => 'Selecciona un valor',
@@ -1274,6 +1280,8 @@ URL: [url]',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
 'settings_initialDocumentStatus_released' => '',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => 'Install ADOdb',
 'settings_install_disabled' => '',
 'settings_install_pear_package_log' => '',
@@ -1479,6 +1487,7 @@ URL: [url]',
 'splash_document_edited' => '',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Document blocat',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => 'Document desblocat',
 'splash_edit_access' => '',
 'splash_edit_attribute' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 339ea1550..956cd3088 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -338,6 +338,7 @@ URL: [url]',
 'details' => 'Podrobnosti',
 'details_version' => 'Podrobnosti verze: [version]',
 'de_DE' => 'Němčina',
+'disable_extension' => '',
 'disclaimer' => 'Toto je neveřejná oblast. Přístup povolen pouze oprávněným uživatelům. Jakékoliv narušení bude stíháno podle platných právních norem.',
 'discspace' => 'Místo na disku',
 'docs_in_reception_no_access' => 'Dokumenty s přijetím, ale bez přístupu příjemce',
@@ -518,6 +519,7 @@ URL: [url]',
 'empty_folder_list' => 'Žádné dokumenty nebo složky',
 'empty_list' => 'Žádné záznamy',
 'empty_notify_list' => 'Žádné položky',
+'enable_extension' => '',
 'en_GB' => 'Angličtina (GB)',
 'equal_transition_states' => 'Počáteční a konečný stav transformace jsou stejné',
 'error' => 'Error',
@@ -556,6 +558,7 @@ URL: [url]',
 'expire_in_1y' => 'Platnost vyprší za rok',
 'expire_in_2h' => 'Platnost vyprší za dvě hodiny',
 'expire_in_2y' => 'Expiruje za dva roky',
+'expire_in_3y' => '',
 'expire_today' => 'Platnost vyprší dnes',
 'expire_tomorrow' => 'Platnost vyprší zítra',
 'expiry_changed_email' => 'Datum expirace změněno',
@@ -813,6 +816,7 @@ URL: [url]',
 'may' => 'Květen',
 'menu_dropfolder' => 'Vhazovací složka',
 'menu_upload_from_dropfolder' => '',
+'message' => '',
 'mimetype' => 'Typ "MIME"',
 'minutes' => 'minuty',
 'misc' => 'Různé',
@@ -1248,7 +1252,9 @@ URL: [url]',
 'select_ind_recipients' => 'Kliknutím vybrat jednotlivého příjemce',
 'select_ind_reviewers' => 'Kliknutím vybrat jednotlivého recenzenta',
 'select_ind_revisors' => 'Kliknutím vybrat jednotlivého revizora',
+'select_mimetype' => '',
 'select_one' => 'Vybrat jeden',
+'select_owner' => '',
 'select_user' => 'Vybrat uživatele',
 'select_users' => 'Kliknutím vybrat uživatele',
 'select_value' => 'Vybrat hodnotu',
@@ -1478,6 +1484,8 @@ Jméno: [username]
 'settings_initialDocumentStatus_desc' => 'Tento stav bude nastaven při přidání dokumentu.',
 'settings_initialDocumentStatus_draft' => 'Návrh',
 'settings_initialDocumentStatus_released' => 'vydán',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => 'Install ADOdb',
 'settings_install_disabled' => 'Soubor ENABLE_INSTALL_TOOL byl smazán. Nyní se můžete přihlásit do SeedDMS a provést další konfiguraci.',
 'settings_install_pear_package_log' => 'Nainstalujte PEAR balík \'Log\'',
@@ -1683,6 +1691,7 @@ Jméno: [username]
 'splash_document_edited' => 'Dokument uložen',
 'splash_document_indexed' => 'Dokument naindexován',
 'splash_document_locked' => 'Dokument zamčen',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => 'Dokument odemčen',
 'splash_edit_access' => 'Přístupová práva změněna',
 'splash_edit_attribute' => 'Atribut uložen',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index fcf90519c..3815b1b0c 100644
--- 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 (2804), dgrutsch (22)
+//    Translators: Admin (2813), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -338,6 +338,7 @@ URL: [url]',
 'details' => 'Details',
 'details_version' => 'Details für Version: [version]',
 'de_DE' => 'Deutsch',
+'disable_extension' => 'Erweiterung deaktivieren',
 'disclaimer' => 'Dies ist ein geschützter Bereich. Nur authorisiertes Personal hat Zugriff. Jegliche Verstöße werden nach geltendem Recht (Englisch und International) verfolgt.',
 'discspace' => 'Plattenplatz',
 'docs_in_reception_no_access' => 'Dokumente mit Empfangsbestätigung ohne Zugriff des Empfängers',
@@ -518,6 +519,7 @@ URL: [url]',
 'empty_folder_list' => 'Keine Dokumente oder Ordner',
 'empty_list' => 'Keine Einträge',
 'empty_notify_list' => 'Keine Beobachter',
+'enable_extension' => 'Erweiterunge aktivieren',
 'en_GB' => 'Englisch (GB)',
 'equal_transition_states' => 'Start- und Endstatus ѕind gleich',
 'error' => 'Fehler',
@@ -556,6 +558,7 @@ URL: [url]',
 'expire_in_1y' => 'Ablauf in 1 Jahr',
 'expire_in_2h' => 'Ablauf in 2 Std.',
 'expire_in_2y' => 'Ablauf in 2 Jahren',
+'expire_in_3y' => 'Ablauf in 3 Jahren',
 'expire_today' => 'Ablauf heute',
 'expire_tomorrow' => 'Ablauf morgen',
 'expiry_changed_email' => 'Ablaufdatum geändert',
@@ -813,6 +816,7 @@ URL: [url]',
 'may' => 'Mai',
 'menu_dropfolder' => 'Ablageordner',
 'menu_upload_from_dropfolder' => 'Diese Datei importieren',
+'message' => 'Meldung',
 'mimetype' => 'Mime-Type',
 'minutes' => 'Minuten',
 'misc' => 'Sonstiges',
@@ -1259,7 +1263,9 @@ URL: [url]',
 'select_ind_recipients' => 'Klicken zur Auswahl eines Empfängers',
 'select_ind_reviewers' => 'Klicken zur Auswahl eines Prüfers',
 'select_ind_revisors' => 'Klicken zur Auswahl eines Wiederholungsprüfers',
+'select_mimetype' => 'Klicken zur Auswahl eines Mimetypes',
 'select_one' => 'Bitte wählen',
+'select_owner' => 'Klicken zur Auswahl eines Besitzers',
 'select_user' => 'Benutzer auswählen',
 'select_users' => 'Klicken zur Auswahl eines Benutzers',
 'select_value' => 'Wert auswählen',
@@ -1489,6 +1495,8 @@ Name: [username]
 'settings_initialDocumentStatus_desc' => 'Dieser STatus wird bei Dokumenten gesetzt, die neu hinzugefügt wurden.',
 'settings_initialDocumentStatus_draft' => 'Entwurf',
 'settings_initialDocumentStatus_released' => 'freigegeben',
+'settings_inlineEditing' => 'Editieren auf der Seite',
+'settings_inlineEditing_desc' => 'Erlaubt das Ändern des Dokumentnamens direkt auf der Detailseite.',
 'settings_installADOdb' => 'Installieren Sie ADOdb',
 'settings_install_disabled' => 'Datei ENABLE_INSTALL_TOOL wurde gelöscht. Sie können sich nun bei SeedDMS anmeldung und mit der Konfiguration fortfahren.',
 'settings_install_pear_package_log' => 'Installiere Pear package \'Log\'',
@@ -1694,6 +1702,7 @@ Name: [username]
 'splash_document_edited' => 'Dokument gespeichert',
 'splash_document_indexed' => 'Dokument \'[name]\' indiziert.',
 'splash_document_locked' => 'Dokument gesperrt',
+'splash_document_name_changed' => 'Dokumentenname geändert',
 'splash_document_unlocked' => 'Dokumentensperre aufgehoben',
 'splash_edit_access' => 'Zugriffsrecht verändert',
 'splash_edit_attribute' => 'Attribut gespeichert',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 039210e27..a79db8d21 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (322)
+//    Translators: Admin (326)
 
 $text = array(
 '2_factor_auth' => '',
@@ -29,7 +29,7 @@ $text = array(
 'access_control' => '',
 'access_control_is_off' => '',
 'access_denied' => '',
-'access_inheritance' => '',
+'access_inheritance' => 'Κληρονομικότητα πρόσβασης',
 'access_mode' => 'Είδος πρόσβασης',
 'access_mode_all' => 'Πλήρης πρόσβαση',
 'access_mode_none' => 'Χωρίς πρόσβαση',
@@ -309,6 +309,7 @@ $text = array(
 'details' => 'Λεπτομέρειες',
 'details_version' => 'Λεπτομέρειες για την έκδοση: [version]',
 'de_DE' => 'German/Γερμανικά',
+'disable_extension' => '',
 'disclaimer' => 'Διαβαθμισμένη περιοχή. Η πρόσβαση επιτρέπεται μόνο σε εξουσιοδοτημένο προσωπικό. Κάθε παράβαση διώκεται σύμφωνα με τους εθνικούς και διεθνής νόμους.',
 'discspace' => '',
 'docs_in_reception_no_access' => '',
@@ -447,6 +448,7 @@ $text = array(
 'empty_folder_list' => 'Δεν υπάρχουν αρχεία ή φάκελοι',
 'empty_list' => '',
 'empty_notify_list' => '',
+'enable_extension' => '',
 'en_GB' => 'English (GB)/Αγγλικά',
 'equal_transition_states' => '',
 'error' => 'Λάθος',
@@ -485,6 +487,7 @@ $text = array(
 'expire_in_1y' => 'Λήγει σε 1 έτος',
 'expire_in_2h' => '',
 'expire_in_2y' => 'Λήγει σε 2 έτη',
+'expire_in_3y' => '',
 'expire_today' => '',
 'expire_tomorrow' => '',
 'expiry_changed_email' => 'Η ημερομηνία λήξης έχει αλλάξει',
@@ -598,9 +601,9 @@ $text = array(
 'individuals_in_groups' => '',
 'info_recipients_tab_not_released' => '',
 'inherited' => 'Κληρονομημένο',
-'inherits_access_copy_msg' => '',
-'inherits_access_empty_msg' => '',
-'inherits_access_msg' => '',
+'inherits_access_copy_msg' => 'Αντιγραφή δικαιωμάτων πρόσβασης',
+'inherits_access_empty_msg' => 'Έναρξη με κενή λίστα δικαιωμάτων πρόσβασης',
+'inherits_access_msg' => 'Η πρόσβαση κληρονομήθηκε',
 'installed_php_extensions' => '',
 'internal_error' => 'Εσωτερικό λάθος',
 'internal_error_exit' => '',
@@ -711,6 +714,7 @@ $text = array(
 'may' => 'Μάϊος',
 'menu_dropfolder' => '',
 'menu_upload_from_dropfolder' => '',
+'message' => '',
 'mimetype' => '',
 'minutes' => 'λεπτά',
 'misc' => 'Διάφορα',
@@ -1055,7 +1059,9 @@ URL: [url]',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => '',
 'select_ind_revisors' => '',
+'select_mimetype' => '',
 'select_one' => 'Επιλογή',
+'select_owner' => '',
 'select_user' => 'Επιλογή χρήστη',
 'select_users' => '',
 'select_value' => 'Επιλέξτε τιμή',
@@ -1280,6 +1286,8 @@ URL: [url]',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
 'settings_initialDocumentStatus_released' => '',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => '',
 'settings_install_disabled' => '',
 'settings_install_pear_package_log' => '',
@@ -1485,6 +1493,7 @@ URL: [url]',
 'splash_document_edited' => '',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Κλειδωμένο έγγραφο',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => '',
 'splash_edit_access' => '',
 'splash_edit_attribute' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 8a08b1abd..90279fd46 100644
--- 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 (1912), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1921), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -338,6 +338,7 @@ URL: [url]',
 'details' => 'Details',
 'details_version' => 'Details for version: [version]',
 'de_DE' => 'German',
+'disable_extension' => 'Disable extension',
 'disclaimer' => 'This is a classified area. Access is permitted only to authorized personnel. Any violation will be prosecuted according to the national and international laws.',
 'discspace' => 'Disc space',
 'docs_in_reception_no_access' => 'Documents with reception without access by recipient',
@@ -518,6 +519,7 @@ URL: [url]',
 'empty_folder_list' => 'No documents or folders',
 'empty_list' => 'No entries',
 'empty_notify_list' => 'No entries',
+'enable_extension' => 'Enable extension',
 'en_GB' => 'English (GB)',
 'equal_transition_states' => 'Start and end state are equal',
 'error' => 'Error',
@@ -556,6 +558,7 @@ URL: [url]',
 'expire_in_1y' => 'Expires in 1 year',
 'expire_in_2h' => 'Expires in 2h',
 'expire_in_2y' => 'Expires in 2 years',
+'expire_in_3y' => 'Expires in 3 years',
 'expire_today' => 'Expires today',
 'expire_tomorrow' => 'Expires tomorrow',
 'expiry_changed_email' => 'Expiry date changed',
@@ -813,6 +816,7 @@ URL: [url]',
 'may' => 'May',
 'menu_dropfolder' => 'Drop folder',
 'menu_upload_from_dropfolder' => 'Import this file',
+'message' => 'Message',
 'mimetype' => 'Mime type',
 'minutes' => 'minutes',
 'misc' => 'Misc',
@@ -1253,7 +1257,9 @@ URL: [url]',
 'select_ind_recipients' => 'Click to select individual recipients',
 'select_ind_reviewers' => 'Click to select individual reviewer',
 'select_ind_revisors' => 'Click to select individual revisors',
+'select_mimetype' => 'Click to select mimetype',
 'select_one' => 'Select one',
+'select_owner' => 'Click to select owner',
 'select_user' => 'Select user',
 'select_users' => 'Click to select users',
 'select_value' => 'Select value',
@@ -1483,6 +1489,8 @@ Name: [username]
 'settings_initialDocumentStatus_desc' => 'This status will be set when a document is added.',
 'settings_initialDocumentStatus_draft' => 'Draft',
 'settings_initialDocumentStatus_released' => 'released',
+'settings_inlineEditing' => 'Inline editing',
+'settings_inlineEditing_desc' => 'If enable, it will be possibly to edit the document name on the details page.',
 'settings_installADOdb' => 'Install ADOdb',
 'settings_install_disabled' => 'File ENABLE_INSTALL_TOOL was deleted. You can now log into SeedDMS and do further configuration.',
 'settings_install_pear_package_log' => 'Install Pear package \'Log\'',
@@ -1688,6 +1696,7 @@ Name: [username]
 'splash_document_edited' => 'Document saved',
 'splash_document_indexed' => 'Document \'[name]\' indexed.',
 'splash_document_locked' => 'Document locked',
+'splash_document_name_changed' => 'Document name changed',
 'splash_document_unlocked' => 'Document unlocked',
 'splash_edit_access' => 'Access right changed',
 'splash_edit_attribute' => 'Attribute saved',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index de48c3f26..b61aad99c 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -333,6 +333,7 @@ URL: [url]',
 'details' => 'Detalles',
 'details_version' => 'Detalles de la versión: [version]',
 'de_DE' => 'Aleman',
+'disable_extension' => '',
 'disclaimer' => 'Esta es un área restringida. Se permite el acceso únicamente a personal autorizado. Cualquier intrusión se perseguirá conforme a las leyes internacionales.',
 'discspace' => 'Espacio en disco',
 'docs_in_reception_no_access' => 'Documentos recibidos sin acceso por recipiente',
@@ -501,6 +502,7 @@ URL: [url]',
 'empty_folder_list' => 'Sin documentos o carpetas',
 'empty_list' => 'Sin registros',
 'empty_notify_list' => 'Sin entradas',
+'enable_extension' => '',
 'en_GB' => 'Ingless (GB)',
 'equal_transition_states' => 'Estado inicial y final son iguales',
 'error' => 'Error',
@@ -539,6 +541,7 @@ URL: [url]',
 'expire_in_1y' => 'Expira en 1 año',
 'expire_in_2h' => 'Vence en 2 horas',
 'expire_in_2y' => 'Expira en 2 años',
+'expire_in_3y' => '',
 'expire_today' => 'Vence Hoy',
 'expire_tomorrow' => 'Vence mañana',
 'expiry_changed_email' => 'Fecha de caducidad modificada',
@@ -789,6 +792,7 @@ URL: [url]',
 'may' => 'Mayo',
 'menu_dropfolder' => '',
 'menu_upload_from_dropfolder' => '',
+'message' => '',
 'mimetype' => 'Tipo Mime',
 'minutes' => 'minutos',
 'misc' => 'Misc',
@@ -1196,7 +1200,9 @@ URL: [url]',
 'select_ind_recipients' => 'Dar click para asignar los receptores',
 'select_ind_reviewers' => 'Haga Click para seleccionar revisor individual',
 'select_ind_revisors' => '',
+'select_mimetype' => '',
 'select_one' => 'Seleccionar uno',
+'select_owner' => '',
 'select_user' => 'Seleccionar Usuario',
 'select_users' => 'Haga Click para seleccionar usuarios',
 'select_value' => 'Selecciona valor',
@@ -1421,6 +1427,8 @@ URL: [url]',
 'settings_initialDocumentStatus_desc' => 'Este estatus se fijará cuando un documento sea añadido.',
 'settings_initialDocumentStatus_draft' => 'Borrador',
 'settings_initialDocumentStatus_released' => 'Liberado',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => 'Instalar ADOdb',
 'settings_install_disabled' => 'El archivo ENABLE_INSTALL_TOOL ha sido eliminado. Ahora puede conectarse a SeedDMS y seguir con la configuración.',
 'settings_install_pear_package_log' => 'Instale el paquete Pear \'Log\'',
@@ -1626,6 +1634,7 @@ URL: [url]',
 'splash_document_edited' => 'Documento guardado',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Documento bloqueado',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => 'Documento desbloqueado',
 'splash_edit_access' => '',
 'splash_edit_attribute' => 'Atributo guardado',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 24706a3c0..51a04099c 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1103), jeromerobert (50), lonnnew (9), Oudiceval (951)
+//    Translators: Admin (1104), jeromerobert (50), lonnnew (9), Oudiceval (966)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -156,7 +156,7 @@ URL : [url]',
 'attrdef_management' => 'Gestion des définitions d\'attributs',
 'attrdef_maxvalues' => 'Nombre maximum de valeurs',
 'attrdef_minvalues' => 'Nombre minimum de valeurs',
-'attrdef_minvalues_help' => '',
+'attrdef_minvalues_help' => 'Nombre minimum de valeurs. Définir à 1 si l’attribut doit être défini.',
 'attrdef_min_greater_max' => 'Le nombre minimum de valeurs est supérieur au maximum',
 'attrdef_multiple' => 'Permettre des valeurs multiples',
 'attrdef_multiple_needs_valueset' => 'Une définition d’attribut à valeurs multiples nécessite un ensemble de valeurs.',
@@ -165,21 +165,21 @@ URL : [url]',
 'attrdef_noname' => 'Le nom d\'attribut est manquant',
 'attrdef_objtype' => 'Type objet',
 'attrdef_regex' => 'Expression régulière',
-'attrdef_regex_help' => '',
+'attrdef_regex_help' => 'Expression régulière qui doit correspondre avec la valeur de l’attribut de type chaîne.',
 'attrdef_type' => 'Type',
 'attrdef_type_boolean' => 'Valeur booléenne',
 'attrdef_type_date' => 'Date',
-'attrdef_type_document' => '',
+'attrdef_type_document' => 'Document',
 'attrdef_type_email' => 'E-mail',
 'attrdef_type_float' => 'Décimal',
-'attrdef_type_folder' => '',
-'attrdef_type_group' => '',
+'attrdef_type_folder' => 'Dossier',
+'attrdef_type_group' => 'Groupe',
 'attrdef_type_int' => 'Entier',
 'attrdef_type_string' => 'Chaîne',
 'attrdef_type_url' => 'URL',
-'attrdef_type_user' => '',
+'attrdef_type_user' => 'Utilisateur',
 'attrdef_valueset' => 'Ensemble de valeurs',
-'attrdef_valueset_help' => '',
+'attrdef_valueset_help' => 'Liste de valeurs séparées par un caractère arbitraire, qui doit également être le premier et le dernier caractère de la chaîne. Ex : #un#deux#trois#',
 'attributes' => 'Attributs',
 'attribute_changed_email_body' => 'Attribut changé
 Document: [name]
@@ -315,7 +315,7 @@ URL: [url]',
 'converter_new_cmd' => 'Commande',
 'converter_new_mimetype' => 'Nouveau type MIME',
 'copied_to_checkout_as' => 'Fichier copié dans l’espace de blocage en tant que « [filename] » ([date])',
-'create_download_link' => '',
+'create_download_link' => 'Créer un lien de téléchargement',
 'create_fulltext_index' => 'Créer un index de recherche plein texte',
 'create_fulltext_index_warning' => 'Vous allez recréer l\'index de recherche plein texte. Cela peut prendre un temps considérable et réduire les performances de votre système dans son ensemble. Si vous voulez vraiment recréer l\'index, merci de confirmer votre opération.',
 'creation_date' => 'Créé le',
@@ -338,6 +338,7 @@ URL: [url]',
 'details' => 'Détails',
 'details_version' => 'Détails de la version: [version]',
 'de_DE' => 'Allemand',
+'disable_extension' => 'Désactiver l’extension',
 'disclaimer' => 'Cet espace est protégé. Son accès est strictement réservé aux utilisateurs autorisés.<br/>Tout accès non autorisé est punissable par les lois internationales.',
 'discspace' => 'Espace disque',
 'docs_in_reception_no_access' => 'Documents en attente de réception sans accès du destinataire',
@@ -387,7 +388,7 @@ Dossier parent: [folder_path]
 Utilisateur: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename] : [name] - Commentaire modifié',
-'document_content_missing' => '',
+'document_content_missing' => 'Contenu du document manquant',
 'document_count' => 'Nombre de documents',
 'document_deleted' => 'Document supprimé',
 'document_deleted_email' => 'Document supprimé',
@@ -518,6 +519,7 @@ URL: [url]',
 'empty_folder_list' => 'Pas de documents ou de dossier',
 'empty_list' => 'Aucune entrée',
 'empty_notify_list' => 'Aucune entrée',
+'enable_extension' => '',
 'en_GB' => 'Anglais (RU)',
 'equal_transition_states' => 'États de début et de fin identiques',
 'error' => 'Erreur',
@@ -556,6 +558,7 @@ URL: [url]',
 'expire_in_1y' => 'Expire dans 1 an',
 'expire_in_2h' => 'Expire dans 2 heures',
 'expire_in_2y' => 'Expire dans 2 ans',
+'expire_in_3y' => 'Expire dans 3 ans',
 'expire_today' => 'Expire aujourd’hui',
 'expire_tomorrow' => 'Expire demain',
 'expiry_changed_email' => 'Date d\'expiration modifiée',
@@ -571,10 +574,10 @@ URL : [url]',
 'extension_changelog' => 'Journal des modifications',
 'extension_loading' => 'Chargement des extensions…',
 'extension_manager' => 'Gestionnaire d\'extensions',
-'extension_mgr_error_upload' => '',
+'extension_mgr_error_upload' => 'Erreur lors du chargement de l’extension',
 'extension_mgr_installed' => 'Installées',
 'extension_mgr_no_upload' => 'L’ajout de nouvelles extensions n’est pas possible car le répertoire des extensions n’est pas accessible en écriture.',
-'extension_mgr_no_zipfile' => '',
+'extension_mgr_no_zipfile' => 'L’extension chargée n’est pas un dossier zip',
 'extension_mgr_repository' => 'Disponibles',
 'extension_version_list' => 'Versions',
 'february' => 'Février',
@@ -689,7 +692,7 @@ URL: [url]',
 'include_subdirectories' => 'Inclure les sous-dossiers',
 'indexing_tasks_in_queue' => 'Opérations d’indexation en attente',
 'index_converters' => '',
-'index_document_unchanged' => '',
+'index_document_unchanged' => 'Document inchangé',
 'index_done' => 'Terminé',
 'index_error' => 'Erreur',
 'index_folder' => 'Dossier Index',
@@ -813,6 +816,7 @@ URL: [url]',
 'may' => 'Mai',
 'menu_dropfolder' => 'Dossier de dépôt',
 'menu_upload_from_dropfolder' => 'Importer ce fichier',
+'message' => '',
 'mimetype' => 'Type MIME',
 'minutes' => 'minutes',
 'misc' => 'Divers',
@@ -1251,7 +1255,9 @@ URL : [url]',
 'select_ind_recipients' => 'Cliquer pour choisir un destinataire individuel',
 'select_ind_reviewers' => 'Cliquer pour choisir un examinateur individuel',
 'select_ind_revisors' => 'Cliquer pour choisir un réviseur individuel',
+'select_mimetype' => '',
 'select_one' => 'Selectionner',
+'select_owner' => '',
 'select_user' => 'Sélectionner un utilisateur',
 'select_users' => 'Cliquer pour choisir un utilisateur',
 'select_value' => 'Sélectionner une valeur',
@@ -1481,6 +1487,8 @@ Nom : [username]
 'settings_initialDocumentStatus_desc' => 'État du document défini lors de l’ajout',
 'settings_initialDocumentStatus_draft' => 'ébauche',
 'settings_initialDocumentStatus_released' => 'publié',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => 'Installer ADOdb',
 'settings_install_disabled' => 'Le fichier ENABLE_INSTALL_TOOL a été supprimé. Vous pouvez maintenant vous connecter à SeedDMS et poursuivre la configuration.',
 'settings_install_pear_package_log' => 'Installer le paquet Pear \'Log\'',
@@ -1686,6 +1694,7 @@ Nom : [username]
 'splash_document_edited' => 'Document sauvegardé',
 'splash_document_indexed' => 'Document « [name] » indexé.',
 'splash_document_locked' => 'Document verrouillé',
+'splash_document_name_changed' => 'Nom du document modifié',
 'splash_document_unlocked' => 'Document déverrouillé',
 'splash_edit_access' => 'Droits d’accès modifiés',
 'splash_edit_attribute' => 'Attribut modifié',
@@ -1867,7 +1876,7 @@ URL : [url]',
 'tr_TR' => 'Turc',
 'tuesday' => 'Mardi',
 'tuesday_abbr' => 'Mar.',
-'types_generic' => '',
+'types_generic' => 'Types génériques',
 'type_of_hook' => 'Type',
 'type_to_filter' => 'Filtrer dans la liste',
 'type_to_search' => 'Effectuer une recherche',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index e65d2e221..f2d939ab7 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1240), marbanas (16)
+//    Translators: Admin (1241), marbanas (16)
 
 $text = array(
 '2_factor_auth' => '',
@@ -141,7 +141,7 @@ Internet poveznica: [url]',
 'archive_creation_warning' => 'Ovom radnjom možete izraditi arhivu koja sadrži datoteke cijele DMS mape. Nakon izrade arhiva će biti pohranjena u podatkovnu mapu vašer servera.<br>UPOZORENJE: arhiva izrađena na način da je čitljiva ljudima, bit će bezkorisna kao sigurnosna kopija servera.',
 'ar_EG' => 'Arapski',
 'assign_approvers' => 'Dodijeli validatore',
-'assign_recipients' => '',
+'assign_recipients' => 'Dodaj primaoca',
 'assign_reviewers' => 'Dodijeli recezente',
 'assign_user_property_to' => 'Dodijeli svojstva korisnika za',
 'assumed_released' => 'Podrazumijevano obrađeno',
@@ -338,6 +338,7 @@ Internet poveznica: [url]',
 'details' => 'Detalji',
 'details_version' => 'Detalji za verziju: [version]',
 'de_DE' => 'Njemački',
+'disable_extension' => '',
 'disclaimer' => 'Ovo je klasificirano područje. Pristup je omogućen samo ovlaštenim osobama. Sa svakim kršenjem bit će postupano sukladno nacionalnim i međunarodnim zakonima.',
 'discspace' => 'Prostor na disku',
 'docs_in_reception_no_access' => '',
@@ -506,6 +507,7 @@ Internet poveznica: [url]',
 'empty_folder_list' => 'Nema dokumenata ili mapa',
 'empty_list' => '',
 'empty_notify_list' => 'Nema zapisa',
+'enable_extension' => '',
 'en_GB' => 'Engleski (GB)',
 'equal_transition_states' => 'Početni i završni status su jednaki',
 'error' => 'Greška',
@@ -544,6 +546,7 @@ Internet poveznica: [url]',
 'expire_in_1y' => 'Istječe za 1 godinu',
 'expire_in_2h' => '',
 'expire_in_2y' => 'Istječe za 2 godine',
+'expire_in_3y' => '',
 'expire_today' => '',
 'expire_tomorrow' => '',
 'expiry_changed_email' => 'Promijenjen datum isteka',
@@ -794,6 +797,7 @@ Internet poveznica: [url]',
 'may' => 'Svibanj',
 'menu_dropfolder' => '',
 'menu_upload_from_dropfolder' => '',
+'message' => '',
 'mimetype' => 'Mime type',
 'minutes' => 'minute',
 'misc' => 'Razno',
@@ -1217,7 +1221,9 @@ Internet poveznica: [url]',
 'select_ind_recipients' => 'Kliknite za odabir pojedinačnog primatelja',
 'select_ind_reviewers' => 'Kliknite za odabir pojedinačnog recezenta',
 'select_ind_revisors' => 'Kliknite za odabir pojedinačnog revizora',
+'select_mimetype' => '',
 'select_one' => 'Odaberite jednog',
+'select_owner' => '',
 'select_user' => 'Izaberi korisnika',
 'select_users' => 'Kliknite za odabir korisnika',
 'select_value' => 'Odaberite vrijednost',
@@ -1442,6 +1448,8 @@ Internet poveznica: [url]',
 'settings_initialDocumentStatus_desc' => 'Ovo je status koji će biti postavljen za dokument prilikom dodavanja.',
 'settings_initialDocumentStatus_draft' => 'Nacrt',
 'settings_initialDocumentStatus_released' => 'oslobođeno',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => 'Instaliraj ADOdb',
 'settings_install_disabled' => 'Datoteka ENABLE_INSTALL_TOOL je izbrisana. Sada se možete prijaviti u ProsperaDMS i nastaviti konfiguraciju.',
 'settings_install_pear_package_log' => 'Instaliraj Pear paket \'Log\'',
@@ -1647,6 +1655,7 @@ Internet poveznica: [url]',
 'splash_document_edited' => 'Dokument pohranjen',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Dokument zaključan',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => 'Dokument otključan',
 'splash_edit_access' => '',
 'splash_edit_attribute' => 'Atribut pohranjen',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index f300f89b5..63f8aa29d 100644
--- 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 (643), Kalpy (113), ribaz (1036)
+//    Translators: Admin (644), Kalpy (113), ribaz (1036)
 
 $text = array(
 '2_factor_auth' => 'Kétfaktoros azonosítás',
@@ -333,6 +333,7 @@ URL: [url]',
 'details' => 'Részletek',
 'details_version' => 'Verzió részletek: [version]',
 'de_DE' => 'Német',
+'disable_extension' => '',
 'disclaimer' => 'Ez egy bizalmas terület. Hozzáférés kizárólag a meghatalmazott személyek részére engedélyezett. Bárminemű megsértését a nemzeti, illetve a nemzetközi jog szerint fogják büntetni.',
 'discspace' => 'Lemezterület',
 'docs_in_reception_no_access' => '',
@@ -501,6 +502,7 @@ URL: [url]',
 'empty_folder_list' => 'Mappa vagy dokumentum nem található',
 'empty_list' => '',
 'empty_notify_list' => 'Nincsenek bejegyzések',
+'enable_extension' => '',
 'en_GB' => 'Angol (GB)',
 'equal_transition_states' => 'A kezdő- és végállapot megegyezik',
 'error' => 'Hiba',
@@ -539,6 +541,7 @@ URL: [url]',
 'expire_in_1y' => 'Érvényesség egy éven belül',
 'expire_in_2h' => '',
 'expire_in_2y' => 'Érvényesség két éven belül',
+'expire_in_3y' => '',
 'expire_today' => '',
 'expire_tomorrow' => '',
 'expiry_changed_email' => 'Lejárati dátum módosítva',
@@ -657,7 +660,7 @@ URL: [url]',
 'import_extension' => 'Kiterjesztés import',
 'import_fs' => 'Importálás fájlrendszerből',
 'import_fs_warning' => '',
-'import_users' => '',
+'import_users' => 'Felhasználók importálása',
 'import_users_addnew' => '',
 'import_users_update' => '',
 'include_content' => '',
@@ -789,6 +792,7 @@ URL: [url]',
 'may' => 'Május',
 'menu_dropfolder' => '',
 'menu_upload_from_dropfolder' => '',
+'message' => '',
 'mimetype' => 'Mime típus',
 'minutes' => 'perc',
 'misc' => 'Vegyes',
@@ -1195,7 +1199,9 @@ URL: [url]',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Kattintson az önálló felülvizsgáló kijelöléséhez',
 'select_ind_revisors' => '',
+'select_mimetype' => '',
 'select_one' => 'Válasszon egyet',
+'select_owner' => '',
 'select_user' => 'Felhasználó kiválasztása',
 'select_users' => 'Kattintson a felhasználó kiválasztásához',
 'select_value' => 'Érték kiválasztása',
@@ -1420,6 +1426,8 @@ URL: [url]',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
 'settings_initialDocumentStatus_released' => '',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => 'ADOdb telepítése',
 'settings_install_disabled' => 'Az ENABLE_INSTALL_TOOL állomány törölve lett. Bejelentkezhet a SeedDMS alkalmazásba és elvégezheti a további konfigurációt.',
 'settings_install_pear_package_log' => 'PEAR csomag \'Log\' telepítése',
@@ -1625,6 +1633,7 @@ URL: [url]',
 'splash_document_edited' => 'Dokumentum elmentve',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Dokumentum zárolva',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => 'Dokumentum zárolás feloldva',
 'splash_edit_access' => '',
 'splash_edit_attribute' => 'Jellemző mentve',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index f5847422b..2209473ed 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2024), rickr (144), s.pnt (26)
+//    Translators: Admin (2026), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -338,6 +338,7 @@ URL: [url]',
 'details' => 'Dettagli',
 'details_version' => 'Dettagli versione: [version]',
 'de_DE' => 'Tedesco',
+'disable_extension' => '',
 'disclaimer' => 'Questa è un\'area riservata. L\'accesso è consentito solo agli utenti autorizzati. Qualunque violazione sarà perseguita a norma delle leggi italiane ed internazionali.',
 'discspace' => 'Spazio su disco',
 'docs_in_reception_no_access' => 'Documenti con ricezione senza accesso dai destinatari',
@@ -511,6 +512,7 @@ URL: [url]',
 'empty_folder_list' => 'Cartella vuota',
 'empty_list' => 'Nessuna voce',
 'empty_notify_list' => 'Nessun record',
+'enable_extension' => '',
 'en_GB' => 'Inglese (GB)',
 'equal_transition_states' => 'Lo stato iniziale e quello finale sono identici',
 'error' => 'Errore',
@@ -549,6 +551,7 @@ URL: [url]',
 'expire_in_1y' => 'Scade in 1 anno',
 'expire_in_2h' => 'Scade in 2 ore',
 'expire_in_2y' => 'Scade in 2 anni',
+'expire_in_3y' => '',
 'expire_today' => 'Scade oggi',
 'expire_tomorrow' => 'Scade domani',
 'expiry_changed_email' => 'Scadenza cambiata',
@@ -648,7 +651,7 @@ URL: [url]',
 'group_members' => 'Membri del gruppo',
 'group_receipt_summary' => 'Panoramica delle conferme ricevute gruppo.',
 'group_review_summary' => 'Dettaglio revisioni di gruppo',
-'group_revision_summary' => '',
+'group_revision_summary' => 'Riepilogo revisioni del gruppo',
 'guest_login' => 'Login come Ospite',
 'guest_login_disabled' => 'Il login come Ospite è disabilitato.',
 'hash' => 'Hash',
@@ -799,6 +802,7 @@ URL: [url]',
 'may' => 'Maggio',
 'menu_dropfolder' => 'Cartella di pubblicazione',
 'menu_upload_from_dropfolder' => 'Importa questo file',
+'message' => '',
 'mimetype' => 'Tipo (MIME)',
 'minutes' => 'minuti',
 'misc' => 'Varie',
@@ -1135,7 +1139,7 @@ URL: [url]',
 'revision_status' => 'Status',
 'revision_submit_email_body' => '',
 'revision_submit_email_subject' => '',
-'revision_summary' => '',
+'revision_summary' => 'Riepilogo revisione',
 'revisors' => 'Revisori',
 'revisor_already_assigned' => 'Utente già assegnato al ruolo di revisore',
 'revisor_already_removed' => 'Revisore già rimosso dal processo di riesame o ha già riesaminato il documento.',
@@ -1239,7 +1243,9 @@ URL: [url]',
 'select_ind_recipients' => 'Fare clic per selezionare un destinatario individuale',
 'select_ind_reviewers' => 'Fare clic per selezionare un revisore individuale',
 'select_ind_revisors' => 'Fare clic per selezionare un riesaminatore individuale',
+'select_mimetype' => '',
 'select_one' => 'Seleziona uno',
+'select_owner' => '',
 'select_user' => 'Seleziona utente',
 'select_users' => 'Clicca per selezionare gli utenti',
 'select_value' => 'Selezionare un valore',
@@ -1469,6 +1475,8 @@ Name: [username]
 'settings_initialDocumentStatus_desc' => 'Stato assegnato quando si aggiunge documento',
 'settings_initialDocumentStatus_draft' => 'Bozza',
 'settings_initialDocumentStatus_released' => 'Pubblicato',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => 'Installa ADOdb',
 'settings_install_disabled' => 'Il file ENABLE_INSTALL_TOOL è stato cancellato. Ora puoi effettuare il login in SeedDMS e fare ulteriori configurazioni.',
 'settings_install_pear_package_log' => 'Installa il registro del pacchetto Pear',
@@ -1674,6 +1682,7 @@ Name: [username]
 'splash_document_edited' => 'Documento modificato',
 'splash_document_indexed' => 'Documento indicizzato',
 'splash_document_locked' => 'Documento bloccato',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => 'Documento sbloccato',
 'splash_edit_access' => 'Accesso modificato',
 'splash_edit_attribute' => 'Attributo modificato',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 19d80b0bf..9b1b3ce3b 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -341,6 +341,7 @@ URL: [url]',
 'details' => '세부사항',
 'details_version' => '버전에 대한 상세 사항 : [version]',
 'de_DE' => '독일어',
+'disable_extension' => '',
 'disclaimer' => '본 사이트는 접근이 허가된 자에게만 사용이 허용된 곳 입니다. 허가받지 않은 접근이나 불법행위는 국내 및 국제법에 따라 기소 될 것입니다.',
 'discspace' => '디스크 공간',
 'docs_in_reception_no_access' => '',
@@ -507,6 +508,7 @@ URL: [url]',
 'empty_folder_list' => '문서 또는 폴더 입력',
 'empty_list' => '',
 'empty_notify_list' => '항목을 입력하세요',
+'enable_extension' => '',
 'en_GB' => '영어 (GB)',
 'equal_transition_states' => '시작 및 종료가 동일한 상태',
 'error' => '오류',
@@ -545,6 +547,7 @@ URL: [url]',
 'expire_in_1y' => '1년 후 만료',
 'expire_in_2h' => '',
 'expire_in_2y' => '2년 후에 만료',
+'expire_in_3y' => '',
 'expire_today' => '',
 'expire_tomorrow' => '',
 'expiry_changed_email' => '유효 기간 변경',
@@ -795,6 +798,7 @@ URL: [url]',
 'may' => '월',
 'menu_dropfolder' => '',
 'menu_upload_from_dropfolder' => '',
+'message' => '',
 'mimetype' => 'MIME 유형',
 'minutes' => '분',
 'misc' => '기타',
@@ -1211,7 +1215,9 @@ URL : [url]',
 'select_ind_recipients' => '개인별 받는 사람을 선택합니다',
 'select_ind_reviewers' => '클릭하여 개별 검토자를 고릅니다.',
 'select_ind_revisors' => '개별 감사를 선택합니다',
+'select_mimetype' => '',
 'select_one' => '선택',
+'select_owner' => '',
 'select_user' => '',
 'select_users' => '사용자를 선택합니다',
 'select_value' => '',
@@ -1436,6 +1442,8 @@ URL : [url]',
 'settings_initialDocumentStatus_desc' => '문서가 추가 된 경우이 상태가 설정 됩니다.',
 'settings_initialDocumentStatus_draft' => '초안',
 'settings_initialDocumentStatus_released' => '배포됨',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => 'ADOdb 설치',
 'settings_install_disabled' => 'ENABLE_INSTALL_TOOL은 삭제 된 파일 . 이제 SeedDMS에 로그인하여 추가 구성을 수행 할 수 있습니다.',
 'settings_install_pear_package_log' => 'Pear package \'Log\' 설치',
@@ -1641,6 +1649,7 @@ URL : [url]',
 'splash_document_edited' => '문서 저장',
 'splash_document_indexed' => '',
 'splash_document_locked' => '문서 잠김',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => '문서 잠금 해제',
 'splash_edit_access' => '',
 'splash_edit_attribute' => '속성 저장',
diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc
index b12185090..88ada726f 100644
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@@ -336,6 +336,7 @@ URL: [url]',
 'details' => 'ລາຍລະອຽດ',
 'details_version' => 'ລາຍລະອຽດສຳລັບລຸ້ນ: [version]',
 'de_DE' => 'ເຢຍລະມັນ',
+'disable_extension' => '',
 'disclaimer' => 'ນີ້ແມ່ນພື້ນທີ່ທີ່ຈຳແນກ ອະນຸຍາດໃຫ້ເຂົ້າເຖິງສະເພາະຜູ້ທີໄດ້ຮັບອານຸຍາດເທົ່ານັ້ນ ຖ້າມີການລະເມີດໄດ້ໆ ຈະຖືກຟ້ອງຮ້ອງຕາມກົດໝາຍຂອງພາຍໃນ ແລະ ຕ່າງປະເທດ',
 'discspace' => 'ຟື້ນທີ່ວ່າງໃນດິສ',
 'docs_in_reception_no_access' => 'ເອກະສານທີ່ໄດ້ຮັບແມ່ນບໍ່ສາມາດເຂົ້າເບີ່ງໄດ້',
@@ -504,6 +505,7 @@ URL: [url]',
 'empty_folder_list' => 'ບໍ່ມີເອກະສານຫຼືໂຟລເດີ',
 'empty_list' => '',
 'empty_notify_list' => 'ບໍ່ມີລາຍການ',
+'enable_extension' => '',
 'en_GB' => 'ອັງກິດ (GB)',
 'equal_transition_states' => 'ສະຖານະເລີມຕົ້ນແລະສິນສຸດມີຄ່າເທົ່າກັນ',
 'error' => 'ຂໍ້ຜິດພາດ',
@@ -542,6 +544,7 @@ URL: [url]',
 'expire_in_1y' => 'ໝົດອາຍຸພາຍໃນ 1 ປີ',
 'expire_in_2h' => 'ໝົດອາຍຸໃນອີກ 2 ຊົ່ວໂມງ',
 'expire_in_2y' => 'ໝົດອາຍຸພາຍໃນ 2 ປີ',
+'expire_in_3y' => '',
 'expire_today' => 'ໝົດອາຍຸໃນມື້ນີ',
 'expire_tomorrow' => 'ໝົດອາຍຸໃນມື້ອື່ນ',
 'expiry_changed_email' => 'ປ່ຽນວັນໝົດອາຍຸ',
@@ -792,6 +795,7 @@ URL: [url]',
 'may' => 'ເດືອນພຶດສະພາ',
 'menu_dropfolder' => 'ວາງໂຟລເດີ',
 'menu_upload_from_dropfolder' => '',
+'message' => '',
 'mimetype' => 'ປະເພດ Mime',
 'minutes' => '',
 'misc' => 'ອື່ນໆ',
@@ -1232,7 +1236,9 @@ URL: [url]',
 'select_ind_recipients' => 'ຄິກເພື່ອເລືອກຜູ້ຮັບແຕ່ລະຄົນ',
 'select_ind_reviewers' => 'ຄິກເພື່ອເລືອກຜູ້ກວດສອບແຕ່ລະຄົນ',
 'select_ind_revisors' => 'ຄິກເພື່ອເລືອກການກວດສອບແຕ່ລະອັນ',
+'select_mimetype' => '',
 'select_one' => 'ເລືອກໜື່ງອັນ',
+'select_owner' => '',
 'select_user' => '',
 'select_users' => 'ຄິກເພື່ອເລືອກຜູ້ໄຊ້',
 'select_value' => '',
@@ -1462,6 +1468,8 @@ URL: [url]',
 'settings_initialDocumentStatus_desc' => 'ສະຖານະຈະຖືກຕັ້ງຄ່າເມືອ່ມີການເພີ່ມເອກະສານ',
 'settings_initialDocumentStatus_draft' => 'ຮ່າງ',
 'settings_initialDocumentStatus_released' => 'ການເຜີຍແຜ່, ປົດລັອກ',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => 'ຕິດຕັ້ງ ADOdb',
 'settings_install_disabled' => 'ເປີດແຟ້ມ-ວຽກ-ເຄື່ອງມືໄດ້ຖືກລົບແລ້ວ ຕອນນີ້ເຈົ້າສາມາດເຂົ້າສູ້ລະບົບຊິສ DMS ແລະການຕັ້ງຄ່າເພີ່ມເຕີມ',
 'settings_install_pear_package_log' => 'ติดตั้งลูกแพร์บรรจุภัณฑ์  "ล็อก "',
@@ -1667,6 +1675,7 @@ URL: [url]',
 'splash_document_edited' => 'ບັນທຶກເອກະສານແລ້ວ',
 'splash_document_indexed' => 'ເອກະສານ  "[name] " ຈັດເຮັດດັດສະນີແລ້ວ',
 'splash_document_locked' => 'ເອກະສານຖືກລັອກ',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => 'ເອກະສານປົດລັອກແລ້ວ',
 'splash_edit_access' => '',
 'splash_edit_attribute' => 'ບັນທຶກແອັດທີບິວແລ້ວ',
diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc
index 7c988f298..8701bfcb0 100644
--- a/languages/nb_NO/lang.inc
+++ b/languages/nb_NO/lang.inc
@@ -338,6 +338,7 @@ URL: [url]',
 'details' => 'Detaljer',
 'details_version' => 'Detaljer for versjon: [version]',
 'de_DE' => 'Tysk',
+'disable_extension' => '',
 'disclaimer' => 'Dette er et klassifisert område. Tilgang er bare tillatt for autorisert personell. Ethvert brudd vil bli tiltalt i henhold til nasjonale og internasjonale lover.',
 'discspace' => 'Diskplass',
 'docs_in_reception_no_access' => 'Dokumenter med mottak uten tilgang fra mottaker',
@@ -518,6 +519,7 @@ URL: [url]',
 'empty_folder_list' => 'Ingen dokumenter eller mapper',
 'empty_list' => 'Ingen oppføringer',
 'empty_notify_list' => 'Ingen oppføringer',
+'enable_extension' => '',
 'en_GB' => 'Engelsk (GB)',
 'equal_transition_states' => 'Status for start og slutt er lik',
 'error' => 'Feil',
@@ -556,6 +558,7 @@ URL: [url]',
 'expire_in_1y' => 'Utløper om 1 år',
 'expire_in_2h' => 'Utløper om 2 timer',
 'expire_in_2y' => 'Utløper om 2 år',
+'expire_in_3y' => '',
 'expire_today' => 'Utløper idag',
 'expire_tomorrow' => 'Utløper i morgon',
 'expiry_changed_email' => 'Utløpsdato endret',
@@ -813,6 +816,7 @@ URL: [url]',
 'may' => 'Mai',
 'menu_dropfolder' => 'Slipp mappe',
 'menu_upload_from_dropfolder' => 'Importer denne filen',
+'message' => '',
 'mimetype' => 'Mime type',
 'minutes' => 'minutter',
 'misc' => 'Diverse',
@@ -1247,7 +1251,9 @@ URL: [url]',
 'select_ind_recipients' => 'Klikk for å velge individuell mottakere',
 'select_ind_reviewers' => 'Klikk for å velge individuell gjennomgå',
 'select_ind_revisors' => 'Klikk for å velge individuell kontrollører',
+'select_mimetype' => '',
 'select_one' => 'Velg en',
+'select_owner' => '',
 'select_user' => 'Velg bruker',
 'select_users' => 'Klikk for å velge flere brukere',
 'select_value' => 'Velg verdi',
@@ -1475,6 +1481,8 @@ Bruker: [username]
 'settings_initialDocumentStatus_desc' => 'Denne statusen blir satt når et dokument legges til.',
 'settings_initialDocumentStatus_draft' => 'Utkast',
 'settings_initialDocumentStatus_released' => 'frigjort',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => 'Installere ADOdb',
 'settings_install_disabled' => 'Filen ENABLE_INSTALL_TOOL ble slettet. Du kan nå logge inn på SeedDMS og gjøre ytterligere konfigurasjon.',
 'settings_install_pear_package_log' => 'Installere Pear-pakken \'Log\'',
@@ -1680,6 +1688,7 @@ Bruker: [username]
 'splash_document_edited' => 'Dokumentet lagret',
 'splash_document_indexed' => 'Dokumentet \'[name]\' er indeksert.',
 'splash_document_locked' => 'Dokumentet er låst',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => 'Dokumentet åpnet',
 'splash_edit_access' => 'Adgangsretten ble endret',
 'splash_edit_attribute' => 'Egenskapen ble lagret',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 7ab79d98f..8e768a45b 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -331,6 +331,7 @@ URL: [url]',
 'details' => 'Details',
 'details_version' => 'Details voor versie: [version]',
 'de_DE' => 'Duits',
+'disable_extension' => '',
 'disclaimer' => 'Dit is een beveiligde omgeving. Gebruik is alleen toegestaan voor geautoriseerde leden. Ongeautoriseerde toegang kan worden bestraft overeenkomstig (inter)nationale wetgeving.',
 'discspace' => 'Schijfruimte',
 'docs_in_reception_no_access' => 'Documenten zonder toegang ontvanger',
@@ -499,6 +500,7 @@ URL: [url]',
 'empty_folder_list' => 'Geen documenten of mappen',
 'empty_list' => 'Lijst is leeg',
 'empty_notify_list' => 'Geen gegevens',
+'enable_extension' => '',
 'en_GB' => 'Engels (GB)',
 'equal_transition_states' => 'Begin- en eind-status zijn hetzelfde',
 'error' => 'Fout',
@@ -537,6 +539,7 @@ URL: [url]',
 'expire_in_1y' => 'Vervalt binnen 1 jaar',
 'expire_in_2h' => 'Vervalt binnen 2 uur',
 'expire_in_2y' => 'Vervalt binnen 2 jaar',
+'expire_in_3y' => '',
 'expire_today' => 'Vervalt vandaag',
 'expire_tomorrow' => 'Vervalt morgen',
 'expiry_changed_email' => 'Verloopdatum gewijzigd',
@@ -787,6 +790,7 @@ URL: [url]',
 'may' => 'mei',
 'menu_dropfolder' => 'Dropfolder',
 'menu_upload_from_dropfolder' => '',
+'message' => '',
 'mimetype' => 'MIME Type',
 'minutes' => 'minuten',
 'misc' => 'Diversen',
@@ -1225,7 +1229,9 @@ URL: [url]',
 'select_ind_recipients' => 'Klik voor individuele ontvnagers',
 'select_ind_reviewers' => 'Klik om individuele beoordelaar te selecteren',
 'select_ind_revisors' => 'Klik voor individuele herziners',
+'select_mimetype' => '',
 'select_one' => 'Selecteer een',
+'select_owner' => '',
 'select_user' => 'Selecteer gebruiker',
 'select_users' => 'Klik om gebruikers te selecteren',
 'select_value' => 'selecteer waarde',
@@ -1459,6 +1465,8 @@ Name: [username]
 'settings_initialDocumentStatus_desc' => 'De beginstatus van een document wordt ingesteld wanneer het document wordt toegevoegd.',
 'settings_initialDocumentStatus_draft' => 'Initieel document als concept',
 'settings_initialDocumentStatus_released' => 'Initieel document-status: gepubliceerd',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => 'Installeer ADOdb',
 'settings_install_disabled' => 'Bestand ENABLE_INSTALL_TOOL is verwijderd. U kunt nu inloggen in SeedDMS en verdere configuratie uitvoeren.',
 'settings_install_pear_package_log' => 'Installeer Pear package \'Log\'',
@@ -1664,6 +1672,7 @@ Name: [username]
 'splash_document_edited' => 'Document opgeslagen',
 'splash_document_indexed' => 'Document geïndexeerd',
 'splash_document_locked' => 'Document vergrendeld',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => 'Document ontgrendeld',
 'splash_edit_access' => '',
 'splash_edit_attribute' => 'Attribuut opgeslagen',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index ff96f8c99..51db7318d 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -326,6 +326,7 @@ URL: [url]',
 'details' => 'Szczegóły',
 'details_version' => 'Szczegóły dla wersji: [version]',
 'de_DE' => 'niemiecki',
+'disable_extension' => '',
 'disclaimer' => 'To jest zastrzeżona strefa. Dostęp do niej ma wyłącznie wyznaczony personel. Wszelkie naruszenia będą ścigane zgodnie z prawem krajowym i międzynarodowym.',
 'discspace' => 'Miejsce na dysku',
 'docs_in_reception_no_access' => 'Dokumenty z odbiorem bez dostępu odbiorcy',
@@ -494,6 +495,7 @@ URL: [url]',
 'empty_folder_list' => 'Nie ma dokumentów lub folderów',
 'empty_list' => 'Brak wpisów',
 'empty_notify_list' => 'Brak elementów',
+'enable_extension' => '',
 'en_GB' => 'Angielski (GB)',
 'equal_transition_states' => 'Stan rozpoczęcia i ukończenia jest taki sam',
 'error' => 'Błąd',
@@ -532,6 +534,7 @@ URL: [url]',
 'expire_in_1y' => 'Wygasa po 1 roku',
 'expire_in_2h' => 'Wygasa po 2 godzinach',
 'expire_in_2y' => 'Wygasa po 2 latach',
+'expire_in_3y' => '',
 'expire_today' => 'Wygasa dzisiaj',
 'expire_tomorrow' => 'Wygasa jutro',
 'expiry_changed_email' => 'Zmieniona data wygaśnięcia',
@@ -782,6 +785,7 @@ URL: [url]',
 'may' => 'Maj',
 'menu_dropfolder' => 'Folder zrzutu',
 'menu_upload_from_dropfolder' => 'Kopiuj do folderu zrzutu',
+'message' => '',
 'mimetype' => 'Typ mime',
 'minutes' => 'minut',
 'misc' => 'Różne',
@@ -1175,7 +1179,9 @@ URL: [url]',
 'select_ind_recipients' => 'Kliknij by wybrać indywidualnych odbiorców',
 'select_ind_reviewers' => 'Kliknij by wybrać recenzenta',
 'select_ind_revisors' => 'Kliknij by wybrać audytora',
+'select_mimetype' => '',
 'select_one' => 'Wybierz',
+'select_owner' => '',
 'select_user' => 'Wybierz użytkownika',
 'select_users' => 'Kliknij by wybrać użytkowników',
 'select_value' => 'Wybrać wartość',
@@ -1405,6 +1411,8 @@ Name: [username]
 'settings_initialDocumentStatus_desc' => 'Ten stan zostanie ustawiony po dodaniu dokumentu.',
 'settings_initialDocumentStatus_draft' => 'Projekt',
 'settings_initialDocumentStatus_released' => 'Wydany',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => 'Zainstaluj ADOdb',
 'settings_install_disabled' => 'Plik ENABLE_INSTALL_TOOL został usunięty. Możesz teraz zalogować się do LetoDMS i przeprowadzić dalszą konfigurację.',
 'settings_install_pear_package_log' => 'Zainstaluj pakiet Pear \'Log\'',
@@ -1610,6 +1618,7 @@ Name: [username]
 'splash_document_edited' => 'Dokument został zapisany',
 'splash_document_indexed' => 'Dokument \'[name]\' zindeksowany.',
 'splash_document_locked' => 'Dokument zablokowany',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => 'Odblokowano dokument',
 'splash_edit_access' => 'Prawo dostępu zostało zmienione',
 'splash_edit_attribute' => 'Zapisano atrybuty',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 89d29f7f7..3e89d6d53 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -338,6 +338,7 @@ URL: [url]',
 'details' => 'Detalhes',
 'details_version' => 'Detalhes para a versão: [version]',
 'de_DE' => 'Alemão',
+'disable_extension' => '',
 'disclaimer' => 'Esta é uma área restrita, o acesso é permitido apenas ao pessoal autorizado. Qualquer violação será tratado de acordo com as normas internas e leis vigentes.',
 'discspace' => 'Espaço em Disco',
 'docs_in_reception_no_access' => 'Documentos com recepção sem acesso pelo destinatário',
@@ -518,6 +519,7 @@ URL: [url]',
 'empty_folder_list' => 'Nenhum documento ou pasta',
 'empty_list' => 'Nenhuma entrada',
 'empty_notify_list' => 'Sem entradas',
+'enable_extension' => '',
 'en_GB' => 'Inglês (GB)',
 'equal_transition_states' => 'Estado de início e fim são iguais',
 'error' => 'Erro',
@@ -556,6 +558,7 @@ URL: [url]',
 'expire_in_1y' => 'Expira em 1 ano',
 'expire_in_2h' => 'Expira em 2 horas',
 'expire_in_2y' => 'Expira em 2 anos',
+'expire_in_3y' => '',
 'expire_today' => 'Expira hoje',
 'expire_tomorrow' => 'Expira amanhã',
 'expiry_changed_email' => 'Data de validade mudou',
@@ -813,6 +816,7 @@ URL: [url]',
 'may' => 'Maio',
 'menu_dropfolder' => 'Pasta suspensa',
 'menu_upload_from_dropfolder' => 'Importar este arquivo',
+'message' => '',
 'mimetype' => 'Tipo mime',
 'minutes' => 'minutos',
 'misc' => 'Miscelânia',
@@ -1251,7 +1255,9 @@ URL: [url]',
 'select_ind_recipients' => 'Clique para selecionar destinatários individuais',
 'select_ind_reviewers' => 'Clique para selecionar revisor individual',
 'select_ind_revisors' => 'Clique para selecionar revisores individuais',
+'select_mimetype' => '',
 'select_one' => 'Selecione um',
+'select_owner' => '',
 'select_user' => 'Selecione o usuário',
 'select_users' => 'Clique para selecionar os usuários',
 'select_value' => 'Selecionar opção',
@@ -1481,6 +1487,8 @@ Nome: [username]
 'settings_initialDocumentStatus_desc' => 'Este estado será definido quando um documento for adicionado.',
 'settings_initialDocumentStatus_draft' => 'Rascunho',
 'settings_initialDocumentStatus_released' => 'liberada',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => 'Instalar ADOdb',
 'settings_install_disabled' => 'O arquivo ENABLE_INSTALL_TOOL foi excluído. Agora você pode entrar em Sistema GED e fazer outras configurações.',
 'settings_install_pear_package_log' => 'Instalar o Pacote pear \'Log\'',
@@ -1686,6 +1694,7 @@ Nome: [username]
 'splash_document_edited' => 'Documento salvo',
 'splash_document_indexed' => 'Documento \'[name]\' indexado.',
 'splash_document_locked' => 'Documento bloqueado',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => 'Documento desbloqueado',
 'splash_edit_access' => 'Direito de acesso alterado',
 'splash_edit_attribute' => 'Atributo salvo',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 4438d18a8..e9e49c71b 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -338,6 +338,7 @@ URL: [url]',
 'details' => 'Detalii',
 'details_version' => 'Detalii pentru versiunea: [version]',
 'de_DE' => 'Germana',
+'disable_extension' => '',
 'disclaimer' => 'Aceasta este o zonă clasificată. Accesul este permis numai personalului autorizat. Orice încălcare va fi urmărită penal în conformitate cu legile naționale și internaționale.',
 'discspace' => 'Spațiu pe disc',
 'docs_in_reception_no_access' => '',
@@ -506,6 +507,7 @@ URL: [url]',
 'empty_folder_list' => 'Nu există documente sau foldere',
 'empty_list' => '',
 'empty_notify_list' => 'Nu există înregistrări',
+'enable_extension' => '',
 'en_GB' => 'Engleza (GB)',
 'equal_transition_states' => 'Starea de start și de stop sunt egale',
 'error' => 'Eroare',
@@ -544,6 +546,7 @@ URL: [url]',
 'expire_in_1y' => 'Expira in un an',
 'expire_in_2h' => '',
 'expire_in_2y' => 'Expira in 2 ani',
+'expire_in_3y' => '',
 'expire_today' => '',
 'expire_tomorrow' => '',
 'expiry_changed_email' => 'Data de expirare schimbată',
@@ -794,6 +797,7 @@ URL: [url]',
 'may' => 'Mai',
 'menu_dropfolder' => '',
 'menu_upload_from_dropfolder' => '',
+'message' => '',
 'mimetype' => 'Mime type',
 'minutes' => 'minute',
 'misc' => 'Diverse',
@@ -1218,7 +1222,9 @@ URL: [url]',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Click pentru a selecta un revizuitor individual',
 'select_ind_revisors' => 'Faceti click pentru a selecta retrimitori individuali',
+'select_mimetype' => '',
 'select_one' => 'Selectați unul',
+'select_owner' => '',
 'select_user' => 'Selecteaza utilizator',
 'select_users' => 'Click pentru a selecta utilizatori',
 'select_value' => 'Valoare selectata',
@@ -1443,6 +1449,8 @@ URL: [url]',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
 'settings_initialDocumentStatus_released' => '',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => 'Instalați ADOdb',
 'settings_install_disabled' => 'Fișierul ENABLE_INSTALL_TOOL a fost șters. Vă puteți conecta acum în SeedDMS și puteți trece la configurările ulterioare.',
 'settings_install_pear_package_log' => 'Instalați pachetul Pear \'Log\'',
@@ -1648,6 +1656,7 @@ URL: [url]',
 'splash_document_edited' => 'Document salvat',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Document blocat',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => 'Document deblocat',
 'splash_edit_access' => '',
 'splash_edit_attribute' => 'Atribut salvat',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 6dc99b3a5..fcf5d3628 100644
--- 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 (1684)
+//    Translators: Admin (1687)
 
 $text = array(
 '2_factor_auth' => 'Двухфакторная аутентификация',
@@ -338,6 +338,7 @@ URL: [url]',
 'details' => 'Подробности',
 'details_version' => 'Подробная информация о версии: [version]',
 'de_DE' => 'German',
+'disable_extension' => '',
 'disclaimer' => 'Работник, помни! От тебя зависит успех фирмы и всей страны!',
 'discspace' => 'Дисковое пространство',
 'docs_in_reception_no_access' => '',
@@ -506,6 +507,7 @@ URL: [url]',
 'empty_folder_list' => 'Нет документов или каталогов',
 'empty_list' => '',
 'empty_notify_list' => 'Нет записей',
+'enable_extension' => '',
 'en_GB' => 'English (GB)',
 'equal_transition_states' => 'Одинаковые начальный и конечный статусы',
 'error' => 'Ошибка',
@@ -533,7 +535,7 @@ URL: [url]',
 'event_details' => 'Информация о событии',
 'exclude_items' => 'Не показывать события:',
 'expired' => 'Срок действия вышел',
-'expired_at_date' => '',
+'expired_at_date' => 'Истекает в',
 'expired_documents' => '',
 'expires' => 'Срок действия',
 'expire_by_date' => 'дата',
@@ -544,6 +546,7 @@ URL: [url]',
 'expire_in_1y' => '1 год',
 'expire_in_2h' => '',
 'expire_in_2y' => '2 года',
+'expire_in_3y' => '',
 'expire_today' => '',
 'expire_tomorrow' => '',
 'expiry_changed_email' => 'Срок действия изменен',
@@ -662,7 +665,7 @@ URL: [url]',
 'import_extension' => '',
 'import_fs' => 'Импорт из файловой системы',
 'import_fs_warning' => 'Предупреждение импорта из ФС',
-'import_users' => '',
+'import_users' => 'Импорт пользователей',
 'import_users_addnew' => '',
 'import_users_update' => '',
 'include_content' => 'Включая содержимое',
@@ -794,6 +797,7 @@ URL: [url]',
 'may' => 'Май',
 'menu_dropfolder' => '',
 'menu_upload_from_dropfolder' => '',
+'message' => '',
 'mimetype' => 'MIME-тип',
 'minutes' => 'минуты',
 'misc' => 'Прочее',
@@ -1184,7 +1188,7 @@ URL: [url]',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
 'scheduler_class_tasks' => '',
-'scheduler_task_mgr' => '',
+'scheduler_task_mgr' => 'Планировщик',
 'search' => 'Поиск',
 'search_fulltext' => 'Полнотекстовый поиск',
 'search_in' => 'Поиск',
@@ -1225,7 +1229,9 @@ URL: [url]',
 'select_ind_recipients' => 'Выберите индивидуального получателя',
 'select_ind_reviewers' => 'Выберите индивидуального рецензента',
 'select_ind_revisors' => 'Выберите индивидуального ревизора',
+'select_mimetype' => '',
 'select_one' => 'Выберите',
+'select_owner' => '',
 'select_user' => '',
 'select_users' => 'Выберите пользователей',
 'select_value' => 'Выберите значение',
@@ -1450,6 +1456,8 @@ URL: [url]',
 'settings_initialDocumentStatus_desc' => 'Этот статус будет установлен, когда добавляется документ',
 'settings_initialDocumentStatus_draft' => 'Черновик',
 'settings_initialDocumentStatus_released' => 'утверждён',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => 'Установить ADOdb',
 'settings_install_disabled' => 'ENABLE_INSTALL_TOOL удалён. Теперь можно войти для дальнейшей настройки системы.',
 'settings_install_pear_package_log' => 'Установите пакет Pear \'Log\'',
@@ -1655,6 +1663,7 @@ URL: [url]',
 'splash_document_edited' => 'Документ сохранён',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Документ заблокирован',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => 'Документ разблокирован',
 'splash_edit_access' => '',
 'splash_edit_attribute' => 'Атрибут сохранён',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 953ac0ff0..d929d77db 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -338,6 +338,7 @@ URL: [url]',
 'details' => 'Podrobnosti',
 'details_version' => 'Podrobnosti verzie: [version]',
 'de_DE' => 'Nemčina',
+'disable_extension' => '',
 'disclaimer' => 'Toto je zabezpečená zóna. Prístup je povolený len autorizovaným osobám.',
 'discspace' => 'Priestor na disku',
 'docs_in_reception_no_access' => 'Documents with reception without access by recipient',
@@ -518,6 +519,7 @@ URL: [url]',
 'empty_folder_list' => 'Žiadne dokumenty alebo zložky',
 'empty_list' => 'Žiadne položky',
 'empty_notify_list' => 'Žiadne položky',
+'enable_extension' => '',
 'en_GB' => 'Angličtina (UK)',
 'equal_transition_states' => 'Začiatok a koniec sú rovnaké',
 'error' => 'Chyba',
@@ -556,6 +558,7 @@ URL: [url]',
 'expire_in_1y' => 'Platnosť vyprší za 1 rok',
 'expire_in_2h' => 'Platnosť vyprší za 2 h',
 'expire_in_2y' => 'Platnosť vyprší za 2 roky',
+'expire_in_3y' => '',
 'expire_today' => 'Platnosť vyprší dnes',
 'expire_tomorrow' => 'Platnosť vyprší zajtra',
 'expiry_changed_email' => 'Dátum vypršania platnosti zmenený',
@@ -813,6 +816,7 @@ URL: [url]',
 'may' => 'Máj',
 'menu_dropfolder' => 'Drop zložka',
 'menu_upload_from_dropfolder' => 'Naimportovať zo súboru',
+'message' => '',
 'mimetype' => 'Mime typ',
 'minutes' => 'minúty',
 'misc' => 'Rôzne',
@@ -1253,7 +1257,9 @@ URL: [url]',
 'select_ind_recipients' => 'Kliknutím vyberte individuálnych príjemcov',
 'select_ind_reviewers' => 'Kliknutím vyberte individuálneho recenzenta',
 'select_ind_revisors' => 'Kliknutím vyberte individuálnych revízorov',
+'select_mimetype' => '',
 'select_one' => 'Vyberte',
+'select_owner' => '',
 'select_user' => 'Vyberte používateľa',
 'select_users' => 'Kliknutím vyberte používateľov',
 'select_value' => 'Vyberte hodnotu',
@@ -1483,6 +1489,8 @@ Meno: [username]
 'settings_initialDocumentStatus_desc' => 'This status will be set when a document is added.',
 'settings_initialDocumentStatus_draft' => 'Návrh',
 'settings_initialDocumentStatus_released' => 'Vydaný',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => 'Inštalovať ADOdb',
 'settings_install_disabled' => 'File ENABLE_INSTALL_TOOL was deleted. You can now log into SeedDMS and do further configuration.',
 'settings_install_pear_package_log' => 'Inštalovať Pear balíček \'Log\'',
@@ -1688,6 +1696,7 @@ Meno: [username]
 'splash_document_edited' => 'Dokument bol uložený',
 'splash_document_indexed' => 'Dokument \'[name]\' bol indexovaný.',
 'splash_document_locked' => 'Dokument uzamknutý',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => 'Dokument odomknutý',
 'splash_edit_access' => 'Access right changed',
 'splash_edit_attribute' => 'Atribút bol uložený',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 837b2b31e..a6530313c 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -339,6 +339,7 @@ URL: [url]',
 'details' => 'Detaljer',
 'details_version' => 'Detaljer för version: [version]',
 'de_DE' => 'Tyska',
+'disable_extension' => '',
 'disclaimer' => 'Detta är ett sekretessbelagt område. Bara auktoriserade personer äger tillträde. Vid överträdelse kommer åtal att väckas i enlighet med nationella och internationella lagar.',
 'discspace' => 'Diskutrymme',
 'docs_in_reception_no_access' => 'Dokument med angiven mottagare som saknar behörighet till dokumentet',
@@ -512,6 +513,7 @@ URL: [url]',
 'empty_folder_list' => 'Inga dokument eller mappar',
 'empty_list' => '',
 'empty_notify_list' => 'Inga meddelanden',
+'enable_extension' => '',
 'en_GB' => 'Engelska (GB)',
 'equal_transition_states' => 'Status för start och slut är lika',
 'error' => 'Fel',
@@ -550,6 +552,7 @@ URL: [url]',
 'expire_in_1y' => 'Upphör att gälla om 1 år',
 'expire_in_2h' => 'Upphör att gälla om 2 tim',
 'expire_in_2y' => 'Upphör att gälla om 2 år',
+'expire_in_3y' => '',
 'expire_today' => 'Upphör att gälla idag',
 'expire_tomorrow' => 'Upphör att gälla i morgon',
 'expiry_changed_email' => 'Utgångsdatum ändrat',
@@ -800,6 +803,7 @@ URL: [url]',
 'may' => 'Maj',
 'menu_dropfolder' => 'Mapp för snabbuppladdning',
 'menu_upload_from_dropfolder' => '',
+'message' => '',
 'mimetype' => 'Mimetyp',
 'minutes' => 'minuter',
 'misc' => 'Diverse',
@@ -1226,7 +1230,9 @@ URL: [url]',
 'select_ind_recipients' => 'Klicka för att välja individuell mottagare',
 'select_ind_reviewers' => 'Välj en person som ska granska',
 'select_ind_revisors' => 'Klicka för att välja individuell reviderare',
+'select_mimetype' => '',
 'select_one' => 'Välj',
+'select_owner' => '',
 'select_user' => 'Välj användare',
 'select_users' => 'Välj användare',
 'select_value' => 'Välj värde',
@@ -1456,6 +1462,8 @@ Kommentar: [comment]',
 'settings_initialDocumentStatus_desc' => 'Denna status används som standard för nya dokument.',
 'settings_initialDocumentStatus_draft' => 'Utkast',
 'settings_initialDocumentStatus_released' => 'Klart för användning',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => 'Installera ADOdb',
 'settings_install_disabled' => 'Filen ENABLE_INSTALL_TOOL har tagits bort. Du kan nu logga in till LetoDMS och göra ytterligare inställningar.',
 'settings_install_pear_package_log' => 'Installera Pear-paketet \'Log\'',
@@ -1661,6 +1669,7 @@ Kommentar: [comment]',
 'splash_document_edited' => 'Dokument sparat',
 'splash_document_indexed' => 'Dokument \'[name]\' indexerat.',
 'splash_document_locked' => 'Dokument låst',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => 'Dokument upplåst',
 'splash_edit_access' => '',
 'splash_edit_attribute' => 'Attribut sparat',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 9c48a6822..4e70ee015 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1109), aydin (83)
+//    Translators: Admin (1110), aydin (83)
 
 $text = array(
 '2_factor_auth' => 'İki faktörlü yetkilendirme',
@@ -332,6 +332,7 @@ URL: [url]',
 'details' => 'Detaylar',
 'details_version' => '[version] versiyonu detayları',
 'de_DE' => 'Almanca',
+'disable_extension' => '',
 'disclaimer' => 'Bu sisteme sadece yetkilendirilmiş personel yetki seviyesine göre erişebilir. Herhangi bir ihlalde veya ihlal girişiminde, ulusal ve uluslararası yasalara göre takibat yapılacaktır.',
 'discspace' => 'Disk alanı',
 'docs_in_reception_no_access' => '',
@@ -500,6 +501,7 @@ URL: [url]',
 'empty_folder_list' => 'Hiç klasör veya doküman yok',
 'empty_list' => '',
 'empty_notify_list' => 'Giriş yok',
+'enable_extension' => '',
 'en_GB' => 'İngilizce',
 'equal_transition_states' => 'Başlangıç ve bitiş durumları eşit',
 'error' => 'Hata',
@@ -538,6 +540,7 @@ URL: [url]',
 'expire_in_1y' => '1 Yıl içinde silinecek',
 'expire_in_2h' => '',
 'expire_in_2y' => '2 Yıl içinde silinecek',
+'expire_in_3y' => '',
 'expire_today' => '',
 'expire_tomorrow' => '',
 'expiry_changed_email' => 'Süresinin dolacağı tarihi değişti',
@@ -788,6 +791,7 @@ URL: [url]',
 'may' => 'Mayıs',
 'menu_dropfolder' => '',
 'menu_upload_from_dropfolder' => '',
+'message' => '',
 'mimetype' => 'Mime tipi',
 'minutes' => 'dakika',
 'misc' => 'Diğer',
@@ -957,7 +961,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
 'pending_revision' => '',
 'pending_workflows' => '',
 'personal_default_keywords' => 'Kişisel anahtar kelimeler',
-'php_info' => '',
+'php_info' => 'PHP Bilgisi',
 'pl_PL' => 'Polonyaca',
 'possible_substitutes' => '',
 'preset_expires' => 'Son Kullanım Tarihi Tanımla',
@@ -1197,7 +1201,9 @@ URL: [url]',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Biresysel kontrol edeni seçmek için tıklayın',
 'select_ind_revisors' => '',
+'select_mimetype' => '',
 'select_one' => 'Birini seçiniz',
+'select_owner' => '',
 'select_user' => 'Kullanıcı Seç',
 'select_users' => 'Kullanıcı seçmek için tıklayın',
 'select_value' => 'Değeri seç',
@@ -1422,6 +1428,8 @@ URL: [url]',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
 'settings_initialDocumentStatus_released' => '',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => 'ADOdb yükle',
 'settings_install_disabled' => 'ENABLE_INSTALL_TOOL silindi. SeedDMS\'e giriş yaparak diğer ayarları yapabilirsiniz.',
 'settings_install_pear_package_log' => 'Pear package \'Log\' yükleyin',
@@ -1627,6 +1635,7 @@ URL: [url]',
 'splash_document_edited' => 'Doküman kaydedildi',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Doküman kilitlendi',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => 'Doküman kiliti açıldı',
 'splash_edit_access' => '',
 'splash_edit_attribute' => 'Nitelik kaydedildi',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index e5b66b847..40f39efc6 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -338,6 +338,7 @@ URL: [url]',
 'details' => 'Деталі',
 'details_version' => 'Детальна інформація про версію: [version]',
 'de_DE' => 'German',
+'disable_extension' => '',
 'disclaimer' => 'Авторизована зона. Несанкціонований доступ переслідується згідно національного законодавства.',
 'discspace' => 'Дисковий простір',
 'docs_in_reception_no_access' => '',
@@ -506,6 +507,7 @@ URL: [url]',
 'empty_folder_list' => 'Немає документів або каталогів',
 'empty_list' => '',
 'empty_notify_list' => 'Немає записів',
+'enable_extension' => '',
 'en_GB' => 'English (GB)',
 'equal_transition_states' => 'Однакові початковий і кінцевий статуси',
 'error' => 'Помилка',
@@ -544,6 +546,7 @@ URL: [url]',
 'expire_in_1y' => '',
 'expire_in_2h' => '',
 'expire_in_2y' => '',
+'expire_in_3y' => '',
 'expire_today' => '',
 'expire_tomorrow' => '',
 'expiry_changed_email' => 'Дату терміну виконання змінено',
@@ -794,6 +797,7 @@ URL: [url]',
 'may' => 'Травень',
 'menu_dropfolder' => '',
 'menu_upload_from_dropfolder' => '',
+'message' => '',
 'mimetype' => 'MIME-тип',
 'minutes' => 'хвилини',
 'misc' => 'Інше',
@@ -1218,7 +1222,9 @@ URL: [url]',
 'select_ind_recipients' => 'Оберіть індивідуального отримувача',
 'select_ind_reviewers' => 'Оберіть індивідуального рецензента',
 'select_ind_revisors' => 'Оберіть індивідуального ревізора',
+'select_mimetype' => '',
 'select_one' => 'Оберіть',
+'select_owner' => '',
 'select_user' => '',
 'select_users' => 'Оберіть користувачів',
 'select_value' => 'Обрати значення',
@@ -1443,6 +1449,8 @@ URL: [url]',
 'settings_initialDocumentStatus_desc' => 'Цей статус буде встановлено, коли додається документ',
 'settings_initialDocumentStatus_draft' => 'Чернетка',
 'settings_initialDocumentStatus_released' => 'затверджено',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => 'Встановити ADOdb',
 'settings_install_disabled' => 'ENABLE_INSTALL_TOOL видалений. Тепер можна увійти для подальшого налаштування системи.',
 'settings_install_pear_package_log' => 'Встановіть пакет Pear \'Log\'',
@@ -1648,6 +1656,7 @@ URL: [url]',
 'splash_document_edited' => 'Документ збережено',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Документ заблоковано',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => 'Документ розблоковано',
 'splash_edit_access' => '',
 'splash_edit_attribute' => 'Атрибут збережено',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 4f4a698ff..b13355555 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (772), archonwang (469), fengjohn (5), yang86 (1)
+//    Translators: Admin (773), archonwang (469), fengjohn (5), yang86 (1)
 
 $text = array(
 '2_factor_auth' => '双重认证',
@@ -332,6 +332,7 @@ URL: [url]',
 'details' => '详细情况',
 'details_version' => '版本详情:[version]',
 'de_DE' => '德国语',
+'disable_extension' => '',
 'disclaimer' => '警告：这是机密区.只有授权用户才被允许访问.任何违反行为将受到法律制裁',
 'discspace' => '磁盘空间',
 'docs_in_reception_no_access' => '',
@@ -500,6 +501,7 @@ URL: [url]',
 'empty_folder_list' => '没有文件或子目录',
 'empty_list' => '',
 'empty_notify_list' => '没有条目',
+'enable_extension' => '',
 'en_GB' => '英语',
 'equal_transition_states' => '开始日期和结束日期相同',
 'error' => '错误',
@@ -538,6 +540,7 @@ URL: [url]',
 'expire_in_1y' => '1年后过期',
 'expire_in_2h' => '两小时后截止',
 'expire_in_2y' => '2年后过期',
+'expire_in_3y' => '',
 'expire_today' => '截止今天',
 'expire_tomorrow' => '截止至明天',
 'expiry_changed_email' => '到期日子已改变',
@@ -652,7 +655,7 @@ URL: [url]',
 'import_extension' => '',
 'import_fs' => '从文件系统导入',
 'import_fs_warning' => '这将只适用于拖动文件夹。该操作将递归导入所有文件夹和文件。文件将立即释放。',
-'import_users' => '',
+'import_users' => '导入用户',
 'import_users_addnew' => '',
 'import_users_update' => '',
 'include_content' => '',
@@ -784,6 +787,7 @@ URL: [url]',
 'may' => '五 月',
 'menu_dropfolder' => '删除文件夹',
 'menu_upload_from_dropfolder' => '',
+'message' => '',
 'mimetype' => 'MIME类型',
 'minutes' => '分钟',
 'misc' => '其他',
@@ -1188,7 +1192,9 @@ URL: [url]',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => '点击选择审核人',
 'select_ind_revisors' => '',
+'select_mimetype' => '',
 'select_one' => '选择一个',
+'select_owner' => '',
 'select_user' => '选择用户',
 'select_users' => '点击选择用户',
 'select_value' => '选择值',
@@ -1418,6 +1424,8 @@ URL: [url]',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '起草中',
 'settings_initialDocumentStatus_released' => '已发布',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => '安装 ADOdb',
 'settings_install_disabled' => 'ENABLE_INSTALL_TOOL 文件已删除。祝贺您，您现在可以登陆并开始使用 SeedDMS 系统了！',
 'settings_install_pear_package_log' => '',
@@ -1623,6 +1631,7 @@ URL: [url]',
 'splash_document_edited' => '文档已保存',
 'splash_document_indexed' => '文档 \'[name]\' 已索引。',
 'splash_document_locked' => '文档已被锁定',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => '已解锁的文档',
 'splash_edit_access' => '',
 'splash_edit_attribute' => '属性已保存',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 846b76517..819d55056 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -338,6 +338,7 @@ URL: [url]',
 'details' => '詳細情況',
 'details_version' => '版本詳情:[version]',
 'de_DE' => '德國語',
+'disable_extension' => '',
 'disclaimer' => '警告：這是機密區.只有授權使用者才被允許訪問.任何違反行為將受到法律制裁',
 'discspace' => '磁碟空間',
 'docs_in_reception_no_access' => '帶有收件人的文件，收件人無法訪問',
@@ -518,6 +519,7 @@ URL: [url]',
 'empty_folder_list' => '沒有檔或子目錄',
 'empty_list' => '沒有條目',
 'empty_notify_list' => '沒有條目',
+'enable_extension' => '',
 'en_GB' => '英語',
 'equal_transition_states' => '起始狀態和結束狀態相等',
 'error' => '錯誤',
@@ -556,6 +558,7 @@ URL: [url]',
 'expire_in_1y' => '1年到期',
 'expire_in_2h' => '2小時後到期',
 'expire_in_2y' => '2年到期',
+'expire_in_3y' => '',
 'expire_today' => '今天到期',
 'expire_tomorrow' => '明天到期',
 'expiry_changed_email' => '到期日子已改變',
@@ -813,6 +816,7 @@ URL: [url]',
 'may' => '五 月',
 'menu_dropfolder' => '下拉目錄',
 'menu_upload_from_dropfolder' => '匯入這個檔案',
+'message' => '',
 'mimetype' => 'MIME類型',
 'minutes' => '分鐘',
 'misc' => '其他',
@@ -1251,7 +1255,9 @@ URL: [url]',
 'select_ind_recipients' => '單擊以選擇單個收件人',
 'select_ind_reviewers' => '請點選單一的校對人',
 'select_ind_revisors' => '單擊以選中單個修訂者',
+'select_mimetype' => '',
 'select_one' => '選擇一個',
+'select_owner' => '',
 'select_user' => '選擇使用者',
 'select_users' => '點擊選擇使用者',
 'select_value' => '選取值',
@@ -1481,6 +1487,8 @@ URL: [url]',
 'settings_initialDocumentStatus_desc' => '添加文檔時將設置此狀態。',
 'settings_initialDocumentStatus_draft' => '草案',
 'settings_initialDocumentStatus_released' => '已發布',
+'settings_inlineEditing' => '',
+'settings_inlineEditing_desc' => '',
 'settings_installADOdb' => '安裝 ADOdb',
 'settings_install_disabled' => '文件ENABLE_INSTALL_TOOL已刪除。現在，您可以登錄SeedDMS並進行進一步的配置。',
 'settings_install_pear_package_log' => '安裝Pear軟件包\'Log \'',
@@ -1686,6 +1694,7 @@ URL: [url]',
 'splash_document_edited' => '文件儲存',
 'splash_document_indexed' => '已為文檔“ [name] ”建立索引。',
 'splash_document_locked' => '文件已被鎖定',
+'splash_document_name_changed' => '',
 'splash_document_unlocked' => '已解鎖的文件',
 'splash_edit_access' => '訪問權限已更改',
 'splash_edit_attribute' => '屬性已保存',

From dc33ad774a1de238c0837e0375b659e710c9dec7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 29 Sep 2020 13:45:50 +0200
Subject: [PATCH 145/312] update release date, fix typo

---
 SeedDMS_Core/package.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 13a02922b..eb0fceaf4 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,8 +12,8 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2020-09-04</date>
- <time>09:43:12</time>
+ <date>2020-09-29</date>
+ <time>13:44:55</time>
  <version>
   <release>5.1.20</release>
   <api>5.1.20</api>
@@ -24,7 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- SeedDMS_Core_DMS::getDocumentList() returns false, if an unknown list passed
+- SeedDMS_Core_DMS::getDocumentList() returns false, if an unknown list is passed
 - SeedDMS_Core_Document::getDocumentFiles() has new parameter to select only those files attached to a specific version of the document
 - removing a document version will not remove attachments of the document anymore
 - set dms of new user instances in SeedDMS_Core_Group

From 73b957281f6561a7180545525788742932a99ad7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 29 Sep 2020 16:37:50 +0200
Subject: [PATCH 146/312] start version 5.1.21

---
 CHANGELOG                          | 4 ++++
 SeedDMS_Core/Core/inc.ClassDMS.php | 2 +-
 inc/inc.Version.php                | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 21bc53d18..a115afa4c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.21
+--------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
                      Changes in version 5.1.20
 --------------------------------------------------------------------------------
diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index bde9fb114..88ee61414 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -396,7 +396,7 @@ class SeedDMS_Core_DMS {
 		$this->lasterror = '';
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '5.1.20';
+			$this->version = '5.1.21';
 	} /* }}} */
 
 	/**
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index 6e4476b08..765c0a617 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version { /* {{{ */
 
-	const _number = "5.1.20";
+	const _number = "5.1.21";
 	const _string = "SeedDMS";
 
 	function __construct() {

From 3a183a452a078cafe7116973fdd1361bf5283c31 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 8 Sep 2020 17:06:26 +0200
Subject: [PATCH 147/312] put fulltext index into service

---
 inc/inc.ClassFulltextService.php | 84 ++++++++++++++++++++++++++++++++
 inc/inc.Settings.php             |  7 +++
 2 files changed, 91 insertions(+)
 create mode 100644 inc/inc.ClassFulltextService.php

diff --git a/inc/inc.ClassFulltextService.php b/inc/inc.ClassFulltextService.php
new file mode 100644
index 000000000..613dcc284
--- /dev/null
+++ b/inc/inc.ClassFulltextService.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Implementation of fulltext service
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2016 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Implementation of fulltext service
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2016 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_FulltextService {
+	/**
+	 * List of services for searching fulltext
+	 */
+	protected $services;
+
+	/**
+	 * List of converters
+	 */
+	protected $converters;
+
+	/**
+	 * Max file size for imediate indexing
+	 */
+	protected $maxsize;
+
+	public function __construct() {
+		$this->services = array();
+		$this->converters = array();
+		$this->maxsize = 0;
+		$this->indexdir = '';
+		$this->index = null;
+	}
+
+	public function addService($name, $service) {
+		$this->services[$name] = $service;
+	}
+
+	public function setConverters($converters) {
+		$this->converters = $converters;
+	}
+
+	public function setMaxSize($maxsize) {
+		$this->maxsize = $maxsize;
+	}
+
+	public function setIndexDir($indexdir) {
+		$this->indexdir = $indexdir;
+	}
+
+	public function IndexedDocument($document) {
+		$indexcontent = $document->getLatestContent()->getFileSize() < $this->maxsize;
+		return new $this->services[0]['IndexedDocument']($document->getDMS(), $document, $this->converters, $indexcontent);
+	}
+
+	public function Indexer($recreate) {
+		if($this->indexdir) {
+			if($recreate)
+				$this->index = $this->services[0]['Indexer']::create($this->indexdir);
+			else
+				$this->index = $this->services[0]['Indexer']::open($this->indexdir);
+			return $this->index;
+		} else
+			return null;
+	}
+
+	public function Indexer($recreate) {
+		return new $this->services[0]['Search']();
+	}
+}
+
+
diff --git a/inc/inc.Settings.php b/inc/inc.Settings.php
index 659b202d3..4f7e7dd5c 100644
--- a/inc/inc.Settings.php
+++ b/inc/inc.Settings.php
@@ -52,6 +52,9 @@ if (get_magic_quotes_gpc()) {
 	unset($process);
 }
 
+require_once("inc.ClassFulltextService.php");
+$fulltextservice = new SeedDMS_FulltextService();
+
 $indexconf = null;
 if($settings->_enableFullSearch) {
 	if($settings->_fullSearchEngine == 'sqlitefts') {
@@ -60,6 +63,7 @@ if($settings->_enableFullSearch) {
 			'Search' => 'SeedDMS_SQLiteFTS_Search',
 			'IndexedDocument' => 'SeedDMS_SQLiteFTS_IndexedDocument'
 		);
+		$fulltextservice->addService('sqlitefts', $indexconf);
 
 		require_once('SeedDMS/SQLiteFTS.php');
 	} else {
@@ -68,12 +72,15 @@ if($settings->_enableFullSearch) {
 			'Search' => 'SeedDMS_Lucene_Search',
 			'IndexedDocument' => 'SeedDMS_Lucene_IndexedDocument'
 		);
+		$fulltextservice->addService('lucene', $indexconf);
 
 		if(!empty($settings->_luceneClassDir))
 			require_once($settings->_luceneClassDir.'/Lucene.php');
 		else
 			require_once('SeedDMS/Lucene.php');
 	}
+	$fulltextservice->setConverters(isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null);
+	$fulltextservice->setMaxSize($settings->_maxSizeForFullText);
 }
 $settings->_indexconf = $indexconf;
 

From 4bdb3c7061556c55e13f95e84c92a2206661f9c7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 9 Sep 2020 19:49:15 +0200
Subject: [PATCH 148/312] put fulltext search into central service

---
 SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php |   2 +-
 controllers/class.AddDocument.php       |   7 +-
 controllers/class.RemoveDocument.php    |   7 +-
 controllers/class.RemoveFolder.php      |  14 ++--
 controllers/class.UpdateDocument.php    |   9 +-
 inc/inc.ClassFulltextService.php        |  22 +++--
 inc/inc.DBInit.php                      |   2 +
 inc/inc.Settings.php                    |  32 --------
 op/op.AddDocument.php                   |  10 +--
 op/op.Ajax.php                          |  30 ++-----
 op/op.RemoveDocument.php                |  11 +--
 op/op.RemoveFolder.php                  |  10 +--
 op/op.RemoveVersion.php                 |  31 +++----
 op/op.UpdateDocument.php                |  10 +--
 op/op.UpdateDocument2.php               |   8 +-
 out/out.IndexInfo.php                   |   2 +-
 out/out.Indexer.php                     |  13 ++-
 out/out.Search.php                      |   4 +-
 utils/indexer.php                       |  38 ++-------
 views/bootstrap/class.Indexer.php       | 105 +++---------------------
 views/bootstrap/class.Settings.php      |  10 ++-
 21 files changed, 94 insertions(+), 283 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
index f4791f5f2..749782300 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
@@ -96,7 +96,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 		if(!$this->_conn)
 			return false;
 
-		$sql = "INSERT INTO docs (docid, title, comment, keywords, category, owner, content, mimetype, origfilename, created, users) VALUES(".$doc->getFieldValue('document_id').", ".$this->_conn->quote($doc->getFieldValue('title')).", ".$this->_conn->quote($doc->getFieldValue('comment')).", ".$this->_conn->quote($doc->getFieldValue('keywords')).", ".$this->_conn->quote($doc->getFieldValue('category')).", ".$this->_conn->quote($doc->getFieldValue('owner')).", ".$this->_conn->quote($doc->getFieldValue('content')).", ".$this->_conn->quote($doc->getFieldValue('mimetype')).", ".$this->_conn->quote($doc->getFieldValue('origfilename')).", ".$doc->getFieldValue('created').", ".$this->_conn->quote($doc->getFieldValue('users'))/*time()*/.")";
+		$sql = "INSERT INTO docs (docid, title, comment, keywords, category, owner, content, mimetype, origfilename, created, users) VALUES(".$doc->getFieldValue('document_id').", ".$this->_conn->quote($doc->getFieldValue('title')).", ".$this->_conn->quote($doc->getFieldValue('comment')).", ".$this->_conn->quote($doc->getFieldValue('keywords')).", ".$this->_conn->quote($doc->getFieldValue('category')).", ".$this->_conn->quote($doc->getFieldValue('owner')).", ".$this->_conn->quote($doc->getFieldValue('content')).", ".$this->_conn->quote($doc->getFieldValue('mimetype')).", ".$this->_conn->quote($doc->getFieldValue('origfilename')).", ".(int)$doc->getFieldValue('created').", ".$this->_conn->quote($doc->getFieldValue('users'))/*time()*/.")";
 		$res = $this->_conn->exec($sql);
 		if($res === false) {
 			return false;
diff --git a/controllers/class.AddDocument.php b/controllers/class.AddDocument.php
index 69259ca9e..0986a2961 100644
--- a/controllers/class.AddDocument.php
+++ b/controllers/class.AddDocument.php
@@ -26,8 +26,7 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$settings = $this->params['settings'];
-		$index = $this->params['index'];
-		$indexconf = $this->params['indexconf'];
+		$fulltextservice = $this->params['fulltextservice'];
 		$folder = $this->params['folder'];
 
 		/* Call preAddDocument early, because it might need to modify some
@@ -140,8 +139,8 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 			return false;
 		}
 
-		if($index && $document) {
-			$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText));
+		if($fulltextservice && ($index = $fulltextservice->Indexer()) && $document) {
+			$idoc = $fulltextservice->IndexedDocument($document);
 			if(false !== $this->callHook('preIndexDocument', $document, $idoc)) {
 				$index->addDocument($idoc);
 				$index->commit();
diff --git a/controllers/class.RemoveDocument.php b/controllers/class.RemoveDocument.php
index d4b1950f7..1b78314d9 100644
--- a/controllers/class.RemoveDocument.php
+++ b/controllers/class.RemoveDocument.php
@@ -27,8 +27,7 @@ class SeedDMS_Controller_RemoveDocument extends SeedDMS_Controller_Common {
 		$user = $this->params['user'];
 		$settings = $this->params['settings'];
 		$document = $this->params['document'];
-		$index = $this->params['index'];
-		$indexconf = $this->params['indexconf'];
+		$fulltextservice = $this->params['fulltextservice'];
 
 		$folder = $document->getFolder();
 
@@ -58,8 +57,8 @@ class SeedDMS_Controller_RemoveDocument extends SeedDMS_Controller_Common {
 		}
 
 		/* Remove the document from the fulltext index */
-		if($index) {
-			$lucenesearch = new $indexconf['Search']($index);
+		if($fulltextservice && ($index = $fulltextservice->Indexer())) {
+			$lucenesearch = $fulltextservice->Search();
 			if($hit = $lucenesearch->getDocument($documentid)) {
 				$index->delete($hit->id);
 				$index->commit();
diff --git a/controllers/class.RemoveFolder.php b/controllers/class.RemoveFolder.php
index b12c10eae..8ccac220a 100644
--- a/controllers/class.RemoveFolder.php
+++ b/controllers/class.RemoveFolder.php
@@ -27,8 +27,7 @@ class SeedDMS_Controller_RemoveFolder extends SeedDMS_Controller_Common {
 		$user = $this->params['user'];
 		$settings = $this->params['settings'];
 		$folder = $this->params['folder'];
-		$index = $this->params['index'];
-		$indexconf = $this->params['indexconf'];
+		$fulltextservice = $this->params['fulltextservice'];
 
 		/* Get the document id and name before removing the document */
 		$foldername = $folder->getName();
@@ -45,18 +44,17 @@ class SeedDMS_Controller_RemoveFolder extends SeedDMS_Controller_Common {
 			/* Register a callback which removes each document from the fulltext index
 			 * The callback must return null other the removal will be canceled.
 			 */
-			function removeFromIndex($arr, $document) {
-				$index = $arr[0];
-				$indexconf = $arr[1];
-				$lucenesearch = new $indexconf['Search']($index);
+			function removeFromIndex($fulltextservice, $document) {
+				$lucenesearch = $fulltextservice->Search();
 				if($hit = $lucenesearch->getDocument($document->getID())) {
+					$index = $fulltextservice->Indexer();
 					$index->delete($hit->id);
 					$index->commit();
 				}
 				return null;
 			}
-			if($index)
-				$dms->setCallback('onPreRemoveDocument', 'removeFromIndex', array($index, $indexconf));
+			if($fulltextservice && ($index = $fulltextservice->Indexer()))
+				$dms->setCallback('onPreRemoveDocument', 'removeFromIndex', array($fulltextservice));
 
 			function removePreviews($arr, $document) {
 				$previewer = $arr[0];
diff --git a/controllers/class.UpdateDocument.php b/controllers/class.UpdateDocument.php
index 6c7b97838..c1e2b7e57 100644
--- a/controllers/class.UpdateDocument.php
+++ b/controllers/class.UpdateDocument.php
@@ -40,8 +40,7 @@ class SeedDMS_Controller_UpdateDocument extends SeedDMS_Controller_Common {
 		$user = $this->params['user'];
 		$document = $this->params['document'];
 		$settings = $this->params['settings'];
-		$index = $this->params['index'];
-		$indexconf = $this->params['indexconf'];
+		$fulltextservice = $this->params['fulltextservice'];
 		$folder = $this->params['folder'];
 		$userfiletmp = $this->getParam('userfiletmp');
 		$userfilename = $this->getParam('userfilename');
@@ -77,12 +76,12 @@ class SeedDMS_Controller_UpdateDocument extends SeedDMS_Controller_Common {
 			return false;
 		}
 
-		if($index && $content) {
-			$lucenesearch = new $indexconf['Search']($index);
+		if($fulltextservice && ($index = $fulltextservice->Indexer()) && $content) {
+			$lucenesearch = $fulltextservice->Search();
 			if($hit = $lucenesearch->getDocument((int) $document->getId())) {
 				$index->delete($hit->id);
 			}
-			$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText));
+			$idoc = $fulltextservice->IndexedDocument($document);
 			if(false !== $this->callHook('preIndexDocument', $document, $idoc)) {
 				$index->addDocument($idoc);
 				$index->commit();
diff --git a/inc/inc.ClassFulltextService.php b/inc/inc.ClassFulltextService.php
index 613dcc284..79153dfab 100644
--- a/inc/inc.ClassFulltextService.php
+++ b/inc/inc.ClassFulltextService.php
@@ -42,10 +42,11 @@ class SeedDMS_FulltextService {
 		$this->maxsize = 0;
 		$this->indexdir = '';
 		$this->index = null;
+		$this->cmdtimeout = 5;
 	}
 
 	public function addService($name, $service) {
-		$this->services[$name] = $service;
+		$this->services[] = $service;
 	}
 
 	public function setConverters($converters) {
@@ -60,12 +61,19 @@ class SeedDMS_FulltextService {
 		$this->indexdir = $indexdir;
 	}
 
-	public function IndexedDocument($document) {
-		$indexcontent = $document->getLatestContent()->getFileSize() < $this->maxsize;
-		return new $this->services[0]['IndexedDocument']($document->getDMS(), $document, $this->converters, $indexcontent);
+	public function setCmdTimeout($timeout) {
+		$this->cmdtimeout = $timeout;
 	}
 
-	public function Indexer($recreate) {
+	public function IndexedDocument($document, $forceupdate=false) {
+		$nocontent = ($document->getLatestContent()->getFileSize() > $this->maxsize) && !$forceupdate;
+		return new $this->services[0]['IndexedDocument']($document->getDMS(), $document, $this->converters, $nocontent, $this->cmdtimeout);
+	}
+
+	public function Indexer($recreate=false) {
+		if($this->index)
+			return $this->index;
+
 		if($this->indexdir) {
 			if($recreate)
 				$this->index = $this->services[0]['Indexer']::create($this->indexdir);
@@ -76,8 +84,8 @@ class SeedDMS_FulltextService {
 			return null;
 	}
 
-	public function Indexer($recreate) {
-		return new $this->services[0]['Search']();
+	public function Search() {
+		return new $this->services[0]['Search']($this->index);
 	}
 }
 
diff --git a/inc/inc.DBInit.php b/inc/inc.DBInit.php
index 1b8d31ab4..4dad2c87d 100644
--- a/inc/inc.DBInit.php
+++ b/inc/inc.DBInit.php
@@ -64,3 +64,5 @@ if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) {
 		}
 	}
 }
+
+require_once('inc.FulltextInit.php');
diff --git a/inc/inc.Settings.php b/inc/inc.Settings.php
index 4f7e7dd5c..c3705d77e 100644
--- a/inc/inc.Settings.php
+++ b/inc/inc.Settings.php
@@ -52,38 +52,6 @@ if (get_magic_quotes_gpc()) {
 	unset($process);
 }
 
-require_once("inc.ClassFulltextService.php");
-$fulltextservice = new SeedDMS_FulltextService();
-
-$indexconf = null;
-if($settings->_enableFullSearch) {
-	if($settings->_fullSearchEngine == 'sqlitefts') {
-		$indexconf = array(
-			'Indexer' => 'SeedDMS_SQLiteFTS_Indexer',
-			'Search' => 'SeedDMS_SQLiteFTS_Search',
-			'IndexedDocument' => 'SeedDMS_SQLiteFTS_IndexedDocument'
-		);
-		$fulltextservice->addService('sqlitefts', $indexconf);
-
-		require_once('SeedDMS/SQLiteFTS.php');
-	} else {
-		$indexconf = array(
-			'Indexer' => 'SeedDMS_Lucene_Indexer',
-			'Search' => 'SeedDMS_Lucene_Search',
-			'IndexedDocument' => 'SeedDMS_Lucene_IndexedDocument'
-		);
-		$fulltextservice->addService('lucene', $indexconf);
-
-		if(!empty($settings->_luceneClassDir))
-			require_once($settings->_luceneClassDir.'/Lucene.php');
-		else
-			require_once('SeedDMS/Lucene.php');
-	}
-	$fulltextservice->setConverters(isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null);
-	$fulltextservice->setMaxSize($settings->_maxSizeForFullText);
-}
-$settings->_indexconf = $indexconf;
-
 /* Add root Dir. Needed because the view classes are included
  * relative to it.
  */
diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 704052eea..7a559f826 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -303,13 +303,6 @@ if(isset($_POST[$prefix.'-fine-uploader-uuids']) && $_POST[$prefix.'-fine-upload
 	}
 }
 
-if($settings->_enableFullSearch) {
-	$index = $indexconf['Indexer']::open($settings->_luceneDir);
-	$indexconf['Indexer']::init($settings->_stopWordsFile);
-} else {
-	$index = null;
-}
-
 /* Check if additional notification shall be added */
 $notusers = array();
 if(!empty($_POST['notification_users'])) {
@@ -371,8 +364,7 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 
 	$controller->setParam('documentsource', $docsource);
 	$controller->setParam('folder', $folder);
-	$controller->setParam('index', $index);
-	$controller->setParam('indexconf', $indexconf);
+	$controller->setParam('fulltextservice', $fulltextservice);
 	$controller->setParam('name', $name);
 	$controller->setParam('comment', $comment);
 	$controller->setParam('expires', $expires);
diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 4f30ab91b..6c965d60b 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -513,18 +513,9 @@ switch($command) {
 						);
 						$docname = $document->getName();
 
-						if($settings->_enableFullSearch) {
-							$index = $indexconf['Indexer']::open($settings->_luceneDir);
-							$indexconf['Indexer']::init($settings->_stopWordsFile);
-						} else {
-							$index = null;
-							$indexconf = null;
-						}
-
 						$controller = Controller::factory('RemoveDocument', array('dms'=>$dms, 'user'=>$user));
 						$controller->setParam('document', $document);
-						$controller->setParam('index', $index);
-						$controller->setParam('indexconf', $indexconf);
+						$controller->setParam('fulltextservice', $fulltextservice);
 						if($controller->run()) {
 							if ($notifier){
 								$subject = "document_deleted_email_subject";
@@ -779,19 +770,10 @@ switch($command) {
 
 				$cats = array();
 
-				if($settings->_enableFullSearch) {
-					$index = $indexconf['Indexer']::open($settings->_luceneDir);
-					$indexconf['Indexer']::init($settings->_stopWordsFile);
-				} else {
-					$index = null;
-					$indexconf = null;
-				}
-
 				$controller = Controller::factory('AddDocument', array('dms'=>$dms, 'user'=>$user));
 				$controller->setParam('documentsource', 'upload');
 				$controller->setParam('folder', $folder);
-				$controller->setParam('index', $index);
-				$controller->setParam('indexconf', $indexconf);
+				$controller->setParam('fulltextservice', $fulltextservice);
 				$controller->setParam('name', $name);
 				$controller->setParam('comment', '');
 				$controller->setParam('expires', $expires);
@@ -933,13 +915,11 @@ switch($command) {
 
 	case 'indexdocument': /* {{{ */
 		if($user && $user->isAdmin()) {
-			if($settings->_enableFullSearch) {
+			if($fulltextservice) {
 				$document = $dms->getDocument($_REQUEST['id']);
 				if($document) {
-						$index = $indexconf['Indexer']::open($settings->_luceneDir);
-						if($index) {
-							$indexconf['Indexer']::init($settings->_stopWordsFile);
-							$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false, $settings->_cmdTimeout);
+					if($index = $fulltextservice->Indexer()) {
+						$idoc = $fulltextservice->IndexedDocument($document, true);
 							$error = $idoc->getErrorMsg();
 							if(!$error) {
 								$ires = null;
diff --git a/op/op.RemoveDocument.php b/op/op.RemoveDocument.php
index bfd19b701..24fd3c614 100644
--- a/op/op.RemoveDocument.php
+++ b/op/op.RemoveDocument.php
@@ -60,14 +60,6 @@ if($document->isLocked()) {
 	}
 }
 
-if($settings->_enableFullSearch) {
-	$index = $indexconf['Indexer']::open($settings->_luceneDir);
-	$indexconf['Indexer']::init($settings->_stopWordsFile);
-} else {
-	$index = null;
-	$indexconf = null;
-}
-
 $folder = $document->getFolder();
 
 /* Remove all preview images. */
@@ -87,8 +79,7 @@ $nl = array(
 $docname = $document->getName();
 
 $controller->setParam('document', $document);
-$controller->setParam('index', $index);
-$controller->setParam('indexconf', $indexconf);
+$controller->setParam('fulltextservice', $fulltextservice);
 if(!$controller->run()) {
 	if ($controller->getErrorMsg() != '')
 		$errormsg = $controller->getErrorMsg();
diff --git a/op/op.RemoveFolder.php b/op/op.RemoveFolder.php
index 5ca82a13a..53c630b03 100644
--- a/op/op.RemoveFolder.php
+++ b/op/op.RemoveFolder.php
@@ -54,13 +54,6 @@ if ($folder->getAccessMode($user, 'removeFolder') < M_ALL) {
 	UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("access_denied"));
 }
 
-if($settings->_enableFullSearch) {
-	$index = $indexconf['Indexer']::open($settings->_luceneDir);
-	$indexconf['Indexer']::init($settings->_stopWordsFile);
-} else {
-	$index = null;
-}
-
 /*
 function removePreviews($arr, $document) {
 	$previewer = $arr[0];
@@ -86,8 +79,7 @@ $nl = array(
 );
 
 $controller->setParam('folder', $folder);
-$controller->setParam('index', $index);
-$controller->setParam('indexconf', $indexconf);
+$controller->setParam('fulltextservice', $fulltextservice);
 if(!$controller->run()) {
 	UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($foldername))),getMLText("error_remove_folder"));
 }
diff --git a/op/op.RemoveVersion.php b/op/op.RemoveVersion.php
index 0dd0e2287..8f7eede93 100644
--- a/op/op.RemoveVersion.php
+++ b/op/op.RemoveVersion.php
@@ -74,14 +74,11 @@ if (count($document->getContent())==1) {
 	} else {
 		$nexturl = "../out/out.ViewFolder.php?folderid=".$folder->getId();
 		/* Remove the document from the fulltext index */
-		if($settings->_enableFullSearch) {
-			$index = $indexconf['Indexer']::open($settings->_luceneDir);
-			if($index) {
-				$lucenesearch = new $indexconf['Search']($index);
-				if($hit = $lucenesearch->getDocument($documentid)) {
-					$index->delete($hit->id);
-					$index->commit();
-				}
+		if($fulltextservice && ($index = $fulltextservice->Index())) {
+			$lucenesearch = $fulltextservice->Search();
+			if($hit = $lucenesearch->getDocument($documentid)) {
+				$index->delete($hit->id);
+				$index->commit();
 			}
 		}
 
@@ -142,18 +139,14 @@ else {
 		else
 			$nexturl = "../out/out.ViewDocument.php?documentid=".$documentid."&currenttab=previous";
 		/* Remove the document from the fulltext index and reindex latest version */
-		if($settings->_enableFullSearch) {
-			$index = $indexconf['Indexer']::open($settings->_luceneDir);
-			if($index) {
-				$lucenesearch = new $indexconf['Search']($index);
-				if($hit = $lucenesearch->getDocument($document->getID())) {
-					$index->delete($hit->id);
-				}
-				$version = $document->getLatestContent();
-				$indexconf['Indexer']::init($settings->_stopWordsFile);
-				$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($version->getFileSize() < $settings->_maxSizeForFullText)));
-				$index->commit();
+		if($fulltextservice && ($index = $fulltextservice->Indexer())) {
+			$lucenesearch = $fulltextservice->Search();
+			if($hit = $lucenesearch->getDocument($document->getID())) {
+				$index->delete($hit->id);
 			}
+			$version = $document->getLatestContent();
+			$index->addDocument($fulltextservice->IndexedDocument($document));
+			$index->commit();
 		}
 
 		// Notify affected users.
diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index 2e8a377a7..91da9f50e 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -133,13 +133,6 @@ if (isset($_FILES['userfile']) && $_FILES['userfile']['error'] == 0) {
 
 	$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 
-if($settings->_enableFullSearch) {
-	$index = $indexconf['Indexer']::open($settings->_luceneDir);
-	$indexconf['Indexer']::init($settings->_stopWordsFile);
-} else {
-	$index = null;
-}
-
 if(isset($_POST["comment"]))
 	$comment  = $_POST["comment"];
 else
@@ -291,8 +284,7 @@ default:
 
 	$controller->setParam('folder', $folder);
 	$controller->setParam('document', $document);
-	$controller->setParam('index', $index);
-	$controller->setParam('indexconf', $indexconf);
+	$controller->setParam('fulltextservice', $fulltextservice);
 	$controller->setParam('comment', $comment);
 	if($oldexpires != $expires)
 		$controller->setParam('expires', $expires);
diff --git a/op/op.UpdateDocument2.php b/op/op.UpdateDocument2.php
index 342160127..609125075 100644
--- a/op/op.UpdateDocument2.php
+++ b/op/op.UpdateDocument2.php
@@ -159,15 +159,13 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 		if (is_bool($contentResult) && !$contentResult) {
 			echo getMLText("error_occured");
 		} else {
-			if($settings->_enableFullSearch) {
-				$index = $indexconf['Indexer']::open($settings->_luceneDir);
+			if($fulltextservice && ($index = $fulltextservice->Indexer())) {
 				if($index) {
-					$lucenesearch = new $indexconf['Search']($index);
+					$lucenesearch = $fulltextservice->Search();
 					if($hit = $lucenesearch->getDocument((int) $document->getId())) {
 						$index->delete($hit->id);
 					}
-					$indexconf['Indexer']::init($settings->_stopWordsFile);
-					$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText)));
+					$index->addDocument($fulltextservice->IndexedDocument($document));
 					$index->commit();
 				}
 			}
diff --git a/out/out.IndexInfo.php b/out/out.IndexInfo.php
index c0f026b05..b2d0d4bc6 100644
--- a/out/out.IndexInfo.php
+++ b/out/out.IndexInfo.php
@@ -40,7 +40,7 @@ if(!$settings->_enableFullSearch) {
 	UI::exitError(getMLText("admin_tools"),getMLText("fulltextsearch_disabled"));
 }
 
-$index = $indexconf['Indexer']::open($settings->_luceneDir);
+$index = $fulltextservice->Indexer();
 if(!$index) {
 	UI::exitError(getMLText("admin_tools"),getMLText("no_fulltextindex"));
 }
diff --git a/out/out.Indexer.php b/out/out.Indexer.php
index d4521bc81..aeb445973 100644
--- a/out/out.Indexer.php
+++ b/out/out.Indexer.php
@@ -42,27 +42,25 @@ if(!$settings->_enableFullSearch) {
 
 $index = null;
 if(!isset($_GET['action']) || $_GET['action'] == 'show') {
-	if($indexconf) {
+	if($fulltextservice) {
 		if(isset($_GET['create']) && $_GET['create'] == 1) {
 			if(isset($_GET['confirm']) && $_GET['confirm'] == 1) {
-				$index = $indexconf['Indexer']::create($settings->_luceneDir);
+				$index = $fulltextservice->Indexer(true);
 				if(!$index) {
 					UI::exitError(getMLText("admin_tools"),getMLText("no_fulltextindex"));
 				}
-				$indexconf['Indexer']::init($settings->_stopWordsFile);
 			} else {
 				header('Location: out.CreateIndex.php');
 				exit;
 			}
 		} else {
-			$index = $indexconf['Indexer']::open($settings->_luceneDir);
+			$index = $fulltextservice->Indexer(false);
 			if(!$index) {
-				$index = $indexconf['Indexer']::create($settings->_luceneDir);
+				$index = $fulltextservice->Indexer(true);
 				if(!$index) {
 					UI::exitError(getMLText("admin_tools"),getMLText("no_fulltextindex"));
 				}
 			}
-			$indexconf['Indexer']::init($settings->_stopWordsFile);
 		}
 	}
 }
@@ -76,8 +74,7 @@ else {
 $folder = $dms->getFolder($folderid);
 
 if($view) {
-	$view->setParam('index', $index);
-	$view->setParam('indexconf', $indexconf);
+	$view->setParam('fulltextservice', $fulltextservice);
 	$view->setParam('recreate', (isset($_GET['create']) && $_GET['create']==1));
 	$view->setParam('forceupdate', (isset($_GET['forceupdate']) && $_GET['forceupdate']==1));
 	$view->setParam('folder', $folder);
diff --git a/out/out.Search.php b/out/out.Search.php
index 74d47fb35..fa8f450c8 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -126,8 +126,8 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 		$searchTime = 0;
 	} else {
 		$startTime = getTime();
-		$index = $indexconf['Indexer']::open($settings->_luceneDir);
-		$lucenesearch = new $indexconf['Search']($index);
+		$index = $fulltextservice->Indexer();
+		$lucenesearch = $fulltextservice->Search();
 		$hits = $lucenesearch->search($query, $owner ? $owner->getLogin() : '', '', $categorynames, array(), $user->isAdmin() ? [] : [$user->getLogin()]);
 		if($hits === false) {
 			$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('splash_invalid_searchterm')));
diff --git a/utils/indexer.php b/utils/indexer.php
index f0f2daf1b..9463310c6 100644
--- a/utils/indexer.php
+++ b/utils/indexer.php
@@ -59,38 +59,21 @@ include($myincpath."/inc/inc.Init.php");
 include($myincpath."/inc/inc.Extension.php");
 include($myincpath."/inc/inc.DBInit.php");
 
-if($settings->_fullSearchEngine == 'sqlitefts') {
-	$indexconf = array(
-		'Indexer' => 'SeedDMS_SQLiteFTS_Indexer',
-		'Search' => 'SeedDMS_SQLiteFTS_Search',
-		'IndexedDocument' => 'SeedDMS_SQLiteFTS_IndexedDocument'
-	);
-
-	require_once('SeedDMS/SQLiteFTS.php');
-} else {
-	$indexconf = array(
-		'Indexer' => 'SeedDMS_Lucene_Indexer',
-		'Search' => 'SeedDMS_Lucene_Search',
-		'IndexedDocument' => 'SeedDMS_Lucene_IndexedDocument'
-	);
-
-	require_once('SeedDMS/Lucene.php');
-}
-
-function tree($dms, $index, $indexconf, $folder, $indent='') { /* {{{ */
+function tree($dms, $fulltextservice, $folder, $indent='') { /* {{{ */
 	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.'  ');
+		tree($dms, $fulltextservice, $subfolder, $indent.'  ');
 	}
 	$documents = $folder->getDocuments();
 	foreach($documents as $document) {
 		echo $themes->black($indent."  ".$document->getId().":".$document->getName()." ");
-		$lucenesearch = new $indexconf['Search']($index);
+		$index = $fulltextservice->Indexer();
+		$lucenesearch = $fulltextservice->Search();
 		if(!($hit = $lucenesearch->getDocument($document->getId()))) {
 			try {
-				$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false, $settings->_cmdTimeout);
+				$idoc = $fulltextservice->IndexedDocument($document, true);
 				if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) {
 					foreach($GLOBALS['SEEDDMS_HOOKS']['indexDocument'] as $hookObj) {
 						if (method_exists($hookObj, 'preIndexDocument')) {
@@ -115,7 +98,7 @@ function tree($dms, $index, $indexconf, $folder, $indent='') { /* {{{ */
 			} else {
 				$index->delete($hit->id);
 				try {
-					$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false, $settings->_cmdTimeout);
+					$idoc = $fulltextservice->IndexedDocument($document, true);
 					if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) {
 						foreach($GLOBALS['SEEDDMS_HOOKS']['indexDocument'] as $hookObj) {
 							if (method_exists($hookObj, 'preIndexDocument')) {
@@ -135,19 +118,14 @@ function tree($dms, $index, $indexconf, $folder, $indent='') { /* {{{ */
 
 $themes = new \AlecRabbit\ConsoleColour\Themes();
 
-if($recreate)
-	$index = $indexconf['Indexer']::create($settings->_luceneDir);
-else
-	$index = $indexconf['Indexer']::open($settings->_luceneDir);
+$index = $fulltextservice->Indexer($recreate);
 if(!$index) {
 	echo $themes->error("Could not create index.").PHP_EOL;
 	exit(1);
 }
 
-$indexconf['Indexer']::init($settings->_stopWordsFile);
-
 $folder = $dms->getFolder($settings->_rootFolderID);
-tree($dms, $index, $indexconf, $folder);
+tree($dms, $fulltextservice, $folder);
 
 $index->commit();
 $index->optimize();
diff --git a/views/bootstrap/class.Indexer.php b/views/bootstrap/class.Indexer.php
index e0934f963..7dbeaf4a5 100644
--- a/views/bootstrap/class.Indexer.php
+++ b/views/bootstrap/class.Indexer.php
@@ -29,11 +29,8 @@ class SeedDMS_View_Indexer_Process_Folder { /* {{{ */
 
 	protected $index;
 
-	protected $indexconf;
-
-	public function __construct($index, $indexconf, $forceupdate) { /* {{{ */
-		$this->index = $index;
-		$this->indexconf = $indexconf;
+	public function __construct($fulltextservice, $forceupdate) { /* {{{ */
+		$this->fulltextservice = $fulltextservice;
 		$this->forceupdate = $forceupdate;
 	} /* }}} */
 
@@ -44,17 +41,9 @@ class SeedDMS_View_Indexer_Process_Folder { /* {{{ */
 			foreach($documents as $document) {
 			echo "<div class=\"document\">".$document->getId().":".htmlspecialchars($document->getName());
 			/* If the document wasn't indexed before then just add it */
-			$lucenesearch = new $this->indexconf['Search']($this->index);
+			$lucenesearch = $this->fulltextservice->Search();
 			if(!($hit = $lucenesearch->getDocument($document->getId()))) {
 				echo " <span id=\"status_".$document->getID()."\" class=\"indexme indexstatus\" data-docid=\"".$document->getID()."\">".getMLText('index_waiting')."</span>";
-				/*
-				try {
-					$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, $this->converters ? $this->converters : null, false, $this->timeout));
-					echo "(document added)";
-				} catch(Exception $e) {
-					echo $indent."(adding document failed '".$e->getMessage()."')";
-				}
-				 */
 			} else {
 				/* Check if the attribute created is set or has a value older
 				 * than the lastet content. Documents without such an attribute
@@ -70,16 +59,8 @@ class SeedDMS_View_Indexer_Process_Folder { /* {{{ */
 				if($created >= $content->getDate() && !$this->forceupdate) {
 					echo "<span id=\"status_".$document->getID()."\" class=\"indexstatus\" data-docid=\"".$document->getID()."\">".getMLText('index_document_unchanged')."</span>";
 				} else {
-					$this->index->delete($hit->id);
+					$this->fulltextservice->Indexer()->delete($hit->id);
 					echo " <span id=\"status_".$document->getID()."\" class=\"indexme indexstatus\" data-docid=\"".$document->getID()."\">".getMLText('index_waiting')."</span>";
-					/*
-					try {
-						$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, $this->converters ? $this->converters : null, false, $this->timeout));
-						echo $indent."(document updated)";
-					} catch(Exception $e) {
-						echo $indent."(updating document failed)";
-					}
-					 */
 				}
 			}
 			echo "</div>";
@@ -110,13 +91,13 @@ class SeedDMS_View_Indexer extends SeedDMS_Bootstrap_Style {
 var queue_count = 0;          // Number of functions being called
 var funcArray = [];     // Array of functions waiting
 var MAX_REQUESTS = 5;   // Max requests
-var CALL_WAIT = 100;        // 100ms
+var CALL_WAIT = 20;        // 100ms
 var docstoindex = 0; // total number of docs to index
 
 function check_queue() {
 		// Check if count doesn't exceeds or if there aren't any functions to call
-		console.log('Queue has ' + funcArray.length + '/' + docstoindex + ' items');
-		console.log('Currently processing ' + queue_count + ' requests (' + $.active + ')');
+//		console.log('Queue has ' + funcArray.length + '/' + docstoindex + ' items');
+//		console.log('Currently processing ' + queue_count + ' requests (' + $.active + ')');
     if(queue_count >= MAX_REQUESTS) {
 			setTimeout(function() { check_queue() }, CALL_WAIT);
 			return;
@@ -193,74 +174,10 @@ $(document).ready( function() {
 <?php
 	} /* }}} */
 
-	protected function tree($dms, $index, $indexconf, $folder, $indent='') { /* {{{ */
-		$forceupdate = $this->params['forceupdate'];
-
-		set_time_limit(30);
-//		echo $indent."D ".htmlspecialchars($folder->getName())."\n";
-		echo '<ul class="nav nav-list"><li><label class="tree-toggle nav-header">'.htmlspecialchars($folder->getName()).'</label>'."\n";
-		$subfolders = $folder->getSubFolders();
-		foreach($subfolders as $subfolder) {
-			$this->tree($dms, $index, $indexconf, $subfolder, $indent.'  ');
-		}
-		$documents = $folder->getDocuments();
-		if($documents) {
-		echo '<ul class="nav nav-list">'."\n";
-		foreach($documents as $document) {
-//			echo $indent."  ".$document->getId().":".htmlspecialchars($document->getName());
-			echo "<li class=\"document\">".$document->getId().":".htmlspecialchars($document->getName());
-			/* If the document wasn't indexed before then just add it */
-			$lucenesearch = new $indexconf['Search']($index);
-			if(!($hit = $lucenesearch->getDocument($document->getId()))) {
-				echo " <span id=\"status_".$document->getID()."\" class=\"indexme indexstatus\" data-docid=\"".$document->getID()."\">".getMLText('index_waiting')."</span>";
-				/*
-				try {
-					$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, $this->converters ? $this->converters : null, false, $this->timeout));
-					echo "(document added)";
-				} catch(Exception $e) {
-					echo $indent."(adding document failed '".$e->getMessage()."')";
-				}
-				 */
-			} else {
-				/* Check if the attribute created is set or has a value older
-				 * than the lastet content. Documents without such an attribute
-				 * where added when a new document was added to the dms. In such
-				 * a case the document content  wasn't indexed.
-				 */
-				try {
-					$created = (int) $hit->getDocument()->getFieldValue('created');
-				} catch (/* Zend_Search_Lucene_ */Exception $e) {
-					$created = 0;
-				}
-				$content = $document->getLatestContent();
-				if($created >= $content->getDate() && !$forceupdate) {
-					echo $indent."<span id=\"status_".$document->getID()."\" class=\"indexstatus\" data-docid=\"".$document->getID()."\">document unchanged</span>";
-				} else {
-					$index->delete($hit->id);
-					echo " <span id=\"status_".$document->getID()."\" class=\"indexme indexstatus\" data-docid=\"".$document->getID()."\">".getMLText('index_waiting')."</span>";
-					/*
-					try {
-						$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, $this->converters ? $this->converters : null, false, $this->timeout));
-						echo $indent."(document updated)";
-					} catch(Exception $e) {
-						echo $indent."(updating document failed)";
-					}
-					 */
-				}
-			}
-			echo "</li>";
-			echo "\n";
-		}
-		echo "</ul>\n";
-		}
-		echo "</li></ul>\n";
-	} /* }}} */
-
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
-		$index = $this->params['index'];
-		$indexconf = $this->params['indexconf'];
+		$fulltextservice = $this->params['fulltextservice'];
 		$forceupdate = $this->params['forceupdate'];
 		$folder = $this->params['folder'];
 		$this->converters = $this->params['converters'];
@@ -271,7 +188,8 @@ $(document).ready( function() {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 		$this->contentHeading(getMLText("update_fulltext_index"));
-		if($index) {
+		if($fulltextservice) {
+			$index = $fulltextservice->Indexer();
 ?>
 <style type="text/css">
 li {line-height: 20px;}
@@ -299,10 +217,9 @@ div.folder {font-weight: bold; line-height: 20px; margin-top: 10px;}
 			<div class="bar-legend"><?php printMLText('indexing_tasks_in_queue'); ?></div>
 		</div>
 <?php
-		$folderprocess = new SeedDMS_View_Indexer_Process_Folder($index, $indexconf, $forceupdate);
+		$folderprocess = new SeedDMS_View_Indexer_Process_Folder($fulltextservice, $forceupdate);
 		$tree = new SeedDMS_FolderTree($folder, array($folderprocess, 'process'));
 		call_user_func(array($folderprocess, 'process'), $folder);
-//		$this->tree($dms, $index, $indexconf, $folder);
 		echo "</div>";
 
 		$index->commit();
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index c7cf18323..c1e9cd71a 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -308,7 +308,15 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
 <?php $this->showConfigCheckbox('settings_enableUsersView', 'enableUsersView'); ?>
 <?php $this->showConfigCheckbox('settings_enableFullSearch', 'enableFullSearch'); ?>
 <?php $this->showConfigText('settings_maxSizeForFullText', 'maxSizeForFullText'); ?>
-<?php $this->showConfigOption('settings_fullSearchEngine', 'fullSearchEngine', array('lucene'=>'settings_fullSearchEngine_vallucene', 'sqlitefts'=>'settings_fullSearchEngine_valsqlitefts'), false, true); ?>
+<?php
+$fullsearchengines = array(
+	'lucene'=>'settings_fullSearchEngine_vallucene',
+	'sqlitefts'=>'settings_fullSearchEngine_valsqlitefts'
+);
+if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
+	$fullsearchengines = array_merge($fullsearchengines, $kkk);
+?>
+<?php $this->showConfigOption('settings_fullSearchEngine', 'fullSearchEngine', $fullsearchengines, false, true); ?>
 <?php $this->showConfigOption('settings_defaultSearchMethod', 'defaultSearchMethod', array('database'=>'settings_defaultSearchMethod_valdatabase', 'fulltext'=>'settings_defaultSearchMethod_valfulltext'), false, true); ?>
 <?php $this->showConfigCheckbox('settings_showSingleSearchHit', 'showSingleSearchHit'); ?>
 <?php $this->showConfigText('settings_stopWordsFile', 'stopWordsFile'); ?>

From e3e46b853d470ee609da9d28b3904f0ea265322a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 10 Sep 2020 15:18:58 +0200
Subject: [PATCH 149/312] get $index and $search before foreach loop

---
 utils/indexer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/indexer.php b/utils/indexer.php
index 9463310c6..156bcb346 100644
--- a/utils/indexer.php
+++ b/utils/indexer.php
@@ -67,10 +67,10 @@ function tree($dms, $fulltextservice, $folder, $indent='') { /* {{{ */
 		tree($dms, $fulltextservice, $subfolder, $indent.'  ');
 	}
 	$documents = $folder->getDocuments();
+	$index = $fulltextservice->Indexer();
+	$lucenesearch = $fulltextservice->Search();
 	foreach($documents as $document) {
 		echo $themes->black($indent."  ".$document->getId().":".$document->getName()." ");
-		$index = $fulltextservice->Indexer();
-		$lucenesearch = $fulltextservice->Search();
 		if(!($hit = $lucenesearch->getDocument($document->getId()))) {
 			try {
 				$idoc = $fulltextservice->IndexedDocument($document, true);

From 1fda490bbe37eeeaea40d3ba34462979413e9142 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 10 Sep 2020 15:26:40 +0200
Subject: [PATCH 150/312] pass a config array to search engine, search returns
 hits and total count

---
 SeedDMS_Lucene/Lucene/Indexer.php       |  8 ++---
 SeedDMS_Lucene/Lucene/Search.php        |  2 +-
 SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php | 20 +++++------
 SeedDMS_SQLiteFTS/SQLiteFTS/Search.php  |  6 ++--
 inc/inc.ClassFulltextService.php        | 25 +++++++++-----
 out/out.IndexInfo.php                   |  2 --
 out/out.Search.php                      | 12 +++----
 views/bootstrap/class.IndexInfo.php     |  8 ++---
 views/bootstrap/class.Indexer.php       | 46 ++++++++++++-------------
 9 files changed, 66 insertions(+), 63 deletions(-)

diff --git a/SeedDMS_Lucene/Lucene/Indexer.php b/SeedDMS_Lucene/Lucene/Indexer.php
index 58b7204eb..a0fc2bb43 100644
--- a/SeedDMS_Lucene/Lucene/Indexer.php
+++ b/SeedDMS_Lucene/Lucene/Indexer.php
@@ -29,17 +29,17 @@ class SeedDMS_Lucene_Indexer {
 	 */
 	protected $indexname;
 
-	static function open($luceneDir) { /* {{{ */
+	static function open($conf) { /* {{{ */
 		try {
-		$index = Zend_Search_Lucene::open($luceneDir);
+		$index = Zend_Search_Lucene::open($conf['indexdir']);
 		return($index);
 		} catch (Exception $e) {
 			return null;
 		}
 	} /* }}} */
 
-	static function create($luceneDir) { /* {{{ */
-		$index = Zend_Search_Lucene::create($luceneDir);
+	static function create($conf) { /* {{{ */
+		$index = Zend_Search_Lucene::create($conf['indexdir']);
 		return($index);
 	} /* }}} */
 
diff --git a/SeedDMS_Lucene/Lucene/Search.php b/SeedDMS_Lucene/Lucene/Search.php
index 604c1549c..992422700 100644
--- a/SeedDMS_Lucene/Lucene/Search.php
+++ b/SeedDMS_Lucene/Lucene/Search.php
@@ -93,7 +93,7 @@ class SeedDMS_Lucene_Search {
 				foreach($hits as $hit) {
 					$recs[] = array('id'=>$hit->id, 'document_id'=>$hit->document_id);
 				}
-				return $recs;
+				return array('count'=>count($hits), 'hits'=>$recs);
 			} catch (Zend_Search_Lucene_Exception $e) {
 				return false;
 			}
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
index 749782300..892fc46a9 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
@@ -42,22 +42,22 @@ class SeedDMS_SQLiteFTS_Indexer {
 	 *
 	 * @param string $indexerDir directory on disk containing the index
 	 */
-	static function open($indexerDir) { /* {{{ */
-		if(file_exists($indexerDir.'/index.db')) {
-			return new SeedDMS_SQLiteFTS_Indexer($indexerDir);
+	static function open($conf) { /* {{{ */
+		if(file_exists($conf['indexdir'].'/index.db')) {
+			return new SeedDMS_SQLiteFTS_Indexer($conf['indexdir']);
 		} else
-			return self::create($indexerDir);
+			return self::create($conf['indexdir']);
 	} /* }}} */
 
 	/**
 	 * Create a new index
 	 *
-	 * @param string $indexerDir directory on disk containing the index
+	 * @param array $conf $conf['indexdir'] is the directory on disk containing the index
 	 */
-	static function create($indexerDir) { /* {{{ */
-		if(file_exists($indexerDir.'/index.db'))
-			unlink($indexerDir.'/index.db');
-		$index =  new SeedDMS_SQLiteFTS_Indexer($indexerDir);
+	static function create($conf) { /* {{{ */
+		if(file_exists($conf['indexdir'].'/index.db'))
+			unlink($conf['indexdir'].'/index.db');
+		$index =  new SeedDMS_SQLiteFTS_Indexer($conf['indexdir']);
 		/* Make sure the sequence of fields is identical to the field list
 		 * in SeedDMS_SQLiteFTS_Term
 		 */
@@ -153,7 +153,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 				$hits[] = $hit;
 			}
 		}
-		return $hits;
+		return array('count'=>count($hits), 'hits'=>$hits);
 	} /* }}} */
 
 	/**
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
index 511783539..4f58ee75e 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
@@ -90,12 +90,12 @@ class SeedDMS_SQliteFTS_Search {
 			$querystr .= '';
 		}
 		try {
-			$hits = $this->index->find($querystr);
+			$result = $this->index->find($querystr);
 			$recs = array();
-			foreach($hits as $hit) {
+			foreach($result["hits"] as $hit) {
 				$recs[] = array('id'=>$hit->id, 'document_id'=>$hit->id);
 			}
-			return $recs;
+			return array('count'=>$result['count'], 'hits'=>$recs);
 		} catch (Exception $e) {
 			return false;
 		}
diff --git a/inc/inc.ClassFulltextService.php b/inc/inc.ClassFulltextService.php
index 79153dfab..1298f59b8 100644
--- a/inc/inc.ClassFulltextService.php
+++ b/inc/inc.ClassFulltextService.php
@@ -36,12 +36,16 @@ class SeedDMS_FulltextService {
 	 */
 	protected $maxsize;
 
+	private $index;
+
+	private $search;
+
 	public function __construct() {
 		$this->services = array();
 		$this->converters = array();
 		$this->maxsize = 0;
-		$this->indexdir = '';
 		$this->index = null;
+		$this->search = null;
 		$this->cmdtimeout = 5;
 	}
 
@@ -57,10 +61,6 @@ class SeedDMS_FulltextService {
 		$this->maxsize = $maxsize;
 	}
 
-	public function setIndexDir($indexdir) {
-		$this->indexdir = $indexdir;
-	}
-
 	public function setCmdTimeout($timeout) {
 		$this->cmdtimeout = $timeout;
 	}
@@ -74,18 +74,25 @@ class SeedDMS_FulltextService {
 		if($this->index)
 			return $this->index;
 
-		if($this->indexdir) {
+		if($this->services[0]) {
 			if($recreate)
-				$this->index = $this->services[0]['Indexer']::create($this->indexdir);
+				$this->index = $this->services[0]['Indexer']::create($this->services[0]['Conf']);
 			else
-				$this->index = $this->services[0]['Indexer']::open($this->indexdir);
+				$this->index = $this->services[0]['Indexer']::open($this->services[0]['Conf']);
 			return $this->index;
 		} else
 			return null;
 	}
 
 	public function Search() {
-		return new $this->services[0]['Search']($this->index);
+		if($this->search)
+			return $this->search;
+		if($this->services[0]) {
+			$this->search = new $this->services[0]['Search']($this->index);
+			return $this->search;
+		} else {
+			return null;
+		}
 	}
 }
 
diff --git a/out/out.IndexInfo.php b/out/out.IndexInfo.php
index b2d0d4bc6..5bfb894f6 100644
--- a/out/out.IndexInfo.php
+++ b/out/out.IndexInfo.php
@@ -46,8 +46,6 @@ if(!$index) {
 }
 
 if($view) {
-	$view->setParam('luceneclassdir', $settings->_luceneClassDir);
-	$view->setParam('lucenedir', $settings->_luceneDir);
 	$view->setParam('index', $index);
 	$view($_GET);
 	exit;
diff --git a/out/out.Search.php b/out/out.Search.php
index fa8f450c8..5fea9bc33 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -128,23 +128,23 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 		$startTime = getTime();
 		$index = $fulltextservice->Indexer();
 		$lucenesearch = $fulltextservice->Search();
-		$hits = $lucenesearch->search($query, $owner ? $owner->getLogin() : '', '', $categorynames, array(), $user->isAdmin() ? [] : [$user->getLogin()]);
-		if($hits === false) {
+		$searchresult = $lucenesearch->search($query, $owner ? $owner->getLogin() : '', '', $categorynames, array(), $user->isAdmin() ? [] : [$user->getLogin()]);
+		if($searchresult === false) {
 			$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('splash_invalid_searchterm')));
 			$totalPages = 0;
 			$entries = array();
 			$searchTime = 0;
 		} else {
 			$entries = array();
-			$dcount = 0;
+			$dcount = $searchresult['count']; //0;
 			$fcount = 0;
-			if($hits) {
-				foreach($hits as $hit) {
+			if($searchresult) {
+				foreach($searchresult['hits'] as $hit) {
 					if($tmp = $dms->getDocument($hit['document_id'])) {
 						if($tmp->getAccessMode($user) >= M_READ) {
 							$tmp->verifyLastestContentExpriry();
 							$entries[] = $tmp;
-							$dcount++;
+//							$dcount++;
 						}
 					}
 				}
diff --git a/views/bootstrap/class.IndexInfo.php b/views/bootstrap/class.IndexInfo.php
index e7a11dd6c..e8ae4d0ae 100644
--- a/views/bootstrap/class.IndexInfo.php
+++ b/views/bootstrap/class.IndexInfo.php
@@ -34,8 +34,6 @@ class SeedDMS_View_IndexInfo extends SeedDMS_Bootstrap_Style {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
-		$luceneclassdir = $this->params['luceneclassdir'];
-		$lucenedir = $this->params['lucenedir'];
 		$index = $this->params['index'];
 
 		$this->htmlStartPage(getMLText('fulltext_info'));
@@ -49,8 +47,8 @@ class SeedDMS_View_IndexInfo extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerStart();
 		for ($id = 0; $id < $numDocs; $id++) {
 			if (!$index->isDeleted($id)) {
-				$hit = $index->getDocument($id);
-				echo "<span title=\"".$hit->document_id."\">".htmlspecialchars($hit->title)."</span>\n";
+				if($hit = $index->getDocument($id))
+					echo "<span title=\"".$hit->document_id."\">".htmlspecialchars($hit->title)."</span>\n";
 			}
 		}
 		$this->contentContainerEnd();
@@ -67,7 +65,7 @@ class SeedDMS_View_IndexInfo extends SeedDMS_Bootstrap_Style {
 				$this->contentContainerStart();
 				$field = $term->field;
 			}
-			echo htmlspecialchars($term->text)."\n";
+			echo "<span title=\"".$term->_occurrence."\">".htmlspecialchars($term->text)."</span>\n";
 		}
 		$this->contentContainerEnd();
 //		echo "</pre>";
diff --git a/views/bootstrap/class.Indexer.php b/views/bootstrap/class.Indexer.php
index 7dbeaf4a5..7613500f1 100644
--- a/views/bootstrap/class.Indexer.php
+++ b/views/bootstrap/class.Indexer.php
@@ -37,34 +37,34 @@ class SeedDMS_View_Indexer_Process_Folder { /* {{{ */
 	public function process($folder) { /* {{{ */
 		$documents = $folder->getDocuments();
 		if($documents) {
+			$lucenesearch = $this->fulltextservice->Search();
 			echo "<div class=\"folder\">".$folder->getFolderPathPlain()."</div>";
 			foreach($documents as $document) {
-			echo "<div class=\"document\">".$document->getId().":".htmlspecialchars($document->getName());
-			/* If the document wasn't indexed before then just add it */
-			$lucenesearch = $this->fulltextservice->Search();
-			if(!($hit = $lucenesearch->getDocument($document->getId()))) {
-				echo " <span id=\"status_".$document->getID()."\" class=\"indexme indexstatus\" data-docid=\"".$document->getID()."\">".getMLText('index_waiting')."</span>";
-			} else {
-				/* Check if the attribute created is set or has a value older
-				 * than the lastet content. Documents without such an attribute
-				 * where added when a new document was added to the dms. In such
-				 * a case the document content  wasn't indexed.
-				 */
-				try {
-					$created = (int) $hit->getDocument()->getFieldValue('created');
-				} catch (/* Zend_Search_Lucene_ */Exception $e) {
-					$created = 0;
-				}
-				$content = $document->getLatestContent();
-				if($created >= $content->getDate() && !$this->forceupdate) {
-					echo "<span id=\"status_".$document->getID()."\" class=\"indexstatus\" data-docid=\"".$document->getID()."\">".getMLText('index_document_unchanged')."</span>";
-				} else {
-					$this->fulltextservice->Indexer()->delete($hit->id);
+				echo "<div class=\"document\">".$document->getId().":".htmlspecialchars($document->getName());
+				/* If the document wasn't indexed before then just add it */
+				if(!($hit = $lucenesearch->getDocument($document->getId()))) {
 					echo " <span id=\"status_".$document->getID()."\" class=\"indexme indexstatus\" data-docid=\"".$document->getID()."\">".getMLText('index_waiting')."</span>";
+				} else {
+					/* Check if the attribute created is set or has a value older
+					 * than the lastet content. Documents without such an attribute
+					 * where added when a new document was added to the dms. In such
+					 * a case the document content  wasn't indexed.
+					 */
+					try {
+						$created = (int) $hit->getDocument()->getFieldValue('created');
+					} catch (/* Zend_Search_Lucene_ */Exception $e) {
+						$created = 0;
+					}
+					$content = $document->getLatestContent();
+					if($created >= $content->getDate() && !$this->forceupdate) {
+						echo "<span id=\"status_".$document->getID()."\" class=\"indexstatus\" data-docid=\"".$document->getID()."\">".getMLText('index_document_unchanged')."</span>";
+					} else {
+						$this->fulltextservice->Indexer()->delete($hit->id);
+						echo " <span id=\"status_".$document->getID()."\" class=\"indexme indexstatus\" data-docid=\"".$document->getID()."\">".getMLText('index_waiting')."</span>";
+					}
 				}
+				echo "</div>";
 			}
-			echo "</div>";
-		}
 		}
 	} /* }}} */
 } /* }}} */

From 41c08492ac24a33b8d0c9de7563d766a9f551d78 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 12 Sep 2020 12:48:54 +0200
Subject: [PATCH 151/312] add field 'status' to index

---
 SeedDMS_Lucene/Lucene/IndexedDocument.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/SeedDMS_Lucene/Lucene/IndexedDocument.php b/SeedDMS_Lucene/Lucene/IndexedDocument.php
index f3938df8c..03a164d94 100644
--- a/SeedDMS_Lucene/Lucene/IndexedDocument.php
+++ b/SeedDMS_Lucene/Lucene/IndexedDocument.php
@@ -168,6 +168,10 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 		if($comment = $document->getComment()) {
 			$this->addField(Zend_Search_Lucene_Field::Text('comment', $comment, 'utf-8'));
 		}
+		if($version) {
+			$status = $version->getStatus();
+			$this->addField(Zend_Search_Lucene_Field::Keyword('status', $status['status'], 'utf-8'));
+		}
 		if($version && !$nocontent) {
 			$path = $dms->contentDir . $version->getPath();
 			if(file_exists($path)) {

From 25fc979a3a9996461e63cc65e82646a05a9561f5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 12 Sep 2020 12:49:33 +0200
Subject: [PATCH 152/312] throw execption if creation/opening of index fails

---
 SeedDMS_Lucene/Lucene/Indexer.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Lucene/Lucene/Indexer.php b/SeedDMS_Lucene/Lucene/Indexer.php
index a0fc2bb43..7c3b3f68a 100644
--- a/SeedDMS_Lucene/Lucene/Indexer.php
+++ b/SeedDMS_Lucene/Lucene/Indexer.php
@@ -31,16 +31,20 @@ class SeedDMS_Lucene_Indexer {
 
 	static function open($conf) { /* {{{ */
 		try {
-		$index = Zend_Search_Lucene::open($conf['indexdir']);
-		return($index);
+			$index = Zend_Search_Lucene::open($conf['indexdir']);
+			return($index);
 		} catch (Exception $e) {
 			return null;
 		}
 	} /* }}} */
 
 	static function create($conf) { /* {{{ */
-		$index = Zend_Search_Lucene::create($conf['indexdir']);
-		return($index);
+		try {
+			$index = Zend_Search_Lucene::create($conf['indexdir']);
+			return($index);
+		} catch (Exception $e) {
+			return null;
+		}
 	} /* }}} */
 
 	/**

From 854a9ea7fd1f7eaac5e3305fabfd01a050260c58 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 12 Sep 2020 12:50:21 +0200
Subject: [PATCH 153/312] add field 'status' to index

---
 SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
index 237cf8576..64383e3e3 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
@@ -162,6 +162,10 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 			$this->addField('groups', implode(' ', $allg));
 			 */
 		}
+		if($version) {
+			$status = $version->getStatus();
+			$this->addField('status', $status['status']+10);
+		}
 		if($version && !$nocontent) {
 			$path = $dms->contentDir . $version->getPath();
 			if(file_exists($path)) {

From 984eca8e9f2edab96cf2082d6d0d07456cc1d001 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 12 Sep 2020 12:51:02 +0200
Subject: [PATCH 154/312] add field 'status' to index

---
 SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
index 892fc46a9..3b5296c8d 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
@@ -63,9 +63,9 @@ class SeedDMS_SQLiteFTS_Indexer {
 		 */
 		$version = SQLite3::version();
 		if($version['versionNumber'] >= 3008000)
-			$sql = 'CREATE VIRTUAL TABLE docs USING fts4(title, comment, keywords, category, mimetype, origfilename, owner, content, created, users, notindexed=created, matchinfo=fts3)';
+			$sql = 'CREATE VIRTUAL TABLE docs USING fts4(title, comment, keywords, category, mimetype, origfilename, owner, content, created, users, status, notindexed=created, matchinfo=fts3)';
 		else
-			$sql = 'CREATE VIRTUAL TABLE docs USING fts4(title, comment, keywords, category, mimetype, origfilename, owner, content, created, users, matchinfo=fts3)';
+			$sql = 'CREATE VIRTUAL TABLE docs USING fts4(title, comment, keywords, category, mimetype, origfilename, owner, content, created, users, status, matchinfo=fts3)';
 		$res = $index->_conn->exec($sql);
 		if($res === false) {
 			return null;
@@ -96,7 +96,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 		if(!$this->_conn)
 			return false;
 
-		$sql = "INSERT INTO docs (docid, title, comment, keywords, category, owner, content, mimetype, origfilename, created, users) VALUES(".$doc->getFieldValue('document_id').", ".$this->_conn->quote($doc->getFieldValue('title')).", ".$this->_conn->quote($doc->getFieldValue('comment')).", ".$this->_conn->quote($doc->getFieldValue('keywords')).", ".$this->_conn->quote($doc->getFieldValue('category')).", ".$this->_conn->quote($doc->getFieldValue('owner')).", ".$this->_conn->quote($doc->getFieldValue('content')).", ".$this->_conn->quote($doc->getFieldValue('mimetype')).", ".$this->_conn->quote($doc->getFieldValue('origfilename')).", ".(int)$doc->getFieldValue('created').", ".$this->_conn->quote($doc->getFieldValue('users'))/*time()*/.")";
+		$sql = "INSERT INTO docs (docid, title, comment, keywords, category, owner, content, mimetype, origfilename, created, users, status) VALUES(".$doc->getFieldValue('document_id').", ".$this->_conn->quote($doc->getFieldValue('title')).", ".$this->_conn->quote($doc->getFieldValue('comment')).", ".$this->_conn->quote($doc->getFieldValue('keywords')).", ".$this->_conn->quote($doc->getFieldValue('category')).", ".$this->_conn->quote($doc->getFieldValue('owner')).", ".$this->_conn->quote($doc->getFieldValue('content')).", ".$this->_conn->quote($doc->getFieldValue('mimetype')).", ".$this->_conn->quote($doc->getFieldValue('origfilename')).", ".(int)$doc->getFieldValue('created').", ".$this->_conn->quote($doc->getFieldValue('users')).", ".$this->_conn->quote($doc->getFieldValue('status'))/*time()*/.")";
 		$res = $this->_conn->exec($sql);
 		if($res === false) {
 			return false;
@@ -189,7 +189,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 		if(!$this->_conn)
 			return false;
 
-		$sql = "SELECT title, comment, owner, keywords, category, mimetype, origfilename, created, users FROM docs WHERE docid=".(int) $id;
+		$sql = "SELECT title, comment, owner, keywords, category, mimetype, origfilename, created, users, status FROM docs WHERE docid=".(int) $id;
 		$res = $this->_conn->query($sql);
 		$doc = false;
 		if($res) {
@@ -204,6 +204,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 			$doc->addField('owner', $rec['owner']);
 			$doc->addField('created', $rec['created']);
 			$doc->addField('users', $rec['users']);
+			$doc->addField('status', $rec['status']);
 		}
 		return $doc;
 	} /* }}} */

From b7d5f09e5a7c9199161f726c2c031419e0a8175c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 12 Sep 2020 12:51:48 +0200
Subject: [PATCH 155/312] add terms for 'user' and 'status'

---
 SeedDMS_SQLiteFTS/SQLiteFTS/Term.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Term.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Term.php
index 01b35429b..abfffbf0b 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Term.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Term.php
@@ -57,7 +57,8 @@ class SeedDMS_SQLiteFTS_Term {
 			6 => 'owner',
 			7 => 'content',
 			8 => 'created',
-			9 => 'user'
+			9 => 'user',
+			10 => 'status'
 		);
 		$this->field = $fields[$col];
 		$this->_occurrence = $occurrence;

From d33eb59b4a328a4d87f38ee4c56590da2c2ca1fa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 12 Sep 2020 12:52:44 +0200
Subject: [PATCH 156/312] categoryids has been replaced by category

---
 out/out.Search.php | 177 +++++++++++++++++++++++++++++++--------------
 1 file changed, 124 insertions(+), 53 deletions(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index 5fea9bc33..7a482f325 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -72,12 +72,12 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 	// category
 	$categories = array();
 	$categorynames = array();
-	if(isset($_GET['categoryids']) && $_GET['categoryids']) {
-		foreach($_GET['categoryids'] as $catid) {
-			if($catid > 0) {
-				$category = $dms->getDocumentCategory($catid);
-				$categories[] = $category;
-				$categorynames[] = $category->getName();
+	if(isset($_GET['category']) && $_GET['category']) {
+		foreach($_GET['category'] as $catname) {
+			if($catname) {
+				$cat = $dms->getDocumentCategoryByName($catname);
+				$categories[] = $cat;
+				$categorynames[] = $cat->getName();
 			}
 		}
 	}
@@ -104,64 +104,123 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 
 	// Check to see if the search has been restricted to a particular
 	// document owner.
-	$owner = null;
-	if (isset($_GET["ownerid"]) && is_numeric($_GET["ownerid"]) && $_GET["ownerid"]!=-1) {
-		$owner = $dms->getUser($_GET["ownerid"]);
-		if (!is_object($owner)) {
-			UI::exitError(getMLText("search_results"),getMLText("unknown_owner"));
+	$owner = [];
+	if (isset($_GET["owner"])) {
+		if (!is_array($_GET['owner'])) {
+			if(!empty($_GET['owner']) && $o = $dms->getUserByLogin($_GET['owner']))
+				$owner[] = $o->getLogin();
+			else
+				UI::exitError(getMLText("search"),getMLText("unknown_owner"));
+		} else {
+			foreach($_GET["owner"] as $l) {
+				if($l && $o = $dms->getUserByLogin($l))
+					$owner[] = $o->getLogin();
+			}
 		}
 	}
 
-	$startTime = getTime();
-	if($settings->_enableFullSearch) {
-		if($settings->_fullSearchEngine == 'lucene') {
-			Zend_Search_Lucene_Search_QueryParser::setDefaultEncoding('utf-8');
+	// Check to see if the search has been restricted to a particular
+	// mimetype.
+	$mimetype = [];
+	if (isset($_GET["mimetype"])) {
+		if (!is_array($_GET['mimetype'])) {
+			if(!empty($_GET['mimetype']))
+				$mimetype[] = $_GET['mimetype'];
+		} else {
+			foreach($_GET["mimetype"] as $l) {
+				if($l)
+					$mimetype[] = $l;
+			}
 		}
 	}
 
+	// status
+	$status = array();
+	if (isset($_GET["pendingReview"])){
+		$status[] = S_DRAFT_REV;
+	}
+	if (isset($_GET["pendingApproval"])){
+		$status[] = S_DRAFT_APP;
+	}
+	if (isset($_GET["inWorkflow"])){
+		$status[] = S_IN_WORKFLOW;
+	}
+	if (isset($_GET["released"])){
+		$status[] = S_RELEASED;
+	}
+	if (isset($_GET["rejected"])){
+		$status[] = S_REJECTED;
+	}
+	if (isset($_GET["obsolete"])){
+		$status[] = S_OBSOLETE;
+	}
+	if (isset($_GET["expired"])){
+		$status[] = S_EXPIRED;
+	}
+
+	$startTime = getTime();
+	if($settings->_fullSearchEngine == 'lucene') {
+		Zend_Search_Lucene_Search_QueryParser::setDefaultEncoding('utf-8');
+	}
+
 	if(strlen($query) < 4 && strpos($query, '*')) {
 		$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('splash_invalid_searchterm')));
+		$dcount = 0;
 		$totalPages = 0;
 		$entries = array();
 		$searchTime = 0;
 	} else {
 		$startTime = getTime();
 		$index = $fulltextservice->Indexer();
-		$lucenesearch = $fulltextservice->Search();
-		$searchresult = $lucenesearch->search($query, $owner ? $owner->getLogin() : '', '', $categorynames, array(), $user->isAdmin() ? [] : [$user->getLogin()]);
-		if($searchresult === false) {
-			$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('splash_invalid_searchterm')));
-			$totalPages = 0;
-			$entries = array();
-			$searchTime = 0;
-		} else {
-			$entries = array();
-			$dcount = $searchresult['count']; //0;
-			$fcount = 0;
-			if($searchresult) {
-				foreach($searchresult['hits'] as $hit) {
-					if($tmp = $dms->getDocument($hit['document_id'])) {
-						if($tmp->getAccessMode($user) >= M_READ) {
-							$tmp->verifyLastestContentExpriry();
-							$entries[] = $tmp;
-//							$dcount++;
+		if($index) {
+			$lucenesearch = $fulltextservice->Search();
+			$searchresult = $lucenesearch->search($query, array('owner'=>$owner, 'status'=>$status, 'category'=>$categorynames, 'user'=>$user->isAdmin() ? [] : [$user->getLogin()], 'mimetype'=>$mimetype));
+			if($searchresult === false) {
+				$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('splash_invalid_searchterm')));
+				$dcount = 0;
+				$fcount = 0;
+				$totalPages = 0;
+				$entries = array();
+				$facets = array();
+				$searchTime = 0;
+			} else {
+				$entries = array();
+				$facets = $searchresult['facets'];
+				$dcount = $searchresult['count']; //0;
+				$fcount = 0;
+				if($searchresult) {
+					foreach($searchresult['hits'] as $hit) {
+						if($tmp = $dms->getDocument($hit['document_id'])) {
+							if($tmp->getAccessMode($user) >= M_READ) {
+								$tmp->verifyLastestContentExpriry();
+								$entries[] = $tmp;
+	//							$dcount++;
+							}
 						}
 					}
 				}
+				$limit = 20;
+				if($pageNumber != 'all' && count($entries) > $limit) {
+					$totalPages = (int) (count($entries)/$limit);
+					if(count($entries)%$limit)
+						$totalPages++;
+					if($limit > 0)
+						$entries = array_slice($entries, ($pageNumber-1)*$limit, $limit);
+				} else {
+					$totalPages = 1;
+				}
 			}
-			$limit = 20;
-			if($pageNumber != 'all' && count($entries) > $limit) {
-				$totalPages = (int) (count($entries)/$limit);
-				if(count($entries)%$limit)
-					$totalPages++;
-				if($limit > 0)
-					$entries = array_slice($entries, ($pageNumber-1)*$limit, $limit);
-			} else {
-				$totalPages = 1;
-			}
+			$searchTime = getTime() - $startTime;
+			$searchTime = round($searchTime, 2);
+		} else {
+			$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('splash_invalid_search_service')));
+			$dcount = 0;
+			$fcount = 0;
+			$totalPages = 0;
+			$entries = array();
+			$facets = array();
+			$searchTime = 0;
 		}
-		$searchTime = getTime() - $startTime;
-		$searchTime = round($searchTime, 2);
 	}
 	// }}}
 } else {
@@ -229,11 +288,15 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 
 	// Check to see if the search has been restricted to a particular
 	// document owner.
-	$owner = null;
-	if (isset($_GET["ownerid"]) && is_numeric($_GET["ownerid"]) && $_GET["ownerid"]!=-1) {
-		$owner = $dms->getUser($_GET["ownerid"]);
-		if (!is_object($owner)) {
+	$owner = array();
+	if (isset($_GET["owner"])) {
+		if (!is_array($_GET['owner'])) {
 			UI::exitError(getMLText("search"),getMLText("unknown_owner"));
+		} else {
+			foreach($_GET["owner"] as $l) {
+				if($o = $dms->getUserByLogin($l))
+					$owner[] = $o;
+			}
 		}
 	}
 
@@ -331,10 +394,14 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 
 	// category
 	$categories = array();
-	if(isset($_GET['categoryids']) && $_GET['categoryids']) {
-		foreach($_GET['categoryids'] as $catid) {
-			if($catid > 0)
-				$categories[] = $dms->getDocumentCategory($catid);
+	$categorynames = array();
+	if(isset($_GET['category']) && $_GET['category']) {
+		foreach($_GET['category'] as $catname) {
+			if($catname) {
+				$cat = $dms->getDocumentCategoryByName($catname);
+				$categories[] = $cat;
+				$categorynames[] = $cat->getName();
+			}
 		}
 	}
 
@@ -419,6 +486,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 		$entries = array_slice($entries, ($pageNumber-1)*$limit, $limit);
 	} else
 		$totalPages = 1;
+	$facets = array();
 // }}}
 }
 
@@ -437,6 +505,7 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
 	$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 	$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'query'=>$query, 'searchhits'=>$entries, 'totalpages'=>$totalPages, 'pagenumber'=>$pageNumber, 'searchtime'=>$searchTime, 'urlparams'=>$_GET, 'cachedir'=>$settings->_cacheDir));
 	if($view) {
+		$view->setParam('facets', $facets);
 		$view->setParam('accessobject', $accessop);
 		$view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax
 		$view->setParam('showtree', showtree());
@@ -460,6 +529,8 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
 		$view->setParam('expirationdate', isset($expirationdate) ? $expirationdate: '');
 		$view->setParam('status', isset($status) ? $status : array());
 		$view->setParam('categories', isset($categories) ? $categories : '');
+		$view->setParam('category', isset($categorynames) ? $categorynames : '');
+		$view->setParam('mimetype', isset($mimetype) ? $mimetype : '');
 		$view->setParam('attributes', isset($attributes) ? $attributes : '');
 		$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_document, SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_folder, SeedDMS_Core_AttributeDefinition::objtype_all));
 		$view->setParam('attrdefs', $attrdefs);

From acab20fe24998b87afef6d18dd50826f311f8c57 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 12 Sep 2020 12:53:27 +0200
Subject: [PATCH 157/312] add documentation for Indexer()

---
 inc/inc.ClassFulltextService.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/inc/inc.ClassFulltextService.php b/inc/inc.ClassFulltextService.php
index 1298f59b8..f10c7939b 100644
--- a/inc/inc.ClassFulltextService.php
+++ b/inc/inc.ClassFulltextService.php
@@ -70,6 +70,14 @@ class SeedDMS_FulltextService {
 		return new $this->services[0]['IndexedDocument']($document->getDMS(), $document, $this->converters, $nocontent, $this->cmdtimeout);
 	}
 
+	/**
+	 * Returns an instance of the indexer
+	 *
+	 * The indexer provides access to fulltext index. It allows to add and
+	 * get documents.
+	 *
+	 * @return object instance of class specified in 'Indexer'
+	 */
 	public function Indexer($recreate=false) {
 		if($this->index)
 			return $this->index;

From 364612f49745be0312e795029058dcef0f8e3af8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 12 Sep 2020 12:53:56 +0200
Subject: [PATCH 158/312] do not show occurences because not each fulltext
 engine supports it

---
 views/bootstrap/class.IndexInfo.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.IndexInfo.php b/views/bootstrap/class.IndexInfo.php
index e8ae4d0ae..623dc7821 100644
--- a/views/bootstrap/class.IndexInfo.php
+++ b/views/bootstrap/class.IndexInfo.php
@@ -65,7 +65,8 @@ class SeedDMS_View_IndexInfo extends SeedDMS_Bootstrap_Style {
 				$this->contentContainerStart();
 				$field = $term->field;
 			}
-			echo "<span title=\"".$term->_occurrence."\">".htmlspecialchars($term->text)."</span>\n";
+			echo htmlspecialchars($term->text)."\n";
+//			echo "<span title=\"".$term->_occurrence."\">".htmlspecialchars($term->text)."</span>\n";
 		}
 		$this->contentContainerEnd();
 //		echo "</pre>";

From c93faff2572db05f7db2820995c0fe26194c211d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 12 Sep 2020 13:40:53 +0200
Subject: [PATCH 159/312] new parameters of search()

---
 SeedDMS_Lucene/Lucene/Search.php       | 42 ++++++++++++++--------
 SeedDMS_SQLiteFTS/SQLiteFTS/Search.php | 49 +++++++++++++++-----------
 2 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/SeedDMS_Lucene/Lucene/Search.php b/SeedDMS_Lucene/Lucene/Search.php
index 992422700..252fced17 100644
--- a/SeedDMS_Lucene/Lucene/Search.php
+++ b/SeedDMS_Lucene/Lucene/Search.php
@@ -59,30 +59,42 @@ class SeedDMS_Lucene_Search {
 	 * @param object $index lucene index
 	 * @return object instance of SeedDMS_Lucene_Search
 	 */
-	function search($term, $owner, $status='', $categories=array(), $fields=array(), $users=array()) { /* {{{ */
+	function search($term, $fields=array()) { /* {{{ */
 		$querystr = '';
-		if($fields) {
-		} else {
-			if($term)
-				$querystr .= trim($term);
+		if($term)
+			$querystr .= trim($term);
+		if(isset($fields['owner'])) {
+			if(is_string($owner)) {
+				if($querystr)
+					$querystr .= ' && ';
+				$querystr .= 'owner:'.$owner;
+			} elseif(is_array($fields['owner'])) {
+				if($querystr)
+					$querystr .= ' && ';
+				$querystr .= '(owner:"';
+				$querystr .= implode('" || owner:"', $fields['owner']);
+				$querystr .= '")';
+			}
 		}
-		if($owner) {
-			if($querystr)
-				$querystr .= ' && ';
-			$querystr .= 'owner:'.$owner;
-		}
-		if($categories) {
+		if(isset($fields['category'])) {
 			if($querystr)
 				$querystr .= ' && ';
 			$querystr .= '(category:"';
-			$querystr .= implode('" || category:"', $categories);
+			$querystr .= implode('" || category:"', $fields['category']);
 			$querystr .= '")';
 		}
-		if($users) {
+		if(isset($fields['status'])) {
+			if($querystr)
+				$querystr .= ' && ';
+			$querystr .= '(status:"';
+			$querystr .= implode('" || status:"', $fields['status']);
+			$querystr .= '")';
+		}
+		if(isset($fields['user'])) {
 			if($querystr)
 				$querystr .= ' && ';
 			$querystr .= '(users:"';
-			$querystr .= implode('" || users:"', $users);
+			$querystr .= implode('" || users:"', $fields['user']);
 			$querystr .= '")';
 		}
 		try {
@@ -93,7 +105,7 @@ class SeedDMS_Lucene_Search {
 				foreach($hits as $hit) {
 					$recs[] = array('id'=>$hit->id, 'document_id'=>$hit->document_id);
 				}
-				return array('count'=>count($hits), 'hits'=>$recs);
+				return array('count'=>count($hits), 'hits'=>$recs, 'facets'=>array());
 			} catch (Zend_Search_Lucene_Exception $e) {
 				return false;
 			}
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
index 4f58ee75e..4f0aecaeb 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
@@ -59,35 +59,44 @@ class SeedDMS_SQliteFTS_Search {
 	 * @param object $index SQlite FTS index
 	 * @return object instance of SeedDMS_Lucene_Search
 	 */
-	function search($term, $owner, $status='', $categories=array(), $fields=array(), $users=array()) { /* {{{ */
+	function search($term, $fields=array()) { /* {{{ */
 		$querystr = '';
-		if($fields) {
-		} else {
-			if($term)
-				$querystr .= trim($term);
+		if($term)
+			$querystr .= trim($term);
+		if(isset($fields['owner'])) {
+			if(is_string($fields['owner'])) {
+				if($querystr)
+					$querystr .= ' ';
+				$querystr .= 'owner:'.$fields['owner'];
+			} elseif(is_array($fields['owner'])) {
+				if($querystr)
+					$querystr .= ' ';
+				$querystr .= '(owner:';
+				$querystr .= implode(' OR owner:', $fields['owner']);
+				$querystr .= ')';
+			}
 		}
-		if($owner) {
+		if(isset($fields['category'])) {
 			if($querystr)
 				$querystr .= ' ';
-				//$querystr .= ' AND ';
-			$querystr .= 'owner:'.$owner;
-			//$querystr .= $owner;
+			$querystr .= '(category:';
+			$querystr .= implode(' OR category:', $fields['category']);
+			$querystr .= ')';
 		}
-		if($categories) {
+		if(isset($fields['status'])) {
 			if($querystr)
 				$querystr .= ' ';
-				//$querystr .= ' AND ';
-			$querystr .= 'category:';
-			$querystr .= implode(' OR category:', $categories);
-			$querystr .= '';
+			$status = array_map(function($v){return $v+10;}, $fields['status']);
+			$querystr .= '(status:';
+			$querystr .= implode(' OR status:', $status);
+			$querystr .= ')';
 		}
-		if($users) {
+		if(isset($fields['user'])) {
 			if($querystr)
 				$querystr .= ' ';
-				//$querystr .= ' AND ';
-			$querystr .= 'users:';
-			$querystr .= implode(' OR users:', $users);
-			$querystr .= '';
+			$querystr .= '(users:';
+			$querystr .= implode(' OR users:', $fields['user']);
+			$querystr .= ')';
 		}
 		try {
 			$result = $this->index->find($querystr);
@@ -95,7 +104,7 @@ class SeedDMS_SQliteFTS_Search {
 			foreach($result["hits"] as $hit) {
 				$recs[] = array('id'=>$hit->id, 'document_id'=>$hit->id);
 			}
-			return array('count'=>$result['count'], 'hits'=>$recs);
+			return array('count'=>$result['count'], 'hits'=>$recs, 'facets'=>array());
 		} catch (Exception $e) {
 			return false;
 		}

From b47e53637d68b7361398e21c96371785acac30df Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Sep 2020 09:33:01 +0200
Subject: [PATCH 160/312] check if search fields are set

---
 SeedDMS_Lucene/Lucene/Search.php       | 8 ++++----
 SeedDMS_SQLiteFTS/SQLiteFTS/Search.php | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/SeedDMS_Lucene/Lucene/Search.php b/SeedDMS_Lucene/Lucene/Search.php
index 252fced17..90cfe8e8e 100644
--- a/SeedDMS_Lucene/Lucene/Search.php
+++ b/SeedDMS_Lucene/Lucene/Search.php
@@ -63,7 +63,7 @@ class SeedDMS_Lucene_Search {
 		$querystr = '';
 		if($term)
 			$querystr .= trim($term);
-		if(isset($fields['owner'])) {
+		if(!empty($fields['owner'])) {
 			if(is_string($owner)) {
 				if($querystr)
 					$querystr .= ' && ';
@@ -76,21 +76,21 @@ class SeedDMS_Lucene_Search {
 				$querystr .= '")';
 			}
 		}
-		if(isset($fields['category'])) {
+		if(!empty($fields['category'])) {
 			if($querystr)
 				$querystr .= ' && ';
 			$querystr .= '(category:"';
 			$querystr .= implode('" || category:"', $fields['category']);
 			$querystr .= '")';
 		}
-		if(isset($fields['status'])) {
+		if(!empty($fields['status'])) {
 			if($querystr)
 				$querystr .= ' && ';
 			$querystr .= '(status:"';
 			$querystr .= implode('" || status:"', $fields['status']);
 			$querystr .= '")';
 		}
-		if(isset($fields['user'])) {
+		if(!empty($fields['user'])) {
 			if($querystr)
 				$querystr .= ' && ';
 			$querystr .= '(users:"';
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
index 4f0aecaeb..dea9892a6 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
@@ -63,7 +63,7 @@ class SeedDMS_SQliteFTS_Search {
 		$querystr = '';
 		if($term)
 			$querystr .= trim($term);
-		if(isset($fields['owner'])) {
+		if(!empty($fields['owner'])) {
 			if(is_string($fields['owner'])) {
 				if($querystr)
 					$querystr .= ' ';
@@ -76,14 +76,14 @@ class SeedDMS_SQliteFTS_Search {
 				$querystr .= ')';
 			}
 		}
-		if(isset($fields['category'])) {
+		if(!empty($fields['category'])) {
 			if($querystr)
 				$querystr .= ' ';
 			$querystr .= '(category:';
 			$querystr .= implode(' OR category:', $fields['category']);
 			$querystr .= ')';
 		}
-		if(isset($fields['status'])) {
+		if(!empty($fields['status'])) {
 			if($querystr)
 				$querystr .= ' ';
 			$status = array_map(function($v){return $v+10;}, $fields['status']);
@@ -91,7 +91,7 @@ class SeedDMS_SQliteFTS_Search {
 			$querystr .= implode(' OR status:', $status);
 			$querystr .= ')';
 		}
-		if(isset($fields['user'])) {
+		if(!empty($fields['user'])) {
 			if($querystr)
 				$querystr .= ' ';
 			$querystr .= '(users:';

From 95b01544f3beb44bbd176cfcfc667d87b9d41943 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Sep 2020 09:33:30 +0200
Subject: [PATCH 161/312] search even if query is empty

---
 SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
index 3b5296c8d..0cd802877 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
@@ -143,7 +143,9 @@ class SeedDMS_SQLiteFTS_Indexer {
 		if(!$this->_conn)
 			return false;
 
-		$sql = "SELECT docid FROM docs WHERE docs MATCH ".$this->_conn->quote($query);
+		$sql = "SELECT docid FROM docs";
+		if($query)
+			$sql .= " WHERE docs MATCH ".$this->_conn->quote($query);
 		$res = $this->_conn->query($sql);
 		$hits = array();
 		if($res) {

From 3191fa931007f9ddff6a56b9f745b5df3fd89bdc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Sep 2020 09:33:55 +0200
Subject: [PATCH 162/312] also check if categoryids is set

---
 out/out.Search.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/out/out.Search.php b/out/out.Search.php
index 7a482f325..c7313f3d7 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -80,6 +80,14 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 				$categorynames[] = $cat->getName();
 			}
 		}
+	} elseif(isset($_GET['categoryids']) && $_GET['categoryids']) {
+		foreach($_GET['categoryids'] as $catid) {
+			if($catid) {
+				$cat = $dms->getDocumentCategory($catid);
+				$categories[] = $cat;
+				$categorynames[] = $cat->getName();
+			}
+		}
 	}
 
 	//

From 0979d2bd541d8602d24c060e0592877340111e49 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Sep 2020 09:34:39 +0200
Subject: [PATCH 163/312] get category, mimetype and facets from view

---
 views/bootstrap/class.Search.php | 71 ++++++++++++++++++++++++++++----
 1 file changed, 64 insertions(+), 7 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index d17e18c10..a2c768f86 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -80,7 +80,9 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 		$enablefullsearch = $this->params['enablefullsearch'];
 		$enableclipboard = $this->params['enableclipboard'];
 		$attributes = $this->params['attributes'];
+		$category = $this->params['category'];
 		$categories = $this->params['categories'];
+		$mimetype = $this->params['mimetype'];
 		$owner = $this->params['owner'];
 		$startfolder = $this->params['startfolder'];
 		$startdate = $this->params['startdate'];
@@ -93,6 +95,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 		$this->query = $this->params['query'];
 		$orderby = $this->params['orderby'];
 		$entries = $this->params['searchhits'];
+		$facets = $this->params['facets'];
 		$totalpages = $this->params['totalpages'];
 		$pageNumber = $this->params['pagenumber'];
 		$searchTime = $this->params['searchtime'];
@@ -155,13 +158,16 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 <tr>
 <td><?php printMLText("owner");?>:</td>
 <td>
-<select class="chzn-select" name="ownerid" data-allow-clear="true" data-placeholder="<?php printMLText('select_users'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
+<?php
+$ownerids = array_map(function($n) {return $n->getId();}, $owner);
+?>
+<select class="chzn-select" name="owner[]" data-allow-clear="true" data-placeholder="<?php printMLText('select_users'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
 <option value=""></option>
 <?php
 		foreach ($allUsers as $userObj) {
 			if ($userObj->isGuest() || ($userObj->isHidden() && $userObj->getID() != $user->getID() && !$user->isAdmin()))
 				continue;
-			print "<option value=\"".$userObj->getID()."\" ".(($owner && $userObj->getID() == $owner->getID()) ? "selected" : "").">" . htmlspecialchars($userObj->getLogin()." - ".$userObj->getFullName()) . "</option>\n";
+			print "<option value=\"".$userObj->getLogin()."\" ".(in_array($userObj->getId(), $ownerids) ? "selected" : "").">" . htmlspecialchars($userObj->getLogin()." - ".$userObj->getFullName()) . "</option>\n";
 		}
 ?>
 </select>
@@ -237,7 +243,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 				}
 			}
 		}
-		if($categories)
+		if($category)
 			$openfilterdlg = true;
 		if($status)
 			$openfilterdlg = true;
@@ -257,7 +263,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 <tr>
 <td><?php printMLText("category");?>:</td>
 <td>
-<select class="chzn-select" name="categoryids[]" multiple="multiple" data-placeholder="<?php printMLText('select_category'); ?>" data-no_results_text="<?php printMLText('unknown_document_category'); ?>">
+<select class="chzn-select" name="category[]" multiple="multiple" data-placeholder="<?php printMLText('select_category'); ?>" data-no_results_text="<?php printMLText('unknown_document_category'); ?>">
 <!--
 <option value="-1"><?php printMLText("all_categories");?>
 -->
@@ -266,7 +272,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 		foreach($categories as $tmpcat)
 			$tmpcatids[] = $tmpcat->getID();
 		foreach ($allCats as $catObj) {
-			print "<option value=\"".$catObj->getID()."\" ".(in_array($catObj->getID(), $tmpcatids) ? "selected" : "").">" . htmlspecialchars($catObj->getName()) . "\n";
+			print "<option value=\"".$catObj->getName()."\" ".(in_array($catObj->getID(), $tmpcatids) ? "selected" : "").">" . htmlspecialchars($catObj->getName()) . "\n";
 		}
 ?>
 </select>
@@ -397,21 +403,24 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 -->
 </td>
 </tr>
+<?php if(!isset($facets['owner'])) { ?>
 <tr>
 <td><?php printMLText("owner");?>:</td>
 <td>
-<select class="chzn-select" name="ownerid" data-allow-clear="true" data-placeholder="<?php printMLText('select_users'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
+<select class="chzn-select" name="owner[]" data-allow-clear="true" data-placeholder="<?php printMLText('select_users'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
 <option value=""></option>
 <?php
 			foreach ($allUsers as $userObj) {
 				if ($userObj->isGuest() || ($userObj->isHidden() && $userObj->getID() != $user->getID() && !$user->isAdmin()))
 					continue;
-				print "<option value=\"".$userObj->getID()."\" ".(($owner && $userObj->getID() == $owner->getID()) ? "selected" : "").">" . htmlspecialchars($userObj->getLogin()." - ".$userObj->getFullName()) . "</option>\n";
+				print "<option value=\"".$userObj->getLogin()."\" ".(in_array($userObj->getLogin(), $owner) ? "selected" : "").">" . htmlspecialchars($userObj->getLogin()." - ".$userObj->getFullName()) . "</option>\n";
 			}
 ?>
 </select>
 </td>
 </tr>
+<?php } ?>
+<?php if(!isset($facets['category'])) { ?>
 <tr>
 <td><?php printMLText("category_filter");?>:</td>
 <td>
@@ -430,6 +439,54 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 </select>
 </td>
 </tr>
+<?php } ?>
+<tr>
+<td><?php printMLText("status");?>:</td>
+<td>
+<?php if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') { ?>
+<?php if($workflowmode == 'traditional') { ?>
+<label class="checkbox" for='pendingReview'><input type="checkbox" id="pendingReview" name="pendingReview" value="1" <?php echo in_array(S_DRAFT_REV, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_DRAFT_REV);?></label>
+<?php } ?>
+<label class="checkbox" for='pendingApproval'><input type="checkbox" id="pendingApproval" name="pendingApproval" value="1" <?php echo in_array(S_DRAFT_APP, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_DRAFT_APP);?></label>
+<?php } elseif($workflowmode == 'advanced') { ?>
+<label class="checkbox" for='inWorkflow'><input type="checkbox" id="inWorkflow" name="inWorkflow" value="1" <?php echo in_array(S_IN_WORKFLOW, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_IN_WORKFLOW);?></label>
+<?php } ?>
+<label class="checkbox" for='released'><input type="checkbox" id="released" name="released" value="1" <?php echo in_array(S_RELEASED, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_RELEASED);?></label>
+<label class="checkbox" for='rejected'><input type="checkbox" id="rejected" name="rejected" value="1" <?php echo in_array(S_REJECTED, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_REJECTED);?></label>
+<label class="checkbox" for='obsolete'><input type="checkbox" id="obsolete" name="obsolete" value="1" <?php echo in_array(S_OBSOLETE, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_OBSOLETE);?></label>
+<label class="checkbox" for='expired'><input type="checkbox" id="expired" name="expired" value="1" <?php echo in_array(S_EXPIRED, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_EXPIRED);?></label>
+</td>
+</tr>
+<?php if($facets) {
+foreach($facets as $facetname=>$values) {
+?>
+<tr>
+<td><?= getMLText($facetname);?>:</td>
+<td>
+<?php
+	$options = array();
+	foreach($values as $v=>$c) {
+		$option = array($v, $v.' ('.$c.')');
+		if(isset(${$facetname}) && in_array($v, ${$facetname}))
+			$option[] = true;
+		$options[] = $option;
+	}
+	$this->formField(
+		null,
+		array(
+			'element'=>'select',
+			'id'=>$facetname,
+			'name'=>$facetname."[]",
+			'class'=>'chzn-select',
+			'attributes'=>array(array('data-placeholder', getMLText('select_'.$facetname))),
+			'options'=>$options,
+			'multiple'=>true
+		)
+	);
+?>
+</td>
+</tr>
+<?php }} ?>
 <tr>
 <td></td><td><button type="submit" class="btn btn-primary"><i class="fa fa-search"></i> <?php printMLText("search"); ?></button></td>
 </tr>

From 338d479604e6643b74b373f4bc3bbf6341811100 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Sep 2020 09:48:14 +0200
Subject: [PATCH 164/312] start new version 1.1.15

---
 SeedDMS_Lucene/package.xml | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Lucene/package.xml b/SeedDMS_Lucene/package.xml
index 2780d31cd..f158845fe 100644
--- a/SeedDMS_Lucene/package.xml
+++ b/SeedDMS_Lucene/package.xml
@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2020-09-02</date>
+ <date>2020-09-10</date>
  <time>08:55:43</time>
  <version>
-  <release>1.1.14</release>
-  <api>1.1.14</api>
+  <release>1.1.15</release>
+  <api>1.1.15</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,7 +23,12 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-Index users with at least read access on the document
+- add searching for document status
+- better error handling if opening index fails	
+- parameters for SeedDMS_Lucene_Search::search() has changed
+- SeedDMS_Lucene_Search::search() returns array of hits, count and facets
+- pass config array instead of index directory to SeedDMS_Lucene_Indexer::create()
+  and SeedDMS_Lucene_Indexer::open()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -315,5 +320,21 @@ execWithTimeout() reads data from stderr and saves it into error msg
 IndexedDocument() remembers cmd and mimetype
    </notes>
   </release>
+  <release>
+   <date>2020-09-02</date>
+   <time>08:55:43</time>
+   <version>
+    <release>1.1.14</release>
+    <api>1.1.14</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+Index users with at least read access on the document
+   </notes>
+  </release>
  </changelog>
 </package>

From d4c4de628446c7f2c6495a745790d1028fea58fe Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Sep 2020 09:48:34 +0200
Subject: [PATCH 165/312] start new version 1.0.14

---
 SeedDMS_SQLiteFTS/package.xml | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml
index 61845de9a..ac53c4121 100644
--- a/SeedDMS_SQLiteFTS/package.xml
+++ b/SeedDMS_SQLiteFTS/package.xml
@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2020-09-02</date>
+ <date>2020-09-11</date>
  <time>08:57:44</time>
  <version>
-  <release>1.0.13</release>
-  <api>1.0.13</api>
+  <release>1.0.14</release>
+  <api>1.0.14</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,7 +23,12 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-add user to list of terms
+- add searching for document status
+- search even if query is empty	(will find all documents)
+- parameters for SeedDMS_SQLiteFTS_Search::search() has changed
+- SeedDMS_Lucene_Search::search() returns array of hits, count and facets
+- pass config array instead of index directory to SeedDMS_Lucene_Indexer::create()
+  and SeedDMS_Lucene_Indexer::open()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -275,5 +280,21 @@ timestamp)
 Index users with at least read access on a document
    </notes>
   </release>
+  <release>
+   <date>2020-09-02</date>
+   <time>08:57:44</time>
+   <version>
+    <release>1.0.13</release>
+    <api>1.0.13</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+add user to list of terms
+   </notes>
+  </release>
  </changelog>
 </package>

From e14774110f258da81384cd2268229b6be9157153 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Sep 2020 16:33:36 +0200
Subject: [PATCH 166/312] new parameter $limit of method search()

---
 SeedDMS_Lucene/Lucene/Search.php       | 7 +++++--
 SeedDMS_SQLiteFTS/SQLiteFTS/Search.php | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Lucene/Lucene/Search.php b/SeedDMS_Lucene/Lucene/Search.php
index 90cfe8e8e..9e6ef4c1b 100644
--- a/SeedDMS_Lucene/Lucene/Search.php
+++ b/SeedDMS_Lucene/Lucene/Search.php
@@ -59,7 +59,7 @@ class SeedDMS_Lucene_Search {
 	 * @param object $index lucene index
 	 * @return object instance of SeedDMS_Lucene_Search
 	 */
-	function search($term, $fields=array()) { /* {{{ */
+	function search($term, $fields=array(), $limit=array()) { /* {{{ */
 		$querystr = '';
 		if($term)
 			$querystr .= trim($term);
@@ -102,8 +102,11 @@ class SeedDMS_Lucene_Search {
 			try {
 				$hits = $this->index->find($query);
 				$recs = array();
+				$c = 0;
 				foreach($hits as $hit) {
-					$recs[] = array('id'=>$hit->id, 'document_id'=>$hit->document_id);
+					if($c >= $limit['offset'] && ($c-$limit['offset'] < $limit))
+						$recs[] = array('id'=>$hit->id, 'document_id'=>$hit->document_id);
+					$c++;
 				}
 				return array('count'=>count($hits), 'hits'=>$recs, 'facets'=>array());
 			} catch (Zend_Search_Lucene_Exception $e) {
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
index dea9892a6..6a780e651 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
@@ -59,7 +59,7 @@ class SeedDMS_SQliteFTS_Search {
 	 * @param object $index SQlite FTS index
 	 * @return object instance of SeedDMS_Lucene_Search
 	 */
-	function search($term, $fields=array()) { /* {{{ */
+	function search($term, $fields=array(), $limit=array()) { /* {{{ */
 		$querystr = '';
 		if($term)
 			$querystr .= trim($term);
@@ -99,7 +99,7 @@ class SeedDMS_SQliteFTS_Search {
 			$querystr .= ')';
 		}
 		try {
-			$result = $this->index->find($querystr);
+			$result = $this->index->find($querystr, $limit);
 			$recs = array();
 			foreach($result["hits"] as $hit) {
 				$recs[] = array('id'=>$hit->id, 'document_id'=>$hit->id);

From 397d542fb43832e26ee1f452f87a6309da0a3a60 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Sep 2020 16:34:21 +0200
Subject: [PATCH 167/312] take limits into account

---
 SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
index 0cd802877..d6c40c278 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
@@ -135,18 +135,30 @@ class SeedDMS_SQLiteFTS_Indexer {
 	/**
 	 * Find documents in index
 	 *
-	 * @param object $doc indexed document of class 
-	 * SeedDMS_SQLiteFTS_IndexedDocument
-	 * @return boolean false in case of an error, otherwise true
+	 * @param string $query 
+	 * @param array $limit array with elements 'limit' and 'offset'
+	 * @return boolean false in case of an error, otherwise array with elements
+	 * 'count', 'hits', 'facets'
 	 */
-	public function find($query) { /* {{{ */
+	public function find($query, $limit=array()) { /* {{{ */
 		if(!$this->_conn)
 			return false;
 
+		$sql = "SELECT count(*) AS `c` FROM `docs`";
+		if($query)
+			$sql .= " WHERE docs MATCH ".$this->_conn->quote($query);
+		$res = $this->_conn->query($sql);
+		$row = $res->fetch();
+
 		$sql = "SELECT docid FROM docs";
 		if($query)
 			$sql .= " WHERE docs MATCH ".$this->_conn->quote($query);
 		$res = $this->_conn->query($sql);
+		if(!empty($limit['limit']))
+			$sql .= " LIMIT ".(int) $limit['limit'];
+		if(!empty($limit['offset']))
+			$sql .= " OFFSET ".(int) $limit['offset'];
+		$res = $this->_conn->query($sql);
 		$hits = array();
 		if($res) {
 			foreach($res as $rec) {
@@ -155,7 +167,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 				$hits[] = $hit;
 			}
 		}
-		return array('count'=>count($hits), 'hits'=>$hits);
+		return array('count'=>$row['c'], 'hits'=>$hits);
 	} /* }}} */
 
 	/**

From 0ebd044cac1a94c045b25f0d189d9becb5b124df Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Sep 2020 16:34:46 +0200
Subject: [PATCH 168/312] paging is done by fulltext engine

---
 out/out.Search.php | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index c7313f3d7..93384d91d 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -181,8 +181,9 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 		$startTime = getTime();
 		$index = $fulltextservice->Indexer();
 		if($index) {
+			$limit = 20;
 			$lucenesearch = $fulltextservice->Search();
-			$searchresult = $lucenesearch->search($query, array('owner'=>$owner, 'status'=>$status, 'category'=>$categorynames, 'user'=>$user->isAdmin() ? [] : [$user->getLogin()], 'mimetype'=>$mimetype));
+			$searchresult = $lucenesearch->search($query, array('owner'=>$owner, 'status'=>$status, 'category'=>$categorynames, 'user'=>$user->isAdmin() ? [] : [$user->getLogin()], 'mimetype'=>$mimetype), ($pageNumber == 'all' ? array() : array('limit'=>$limit, 'offset'=>$limit * ($pageNumber-1))));
 			if($searchresult === false) {
 				$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('splash_invalid_searchterm')));
 				$dcount = 0;
@@ -207,13 +208,12 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 						}
 					}
 				}
-				$limit = 20;
-				if($pageNumber != 'all' && count($entries) > $limit) {
-					$totalPages = (int) (count($entries)/$limit);
-					if(count($entries)%$limit)
+				if($pageNumber != 'all' && $dcount > $limit) {
+					$totalPages = (int) ($dcount/$limit);
+					if($dcount%$limit)
 						$totalPages++;
-					if($limit > 0)
-						$entries = array_slice($entries, ($pageNumber-1)*$limit, $limit);
+//					if($limit > 0)
+//						$entries = array_slice($entries, ($pageNumber-1)*$limit, $limit);
 				} else {
 					$totalPages = 1;
 				}
@@ -297,13 +297,20 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 	// Check to see if the search has been restricted to a particular
 	// document owner.
 	$owner = array();
+	$ownerobjs = array();
 	if (isset($_GET["owner"])) {
 		if (!is_array($_GET['owner'])) {
-			UI::exitError(getMLText("search"),getMLText("unknown_owner"));
+			if(!empty($_GET['owner']) && $o = $dms->getUserByLogin($_GET['owner'])) {
+				$ownerobjs[] = $o;
+				$owner = $o->getLogin();
+			} else
+				UI::exitError(getMLText("search"),getMLText("unknown_owner"));
 		} else {
 			foreach($_GET["owner"] as $l) {
-				if($o = $dms->getUserByLogin($l))
-					$owner[] = $o;
+				if($o = $dms->getUserByLogin($l)) {
+					$ownerobjs[] = $o;
+					$owner[] = $o->getLogin();
+				}
 			}
 		}
 	}
@@ -451,7 +458,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 		'logicalmode'=>$mode,
 		'searchin'=>$searchin,
 		'startFolder'=>$startFolder,
-		'owner'=>$owner,
+		'owner'=>$ownerobjs,
 		'status'=>$status,
 		'creationstartdate'=>$creationdate ? $startdate : array(),
 		'creationenddate'=>$creationdate ? $stopdate : array(),

From 904eef78160ca803240aebfe70618ab69e71d87c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Sep 2020 16:35:17 +0200
Subject: [PATCH 169/312] fix selection of owner

---
 views/bootstrap/class.Search.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index a2c768f86..b1d41eaaf 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -158,16 +158,13 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 <tr>
 <td><?php printMLText("owner");?>:</td>
 <td>
-<?php
-$ownerids = array_map(function($n) {return $n->getId();}, $owner);
-?>
 <select class="chzn-select" name="owner[]" data-allow-clear="true" data-placeholder="<?php printMLText('select_users'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
 <option value=""></option>
 <?php
 		foreach ($allUsers as $userObj) {
 			if ($userObj->isGuest() || ($userObj->isHidden() && $userObj->getID() != $user->getID() && !$user->isAdmin()))
 				continue;
-			print "<option value=\"".$userObj->getLogin()."\" ".(in_array($userObj->getId(), $ownerids) ? "selected" : "").">" . htmlspecialchars($userObj->getLogin()." - ".$userObj->getFullName()) . "</option>\n";
+			print "<option value=\"".$userObj->getLogin()."\" ".(in_array($userObj->getLogin(), $owner) ? "selected" : "").">" . htmlspecialchars($userObj->getLogin()." - ".$userObj->getFullName()) . "</option>\n";
 		}
 ?>
 </select>

From 7bd9f4777aa8f6c05d2a43c4be3cf87220defd8d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 29 Sep 2020 16:51:29 +0200
Subject: [PATCH 170/312] add note about new fulltext search api

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index a115afa4c..487b41745 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 --------------------------------------------------------------------------------
                      Changes in version 5.1.21
 --------------------------------------------------------------------------------
+- new api to fulltext search
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.20

From 7862f5bc80a2796e7362d263eef932e1e82aafcd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 29 Sep 2020 17:07:16 +0200
Subject: [PATCH 171/312] do not export empty groups

---
 CHANGELOG                          | 1 +
 views/bootstrap/class.GroupMgr.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 487b41745..cc3fffd4d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 5.1.21
 --------------------------------------------------------------------------------
 - new api to fulltext search
+- do offer to export users of group if there are no users
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.20
diff --git a/views/bootstrap/class.GroupMgr.php b/views/bootstrap/class.GroupMgr.php
index 144f59f3c..d2cfdb7bd 100644
--- a/views/bootstrap/class.GroupMgr.php
+++ b/views/bootstrap/class.GroupMgr.php
@@ -164,7 +164,8 @@ $(document).ready( function() {
   <ul class="dropdown-menu">
 <?php
 			echo '<li><a href="../out/out.RemoveGroup.php?groupid='.$selgroup->getID().'"><i class="fa fa-remove"></i> '.getMLText("rm_group").'</a><li>';
-			echo '<li><a href="../op/op.UserListCsv.php?groupid='.$selgroup->getID().'"><i class="fa fa-download"></i> '.getMLText("export_user_list_csv").'</a><li>';
+			if($selgroup->getUsers())
+				echo '<li><a href="../op/op.UserListCsv.php?groupid='.$selgroup->getID().'"><i class="fa fa-download"></i> '.getMLText("export_user_list_csv").'</a><li>';
 ?>
 	</ul>
 </div>

From 8d2de278285f370153f13c688c25e6b522d161e6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 30 Sep 2020 09:11:13 +0200
Subject: [PATCH 172/312] add indexing task

---
 inc/inc.ClassSchedulerTaskBase.php |   5 +-
 inc/inc.Tasks.php                  | 141 ++++++++++++++++++++++++++++-
 inc/inc.Utils.php                  |   6 +-
 op/op.SchedulerTaskMgr.php         |   4 +-
 views/bootstrap/class.Indexer.php  |   2 +-
 5 files changed, 150 insertions(+), 8 deletions(-)

diff --git a/inc/inc.ClassSchedulerTaskBase.php b/inc/inc.ClassSchedulerTaskBase.php
index a596348d9..372c30e0f 100644
--- a/inc/inc.ClassSchedulerTaskBase.php
+++ b/inc/inc.ClassSchedulerTaskBase.php
@@ -37,11 +37,14 @@ class SeedDMS_SchedulerTaskBase {
 
 	var $logger;
 
-	public function __construct($dms=null, $user=null, $settings=null, $logger=null) { /* {{{ */
+	var $fulltextservice;
+
+	public function __construct($dms=null, $user=null, $settings=null, $logger=null, $fulltextservice=null) { /* {{{ */
 		$this->dms = $dms;
 		$this->user = $user;
 		$this->settings = $settings;
 		$this->logger = $logger;
+		$this->fulltextservice = $fulltextservice;
 	} /* }}} */
 
 	public function execute($task) { /* {{{ */
diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 34e94537e..c503eebcb 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -7,7 +7,7 @@ require_once("inc/inc.ClassSchedulerTaskBase.php");
  *
  * @author  Uwe Steinmann <uwe@steinmann.cx>
  * @package SeedDMS
- * @subpackage  trash
+ * @subpackage  core
  */
 class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 
@@ -43,4 +43,143 @@ class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 	}
 } /* }}} */
 
+/**
+ * Class for processing a single folder
+ *
+ * SeedDMS_Task_Indexer_Process_Folder::process() is used as a callable when
+ * iterating over all folders recursively.
+ */
+class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
+	protected $forceupdate;
+
+	protected $fulltextservice;
+
+	public function __construct($fulltextservice, $forceupdate) { /* {{{ */
+		$this->fulltextservice = $fulltextservice;
+		$this->forceupdate = $forceupdate;
+	} /* }}} */
+
+	public function process($folder) { /* {{{ */
+		$documents = $folder->getDocuments();
+		if($documents) {
+			$lucenesearch = $this->fulltextservice->Search();
+			echo $folder->getFolderPathPlain()."\n";
+			foreach($documents as $document) {
+				echo $document->getId().":".$document->getName()." ";
+				/* If the document wasn't indexed before then just add it */
+				if(!($hit = $lucenesearch->getDocument($document->getId()))) {
+					try {
+						$idoc = $this->fulltextservice->IndexedDocument($document, true);
+						if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) {
+							foreach($GLOBALS['SEEDDMS_HOOKS']['indexDocument'] as $hookObj) {
+								if (method_exists($hookObj, 'preIndexDocument')) {
+									$hookObj->preIndexDocument(null, $document, $idoc);
+								}
+							}
+						}
+						$this->fulltextservice->Indexer()->addDocument($idoc);
+						echo " (Document added)".PHP_EOL;
+					} catch(Exception $e) {
+						echo " (Timeout)".PHP_EOL;
+					}
+				} else {
+					/* Check if the attribute created is set or has a value older
+					 * than the lastet content. Documents without such an attribute
+					 * where added when a new document was added to the dms. In such
+					 * a case the document content  wasn't indexed.
+					 */
+					try {
+						$created = (int) $hit->getDocument()->getFieldValue('created');
+					} catch (/* Zend_Search_Lucene_ */Exception $e) {
+						$created = 0;
+					}
+					$content = $document->getLatestContent();
+					if($created >= $content->getDate() && !$this->forceupdate) {
+						echo getMLText('index_document_unchanged').PHP_EOL;
+					} else {
+						$this->fulltextservice->Indexer()->delete($hit->id);
+						try {
+							$idoc = $this->fulltextservice->IndexedDocument($document, true);
+							if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) {
+								foreach($GLOBALS['SEEDDMS_HOOKS']['indexDocument'] as $hookObj) {
+									if (method_exists($hookObj, 'preIndexDocument')) {
+										$hookObj->preIndexDocument(null, $document, $idoc);
+									}
+								}
+							}
+							$this->fulltextservice->Indexer()->addDocument($idoc);
+							echo " (Document updated)".PHP_EOL;
+						} catch(Exception $e) {
+							echo " (Timeout)".PHP_EOL;
+						}
+					}
+				}
+			}
+		}
+	} /* }}} */
+} /* }}} */
+
+/**
+ * Class containing methods for running a scheduled task
+ *
+ * @author  Uwe Steinmann <uwe@steinmann.cx>
+ * @package SeedDMS
+ * @subpackage  core
+ */
+class SeedDMS_IndexingDocumentsTask 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 = $this->dms;
+		$fulltextservice = $this->fulltextservice;
+		$taskparams = $task->getParameter();
+		$folder = $dms->getRootFolder();
+		$recreate = isset($taskparams['recreate']) ? $taskparams['recreate'] : false;
+
+		if($fulltextservice) {
+			if($recreate) {
+				$index = $fulltextservice->Indexer(true);
+				if(!$index) {
+					UI::exitError(getMLText("admin_tools"),getMLText("no_fulltextindex"));
+				}
+			} else {
+				$index = $fulltextservice->Indexer(false);
+				if(!$index) {
+					$index = $fulltextservice->Indexer(true);
+					if(!$index) {
+						UI::exitError(getMLText("admin_tools"),getMLText("no_fulltextindex"));
+					}
+				}
+			}
+		}
+
+		$folderprocess = new SeedDMS_Task_Indexer_Process_Folder($fulltextservice, $recreate);
+		$tree = new SeedDMS_FolderTree($folder, array($folderprocess, 'process'));
+		call_user_func(array($folderprocess, 'process'), $folder);
+
+		return true;
+	}
+
+	public function getDescription() {
+		return 'Indexing all new or updated documents';
+	}
+
+	public function getAdditionalParams() {
+		return array(
+			array(
+				'name'=>'recreate',
+				'type'=>'boolean',
+				'description'=> 'Force recreation of index',
+			)
+		);
+	}
+} /* }}} */
+
 $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['expireddocs'] = 'SeedDMS_ExpiredDocumentsTask';
+$GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['indexingdocs'] = 'SeedDMS_IndexingDocumentsTask';
diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 50f9ff6bc..d57d6ef0c 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -650,13 +650,13 @@ function seed_pass_verify($password, $hash) { /* {{{ */
 } /* }}} */
 
 function resolveTask($task) {
-	global $dms, $user, $settings, $logger;
+	global $dms, $user, $settings, $logger, $fulltextservice;
 
 	if(is_object($task))
 		return $task;
 	if(is_string($task)) {
 		if(class_exists($task)) {
-			$task = new $task($dms, $user, $settings, $logger);
+			$task = new $task($dms, $user, $settings, $logger, $fulltextservice);
 		}
 	}
 	return $task;
@@ -741,7 +741,7 @@ class SeedDMS_FolderTree { /* {{{ */
 
 	public function __construct($folder, $callback) { /* {{{ */
     $iter = new \SeedDMS\RecursiveFolderIterator($folder);
-    $iter2 = new RecursiveIteratorIterator($iter, RecursiveIteratorIterator::       SELF_FIRST);
+    $iter2 = new RecursiveIteratorIterator($iter, RecursiveIteratorIterator::SELF_FIRST);
 		foreach($iter2 as $ff) {
 			call_user_func($callback, $ff);
 //      echo $ff->getID().': '.$ff->getFolderPathPlain().'-'.$ff->getName()."<br />";
diff --git a/op/op.SchedulerTaskMgr.php b/op/op.SchedulerTaskMgr.php
index 45589660b..c38c5e595 100644
--- a/op/op.SchedulerTaskMgr.php
+++ b/op/op.SchedulerTaskMgr.php
@@ -53,7 +53,7 @@ if ($action == "addtask") { /* {{{ */
 	$description = $_POST["description"];
 	$frequency = $_POST["frequency"];
 	$disabled = isset($_POST["disabled"]) ? $_POST["disabled"] : 0;
-	$params = $_POST["params"];
+	$params = isset($_POST["params"]) ? $_POST["params"] : null;
 
 	$newtask = $scheduler->addTask($extension, $task, $name, $description, $frequency, $disabled, $params);
 	if ($newtask) {
@@ -90,7 +90,7 @@ else if ($action == "edittask") { /* {{{ */
 	$description = $_POST["description"];
 	$frequency = $_POST["frequency"];
 	$disabled = isset($_POST["disabled"]) ? $_POST["disabled"] : 0;
-	$params = $_POST["params"];
+	$params = isset($_POST["params"]) ? $_POST["params"] : null;
 
 	if ($editedtask->getName() != $name)
 		$editedtask->setName($name);
diff --git a/views/bootstrap/class.Indexer.php b/views/bootstrap/class.Indexer.php
index 7613500f1..92de6595b 100644
--- a/views/bootstrap/class.Indexer.php
+++ b/views/bootstrap/class.Indexer.php
@@ -27,7 +27,7 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_Indexer_Process_Folder { /* {{{ */
 	protected $forceupdate;
 
-	protected $index;
+	protected $fulltextservice;
 
 	public function __construct($fulltextservice, $forceupdate) { /* {{{ */
 		$this->fulltextservice = $fulltextservice;

From bad5be893d8a2fcfc7cd6c8cccba6c5ef2f99624 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 30 Sep 2020 11:02:58 +0200
Subject: [PATCH 173/312] check env var SEEDDMS_CONFIG_FILE for config file

---
 inc/inc.Settings.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/inc/inc.Settings.php b/inc/inc.Settings.php
index c3705d77e..0531a16d6 100644
--- a/inc/inc.Settings.php
+++ b/inc/inc.Settings.php
@@ -21,6 +21,8 @@
 require_once('inc.ClassSettings.php');
 if(defined("SEEDDMS_CONFIG_FILE"))
 	$settings = new Settings(SEEDDMS_CONFIG_FILE);
+elseif(getenv("SEEDDMS_CONFIG_FILE"))
+	$settings = new Settings(getenv("SEEDDMS_CONFIG_FILE"));
 else
 	$settings = new Settings();
 if(!defined("SEEDDMS_INSTALL") && file_exists(dirname($settings->_configFilePath)."/ENABLE_INSTALL_TOOL")) {

From 91be15c60a1bd5d8c59b2129bcdd044175b4a9a7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 30 Sep 2020 11:04:23 +0200
Subject: [PATCH 174/312] add note about SEEDDMS_CONFIG_FILE

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index cc3fffd4d..1072733b0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 --------------------------------------------------------------------------------
 - new api to fulltext search
 - do offer to export users of group if there are no users
+- config file can be set in env var SEEDDMS_CONFIG_FILE
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.20

From 16e4437032edc6773283476bbb990962eed37f4c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 1 Oct 2020 10:52:49 +0200
Subject: [PATCH 175/312] more packages

---
 Gruntfile.js | 88 ++++++++++++++++++++++++++++++++++++++++++----------
 package.json |  7 ++++-
 2 files changed, 78 insertions(+), 17 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 1beeb3cc4..35a4ea180 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -173,36 +173,50 @@ module.exports = function (grunt) {
 								],
 								dest: bootstrapDir + '/bootstrap-datepicker/locales',
 								flatten: true
-						},{
-								expand: true,
-								src: [
-										nodeDir + '/@coreui/coreui/dist/js/*'
-								],
-								dest: bootstrapDir + '/coreui/js',
-								flatten: true
-						},{
-								expand: true,
-								src: [
-										nodeDir + '/@coreui/coreui/dist/css/*'
-								],
-								dest: bootstrapDir + '/coreui/css',
-								flatten: true
 						}]
 					},
 					'coreui': {
 						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/jquery/dist/*'
+								],
+								dest: tdkDir + '/jquery',
+								flatten: true
+						}, {
 								expand: true,
 								src: [
 										nodeDir + '/@coreui/coreui/dist/js/*'
 								],
-								dest: tdkDir + '/coreui/js',
+								dest: tdkDir + '/@coreui/coreui/js',
 								flatten: true
 						},{
 								expand: true,
 								src: [
 										nodeDir + '/@coreui/coreui/dist/css/*'
 								],
-								dest: tdkDir + '/coreui/css',
+								dest: tdkDir + '/@coreui/coreui/css',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/@coreui/icons/css/*'
+								],
+								dest: tdkDir + '/@coreui/icons/css',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/@coreui/icons/fonts/*'
+								],
+								dest: tdkDir + '/@coreui/icons/fonts',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/popper.js/dist/esm/*'
+								],
+								dest: tdkDir + '/popper.js',
 								flatten: true
 						},{
 								expand: true,
@@ -239,6 +253,48 @@ module.exports = function (grunt) {
 								],
 								dest: tdkDir + '/font-awesome/css',
 								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/pace-progressbar/index.js'
+								],
+								dest: tdkDir + '/pace-progressbar',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/pace-progressbar/themes/*'
+								],
+								dest: tdkDir + '/pace-progressbar/themes',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/pace-progressbar/templates/*'
+								],
+								dest: tdkDir + '/pace-progressbar/templates',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/flag-icon-css/css/*'
+								],
+								dest: tdkDir + '/flag-icon-css/css',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/simple-line-icons/dist/fonts/*'
+								],
+								dest: tdkDir + '/simple-line-icons/fonts',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/simple-line-icons/dist/styles/*'
+								],
+								dest: tdkDir + '/simple-line-icons/css',
+								flatten: true
 						}]
 					},
 				}
diff --git a/package.json b/package.json
index 8378da1e4..bd8258450 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "@coreui/coreui": "^3.2.2",
+    "@coreui/icons": "^1.0.1",
     "@popperjs/core": "^2.4.4",
     "bootstrap": "^4.5.2",
     "bootstrap-datepicker": "^1.9.0",
@@ -17,6 +18,7 @@
     "cytoscape": "^3.15.2",
     "cytoscape-grid-guide": "^2.3.2",
     "fine-uploader": "^5.16.2",
+    "flag-icon-css": "^3.5.0",
     "flot": "^4.2.1",
     "font-awesome": "^4.7.0",
     "fullcalendar": "^3.*",
@@ -28,7 +30,10 @@
     "jquery-validation": "^1.19.2",
     "moment": "^2.17.1",
     "noty": "^2.4.1",
+    "pace-progressbar": "^1.0.9",
     "perfect-scrollbar": "^1.5.0",
-    "select2": "^4.0.13"
+    "popper.js": "^1.16.1",
+    "select2": "^4.0.13",
+    "simple-line-icons": "^2.5.5"
   }
 }

From d867e5d0b8b15edac72f942163bb132e41df6252 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 3 Oct 2020 10:18:04 +0200
Subject: [PATCH 176/312] SeedDMS_Folder_DMS::getAccessList() and
 getDefaultAccess() do not return fals    anymore if the parent does not
 exists. They just stop inheritance.

---
 SeedDMS_Core/Core/inc.ClassFolder.php | 16 +++++++++++----
 SeedDMS_Core/package.xml              | 28 +++++++++++++++++++++------
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index 0b7945bff..76d198db8 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -465,9 +465,13 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 	 */
 	function getDefaultAccess() { /* {{{ */
 		if ($this->inheritsAccess()) {
+			/* Access is supposed to be inherited but it could be that there
+			 * is no parent because the configured root folder id is somewhere
+			 * below the actual root folder.
+			 */
 			$res = $this->getParent();
-			if (!$res) return false;
-			return $this->_parent->getDefaultAccess();
+			if ($res)
+				return $this->_parent->getDefaultAccess();
 		}
 
 		return $this->_defaultAccess;
@@ -1226,9 +1230,13 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		$db = $this->_dms->getDB();
 
 		if ($this->inheritsAccess()) {
+			/* Access is supposed to be inherited but it could be that there
+			 * is no parent because the configured root folder id is somewhere
+			 * below the actual root folder.
+			 */
 			$res = $this->getParent();
-			if (!$res) return false;
-			return $this->_parent->getAccessList($mode, $op);
+			if ($res)
+				return $this->_parent->getAccessList($mode, $op);
 		}
 
 		if (!isset($this->_accessList[$mode])) {
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index eb0fceaf4..68cf78f97 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -15,8 +15,8 @@
  <date>2020-09-29</date>
  <time>13:44:55</time>
  <version>
-  <release>5.1.20</release>
-  <api>5.1.20</api>
+  <release>5.1.21</release>
+  <api>5.1.21</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,10 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- SeedDMS_Core_DMS::getDocumentList() returns false, if an unknown list is passed
-- SeedDMS_Core_Document::getDocumentFiles() has new parameter to select only those files attached to a specific version of the document
-- removing a document version will not remove attachments of the document anymore
-- set dms of new user instances in SeedDMS_Core_Group
+- SeedDMS_Folder_DMS::getAccessList() and getDefaultAccess() do not return fals anymore if the parent does not exists. They just stop inheritance.
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1822,5 +1819,24 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
 - add new attribute types 'document', 'folder', 'user', 'group'
    </notes>
   </release>
+  <release>
+   <date>2020-09-29</date>
+   <time>13:44:55</time>
+   <version>
+    <release>5.1.20</release>
+    <api>5.1.20</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- SeedDMS_Core_DMS::getDocumentList() returns false, if an unknown list is passed
+- SeedDMS_Core_Document::getDocumentFiles() has new parameter to select only those files attached to a specific version of the document
+- removing a document version will not remove attachments of the document anymore
+- set dms of new user instances in SeedDMS_Core_Group
+   </notes>
+  </release>
  </changelog>
 </package>

From eb0367bd7c27e433f471bb52e6f3116a2e10c5d0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 6 Oct 2020 06:37:07 +0200
Subject: [PATCH 177/312] document links can be added by regular users again

---
 CHANGELOG                        | 1 +
 inc/inc.ClassAccessOperation.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 285749c27..39807f031 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 6.0.14
 --------------------------------------------------------------------------------
 - merge changes up to 5.1.21
+- document links can be added by regular users again
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.13
diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index a01abd2f4..a43530c10 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -433,6 +433,7 @@ class SeedDMS_AccessOperation {
 		} else {
 			$user_allowed = array(
 				'AddDocument',
+				'AddDocumentLink',
 				'AddEvent',
 				'AddFile',
 				'AddSubFolder',

From fd9bc77fefe2829e9f8ce803bfbc9fdb1c9ba6fb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 6 Oct 2020 14:07:21 +0200
Subject: [PATCH 178/312] add new method addDocumentCategory

---
 restapi/index.php | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/restapi/index.php b/restapi/index.php
index e6b2a4c42..0548d12ad 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -1322,6 +1322,39 @@ class RestapiController { /* {{{ */
         }
     } /* }}} */
 
+    function addDocumentCategory($request, $response, $args) { /* {{{ */
+        $dms = $this->container->dms;
+        $userobj = $this->container->userobj;
+
+        if(!$userobj) {
+            return $response->withJson(array('success'=>false, 'message'=>'Not logged in', 'data'=>''), 403);
+        }
+
+        if(!ctype_digit($args['id']) || $args['id'] == 0) {
+            return $response->withJson(array('success'=>false, 'message'=>'No document given', 'data'=>''), 400);
+            return;
+        }
+        if(!ctype_digit($args['catid']) || $args['catid'] == 0) {
+            return $response->withJson(array('success'=>false, 'message'=>'No category given', 'data'=>''), 400);
+            return;
+        }
+        $cat = $dms->getDocumentCategory($args['catid']);
+        $doc = $dms->getDocument($args['id']);
+        if($doc && $cat) {
+            if($doc->getAccessMode($userobj, 'addDocumentCategory') >= M_READ) {
+                if ($doc->addCategories([$cat])){
+                    return $response->withJson(array('success'=>true, 'message'=>'', 'data'=>''), 201);
+                } else {
+                        return $response->withJson(array('success'=>false, 'message'=>'Could not add document category', 'data'=>''), 500);
+                }
+            } else {
+                return $response->withJson(array('success'=>false, 'message'=>'No access on document', 'data'=>''), 403);
+            }
+        } else {
+            return $response->withJson(array('success'=>false, 'message'=>'Could not find category or document', 'data'=>''), 500);
+        }
+    } /* }}} */
+
     function removeDocumentCategory($request, $response, $args) { /* {{{ */
         $dms = $this->container->dms;
         $userobj = $this->container->userobj;
@@ -2355,6 +2388,7 @@ $app->get('/document/{id}/attributes', \RestapiController::class.':getDocumentAt
 $app->get('/document/{id}/preview/{version}/{width}', \RestapiController::class.':getDocumentPreview');
 $app->delete('/document/{id}/categories', \RestapiController::class.':removeDocumentCategories');
 $app->delete('/document/{id}/category/{catid}', \RestapiController::class.':removeDocumentCategory');
+$app->post('/document/{id}/category/{catid}', \RestapiController::class.':addDocumentCategory');
 $app->put('/account/fullname', \RestapiController::class.':setFullName');
 $app->put('/account/email', \RestapiController::class.':setEmail');
 $app->get('/account/documents/locked', \RestapiController::class.':getLockedDocuments');

From 74a07c9593a4fb2aac4db90e2894f6822b6d8f5f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 6 Oct 2020 18:35:33 +0200
Subject: [PATCH 179/312] close button of modal boxes is never primary

---
 views/bootstrap/class.Bootstrap.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 3a5240084..a8cfb7383 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1222,7 +1222,7 @@ $(document).ready(function() {
 		<p>'.getMLText('tree_loading').'</p>
   </div>
   <div class="modal-footer">
-    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
+    <button class="btn" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
   </div>
 </div>
 ';
@@ -1288,7 +1288,7 @@ function folderSelected<?php echo $formid ?>(id, name) {
 		<p>'.getMLText('tree_loading').'</p>
   </div>
   <div class="modal-footer">
-    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
+    <button class="btn" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
   </div>
 </div>
 ';
@@ -1385,8 +1385,8 @@ $(document).ready(function() {
 		<p><?php printMLText('categories_loading') ?></p>
   </div>
   <div class="modal-footer">
-    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true"><?php printMLText("close") ?></button>
-    <button class="btn" data-dismiss="modal" aria-hidden="true" onClick="acceptCategories();"><i class="fa fa-save"></i> <?php printMLText("save") ?></button>
+    <button class="btn" data-dismiss="modal" aria-hidden="true"><?php printMLText("close") ?></button>
+    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true" onClick="acceptCategories();"><i class="fa fa-save"></i> <?php printMLText("save") ?></button>
   </div>
 </div>
 <?php
@@ -1647,7 +1647,7 @@ $(document).ready(function() {
 		<p>'.getMLText('files_loading').'</p>
 		</div>
   <div class="modal-footer">
-    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
+    <button class="btn" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
   </div>
 </div>
 ';

From a3898e36dee6bead2d8ad838bfb59e336d218bf4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Oct 2020 07:45:06 +0200
Subject: [PATCH 180/312] fix getAttributeEditField() for boolean attributes

---
 views/bootstrap/class.Bootstrap.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index a8cfb7383..017dcce7b 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1515,8 +1515,9 @@ $(document).ready(function() {
 		$content = '';
 		switch($attrdef->getType()) {
 		case SeedDMS_Core_AttributeDefinition::type_boolean:
+			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
 			$content .= "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"\" />";
-			$content .= "<input type=\"checkbox\" id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"1\" ".(($attribute && $attribute->getValue()) ? 'checked' : '')." />";
+			$content .= "<input type=\"checkbox\" id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"1\" ".($objvalue ? 'checked' : '')." />";
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_date:
 				$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';

From b509696715f6074bd3e476c77d8646873a37350b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Oct 2020 07:55:44 +0200
Subject: [PATCH 181/312] item for 5.1.21

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 1072733b0..50f65712b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 - new api to fulltext search
 - do offer to export users of group if there are no users
 - config file can be set in env var SEEDDMS_CONFIG_FILE
+- fix error when search for a boolean attribute value
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.20

From b5f252cd544e02d5c67ee4084c8be5ddee93884c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Oct 2020 18:32:50 +0200
Subject: [PATCH 182/312] add methods [row|column][Start|End]()

---
 views/bootstrap/class.Bootstrap.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 017dcce7b..7b5261b5b 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -903,6 +903,26 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		return;
 	} /* }}} */
 
+	function rowStart() { /* {{{ */
+		echo "<div class=\"row-fluid\">\n";
+		return;
+	} /* }}} */
+
+	function rowEnd() { /* {{{ */
+		echo "</div>\n";
+		return;
+	} /* }}} */
+
+	function columnStart($width=6) { /* {{{ */
+		echo "<div class=\"span".$width."\">\n";
+		return;
+	} /* }}} */
+
+	function columnEnd() { /* {{{ */
+		echo "</div>\n";
+		return;
+	} /* }}} */
+
 	function formField($title, $value, $params=array()) { /* {{{ */
 		if($title !== null) {
 			echo "<div class=\"control-group\">";

From 919fdd659036ddef6bfe3199873162c94ae455c1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Oct 2020 18:33:22 +0200
Subject: [PATCH 183/312] use new methods for rows and columns

---
 views/bootstrap/class.Info.php | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/views/bootstrap/class.Info.php b/views/bootstrap/class.Info.php
index a733fef90..be46390fd 100644
--- a/views/bootstrap/class.Info.php
+++ b/views/bootstrap/class.Info.php
@@ -54,10 +54,9 @@ class SeedDMS_View_Info extends SeedDMS_Bootstrap_Style {
 		} else {
 			$this->warningMsg(getMLText('no_version_check'));
 		}
-?>
-<div class="row-fluid">
-<div class="span6">
-<?php
+
+		$this->rowStart();
+		$this->columnStart(6);
 		$this->contentHeading(getMLText("seeddms_info"));
 		$seedextensions = $extmgr->getExtensionConfiguration();
 		echo "<table class=\"table table-condensed\">\n";
@@ -73,10 +72,8 @@ class SeedDMS_View_Info extends SeedDMS_Bootstrap_Style {
 				echo "<tr><td>".$extname."<br />".$extconf['title']."</td><td>".$extconf['version']."</td></tr>\n";
 		}
 		echo "</tbody>\n</table>\n";
-?>
-</div>
-<div class="span6">
-<?php
+		$this->columnEnd();
+		$this->columnStart(6);
 		if($user->isAdmin()) {
 			$this->contentHeading(getMLText("php_info"));
 			echo "<table class=\"table table-condensed\">\n";
@@ -110,10 +107,8 @@ class SeedDMS_View_Info extends SeedDMS_Bootstrap_Style {
 				echo "<tr><td>".$extname."</td><td>"."</td></tr>\n";
 			echo "</tbody>\n</table>\n";
 		}
-?>
-</div>
-</div>
-<?php
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From 1c718872938f562877294cfa0c48177ac6dc9fb2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Oct 2020 18:52:14 +0200
Subject: [PATCH 184/312] make box for number of hits of type info

---
 views/bootstrap/class.Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index b1d41eaaf..59e73e0ea 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -511,7 +511,7 @@ foreach($facets as $facetname=>$values) {
 				}
 			}
 			 */
-			print "<div class=\"alert\">".getMLText("search_report", array("doccount" => $totaldocs, "foldercount" => $totalfolders, 'searchtime'=>$searchTime))."</div>";
+			print "<div class=\"alert alert-info\">".getMLText("search_report", array("doccount" => $totaldocs, "foldercount" => $totalfolders, 'searchtime'=>$searchTime))."</div>";
 			$this->pageList($pageNumber, $totalpages, "../out/out.Search.php", $urlparams);
 //			$this->contentContainerStart();
 

From 28e7b32ddfdf7ada4f7725ef6bda4db86189f15c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Oct 2020 19:04:39 +0200
Subject: [PATCH 185/312] replace html code with row and column methods

---
 views/bootstrap/class.Search.php     | 12 ++++++------
 views/bootstrap/class.ViewFolder.php | 22 +++++++++++-----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 59e73e0ea..465949567 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -113,8 +113,8 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("search_results"), "");
 
-		echo "<div class=\"row-fluid\">\n";
-		echo "<div class=\"span4\">\n";
+		$this->rowStart();
+		$this->columnStart(4);
 //echo "<pre>";print_r($_GET);echo "</pre>";
 ?>
   <ul class="nav nav-tabs" id="searchtab">
@@ -497,8 +497,8 @@ foreach($facets as $facetname=>$values) {
 ?>
 	</div>
 <?php
-		echo "</div>\n";
-		echo "<div class=\"span8\">\n";
+		$this->columnEnd();
+		$this->columnStart(8);
 // Search Result {{{
 		$foldercount = $doccount = 0;
 		if($entries) {
@@ -647,8 +647,8 @@ foreach($facets as $facetname=>$values) {
 			}
 		}
 // }}}
-		echo "</div>";
-		echo "</div>";
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index 27acd6e74..ac6a4f68e 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -569,7 +569,7 @@ $('body').on('click', '.order-btn', function(ev) {
 			$RightColumnSpan = 8;
 		}
 		if ($LeftColumnSpan > 0) {
-			echo "<div class=\"span".$LeftColumnSpan."\">\n";
+			$this->columnStart($LeftColumnSpan);
 
 			echo $this->callHook('leftContentPre');
 
@@ -594,13 +594,13 @@ $('body').on('click', '.order-btn', function(ev) {
 
 			echo $this->callHook('leftContentPost');
 
-			echo "</div>\n";
+			$this->columnEnd();
 		}
-		echo "<div class=\"span".$RightColumnSpan."\">\n";
+		$this->columnStart($RightColumnSpan);
 
 		if ($enableDropUpload/* && $folder->getAccessMode($user) >= M_READWRITE*/) {
-			echo "<div class=\"row-fluid\">";
-			echo "<div class=\"span8\">";
+			$this->rowStart();
+			$this->columnStart(8);
 		}
 
 //		$this->folderInfos();
@@ -608,15 +608,15 @@ $('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*/) {
-			echo "</div>";
-			echo "<div class=\"span4\">";
+			$this->columnEnd();
+			$this->columnStart(4);
 //			$this->dropUpload();
 ?>
 	<div class="ajax" data-view="ViewFolder" data-action="dropUpload" data-no-spinner="true" <?php echo ($folder ? "data-query=\"folderid=".$folder->getID()."\"" : "") ?>></div>
 <?php
 
-			echo "</div>";
-			echo "</div>";
+			$this->columnEnd();
+			$this->rowEnd();
 		}
 
 		echo $this->callHook('rightContentPre');
@@ -624,8 +624,8 @@ $('body').on('click', '.order-btn', function(ev) {
 	<div class="ajax" data-view="ViewFolder" data-action="folderList" <?php echo ($folder ? "data-query=\"folderid=".$folder->getID()."&orderby=".$orderby."\"" : "") ?>></div>
 <?php
 		echo $this->callHook('rightContentPost');
-		echo "</div>\n"; // End of right column div
-		echo "</div>\n"; // End of div around left and right column
+		$this->columnEnd(); // End of right column div
+		$this->rowEnd(); // End of div around left and right column
 
 		echo $this->callHook('postContent');
 

From d1a5a6823b9086aa80e130b663d206c07bac363a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Oct 2020 07:57:23 +0200
Subject: [PATCH 186/312] use new row, column methods instead of plain html

---
 views/bootstrap/class.ApprovalSummary.php     | 12 ++--
 views/bootstrap/class.AttributeMgr.php        | 21 +++---
 views/bootstrap/class.Calendar.php            | 14 ++--
 views/bootstrap/class.Categories.php          | 23 ++++---
 views/bootstrap/class.Charts.php              | 20 +++---
 views/bootstrap/class.DefaultKeywords.php     | 19 ++---
 views/bootstrap/class.DocumentAccess.php      | 25 +++----
 views/bootstrap/class.DocumentNotify.php      | 12 ++--
 .../bootstrap/class.DocumentVersionDetail.php | 54 ++++++---------
 views/bootstrap/class.EditOnline.php          | 21 ++----
 views/bootstrap/class.ExtensionMgr.php        | 20 +++---
 views/bootstrap/class.FolderAccess.php        | 25 +++----
 views/bootstrap/class.FolderNotify.php        | 12 ++--
 views/bootstrap/class.GroupMgr.php            | 24 +++----
 views/bootstrap/class.Help.php                | 14 ++--
 views/bootstrap/class.ImportUsers.php         | 12 ++--
 views/bootstrap/class.ManageNotify.php        | 27 ++++----
 views/bootstrap/class.MyAccount.php           | 14 ++--
 views/bootstrap/class.RemoveWorkflow.php      | 14 ++--
 .../class.RemoveWorkflowFromDocument.php      | 14 ++--
 .../bootstrap/class.ReturnFromSubWorkflow.php | 15 ++--
 views/bootstrap/class.ReviewSummary.php       | 12 ++--
 views/bootstrap/class.RewindWorkflow.php      | 14 ++--
 views/bootstrap/class.RunSubWorkflow.php      | 14 ++--
 views/bootstrap/class.SetWorkflow.php         | 14 ++--
 views/bootstrap/class.Setup2Factor.php        |  4 +-
 views/bootstrap/class.Timeline.php            | 16 ++---
 views/bootstrap/class.TriggerWorkflow.php     | 14 ++--
 views/bootstrap/class.UserDefaultKeywords.php | 27 ++++----
 views/bootstrap/class.UsrMgr.php              | 21 +++---
 views/bootstrap/class.ViewDocument.php        | 69 ++++++++-----------
 views/bootstrap/class.WorkflowActionsMgr.php  | 14 ++--
 views/bootstrap/class.WorkflowMgr.php         | 21 +++---
 views/bootstrap/class.WorkflowStatesMgr.php   | 14 ++--
 34 files changed, 323 insertions(+), 343 deletions(-)

diff --git a/views/bootstrap/class.ApprovalSummary.php b/views/bootstrap/class.ApprovalSummary.php
index 8050aa283..ea2c46e3c 100644
--- a/views/bootstrap/class.ApprovalSummary.php
+++ b/views/bootstrap/class.ApprovalSummary.php
@@ -60,8 +60,8 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 		$this->globalNavigation();
 		$this->contentStart();
 		$this->pageNavigation(getMLText("my_documents"), "my_documents");
-		echo "<div class=\"row-fluid\">\n";
-		echo "<div class=\"span6\">\n";
+		$this->rowStart();
+		$this->columnStart(6);
 		$this->contentHeading(getMLText("approval_summary"));
 //		$this->contentContainerStart();
 
@@ -110,8 +110,8 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 		}
 
 //		$this->contentContainerEnd();
-		echo "</div>\n";
-		echo "<div class=\"span6\">\n";
+		$this->columnEnd();
+		$this->columnStart(6);
 		$this->contentHeading(getMLText("group_approval_summary"));
 //		$this->contentContainerStart();
 
@@ -149,8 +149,8 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 		}
 
 //		$this->contentContainerEnd();
-		echo "</div>\n";
-		echo "</div>\n";
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index b3f90356c..de06bc3dc 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -325,10 +325,9 @@ $(document).ready( function() {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 		$this->contentHeading(getMLText("attrdef_management"));
+		$this->rowStart();
+		$this->columnStart(6);
 ?>
-
-<div class="row-fluid">
-<div class="span6">
 <form class="form-horizontal">
 	<select class="chzn-select" id="selector" class="input-xlarge">
 		<option value="-1"><?php echo getMLText("choose_attrdef")?></option>
@@ -396,17 +395,17 @@ $(document).ready( function() {
 </form>
 	<div class="ajax" style="margin-bottom: 15px;" data-view="AttributeMgr" data-action="actionmenu" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div>
 	<div class="ajax" data-view="AttributeMgr" data-action="info" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div>
-</div>
-
-<div class="span6">
+<?php
+		$this->columnEnd();
+		$this->columnStart(6);
+?>
 	<?php	$this->contentContainerStart(); ?>
 		<div class="ajax" data-view="AttributeMgr" data-action="form" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div>
-	<?php	$this->contentContainerEnd(); ?>
-</div>
-
-</div>
-
 <?php
+		$this->contentContainerEnd();
+		$this->columnEnd();
+		$this->rowEnd();
+
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.Calendar.php b/views/bootstrap/class.Calendar.php
index 7529ad3ea..c0be2b256 100644
--- a/views/bootstrap/class.Calendar.php
+++ b/views/bootstrap/class.Calendar.php
@@ -392,15 +392,21 @@ $(document).ready(function() {
 		$this->globalNavigation();
 		$this->contentStart();
 //		$this->pageNavigation("", "calendar", array());
+		$this->rowStart();
+		$this->columnStart(8);
 ?>
-<div class="row-fluid" style="margin-bottom: 20px;">
-	<div id="calendar" class="span8"></div>
-	<div id="docinfo" class="span4">
+	<div id="calendar" style="margin-bottom: 20px;"></div>
+<?php
+		$this->columnEnd();
+		$this->columnStart(4);
+?>
+	<div id="docinfo">
 		<div class="ajax iteminfo" data-view="Calendar" data-action="iteminfo" ></div>
 		<div class="ajax itemsperday" data-view="Calendar" data-action="itemsperday" ></div>
 	</div>
-</div>
 <?php
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.Categories.php b/views/bootstrap/class.Categories.php
index 29045f79b..bbe4de8a5 100644
--- a/views/bootstrap/class.Categories.php
+++ b/views/bootstrap/class.Categories.php
@@ -151,9 +151,9 @@ $(document).ready( function() {
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 
 		$this->contentHeading(getMLText("global_document_categories"));
+		$this->rowStart();
+		$this->columnStart(6);
 ?>
-<div class="row-fluid">
-	<div class="span6">
 <form class="form-horizontal">
 			<select class="chzn-select" id="selector" class="input-xlarge">
 				<option value="-1"><?php echo getMLText("choose_category")?>
@@ -167,16 +167,17 @@ $(document).ready( function() {
 </form>
 	<div class="ajax" style="margin-bottom: 15px;" data-view="Categories" data-action="actionmenu" <?php echo ($selcat ? "data-query=\"categoryid=".$selcat->getID()."\"" : "") ?>></div>
 		<div class="ajax" data-view="Categories" data-action="info" <?php echo ($selcat ? "data-query=\"categoryid=".$selcat->getID()."\"" : "") ?>></div>
-	</div>
-
-	<div class="span6">
-		<?php	$this->contentContainerStart(); ?>
-			<div class="ajax" data-view="Categories" data-action="form" <?php echo ($selcat ? "data-query=\"categoryid=".$selcat->getID()."\"" : "") ?>></div>
-		<?php	$this->contentContainerEnd(); ?>
-	</div>
-</div>
-	
 <?php
+		$this->columnEnd();
+		$this->columnStart(6);
+		$this->contentContainerStart();
+?>
+			<div class="ajax" data-view="Categories" data-action="form" <?php echo ($selcat ? "data-query=\"categoryid=".$selcat->getID()."\"" : "") ?>></div>
+<?php
+		$this->contentContainerEnd();
+		$this->columnEnd();
+		$this->rowEnd();
+
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.Charts.php b/views/bootstrap/class.Charts.php
index 5794be916..96d7e5d72 100644
--- a/views/bootstrap/class.Charts.php
+++ b/views/bootstrap/class.Charts.php
@@ -206,21 +206,20 @@ $(document).ready( function() {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 
-		echo "<div class=\"row-fluid\">\n";
-
-		echo "<div class=\"span3\">\n";
+		$this->rowStart();
+		$this->columnStart(3);
 		$this->contentHeading(getMLText("chart_selection"));
 		$this->contentContainerStart();
 		foreach(array('docsperuser', 'sizeperuser', 'docspermimetype', 'docspercategory', 'docsperstatus', 'docspermonth', 'docsaccumulated') as $atype) {
 			echo "<div><a href=\"?type=".$atype."\">".getMLText('chart_'.$atype.'_title')."</a></div>\n";
 		}
 		$this->contentContainerEnd();
-		echo "</div>\n";
+		$this->columnEnd();
 
 		if(in_array($type, array('docspermonth', 'docsaccumulated'))) {
-			echo "<div class=\"span9\">\n";
+			$this->columnStart(9);
 		} else {
-			echo "<div class=\"span6\">\n";
+			$this->columnStart(6);
 		}
 		$this->contentHeading(getMLText('chart_'.$type.'_title'));
 		$this->contentContainerStart();
@@ -258,18 +257,17 @@ $(document).ready( function() {
 			break;
 		}
 		echo "</table>";
-		echo "</div>\n";
+		$this->columnEnd();
 
 		if(!in_array($type, array('docspermonth', 'docsaccumulated'))) {
-			echo "<div class=\"span3\">\n";
+			$this->columnStart(3);
 			$this->contentHeading(getMLText('legend'));
 			$this->contentContainerStart('', 'legend');
 			$this->contentContainerEnd();
-			echo "</div>\n";
+			$this->columnEnd();
 		}
 
-		echo "</div>\n";
-
+		$this->rowEnd();
 		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
diff --git a/views/bootstrap/class.DefaultKeywords.php b/views/bootstrap/class.DefaultKeywords.php
index f2b61e03f..e91a025ee 100644
--- a/views/bootstrap/class.DefaultKeywords.php
+++ b/views/bootstrap/class.DefaultKeywords.php
@@ -240,9 +240,9 @@ $(document).ready( function() {
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 
 		$this->contentHeading(getMLText("global_default_keywords"));
+		$this->rowStart();
+		$this->columnStart(4);
 ?>
-<div class="row-fluid">
-<div class="span4">
 <form class="form-horizontal">
 			<select class="chzn-select" id="selector" class="input-xlarge">
 		    <option value="-1"><?php echo getMLText("choose_category")?>
@@ -264,16 +264,17 @@ $(document).ready( function() {
 			</select>
 </form>
 	<div class="ajax" style="margin-bottom: 15px;" data-view="DefaultKeywords" data-action="actionmenu" <?php echo ($selcategoryid ? "data-query=\"categoryid=".$selcategoryid."\"" : "") ?>></div>
-</div>
-
-<div class="span8">
-	<?php	$this->contentContainerStart(); ?>
+<?php
+		$this->columnEnd();
+		$this->columnStart(8);
+		$this->contentContainerStart();
+?>
 		<div class="ajax" data-view="DefaultKeywords" data-action="form" <?php echo ($selcategoryid ? "data-query=\"categoryid=".$selcategoryid."\"" : "") ?>></div>
 		</div>
-	<?php	$this->contentContainerEnd(); ?>
-</div>
-
 <?php
+		$this->contentContainerEnd();
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.DocumentAccess.php b/views/bootstrap/class.DocumentAccess.php
index 3471dc6b4..220cbc545 100644
--- a/views/bootstrap/class.DocumentAccess.php
+++ b/views/bootstrap/class.DocumentAccess.php
@@ -93,8 +93,8 @@ $(document).ready( function() {
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 
 		$this->contentHeading(getMLText("edit_document_access"));
-		echo "<div class=\"row-fluid\">\n";
-		echo "<div class=\"span4\">\n";
+		$this->rowStart();
+		$this->columnStart(4);
 		$this->contentContainerStart();
 
 		if ($user->isAdmin()) {
@@ -149,8 +149,8 @@ $(document).ready( function() {
 	</p>
 <?php
 			$this->contentContainerEnd();
-			echo "</div>";
-			echo "</div>";
+			$this->columnEnd();
+			$this->rowEnd();
 			$this->contentEnd();
 			$this->htmlEndPage();
 			return;
@@ -164,8 +164,8 @@ $(document).ready( function() {
 	</form>
 <?php
 		$this->contentContainerEnd();
-		echo "</div>";
-		echo "<div class=\"span4\">";
+		$this->columnEnd();
+		$this->columnStart(4);
 		$this->contentContainerStart();
 
 		$accessList = $document->getAccessList();
@@ -239,10 +239,8 @@ $(document).ready( function() {
 </form>
 <?php
 		$this->contentContainerEnd();
-?>
-	</div>
-	<div class="span4">
-<?php
+		$this->columnEnd();
+		$this->columnStart(4);
 		/* memorize users with access rights */
 		$memusers = array();
 		/* memorize groups with access rights */
@@ -314,11 +312,8 @@ $(document).ready( function() {
 			
 			print "</table><br>";
 		}
-?>
-	</div>
-	</div>
-
-<?php
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.DocumentNotify.php b/views/bootstrap/class.DocumentNotify.php
index de9096b65..b727835b6 100644
--- a/views/bootstrap/class.DocumentNotify.php
+++ b/views/bootstrap/class.DocumentNotify.php
@@ -89,8 +89,8 @@ $(document).ready( function() {
 			$groupNotifyIDs[] = $groupNotify->getID();
 		}
 
-		echo "<div class=\"row-fluid\">\n";
-		echo "<div class=\"span6\">\n";
+		$this->rowStart();
+		$this->columnStart(6);
 		$this->contentContainerStart();
 
 ?>
@@ -142,8 +142,8 @@ $(document).ready( function() {
 </form>
 <?php
 		$this->contentContainerEnd();
-		echo "</div>\n";
-		echo "<div class=\"span6\">\n";
+		$this->columnEnd();
+		$this->columnStart(6);
 		print "<table class=\"table-condensed\">\n";
 		if ((count($notifyList["users"]) == 0) && (count($notifyList["groups"]) == 0)) {
 			print "<tr><td>".getMLText("empty_notify_list")."</td></tr>";
@@ -186,8 +186,8 @@ $(document).ready( function() {
 		}
 		print "</table>\n";
 
-		echo "</div>\n";
-		echo "</div>\n";
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index 6d96e0299..99d9fc537 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -157,10 +157,8 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		$this->globalNavigation($folder);
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
-?>
-<div class="row-fluid">
-<div class="span4">
-<?php
+		$this->rowStart();
+		$this->columnStart(4);
 		$this->contentHeading(getMLText("document_infos"));
 		$this->contentContainerStart();
 ?>
@@ -243,10 +241,8 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 <?php
 		$this->contentContainerEnd();
 		$this->preview();
-?>
-</div>
-<div class="span8">
-<?php
+		$this->columnEnd();
+		$this->columnStart(8);
 
 		// verify if file exists
 		$file_exists=file_exists($dms->contentDir . $version->getPath());
@@ -348,8 +344,8 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 
 		$this->contentContainerEnd();
 
-		print "<div class=\"row-fluid\">";
-		print "<div class=\"span6\">";
+		$this->rowStart();
+		$this->columnStart(6);
 
 		if (is_array($reviewStatus) && count($reviewStatus)>0) { /* {{{ */
 
@@ -402,8 +398,8 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 			print "</table>\n";
 		} /* }}} */
 
-		print "</div>\n";
-		print "<div class=\"span6\">";
+		$this->columnEnd();
+		$this->columnStart(6);
 
 		if (is_array($approvalStatus) && count($approvalStatus)>0) { /* {{{ */
 
@@ -456,8 +452,8 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 			print "</table>\n";
 		} /* }}} */
 
-		print "</div>\n";
-		print "</div>\n";
+		$this->columnEnd();
+		$this->rowEnd();
 
 		/* Get attachments exclusively for this version, without those
 		 * attached to the document
@@ -577,36 +573,26 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 				print "</tbody>\n</table>\n";
 				$this->contentContainerEnd();
 			}
-?>
-			<div class="row-fluid">
-<?php
+			$this->rowStart();
 			/* Check for an existing review log, even if the workflowmode
 			 * is set to traditional_only_approval. There may be old documents
 			 * that still have a review log if the workflow mode has been
 			 * changed afterwards.
 			 */
 			if($version->getReviewStatus(10)) {
-?>
-				<div class="span6">
-				<?php $this->printProtocol($version, 'review'); ?>
-				</div>
-<?php
+				$this->columnStart(6);
+				$this->printProtocol($version, 'review');
+				$this->columnEnd();
 			}
 			if($version->getApprovalStatus(10)) {
-?>
-				<div class="span6">
-				<?php $this->printProtocol($version, 'approval'); ?>
-				</div>
-<?php
+				$this->columnStart(6);
+				$this->printProtocol($version, 'approval');
+				$this->columnEnd();
 			}
-?>
-			</div>
-<?php
+			$this->rowEnd();
 		}
-?>
-</div>
-</div>
-<?php
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.EditOnline.php b/views/bootstrap/class.EditOnline.php
index f9b7de66a..029604fb6 100644
--- a/views/bootstrap/class.EditOnline.php
+++ b/views/bootstrap/class.EditOnline.php
@@ -108,13 +108,9 @@ $(document).ready(function()	{
 		$this->contentStart();
 		$folder = $document->getFolder();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
-?>
-
-<?php
-echo "<div class=\"row-fluid\">\n";
-
-echo "<div class=\"span6\">\n";
-$this->contentHeading(getMLText("content"));
+		$this->rowStart();
+		$this->columnStart(6);
+		$this->contentHeading(getMLText("content"));
 ?>
 <form action="../op/op.EditOnline.php" id="form1" method="post">
 <input type="hidden" name="documentid" value="<?php echo $document->getId(); ?>" />
@@ -129,15 +125,12 @@ $this->contentHeading(getMLText("content"));
 <button id="update" type="submit" class="btn btn-primary"><i class="fa fa-save"></i> <?php printMLText("save"); ?></button>
 </form>
 <?php
-		echo "</div>\n";
-
-		echo "<div class=\"span6\">\n";
+		$this->columnEnd();
+		$this->columnStart(6);
 		$this->contentHeading(getMLText("preview"));
 		echo "<div class=\"ajax\" data-view=\"EditOnline\" data-action=\"preview\" data-query=\"documentid=".$document->getId()."\"></div>";
-		echo "</div>\n";
-
-		echo "</div>\n";
-
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index 1f7f32619..ada1960ca 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -250,10 +250,8 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 		$this->contentHeading(getMLText("extension_manager"));
-?>
-<div class="row-fluid">
-	<div class="span4">
-<?php
+		$this->rowStart();
+		$this->columnStart(4);
 		if($extmgr->isWritableExtDir()) {
 ?>
 		<form class="form-horizontal" method="post" enctype="multipart/form-data" action="../op/op.ExtensionMgr.php">
@@ -271,9 +269,9 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 		} else {
 			echo "<div class=\"alert alert-warning\">".getMLText('extension_mgr_no_upload')."</div>";
 		}
+		$this->columnEnd();
+		$this->columnStart(8);
 ?>
-	</div>
-	<div class="span8">
 		<ul class="nav nav-tabs" id="extensionstab">
 			<li class="<?php if(!$currenttab || $currenttab == 'installed') echo 'active'; ?>"><a data-target="#installed" data-toggle="tab"><?= getMLText('extension_mgr_installed'); ?></a></li>
 			<li class="<?php if($currenttab == 'repository') echo 'active'; ?>"><a data-target="#repository" data-toggle="tab"><?= getMLText('extension_mgr_repository'); ?></a></li>
@@ -288,7 +286,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 <form action="../op/op.ExtensionMgr.php" name="form1" method="post">
   <?php echo createHiddenFieldWithKey('extensionmgr'); ?>
 	<input type="hidden" name="action" value="refresh" />
-	<p><button type="submit" class="btn"><i class="fa fa-refresh"></i> <?php printMLText("refresh");?></button></p>
+	<p><button type="submit" class="btn btn-primary"><i class="fa fa-refresh"></i> <?php printMLText("refresh");?></button></p>
 </form>
 			</div>
 
@@ -343,13 +341,15 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 					<input type="hidden" name="action" value="getlist" />
 					<input type="hidden" name="currenttab" value="repository" />
 					<input type="hidden" name="forceupdate" value="1" />
-          <button type="submit" class="btn btn-delete"><i class="fa fa-refresh"></i> <?= getMLText('force_update')?></button>
+          <button type="submit" class="btn btn-primary"><i class="fa fa-refresh"></i> <?= getMLText('force_update')?></button>
 					</form>
 </div>
 			</div>
 		</div>
-  </div>
-</div>
+<?php
+		$this->columnEnd();
+		$this->rowEnd();
+?>
 <div class="modal modal-wide hide" id="extensionInfo" tabindex="-1" role="dialog" aria-labelledby="extensionInfoLabel" aria-hidden="true">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
diff --git a/views/bootstrap/class.FolderAccess.php b/views/bootstrap/class.FolderAccess.php
index 8bca2fd16..b71da02c7 100644
--- a/views/bootstrap/class.FolderAccess.php
+++ b/views/bootstrap/class.FolderAccess.php
@@ -90,8 +90,8 @@ $(document).ready(function() {
 		$this->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder);
 
 		$this->contentHeading(getMLText("edit_folder_access"));
-		echo "<div class=\"row-fluid\">\n";
-		echo "<div class=\"span4\">\n";
+		$this->rowStart();
+		$this->columnStart(4);
 		$this->contentContainerStart();
 
 		if ($user->isAdmin()) {
@@ -148,8 +148,8 @@ $(document).ready(function() {
 	</p>
 <?php
 				$this->contentContainerEnd();
-				echo "</div>";
-				echo "</div>";
+				$this->columnEnd();
+				$this->rowEnd();
 				$this->contentEnd();
 				$this->htmlEndPage();
 				return;
@@ -164,8 +164,8 @@ $(document).ready(function() {
 <?php
 		}
 		$this->contentContainerEnd();
-		echo "</div>";
-		echo "<div class=\"span4\">";
+		$this->columnEnd();
+		$this->columnStart(4);
 		$this->contentContainerStart();
 
 		$accessList = $folder->getAccessList();
@@ -230,10 +230,8 @@ $(document).ready(function() {
 </form>
 <?php
 		$this->contentContainerEnd();
-?>
-	</div>
-	<div class="span4">
-<?php
+		$this->columnEnd();
+		$this->columnStart(4);
 
 		if ((count($accessList["users"]) != 0) || (count($accessList["groups"]) != 0)) {
 
@@ -300,11 +298,8 @@ $(document).ready(function() {
 			
 			print "</table><br>";
 		}
-?>
-	</div>
-	</div>
-
-<?php
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.FolderNotify.php b/views/bootstrap/class.FolderNotify.php
index cae14942f..5fe0bfb24 100644
--- a/views/bootstrap/class.FolderNotify.php
+++ b/views/bootstrap/class.FolderNotify.php
@@ -89,8 +89,8 @@ $(document).ready(function() {
 			$groupNotifyIDs[] = $groupNotify->getID();
 		}
 
-		echo "<div class=\"row-fluid\">\n";
-		echo "<div class=\"span6\">\n";
+		$this->rowStart();
+		$this->columnStart(6);
 		$this->contentContainerStart();
 
 ?>
@@ -142,8 +142,8 @@ $(document).ready(function() {
 </form>
 <?php
 		$this->contentContainerEnd();
-		echo "</div>\n";
-		echo "<div class=\"span6\">\n";
+		$this->columnEnd();
+		$this->columnStart(6);
 		print "<table class=\"table-condensed\">\n";
 		if (empty($notifyList["users"]) && empty($notifyList["groups"])) {
 			print "<tr><td>".getMLText("empty_notify_list")."</td></tr>";
@@ -186,8 +186,8 @@ $(document).ready(function() {
 		}
 		print "</table>\n";
 
-		echo "</div>\n";
-		echo "</div>\n";
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.GroupMgr.php b/views/bootstrap/class.GroupMgr.php
index d2cfdb7bd..4cb97d4a9 100644
--- a/views/bootstrap/class.GroupMgr.php
+++ b/views/bootstrap/class.GroupMgr.php
@@ -296,10 +296,9 @@ $(document).ready( function() {
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 
 		$this->contentHeading(getMLText("group_management"));
+		$this->rowStart();
+		$this->columnStart(4);
 ?>
-
-<div class="row-fluid">
-<div class="span4">
 <form class="form-horizontal">
 <?php
 		$options = array();
@@ -321,17 +320,16 @@ $(document).ready( function() {
 </form>
 	<div class="ajax" style="margin-bottom: 15px;" data-view="GroupMgr" data-action="actionmenu" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>
 	<div class="ajax" data-view="GroupMgr" data-action="info" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>
-</div>
-
-<div class="span8">
-	<?php	$this->contentContainerStart(); ?>
-		<div class="ajax" data-view="GroupMgr" data-action="form" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>
-	<?php	$this->contentContainerEnd(); ?>
-</div>
-
-</div>
-
 <?php
+		$this->columnEnd();
+		$this->columnStart(8);
+		$this->contentContainerStart();
+?>
+		<div class="ajax" data-view="GroupMgr" data-action="form" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>
+<?php
+		$this->contentContainerEnd();
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.Help.php b/views/bootstrap/class.Help.php
index 15d9d2898..6dfd467f7 100644
--- a/views/bootstrap/class.Help.php
+++ b/views/bootstrap/class.Help.php
@@ -40,9 +40,9 @@ class SeedDMS_View_Help extends SeedDMS_Bootstrap_Style {
 		$this->globalNavigation();
 		$this->contentStart();
 //		$this->pageNavigation(getMLText("help").": ".getMLText('help_'.strtolower($context), array(), $context), "");
+		$this->rowStart();
+		$this->columnStart(4);
 ?>
-<div class="row-fluid">
-<div class="span4">
 	<legend>Table of contents</legend>
 <?php
 		$dir = "../languages/".$this->params['session']->getLanguage()."/help";
@@ -57,9 +57,9 @@ class SeedDMS_View_Help extends SeedDMS_Bootstrap_Style {
 			}
 		}
 		echo "</ul>";
+		$this->columnEnd();
+		$this->columnStart(8);
 ?>
-</div>
-<div class="span8">
 <legend><?php printMLText('help_'.strtolower($context), array(), $context); ?></legend>
 <?php
 
@@ -76,10 +76,8 @@ class SeedDMS_View_Help extends SeedDMS_Bootstrap_Style {
 			readfile("../languages/".$this->params['session']->getLanguage()."/help.htm");
 		}
 
-?>
-</div>
-</div>
-<?php
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.ImportUsers.php b/views/bootstrap/class.ImportUsers.php
index 5886caccf..5a2f92673 100644
--- a/views/bootstrap/class.ImportUsers.php
+++ b/views/bootstrap/class.ImportUsers.php
@@ -51,8 +51,8 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Bootstrap_Style {
 
 		$this->contentHeading(getMLText("import_users"));
 
-		echo "<div class=\"row-fluid\">\n";
-		echo "<div class=\"span4\">\n";
+		$this->rowStart();
+		$this->columnStart(4);
 		$this->contentContainerStart();
 		print "<form class=\"form-horizontal\" action=\"../op/op.ImportUsers.php\" name=\"form1\" enctype=\"multipart/form-data\" method=\"post\">";
 		$this->formField(
@@ -81,8 +81,8 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Bootstrap_Style {
 		print "</form>\n";
 		$this->contentContainerEnd();
 
-		echo "</div>\n";
-		echo "<div class=\"span8\">\n";
+		$this->columnEnd();
+		$this->columnStart(8);
 		if($newusers) {
 			echo "<table class=\"table table-condensed\">\n";
 			echo "<tr>";
@@ -121,8 +121,8 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Bootstrap_Style {
 				 */
 			echo "</table>";
 		}
-		echo "</div>\n";
-		echo "</div>\n";
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.ManageNotify.php b/views/bootstrap/class.ManageNotify.php
index 236570370..2077c57cb 100644
--- a/views/bootstrap/class.ManageNotify.php
+++ b/views/bootstrap/class.ManageNotify.php
@@ -153,8 +153,8 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("my_account"), "my_account");
 
-		echo "<div class=\"row-fluid\">";
-		echo "<div class=\"span6\">";
+		$this->rowStart();
+		$this->columnStart(6);
 		$this->contentHeading(getMLText("edit_folder_notify"));
 		$this->contentContainerStart();
 
@@ -181,9 +181,8 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 		$this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add'));
 		print "</form>";
 		$this->contentContainerEnd();
-		echo "</div>";
-
-		echo "<div class=\"span6\">";
+		$this->columnEnd();
+		$this->columnStart(6);
 		$this->contentHeading(getMLText("edit_document_notify"));
 		$this->contentContainerStart();
 		print "<form method=\"post\" action=\"../op/op.ManageNotify.php?type=document&action=add\" name=\"form2\">";
@@ -194,32 +193,30 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 		print "</form>";
 
 		$this->contentContainerEnd();
-		echo "</div>";
-		echo "</div>";
-
+		$this->columnEnd();
+		$this->rowEnd();
 
 		//
 		// Display the results.
 		//
-		echo "<div class=\"row-fluid\">";
-		echo "<div class=\"span6\">";
+		$this->rowStart();
+		$this->columnStart(6);
 		$this->contentHeading(getMLText("user"));
 		$ret=$this->getNotificationList(false,true);
 		$this->printFolderNotificationList($ret);
 		$this->contentHeading(getMLText("group"));
 		$ret=$this->getNotificationList(true,true);
 		$this->printFolderNotificationList($ret,false);
-		echo "</div>";
-
-		echo "<div class=\"span6\">";
+		$this->columnEnd();
+		$this->columnStart(6);
 		$this->contentHeading(getMLText("user"));
 		$ret=$this->getNotificationList(false,false);
 		$this->printDocumentNotificationList($ret);
 		$this->contentHeading(getMLText("group"));
 		$ret=$this->getNotificationList(true,false);
 		$this->printDocumentNotificationList($ret,false);
-		echo "</div>";
-		echo "</div>";
+		$this->columnEnd();
+		$this->rowEnd();
 
 		$this->contentEnd();
 		$this->htmlEndPage();
diff --git a/views/bootstrap/class.MyAccount.php b/views/bootstrap/class.MyAccount.php
index a999e3134..c145e2e0a 100644
--- a/views/bootstrap/class.MyAccount.php
+++ b/views/bootstrap/class.MyAccount.php
@@ -53,14 +53,14 @@ class SeedDMS_View_MyAccount extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerStart();
 
 
-		echo "<div class=\"row-fluid\">\n";
+		$this->rowStart();
 		if ($enableuserimage){
-			echo "<div class=\"span2\">\n";
+			$this->columnStart(2);
 			print ($user->hasImage() ? "<img class=\"userImage\" src=\"".$httproot . "out/out.UserImage.php?userid=".$user->getId()."\">" : getMLText("no_user_image"))."\n";
-			echo "</div>\n";
-			echo "<div class=\"span10\">\n";
+			$this->columnEnd();
+			$this->columnStart(10);
 		} else {
-			echo "<div class=\"span12\">\n";
+			$this->columnStart(12);
 		}
 
 		print "<table class=\"table-condensed\">\n";
@@ -113,8 +113,8 @@ class SeedDMS_View_MyAccount extends SeedDMS_Bootstrap_Style {
 			print "</tr>\n";
 		}
 		print "</table>\n";
-		print "</div>\n";
-		print "</div>\n";
+		$this->columnEnd();
+		$this->rowEnd();
 
 		$this->contentContainerEnd();
 		$this->contentEnd();
diff --git a/views/bootstrap/class.RemoveWorkflow.php b/views/bootstrap/class.RemoveWorkflow.php
index 465d771eb..d41e91ab2 100644
--- a/views/bootstrap/class.RemoveWorkflow.php
+++ b/views/bootstrap/class.RemoveWorkflow.php
@@ -43,21 +43,25 @@ class SeedDMS_View_RemoveWorkflow extends SeedDMS_Bootstrap_Style {
 		$this->contentHeading(getMLText("rm_workflow"));
 		$this->contentContainerStart();
 		// Display the Workflow form.
+		$this->rowStart();
+		$this->columnStart(4);
 ?>
-	<div class="row-fluid">
-	<div class="span4">
 	<p><?php printMLText("rm_workflow_warning"); ?></p>
 	<form method="post" action="../op/op.RemoveWorkflow.php" name="form1">
 	<?php echo createHiddenFieldWithKey('removeworkflow'); ?>
 	<input type='hidden' name='workflowid' value='<?php echo $workflow->getId(); ?>'/>
 	<button type='submit' class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_workflow"); ?></button>
 	</form>
-	</div>
-	<div id="workflowgraph" class="span8">
+<?php
+		$this->columnEnd();
+		$this->columnStart(8);
+?>
+	<div id="workflowgraph">
 	<iframe src="out.WorkflowGraph.php?workflow=<?php echo $workflow->getID(); ?>" width="100%" height="661" style="border: 1px solid #AAA;"></iframe>
 	</div>
-	</div>
 <?php
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentContainerEnd();
 
 		$this->contentEnd();
diff --git a/views/bootstrap/class.RemoveWorkflowFromDocument.php b/views/bootstrap/class.RemoveWorkflowFromDocument.php
index 9de6c747a..91021db12 100644
--- a/views/bootstrap/class.RemoveWorkflowFromDocument.php
+++ b/views/bootstrap/class.RemoveWorkflowFromDocument.php
@@ -65,9 +65,9 @@ class SeedDMS_View_RemoveWorkflowFromDocument extends SeedDMS_Bootstrap_Style {
 
 		$this->contentContainerStart();
 		// Display the Workflow form.
+		$this->rowStart();
+		$this->columnStart(4);
 ?>
-	<div class="row-fluid">
-	<div class="span4">
 	<p><?php printMLText("rm_workflow_warning"); ?></p>
 	<form method="post" action="../op/op.RemoveWorkflowFromDocument.php" name="form1">
 	<?php echo createHiddenFieldWithKey('removeworkflowfromdocument'); ?>
@@ -75,12 +75,15 @@ class SeedDMS_View_RemoveWorkflowFromDocument extends SeedDMS_Bootstrap_Style {
 	<input type='hidden' name='version' value='<?php echo $latestContent->getVersion(); ?>'/>
 	<button type='submit' class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_workflow"); ?></button>
 	</form>
-	</div>
-	<div id="workflowgraph" class="span8">
+<?php
+		$this->columnEnd();
+		$this->columnStart(8);
+?>
+	<div id="workflowgraph">
 	<iframe src="out.WorkflowGraph.php?workflow=<?php echo $workflow->getID(); ?>" width="100%" height="500" style="border: 1px solid #AAA;"></iframe>
 	</div>
-	</div>
 <?php
+		$this->columnEnd();
 		$this->contentContainerEnd();
 
 		if($wkflog) {
@@ -101,6 +104,7 @@ class SeedDMS_View_RemoveWorkflowFromDocument extends SeedDMS_Bootstrap_Style {
 			$this->contentContainerEnd();
 		}
 
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.ReturnFromSubWorkflow.php b/views/bootstrap/class.ReturnFromSubWorkflow.php
index 4bc8842b3..d0a496cdb 100644
--- a/views/bootstrap/class.ReturnFromSubWorkflow.php
+++ b/views/bootstrap/class.ReturnFromSubWorkflow.php
@@ -97,9 +97,9 @@ $(document).ready(function() {
 
 		$this->contentContainerStart();
 		// Display the Workflow form.
+		$this->rowStart();
+		$this->columnStart(4);
 ?>
-	<div class="row-fluid">
-	<div class="span4">
 	<form method="post" action="../op/op.ReturnFromSubWorkflow.php" id="form1" name="form1">
 	<?php echo createHiddenFieldWithKey('returnfromsubworkflow'); ?>
 	<table>
@@ -115,13 +115,16 @@ $(document).ready(function() {
 	<input type='submit' class="btn" value='<?php printMLText("return_from_subworkflow"); ?>'/>
 	</td></tr></table>
 	</form>
-	</div>
-	<div id="workflowgraph" class="span8">
+<?php
+		$this->columnEnd();
+		$this->columnStart(4);
+?>
+	<div id="workflowgraph">
 	<iframe src="out.WorkflowGraph.php?workflow=<?php echo $parentworkflow->getID(); ?>&transition=<?php echo $transition->getID(); ?>&documentid=<?php echo $document->getID(); ?>" width="100%" height="500" style="border: 1px solid #AAA;"></iframe>
 	<h4>Workflow</h4>
-	</div>
-	</div>
 <?php
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentContainerEnd();
 
 		if($wkflog) {
diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php
index de95a0646..b8fe259dc 100644
--- a/views/bootstrap/class.ReviewSummary.php
+++ b/views/bootstrap/class.ReviewSummary.php
@@ -61,8 +61,8 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("my_documents"), "my_documents");
 
-		echo "<div class=\"row-fluid\">\n";
-		echo "<div class=\"span6\">\n";
+		$this->rowStart();
+		$this->columnStart(6);
 		$this->contentHeading(getMLText("review_summary"));
 //		$this->contentContainerStart();
 
@@ -113,8 +113,8 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 		}
 
 //		$this->contentContainerEnd();
-		echo "</div>\n";
-		echo "<div class=\"span6\">\n";
+		$this->columnEnd();
+		$this->columnStart(6);
 		$this->contentHeading(getMLText("group_review_summary"));
 //		$this->contentContainerStart();
 
@@ -154,8 +154,8 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 		}
 
 //		$this->contentContainerEnd();
-		echo "</div>\n";
-		echo "</div>\n";
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.RewindWorkflow.php b/views/bootstrap/class.RewindWorkflow.php
index 93bfe0432..d1847a979 100644
--- a/views/bootstrap/class.RewindWorkflow.php
+++ b/views/bootstrap/class.RewindWorkflow.php
@@ -65,9 +65,9 @@ class SeedDMS_View_RewindWorkflow extends SeedDMS_Bootstrap_Style {
 
 		$this->contentContainerStart();
 		// Display the Workflow form.
+		$this->rowStart();
+		$this->columnStart(4);
 ?>
-	<div class="row-fluid">
-	<div class="span4">
 	<p><?php printMLText("rewind_workflow_warning"); ?></p>
 	<form method="post" action="../op/op.RewindWorkflow.php" name="form1">
 	<?php echo createHiddenFieldWithKey('rewindworkflow'); ?>
@@ -75,12 +75,16 @@ class SeedDMS_View_RewindWorkflow extends SeedDMS_Bootstrap_Style {
 	<input type='hidden' name='version' value='<?php echo $latestContent->getVersion(); ?>'/>
 	<input type='submit' class="btn" value='<?php printMLText("rewind_workflow"); ?>'/>
 	</form>
-	</div>
-	<div id="workflowgraph" class="span8">
+<?php
+		$this->columnEnd();
+		$this->columnStart(8);
+?>
+	<div id="workflowgraph">
 	<iframe src="out.WorkflowGraph.php?workflow=<?php echo $workflow->getID(); ?>" width="100%" height="400" style="border: 1px solid #AAA;"></iframe>
 	</div>
-	</div>
 <?php
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentContainerEnd();
 
 		if($wkflog) {
diff --git a/views/bootstrap/class.RunSubWorkflow.php b/views/bootstrap/class.RunSubWorkflow.php
index af7ea88b9..dd108bf24 100644
--- a/views/bootstrap/class.RunSubWorkflow.php
+++ b/views/bootstrap/class.RunSubWorkflow.php
@@ -66,9 +66,9 @@ class SeedDMS_View_RunSubWorkflow extends SeedDMS_Bootstrap_Style {
 
 		$this->contentContainerStart();
 		// Display the Workflow form.
+		$this->rowStart();
+		$this->columnStart(4);
 ?>
-	<div class="row-fluid">
-	<div class="span4">
 	<form method="POST" action="../op/op.RunSubWorkflow.php" name="form1">
 	<?php echo createHiddenFieldWithKey('runsubworkflow'); ?>
 	<table>
@@ -79,12 +79,16 @@ class SeedDMS_View_RunSubWorkflow extends SeedDMS_Bootstrap_Style {
 	<input type='submit' class="btn" value='<?php printMLText("run_subworkflow"); ?>'/>
 	</td></tr></table>
 	</form>
-	</div>
-	<div id="workflowgraph" class="span8">
+<?php
+		$this->columnEnd();
+		$this->columnStart(4);
+?>
+	<div id="workflowgraph">
 	<iframe src="out.WorkflowGraph.php?workflow=<?php echo $subworkflow->getID(); ?>" width="100%" height="400" style="border: 1px solid #AAA;"></iframe>
 	</div>
-	</div>
 <?php
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentContainerEnd();
 
 		if($wkflog) {
diff --git a/views/bootstrap/class.SetWorkflow.php b/views/bootstrap/class.SetWorkflow.php
index 5a7edd574..8bcc8b244 100644
--- a/views/bootstrap/class.SetWorkflow.php
+++ b/views/bootstrap/class.SetWorkflow.php
@@ -69,10 +69,8 @@ $(document).ready( function() {
 
 		$this->contentContainerStart();
 		// Display the Workflow form.
-?>
-	<div class="row-fluid">
-	<div class="span4">
-<?php
+		$this->rowStart();
+		$this->columnStart(4);
 				$workflows = $dms->getAllWorkflows();
 				if($workflows) {
 ?>
@@ -109,13 +107,15 @@ $(document).ready( function() {
 		<p><?php printMLText('no_workflow_available'); ?></p>
 <?php
 				}
+		$this->columnEnd();
+		$this->columnStart(8);
 ?>
-	</div>
-	<div id="workflowgraph" class="span8" style="display: none;">
+	<div id="workflowgraph" style="display: none;">
 	<iframe src="" width="100%" height="500" style="border: 1px solid #AAA;"></iframe>
 	</div>
-	</div>
 <?php
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
diff --git a/views/bootstrap/class.Setup2Factor.php b/views/bootstrap/class.Setup2Factor.php
index 12311557f..21cad1ce8 100644
--- a/views/bootstrap/class.Setup2Factor.php
+++ b/views/bootstrap/class.Setup2Factor.php
@@ -77,7 +77,7 @@ $(document).ready( function() {
 		$this->pageNavigation(getMLText("my_account"), "my_account");
 		$this->contentHeading(getMLText('2_factor_auth'));
 		echo "<div class=\"alert\">".getMLText('2_factor_auth_info')."</div>";
-		echo '<div class="row-fluid">';
+		$this->rowStart();
 		$this->contentContainerStart('span6');
 
 		$tfa = new \RobThree\Auth\TwoFactorAuth('SeedDMS');
@@ -106,7 +106,7 @@ $(document).ready( function() {
 		}
 
 		$this->contentContainerEnd();
-		echo '</div>';
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php
index 908d979e8..209f27c23 100644
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@@ -228,12 +228,9 @@ div.timeline-event-selected {
 		$this->globalNavigation();
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-?>
 
-<?php
-		echo "<div class=\"row-fluid\">\n";
-
-		echo "<div class=\"span3\">\n";
+		$this->rowStart();
+		$this->columnStart(3);
 		$this->contentHeading(getMLText("timeline"));
 		$this->contentContainerStart();
 ?>
@@ -280,13 +277,12 @@ div.timeline-event-selected {
 <?php
 		$this->contentContainerEnd();
 		echo "<div class=\"ajax\" data-view=\"Timeline\" data-action=\"iteminfo\" ></div>";
-		echo "</div>\n";
-
-		echo "<div class=\"span9\">\n";
+		$this->columnEnd();
+		$this->columnStart(9);
 		$this->contentHeading(getMLText("timeline"));
 		$this->printTimelineHtml(550);
-		echo "</div>\n";
-		echo "</div>\n";
+		$this->columnEnd();
+		$this->rowEnd();
 
 		$this->contentContainerEnd();
 		$this->contentEnd();
diff --git a/views/bootstrap/class.TriggerWorkflow.php b/views/bootstrap/class.TriggerWorkflow.php
index b9a89bbd5..9f1a10fff 100644
--- a/views/bootstrap/class.TriggerWorkflow.php
+++ b/views/bootstrap/class.TriggerWorkflow.php
@@ -98,9 +98,9 @@ $(document).ready(function() {
 
 		$this->contentContainerStart();
 		// Display the Workflow form.
+		$this->rowStart();
+		$this->columnStart(4);
 ?>
-	<div class="row-fluid">
-	<div class="span4">
 	<form class="form-horizontal" method="post" action="../op/op.TriggerWorkflow.php" id="form1" name="form1">
 	<input type='hidden' name='documentid' value='<?php echo $document->getId(); ?>'/>
 	<input type='hidden' name='version' value='<?php echo $latestContent->getVersion(); ?>'/>
@@ -118,12 +118,16 @@ $(document).ready(function() {
 		$this->formSubmit(getMLText("action_".strtolower($action->getName()), array(), $action->getName()));
 ?>
 	</form>
-	</div>
-	<div id="workflowgraph" class="span8">
+<?php
+		$this->columnEnd();
+		$this->columnStart(8);
+?>
+	<div id="workflowgraph">
 	<iframe src="out.WorkflowGraph.php?workflow=<?php echo $workflow->getID(); ?>&transitions[]=<?php echo $transition->getID(); ?>&documentid=<?php echo $document->getID(); ?>" width="100%" height="500" style="border: 1px solid #AAA;"></iframe>
 	</div>
-	</div>
 <?php
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentContainerEnd();
 
 		if($wkflog) {
diff --git a/views/bootstrap/class.UserDefaultKeywords.php b/views/bootstrap/class.UserDefaultKeywords.php
index f731fec6b..5bfad7e96 100644
--- a/views/bootstrap/class.UserDefaultKeywords.php
+++ b/views/bootstrap/class.UserDefaultKeywords.php
@@ -74,10 +74,10 @@ $(document).ready(function() {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("my_account"), "my_account");
 		$this->contentHeading(getMLText("edit_default_keywords"));
+		$this->rowStart();
+		$this->columnStart(4);
+		$this->contentContainerStart();
 ?>
-<div class="row-fluid">
-	<div class="span4">
-		<?php	$this->contentContainerStart(); ?>
 			<form class="form-horizontal">
 <?php
 		$selected=0;
@@ -104,11 +104,12 @@ $(document).ready(function() {
 		);
 ?>
 			</form>
-		<?php	$this->contentContainerEnd(); ?>
-	</div>
-
-	<div class="span8">
-		<?php	$this->contentContainerStart(); ?>
+<?php
+		$this->contentContainerEnd();
+		$this->columnEnd();
+		$this->columnStart(8);
+		$this->contentContainerStart();
+ ?>
 
 			<div id="keywords0" style="display : none;">
 				<form class="form-horizontal" action="../op/op.UserDefaultKeywords.php" method="post" name="addcategory">
@@ -193,12 +194,10 @@ $(document).ready(function() {
 				</div>
 
 		</div>
-<?php } ?>
-		<?php	$this->contentContainerEnd(); ?>
-</div>
-</div>
-
-<?php
+<?php }
+		$this->contentContainerEnd();
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 78756f756..45a5d8a00 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -531,9 +531,9 @@ $(document).ready( function() {
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 
 		$this->contentHeading(getMLText("user_management"));
+		$this->rowStart();
+		$this->columnStart(4);
 ?>
-<div class="row-fluid">
-<div class="span4">
 <form class="form-horizontal">
 <?php
 		$options = array();
@@ -555,16 +555,17 @@ $(document).ready( function() {
 </form>
 	<div class="ajax" style="margin-bottom: 15px;" data-view="UsrMgr" data-action="actionmenu" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
 	<div class="ajax" data-view="UsrMgr" data-action="info" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
-</div>
-
-<div class="span8">
-	<?php	$this->contentContainerStart(); ?>
+<?php
+		$this->columnEnd();
+		$this->columnStart(4);
+		$this->contentContainerStart();
+ ?>
 		<div class="ajax" data-view="UsrMgr" data-action="form" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
 	</div>
-	<?php	$this->contentContainerEnd(); ?>
-</div>
-
-<?php
+	<?php
+		$this->contentContainerEnd();
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 7cf62e8a4..57eb0e776 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -519,20 +519,18 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$status = $latestContent->getStatus();
 		$reviewStatus = $latestContent->getReviewStatus();
 		$approvalStatus = $latestContent->getApprovalStatus();
-?>
 
-<div class="row-fluid">
-<div class="span4">
-<?php
+		$this->rowStart();
+		$this->columnStart(4);
 		$txt = $this->callHook('startLeftColumn', $document);
 		if(is_string($txt))
 			echo $txt;
 		$this->documentInfos();
 		$this->preview();
-?>
-</div>
-<div class="span8">
-<?php
+
+		$this->columnEnd();
+		$this->columnStart(8);
+
 		$txt = $this->callHook('startRightColumn', $document);
 		if(is_string($txt))
 			echo $txt;
@@ -769,14 +767,14 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 ?>
 		  <div class="tab-pane <?php if($currenttab == 'revapp') echo 'active'; ?>" id="revapp">
 <?php
-		print "<div class=\"row-fluid\">";
+		$this->rowStart();
 		/* Just check fo an exting reviewStatus, even workflow mode is set
 		 * to traditional_only_approval. There may be old documents which
 		 * are still in S_DRAFT_REV.
 		 */
 		if (/*$workflowmode != 'traditional_only_approval' &&*/ is_array($reviewStatus) && count($reviewStatus)>0) {
 
-			print "<div class=\"span6\">";
+			$this->columnStart(6);
 //		$this->contentContainerStart();
 			print "<legend>".getMLText('reviewers')."</legend>";
 			print "<table class=\"table table-condensed\">\n";
@@ -875,9 +873,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "</table>";
 //		$this->contentContainerEnd();
 
-			print "</div>";
+			$this->columnEnd();
 		}
-		print "<div class=\"span6\">";
+		$this->columnStart(6);
 //		$this->contentContainerStart();
 		print "<legend>".getMLText('approvers')."</legend>";
 		print "<table class=\"table table-condensed\">\n";
@@ -979,31 +977,25 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 		print "</table>\n";
 //		$this->contentContainerEnd();
-		print "</div>";
-		print "</div>";
+		$this->columnEnd();
+		$this->rowEnd();
 
 		if($user->isAdmin() || $user->getId() == $document->getOwner()->getId()) {
-?>
-			<div class="row-fluid">
-<?php
+			$this->rowStart();
 			/* Check for an existing review log, even if the workflowmode
 			 * is set to traditional_only_approval. There may be old documents
 			 * that still have a review log if the workflow mode has been
 			 * changed afterwards.
 			 */
 			if($latestContent->getReviewStatus(10) /*$workflowmode != 'traditional_only_approval'*/) {
-?>
-				<div class="span6">
-				<?php $this->printProtocol($latestContent, 'review'); ?>
-				</div>
-<?php
+				$this->columnStart(6);
+				$this->printProtocol($latestContent, 'review');
+				$this->columnEnd();
 			}
-?>
-				<div class="span6">
-				<?php $this->printProtocol($latestContent, 'approval'); ?>
-				</div>
-			</div>
-<?php
+			$this->columnStart(6);
+			$this->printProtocol($latestContent, 'approval');
+			$this->columnEnd();
+			$this->rowEnd();
 		}
 ?>
 		  </div>
@@ -1021,11 +1013,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 ?>
 		  <div class="tab-pane <?php if($currenttab == 'workflow') echo 'active'; ?>" id="workflow">
 <?php
-			echo "<div class=\"row-fluid\">";
+			$this->rowStart();
 			if($user_is_involved || $user->isAdmin())
-				echo "<div class=\"span6\">";
+				$this->columnStart(6);
 			else
-				echo "<div class=\"span12\">";
+				$this->columnStart(12);
 			$this->contentContainerStart();
 			if($user->isAdmin()) {
 				if(SeedDMS_Core_DMS::checkIfEqual($workflow->getInitState(), $latestContent->getWorkflowState())) {
@@ -1209,15 +1201,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				}
 			}
 			$this->contentContainerEnd();
-			echo "</div>";
+			$this->columnEnd();
 			if($user_is_involved || $user->isAdmin()) {
-				echo "<div class=\"span6\">";
+				$this->columnStart(6);
 ?>
 	<iframe src="out.WorkflowGraph.php?workflow=<?php echo $workflow->getID(); ?><?php if($allowedtransitions) foreach($allowedtransitions as $tr) {echo "&transitions[]=".$tr->getID();} ?>" width="99%" height="661" style="border: 1px solid #AAA;"></iframe>
 <?php
-				echo "</div>";
+				$this->columnEnd();
 			}
-			echo "</div>";
+			$this->rowEnd();
 ?>
 		  </div>
 <?php
@@ -1541,10 +1533,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			$this->contentHeading(getMLText("timeline"));
 			$this->printTimelineHtml(300);
 		}
-?>
-		  </div>
-		</div>
-<?php
+
+		$this->columnEnd();
+		$this->rowEnd();
 		echo $this->callHook('postContent');
 		$this->contentEnd();
 		$this->htmlEndPage();
diff --git a/views/bootstrap/class.WorkflowActionsMgr.php b/views/bootstrap/class.WorkflowActionsMgr.php
index 758673dbe..223f15e2d 100644
--- a/views/bootstrap/class.WorkflowActionsMgr.php
+++ b/views/bootstrap/class.WorkflowActionsMgr.php
@@ -181,10 +181,9 @@ $(document).ready( function() {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 		$this->contentHeading(getMLText("workflow_actions_management"));
+		$this->rowStart();
+		$this->columnStart(4);
 ?>
-
-<div class="row-fluid">
-	<div class="span4">
 		<form class="form-horizontal">
 <?php
 		$options = array();
@@ -206,14 +205,17 @@ $(document).ready( function() {
 		</form>
 	  <div class="ajax" style="margin-bottom: 15px;" data-view="WorkflowActionsMgr" data-action="actionmenu" <?php echo ($selworkflowaction ? "data-query=\"workflowactionid=".$selworkflowaction->getID()."\"" : "") ?>></div>
 		<div class="ajax" data-view="WorkflowActionsMgr" data-action="info" <?php echo ($selworkflowaction ? "data-query=\"workflowactionid=".$selworkflowaction->getID()."\"" : "") ?>></div>
-	</div>
-
-	<div class="span8">
+<?php
+		$this->columnEnd();
+		$this->columnStart(8);
+?>
 		<div class="ajax" data-view="WorkflowActionsMgr" data-action="form" <?php echo ($selworkflowaction ? "data-query=\"workflowactionid=".$selworkflowaction->getID()."\"" : "") ?>></div>
 	</div>
 </div>
 
 <?php
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.WorkflowMgr.php b/views/bootstrap/class.WorkflowMgr.php
index d8b1c0535..68d81819e 100644
--- a/views/bootstrap/class.WorkflowMgr.php
+++ b/views/bootstrap/class.WorkflowMgr.php
@@ -330,10 +330,9 @@ $(document).ready(function() {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 		$this->contentHeading(getMLText("workflow_management"));
+		$this->rowStart();
+		$this->columnStart(5);
 ?>
-
-<div class="row-fluid">
-	<div class="span5">
 		<form class="form-horizontal">
 <?php
 		$options = array();
@@ -354,15 +353,15 @@ $(document).ready(function() {
 ?>
 		</form>
 	  <div class="ajax" style="margin-bottom: 15px;" data-view="WorkflowMgr" data-action="actionmenu" <?php echo ($selworkflow ? "data-query=\"workflowid=".$selworkflow->getID()."\"" : "") ?>></div>
-	  <div class="ajax" data-view="WorkflowMgr" data-action="info" <?php echo ($selworkflow ? "data-query=\"workflowid=".$selworkflow->getID()."\"" : "") ?>></div>
-	</div>
-
-	<div class="span7">
-		<div class="ajax" data-view="WorkflowMgr" data-action="form" <?php echo ($selworkflow ? "data-query=\"workflowid=".$selworkflow->getID()."\"" : "") ?>></div>
-	</div>
-</div>
-
+		<div class="ajax" data-view="WorkflowMgr" data-action="info" <?php echo ($selworkflow ? "data-query=\"workflowid=".$selworkflow->getID()."\"" : "") ?>></div>
 <?php
+		$this->columnEnd();
+		$this->columnStart(7);
+?>
+		<div class="ajax" data-view="WorkflowMgr" data-action="form" <?php echo ($selworkflow ? "data-query=\"workflowid=".$selworkflow->getID()."\"" : "") ?>></div>
+<?php
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.WorkflowStatesMgr.php b/views/bootstrap/class.WorkflowStatesMgr.php
index 04e685890..6b96998fc 100644
--- a/views/bootstrap/class.WorkflowStatesMgr.php
+++ b/views/bootstrap/class.WorkflowStatesMgr.php
@@ -194,10 +194,9 @@ $(document).ready(function() {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 		$this->contentHeading(getMLText("workflow_states_management"));
+		$this->rowStart();
+		$this->columnStart(4);
 ?>
-
-<div class="row-fluid">
-	<div class="span4">
 		<form class="form-horizontal">
 <?php
 		$options = array();
@@ -219,14 +218,17 @@ $(document).ready(function() {
 		</form>
 	  <div class="ajax" style="margin-bottom: 15px;" data-view="WorkflowStatesMgr" data-action="actionmenu" <?php echo ($selworkflowstate ? "data-query=\"workflowstateid=".$selworkflowstate->getID()."\"" : "") ?>></div>
 		<div class="ajax" data-view="WorkflowStatesMgr" data-action="info" <?php echo ($selworkflowstate ? "data-query=\"workflowstateid=".$selworkflowstate->getID()."\"" : "") ?>></div>
-	</div>
-
-	<div class="span8">
+<?php
+		$this->columnEnd();
+		$this->columnStart(8);
+?>
 			<div class="ajax" data-view="WorkflowStatesMgr" data-action="form" <?php echo ($selworkflowstate ? "data-query=\"workflowstateid=".$selworkflowstate->getID()."\"" : "") ?>></div>
 	</div>
 </div>
 
 <?php
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From 63236e7f930654b7c8a84ef3bfb64d1a15ea61b5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Oct 2020 08:34:55 +0200
Subject: [PATCH 187/312] replace old html code

---
 views/bootstrap/class.ViewFolder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index ac6a4f68e..c36799d2b 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -558,7 +558,7 @@ $('body').on('click', '.order-btn', function(ev) {
 	<div class="ajax" data-view="ViewFolder" data-action="navigation" data-no-spinner="true" <?php echo ($folder ? "data-query=\"folderid=".$folder->getID()."\"" : "") ?>></div>
 <?php
 
-		echo "<div class=\"row-fluid\">\n";
+		$this->rowStart();
 
 		// dynamic columns - left column removed if no content and right column then fills span12.
 		if (!($enableFolderTree || $enableClipboard)) {

From 089b74ec38ecd408800fe20a01d284c72395ee07 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Oct 2020 08:51:20 +0200
Subject: [PATCH 188/312] replace html code for rows and columns

---
 views/bootstrap/class.Statistic.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/views/bootstrap/class.Statistic.php b/views/bootstrap/class.Statistic.php
index 7422a42f5..9e330db6a 100644
--- a/views/bootstrap/class.Statistic.php
+++ b/views/bootstrap/class.Statistic.php
@@ -180,8 +180,8 @@ li.folderClass {
 
 <?php
 		$this->contentHeading(getMLText("folders_and_documents_statistic"));
-		echo "<div class=\"row-fluid\">\n";
-		echo "<div class=\"span8\">\n";
+		$this->rowStart();
+		$this->columnStart(8);
 		$this->contentContainerStart();
 
 		print "<ul>\n";
@@ -189,9 +189,8 @@ li.folderClass {
 		print "</ul>\n";
 
 		$this->contentContainerEnd();
-		echo "</div>\n";
-
-		echo "<div class=\"span4\">\n";
+		$this->columnEnd();
+		$this->columnStart(4);
 		$this->contentContainerStart();
 		print "<legend>".getMLText("legend")."</legend>\n";
 		print "<ul class=\"unstyled\">\n";
@@ -212,8 +211,8 @@ li.folderClass {
 		print "</ul>\n";
 
 		$this->contentContainerEnd();
-		echo "</div>\n";
-		echo "</div>\n";
+		$this->columnEnd();
+		$this->rowEnd();
 
 		$this->contentContainerEnd();
 		$this->contentEnd();

From e33a37ca938b90ccde37a9464fe952813307343e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Oct 2020 08:51:37 +0200
Subject: [PATCH 189/312] make remove button btn-danger

---
 views/bootstrap/class.RemoveDocument.php | 2 +-
 views/bootstrap/class.RemoveFolder.php   | 2 +-
 views/bootstrap/class.RemoveLog.php      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.RemoveDocument.php b/views/bootstrap/class.RemoveDocument.php
index ae692667d..26e3cb019 100644
--- a/views/bootstrap/class.RemoveDocument.php
+++ b/views/bootstrap/class.RemoveDocument.php
@@ -52,7 +52,7 @@ class SeedDMS_View_RemoveDocument extends SeedDMS_Bootstrap_Style {
 <p>
 <?php printMLText("confirm_rm_document", array ("documentname" => htmlspecialchars($document->getName())));?>
 </p>
-<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_document");?></button></p>
+<p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("rm_document");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveFolder.php b/views/bootstrap/class.RemoveFolder.php
index ce0ed12b7..b91ec6a33 100644
--- a/views/bootstrap/class.RemoveFolder.php
+++ b/views/bootstrap/class.RemoveFolder.php
@@ -50,7 +50,7 @@ class SeedDMS_View_RemoveFolder extends SeedDMS_Bootstrap_Style {
 	<p>
 	<?php printMLText("confirm_rm_folder", array ("foldername" => htmlspecialchars($folder->getName())));?>
 	</p>
-	<p><button class="btn" type="submit"><i class="fa fa-remove"></i> <?php printMLText("rm_folder");?></button></p>
+	<p><button class="btn btn-danger" type="submit"><i class="fa fa-remove"></i> <?php printMLText("rm_folder");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveLog.php b/views/bootstrap/class.RemoveLog.php
index 96b400a2f..272e02079 100644
--- a/views/bootstrap/class.RemoveLog.php
+++ b/views/bootstrap/class.RemoveLog.php
@@ -54,7 +54,7 @@ class SeedDMS_View_RemoveLog extends SeedDMS_Bootstrap_Style {
 		}
 ?>
 	<p><?php printMLText("confirm_rm_log", array ("logname" => implode(', ', $lognames)));?></p>
-	<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_file");?></button></p>
+	<p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("rm_file");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();

From 6e653050c8b62387286357b62f470368d2bd38da Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Oct 2020 09:05:05 +0200
Subject: [PATCH 190/312] place new SeedDMS_AccessOperation() of document was
 get

---
 out/out.RewindWorkflow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.RewindWorkflow.php b/out/out.RewindWorkflow.php
index b419dfa10..7d3ba11bb 100644
--- a/out/out.RewindWorkflow.php
+++ b/out/out.RewindWorkflow.php
@@ -33,7 +33,6 @@ require_once("inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
 if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
@@ -64,6 +63,7 @@ if (!is_object($workflow)) {
 }
 
 $folder = $document->getFolder();
+$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
 
 if($view) {
 	$view->setParam('folder', $folder);

From ec6e369e4a3a0d79fc7e64c92522867d75244591 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Oct 2020 09:05:33 +0200
Subject: [PATCH 191/312] remove extra closing div

---
 views/bootstrap/class.WorkflowStatesMgr.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/views/bootstrap/class.WorkflowStatesMgr.php b/views/bootstrap/class.WorkflowStatesMgr.php
index 6b96998fc..6b1b42578 100644
--- a/views/bootstrap/class.WorkflowStatesMgr.php
+++ b/views/bootstrap/class.WorkflowStatesMgr.php
@@ -223,9 +223,6 @@ $(document).ready(function() {
 		$this->columnStart(8);
 ?>
 			<div class="ajax" data-view="WorkflowStatesMgr" data-action="form" <?php echo ($selworkflowstate ? "data-query=\"workflowstateid=".$selworkflowstate->getID()."\"" : "") ?>></div>
-	</div>
-</div>
-
 <?php
 		$this->columnEnd();
 		$this->rowEnd();

From 7bd399afda5a92af950667d663657e9ed3ad2ced Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Oct 2020 09:05:46 +0200
Subject: [PATCH 192/312] add icon on button

---
 views/bootstrap/class.RewindWorkflow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.RewindWorkflow.php b/views/bootstrap/class.RewindWorkflow.php
index d1847a979..db32c5131 100644
--- a/views/bootstrap/class.RewindWorkflow.php
+++ b/views/bootstrap/class.RewindWorkflow.php
@@ -73,7 +73,7 @@ class SeedDMS_View_RewindWorkflow extends SeedDMS_Bootstrap_Style {
 	<?php echo createHiddenFieldWithKey('rewindworkflow'); ?>
 	<input type='hidden' name='documentid' value='<?php echo $document->getId(); ?>'/>
 	<input type='hidden' name='version' value='<?php echo $latestContent->getVersion(); ?>'/>
-	<input type='submit' class="btn" value='<?php printMLText("rewind_workflow"); ?>'/>
+	<button type='submit' class="btn"><i class="fa fa-refresh"></i> <?php printMLText("rewind_workflow"); ?></button>
 	</form>
 <?php
 		$this->columnEnd();

From 68a46bb78d9211c9b271ad19739b59a269e8e53e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Oct 2020 09:07:40 +0200
Subject: [PATCH 193/312] make buttons primary or danger

---
 views/bootstrap/class.DefaultKeywords.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.DefaultKeywords.php b/views/bootstrap/class.DefaultKeywords.php
index e91a025ee..6b42ff0c0 100644
--- a/views/bootstrap/class.DefaultKeywords.php
+++ b/views/bootstrap/class.DefaultKeywords.php
@@ -128,7 +128,7 @@ $(document).ready( function() {
 						<?php echo createHiddenFieldWithKey('removecategory'); ?>
 						<input type="hidden" name="categoryid" value="<?php echo $selcategoryid?>">
 						<input type="hidden" name="action" value="removecategory">
-						<button class="btn" type="submit"><i class="fa fa-remove"></i> <?php echo getMLText("rm_default_keyword_category")?></button>
+						<button class="btn btn-danger" type="submit"><i class="fa fa-remove"></i> <?php echo getMLText("rm_default_keyword_category")?></button>
 						</form>
 <?php
 		}
@@ -175,7 +175,7 @@ $(document).ready( function() {
 							<input type="hidden" name="action" value="editcategory">
 							<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
 							<input name="name" class="name" type="text" value="<?php echo htmlspecialchars($category->getName()) ?>">
-							<button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText("save");?></button>
+							<button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> <?php printMLText("save");?></button>
 						</form>
 					</div>
 				</div>
@@ -196,7 +196,7 @@ $(document).ready( function() {
 									<input type="Hidden" name="keywordsid" value="<?php echo $list["id"]?>">
 									<input type="Hidden" name="action" value="editkeywords">
 									<input name="keywords" class="keywords" type="text" value="<?php echo htmlspecialchars($list["keywords"]) ?>">
-									<button class="btn" title="<?php echo getMLText("save")?>"><i class="fa fa-save"></i> <?php echo getMLText("save")?></button>
+									<button class="btn btn-primary" title="<?php echo getMLText("save")?>"><i class="fa fa-save"></i> <?php echo getMLText("save")?></button>
 									<!--	 <input name="action" value="removekeywords" type="Image" src="images/del.gif" title="<?php echo getMLText("delete")?>" border="0"> &nbsp; -->
 									</form>
 									<form style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php" >
@@ -204,7 +204,7 @@ $(document).ready( function() {
 									<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
 									<input type="hidden" name="keywordsid" value="<?php echo $list["id"]?>">
 									<input type="hidden" name="action" value="removekeywords">
-									<button class="btn" title="<?php echo getMLText("delete")?>"><i class="fa fa-remove"></i> <?php echo getMLText("delete")?></button>
+									<button class="btn btn-danger" title="<?php echo getMLText("delete")?>"><i class="fa fa-remove"></i> <?php echo getMLText("delete")?></button>
 									</form>
 									<br>
 						<?php }  ?>

From a72e974db2bae6fcf68159397b44b12cc05dbc69 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Oct 2020 09:08:33 +0200
Subject: [PATCH 194/312] add class btn-danger to removal buttons

---
 views/bootstrap/class.Categories.php | 2 +-
 views/bootstrap/class.ClearCache.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Categories.php b/views/bootstrap/class.Categories.php
index bbe4de8a5..944414678 100644
--- a/views/bootstrap/class.Categories.php
+++ b/views/bootstrap/class.Categories.php
@@ -97,7 +97,7 @@ $(document).ready( function() {
 						<?php echo createHiddenFieldWithKey('removecategory'); ?>
 						<input type="hidden" name="categoryid" value="<?php echo $selcat->getID()?>">
 						<input type="hidden" name="action" value="removecategory">
-						<button class="btn" type="submit"><i class="fa fa-remove"></i> <?php echo getMLText("rm_document_category")?></button>
+						<button class="btn btn-danger" type="submit"><i class="fa fa-remove"></i> <?php echo getMLText("rm_document_category")?></button>
 						</form>
 <?php
 		}
diff --git a/views/bootstrap/class.ClearCache.php b/views/bootstrap/class.ClearCache.php
index 3699c04ce..69ef1972e 100644
--- a/views/bootstrap/class.ClearCache.php
+++ b/views/bootstrap/class.ClearCache.php
@@ -61,7 +61,7 @@ class SeedDMS_View_ClearCache extends SeedDMS_Bootstrap_Style {
 				echo "<p><input type=\"checkbox\" name=\"".$c[0]."\" value=\"1\" checked> ".$c[1]."</p>";
 		}
 ?>
-<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("clear_cache");?></button></p>
+<p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("clear_cache");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();

From 31e55a500e9cee3dd42fa0efe13b1c9012b3a01a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Oct 2020 09:17:23 +0200
Subject: [PATCH 195/312] add class btn-danger for removal buttons

---
 views/bootstrap/class.RemoveWorkflow.php      | 2 +-
 views/bootstrap/class.UserDefaultKeywords.php | 4 ++--
 views/bootstrap/class.WorkflowMgr.php         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.RemoveWorkflow.php b/views/bootstrap/class.RemoveWorkflow.php
index d41e91ab2..8caa4726e 100644
--- a/views/bootstrap/class.RemoveWorkflow.php
+++ b/views/bootstrap/class.RemoveWorkflow.php
@@ -50,7 +50,7 @@ class SeedDMS_View_RemoveWorkflow extends SeedDMS_Bootstrap_Style {
 	<form method="post" action="../op/op.RemoveWorkflow.php" name="form1">
 	<?php echo createHiddenFieldWithKey('removeworkflow'); ?>
 	<input type='hidden' name='workflowid' value='<?php echo $workflow->getId(); ?>'/>
-	<button type='submit' class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_workflow"); ?></button>
+	<button type='submit' class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("rm_workflow"); ?></button>
 	</form>
 <?php
 		$this->columnEnd();
diff --git a/views/bootstrap/class.UserDefaultKeywords.php b/views/bootstrap/class.UserDefaultKeywords.php
index 5bfad7e96..86319c4f4 100644
--- a/views/bootstrap/class.UserDefaultKeywords.php
+++ b/views/bootstrap/class.UserDefaultKeywords.php
@@ -139,7 +139,7 @@ $(document).ready(function() {
 					<?php echo createHiddenFieldWithKey('removecategory'); ?>
 						<input type="hidden" name="action" value="removecategory">
 						<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
-						<button type="submit" class="btn" title="<?php echo getMLText("delete")?>"><i class="fa fa-remove"></i> <?php printMLText("rm_default_keyword_category");?></button>
+						<button type="submit" class="btn btn-danger" title="<?php echo getMLText("delete")?>"><i class="fa fa-remove"></i> <?php printMLText("rm_default_keyword_category");?></button>
 					</form>
 				</div>
 
@@ -177,7 +177,7 @@ $(document).ready(function() {
 									<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
 									<input type="hidden" name="keywordsid" value="<?php echo $list["id"]?>">
 									<input type="hidden" name="action" value="removekeywords">
-									<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("delete")?></button>
+									<button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("delete")?></button>
 									</form>
 									<br>
 						<?php }  ?>
diff --git a/views/bootstrap/class.WorkflowMgr.php b/views/bootstrap/class.WorkflowMgr.php
index 68d81819e..81944a424 100644
--- a/views/bootstrap/class.WorkflowMgr.php
+++ b/views/bootstrap/class.WorkflowMgr.php
@@ -247,7 +247,7 @@ $(document).ready(function() {
   <?php echo createHiddenFieldWithKey('removetransitionfromworkflow'); ?>
 	<input type="hidden" name="workflow" value="<?php print $workflow->getID();?>">
 	<input type="hidden" name="transition" value="<?php print $transition->getID(); ?>">
-	<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("delete");?></button>
+	<button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("delete");?></button>
 </form>
 <?php
 				echo "</td>";

From b67a7379ae60aaafa08e09c1d54bdf3b5a640402 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Oct 2020 19:49:03 +0200
Subject: [PATCH 196/312] update some packages

---
 package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 8378da1e4..4084e288c 100644
--- a/package.json
+++ b/package.json
@@ -9,12 +9,12 @@
   "author": "Uwe Steinmann",
   "license": "ISC",
   "dependencies": {
-    "@coreui/coreui": "^3.2.2",
-    "@popperjs/core": "^2.4.4",
+    "@coreui/coreui": "^3.3.0",
+    "@popperjs/core": "^2.5.3",
     "bootstrap": "^4.5.2",
     "bootstrap-datepicker": "^1.9.0",
     "chartjs": "^0.3.24",
-    "cytoscape": "^3.15.2",
+    "cytoscape": "^3.16.2",
     "cytoscape-grid-guide": "^2.3.2",
     "fine-uploader": "^5.16.2",
     "flot": "^4.2.1",
@@ -23,10 +23,10 @@
     "grunt": "^1.3.0",
     "grunt-contrib-clean": "^2.0.0",
     "grunt-contrib-copy": "^1.0.0",
-    "jqtree": "^1.4.12",
+    "jqtree": "^1.5.1",
     "jquery": "^1.12.4",
     "jquery-validation": "^1.19.2",
-    "moment": "^2.17.1",
+    "moment": "^2.29.1",
     "noty": "^2.4.1",
     "perfect-scrollbar": "^1.5.0",
     "select2": "^4.0.13"

From d35d8153767923aaf8a702f8c75b13e69b4e0e14 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Oct 2020 19:49:22 +0200
Subject: [PATCH 197/312] set missing attributes of tree nodes to make
 drag&drop work again

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 7b5261b5b..c537cab00 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1932,7 +1932,7 @@ $(function() {
     onCreateLi: function(node, $li) {
         // Add 'icon' span before title
 				if(node.is_folder)
-					$li.find('.jqtree-title').before('<i class="fa fa-folder-o table-row-folder droptarget" data-droptarget="folder_' + node.id + '" rel="folder_' + node.id + '"></i> ').attr('rel', 'folder_' + node.id).attr('formtoken', '<?php echo createFormKey(''); ?>').attr('data-uploadformtoken', '<?php echo createFormKey(''); ?>');
+					$li.find('.jqtree-title').before('<i class="fa fa-folder-o table-row-folder droptarget" data-droptarget="folder_' + node.id + '" rel="folder_' + node.id + '"></i> ').attr('data-name', node.name).attr('rel', 'folder_' + node.id).attr('formtoken', '<?php echo createFormKey(''); ?>').attr('data-uploadformtoken', '<?php echo createFormKey(''); ?>').attr('data-droptarget', 'folder_' + node.id).addClass('droptarget');
 				else
 					$li.find('.jqtree-title').before('<i class="fa fa-file"></i> ');
     }

From 33b1e1f65fcb06f817b96c19916c28a1c2ae683f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Oct 2020 21:35:46 +0200
Subject: [PATCH 198/312] fix js error after upgrade to cytoscrape.js 3.x

---
 views/bootstrap/class.WorkflowGraph.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.WorkflowGraph.php b/views/bootstrap/class.WorkflowGraph.php
index 5c723c6d2..accaeaaa3 100644
--- a/views/bootstrap/class.WorkflowGraph.php
+++ b/views/bootstrap/class.WorkflowGraph.php
@@ -150,7 +150,7 @@ cy.on('free', 'node', function(evt) {
 });
 
 cy.on('tap', 'node', function(evt) {
-	var node = evt.cyTarget;
+	var node = evt.target;
 	var scratch = node.scratch('app');
 	if(typeof scratch !== 'undefined') {
 	noty({
@@ -217,12 +217,12 @@ $(document).ready(function() {
 					$transusers = $transition->getUsers();
 					$unames = array();
 					foreach($transusers as $transuser) {
-						$unames[] = $transuser->getUser()->getLogin().' - '.$transuser->getUser()->getFullName();
+						$unames[] = htmlspecialchars($transuser->getUser()->getLogin().' - '.$transuser->getUser()->getFullName());
 					}
 					$transgroups = $transition->getGroups();
 					$gnames = array();
 					foreach($transgroups as $transgroup) {
-						$gnames[] = $transgroup->getGroup()->getName();
+						$gnames[] = htmlspecialchars($transgroup->getGroup()->getName());
 					}
 					echo "cy.add({
 						data: {

From 5f8879a8e5b36a2307c840ff27875261c2d7b4c2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Oct 2020 21:58:20 +0200
Subject: [PATCH 199/312] new conf variable for workflows in extensions

---
 views/bootstrap/class.Settings.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index c1e9cd71a..2abc030b7 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -598,6 +598,23 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
 											printMLText('no_attribute_definitions');
 										}
 										break;
+									case "workflows":
+										$recs = $dms->getAllWorkflows();
+										if($recs) {
+											echo "<select class=\"chzn-select\"".($allowempty ? " data-allow-clear=\"true\"" : "")."\" name=\"extensions[".$extname."][".$confkey."][]\"".(!empty($conf['multiple']) ? "  multiple" : "").(!empty($conf['size']) ? "  size=\"".$conf['size']."\"" : "")." data-placeholder=\"".getMLText("select_attribute_value")."\">";
+											if($allowempty)
+												echo "<option value=\"\"></option>";
+											foreach($recs as $rec) {
+												echo "<option value=\"".$rec->getID()."\"";
+												if(in_array($rec->getID(), $selections))
+													echo " selected";
+												echo ">".htmlspecialchars($rec->getName())."</option>";
+											}
+											echo "</select>";
+										} else {
+											printMLText('no_workflows');
+										}
+										break;
 									case "folders":
 										$this->formField(null, $this->getFolderChooserHtml("form".$extname.$confkey, M_READ, -1, $selections ? $dms->getFolder($selections[0]) : 0, 'extensions['.$extname."][".$confkey."]"));
 										break;

From 8c78c474433d7717f0b860032f079f851c77ec09 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Oct 2020 21:59:26 +0200
Subject: [PATCH 200/312] add entry for 5.1.21

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 50f65712b..7816b1bfd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
 - do offer to export users of group if there are no users
 - config file can be set in env var SEEDDMS_CONFIG_FILE
 - fix error when search for a boolean attribute value
+- extension may contain a conf varіable to select a workflow
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.20

From 8198fd333fce6e2697d1b9e59399b3be878d9d87 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Oct 2020 22:13:33 +0200
Subject: [PATCH 201/312] replace btn-default by btn-secondary

---
 views/bootstrap/class.Bootstrap.php     | 2 +-
 views/bootstrap/class.Search.php        | 4 ++--
 views/bootstrap/class.ViewFolder.php    | 4 ++--
 views/bootstrap/class.WorkflowGraph.php | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index c537cab00..5dca1131e 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1120,7 +1120,7 @@ $(document).ready(function() {
 		<div id="'.$id.'-upload-file" class="upload-file">
 			<div class="input-append">
 				<input type="text" class="form-control" readonly>
-				<span class="btn btn-default btn-file">
+				<span class="btn btn-secondary btn-file">
 					'.getMLText("browse").'&hellip; <input id="'.$id.'" type="file" name="'.$varname.'"'.($multiple ? " multiple" : "").($accept ? ' accept="'.$accept.'"' : "").'>
 				</span>
 			</div>
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 465949567..2d8bdf61f 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -608,7 +608,7 @@ foreach($facets as $facetname=>$values) {
 						$extracontent = array();
 						$extracontent['below_title'] = $belowtitle;
 						if($attrstr)
-							$extracontent['bottom_title'] = '<br />'.$this->printPopupBox('<span class="btn btn-mini btn-default">'.getMLText('attributes').'</span>', $attrstr, true);
+							$extracontent['bottom_title'] = '<br />'.$this->printPopupBox('<span class="btn btn-mini btn-secondary">'.getMLText('attributes').'</span>', $attrstr, true);
 						print $this->documentListRow($document, $previewer, false, 0, $extracontent);
 					}
 				} elseif($entry->isType('folder')) {
@@ -633,7 +633,7 @@ foreach($facets as $facetname=>$values) {
 					}
 					$extracontent = array();
 					if($attrstr)
-						$extracontent['bottom_title'] = '<br />'.$this->printPopupBox('<span class="btn btn-mini btn-default">'.getMLText('attributes').'</span>', $attrstr, true);
+						$extracontent['bottom_title'] = '<br />'.$this->printPopupBox('<span class="btn btn-mini btn-secondary">'.getMLText('attributes').'</span>', $attrstr, true);
 					print $this->folderListRow($folder, false, $extracontent);
 				}
 			}
diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index c36799d2b..b3dd1628e 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -356,7 +356,7 @@ $('body').on('click', '.order-btn', function(ev) {
 			else {
 				print "<table id=\"viewfolder-table\" class=\"table table-condensed table-hover\">";
 				print "<thead>\n<tr>\n";
-				print "<th>".($parent ? '<button class="btn btn-mini btn-default" id="goto-parent" data-parentid="'.$parent->getID().'"><i class="fa fa-arrow-up"></i></button>' : '')."</th>\n";	
+				print "<th>".($parent ? '<button class="btn btn-mini btn-secondary" id="goto-parent" data-parentid="'.$parent->getID().'"><i class="fa fa-arrow-up"></i></button>' : '')."</th>\n";	
 				print "<th>".getMLText("name");
 				print " <a class=\"order-btn\" href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="n"||$orderby=="na"?"&orderby=nd":"&orderby=n")."\" data-orderby=\"".($orderby=="n"||$orderby=="na"?"nd":"n")."\"title=\"".getMLText("sort_by_name")."\">".($orderby=="n"||$orderby=="na"?' <i class="fa fa-sort-alpha-asc selected"></i>':($orderby=="nd"?' <i class="fa fa-sort-alpha-desc selected"></i>':' <i class="fa fa-sort-alpha-asc"></i>'))."</a>";
 				print " <a class=\"order-btn\" href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="s"||$orderby=="sa"?"&orderby=sd":"&orderby=s")."\" data-orderby=\"".($orderby=="s"||$orderby=="sa"?"sd":"s")."\" title=\"".getMLText("sort_by_sequence")."\">".($orderby=="s"||$orderby=="sa"?' <i class="fa fa-sort-numeric-asc selected"></i>':($orderby=="sd"?' <i class="fa fa-sort-numeric-desc selected"></i>':' <i class="fa fa-sort-numeric-asc"></i>'))."</a>";
@@ -409,7 +409,7 @@ $('body').on('click', '.order-btn', function(ev) {
 				echo "</tbody>\n</table>\n";
 
 			if($maxItemsPerPage && $i > $maxItemsPerPage)
-				echo "<button id=\"loadmore\" style=\"width: 100%; margin-bottom: 20px;\" class=\"btn btn-default\" data-folder=\"".$folder->getId()."\"data-offset=\"".$maxItemsPerPage."\" data-limit=\"".$incItemsPerPage."\" data-all=\"".($i-$maxItemsPerPage)."\">".getMLText('x_more_objects', array('number'=>($i-$maxItemsPerPage)))."</button>";
+				echo "<button id=\"loadmore\" style=\"width: 100%; margin-bottom: 20px;\" class=\"btn btn-secondary\" data-folder=\"".$folder->getId()."\"data-offset=\"".$maxItemsPerPage."\" data-limit=\"".$incItemsPerPage."\" data-all=\"".($i-$maxItemsPerPage)."\">".getMLText('x_more_objects', array('number'=>($i-$maxItemsPerPage)))."</button>";
 		}
 		else printMLText("empty_folder_list");
 
diff --git a/views/bootstrap/class.WorkflowGraph.php b/views/bootstrap/class.WorkflowGraph.php
index accaeaaa3..9c4c7fba3 100644
--- a/views/bootstrap/class.WorkflowGraph.php
+++ b/views/bootstrap/class.WorkflowGraph.php
@@ -342,7 +342,7 @@ div.buttons #zoom {margin: 3px; _float: right;}
 		<i class="fa fa-sign-blank workflow-action"></i> <?php echo printMLText('global_workflow_actions'); ?>
 	</div>
 	<div class="buttons">
-		<div id="zoom"><button class="btn btn-mini btn-default">Zoom</button></div>
+		<div id="zoom"><button class="btn btn-mini btn-secondary">Zoom</button></div>
 		<button class="btn btn-mini" id="setlayout" data-layout="cose"><?php printMLText('redraw'); ?></button>
 	</div>
 </div>

From d08f6fe24c5456b4a4a0e75f6c06c22fa4e5c4a5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Oct 2020 22:25:51 +0200
Subject: [PATCH 202/312] set button type which didn't have

---
 views/bootstrap/class.ViewDocument.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 57eb0e776..d3f364f71 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -845,7 +845,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print htmlspecialchars($r["comment"]);
 					if($r['file']) {
 						echo "<br />";
-						echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$r['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
+						echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$r['reviewLogID']."\" class=\"btn btn-secondary btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
 					}
 					print "</td>\n";
 						print "<td>";
@@ -947,7 +947,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print htmlspecialchars($a["comment"]);
 					if($a['file']) {
 						echo "<br />";
-						echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
+						echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogID']."\" class=\"btn btn-secondary btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
 					}
 					echo "</td>\n";
 						print "<td>";
@@ -1021,9 +1021,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			$this->contentContainerStart();
 			if($user->isAdmin()) {
 				if(SeedDMS_Core_DMS::checkIfEqual($workflow->getInitState(), $latestContent->getWorkflowState())) {
-					print "<form action=\"../out/out.RemoveWorkflowFromDocument.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn\"><i class=\"fa fa-remove\"></i> ".getMLText('rm_workflow')."</button></form>";
+					print "<form action=\"../out/out.RemoveWorkflowFromDocument.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn btn-danger\"><i class=\"fa fa-remove\"></i> ".getMLText('rm_workflow')."</button></form>";
 				} else {
-					print "<form action=\"../out/out.RewindWorkflow.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn\"><i class=\"fa fa-refresh\"></i> ".getMLText('rewind_workflow')."</button></form>";
+					print "<form action=\"../out/out.RewindWorkflow.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn btn-danger\"><i class=\"fa fa-refresh\"></i> ".getMLText('rewind_workflow')."</button></form>";
 				}
 			}
 
@@ -1123,7 +1123,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				echo "<td>";
 				if($latestContent->triggerWorkflowTransitionIsAllowed($user, $transition)) {
 					$action = $transition->getAction();
-					print "<form action=\"../out/out.TriggerWorkflow.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><input type=\"hidden\" name=\"transition\" value=\"".$transition->getID()."\" /><input type=\"submit\" class=\"btn\" value=\"".getMLText('action_'.strtolower($action->getName()), array(), htmlspecialchars($action->getName()))."\" /></form>";
+					print "<form action=\"../out/out.TriggerWorkflow.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><input type=\"hidden\" name=\"transition\" value=\"".$transition->getID()."\" /><input type=\"submit\" class=\"btn btn-primary\" value=\"".getMLText('action_'.strtolower($action->getName()), array(), htmlspecialchars($action->getName()))."\" /></form>";
 					$allowedtransitions[] = $transition;
 				}
 				echo "</td>";
@@ -1149,7 +1149,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					}
 					echo "</select>";
 					echo "<label class=\"inline\">";
-					echo "<input type=\"submit\" class=\"btn\" value=\"".getMLText('run_subworkflow')."\" />";
+					echo "<input type=\"submit\" class=\"btn btn-primary\" value=\"".getMLText('run_subworkflow')."\" />";
 					echo "</lable>";
 					echo "</form>";
 				}
@@ -1175,7 +1175,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						if($workflow->getInitState()->getID() == $latestContent->getWorkflowState()->getID()) {
 							echo "Initial state of sub workflow has not been left. Return to parent workflow is possible<br />";
 							echo "<form action=\"../out/out.ReturnFromSubWorkflow.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" />";
-							echo "<input type=\"submit\" class=\"btn\" value=\"".getMLText('return_from_subworkflow')."\" />";
+							echo "<input type=\"submit\" class=\"btn btn-primary\" value=\"".getMLText('return_from_subworkflow')."\" />";
 							echo "</form>";
 						} else {
 							/* Get a transition from the last state in the parent workflow
@@ -1190,7 +1190,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 									if($latestContent->triggerWorkflowTransitionIsAllowed($user, $transition)) {
 										echo "Triggering transition is allowed<br />";
 										echo "<form action=\"../out/out.ReturnFromSubWorkflow.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><input type=\"hidden\" name=\"transition\" value=\"".$transition->getID()."\" />";
-										echo "<input type=\"submit\" class=\"btn\" value=\"".getMLText('return_from_subworkflow')."\" />";
+										echo "<input type=\"submit\" class=\"btn btn-primary\" value=\"".getMLText('return_from_subworkflow')."\" />";
 										echo "</form>";
 
 									}
@@ -1444,7 +1444,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
 					print "<br />".getMLText("document_link_public").": ".(($link->isPublic()) ? getMLText("yes") : getMLText("no"));
 				if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
-					print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button></form>";
+					print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-danger btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button></form>";
 				print "</span></td>";
 				echo $this->documentListRowEnd($targetDoc);
 			}
@@ -1509,7 +1509,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print getMLText("document_link_by")." ".htmlspecialchars($responsibleUser->getFullName());
 				if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
 					print "<br />".getMLText("document_link_public").": ".(($link->isPublic()) ? getMLText("yes") : getMLText("no"));
-					print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$sourceDoc->getId()."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button></form>";
+					print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$sourceDoc->getId()."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-danger btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button></form>";
 				print "</span></td>";
 				echo $this->documentListRowEnd($sourceDoc);
 			}

From feb0b2a6f1fb30c257e914c1f2e215f0006b0ca0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Oct 2020 22:28:55 +0200
Subject: [PATCH 203/312] set btn-danger

---
 views/bootstrap/class.Calendar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Calendar.php b/views/bootstrap/class.Calendar.php
index c0be2b256..42d2a7b60 100644
--- a/views/bootstrap/class.Calendar.php
+++ b/views/bootstrap/class.Calendar.php
@@ -112,7 +112,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style {
   <?php echo createHiddenFieldWithKey('removeevent'); ?>
 	<input type="hidden" name="eventid" value="<?php echo intval($event["id"]); ?>">
 	<p><?php printMLText("confirm_rm_event", array ("name" => htmlspecialchars($event["name"])));?></p>
-	<button class="btn" type="submit"><i class="fa fa-remove"></i> <?php printMLText("delete");?></button>
+	<button class="btn btn-danger" type="submit"><i class="fa fa-remove"></i> <?php printMLText("delete");?></button>
 </form>
 <?php
 			$this->contentContainerEnd();

From f9bcb9492513fc2e300c42de94d0dad5941427d0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 15 Oct 2020 10:51:02 +0200
Subject: [PATCH 204/312] add i.warning, remove some bs-docs-sidenav

---
 styles/bootstrap/application.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css
index 87b864374..acdbb6dd3 100644
--- a/styles/bootstrap/application.css
+++ b/styles/bootstrap/application.css
@@ -217,7 +217,7 @@ ul.jqtree-tree li.jqtree_common > .jqtree-element:hover {
 
 i.success {color: #00b000;}
 i.error {color: #b00000;}
-
+i.warning {color: #ff9900;}
 i.initstate {color: #ff9900;}
 i.released {color: #00b000;}
 i.rejected {color: #b00000;}

From 4f9f5cb3a9d1a7843da9ec9a05f4b0a3b12f9701 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 15 Oct 2020 13:30:34 +0200
Subject: [PATCH 205/312] check if metadata is set before using it

---
 op/op.ImportFS.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.ImportFS.php b/op/op.ImportFS.php
index 73afdeed4..19cf01aea 100644
--- a/op/op.ImportFS.php
+++ b/op/op.ImportFS.php
@@ -174,10 +174,10 @@ function import_folder($dirname, $folder, $setfiledate, $setfolderdate, $metadat
 
 				echo $mimetype." - ".$filetype." - ".$path."<br />\n";
 				if($res = $folder->addDocument($docname, $comment, $expires, $owner, $keywords,
-																		$metadata[$path]['category'], $filetmp, $name,
+																		!empty($metadata[$path]['category']) ? $metadata[$path]['category'] : array(), $filetmp, $name,
 																		$filetype, $mimetype, $sequence, $reviewers,
 																		$approvers, $reqversion, $version_comment,
-																	 	$metadata[$path]['attributes'])) {
+																	 	!empty($metadata[$path]['attributes']) ? $metadata[$path]['attributes'] : array())) {
 					$doccount++;
 					if($setfiledate) {
 						$newdoc = $res[0];

From 2bac73f4c89b096b2db1872b74c73f182188a8df Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 15 Oct 2020 15:34:15 +0200
Subject: [PATCH 206/312] set max_execution_time only if not php-cli

---
 inc/inc.Settings.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/inc/inc.Settings.php b/inc/inc.Settings.php
index 0531a16d6..1f0e7b692 100644
--- a/inc/inc.Settings.php
+++ b/inc/inc.Settings.php
@@ -35,8 +35,11 @@ if(isset($settings->_extraPath))
 /* composer is installed in pear directory */
 require_once 'vendor/autoload.php';
 
-if(isset($settings->_maxExecutionTime))
-	ini_set('max_execution_time', $settings->_maxExecutionTime);
+if(isset($settings->_maxExecutionTime)) {
+	if (php_sapi_name() !== "cli") {
+		ini_set('max_execution_time', $settings->_maxExecutionTime);
+	}
+}
 
 if (get_magic_quotes_gpc()) {
 	$process = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);

From 57ed04eaa55b30a813765048833b500c4c735bf9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 16 Oct 2020 15:57:29 +0200
Subject: [PATCH 207/312] add item for 5.1.21

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 7816b1bfd..78059e8ed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
 - config file can be set in env var SEEDDMS_CONFIG_FILE
 - fix error when search for a boolean attribute value
 - extension may contain a conf varіable to select a workflow
+- do not set max_execution_time for scripts run by php-cli
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.20

From defa988e62a1278dcf9611607dcfb97b7a5bd139 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Oct 2020 09:25:35 +0200
Subject: [PATCH 208/312] backport from 6.0.x

---
 Gruntfile.js | 90 ++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 73 insertions(+), 17 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 1beeb3cc4..e1015ea84 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -173,36 +173,50 @@ module.exports = function (grunt) {
 								],
 								dest: bootstrapDir + '/bootstrap-datepicker/locales',
 								flatten: true
-						},{
-								expand: true,
-								src: [
-										nodeDir + '/@coreui/coreui/dist/js/*'
-								],
-								dest: bootstrapDir + '/coreui/js',
-								flatten: true
-						},{
-								expand: true,
-								src: [
-										nodeDir + '/@coreui/coreui/dist/css/*'
-								],
-								dest: bootstrapDir + '/coreui/css',
-								flatten: true
 						}]
 					},
-					'coreui': {
+					'tdk': {
 						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/jquery/dist/*'
+								],
+								dest: tdkDir + '/jquery',
+								flatten: true
+						}, {
 								expand: true,
 								src: [
 										nodeDir + '/@coreui/coreui/dist/js/*'
 								],
-								dest: tdkDir + '/coreui/js',
+								dest: tdkDir + '/@coreui/coreui/js',
 								flatten: true
 						},{
 								expand: true,
 								src: [
 										nodeDir + '/@coreui/coreui/dist/css/*'
 								],
-								dest: tdkDir + '/coreui/css',
+								dest: tdkDir + '/@coreui/coreui/css',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/@coreui/icons/css/*'
+								],
+								dest: tdkDir + '/@coreui/icons/css',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/@coreui/icons/fonts/*'
+								],
+								dest: tdkDir + '/@coreui/icons/fonts',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/popper.js/dist/esm/*'
+								],
+								dest: tdkDir + '/popper.js',
 								flatten: true
 						},{
 								expand: true,
@@ -239,6 +253,48 @@ module.exports = function (grunt) {
 								],
 								dest: tdkDir + '/font-awesome/css',
 								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/pace-progressbar/index.js'
+								],
+								dest: tdkDir + '/pace-progressbar',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/pace-progressbar/themes/*'
+								],
+								dest: tdkDir + '/pace-progressbar/themes',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/pace-progressbar/templates/*'
+								],
+								dest: tdkDir + '/pace-progressbar/templates',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/flag-icon-css/css/*'
+								],
+								dest: tdkDir + '/flag-icon-css/css',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/simple-line-icons/dist/fonts/*'
+								],
+								dest: tdkDir + '/simple-line-icons/fonts',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/simple-line-icons/dist/styles/*'
+								],
+								dest: tdkDir + '/simple-line-icons/css',
+								flatten: true
 						}]
 					},
 				}

From 693af89d9a389af04098d8f4af1bdfc5f911f461 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Oct 2020 09:36:43 +0200
Subject: [PATCH 209/312] allow to select views added to tar.gz

---
 Makefile | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index cedfde6e9..11de07b63 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION=$(shell php -r 'include("inc/inc.Version.php"); $$v=new SeedDMS_Version(); echo $$v->version();')
-SRC=CHANGELOG inc conf utils index.php .htaccess languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer
-# webapp
+SRC=CHANGELOG inc conf utils index.php .htaccess languages op out controllers doc TODO LICENSE webdav install restapi pdfviewer
+VIEWS ?= bootstrap
 
-NODISTFILES=utils/importmail.php utils/seedddms-importmail utils/remote-email-upload utils/remote-upload utils/da-bv-reminder.php utils/seeddms-da-bv-reminder .svn .gitignore styles/blue styles/hc styles/clean views/blue views/hc views/clean views/pca views/tdk
+NODISTFILES=utils/importmail.php utils/seedddms-importmail utils/remote-email-upload utils/remote-upload utils/da-bv-reminder.php utils/seeddms-da-bv-reminder .svn .gitignore
 
 EXTENSIONS := \
 	dynamic_content.tar.gz\
@@ -15,8 +15,18 @@ PHPDOC=~/Downloads/phpDocumentor.phar
 dist:
 	mkdir -p tmp/seeddms-$(VERSION)
 	cp -a $(SRC) tmp/seeddms-$(VERSION)
+	mkdir -p tmp/seeddms-$(VERSION)/views
+	mkdir -p tmp/seeddms-$(VERSION)/styles
+	for view in $(VIEWS) ; do \
+		if [ -d "views/$$view" ] ; then \
+			cp -a views/$$view tmp/seeddms-$(VERSION)/views ; \
+		fi ; \
+		if [ -d "styles/$$view" ] ; then \
+			cp -a styles/$$view tmp/seeddms-$(VERSION)/styles ; \
+		fi ; \
+	done
 	(cd tmp/seeddms-$(VERSION); rm -rf $(NODISTFILES); mv conf conf.template)
-	(cd tmp;  tar --exclude=.svn --exclude=.gitignore --exclude=views/blue --exclude=views/hc --exclude=views/clean --exclude=styles/blue --exclude=styles/hc --exclude=styles/clean -czvf ../seeddms-$(VERSION).tar.gz seeddms-$(VERSION))
+	(cd tmp;  tar --exclude=.svn --exclude=.gitignore -czvf ../seeddms-$(VERSION).tar.gz seeddms-$(VERSION))
 	rm -rf tmp
 
 pear:

From 16175182826951a8d97c37c202f1cb4068790dca Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Oct 2020 21:49:48 +0200
Subject: [PATCH 210/312] show debug menu only if debug mode is on

---
 CHANGELOG                           | 1 +
 views/bootstrap/class.Bootstrap.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 11a9e55d4..ff78183de 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 --------------------------------------------------------------------------------
                      Changes in version 6.0.14
 --------------------------------------------------------------------------------
+- show debug menu only if debug mode is on
 - merge changes up to 5.1.21
 - document links can be added by regular users again
 
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index e6cb25bd5..d61e3c8c0 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -916,7 +916,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$menuitems['misc']['children']['version_info'] = array('link'=>"../out/out.Info.php", 'label'=>'version_info');
 		}
 
-		if($accessobject->check_view_access(array('Hooks'))) {
+		if ($settings->_enableDebugMode) {
 		$menuitems['debug'] = array('link'=>"#", 'label'=>'debug');
 		if ($accessobject->check_view_access('Hooks'))
 		$menuitems['debug']['children']['hooks'] = array('link'=>"../out/out.Hooks.php", 'label'=>'list_hooks');

From 27d85cd1562a31b45ea5d88fac0d06b1901df5b7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Oct 2020 07:39:09 +0200
Subject: [PATCH 211/312] add link to document/folder details in list row when
 onepage mode is on

---
 CHANGELOG                           | 5 +++--
 views/bootstrap/class.Bootstrap.php | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 78059e8ed..e5999118c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,11 +2,12 @@
                      Changes in version 5.1.21
 --------------------------------------------------------------------------------
 - new api to fulltext search
-- do offer to export users of group if there are no users
+- do not offer to export users of group if there are no users
 - config file can be set in env var SEEDDMS_CONFIG_FILE
-- fix error when search for a boolean attribute value
+- fix error when searching for a boolean attribute value
 - extension may contain a conf varіable to select a workflow
 - do not set max_execution_time for scripts run by php-cli
+- add link to document/folder details in each list row if onepage mode is on
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.20
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 5dca1131e..2b4bfd4e5 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2685,6 +2685,8 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 			if($enableClipboard) {
 				$content .= '<a class="addtoclipboard" rel="D'.$docID.'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="fa fa-copy"></i></a>';
 			}
+			if($onepage)
+				$content .= '<a href="../out/out.ViewDocument.php?documentid='.$docID.'" title="'.getMLText("view_document").'"><i class="fa fa-eye"></i></a>';
 			if(!empty($extracontent['end_action_list']))
 				$content .= $extracontent['end_action_list'];
 			$content .= "</div>";
@@ -2812,6 +2814,8 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 		if($enableClipboard) {
 			$content .= '<a class="addtoclipboard" rel="F'.$subFolder->getID().'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="fa fa-copy"></i></a>';
 		}
+		if($onepage)
+			$content .= '<a href="../out/out.ViewFolder.php?folderid='.$subFolder->getID().'" title="'.getMLText("view_folder").'"><i class="fa fa-eye"></i></a>';
 		if(!empty($extracontent['end_action_list']))
 			$content .= $extracontent['end_action_list'];
 		$content .= "</div>";

From 16836bf2833c792693fff8333269b25d6465dc04 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Oct 2020 12:30:49 +0200
Subject: [PATCH 212/312] add new methods getModelBox() and getModelBoxLink()

---
 views/bootstrap/class.Bootstrap.php | 47 +++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 2b4bfd4e5..84c58d331 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1089,6 +1089,53 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		}
 	} /* }}} */
 
+	/**
+	 * Get html for button opening a modal box
+	 *
+	 * @param array $config contains elements
+	 *   target: id of modal box
+	 *   remote: URL of data to be loaded into box
+	 *   title: text on button
+	 * @return string
+	 */
+	function getModalBoxLink($config) { /* {{{ */
+		$content = '';
+		$content .= "<a data-target=\"#".$config['target']."\" href=\"".$config['remote']."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".$config['title']."…</a>\n";
+		return $content;
+	} /* }}} */
+
+	/**
+	 * Get html for a modal box with buttons
+	 *
+	 * @param array $config contains elements
+	 *   id: id of modal box (must match target of getModalBoxLink())
+	 *   title: title of modal box
+	 *   buttons: array of buttons, each having a title and an optional id
+	 * @return string
+	 */
+	function getModalBox($config) { /* {{{ */
+		$content = '
+<div class="modal hide" id="'.$config['id'].'" tabindex="-1" role="dialog" aria-labelledby="'.$config['id'].'Label" aria-hidden="true">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    <h3 id="'.$config['id'].'Label">'.$config['title'].'</h3>
+  </div>
+  <div class="modal-body">
+		<p>'.getMLText('tree_loading').'</p>
+  </div>
+	<div class="modal-footer">
+';
+		if($config['buttons']) {
+			foreach($config['buttons'] as $button)
+				$content .= '<button class="btn" '.(!empty($button['id']) ? 'id="'.$button['id'].'"': '').'data-dismiss="modal" aria-hidden="true">'.$button['title'].'</button>';
+		}
+	$content .= '
+  </div>
+</div>
+';
+	return $content;
+	} /* }}} */
+
 	function printFileChooserJs() { /* {{{ */
 ?>
 $(document).ready(function() {

From 024a61319e267a93ce29c79f2563a20c9913dbb9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Oct 2020 12:40:35 +0200
Subject: [PATCH 213/312] fix typo in printDocumentChooserHtml()

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 4aaece05d..e06c35301 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1481,7 +1481,7 @@ $(document).ready(function() {
 		return $content;
 	} /* }}} */
 
-	function printtDocumentChooserHtml($form, $accessMode=M_READ, $exclude = -1, $default = false, $formname = '', $folder='', $partialtree=0) { /* {{{ */
+	function printDocumentChooserHtml($form, $accessMode=M_READ, $exclude = -1, $default = false, $formname = '', $folder='', $partialtree=0) { /* {{{ */
 		echo self::getDocumentChooserHtml($form, $accessMode, $exclude, $default, $formname, $folder, $partialtree);
 	} /* }}} */
 

From 1924e1901d6312759941e70649ab7e12d6678a27 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Oct 2020 12:42:54 +0200
Subject: [PATCH 214/312] unset formtoken before creating link to footer js
 file

---
 views/bootstrap/class.Bootstrap.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 84c58d331..527a6ca4b 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -179,6 +179,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo '<script src="../styles/'.$this->theme.'/select2/js/select2.min.js"></script>'."\n";
 		parse_str($_SERVER['QUERY_STRING'], $tmp);
 		$tmp['action'] = 'webrootjs';
+		if(isset($tmp['formtoken']))
+			unset($tmp['formtoken']);
 		echo '<script src="'.$this->params['absbaseprefix'].'out/out.'.$this->params['class'].'.php?'.http_build_query($tmp).'"></script>'."\n";
 		echo '<script src="../styles/'.$this->theme.'/application.js"></script>'."\n";
 		if($this->params['enablemenutasks'] && isset($this->params['user']) && $this->params['user']) {

From 0c07a0568e3c10f97662a3f346177c47b4b373b1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Oct 2020 12:45:15 +0200
Subject: [PATCH 215/312] do not allow a second user substitution

---
 views/bootstrap/class.Bootstrap.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 527a6ca4b..fffc26021 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -346,9 +346,11 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				echo "     </ul>\n";
 				echo "    </li>\n";
 			}
-			if($this->params['user']->isAdmin()) {
-				$showdivider = true;
-				echo "    <li><a href=\"../out/out.SubstituteUser.php\">".getMLText("substitute_user")."</a></li>\n";
+			if(!$this->params['session']->getSu()) {
+				if($this->params['user']->isAdmin()) {
+					$showdivider = true;
+					echo "    <li><a href=\"../out/out.SubstituteUser.php\">".getMLText("substitute_user")."</a></li>\n";
+				}
 			}
 			if($showdivider)
 				echo "    <li class=\"divider\"></li>\n";

From 196ea676be3fe184bd28942e525f8114c321afec Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Oct 2020 13:12:02 +0200
Subject: [PATCH 216/312] minor backports from 6.0.x

---
 views/bootstrap/class.Bootstrap.php | 39 ++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index fffc26021..aa3400cd7 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -583,6 +583,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	} /* }}} */
 
 	private function documentNavigationBar($document)	{ /* {{{ */
+		$accessobject = $this->params['accessobject'];
 		$accessMode = $document->getAccessMode($this->params['user']);
 		$docid=".php?documentid=" . $document->getID();
 		echo "<id=\"first\"><a href=\"../out/out.ViewDocument". $docid ."\" class=\"brand\">".getMLText("document")."</a>\n";
@@ -606,7 +607,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 					$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>'move_document');
 				}
 			}
-			if($this->params['accessobject']->maySetExpires()) {
+			if($accessobject->maySetExpires()) {
 				$menuitems['expires'] = array('link'=>"../out/out.SetExpires".$docid, 'label'=>'expires');
 			}
 		}
@@ -768,7 +769,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "<li><a href=\"../out/out.CalendarOld.php?mode=w".$ds."\">".getMLText("week_view")."</a></li>\n";
 		echo "<li><a href=\"../out/out.CalendarOld.php?mode=m".$ds."\">".getMLText("month_view")."</a></li>\n";
 		echo "<li><a href=\"../out/out.CalendarOld.php?mode=y".$ds."\">".getMLText("year_view")."</a></li>\n";
-		if (!$this->params['user']->isGuest()) echo "<li><a href=\"../out/out.AddEvent.php\">".getMLText("add_event")."</a></li>\n";
+		if (!$this->params['user']->isGuest())
+			echo "<li><a href=\"../out/out.AddEvent.php\">".getMLText("add_event")."</a></li>\n";
 		echo "</ul>\n";
 		echo "</div>\n";
 		return;
@@ -1277,7 +1279,7 @@ $(document).ready(function() {
 		$content = '';
 		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
 		$content .= "<div class=\"input-append\">\n";
-		$content .= "<input type=\"text\" id=\"choosedocsearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"docname".$formid."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" value=\"" . (($default) ? htmlspecialchars($default->getName()) : "") ."\"/>";
+		$content .= "<input type=\"text\" id=\"choosedocsearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"docname".$formid."\"value=\"" . (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" />";
 		$content .= "<button type=\"button\" class=\"btn\" id=\"cleardocument".$form."\" data-target=\"".$formid."\"><i class=\"fa fa-remove\"></i></button>";
 		if(!$skiptree)
 			$content .= "<a data-target=\"#docChooser".$formid."\" href=\"../out/out.DocumentChooser.php?form=".$formid."&folderid=".$this->params['rootfolderid']."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("document")."…</a>\n";
@@ -1512,7 +1514,12 @@ $(document).ready(function() {
 <?php
 	} /* }}} */
 
-	function printAttributeValue($attribute) { /* {{{ */
+	/**
+	 * Output a single attribute in the document info section
+	 *
+	 * @param object $attribute attribute
+	 */
+	protected function printAttributeValue($attribute) { /* {{{ */
 		echo self::getAttributeValue($attribute);
 	} /* }}} */
 
@@ -1836,10 +1843,12 @@ $(document).ready(function() {
 		print "<h4>".getMLText('error')."!</h4>";
 		print htmlspecialchars($error);
 		print "</div>";
-		print "<div><button class=\"btn history-back\">".getMLText('back')."</button></div>";
-		
-		$this->contentEnd();
-		$this->htmlEndPage();
+		if(!$plain) {	
+			print "<div><button class=\"btn history-back\">".getMLText('back')."</button></div>";
+
+			$this->contentEnd();
+			$this->htmlEndPage();
+		}
 		
 		add_log_line(" UI::exitError error=".$error." pagetitle=".$pagetitle, PEAR_LOG_ERR);
 
@@ -1926,9 +1935,9 @@ $(document).ready(function() {
 			$folder = $this->params['dms']->getFolder($folderid);
 			if(!$partialtree) {
 				$path = $folder->getPath();
+				/* Get the first folder (root folder) of path */
+				$folder = array_shift($path);
 			}
-			/* Get the first folder (root folder) of path */
-			$folder = array_shift($path);
 			$node = array('label'=>$folder->getName(), 'id'=>$folder->getID(), 'load_on_demand'=>false, 'is_folder'=>true);
 			if(!$folder->hasSubFolders()) {
 				$node['load_on_demand'] = true;
@@ -2628,9 +2637,6 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 		if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
 		$docID = $document->getID();
 
-		if(!$skipcont)
-			$content .= $this->documentListRowStart($document);
-
 		if($version) {
 			$latestContent = $this->callHook('documentContent', $document, $version);
 			if($latestContent === null)
@@ -2642,6 +2648,9 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 		}
 
 		if($latestContent) {
+			if(!$skipcont)
+				$content .= $this->documentListRowStart($document);
+
 			$previewer->createPreview($latestContent);
 			$version = $latestContent->getVersion();
 			$status = $latestContent->getStatus();
@@ -2742,9 +2751,9 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 				$content .= $extracontent['end_action_list'];
 			$content .= "</div>";
 			$content .= "</td>";
+			if(!$skipcont)
+				$content .= $this->documentListRowEnd($document);
 		}
-		if(!$skipcont)
-			$content .= $this->documentListRowEnd($document);
 		return $content;
 	} /* }}} */
 

From 80453c7e2e4d2fe4dafde75411687df78f041b1e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Oct 2020 17:19:47 +0200
Subject: [PATCH 217/312] use new methods getModalBoxLink() and getModalBox(),
 remove printCategoryChooser()

---
 views/bootstrap/class.Bootstrap.php | 179 ++++++++++------------------
 1 file changed, 62 insertions(+), 117 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index aa3400cd7..88ee0e15b 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1133,7 +1133,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 ';
 		if($config['buttons']) {
 			foreach($config['buttons'] as $button)
-				$content .= '<button class="btn" '.(!empty($button['id']) ? 'id="'.$button['id'].'"': '').'data-dismiss="modal" aria-hidden="true">'.$button['title'].'</button>';
+				$content .= '<button class="btn'.(!empty($button['id']) ? ' btn-primary" id="'.$button['id'].'"': '" ').'data-dismiss="modal" aria-hidden="true">'.$button['title'].'</button>';
 		}
 	$content .= '
   </div>
@@ -1282,23 +1282,22 @@ $(document).ready(function() {
 		$content .= "<input type=\"text\" id=\"choosedocsearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"docname".$formid."\"value=\"" . (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" />";
 		$content .= "<button type=\"button\" class=\"btn\" id=\"cleardocument".$form."\" data-target=\"".$formid."\"><i class=\"fa fa-remove\"></i></button>";
 		if(!$skiptree)
-			$content .= "<a data-target=\"#docChooser".$formid."\" href=\"../out/out.DocumentChooser.php?form=".$formid."&folderid=".$this->params['rootfolderid']."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("document")."…</a>\n";
+			$content .= $this->getModalBoxLink(
+				array(
+					'target' => 'docChooser'.$formid,
+					'remote' => "../out/out.DocumentChooser.php?form=".$formid."&folderid=".$this->params['rootfolderid'],
+					'title' => getMLText('document')
+				));
 		$content .= "</div>\n";
 		if(!$skiptree)
-			$content .= '
-<div class="modal hide" id="docChooser'.$formid.'" tabindex="-1" role="dialog" aria-labelledby="docChooserLabel" aria-hidden="true">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="docChooserLabel">'.getMLText("choose_target_document").'</h3>
-  </div>
-  <div class="modal-body">
-		<p>'.getMLText('tree_loading').'</p>
-  </div>
-  <div class="modal-footer">
-    <button class="btn" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
-  </div>
-</div>
-';
+			$content .= $this->getModalBox(
+				array(
+					'id' => 'docChooser'.$formid,
+					'title' => getMLText('choose_target_document'),
+					'buttons' => array(
+						array('title'=>getMLText('close'))
+					)
+				));
 		return $content;
 	} /* }}} */
 
@@ -1347,24 +1346,23 @@ function folderSelected<?php echo $formid ?>(id, name) {
 		$content .= "<input type=\"text\" id=\"choosefoldersearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"targetname".$formid."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" target=\"".$formid."\"/>";
 		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfolder".$formid."\" data-target=\"".$formid."\"><i class=\"fa fa-remove\"></i></button>";
 		if(!$skiptree) {
-			$content .= "<a data-target=\"#folderChooser".$formid."\" href=\"../out/out.FolderChooser.php?form=".$formid."&mode=".$accessMode."&exclude=".$exclude."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("folder")."…</a>\n";
+			$content .= $this->getModalBoxLink(
+				array(
+					'target' => 'folderChooser'.$formid,
+					'remote' => "../out/out.FolderChooser.php?form=".$formid."&mode=".$accessMode."&exclude=".$exclude,
+					'title' => getMLText('folder')
+				));
 		}
 		$content .= "</div>\n";
 		if(!$skiptree) {
-			$content .= '
-<div class="modal hide" id="folderChooser'.$formid.'" tabindex="-1" role="dialog" aria-labelledby="folderChooser'.$formid.'Label" aria-hidden="true">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="folderChooser'.$formid.'Label">'.getMLText("choose_target_folder").'</h3>
-  </div>
-  <div class="modal-body">
-		<p>'.getMLText('tree_loading').'</p>
-  </div>
-  <div class="modal-footer">
-    <button class="btn" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
-  </div>
-</div>
-';
+			$content .= $this->getModalBox(
+				array(
+					'id' => 'folderChooser'.$formid,
+					'title' => getMLText('choose_target_folder'),
+					'buttons' => array(
+						array('title'=>getMLText('close'))
+					)
+				));
 		}
 		return $content;
 	} /* }}} */
@@ -1410,61 +1408,6 @@ $(document).ready(function() {
 <?php
 	} /* }}} */
 
-	/**
-	 * Do not use anymore. Was previously used to show the category
-	 * chooser. It has been replaced by a select box
-	 */
-	function printCategoryChooser($formName, $categories=array()) { /* {{{ */
-?>
-<script language="JavaScript">
-	function clearCategory<?php print $formName ?>() {
-		document.<?php echo $formName ?>.categoryid<?php echo $formName ?>.value = '';
-		document.<?php echo $formName ?>.categoryname<?php echo $formName ?>.value = '';
-	}
-
-	function acceptCategories() {
-		var targetName = document.<?php echo $formName?>.categoryname<?php print $formName ?>;
-		var targetID = document.<?php echo $formName?>.categoryid<?php print $formName ?>;
-		var value = '';
-		$('#keywordta option:selected').each(function(){
-			value += ' ' + $(this).text();
-		});
-		targetName.value = value;
-		targetID.value = $('#keywordta').val();
-		return true;
-	}
-</script>
-<?php
-		$ids = $names = array();
-		if($categories) {
-			foreach($categories as $cat) {
-				$ids[] = $cat->getId();
-				$names[] = htmlspecialchars($cat->getName());
-			}
-		}
-		print "<input type=\"hidden\" name=\"categoryid".$formName."\" value=\"".implode(',', $ids)."\">";
-		print "<div class=\"input-append\">\n";
-		print "<input type=\"text\" disabled name=\"categoryname".$formName."\" value=\"".implode(' ', $names)."\">";
-		print "<button type=\"button\" class=\"btn\" onclick=\"javascript:clearCategory".$formName."();\"><i class=\"fa fa-remove\"></i></button>";
-		print "<a data-target=\"#categoryChooser\" href=\"../out/out.CategoryChooser.php?form=form1&cats=".implode(',', $ids)."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("category")."…</a>\n";
-		print "</div>\n";
-?>
-<div class="modal hide" id="categoryChooser" tabindex="-1" role="dialog" aria-labelledby="categoryChooserLabel" aria-hidden="true">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="categoryChooserLabel"><?php printMLText("choose_target_category") ?></h3>
-  </div>
-  <div class="modal-body">
-		<p><?php printMLText('categories_loading') ?></p>
-  </div>
-  <div class="modal-footer">
-    <button class="btn" data-dismiss="modal" aria-hidden="true"><?php printMLText("close") ?></button>
-    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true" onClick="acceptCategories();"><i class="fa fa-save"></i> <?php printMLText("save") ?></button>
-  </div>
-</div>
-<?php
-	} /* }}} */
-
 	function printKeywordChooserHtml($formName, $keywords='', $fieldname='keywords') { /* {{{ */
 		echo self::getKeywordChooserHtml($formName, $keywords, $fieldname); 
 	} /* }}} */
@@ -1474,22 +1417,25 @@ $(document).ready(function() {
 		$content = '';
 		$content .= '
 		    <div class="input-append">
-				<input type="text" name="'.$fieldname.'" id="'.$fieldname.'" value="'.htmlspecialchars($keywords).'"'.($strictformcheck ? ' required' : '').' />
-				<a data-target="#keywordChooser" role="button" class="btn" data-toggle="modal" href="../out/out.KeywordChooser.php?target='.$formName.'">'.getMLText("keywords").'…</a>
-		    </div>
-<div class="modal hide" id="keywordChooser" tabindex="-1" role="dialog" aria-labelledby="keywordChooserLabel" aria-hidden="true">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="keywordChooserLabel">'.getMLText("use_default_keywords").'</h3>
-  </div>
-  <div class="modal-body">
-		<p>'.getMLText('keywords_loading').'</p>
-  </div>
-  <div class="modal-footer">
-    <button class="btn" data-dismiss="modal" aria-hidden="true">'. getMLText("close").'</button>
-    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true" id="acceptkeywords"><i class="fa fa-save"></i> '.getMLText("save").'</button>
-  </div>
-</div>';
+				<input type="text" name="'.$fieldname.'" id="'.$fieldname.'" value="'.htmlspecialchars($keywords).'"'.($strictformcheck ? ' required' : '').' />';
+		$content .= $this->getModalBoxLink(
+			array(
+				'target' => 'keywordChooser',
+				'remote' => "../out/out.KeywordChooser.php?target=".$formName,
+				'title' => getMLText('keywords')
+			));
+		$content .= '
+			</div>
+';
+		$content .= $this->getModalBox(
+			array(
+				'id' => 'keywordChooser',
+				'title' => getMLText('use_default_keywords'),
+				'buttons' => array(
+					array('id'=>'acceptkeywords', 'title'=>getMLText('save')),
+					array('title'=>getMLText('close')),
+				)
+			));
 		return $content;
 	} /* }}} */
 
@@ -1714,22 +1660,21 @@ $(document).ready(function() {
 		$content =  "<div class=\"input-append\">\n";
 		$content .= "<input readonly type=\"text\" id=\"dropfolderfile".$formName."\" name=\"dropfolderfile".$formName."\" value=\"".$dropfolderfile."\">";
 		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfilename".$formName."\"><i class=\"fa fa-remove\"></i></button>";
-		$content .= "<a data-target=\"#dropfolderChooser\" href=\"../out/out.DropFolderChooser.php?form=".$formName."&dropfolderfile=".urlencode($dropfolderfile)."&showfolders=".$showfolders."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))."…</a>\n";
+		$content .= $this->getModalBoxLink(
+			array(
+				'target' => 'dropfolderChooser',
+				'remote' => "../out/out.DropFolderChooser.php?form=".$formName."&dropfolderfile=".urlencode($dropfolderfile)."&showfolders=".$showfolders,
+				'title' => ($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))
+			));
 		$content .= "</div>\n";
-		$content .= '
-<div class="modal hide" id="dropfolderChooser" tabindex="-1" role="dialog" aria-labelledby="dropfolderChooserLabel" aria-hidden="true">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="dropfolderChooserLabel">'.($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file")).'</h3>
-  </div>
-  <div class="modal-body">
-		<p>'.getMLText('files_loading').'</p>
-		</div>
-  <div class="modal-footer">
-    <button class="btn" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
-  </div>
-</div>
-';
+		$content .= $this->getModalBox(
+			array(
+				'id' => 'dropfolderChooser',
+				'title' => ($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file")),
+				'buttons' => array(
+					array('title'=>getMLText('close')),
+				)
+			));
 		return $content;
 	} /* }}} */
 

From 19ab11f595241854e8b86a2e31f1bb0e740293ef Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Oct 2020 18:16:44 +0200
Subject: [PATCH 218/312] more parameters can be passed to getModalBoxLink()
 and getModalBox()

---
 views/bootstrap/class.Bootstrap.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 88ee0e15b..d5c808de5 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1106,7 +1106,12 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	 */
 	function getModalBoxLink($config) { /* {{{ */
 		$content = '';
-		$content .= "<a data-target=\"#".$config['target']."\" href=\"".$config['remote']."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".$config['title']."…</a>\n";
+		$content .= "<a data-target=\"#".$config['target']."\"".(isset($config['remote']) ? " href=\"".$config['remote']."\"" : "")." role=\"button\" class=\"".(isset($config['class']) ? $config['class'] : "btn")."\" data-toggle=\"modal\"";
+		if(!empty($config['attributes'])) {
+			foreach($config['attributes'] as $attrname=>$attrval)
+				$content .= ' '.$attrname.'="'.$attrval.'"';
+		}
+		$content .= ">".$config['title']."…</a>\n";
 		return $content;
 	} /* }}} */
 
@@ -1126,8 +1131,13 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
     <h3 id="'.$config['id'].'Label">'.$config['title'].'</h3>
   </div>
-  <div class="modal-body">
-		<p>'.getMLText('tree_loading').'</p>
+	<div class="modal-body">
+';
+		if(!empty($config['content']))
+			$content .= $config['content'];
+		else
+			$content .= '<p>'.getMLText('data_loading').'</p>';
+		$content .= '
   </div>
 	<div class="modal-footer">
 ';

From d7a7b251fdc1d6db18d77a05bc08b43e03fe1d4a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 23 Oct 2020 16:24:29 +0200
Subject: [PATCH 219/312] ?

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index d5c808de5..ad9cfe7d4 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2674,7 +2674,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 				$content .= count($links)."/".count($revlinks)." ".getMLText("linked_documents")."<br />";
 			if($status["status"] == S_IN_WORKFLOW && $workflowmode == 'advanced') {
 				$workflowstate = $latestContent->getWorkflowState();
-				$content .= '<span title="'.getOverallStatusText($status["status"]).': '.htmlspecialchars($workflow->getName()).'">'.htmlspecialchars($workflowstate->getName()).'</span>';
+				$content .= '<span title="'.getOverallStatusText($status["status"]).': '.($workflow ? htmlspecialchars($workflow->getName()) : '').'">'.($workflowstate ? htmlspecialchars($workflowstate->getName()) : '').'</span>';
 			} else {
 				$content .= getOverallStatusText($status["status"]);
 			}

From 0cc4fccd7fdbb062e51dd952885c43aa15303039 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 23 Oct 2020 16:26:30 +0200
Subject: [PATCH 220/312] show list of recject and docs that need attention if
 for traditional_only_approval

---
 views/bootstrap/class.MyDocuments.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 089c9da3f..b0e0b51c7 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -728,7 +728,7 @@ $(document).ready( function() {
 		echo '<li class=""><a data-href="#documents_user_reception" data-action="listReceiveOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_reception").'</a></li>';
 		$resArr = $dms->getDocumentList('NoReceiveOwner', $user);
 		echo '<li class=""><a data-href="#documents_user_no_reception" data-action="listNoReceiveOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_no_reception").'</a></li>';
-		if($workflowmode == 'traditional') {
+		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			$resArr = $dms->getDocumentList('AppRevOwner', $user);
 			echo '<li class=""><a data-href="#documents_user_requiring_attention" data-action="listDocsToLookAt"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_requiring_attention").'</a></li>';
 		}
@@ -737,7 +737,7 @@ $(document).ready( function() {
 		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
 		$resArr = $dms->getDocumentList('DraftOwner', $user);
 		echo '<li class=""><a data-href="#documents_user_draft" data-action="listDraftOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_draft").'</a></li>';
-		if($workflowmode == 'traditional') {
+		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			$resArr = $dms->getDocumentList('RejectOwner', $user);
 			echo '<li class=""><a data-href="#documents_user_rejected" data-action="listRejects"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_rejected").'</a></li>';
 		}

From 40f410a762662cd0621653703aa5c3aa3b6617c9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 23 Oct 2020 16:27:06 +0200
Subject: [PATCH 221/312] check for workflow and workflowstate

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 5b29f2581..1c6a995a8 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2868,7 +2868,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 				$content .= count($links)."/".count($revlinks)." ".getMLText("linked_documents")."<br />";
 			if($status["status"] == S_IN_WORKFLOW && $workflowmode == 'advanced') {
 				$workflowstate = $latestContent->getWorkflowState();
-				$content .= '<span title="'.getOverallStatusText($status["status"]).': '.htmlspecialchars($workflow->getName()).'">'.htmlspecialchars($workflowstate->getName()).'</span>';
+				$content .= '<span title="'.getOverallStatusText($status["status"]).': '.($workflow ? htmlspecialchars($workflow->getName()) : '').'">'.($workflowstate ? htmlspecialchars($workflowstate->getName()) : '').'</span>';
 			} else {
 				$content .= getOverallStatusText($status["status"]);
 			}

From d842b90f9e1ef7771772aab13489f33eadb62b1c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 23 Oct 2020 17:06:06 +0200
Subject: [PATCH 222/312] set showtree for view

---
 out/out.MyDocuments.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php
index aa183d67a..fff285cdf 100644
--- a/out/out.MyDocuments.php
+++ b/out/out.MyDocuments.php
@@ -49,6 +49,7 @@ if (isset($_GET["orderby"]) && strlen($_GET["orderby"])==1 ) {
 }
 
 if($view) {
+	$view->setParam('showtree', showtree());
 	$view->setParam('orderby', $orderby);
 	$view->setParam('showinprocess', $showInProcess);
 	$view->setParam('workflowmode', $settings->_workflowMode);

From a358d8565a4b4aa5afb53d88b881ebce349b9033 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 23 Oct 2020 17:06:19 +0200
Subject: [PATCH 223/312] add list of rejected documents

---
 views/bootstrap/class.Tasks.php | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index 6de76c080..cbc919f72 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -47,6 +47,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 				$tasks['review'] = array();
 		} elseif($workflowmode == 'advanced')
 			$tasks['workflow'] = array();
+		$tasks['rejected'] = array();
 
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			$resArr = $dms->getDocumentList('ApproveByMe', $user);
@@ -98,6 +99,21 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 						$tasks['workflow'][] = array('id'=>$doc->getId(), 'name'=>$doc->getName());
 			}
 		}
+		$resArr = $dms->getDocumentList('RejectOwner', $user);
+		if($resArr) {
+			$docs = array();
+			foreach ($resArr as $res) {
+				$document = $dms->getDocument($res["id"]);
+				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+					$docs[] = $document;
+				}
+			}
+			if($this->hasHook('filterRejectedTaskList'))
+				$docs = $this->callHook('filterRejectedTaskList', $docs);
+			foreach($docs as $doc)
+					$tasks['rejected'][] = array('id'=>$doc->getId(), 'name'=>$doc->getName());
+		}
+
 		return $tasks;
 	} /* }}} */
 
@@ -152,6 +168,8 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 			$ct[] = count($tasks['approval']);
 		if(isset($tasks['workflow']))
 			$ct[] = count($tasks['workflow']);
+		if(isset($tasks['rejected']))
+			$ct[] = count($tasks['rejected']);
 		$content .= implode('/', $ct);
 		$content .= ")";
 		if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['workflow'])) {
@@ -190,6 +208,17 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
+		if(!empty($tasks['rejected'])) {
+		$content .= "      <li class=\"dropdown-submenu\">\n";
+		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_trigger_rejected")."</a>\n";
+		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		foreach($tasks['rejected'] as $t) {
+			$doc = $dms->getDocument($t['id']);
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=docinfo\" class=\"table-row-document\" rel=\"document_".$doc->getID()."\">".$doc->getName()."</a></li>";
+		}
+		$content .= "       </ul>\n";
+		$content .= "      </li>\n";
+		}
 		$content .= "    <li class=\"divider\"></li>\n";
 		$content .= "    <li><a href=\"../out/out.MyDocuments.php\">".getMLText("my_documents")."</a></li>\n";
 		$content .= "     </ul>\n";

From 2dfbc164aeae4dbfebd2b3d8b0723efe36388f4e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 23 Oct 2020 18:47:39 +0200
Subject: [PATCH 224/312] add item for 5.1.21

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index e5999118c..543a663e2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@
 - extension may contain a conf varіable to select a workflow
 - do not set max_execution_time for scripts run by php-cli
 - add link to document/folder details in each list row if onepage mode is on
+- add list of rejected documents to tasks
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.20

From 598529da7a0464ac15be965cbf837da0dbca3faa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 23 Oct 2020 18:48:32 +0200
Subject: [PATCH 225/312] add item for 6.0.14

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 04672e013..c4b69944f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 - show debug menu only if debug mode is on
 - merge changes up to 5.1.21
 - document links can be added by regular users again
+- add list of checked out documents to tasks
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.13

From 8f563622b6f11940fbeee52a6e719e0a522888a1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Oct 2020 15:26:04 +0100
Subject: [PATCH 226/312] set php handler, fix name of mod_headers

---
 restapi/.htaccess | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/restapi/.htaccess b/restapi/.htaccess
index edeafcef4..0151827f6 100644
--- a/restapi/.htaccess
+++ b/restapi/.htaccess
@@ -1,10 +1,11 @@
 RewriteEngine on
 RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
 
-<IfModule mod_header.c>
 <Files ~ "^swagger\.yaml">
+SetHandler application/x-httpd-php
+<IfModule mod_headers.c>
 Header set Access-Control-Allow-Origin "*"
 Header set Access-Control-Allow-Methods "GET"
 Header set Access-Control-Allow-Headers "X-Requested-With, Content-Type, Accept, Origin, Authorization"
-</Files>
 </IfModule>
+</Files>

From 0159208e2048f00120d1b0a1974c388d8e628594 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Oct 2020 15:26:32 +0100
Subject: [PATCH 227/312] add new method setDocumentOwner(), owner can be set
 when uploadig document

---
 restapi/index.php    | 53 ++++++++++++++++++++++++-
 restapi/swagger.yaml | 94 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 145 insertions(+), 2 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index 0548d12ad..10feb57ed 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -629,7 +629,11 @@ class RestapiController { /* {{{ */
                 foreach($categories as $catid) {
                     if($cat = $dms->getDocumentCategory($catid))
                         $cats[] = $cat;
-                }
+								}
+								$owner = null;
+								if($userobj->isAdmin() && isset($params["owner"]) && ctype_digit($params['owner'])) {
+									$owner = $dms->getUser($params["owner"]);
+								}
                 $attributes = isset($params["attributes"]) ? $params["attributes"] : array();
                 foreach($attributes as $attrdefid=>$attribute) {
                     if($attrdef = $dms->getAttributeDefinition($attrdefid)) {
@@ -661,7 +665,7 @@ class RestapiController { /* {{{ */
                 $userfiletype = finfo_file($finfo, $temp);
                 $fileType = ".".pathinfo($origfilename, PATHINFO_EXTENSION);
                 finfo_close($finfo);
-                $res = $mfolder->addDocument($docname, $comment, $expires, $userobj, $keywords, $cats, $temp, $origfilename ? $origfilename : basename($temp), $fileType, $userfiletype, $sequence, array(), array(), $reqversion, $version_comment, $attributes);
+                $res = $mfolder->addDocument($docname, $comment, $expires, $owner ? $owner : $userobj, $keywords, $cats, $temp, $origfilename ? $origfilename : basename($temp), $fileType, $userfiletype, $sequence, array(), array(), $reqversion, $version_comment, $attributes);
     //            addDocumentCategories($res, $categories);
     //            setDocumentAttributes($res, $attributes);
 
@@ -1351,6 +1355,10 @@ class RestapiController { /* {{{ */
                 return $response->withJson(array('success'=>false, 'message'=>'No access on document', 'data'=>''), 403);
             }
         } else {
+            if(!$doc)
+                return $response->withJson(array('success'=>false, 'message'=>'No such document', 'data'=>''), 404);
+            if(!$cat)
+                return $response->withJson(array('success'=>false, 'message'=>'No such category', 'data'=>''), 404);
             return $response->withJson(array('success'=>false, 'message'=>'Could not find category or document', 'data'=>''), 500);
         }
     } /* }}} */
@@ -1413,6 +1421,46 @@ class RestapiController { /* {{{ */
         }
     } /* }}} */
 
+    function setDocumentOwner($request, $response, $args) { /* {{{ */
+        $dms = $this->container->dms;
+        $userobj = $this->container->userobj;
+
+        if(!$userobj) {
+            return $response->withJson(array('success'=>false, 'message'=>'Not logged in', 'data'=>''), 403);
+				}
+				if(!$userobj->isAdmin()) {
+					return $response->withJson(array('success'=>false, 'message'=>'No access on document', 'data'=>''), 403);
+				}
+
+        if(!ctype_digit($args['id']) || $args['id'] == 0) {
+            return $response->withJson(array('success'=>false, 'message'=>'No document given', 'data'=>''), 400);
+            return;
+        }
+        if(!ctype_digit($args['userid']) || $args['userid'] == 0) {
+            return $response->withJson(array('success'=>false, 'message'=>'No user given', 'data'=>''), 400);
+            return;
+        }
+        $owner = $dms->getUser($args['userid']);
+        $doc = $dms->getDocument($args['id']);
+        if($doc && $owner) {
+            if($doc->getAccessMode($userobj, 'setDocumentOwner') > M_READ) {
+                if ($doc->setOwner($owner)){
+                    return $response->withJson(array('success'=>true, 'message'=>'', 'data'=>''), 201);
+                } else {
+                        return $response->withJson(array('success'=>false, 'message'=>'Could not set owner of document', 'data'=>''), 500);
+                }
+            } else {
+                return $response->withJson(array('success'=>false, 'message'=>'No access on document', 'data'=>''), 403);
+            }
+        } else {
+            if(!$doc)
+                return $response->withJson(array('success'=>false, 'message'=>'No such document', 'data'=>''), 404);
+            if(!$owner)
+                return $response->withJson(array('success'=>false, 'message'=>'No such user', 'data'=>''), 404);
+            return $response->withJson(array('success'=>false, 'message'=>'Could not find user or document', 'data'=>''), 500);
+        }
+    } /* }}} */
+
     function getAccount($request, $response) { /* {{{ */
         $dms = $this->container->dms;
         $userobj = $this->container->userobj;
@@ -2389,6 +2437,7 @@ $app->get('/document/{id}/preview/{version}/{width}', \RestapiController::class.
 $app->delete('/document/{id}/categories', \RestapiController::class.':removeDocumentCategories');
 $app->delete('/document/{id}/category/{catid}', \RestapiController::class.':removeDocumentCategory');
 $app->post('/document/{id}/category/{catid}', \RestapiController::class.':addDocumentCategory');
+$app->put('/document/{id}/owner/{userid}', \RestapiController::class.':setDocumentOwner');
 $app->put('/account/fullname', \RestapiController::class.':setFullName');
 $app->put('/account/email', \RestapiController::class.':setEmail');
 $app->get('/account/documents/locked', \RestapiController::class.':getLockedDocuments');
diff --git a/restapi/swagger.yaml b/restapi/swagger.yaml
index 1e453c2a0..4375e09e1 100644
--- a/restapi/swagger.yaml
+++ b/restapi/swagger.yaml
@@ -910,6 +910,53 @@ paths:
             $ref: "#/definitions/ApiResponse"
       security:
       - api_key: []
+  /document/{id}/category/{catid}:
+    post:
+      tags:
+      - "document"
+      summary: "Add a single category to document"
+      description: "Adds a single category to a document"
+      operationId: "addDocumentCategory"
+      produces:
+      - "application/json"
+      consumes:
+        - multipart/form-data
+      parameters:
+      - name: "id"
+        in: "path"
+        description: "ID of document."
+        type: "integer"
+        required: true
+        format: "int64"
+      - name: "catid"
+        in: "path"
+        description: "ID of category."
+        type: "integer"
+        required: true
+        format: "int64"
+      responses:
+        "201":
+          description: "successful operation"
+          schema:
+            $ref: "#/definitions/ApiResponse"
+        "400":
+          description: "No document or category given"
+          schema:
+            $ref: "#/definitions/ApiResponse"
+        "403":
+          description: "No access"
+          schema:
+            $ref: "#/definitions/ApiResponse"
+        "404":
+          description: "Document not found"
+          schema:
+            $ref: "#/definitions/ApiResponse"
+        "500":
+          description: "Internal error"
+          schema:
+            $ref: "#/definitions/ApiResponse"
+      security:
+      - api_key: []
   /document/{id}/category/{catid}:
     delete:
       tags:
@@ -951,6 +998,53 @@ paths:
             $ref: "#/definitions/ApiResponse"
       security:
       - api_key: []
+  /document/{id}/owner/{userid}:
+    post:
+      tags:
+      - "document"
+      summary: "Set owner of document"
+      description: "Set owner of document"
+      operationId: "setDocumentOwner"
+      produces:
+      - "application/json"
+      consumes:
+        - multipart/form-data
+      parameters:
+      - name: "id"
+        in: "path"
+        description: "ID of document."
+        type: "integer"
+        required: true
+        format: "int64"
+      - name: "userid"
+        in: "path"
+        description: "ID of user."
+        type: "integer"
+        required: true
+        format: "int64"
+      responses:
+        "201":
+          description: "successful operation"
+          schema:
+            $ref: "#/definitions/ApiResponse"
+        "400":
+          description: "No document or user given"
+          schema:
+            $ref: "#/definitions/ApiResponse"
+        "403":
+          description: "No access"
+          schema:
+            $ref: "#/definitions/ApiResponse"
+        "404":
+          description: "Document not found"
+          schema:
+            $ref: "#/definitions/ApiResponse"
+        "500":
+          description: "Internal error"
+          schema:
+            $ref: "#/definitions/ApiResponse"
+      security:
+      - api_key: []
   /folder/{id}:
     get:
       tags:

From 42907bcb44ea95c378b6e8fa822cf7c39822c040 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Oct 2020 15:27:07 +0100
Subject: [PATCH 228/312] add changes for 5.1.21

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 543a663e2..376da2c3f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,8 @@
 - do not set max_execution_time for scripts run by php-cli
 - add link to document/folder details in each list row if onepage mode is on
 - add list of rejected documents to tasks
+- fix .htaccess file in restapi
+- restapi: add setDocumentOwner, owner can be set when uploading a document
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.20

From 3014b9411136a76cf15049113df606bcb75c4564 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Oct 2020 14:35:05 +0100
Subject: [PATCH 229/312] fix syntax error

---
 SeedDMS_Core/package.xml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 465e49012..235232b13 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,6 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
+???
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -2090,20 +2091,20 @@ SeedDMS_Core_DMS::filterAccess() properly checks for documents
    </notes>
   </release>
   <release>
- <date>2020-09-29</date>
- <time>13:44:55</time>
- <version>
-  <release>6.0.13</release>
-  <api>6.0.13</api>
- </version>
- <stability>
-  <release>stable</release>
-  <api>stable</api>
- </stability>
- <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
- <notes>
+   <date>2020-09-29</date>
+   <time>13:44:55</time>
+   <version>
+    <release>6.0.13</release>
+    <api>6.0.13</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
 - SeedDMS_Folder_DMS::getAccessList() and getDefaultAccess() do not return fals anymore if the parent does not exists. They just stop inheritance.
+   </notes>
   </release>
- </notes>
  </changelog>
 </package>

From 65a1b64db9d69278aca7e0c7ade42adb43bbd044 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Oct 2020 14:37:32 +0100
Subject: [PATCH 230/312] remove old code which was already removed in 5.1.x

---
 controllers/class.AddDocument.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/controllers/class.AddDocument.php b/controllers/class.AddDocument.php
index 30a0633f5..3dffad086 100644
--- a/controllers/class.AddDocument.php
+++ b/controllers/class.AddDocument.php
@@ -140,13 +140,6 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 				}
 			}
 
-			if($index) {
-				$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText));
-				if(!$this->callHook('preIndexDocument', $document, $idoc)) {
-				}
-				$index->addDocument($idoc);
-			}
-
 			/* Add a default notification for the owner of the document */
 			if($settings->_enableOwnerNotification) {
 				$res = $document->addNotify($owner->getID(), true);

From 277cc52025466b5254aa8186dc01ec2c7f8b5ca4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 Nov 2020 17:36:35 +0100
Subject: [PATCH 231/312] check if extraheader[favicon] is set

---
 views/bootstrap/class.Bootstrap.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index ad9cfe7d4..fb94c0e95 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -31,7 +31,7 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 
 	function __construct($params, $theme='bootstrap') {
 		parent::__construct($params, $theme);
-		$this->extraheader = array('js'=>'', 'css'=>'');
+		$this->extraheader = array('js'=>'', 'css'=>'', 'favicon'=>'');
 		$this->footerjs = array();
 		$this->nonces = array();
 	}
@@ -120,7 +120,12 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 		echo '<script type="text/javascript" src="../views/'.$this->theme.'/vendors/noty/themes/default.js"></script>'."\n";
 		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jqtree/tree.jquery.js"></script>'."\n";
 //		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jquery-cookie/jquery.cookie.js"></script>'."\n";
-		echo '<link rel="shortcut icon" href="../styles/'.$this->theme.'/favicon.ico" type="image/x-icon"/>'."\n";
+		if($this->extraheader['favicon'])
+			echo $this->extraheader['favicon'];
+		else {
+			echo '<link rel="icon" href="../views/'.$this->theme.'/images/favicon.svg" type="image/svg+xml"/>'."\n";
+			echo '<link rel="apple-touch-icon" sizes="180x180" href="../views/'.$this->theme.'/images/apple-touch-icon.png">'."\n";
+		}
 		if($this->params['session'] && $this->params['session']->getSu()) {
 ?>
 <style type="text/css">

From fc4c16c01be46c8a1171e4abbec77c022b364892 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Nov 2020 08:41:29 +0100
Subject: [PATCH 232/312] move favicon

---
 .../bootstrap/images}/favicon.ico                   | Bin
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {styles/bootstrap => views/bootstrap/images}/favicon.ico (100%)

diff --git a/styles/bootstrap/favicon.ico b/views/bootstrap/images/favicon.ico
similarity index 100%
rename from styles/bootstrap/favicon.ico
rename to views/bootstrap/images/favicon.ico

From f1aed51047692f39a83a2fee8bd2ed27b737ba5f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 9 Nov 2020 15:03:06 +0100
Subject: [PATCH 233/312] add method callHook() to class
 SeedDMS_SchedulerTaskBase

---
 inc/inc.ClassSchedulerTaskBase.php | 62 ++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/inc/inc.ClassSchedulerTaskBase.php b/inc/inc.ClassSchedulerTaskBase.php
index 372c30e0f..2c5330e77 100644
--- a/inc/inc.ClassSchedulerTaskBase.php
+++ b/inc/inc.ClassSchedulerTaskBase.php
@@ -39,6 +39,68 @@ class SeedDMS_SchedulerTaskBase {
 
 	var $fulltextservice;
 
+	/**
+	 * Call a hook with a given name
+	 *
+	 * Checks if a hook with the given name and for the current task
+	 * exists and executes it. The name of the current task is taken
+	 * from the current class name by lower casing the first char.
+	 * This function will execute all registered hooks in the order
+	 * they were registered.
+	 *
+	 * Attention: as func_get_arg() cannot handle references passed to the hook,
+	 * callHook() should not be called if that is required. In that case get
+	 * a list of hook objects with getHookObjects() and call the hooks yourself.
+	 *
+	 * @params string $hook name of hook
+	 * @return string concatenated string, merged arrays or whatever the hook
+	 * function returns
+	 */
+	public function callHook($hook) { /* {{{ */
+		$tmps = array();
+		$tmp = explode('_', get_class($this));
+		$tmps[] = $tmp[1];
+		$tmp = explode('_', get_parent_class($this));
+		$tmps[] = $tmp[1];
+		/* Run array_unique() in case the parent class has the same suffix */
+		$tmps = array_unique($tmps);
+		$ret = null;
+		foreach($tmps as $tmp)
+		if(isset($GLOBALS['SEEDDMS_HOOKS']['task'][lcfirst($tmp)])) {
+			foreach($GLOBALS['SEEDDMS_HOOKS']['task'][lcfirst($tmp)] as $hookObj) {
+				if (method_exists($hookObj, $hook)) {
+					switch(func_num_args()) {
+						case 1:
+							$tmpret = $hookObj->$hook($this);
+							break;
+						case 2:
+							$tmpret = $hookObj->$hook($this, func_get_arg(1));
+							break;
+						case 3:
+							$tmpret = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2));
+							break;
+						case 4:
+							$tmpret = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2), func_get_arg(3));
+							break;
+						default:
+						case 5:
+							$tmpret = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2), func_get_arg(3), func_get_arg(4));
+							break;
+					}
+					if($tmpret !== null) {
+						if(is_string($tmpret)) {
+							$ret = ($ret === null) ? $tmpret : (is_string($ret) ? $ret.$tmpret : array_merge($ret, array($tmpret)));
+						} elseif(is_array($tmpret) || is_object($tmpret)) {
+							$ret = ($ret === null) ? $tmpret : (is_string($ret) ? array_merge(array($ret), $tmpret) : array_merge($ret, $tmpret));
+						} else
+							$ret = $tmpret;
+					}
+				}
+			}
+		}
+		return $ret;
+	} /* }}} */
+
 	public function __construct($dms=null, $user=null, $settings=null, $logger=null, $fulltextservice=null) { /* {{{ */
 		$this->dms = $dms;
 		$this->user = $user;

From 768ea3544cb5a5c3347e437730c09a20b6bc2dc1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 9 Nov 2020 15:14:09 +0100
Subject: [PATCH 234/312] theme in configuration can override theme of each
 user

---
 CHANGELOG                          | 1 +
 controllers/class.Login.php        | 5 ++++-
 inc/inc.ClassSettings.php          | 4 ++++
 op/op.Settings.php                 | 1 +
 views/bootstrap/class.Settings.php | 1 +
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 376da2c3f..3c71a9920 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@
 - add list of rejected documents to tasks
 - fix .htaccess file in restapi
 - restapi: add setDocumentOwner, owner can be set when uploading a document
+- theme in configuration can override theme of user
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.20
diff --git a/controllers/class.Login.php b/controllers/class.Login.php
index ef96153ee..380253277 100644
--- a/controllers/class.Login.php
+++ b/controllers/class.Login.php
@@ -174,7 +174,10 @@ class SeedDMS_Controller_Login extends SeedDMS_Controller_Common {
 		}
 		else {
 			$sesstheme = $user->getTheme();
-			if (strlen($sesstheme)==0) {
+			/* Override the theme if the user doesn't have one or the default theme
+			 * shall override it.
+			 */
+			if (strlen($sesstheme)==0 || !empty($settings->_overrideTheme)) {
 				$sesstheme = $settings->_theme;
 		//		$user->setTheme($sesstheme);
 			}
diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 9b5180cf2..3f302c050 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -142,6 +142,8 @@ class Settings { /* {{{ */
 	var $_enableConverting = false;
 	// default style
 	var $_theme = "bootstrap";
+	// override user settings of theme
+	var $_overrideTheme = false;
 	// experimental one page mode for ViewFolder page
 	var $_onePageMode = false;
 	// Workaround for page titles that go over more than 2 lines.
@@ -454,6 +456,7 @@ class Settings { /* {{{ */
 		if(trim(strval($tab["availablelanguages"])))
 			$this->_availablelanguages = explode(',',strval($tab["availablelanguages"]));
 		$this->_theme = strval($tab["theme"]);
+		$this->_overrideTheme = Settings::boolVal($tab["overrideTheme"]);
 		$this->_onePageMode = Settings::boolVal($tab["onePageMode"]);
 		if(isset($tab["previewWidthList"]))
 			$this->_previewWidthList = intval($tab["previewWidthList"]);
@@ -825,6 +828,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "language", $this->_language);
     $this->setXMLAttributValue($node, "availablelanguages", implode(',', $this->_availablelanguages));
     $this->setXMLAttributValue($node, "theme", $this->_theme);
+    $this->setXMLAttributValue($node, "overrideTheme", $this->_overrideTheme);
     $this->setXMLAttributValue($node, "onePageMode", $this->_onePageMode);
     $this->setXMLAttributValue($node, "previewWidthList", $this->_previewWidthList);
     $this->setXMLAttributValue($node, "previewWidthMenuList", $this->_previewWidthMenuList);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 007620307..908e4ef75 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -64,6 +64,7 @@ if ($action == "saveSettings")
 	else
 		$settings->_availablelanguages = $_POST["availablelanguages"];
   $settings->_theme = $_POST["theme"];
+  $settings->_overrideTheme = getBoolValue("overrideTheme");
   $settings->_onePageMode = getBoolValue("onePageMode");
   $settings->_previewWidthList = $_POST["previewWidthList"];
   $settings->_previewWidthMenuList = $_POST["previewWidthMenuList"];
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 2abc030b7..f6c8c50de 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -284,6 +284,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
 <?php $this->showConfigOption('settings_available_languages', 'availablelanguages', getAvailableLanguages(), true, true); ?>
 <?php $this->showConfigOption('settings_language', 'language', getAvailableLanguages(), false, true); ?>
 <?php $this->showConfigOption('settings_theme', 'theme', UI::getStyles(), false, false); ?>
+<?php $this->showConfigCheckbox('settings_overrideTheme', 'overrideTheme'); ?>
 <?php $this->showConfigCheckbox('settings_onePageMode', 'onePageMode'); ?>
 <?php $this->showConfigText('settings_previewWidthList', 'previewWidthList'); ?>
 <?php $this->showConfigText('settings_previewWidthMenuList', 'previewWidthMenuList'); ?>

From 377095b47442600742f85f27a28f663e08e12566 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 9 Nov 2020 16:01:25 +0100
Subject: [PATCH 235/312] more translation updates

---
 languages/ar_EG/lang.inc | 11 +++++++++--
 languages/bg_BG/lang.inc | 15 +++++++++++----
 languages/ca_ES/lang.inc |  7 +++++++
 languages/cs_CZ/lang.inc | 17 ++++++++++++-----
 languages/de_DE/lang.inc | 11 +++++++++--
 languages/el_GR/lang.inc | 13 ++++++++++---
 languages/en_GB/lang.inc | 11 +++++++++--
 languages/es_ES/lang.inc | 27 +++++++++++++++++----------
 languages/fr_FR/lang.inc | 19 +++++++++++++------
 languages/hr_HR/lang.inc |  7 +++++++
 languages/hu_HU/lang.inc |  7 +++++++
 languages/it_IT/lang.inc |  7 +++++++
 languages/ko_KR/lang.inc |  7 +++++++
 languages/lo_LA/lang.inc |  7 +++++++
 languages/nb_NO/lang.inc | 11 +++++++++--
 languages/nl_NL/lang.inc |  7 +++++++
 languages/pl_PL/lang.inc | 15 +++++++++++----
 languages/pt_BR/lang.inc | 11 +++++++++--
 languages/ro_RO/lang.inc | 13 ++++++++++---
 languages/ru_RU/lang.inc | 29 ++++++++++++++++++-----------
 languages/sk_SK/lang.inc |  7 +++++++
 languages/sv_SE/lang.inc | 15 +++++++++++----
 languages/tr_TR/lang.inc | 11 +++++++++--
 languages/uk_UA/lang.inc |  7 +++++++
 languages/zh_CN/lang.inc |  7 +++++++
 languages/zh_TW/lang.inc | 11 +++++++++--
 26 files changed, 246 insertions(+), 64 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index c305f1d63..858d8de51 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2266)
+//    Translators: Admin (2267)
 
 $text = array(
 '2_factor_auth' => 'توثيق ذو عاملين',
@@ -315,6 +315,7 @@ URL: [url]',
 'daily' => 'يومي',
 'databasesearch' => 'بحث قاعدة البيانات',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => 'تاريخ',
 'days' => 'أيام',
 'debug' => 'debug',
@@ -1459,6 +1460,8 @@ URL: [url]',
 'settings_onePageMode_desc' => '',
 'settings_overrideMimeType' => 'تجاوز نوع الملف',
 'settings_overrideMimeType_desc' => 'تجاوز نوع الملف',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => 'حجم القسم',
 'settings_partitionSize_desc' => 'حجم القسم',
 'settings_passwordExpiration' => 'انتهاء صلاحية كلمة المرور',
@@ -1554,9 +1557,11 @@ URL: [url]',
 'settings_System' => 'نظام',
 'settings_tasksInMenu' => 'قائمة المهام',
 'settings_tasksInMenu_approval' => 'موافقة قائمة المهام',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => 'قائمة المهام',
 'settings_tasksInMenu_needscorrection' => 'قائمة المهام تحتاج إلى تصحيح',
 'settings_tasksInMenu_receipt' => 'مستلم قائمة المهام',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => 'مراجعة قائمة المهام',
 'settings_tasksInMenu_revision' => 'مراجعة قائمة المهام',
 'settings_tasksInMenu_workflow' => 'سير عمل قائمة المهام',
@@ -1768,7 +1773,7 @@ URL: [url]',
 'to' => 'الى',
 'toggle_manager' => 'رجح مدير',
 'toggle_qrcode' => 'toggle toggle',
-'total' => '',
+'total' => 'ﺍﻼﺠﻣﺎﻠﻳ',
 'to_before_from' => 'إلى قبل من',
 'transfer_content' => 'تحويل المحتوى',
 'transfer_document' => 'تحويل مستند',
@@ -1872,6 +1877,8 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename]: [name] - تم مسح الاصدار',
 'version_info' => 'معلومات الاصدار',
 'view' => 'اعرض',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => 'شاهد اونلاين',
 'warning' => 'تحذير',
 'webauthn_auth' => '',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 0ea74b0ed..544b94e02 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (863)
+//    Translators: Admin (866)
 
 $text = array(
 '2_factor_auth' => '',
@@ -298,6 +298,7 @@ $text = array(
 'daily' => 'Ежедневно',
 'databasesearch' => 'Търсене по БД',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => 'Дата',
 'days' => 'дни',
 'debug' => '',
@@ -736,9 +737,9 @@ $text = array(
 'move_folder' => 'Премести папка',
 'my_account' => 'Моя акаунт',
 'my_documents' => 'Моите документи',
-'my_transmittals' => '',
+'my_transmittals' => 'Моите предавания',
 'name' => 'Име',
-'nb_NO' => '',
+'nb_NO' => 'Норвежки',
 'needs_correction' => '',
 'needs_workflow_action' => '',
 'network_drive' => '',
@@ -812,7 +813,7 @@ $text = array(
 'october' => 'октомври',
 'old' => 'Стар',
 'only_jpg_user_images' => 'Разрешени са само .jpg-изображения',
-'order_by_sequence_off' => '',
+'order_by_sequence_off' => 'Подреждането по последователност е изключено в настройките. Ако искате този параметър да има ефект, ще трябва да го включите отново.',
 'original_filename' => 'Оригинално име на файл',
 'overall_indexing_progress' => '',
 'owner' => 'Собственик',
@@ -1322,6 +1323,8 @@ $text = array(
 'settings_onePageMode_desc' => '',
 'settings_overrideMimeType' => '',
 'settings_overrideMimeType_desc' => '',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => 'Частичен размер на файла',
 'settings_partitionSize_desc' => 'Размер на частичните файлове в байтове, качвани чрез jumploader. Не установвявайте над максимално возможния размер, установен на сървъра.',
 'settings_passwordExpiration' => 'Валидност на парола',
@@ -1417,9 +1420,11 @@ $text = array(
 'settings_System' => 'Система',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => '',
 'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
 'settings_tasksInMenu_workflow' => '',
@@ -1721,6 +1726,8 @@ $text = array(
 'version_deleted_email_subject' => '',
 'version_info' => 'Информация за версията',
 'view' => 'Преглед',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => 'Преглед онлайн',
 'warning' => 'Внимание',
 'webauthn_auth' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index fc90c92f5..cdaf11271 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -303,6 +303,7 @@ URL: [url]',
 'daily' => 'Daily',
 'databasesearch' => 'Database search',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => 'Data',
 'days' => '',
 'debug' => '',
@@ -1327,6 +1328,8 @@ URL: [url]',
 'settings_onePageMode_desc' => '',
 'settings_overrideMimeType' => '',
 'settings_overrideMimeType_desc' => '',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => '',
 'settings_partitionSize_desc' => '',
 'settings_passwordExpiration' => '',
@@ -1422,9 +1425,11 @@ URL: [url]',
 'settings_System' => 'System',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => '',
 'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
 'settings_tasksInMenu_workflow' => '',
@@ -1726,6 +1731,8 @@ URL: [url]',
 'version_deleted_email_subject' => '',
 'version_info' => 'Informació de versió',
 'view' => '',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => 'Veure online',
 'warning' => 'Advertència',
 'webauthn_auth' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 956cd3088..fb031cc3c 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1531), kreml (579)
+//    Translators: Admin (1535), kreml (579)
 
 $text = array(
 '2_factor_auth' => 'dvoufaktorové ověření',
@@ -327,6 +327,7 @@ URL: [url]',
 'daily' => 'Denně',
 'databasesearch' => 'Vyhledání v databázi',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => 'Datum',
 'days' => 'dny',
 'debug' => 'odstranění chyb kódu',
@@ -684,9 +685,9 @@ 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_addnew' => '',
-'import_users_update' => '',
+'import_users' => 'Import uživatelů',
+'import_users_addnew' => 'Přidat nové uživatele',
+'import_users_update' => 'Aktualizovat existující uživatele',
 'include_content' => 'Včetně obsahu',
 'include_documents' => 'Včetně dokumentů',
 'include_subdirectories' => 'Včetně podadresářů',
@@ -1531,6 +1532,8 @@ Jméno: [username]
 'settings_onePageMode_desc' => '',
 'settings_overrideMimeType' => 'Přepsat typ MimeType',
 'settings_overrideMimeType_desc' => 'Přepsat MimeType dodaný prohlížečem, pokud je nahrán soubor. Nový MimeType je určen samotným SeedDMS.',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => 'Částečná velikost souboru',
 'settings_partitionSize_desc' => 'Velikost dílčích souborů v bajtech, nahraná jumploaderem. Nenastavujte hodnotu větší, než je maximální velikost odesílání nastavená serverem.',
 'settings_passwordExpiration' => 'Platnost hesla',
@@ -1626,9 +1629,11 @@ Jméno: [username]
 'settings_System' => 'System',
 'settings_tasksInMenu' => 'Vybrané úkoly',
 'settings_tasksInMenu_approval' => 'Schvalování',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => 'Vyberte ty úkoly, které mají být započítány. Není-li vybrán žádný, započítávají se všechny úkoly.',
 'settings_tasksInMenu_needscorrection' => 'vyžadována korektura',
 'settings_tasksInMenu_receipt' => 'Přijetí',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => 'Recenze',
 'settings_tasksInMenu_revision' => 'Revize',
 'settings_tasksInMenu_workflow' => 'Workflow',
@@ -1910,7 +1915,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' => '',
+'userdata_file' => 'Soubor uživatelů',
 'userid_groupid' => 'ID uživatel/ID skupiny',
 'users' => 'Uživatel',
 'users_and_groups' => 'Uživatelé / Skupiny',
@@ -1944,6 +1949,8 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename]: [name] - Verze smazána',
 'version_info' => 'Informace o verzi',
 'view' => 'Posouzení',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => 'Zobrazit online',
 'warning' => 'Upozornění',
 'webauthn_auth' => '',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 3815b1b0c..abe59576d 100644
--- 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 (2813), dgrutsch (22)
+//    Translators: Admin (2821), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -327,6 +327,7 @@ URL: [url]',
 'daily' => 'täglich',
 'databasesearch' => 'Datenbanksuche',
 'database_schema_version' => 'Version des Datenbankschemas',
+'data_loading' => 'Bitte warten, bis die Daten geladen sind …',
 'date' => 'Datum',
 'days' => 'Tage',
 'debug' => 'Debug',
@@ -477,7 +478,7 @@ URL: [url]',
 'dropfolderdir_missing' => 'Ihr persönlicher Ablageordner auf dem Server existiert nicht! Kontaktieren Sie den Administrator, um in anlegen zu lassen.',
 'dropfolder_file' => 'Datei aus Ablageordner',
 'dropfolder_folder' => 'Ordner aus Ablageordner',
-'dropfolder_metadata' => '',
+'dropfolder_metadata' => 'Metadaten der zu importierenen Dateien',
 'dropupload' => 'Direkt Hochladen',
 'drop_files_here' => 'Dateien hier hin ziehen!',
 'dump_creation' => 'DB dump erzeugen',
@@ -1542,6 +1543,8 @@ Name: [username]
 'settings_onePageMode_desc' => 'Der Einseiten-Modus schaltet javascript auf der ViewFolder-Seite ein, der die Ordner- und Dokumentenliste, die Navigation, etc. aktualisiert, wenn auf einen Ordner geklickt wird.',
 'settings_overrideMimeType' => 'Überschreibe MimeType',
 'settings_overrideMimeType_desc' => 'Überschreibe den MimeType, der vom Browser beim Hochladen einer Datei übertragen wird. Der neue MimeType wird von SeedDMS selbst ermittelt.',
+'settings_overrideTheme' => 'Theme überschreiben',
+'settings_overrideTheme_desc' => 'Einschalten, um die Einstellung des Themes im Benutzerkonto durch die Einstellung in der Konfiguration zu überschreiben.',
 'settings_partitionSize' => 'Partitionsgröße',
 'settings_partitionSize_desc' => 'Größe der partiellen Uploads in Bytes durch den Jumploader. Wählen Sie diesen Wert nicht größer als maximale Upload-Größe, die durch den Server vorgegeben ist.',
 'settings_passwordExpiration' => 'Passwortverfall',
@@ -1637,9 +1640,11 @@ Name: [username]
 'settings_System' => 'System',
 'settings_tasksInMenu' => 'Ausgewähtlte Aufgaben',
 'settings_tasksInMenu_approval' => 'Freigaben',
+'settings_tasksInMenu_checkedout' => 'Ausgechecked',
 'settings_tasksInMenu_desc' => 'Setzt die Aufgaben, die gezählt werden sollen. Wenn keine Aufgaben ausgewählt werden, werden alle gezählt.',
 'settings_tasksInMenu_needscorrection' => 'Korrektur erforderlich',
 'settings_tasksInMenu_receipt' => 'Empfangsbestätigungen',
+'settings_tasksInMenu_rejected' => 'Abgelehnt',
 'settings_tasksInMenu_review' => 'Prüfungen',
 'settings_tasksInMenu_revision' => 'Wiederholungsprüfungen',
 'settings_tasksInMenu_workflow' => 'Workflow',
@@ -1955,6 +1960,8 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename]: [name] - Version gelöscht',
 'version_info' => 'Versionsinformation',
 'view' => 'Ansicht',
+'view_document' => 'Dokumentendetails anzeigen',
+'view_folder' => 'Ordnerdetails anzeigen',
 'view_online' => 'Online betrachten',
 'warning' => 'Warnung',
 'webauthn_auth' => 'WebAuthn Authentifizierung',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index a79db8d21..9f7fdf84d 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (326)
+//    Translators: Admin (328)
 
 $text = array(
 '2_factor_auth' => '',
@@ -298,6 +298,7 @@ $text = array(
 'daily' => '',
 'databasesearch' => '',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => 'Ημερομηνία',
 'days' => 'μέρες',
 'debug' => '',
@@ -684,7 +685,7 @@ $text = array(
 'local_file' => 'Τοπικό αρχείο',
 'locked_by' => '',
 'lock_document' => 'Κλείδωμα',
-'lock_message' => '',
+'lock_message' => 'Αυτό το έγγραφο είναι κλειδωμένο από [username]. Μόνο εξουσιοδοτημένοι χρήστες μπορούν να ξεκλειδώσουν αυτό το έγγραφο.',
 'lock_status' => 'Κατάσταση',
 'logfile_loading' => '',
 'login' => 'Είσοδος',
@@ -1333,6 +1334,8 @@ URL: [url]',
 'settings_onePageMode_desc' => '',
 'settings_overrideMimeType' => '',
 'settings_overrideMimeType_desc' => '',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => '',
 'settings_partitionSize_desc' => '',
 'settings_passwordExpiration' => '',
@@ -1428,9 +1431,11 @@ URL: [url]',
 'settings_System' => '',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => '',
 'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
 'settings_tasksInMenu_workflow' => '',
@@ -1686,7 +1691,7 @@ URL: [url]',
 'unlinking_objects' => '',
 'unlock_cause_access_mode_all' => '',
 'unlock_cause_locking_user' => '',
-'unlock_document' => '',
+'unlock_document' => 'Ξεκλείδωμα',
 'update' => 'Ενημέρωση',
 'update_approvers' => '',
 'update_document' => 'Ενημέρωση εγγράφου',
@@ -1732,6 +1737,8 @@ URL: [url]',
 'version_deleted_email_subject' => '',
 'version_info' => 'Πληροφορίες έκδοσης',
 'view' => '',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => 'προβολή online',
 'warning' => 'Προειδοποίηση',
 'webauthn_auth' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 90279fd46..b382ad7b3 100644
--- 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 (1921), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1927), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -327,6 +327,7 @@ URL: [url]',
 'daily' => 'Daily',
 'databasesearch' => 'Database search',
 'database_schema_version' => 'Version of database schema',
+'data_loading' => 'Please wait, until the data is loaded …',
 'date' => 'Date',
 'days' => 'days',
 'debug' => 'Debug',
@@ -477,7 +478,7 @@ URL: [url]',
 'dropfolderdir_missing' => 'Your personal drop folder does not exist on the server! Please ask your administrator to create it.',
 'dropfolder_file' => 'File from drop folder',
 'dropfolder_folder' => 'Folder from drop folder',
-'dropfolder_metadata' => 'Metadata of the drop folder',
+'dropfolder_metadata' => 'Metadata of files to be imported',
 'dropupload' => 'Fast upload',
 'drop_files_here' => 'Drop files here!',
 'dump_creation' => 'DB dump creation',
@@ -1536,6 +1537,8 @@ Name: [username]
 'settings_onePageMode_desc' => 'One page mode will turn on javascript code on the ViewFolder page, which updates the folder/document list, navigation, etc. when clicking on a folder or changing the sort parameter.',
 'settings_overrideMimeType' => 'Override MimeType',
 'settings_overrideMimeType_desc' => 'Override the MimeType delivered by the browser, if a file is uploaded. The new MimeType is determined by SeedDMS itself.',
+'settings_overrideTheme' => 'Override theme',
+'settings_overrideTheme_desc' => 'Enable this for overriding the theme store in the user record with the theme configured in this configuration.',
 'settings_partitionSize' => 'Partial filesize',
 'settings_partitionSize_desc' => 'Size of partial files in bytes, uploaded by jumploader. Do not set a value larger than the maximum upload size set by the server.',
 'settings_passwordExpiration' => 'Password expiration',
@@ -1631,9 +1634,11 @@ Name: [username]
 'settings_System' => 'System',
 'settings_tasksInMenu' => 'Selected tasks',
 'settings_tasksInMenu_approval' => 'Approvals',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => 'Select those tasks which are to be counted. If none is selected, then all tasks will be counted.',
 'settings_tasksInMenu_needscorrection' => 'Correction needed',
 'settings_tasksInMenu_receipt' => 'Receipts',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => 'Reviews',
 'settings_tasksInMenu_revision' => 'Revisions',
 'settings_tasksInMenu_workflow' => 'Workflow',
@@ -1949,6 +1954,8 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename]: [name] - Version deleted',
 'version_info' => 'Version Information',
 'view' => 'View',
+'view_document' => 'View document details',
+'view_folder' => 'View folder details',
 'view_online' => 'View online',
 'warning' => 'Warning',
 'webauthn_auth' => 'WebAuthn Authentification',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index b61aad99c..924940bb8 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: acabello (20), Admin (1276), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1285), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -70,7 +70,7 @@ URL: [url]',
 'add_revision' => '',
 'add_role' => 'Agregar Usuario',
 'add_subfolder' => 'Añadir subcarpeta',
-'add_task' => '',
+'add_task' => 'Agregar nueva tarea a esta clase',
 'add_to_clipboard' => 'Añadir al portapapeles',
 'add_to_transmittal' => 'Añadir a transmisión',
 'add_transmittal' => '',
@@ -168,11 +168,11 @@ URL: [url]',
 'attrdef_type_email' => 'E-mail',
 'attrdef_type_float' => 'Número decimal',
 'attrdef_type_folder' => '',
-'attrdef_type_group' => '',
+'attrdef_type_group' => 'Grupo',
 'attrdef_type_int' => 'Número entero',
 'attrdef_type_string' => 'Texto',
 'attrdef_type_url' => 'URL',
-'attrdef_type_user' => '',
+'attrdef_type_user' => 'Usuario',
 'attrdef_valueset' => 'Conjunto de valores',
 'attrdef_valueset_help' => '',
 'attributes' => 'Atributos',
@@ -322,6 +322,7 @@ URL: [url]',
 'daily' => 'Diaria',
 'databasesearch' => 'Búsqueda en base de datos',
 'database_schema_version' => 'Versión del esquema de base de datos',
+'data_loading' => '',
 'date' => 'Fecha',
 'days' => 'días',
 'debug' => 'Depuración',
@@ -460,7 +461,7 @@ URL: [url]',
 'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Fichero de la carpeta destino',
 'dropfolder_folder' => 'Carpeta de la carpeta destino',
-'dropfolder_metadata' => 'Metadata de carpeta de destino',
+'dropfolder_metadata' => '',
 'dropupload' => 'Carga Rapida',
 'drop_files_here' => 'Arrastre archivos aquí!',
 'dump_creation' => 'Creación de volcado de BDD',
@@ -541,7 +542,7 @@ URL: [url]',
 'expire_in_1y' => 'Expira en 1 año',
 'expire_in_2h' => 'Vence en 2 horas',
 'expire_in_2y' => 'Expira en 2 años',
-'expire_in_3y' => '',
+'expire_in_3y' => 'Expira en 3 años',
 'expire_today' => 'Vence Hoy',
 'expire_tomorrow' => 'Vence mañana',
 'expiry_changed_email' => 'Fecha de caducidad modificada',
@@ -989,7 +990,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado
 'receipts_without_user' => 'Recibos sin usuario',
 'receipt_deletion_email_body' => '',
 'receipt_deletion_email_subject' => '',
-'receipt_log' => '',
+'receipt_log' => 'Log de recepción',
 'receipt_request_email_body' => '',
 'receipt_request_email_subject' => '',
 'receipt_status' => '',
@@ -1155,9 +1156,9 @@ URL: [url]',
 'saturday' => 'Sábado',
 'saturday_abbr' => 'S',
 'save' => 'Guardar',
-'scheduler_class' => '',
-'scheduler_class_description' => '',
-'scheduler_class_parameter' => '',
+'scheduler_class' => 'Clase',
+'scheduler_class_description' => 'Descripción',
+'scheduler_class_parameter' => 'Parametro',
 'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => 'Rrogramacion',
 'search' => 'Buscar',
@@ -1474,6 +1475,8 @@ URL: [url]',
 'settings_onePageMode_desc' => 'El modo una página encenderá el código javascript en la página visor de carpetas, el cual actualiza la lista de carpetas/documentos, navegación, etc. Al hacer click en una carpeta o al cambiar el parametro ordenar.',
 'settings_overrideMimeType' => 'Anular MimeType',
 'settings_overrideMimeType_desc' => 'Permitir que SeedDMS fije el tipo MIME sobreescribiendo el que haya definido el navegador durante el proceso de carga de un archivo.',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => 'Tamaño de fichero parcial',
 'settings_partitionSize_desc' => 'Tamaño de ficheros parciales en bytes, subidos por jumploader. No configurar un valor mayor que el tamaño máximo de subida configurado en el servidor.',
 'settings_passwordExpiration' => 'Caducidad de contraseña',
@@ -1569,9 +1572,11 @@ URL: [url]',
 'settings_System' => 'Sistema',
 'settings_tasksInMenu' => 'Tareas seleccionadas',
 'settings_tasksInMenu_approval' => 'Aprobaciones',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => 'Selecciona aquéllas tareas que serán contadas. Si no se selecciona alguna, todas la tareas serán contadas.',
 'settings_tasksInMenu_needscorrection' => 'Se requere correciones',
 'settings_tasksInMenu_receipt' => 'Recibos',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => 'Revisiones',
 'settings_tasksInMenu_revision' => 'Revisiones',
 'settings_tasksInMenu_workflow' => 'Flujo de trabajo',
@@ -1887,6 +1892,8 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename]: [name] - Versión eliminada',
 'version_info' => 'Información de versión',
 'view' => 'Vista',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => 'Ver online',
 'warning' => 'Advertencia',
 'webauthn_auth' => '',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 51a04099c..5636061b1 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1104), jeromerobert (50), lonnnew (9), Oudiceval (966)
+//    Translators: Admin (1105), jeromerobert (50), lonnnew (9), Oudiceval (970)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -243,7 +243,7 @@ URL: [url]',
 'change_assignments' => 'Changer les affectations',
 'change_password' => 'Changer de mot de passe',
 'change_password_message' => 'Votre mot de passe a été changé.',
-'change_recipients' => 'Définir destinataires',
+'change_recipients' => 'Définir les destinataires',
 'change_revisors' => 'Définir les réviseurs',
 'change_status' => 'Modifier le statut',
 'charts' => 'Graphiques',
@@ -327,6 +327,7 @@ URL: [url]',
 'daily' => 'Journalier',
 'databasesearch' => 'Recherche dans la base de données',
 'database_schema_version' => 'Version du schéma de base de données',
+'data_loading' => '',
 'date' => 'Date',
 'days' => 'jours',
 'debug' => 'Débogage',
@@ -477,7 +478,7 @@ URL: [url]',
 'dropfolderdir_missing' => 'Votre dossier de dépôt personnel n\'existe pas sur le serveur ! Veuillez faire une demande à l\'administrateur.',
 'dropfolder_file' => 'Fichier du dossier de dépôt',
 'dropfolder_folder' => 'Répertoire du dossier de dépôt',
-'dropfolder_metadata' => 'Métadonnées du dossier de dépôt',
+'dropfolder_metadata' => '',
 'dropupload' => 'Téléchargement rapide',
 'drop_files_here' => 'Glissez les fichiers ici !',
 'dump_creation' => 'Sauvegarder la base de données',
@@ -519,7 +520,7 @@ URL: [url]',
 'empty_folder_list' => 'Pas de documents ou de dossier',
 'empty_list' => 'Aucune entrée',
 'empty_notify_list' => 'Aucune entrée',
-'enable_extension' => '',
+'enable_extension' => 'Activer l’extension',
 'en_GB' => 'Anglais (RU)',
 'equal_transition_states' => 'États de début et de fin identiques',
 'error' => 'Erreur',
@@ -1257,7 +1258,7 @@ URL : [url]',
 'select_ind_revisors' => 'Cliquer pour choisir un réviseur individuel',
 'select_mimetype' => '',
 'select_one' => 'Selectionner',
-'select_owner' => '',
+'select_owner' => 'Sélectionner un propriétaire',
 'select_user' => 'Sélectionner un utilisateur',
 'select_users' => 'Cliquer pour choisir un utilisateur',
 'select_value' => 'Sélectionner une valeur',
@@ -1534,6 +1535,8 @@ Nom : [username]
 'settings_onePageMode_desc' => 'Le mode Page unique activera le code javascript dans la page AfficherDossier, qui va mettre à jour la liste Dossier/Document, navigation, etc quand vous cliquez sur un dossier ou vous changer le parametre de l\'ordre d\'affichage.',
 'settings_overrideMimeType' => 'Passer outre le type MIME',
 'settings_overrideMimeType_desc' => 'Ne pas tenir compte du type MIME envoyé par le navigateur quand un fichier est téléversé. Le type MIME sera déterminé par SeedDMS.',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => 'Taille des fichiers partiels téléchargées par jumploader',
 'settings_partitionSize_desc' => 'Taille des fichiers partiels en octets, téléchargées par jumploader. Ne pas fixer une valeur plus grande que la taille de transfert maximale définie par le serveur.',
 'settings_passwordExpiration' => 'Expiration du mot de passe',
@@ -1629,9 +1632,11 @@ Nom : [username]
 'settings_System' => 'Système',
 'settings_tasksInMenu' => 'Tâches sélectionnées',
 'settings_tasksInMenu_approval' => 'Approbations',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => 'Sélectionnez les tâches à comptabiliser. Si aucune n’est sélectionnée, toutes les tâches seront comptabilisées.',
 'settings_tasksInMenu_needscorrection' => 'Nécessitant une correction',
 'settings_tasksInMenu_receipt' => 'Réceptions',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => 'Vérifications',
 'settings_tasksInMenu_revision' => 'Révisions',
 'settings_tasksInMenu_workflow' => 'Workflow',
@@ -1683,7 +1688,7 @@ Nom : [username]
 'splash_add_group_member' => 'Nouveau membre ajouté au groupe',
 'splash_add_role' => 'Nouveau rôle ajouté',
 'splash_add_task' => 'Nouvelle tâche ajoutée',
-'splash_add_to_transmittal' => 'Ajouter à la transmission',
+'splash_add_to_transmittal' => 'Ajouté à la transmission',
 'splash_add_transmittal' => 'Ajouté à la transmission',
 'splash_add_user' => 'Nouvel utilisateur ajouté',
 'splash_cleared_cache' => 'Cache vidé',
@@ -1947,6 +1952,8 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename] : [name] - Version supprimée',
 'version_info' => 'Informations de version',
 'view' => 'Aperçu',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => 'Aperçu en ligne',
 'warning' => 'Avertissement',
 'webauthn_auth' => 'Authentification WebAuthn',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index f2d939ab7..12752f784 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -327,6 +327,7 @@ Internet poveznica: [url]',
 'daily' => 'Dnevno',
 'databasesearch' => 'Pretraživanje baze podataka',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => 'Datum',
 'days' => 'dani',
 'debug' => 'Ispravljanje',
@@ -1495,6 +1496,8 @@ Internet poveznica: [url]',
 'settings_onePageMode_desc' => '',
 'settings_overrideMimeType' => 'Premosti tip datoteke',
 'settings_overrideMimeType_desc' => 'Premošćivanje tipa datoteke određenog od strane pretraživača ako je datoteka učitana. Novi tip datoteke se određuje od strane DMS sustava.',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => 'Veličina djelomične datoteke',
 'settings_partitionSize_desc' => 'Veličine djelomičnih datoteka u bajtovima, učitane s jumploader-om. Ne postavljajte vrijednot veću od max. veličine učitavanja koju je postavio server.',
 'settings_passwordExpiration' => 'Istek lozinke',
@@ -1590,9 +1593,11 @@ Internet poveznica: [url]',
 'settings_System' => 'Sustav',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => '',
 'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
 'settings_tasksInMenu_workflow' => '',
@@ -1908,6 +1913,8 @@ Internet poveznica: [url]',
 'version_deleted_email_subject' => '[sitename]: [name] - Izbrisana verzija',
 'version_info' => 'Informacije o verziji',
 'view' => 'Pregled',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => 'Online pregled',
 'warning' => 'Upozorenje',
 'webauthn_auth' => '',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 63f8aa29d..1fa5a0883 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -322,6 +322,7 @@ URL: [url]',
 'daily' => 'Napi',
 'databasesearch' => 'Adatbázis keresés',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => 'Dátum',
 'days' => 'nap',
 'debug' => 'Hibakeresés',
@@ -1473,6 +1474,8 @@ URL: [url]',
 'settings_onePageMode_desc' => '',
 'settings_overrideMimeType' => 'A Mime típus felülbírálása',
 'settings_overrideMimeType_desc' => 'A fájl feltöltése esetén felülbírálja a böngésző által szállított Mime típust. Az új Mime típust maga a SeedDMS határozza meg.',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => 'Részleges fájlméret',
 'settings_partitionSize_desc' => 'A részleges állományok mérete, amelyek a jumploader segítségével lesznek feltöltve. Ne adjon meg magasabb értéket, mint a szerveren beállított legnagyobb feltölthető állomány méret.',
 'settings_passwordExpiration' => 'Jelszó lejárat',
@@ -1568,9 +1571,11 @@ URL: [url]',
 'settings_System' => 'Rendszer',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => '',
 'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
 'settings_tasksInMenu_workflow' => '',
@@ -1886,6 +1891,8 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename]: [name] - Változat törölve',
 'version_info' => 'Verzió információ',
 'view' => 'Nézet',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => 'Online megtekintés',
 'warning' => 'Figyelmeztetés',
 'webauthn_auth' => '',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 2209473ed..cbd2a01cd 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -327,6 +327,7 @@ URL: [url]',
 'daily' => 'Giornaliero',
 'databasesearch' => 'Ricerca nel Database',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => 'Data',
 'days' => 'Giorni',
 'debug' => 'Localizzare e rimuovere errori da (Debug)',
@@ -1522,6 +1523,8 @@ Name: [username]
 'settings_onePageMode_desc' => '',
 'settings_overrideMimeType' => 'Ignora MimeType',
 'settings_overrideMimeType_desc' => 'Ignora il MimeType impostato dal browser, se un file viene caricato. Il MimeType è determinato ed impostato dal DMS stesso.',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => 'Dimensione file parziale',
 'settings_partitionSize_desc' => 'Dimensione parziale dei files caricati da Jumploader in bytes. Non impostare un valore maggiore del massimo carico di upload attribuito dal server.',
 'settings_passwordExpiration' => 'Scadenza Password',
@@ -1617,9 +1620,11 @@ Name: [username]
 'settings_System' => 'Sistema',
 'settings_tasksInMenu' => 'Attività selezionate',
 'settings_tasksInMenu_approval' => 'Approvazioni',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => 'Seleziona le attività da conteggiare. Se non ne sono state selezionate, verranno conteggiate tutte le attività.',
 'settings_tasksInMenu_needscorrection' => 'Correzioni necessarie',
 'settings_tasksInMenu_receipt' => 'Ricevute',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => 'Revisioni',
 'settings_tasksInMenu_revision' => 'Riesami',
 'settings_tasksInMenu_workflow' => 'Flusso di lavoro',
@@ -1935,6 +1940,8 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename]: [name] - Versione cancellata',
 'version_info' => 'Informazioni versione',
 'view' => 'Visualizza',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => 'Visualizza on-line',
 'warning' => 'Attenzione',
 'webauthn_auth' => '',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 9b1b3ce3b..222395b78 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -330,6 +330,7 @@ URL: [url]',
 'daily' => '매일',
 'databasesearch' => '데이터베이스 검색',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => '날짜',
 'days' => '일',
 'debug' => '디버그',
@@ -1489,6 +1490,8 @@ URL : [url]',
 'settings_onePageMode_desc' => '',
 'settings_overrideMimeType' => 'MIME 타입 재정의',
 'settings_overrideMimeType_desc' => '파일이 업로드 되는 경우, 브라우저에 의해 제공되는 MIME 타입을 재정의 합니다. 새로운 MIME 타입은 SeedDMS에 의해 결정 됩니다.',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => '조각 파일 크기',
 'settings_partitionSize_desc' => 'jumploader의 조각 업로드 파일의 크기(Byte). 서버에서 설정 한 최대 업로드 크기 보다 큰 값을 설정하지 마십시오.',
 'settings_passwordExpiration' => '암호 만료',
@@ -1584,9 +1587,11 @@ URL : [url]',
 'settings_System' => '시스템',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => '',
 'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
 'settings_tasksInMenu_workflow' => '',
@@ -1902,6 +1907,8 @@ URL : [url]',
 'version_deleted_email_subject' => '[sitename] : [name] - 버전 삭제',
 'version_info' => '버전 정보',
 'view' => '보기',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => '온라인으로 보기',
 'warning' => '경고',
 'webauthn_auth' => '',
diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc
index 88ada726f..332bdc640 100644
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@@ -325,6 +325,7 @@ URL: [url]',
 'daily' => 'ປະຈຳວັນ',
 'databasesearch' => 'ຄົ້ນຫາຖານຂໍ້ມູນ',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => 'ວັນທີ',
 'days' => 'ວັນ',
 'debug' => 'ກວດແກ້ຈຸດບົກຜ່ອງ',
@@ -1515,6 +1516,8 @@ URL: [url]',
 'settings_onePageMode_desc' => '',
 'settings_overrideMimeType' => 'ชนิดละครใบ้แทนที่',
 'settings_overrideMimeType_desc' => 'แทนที่ ชนิดละครใบ้ ที่จัดส่งโดยเบราว์เซอร์ถ้าไฟล์ถูกอัปโหลด ชนิดละครใบ้ใหม่จะถูกกำหนดโดย SeedDMS เอง.',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => 'ໄຟລບາງສ່ວນ',
 'settings_partitionSize_desc' => 'ຂະໜາດຂອງໄຟລບາງສ່ວນເປັນໄບຣທີອັບໂຫລດ,ບໍ່ສາມາດຕັ້ງຄ່າທີ່ໃຫ່ຍກ່ວາຂະໜາດອັບໂຫຼດສູງສຸດທີກຳນົດໂດຍເຊີເວີ',
 'settings_passwordExpiration' => 'ລະຫັດໝົດອາຍຸ',
@@ -1610,9 +1613,11 @@ URL: [url]',
 'settings_System' => 'ລະບົບ',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => '',
 'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
 'settings_tasksInMenu_workflow' => '',
@@ -1928,6 +1933,8 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename]:[name] - ເວີຊັ້ນທີຖືກລົບ',
 'version_info' => 'ຂໍ້ມູນເວີຊັນ',
 'view' => 'ດູ',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => 'ດູອອນລາຍ',
 'warning' => 'ການເຕືອນ',
 'webauthn_auth' => '',
diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc
index 8701bfcb0..9a8bf68ac 100644
--- a/languages/nb_NO/lang.inc
+++ b/languages/nb_NO/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 (1729)
+//    Translators: Admin (1730)
 
 $text = array(
 '2_factor_auth' => '2-trinns autentisering',
@@ -327,6 +327,7 @@ URL: [url]',
 'daily' => 'Daglig',
 'databasesearch' => 'Søk i database',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => 'Dato',
 'days' => 'dager',
 'debug' => 'Feilsøking',
@@ -477,7 +478,7 @@ URL: [url]',
 'dropfolderdir_missing' => 'Din personlige slippmappe eksisterer ikke på serveren! Be administratoren din om å opprette den.',
 'dropfolder_file' => 'Fil fra personlige slippmappe',
 'dropfolder_folder' => 'Katalog fra personlige slippmappe',
-'dropfolder_metadata' => 'Metadata fra personlige slippmappe',
+'dropfolder_metadata' => '',
 'dropupload' => 'Hurtig opplasting',
 'drop_files_here' => 'Dra filene hit!',
 'dump_creation' => 'Lag database-dump',
@@ -1528,6 +1529,8 @@ Bruker: [username]
 'settings_onePageMode_desc' => 'En sidemodus vil slå på javascript-kode på ViewFolder-siden, som oppdaterer mappe/dokumentliste, navigasjon osv. Når du klikker på en mappe eller endrer sorteringsparameter.',
 'settings_overrideMimeType' => 'Overstyr Mime-type',
 'settings_overrideMimeType_desc' => 'Overstyr Mime-type levert av nettleseren, hvis en fil lastes opp. Den nye Mime-type bestemmes av SeedDMS selv.',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => 'Oppdelt filstørrrelse',
 'settings_partitionSize_desc' => 'Størrelse på oppdelte filer i byte, lastet opp av jumploader. Ikke angi en verdi som er større enn den maksimale opplastningsstørrelsen som er angitt av serveren.',
 'settings_passwordExpiration' => 'Utløp av passord',
@@ -1623,9 +1626,11 @@ Bruker: [username]
 'settings_System' => 'System',
 'settings_tasksInMenu' => 'Valgte oppgaver',
 'settings_tasksInMenu_approval' => 'Godkjenninger',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => 'Velg oppgavene som skal telles. Hvis ingen er valgt, telles alle oppgavene.',
 'settings_tasksInMenu_needscorrection' => 'Retting nødvendig',
 'settings_tasksInMenu_receipt' => 'Kvitteringer',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => 'Korrigeringer',
 'settings_tasksInMenu_revision' => 'Revisjoner',
 'settings_tasksInMenu_workflow' => 'Arbeidsflyt',
@@ -1941,6 +1946,8 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename]: [name] - Versjon slettet',
 'version_info' => 'Versjons informasjon',
 'view' => 'Vis',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => 'Vis på nett',
 'warning' => 'Advarsel',
 'webauthn_auth' => '',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 8e768a45b..3464efecb 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -320,6 +320,7 @@ URL: [url]',
 'daily' => 'Dagelijks',
 'databasesearch' => 'Zoek in Database',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => 'Datum',
 'days' => 'Dagen',
 'debug' => 'debug',
@@ -1512,6 +1513,8 @@ Name: [username]
 'settings_onePageMode_desc' => '',
 'settings_overrideMimeType' => 'Override MimeType',
 'settings_overrideMimeType_desc' => 'Override MimeType',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => 'Partitie-grootte',
 'settings_partitionSize_desc' => 'Omvang van de partitie in bytes, geüpload door jumploader. Zet de waarde niet hoger dan de maximum upload grootte van de server.',
 'settings_passwordExpiration' => 'Wachtwoord verloopt',
@@ -1607,9 +1610,11 @@ Name: [username]
 'settings_System' => 'Systeem',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => '',
 'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
 'settings_tasksInMenu_workflow' => '',
@@ -1925,6 +1930,8 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename]: [name] - Versie verwijderd',
 'version_info' => 'Versie Informatie',
 'view' => 'Bekijk',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => 'Bekijk online',
 'warning' => 'Waarschuwing',
 'webauthn_auth' => '',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 51db7318d..bdefae0d1 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1452), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (1455), netixw (84), romi (93), uGn (112)
 
 $text = array(
 '2_factor_auth' => 'Uwierzytelnianie dwuetapowe',
@@ -165,7 +165,7 @@ URL: [url]',
 'attrdef_type_int' => 'Liczba całkowita',
 'attrdef_type_string' => 'Ciąg znaków',
 'attrdef_type_url' => 'URL',
-'attrdef_type_user' => '',
+'attrdef_type_user' => 'Użytkownik',
 'attrdef_valueset' => 'Zestaw wartości',
 'attrdef_valueset_help' => '',
 'attributes' => 'Atrybuty',
@@ -315,6 +315,7 @@ URL: [url]',
 'daily' => 'Codziennie',
 'databasesearch' => 'Przeszukiwanie bazy danych',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => 'Data',
 'days' => 'dni',
 'debug' => 'Debugowanie',
@@ -453,7 +454,7 @@ URL: [url]',
 'dropfolderdir_missing' => 'Twój osobisty folder zrzutu nie istnieje na serwerze! Poproś swojego administratora o jego utworzenie.',
 'dropfolder_file' => 'Plik z folderu zrzutu',
 'dropfolder_folder' => 'Katalog ze strefy zrzutu',
-'dropfolder_metadata' => 'Metadane folderu zrzutu',
+'dropfolder_metadata' => '',
 'dropupload' => 'Szybki upload',
 'drop_files_here' => 'Przeciągnij tu pliki!',
 'dump_creation' => 'Utworzenie zrzutu bazy danych',
@@ -534,7 +535,7 @@ URL: [url]',
 'expire_in_1y' => 'Wygasa po 1 roku',
 'expire_in_2h' => 'Wygasa po 2 godzinach',
 'expire_in_2y' => 'Wygasa po 2 latach',
-'expire_in_3y' => '',
+'expire_in_3y' => 'Wygasa za 3 lata',
 'expire_today' => 'Wygasa dzisiaj',
 'expire_tomorrow' => 'Wygasa jutro',
 'expiry_changed_email' => 'Zmieniona data wygaśnięcia',
@@ -1458,6 +1459,8 @@ Name: [username]
 'settings_onePageMode_desc' => 'Tryb jednostronicowy włączy kod javascript na stronie Wyświetl folder, który aktualizuje listę folderów / dokumentów, nawigację itp. Po kliknięciu folderu lub zmianie parametru sortowania.',
 'settings_overrideMimeType' => 'Nadpisz typ rozszerzenia',
 'settings_overrideMimeType_desc' => 'Zastąp typ MimeType dostarczony przez przeglądarkę, jeśli plik zostanie przesłany. Nowy typ MimeType jest określany przez sam SeedDMS.',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => 'Rozmiar części pliku',
 'settings_partitionSize_desc' => 'Rozmiar części pliku, w bajtach, wczytywane przez jumploader. Nie wpisuj wartości większej niż maksymalna wartość wczytywanego pliku ustawiona na serwerze.',
 'settings_passwordExpiration' => 'Wygaśnięcie hasła',
@@ -1553,9 +1556,11 @@ Name: [username]
 'settings_System' => 'System',
 'settings_tasksInMenu' => 'Wybrane zadania',
 'settings_tasksInMenu_approval' => 'Zatwierdzone',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => 'Wybierz te zadania, które mają być zliczane. Jeśli żadna opcja nie zostanie wybrana, wszystkie zadania zostaną policzone.',
 'settings_tasksInMenu_needscorrection' => 'Konieczna korekta',
 'settings_tasksInMenu_receipt' => 'Wpływy',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => 'Recenzji',
 'settings_tasksInMenu_revision' => 'Korekty',
 'settings_tasksInMenu_workflow' => 'Przepływu pracy',
@@ -1871,6 +1876,8 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename]: [name] - Usunięcie wersji',
 'version_info' => 'Informacje o wersji',
 'view' => 'Widok',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => 'Obejrzyj online',
 'warning' => 'Ostrzeżenie',
 'webauthn_auth' => 'Uwierzytelnianie WebAuthn',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 3e89d6d53..adecb0592 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1842), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (1843), flaviove (627), lfcristofoli (352)
 
 $text = array(
 '2_factor_auth' => 'Autenticação de dois fatores',
@@ -327,6 +327,7 @@ URL: [url]',
 'daily' => 'Diariamente',
 'databasesearch' => 'Pesquisar Base de dados',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => 'Data',
 'days' => 'dias',
 'debug' => 'Debug',
@@ -477,7 +478,7 @@ URL: [url]',
 'dropfolderdir_missing' => 'Sua pasta suspensa pessoal não existe no servidor! Por favor, peça ao seu administrador para criá-lo.',
 'dropfolder_file' => 'Arquivo de pasta suspensa',
 'dropfolder_folder' => 'Pasta da pasta-alvo',
-'dropfolder_metadata' => 'soltar metadados da pasta',
+'dropfolder_metadata' => '',
 'dropupload' => 'Envio rápido',
 'drop_files_here' => 'Solte os arquivos aqui!',
 'dump_creation' => 'Criação de despejo de banco de dados',
@@ -1534,6 +1535,8 @@ Nome: [username]
 'settings_onePageMode_desc' => 'O modo de uma página ativará o código javascript na página do ViewFolder, que atualiza a lista de pastas / documentos, navegação, etc. ao clicar em uma pasta ou alterar o parâmetro de classificação.',
 'settings_overrideMimeType' => 'Substituir MimeType',
 'settings_overrideMimeType_desc' => 'Substitua o MimeType entregue pelo navegador, se um arquivo for carregado. O novo MimeType é determinado pelo próprio Sistema GED.',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => 'Tamanho de arquivo parcial',
 'settings_partitionSize_desc' => 'Tamanho dos arquivos parciais em bytes, enviados por jumploader. Não defina um valor maior do que o tamanho máximo de carregamento definido pelo servidor.',
 'settings_passwordExpiration' => 'Expiração de senha',
@@ -1629,9 +1632,11 @@ Nome: [username]
 'settings_System' => 'Sistema',
 'settings_tasksInMenu' => 'Tarefas selecionadas',
 'settings_tasksInMenu_approval' => 'Aprovações',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => 'Selecione as tarefas que devem ser contadas. Se nenhuma for selecionado, todas as tarefas serão contadas.',
 'settings_tasksInMenu_needscorrection' => 'Correção necessária',
 'settings_tasksInMenu_receipt' => 'Recibos',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => 'Avaliações',
 'settings_tasksInMenu_revision' => 'Revisões',
 'settings_tasksInMenu_workflow' => 'Fluxo de trabalho',
@@ -1947,6 +1952,8 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename]: [name] - Versão eliminada',
 'version_info' => 'Informações da versão',
 'view' => 'Visualizar',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => 'Ver online',
 'warning' => 'Aviso',
 'webauthn_auth' => '',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index e9e49c71b..36f1f8af3 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1099), balan (87)
+//    Translators: Admin (1101), balan (87)
 
 $text = array(
 '2_factor_auth' => '',
@@ -327,6 +327,7 @@ URL: [url]',
 'daily' => 'Zilnic',
 'databasesearch' => 'Căutare baza de date',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => 'Data',
 'days' => 'zile',
 'debug' => '',
@@ -546,7 +547,7 @@ URL: [url]',
 'expire_in_1y' => 'Expira in un an',
 'expire_in_2h' => '',
 'expire_in_2y' => 'Expira in 2 ani',
-'expire_in_3y' => '',
+'expire_in_3y' => 'Expira in 3 ani',
 'expire_today' => '',
 'expire_tomorrow' => '',
 'expiry_changed_email' => 'Data de expirare schimbată',
@@ -665,7 +666,7 @@ URL: [url]',
 'import_extension' => '',
 'import_fs' => 'Import din filesystem',
 'import_fs_warning' => '',
-'import_users' => '',
+'import_users' => 'Importa utilizatori',
 'import_users_addnew' => '',
 'import_users_update' => '',
 'include_content' => '',
@@ -1496,6 +1497,8 @@ URL: [url]',
 'settings_onePageMode_desc' => '',
 'settings_overrideMimeType' => 'Suprascrie MMimeType',
 'settings_overrideMimeType_desc' => 'Suprascrie MimeType expus de browser, dacă un fișier este încărcat. MimeType este determinat de SeedDMS.',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => 'Dimensiune fișier parțială',
 'settings_partitionSize_desc' => 'Mărimea fișierelor parțiale în bytes, încărcate de jumploader. Nu setați o valoare mai mare decât dimensiunea maximă de încărcare stabilită de server.',
 'settings_passwordExpiration' => 'Expirare parolă',
@@ -1591,9 +1594,11 @@ URL: [url]',
 'settings_System' => 'Sistem',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => '',
 'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
 'settings_tasksInMenu_workflow' => '',
@@ -1909,6 +1914,8 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename]: [name] - Versiune ștearsă',
 'version_info' => 'Informații versiune',
 'view' => 'Vizualizare',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => 'Vizualizare online',
 'warning' => 'Avertisment',
 'webauthn_auth' => '',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index fcf5d3628..4d710bbf2 100644
--- 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 (1687)
+//    Translators: Admin (1697)
 
 $text = array(
 '2_factor_auth' => 'Двухфакторная аутентификация',
@@ -327,6 +327,7 @@ URL: [url]',
 'daily' => 'Ежедневно',
 'databasesearch' => 'Поиск по БД',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => 'Дата',
 'days' => 'дни',
 'debug' => 'Отладка',
@@ -360,10 +361,10 @@ URL: [url]',
 'documents_to_revise' => 'Документы на ревизии',
 'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
-'documents_user_expiration' => '',
+'documents_user_expiration' => 'Просроченный документ',
 'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
-'documents_user_obsolete' => '',
+'documents_user_obsolete' => 'Устаревшие документы',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Отклоненные документы',
 'documents_user_requiring_attention' => 'Ваши документы, требующие внимания',
@@ -505,7 +506,7 @@ URL: [url]',
 'email_not_given' => 'Введите настоящий адрес e-mail.',
 'empty_attribute_group_list' => 'Пустой список группы атрибутов',
 'empty_folder_list' => 'Нет документов или каталогов',
-'empty_list' => '',
+'empty_list' => 'Записи отсутствуют',
 'empty_notify_list' => 'Нет записей',
 'enable_extension' => '',
 'en_GB' => 'English (GB)',
@@ -769,7 +770,7 @@ URL: [url]',
 'lock_document' => 'Заблокировать',
 'lock_message' => 'Документ заблокировал(а) [username]. Только имеющие права могут его разблокировать.',
 'lock_status' => 'Статус',
-'logfile_loading' => '',
+'logfile_loading' => 'Подождите, идет загрузка лог-файла',
 'login' => 'Логин',
 'login_disabled_text' => 'Ваша учётная запись заблокирована, возможно, из-за нескольких неудачных попыток входа.',
 'login_disabled_title' => 'Учётная запись заблокирована',
@@ -862,7 +863,7 @@ URL: [url]',
 'next_state' => 'Новое состояние',
 'nl_NL' => 'Dutch',
 'no' => 'Нет',
-'notification' => '',
+'notification' => 'Уведомление',
 'notify_added_email' => 'Вы добавлены в список уведомлений',
 'notify_added_email_body' => 'Вы добавлены в список уведомлений
 Имя: [name]
@@ -883,7 +884,7 @@ URL: [url]',
 'no_approval_needed' => 'Утверждение не требуется',
 'no_attached_files' => 'Нет вложений',
 'no_attribute_definitions' => '',
-'no_backup_dir' => '',
+'no_backup_dir' => 'Директория для архивирования не установлена',
 'no_current_version' => 'Вы используете старую версию SeedDMS. Последняя доступная версия [latestversion].',
 'no_default_keywords' => 'Нет меток',
 'no_docs_checked_out' => 'Нет документов на рассмотрении',
@@ -1212,7 +1213,7 @@ URL: [url]',
 'select_attrdefgrp_show' => '',
 'select_attribute_value' => '',
 'select_category' => 'Выберите категорию',
-'select_group' => '',
+'select_group' => 'Выберите группу',
 'select_groups' => 'Выберите группы',
 'select_grp_approvers' => 'Выберите утверждающую группу',
 'select_grp_ind_approvers' => 'Выберите группу',
@@ -1232,7 +1233,7 @@ URL: [url]',
 'select_mimetype' => '',
 'select_one' => 'Выберите',
 'select_owner' => '',
-'select_user' => '',
+'select_user' => 'Выберите пользователя',
 'select_users' => 'Выберите пользователей',
 'select_value' => 'Выберите значение',
 'select_workflow' => 'Выберите процесс',
@@ -1493,16 +1494,18 @@ URL: [url]',
 'settings_maxUploadSize' => 'Максимальный размер загружаемых файлов',
 'settings_maxUploadSize_desc' => 'Это максимальный размер загружаемых файлов. Он повлияет на версии документов и вложения.',
 'settings_more_settings' => 'Прочие настройки. Логин по умолчанию: admin/admin',
-'settings_noDocumentFormFields' => '',
+'settings_noDocumentFormFields' => 'Не показывать поле',
 'settings_noDocumentFormFields_desc' => '',
 'settings_notfound' => 'Не найден',
 'settings_Notification' => 'Настройки извещения',
 'settings_notwritable' => 'Конфигурация не может быть сохранена, потому что файл конфигурации только для чтения.',
 'settings_no_content_dir' => 'Каталог содержимого',
-'settings_onePageMode' => '',
+'settings_onePageMode' => 'Одностраничный режим',
 'settings_onePageMode_desc' => '',
 'settings_overrideMimeType' => 'Переопределить mime тип',
 'settings_overrideMimeType_desc' => 'Переопределение mime типа предоставленного браузером, если файл загружен. Новый mime тип определяется самой SeedDMS.',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => 'Частичный размер файла',
 'settings_partitionSize_desc' => 'Размер частичных файлов в байтах, загружаемых через jumploader. Не устанавливать выше максимально возможного размера, установленного на сервере.',
 'settings_passwordExpiration' => 'Срок действия пароля',
@@ -1598,9 +1601,11 @@ URL: [url]',
 'settings_System' => 'Система',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => '',
 'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
 'settings_tasksInMenu_workflow' => '',
@@ -1916,6 +1921,8 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename]: удалена версия «[name]»',
 'version_info' => 'Информация о версии',
 'view' => 'Просмотр',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => 'Просмотреть',
 'warning' => 'Внимание',
 'webauthn_auth' => '',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index d929d77db..6b339e3ab 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -327,6 +327,7 @@ URL: [url]',
 'daily' => 'Denná',
 'databasesearch' => 'Hľadať databázu',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => 'Dátum',
 'days' => 'dní',
 'debug' => 'Ladiť',
@@ -1536,6 +1537,8 @@ Meno: [username]
 'settings_onePageMode_desc' => '',
 'settings_overrideMimeType' => 'Override MimeType',
 'settings_overrideMimeType_desc' => 'Override the MimeType delivered by the browser, if a file is uploaded. The new MimeType is determined by SeedDMS itself.',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => 'Čiastočná veľkosť súboru',
 'settings_partitionSize_desc' => 'Size of partial files in bytes, uploaded by jumploader. Do not set a value larger than the maximum upload size set by the server.',
 'settings_passwordExpiration' => 'Vypršanie hesla',
@@ -1631,9 +1634,11 @@ Meno: [username]
 'settings_System' => 'Systém',
 'settings_tasksInMenu' => 'Selected tasks',
 'settings_tasksInMenu_approval' => 'Approvals',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => 'Select those tasks which are to be counted. If none is selected, then all tasks will be counted.',
 'settings_tasksInMenu_needscorrection' => 'Correction needed',
 'settings_tasksInMenu_receipt' => 'Reviews',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => 'Receipts',
 'settings_tasksInMenu_revision' => 'Revisions',
 'settings_tasksInMenu_workflow' => 'Workflow',
@@ -1949,6 +1954,8 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename]: [name] - Verzia bola odstránená',
 'version_info' => 'Informácie o verzii',
 'view' => 'Zobraziť',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => 'Zobraziť online',
 'warning' => 'Upozornenie',
 'webauthn_auth' => '',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index a6530313c..e873a1957 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1162), MagnusI (649), tmichelfelder (106)
+//    Translators: Admin (1165), MagnusI (649), tmichelfelder (106)
 
 $text = array(
 '2_factor_auth' => '2-faktors autentisering',
@@ -170,10 +170,10 @@ URL: [url]',
 'attrdef_type' => 'Typ',
 'attrdef_type_boolean' => 'Logisk',
 'attrdef_type_date' => 'Datum',
-'attrdef_type_document' => '',
+'attrdef_type_document' => 'Dokument',
 'attrdef_type_email' => 'E-post',
 'attrdef_type_float' => 'Flyttal',
-'attrdef_type_folder' => '',
+'attrdef_type_folder' => 'Mapp',
 'attrdef_type_group' => '',
 'attrdef_type_int' => 'Heltal',
 'attrdef_type_string' => 'Textsträng',
@@ -328,6 +328,7 @@ URL: [url]',
 'daily' => 'Dagligen',
 'databasesearch' => 'Sök databas',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => 'Datum',
 'days' => 'dagar',
 'debug' => 'Felsökning',
@@ -671,7 +672,7 @@ 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' => 'Importera användare',
 'import_users_addnew' => '',
 'import_users_update' => '',
 'include_content' => 'Inkudera innehåll',
@@ -1509,6 +1510,8 @@ Kommentar: [comment]',
 'settings_onePageMode_desc' => '',
 'settings_overrideMimeType' => 'Åsido Mediatyp (Mime)',
 'settings_overrideMimeType_desc' => 'Åsidosätta MimeType levererad av webbläsaren, om en fil överförs. Den nya Mediatyp bestäms av SeedDMS själv.',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => 'Uppdelad filstorlek',
 'settings_partitionSize_desc' => 'Storlek hos uppdelade filer i bytes som laddades upp med jumploader. Sätt inte ett värde som är större än den högsta tillåtna storleken på servern.',
 'settings_passwordExpiration' => 'Lösenord utgångsdatum',
@@ -1604,9 +1607,11 @@ Kommentar: [comment]',
 'settings_System' => 'System',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => '',
 'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
 'settings_tasksInMenu_workflow' => '',
@@ -1922,6 +1927,8 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename]: [name] - Version borttagen',
 'version_info' => 'Versionsinformation',
 'view' => 'Vy',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => 'Visa online',
 'warning' => 'Varning',
 'webauthn_auth' => '',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 4e70ee015..f41a8528e 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1110), aydin (83)
+//    Translators: Admin (1111), aydin (83)
 
 $text = array(
 '2_factor_auth' => 'İki faktörlü yetkilendirme',
@@ -321,6 +321,7 @@ URL: [url]',
 'daily' => 'Günlük',
 'databasesearch' => 'Veritabanı arama',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => 'Tarih',
 'days' => 'gün',
 'debug' => '',
@@ -515,7 +516,7 @@ URL: [url]',
 'error_no_folder_selected' => 'Hiçbir klasör seçilmedi',
 'error_occured' => 'Bir hata oluştu',
 'error_remove_document' => '',
-'error_remove_folder' => '',
+'error_remove_folder' => 'Klasörü Silerken Hata!',
 'error_remove_permission' => '',
 'error_rm_workflow' => '',
 'error_rm_workflow_action' => '',
@@ -1475,6 +1476,8 @@ URL: [url]',
 'settings_onePageMode_desc' => '',
 'settings_overrideMimeType' => '',
 'settings_overrideMimeType_desc' => '',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => 'Kısmi dosya boyutu',
 'settings_partitionSize_desc' => 'Jumploader ile yüklenecek dosyaların byte cinsinden kısmi dosya boyutu. Sunucu tarafından tanımlanandan daha büyük bir değer girmeyiniz.',
 'settings_passwordExpiration' => 'Parola geçerlilik süresi',
@@ -1570,9 +1573,11 @@ URL: [url]',
 'settings_System' => 'Sistem',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => '',
 'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
 'settings_tasksInMenu_workflow' => '',
@@ -1888,6 +1893,8 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename]: [name] - Versiyon silindi',
 'version_info' => 'Versiyon Bilgisi',
 'view' => 'Görüntüle',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => 'Online görüntüle',
 'warning' => 'Dikkat',
 'webauthn_auth' => '',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 40f39efc6..f4b8adba1 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -327,6 +327,7 @@ URL: [url]',
 'daily' => 'Щоденно',
 'databasesearch' => 'Пошук по БД',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => 'Дата',
 'days' => 'дні',
 'debug' => '',
@@ -1496,6 +1497,8 @@ URL: [url]',
 'settings_onePageMode_desc' => '',
 'settings_overrideMimeType' => 'Перевизначити mime тип',
 'settings_overrideMimeType_desc' => 'Перевизначення mime типу наданого браузером, якщо файл завантажений. Новий mime тип визначається самою SeedDMS.',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => 'Частковий розмір файлу',
 'settings_partitionSize_desc' => 'Розмір частинок файлів, які завантажуються через jumploader. Не встановлювати більше максимально дозволеного розміру, встановленого на сервері.',
 'settings_passwordExpiration' => 'Термін дії пароля',
@@ -1591,9 +1594,11 @@ URL: [url]',
 'settings_System' => 'Система',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => '',
 'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
 'settings_tasksInMenu_workflow' => '',
@@ -1909,6 +1914,8 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename]: знищено версію «[name]»',
 'version_info' => 'Інформація про версію',
 'view' => 'Перегляд',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => 'Переглянути',
 'warning' => 'Увага',
 'webauthn_auth' => '',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index b13355555..a2da52d22 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -321,6 +321,7 @@ URL: [url]',
 'daily' => '天',
 'databasesearch' => '数据库搜索',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => '日期',
 'days' => '天',
 'debug' => '调试',
@@ -1471,6 +1472,8 @@ URL: [url]',
 'settings_onePageMode_desc' => '',
 'settings_overrideMimeType' => '覆盖Mime Type',
 'settings_overrideMimeType_desc' => '',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => '',
 'settings_partitionSize_desc' => '',
 'settings_passwordExpiration' => '密码过期',
@@ -1566,9 +1569,11 @@ URL: [url]',
 'settings_System' => '系统设置',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => '',
 'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
 'settings_tasksInMenu_workflow' => '',
@@ -1875,6 +1880,8 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename]: [name] - 版本已删除',
 'version_info' => '版本信息',
 'view' => '查看',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => '在线浏览',
 'warning' => '警告',
 'webauthn_auth' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 819d55056..a45ff9011 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2424)
+//    Translators: Admin (2425)
 
 $text = array(
 '2_factor_auth' => '2階段認證',
@@ -327,6 +327,7 @@ URL: [url]',
 'daily' => '每日',
 'databasesearch' => '資料庫搜索',
 'database_schema_version' => '',
+'data_loading' => '',
 'date' => '日期',
 'days' => '天數',
 'debug' => '除錯',
@@ -477,7 +478,7 @@ URL: [url]',
 'dropfolderdir_missing' => '您的個人放置文件夾在服務器上不存在！請要求管理員創建它',
 'dropfolder_file' => '檔案來源為 drop 目錄',
 'dropfolder_folder' => '目錄來源為下拉目錄',
-'dropfolder_metadata' => '下拉目錄的Metadata',
+'dropfolder_metadata' => '',
 'dropupload' => '快速上傳',
 'drop_files_here' => '拖入這裡',
 'dump_creation' => '轉儲數據',
@@ -1534,6 +1535,8 @@ URL: [url]',
 'settings_onePageMode_desc' => '單一頁面模式將打開ViewFolder頁面上的javascript代碼，當單擊文件夾或更改排序參數時，該代碼將更新文件夾/文檔列表，導航等。',
 'settings_overrideMimeType' => '覆蓋MimeType',
 'settings_overrideMimeType_desc' => '如果上傳了文件，則覆蓋瀏覽器提供的MimeType。新的MimeType由SeedDMS本身確定。',
+'settings_overrideTheme' => '',
+'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => '部分文件大小',
 'settings_partitionSize_desc' => '由Jumploader上傳的部分文件的大小（以字節為單位）。請勿將值設置為大於服務器設置的最大上傳大小。',
 'settings_passwordExpiration' => '密碼過期',
@@ -1629,9 +1632,11 @@ URL: [url]',
 'settings_System' => '系統',
 'settings_tasksInMenu' => '選定的任務',
 'settings_tasksInMenu_approval' => '批准書',
+'settings_tasksInMenu_checkedout' => '',
 'settings_tasksInMenu_desc' => '選擇要計算的那些任務。如果未選擇任何一項，則將計算所有任務。',
 'settings_tasksInMenu_needscorrection' => '需要更正',
 'settings_tasksInMenu_receipt' => '收據',
+'settings_tasksInMenu_rejected' => '',
 'settings_tasksInMenu_review' => '預覽',
 'settings_tasksInMenu_revision' => '修訂版',
 'settings_tasksInMenu_workflow' => '工作流程',
@@ -1947,6 +1952,8 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename]: [name]-版本已刪除',
 'version_info' => '版本資訊',
 'view' => '檢視',
+'view_document' => '',
+'view_folder' => '',
 'view_online' => '線上流覽',
 'warning' => '警告',
 'webauthn_auth' => '',

From bb75b768efa9871f24754a188d09f72287845593 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Nov 2020 17:29:53 +0100
Subject: [PATCH 236/312] fix error in creating a new fulltext index

---
 SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
index d6c40c278..0682a7819 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
@@ -46,7 +46,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 		if(file_exists($conf['indexdir'].'/index.db')) {
 			return new SeedDMS_SQLiteFTS_Indexer($conf['indexdir']);
 		} else
-			return self::create($conf['indexdir']);
+			return self::create($conf);
 	} /* }}} */
 
 	/**

From c36d5c9cb975cc8b476f73607c907d354da22fbe Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Nov 2020 17:41:58 +0100
Subject: [PATCH 237/312] replace fa-bar icon with fa-bars

---
 views/bootstrap/class.Bootstrap.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index fb94c0e95..9f0da2b88 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -305,9 +305,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo " <div class=\"navbar-inner\">\n";
 		echo "  <div class=\"container-fluid\">\n";
 		echo "   <a class=\"btn btn-navbar\" data-toggle=\"collapse\" data-target=\".nav-col1\">\n";
-		echo "     <span class=\"fa fa-bar\"></span>\n";
-		echo "     <span class=\"fa fa-bar\"></span>\n";
-		echo "     <span class=\"fa fa-bar\"></span>\n";
+		echo "     <span class=\"fa fa-bars\"></span>\n";
 		echo "   </a>\n";
 		echo "   <a class=\"brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['rootfolderid']."\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n";
 		if(isset($this->params['user']) && $this->params['user']) {
@@ -476,9 +474,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			echo " <div class=\"navbar-inner\">\n";
 			echo "  <div class=\"container\">\n";
 			echo "   <a class=\"btn btn-navbar\" data-toggle=\"collapse\" data-target=\".col2\">\n";
-			echo " 		<span class=\"fa fa-bar\"></span>\n";
-			echo " 		<span class=\"fa fa-bar\"></span>\n";
-			echo " 		<span class=\"fa fa-bar\"></span>\n";
+			echo " 		<span class=\"fa fa-bars\"></span>\n";
 			echo "   </a>\n";
 			switch ($pageType) {
 				case "view_folder":

From f094262e8b09fbf896c7dfb1faa385b962d1287d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 13 Nov 2020 11:23:04 +0100
Subject: [PATCH 238/312] hook documentInfos() replaces title and container,
 new hook additionalDocumentInfos

---
 views/bootstrap/class.ViewDocument.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index d3f364f71..7f9fa4c98 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -197,15 +197,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$document = $this->params['document'];
 
+		$txt = $this->callHook('documentInfos', $document);
+		if(is_string($txt))
+			echo $txt;
+		else {
 		$this->contentHeading(getMLText("document_infos"));
 		$this->contentContainerStart();
 		$txt = $this->callHook('preDocumentInfos', $document);
 		if(is_string($txt))
 			echo $txt;
-		$txt = $this->callHook('documentInfos', $document);
-		if(is_string($txt))
-			echo $txt;
-		else {
 ?>
 		<table class="table-condensed">
 <?php
@@ -320,8 +320,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 <?php
 			}
 		}
-?>
-		<?php
 		$attributes = $document->getAttributes();
 		if($attributes) {
 			foreach($attributes as $attribute) {
@@ -338,14 +336,25 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				}
 			}
 		}
+		$arrarr = $this->callHook('additionalDocumentInfos', $document);
+		if(is_array($arrarr)) {
+			foreach($arrarr as $arr) {
+				echo "<tr>";
+				echo "<td>".$arr[0].":</td>";
+				echo "<td>".$arr[1]."</td>";
+				echo "</tr>";
+			}
+		} elseif(is_string($arrarr)) {
+			echo $arrarr;
+		}
 ?>
 		</table>
 <?php
-		}
 		$txt = $this->callHook('postDocumentInfos', $document);
 		if(is_string($txt))
 			echo $txt;
 		$this->contentContainerEnd();
+		}
 	} /* }}} */
 
 	function preview() { /* {{{ */

From 42a0df1d5244f7e1bafc8b8d616fb50dd58e16a6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 13 Nov 2020 11:23:56 +0100
Subject: [PATCH 239/312] rename hook folderInfo to folderInfos, add hook
 additionalDocumentInfos

---
 views/bootstrap/class.ViewFolder.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index b3dd1628e..7d7a31f2f 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -232,7 +232,7 @@ $('body').on('click', '.order-btn', function(ev) {
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
 
-		$txt = $this->callHook('folderInfo', $folder);
+		$txt = $this->callHook('folderInfos', $folder);
 		if(is_string($txt))
 			echo $txt;
 		else {
@@ -240,6 +240,9 @@ $('body').on('click', '.order-btn', function(ev) {
 			$owner = $folder->getOwner();
 			$this->contentHeading(getMLText("folder_infos"));
 			$this->contentContainerStart();
+			$txt = $this->callHook('preFolderInfos', $folder);
+			if(is_string($txt))
+				echo $txt;
 			echo "<table class=\"table-condensed\">\n";
 			if($user->isAdmin()) {
 				echo "<tr>";
@@ -305,7 +308,21 @@ $('body').on('click', '.order-btn', function(ev) {
 					}
 				}
 			}
+			$arrarr = $this->callHook('additionalFolderInfos', $folder);
+			if(is_array($arrarr)) {
+				foreach($arrarr as $arr) {
+					echo "<tr>";
+					echo "<td>".$arr[0].":</td>";
+					echo "<td>".$arr[1]."</td>";
+					echo "</tr>";
+				}
+			} elseif(is_string($arrarr)) {
+				echo $arrarr;
+			}
 			echo "</table>\n";
+			$txt = $this->callHook('postFolderInfos', $folder);
+			if(is_string($txt))
+				echo $txt;
 			$this->contentContainerEnd();
 		}
 	} /* }}} */

From f440d8bf5401890e20f9fe1eb96f489fbc0f781e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 15 Nov 2020 07:44:09 +0100
Subject: [PATCH 240/312] call hook filterList

---
 views/bootstrap/class.MyDocuments.php | 36 +++++++++++++++++----------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index b0e0b51c7..f754a6acb 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -56,19 +56,23 @@ $(document).ready( function() {
 <?php
 	} /* }}} */
 
-	protected function printListHeader($resArr, $previewer, $order=false) { /* {{{ */
+	protected function printListHeader($resArr, $previewer, $action=false) { /* {{{ */
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
 
 		print "<table class=\"table table-condensed\">";
 		print "<thead>\n<tr>\n";
 		print "<th></th>\n";
-		if($order)
-			print "<th><a data-action=\"".$order."\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> ".($orderby == 'u' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a> ".($orderby == 'e' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')."</th>\n";
-		else
+		if($action) {
+			print "<th>";
+			print "<a data-action=\"".$action."\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')." &middot; ";
+			print "<a data-action=\"".$action."\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> ".($orderby == 'u' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')." &middot; ";
+			print "<a data-action=\"".$action."\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a> ".($orderby == 'e' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '');
+			print "</th>\n";
+		} else
 			print "<th>".getMLText("name")."</th>\n";
-		if($order)
-			print "<th><a data-action=\"".$order."\" data-orderby=\"s\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("status")."</a>".($orderby == 's' ? " ".($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')."</th>\n";
+		if($action)
+			print "<th><a data-action=\"".$action."\" data-orderby=\"s\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("status")."</a>".($orderby == 's' ? " ".($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')."</th>\n";
 		else
 			print "<th>".getMLText("status")."</th>\n";
 		print "<th>".getMLText("action")."</th>\n";
@@ -79,26 +83,32 @@ $(document).ready( function() {
 		echo "</tbody>\n</table>";
 	} /* }}} */
 
-	protected function printList($resArr, $previewer, $order=false) { /* {{{ */
+	protected function printList($resArr, $previewer, $action=false) { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 
-		$this->printListHeader($resArr, $previewer, $order);
+		$this->printListHeader($resArr, $previewer, $action);
 		$noaccess = 0;
+		$docs = [];
 		foreach ($resArr as $res) {
 			$document = $dms->getDocument($res["id"]);
 			$document->verifyLastestContentExpriry();
 
 			if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-				$txt = $this->callHook('documentListItem', $document, $previewer, false, $res['version']);
-				if(is_string($txt))
-					echo $txt;
-				else
-					echo $this->documentListRow($document, $previewer, false, $res['version']);
+				$docs[] = $document;
 			} else {
 				$noaccess++;
 			}
 		}
+		if($this->hasHook('filterList'))
+			$docs = $this->callHook('filterList', $docs, $action);
+		foreach($docs as $document) {
+			$txt = $this->callHook('documentListItem', $document, $previewer, false);
+			if(is_string($txt))
+				echo $txt;
+			else
+				echo $this->documentListRow($document, $previewer, false);
+		}
 		$this->printListFooter();
 
 		if($noaccess) {

From 78aab08ebd6bf78bacb40e6830f9f7863aaac2f9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 16 Nov 2020 16:50:37 +0100
Subject: [PATCH 241/312] do not show the task menu at all, if there are no
 tasks

---
 views/bootstrap/class.Tasks.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index db6bcd076..fdab2d397 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -300,7 +300,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 			$ct[] = count($tasks['checkedout']);
 		$content .= implode('/', $ct);
 		$content .= ")";
-		if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision']) || !empty($tasks['needscorrection']) || !empty($tasks['workflow']) || !empty($tasks['rejected']) || !empty($tasks['rejected'])) {
+		if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision']) || !empty($tasks['needscorrection']) || !empty($tasks['workflow']) || !empty($tasks['rejected']) || !empty($tasks['rejected']) || !empty($tasks['checkedout'])) {
 		$content .= " <i class=\"fa fa-caret-down\"></i></a>\n";
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		if(!empty($tasks['review'])) {
@@ -391,11 +391,11 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
-		}
 		if ($accessobject->check_view_access('MyDocuments')) {
 			$content .= "    <li class=\"divider\"></li>\n";
 			$content .= "    <li><a href=\"../out/out.MyDocuments.php\">".getMLText("my_documents")."</a></li>\n";
 		}
+		}
 		$content .= "    </li>\n";
 		$content .= "   </ul>\n";
 		echo $content;

From e2db558de7dcd2922b91c3d6e9b9d83b2c819e8a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 16 Nov 2020 16:55:56 +0100
Subject: [PATCH 242/312] override theme even if autologin is turned on

---
 inc/inc.Authentication.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index 89d3ab7c1..36fb1dd6a 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -37,9 +37,9 @@ if (!isset($_COOKIE["mydms_session"])) {
 			exit;
 		}
 		$theme = $user->getTheme();
-		if (strlen($theme)==0) {
+		if (strlen($theme)==0 || !empty($settings->_overrideTheme)) {
 			$theme = $settings->_theme;
-			$user->setTheme($theme);
+//			$user->setTheme($theme);
 		}
 		$lang = $user->getLanguage();
 		if (strlen($lang)==0) {

From ab858a9af808f29a8b13af3c9286523b54c681a6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 17 Nov 2020 08:14:12 +0100
Subject: [PATCH 243/312] set todayHighlight and toggleActive in date picker

---
 styles/bootstrap/application.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 255c8f410..5a1e60d72 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -64,7 +64,7 @@ $(document).ready( function() {
 	$('body').on('touchstart.dropdown', '.dropdown-menu', function (e) { e.stopPropagation(); });
 
 	$('.datepicker, #expirationdate, #fromdate, #todate, #createstartdate, #createenddate, #expirationstartdate, #expirationenddate')
-		.datepicker()
+		.datepicker({todayHighlight: true, toggleActive: true})
 		.on('changeDate', function(ev){
 			if(ev.date && $(ev.target).data('selectmenu')) {
 				$("#"+$(ev.target).data('selectmenu')).val('date');

From ab438f18d9b275813f2dba6415ff5f5c0c90b6b6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 22 Nov 2020 11:39:57 +0100
Subject: [PATCH 244/312] issue warning when deleting a checked out document

---
 CHANGELOG                                | 1 +
 views/bootstrap/class.RemoveDocument.php | 4 ++++
 views/bootstrap/class.UpdateDocument.php | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9b7503bb2..958ca45b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
 - merge changes up to 5.1.21
 - document links can be added by regular users again
 - add list of checked out documents to tasks
+- issue a warning when removing a document with is checked out
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.13
diff --git a/views/bootstrap/class.RemoveDocument.php b/views/bootstrap/class.RemoveDocument.php
index 26e3cb019..945da4312 100644
--- a/views/bootstrap/class.RemoveDocument.php
+++ b/views/bootstrap/class.RemoveDocument.php
@@ -43,6 +43,10 @@ class SeedDMS_View_RemoveDocument extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("rm_document"));
+		if ($document->isCheckedOut()) {
+			$msg = getMLText('document_is_checked_out_remove');
+			$this->warningMsg($msg);
+		}
 		$this->contentContainerStart('warning');
 
 ?>
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 5758b5397..58135cc33 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -225,7 +225,7 @@ console.log(element);
 			$this->warningMsg($msg);
 
 		if ($document->isCheckedOut()) {
-			$msg = getMLText('document_is_checked_out');
+			$msg = getMLText('document_is_checked_out_update');
 			$this->warningMsg($msg);
 		}
 

From 386e37db0da6282988b82b28c39ee4988b0626ef Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 22 Nov 2020 12:35:26 +0100
Subject: [PATCH 245/312] saving the settings will no longer reenable an
 extention with no configuration

---
 CHANGELOG                          |  2 ++
 styles/bootstrap/application.css   |  2 ++
 views/bootstrap/class.Settings.php | 13 ++++++++++---
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3c71a9920..76af04a15 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,8 @@
 - fix .htaccess file in restapi
 - restapi: add setDocumentOwner, owner can be set when uploading a document
 - theme in configuration can override theme of user
+- saving the settings will no longer reenable an extention with no configuration
+- put a red/green bullet before the extension name in the settings
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.20
diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css
index acdbb6dd3..0b8ffc87f 100644
--- a/styles/bootstrap/application.css
+++ b/styles/bootstrap/application.css
@@ -216,7 +216,9 @@ ul.jqtree-tree li.jqtree_common > .jqtree-element:hover {
 }
 
 i.success {color: #00b000;}
+i.enabled {color: #00b000;}
 i.error {color: #b00000;}
+i.disabled {color: #b00000;}
 i.warning {color: #ff9900;}
 i.initstate {color: #ff9900;}
 i.released {color: #00b000;}
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index f6c8c50de..c30bbaf3e 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -38,7 +38,8 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style {
 	protected function showStartPaneContent($name, $isactive) { /* {{{ */
 		echo '<div class="tab-pane'.($isactive ? ' active' : '').'" id="'.$name.'">';
 		$this->contentContainerStart();
-		echo '<table class="table-condensed">';
+		echo '<table class="table-condensed" style="table-layout: fixed;">';
+		echo '<tr><td width="20%"></td><td width="80%"></td></tr>';
 	} /* }}} */
 
 	protected function showEndPaneContent($name, $currentab) { /* {{{ */
@@ -510,8 +511,8 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
 		if($this->hasHook('processConfig'))
 			$extconf = $this->callHook('processConfig', $extname, $extconf);
 		if($extconf['config']) {
-		$this->showRawConfigHeadline("<a name=\"".$extname."\"></a>".'<input type="hidden" name="extensions['.$extname.'][__disable__]" value="'.(isset($settings->_extensions[$extname]["__disable__"]) && $settings->_extensions[$extname]["__disable__"] ? '1' : '').'" />'.$extconf['title']);
-		foreach($extconf['config'] as $confkey=>$conf) {
+			$this->showRawConfigHeadline("<a name=\"".$extname."\"></a>".'<input type="hidden" name="extensions['.$extname.'][__disable__]" value="'.(isset($settings->_extensions[$extname]["__disable__"]) && $settings->_extensions[$extname]["__disable__"] ? '1' : '').'" /><i class="fa fa-circle'.($settings->_extensions[$extname]["__disable__"] ? ' disabled' : ' enabled').'"></i> <span title="'.$extname.'">'.$extconf['title'].'</span>');
+			foreach($extconf['config'] as $confkey=>$conf) {
 						ob_start();
 						switch($conf['type']) {
 							case 'checkbox':
@@ -631,6 +632,12 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
 						$html = ob_get_clean();
 						$this->showConfigPlain($conf['title'], isset($conf['help']) ? $conf['help'] : '', $html);
 					}
+		} else {
+			/* Even no configuration exists, output the input field to enable/disable
+			 * the extension. Otherwise it will be enabled each time the config is
+			 * saved.
+			 */
+			echo '<input type="hidden" name="extensions['.$extname.'][__disable__]" value="'.(isset($settings->_extensions[$extname]["__disable__"]) && $settings->_extensions[$extname]["__disable__"] ? '1' : '').'" />'."\n";
 		}
 	}
 	$this->showEndPaneContent('extensions', $currenttab);

From 152c943d5aeb3a45a44520b6d55e856be476991c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 24 Nov 2020 08:04:44 +0100
Subject: [PATCH 246/312] SeedDMS_Core_Document::getCheckOutInfo() returns all
 checkout versions

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 27 ++++++++++++++++---------
 views/bootstrap/class.ViewDocument.php  | 11 ++++++----
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 2ceb12874..3e12f6edf 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -1020,7 +1020,10 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	/**
 	 * Get checkout info for document
 	 *
-	 * @return array/boolean record from table tblDocumentCheckOuts or false
+	 * This returns the checkouts for a document. There could be several checkouts
+	 * for one document, but usually there is just one.
+	 *
+	 * @return array/boolean records from table tblDocumentCheckOuts or false
 	 * in case of an error.
 	 */
 	function getCheckOutInfo() { /* {{{ */
@@ -1033,7 +1036,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 		} else {
 			// A check out has been identified for this document.
-			return $resArr[0];
+			return $resArr;
 		}
 	} /* }}} */
 
@@ -1114,7 +1117,10 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	function checkIn($comment, $user, $reviewers=array(), $approvers=array(), $version=0, $attributes=array(), $workflow=null, $initstate=S_RELEASED) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$info = self::getCheckOutInfo();
+		$infos = self::getCheckOutInfo();
+		if(!$infos)
+			return false;
+		$info = $infos[0];
 		$lc = self::getLatestContent();
 
 		/* If file doesn't exist anymore, then just remove the record from the db */
@@ -1168,12 +1174,14 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	function cancelCheckOut() { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$info = self::getCheckOutInfo();
-		if($info) {
-			SeedDMS_Core_File::removeFile($info['filename']);
+		$infos = self::getCheckOutInfo();
+		if($infos) {
+			$info = $infos[0];
 
 			$queryStr = "DELETE FROM `tblDocumentCheckOuts` WHERE `document` = ".$this->_id;
-			$db->getResult($queryStr);
+			if (!$db->getResult($queryStr))
+				return false;
+			SeedDMS_Core_File::removeFile($info['filename']);
 		}
 
 		return true;
@@ -1193,10 +1201,11 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 * 0=The checked out file is modified and check in will create a new version
 	 */
 	function checkOutStatus() { /* {{{ */
-		$info = self::getCheckOutInfo();
-		if(!$info)
+		$infos = self::getCheckOutInfo();
+		if(!$infos)
 			return 4;
 
+		$info = $infos[0];
 		$lc = self::getLatestContent();
 
 		/* If file doesn't exist anymore, then just remove the record from the db */
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 1a9725b47..e2a4c82eb 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -194,17 +194,20 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$txt = $this->callHook('checkOutInfo', $document);
 		if(is_string($txt)) {
 			echo $txt;
-		} elseif($info = $document->getCheckOutInfo()) {
-			echo "<div class=\"alert alert-info\">";
+		} elseif($infos = $document->getCheckOutInfo()) {
 			$session = $this->params['session'];
 			if($session->getSu()) {
 				$origuser = $dms->getUser($session->getUser());
 				$checkoutpath = sprintf($checkoutdir, preg_replace('/[^A-Za-z0-9_-]/', '', $origuser->getLogin()));
 			} else {
+				$origuser = $user;
 				$checkoutpath = sprintf($checkoutdir, preg_replace('/[^A-Za-z0-9_-]/', '', $user->getLogin()));
 			}
-			echo "<a href=\"file://".$info['filename']."\">".getMLText('copied_to_checkout_as', array('date'=>$info['date'], 'filename'=>substr($info['filename'], strlen($checkoutpath)+1)))."</a>";
-			echo "</div>";
+			foreach($infos as $info) {
+				echo "<div class=\"alert alert-info\">";
+				echo "<a href=\"file://".$info['filename']."\">".getMLText('copied_to_checkout_as', array('date'=>$info['date'], 'filename'=>substr($info['filename'], strlen($checkoutpath)+1)))."</a>";
+				echo "</div>";
+			}
 		}
 		$this->contentContainerStart();
 		$txt = $this->callHook('preDocumentInfos', $document);

From 877844cbba0749367b8ba0e4e0bde34a1dc838f1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 24 Nov 2020 08:23:23 +0100
Subject: [PATCH 247/312] fix security issue CVE-2020-28726 escape input form
 field value

---
 CHANGELOG                           | 2 ++
 views/bootstrap/class.Bootstrap.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 76af04a15..d4ff595e5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,8 @@
 - theme in configuration can override theme of user
 - saving the settings will no longer reenable an extention with no configuration
 - put a red/green bullet before the extension name in the settings
+- escape value of dropfolderfile in input form field created by
+  SeedDMS_Bootstrap_Style::getDropFolderChooserHtml() (CVE-2020-2872)
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.20
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 9f0da2b88..07a9cc4d9 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1669,7 +1669,7 @@ $(document).ready(function() {
 
 	function getDropFolderChooserHtml($formName, $dropfolderfile="", $showfolders=0) { /* {{{ */
 		$content =  "<div class=\"input-append\">\n";
-		$content .= "<input readonly type=\"text\" id=\"dropfolderfile".$formName."\" name=\"dropfolderfile".$formName."\" value=\"".$dropfolderfile."\">";
+		$content .= "<input readonly type=\"text\" id=\"dropfolderfile".$formName."\" name=\"dropfolderfile".$formName."\" value=\"".htmlspecialchars($dropfolderfile)."\">";
 		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfilename".$formName."\"><i class=\"fa fa-remove\"></i></button>";
 		$content .= $this->getModalBoxLink(
 			array(

From 32b03b1e5880e2f38cecf4ac7743f8f62f33043f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 24 Nov 2020 17:13:36 +0100
Subject: [PATCH 248/312] fix another cross site scripting hole
 (CVE-2020-28727)

---
 CHANGELOG                                   | 4 +++-
 views/bootstrap/class.DropFolderChooser.php | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d4ff595e5..5b8e75ed6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,7 +15,9 @@
 - saving the settings will no longer reenable an extention with no configuration
 - put a red/green bullet before the extension name in the settings
 - escape value of dropfolderfile in input form field created by
-  SeedDMS_Bootstrap_Style::getDropFolderChooserHtml() (CVE-2020-2872)
+  SeedDMS_Bootstrap_Style::getDropFolderChooserHtml() (CVE-2020-28726)
+- prevent cross site scripting in views/bootstrap/class.DropFileChooser.php
+  folderid wasn't checked propperly for being an integer (CVE-2020-28727)
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.20
diff --git a/views/bootstrap/class.DropFolderChooser.php b/views/bootstrap/class.DropFolderChooser.php
index d668fae80..68ba7d4b1 100644
--- a/views/bootstrap/class.DropFolderChooser.php
+++ b/views/bootstrap/class.DropFolderChooser.php
@@ -61,7 +61,7 @@ $('.folderselect').click(function(ev) {
 		$previewwidth = $this->params['previewWidthMenuList'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
-		$folderid = isset($_GET['folderid']) ? $_GET['folderid'] : 0;
+		$folder = $this->params['folder'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
 
@@ -81,7 +81,7 @@ $('.folderselect').click(function(ev) {
 						if($showfolders == 0 && !is_dir($dir.'/'.$entry)) {
 							$c++;
 							$mimetype = finfo_file($finfo, $dir.'/'.$entry);
-							$filecontent .= "<li><a".($folderid ? " href=\"../out/out.AddDocument.php?folderid=".$folderid."&dropfolderfileform1=".urldecode($entry)."\" title=\"".getMLText('menu_upload_from_dropfolder')."\"" : "").">";
+							$filecontent .= "<li><a".($folder ? " href=\"../out/out.AddDocument.php?folderid=".$folder->getId()."&dropfolderfileform1=".urldecode($entry)."\" title=\"".getMLText('menu_upload_from_dropfolder')."\"" : "").">";
 							if($previewwidth) {
 								$previewer->createRawPreview($dir.'/'.$entry, 'dropfolder/', $mimetype);
 								if($previewer->hasRawPreview($dir.'/'.$entry, 'dropfolder/')) {

From c9a2aaca9c64044755cc9849f57ce2d67f55ac83 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Nov 2020 09:13:37 +0100
Subject: [PATCH 249/312] add notes for 6.0.14

---
 SeedDMS_Core/package.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 235232b13..b1299f17d 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,7 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-???
+better error checking in SeedDMS_Core_Document::cancelCheckOut()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 67a8d10797a28db0a0eaa3bea52ca57432cb4de2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Nov 2020 09:14:03 +0100
Subject: [PATCH 250/312] add discarding of checked out document

---
 CHANGELOG                                 |  3 +-
 SeedDMS_Core/Core/inc.ClassDocument.php   | 11 ++++-
 inc/inc.ClassSettings.php                 |  4 ++
 op/op.CancelCheckOut.php                  | 50 +++++++++++++++++++++++
 op/op.CheckInDocument.php                 |  7 +++-
 op/op.Settings.php                        |  1 +
 views/bootstrap/class.CheckInDocument.php | 16 +++++++-
 views/bootstrap/class.Settings.php        |  1 +
 8 files changed, 87 insertions(+), 6 deletions(-)
 create mode 100644 op/op.CancelCheckOut.php

diff --git a/CHANGELOG b/CHANGELOG
index e4b0280cb..6a433e522 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,7 +5,8 @@
 - merge changes up to 5.1.21
 - document links can be added by regular users again
 - add list of checked out documents to tasks
-- issue a warning when removing a document with is checked out
+- issue a warning when removing a document which is checked out
+- checked out can be discarded if it was changed
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.13
diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 3e12f6edf..d9adfb97a 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -1178,10 +1178,17 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		if($infos) {
 			$info = $infos[0];
 
+			$db->startTransaction();
 			$queryStr = "DELETE FROM `tblDocumentCheckOuts` WHERE `document` = ".$this->_id;
-			if (!$db->getResult($queryStr))
+			if (!$db->getResult($queryStr)) {
+				$db->rollbackTransaction();
 				return false;
-			SeedDMS_Core_File::removeFile($info['filename']);
+			}
+			if(!SeedDMS_Core_File::removeFile($info['filename'])) {
+				$db->rollbackTransaction();
+				return false;
+			}
+			$db->commitTransaction();
 		}
 
 		return true;
diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 4b373b696..6022d9624 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -188,6 +188,8 @@ class Settings { /* {{{ */
 	var $_enableDuplicateDocNames = true;
 	// enable/disable duplicate names of a subfolder in a folder
 	var $_enableDuplicateSubFolderNames = true;
+	// allow/disallow to cancel a checkout
+	var $_enableCancelCheckout = true;
 	// override mimetype set by browser when uploading a file
 	var $_overrideMimeType = false;
 	// advanced access control lists
@@ -749,6 +751,7 @@ class Settings { /* {{{ */
 			$this->_enableVersionModification = Settings::boolval($tab["enableVersionModification"]);
 			$this->_enableDuplicateDocNames = Settings::boolval($tab["enableDuplicateDocNames"]);
 			$this->_enableDuplicateSubFolderNames = Settings::boolval($tab["enableDuplicateSubFolderNames"]);
+			$this->_enableCancelCheckout = Settings::boolval($tab["enableCancelCheckout"]);
 			$this->_overrideMimeType = Settings::boolval($tab["overrideMimeType"]);
 			$this->_advancedAcl = Settings::boolval($tab["advancedAcl"]);
 			$this->_removeFromDropFolder = Settings::boolval($tab["removeFromDropFolder"]);
@@ -1099,6 +1102,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableVersionModification", $this->_enableVersionModification);
     $this->setXMLAttributValue($node, "enableDuplicateDocNames", $this->_enableDuplicateDocNames);
     $this->setXMLAttributValue($node, "enableDuplicateSubFolderNames", $this->_enableDuplicateSubFolderNames);
+    $this->setXMLAttributValue($node, "enableCancelCheckout", $this->_enableCancelCheckout);
     $this->setXMLAttributValue($node, "overrideMimeType", $this->_overrideMimeType);
     $this->setXMLAttributValue($node, "advancedAcl", $this->_advancedAcl);
     $this->setXMLAttributValue($node, "removeFromDropFolder", $this->_removeFromDropFolder);
diff --git a/op/op.CancelCheckOut.php b/op/op.CancelCheckOut.php
new file mode 100644
index 000000000..c3a1ce270
--- /dev/null
+++ b/op/op.CancelCheckOut.php
@@ -0,0 +1,50 @@
+<?php
+//    SeedDMS. Document Management System
+//    Copyright (C) 2015 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+/* Check if the form data comes from a trusted request */
+if(!checkFormKey('cancelcheckout')) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
+}
+
+if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+$documentid = $_POST["documentid"];
+$document = $dms->getDocument($documentid);
+
+if(empty($settings->_enableCancelCheckout)) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("operation_disallowed"));
+}
+
+$document->cancelCheckOut($comment);
+if (is_bool($result) && !$result) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
+}
+$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_cancel_checkout')));
+add_log_line("?documentid=".$documentid);
+header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index fd0e40ead..b60f4ad92 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -25,6 +25,11 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+/* Check if the form data comes from a trusted request */
+if(!checkFormKey('checkindocument')) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
+}
+
 if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -427,5 +432,3 @@ else
 add_log_line("?documentid=".$documentid);
 header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
 
-?>
-
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 0cad3843a..1f91dc0b8 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -216,6 +216,7 @@ if ($action == "saveSettings")
   $settings->_enableVersionModification = getBoolValue("enableVersionModification");
   $settings->_enableDuplicateDocNames = getBoolValue("enableDuplicateDocNames");
   $settings->_enableDuplicateSubFolderNames = getBoolValue("enableDuplicateSubFolderNames");
+  $settings->_enableCancelCheckout = getBoolValue("enableCancelCheckout");
   $settings->_overrideMimeType = getBoolValue("overrideMimeType");
   $settings->_advancedAcl = getBoolValue("advancedAcl");
   $settings->_removeFromDropFolder = getBoolValue("removeFromDropFolder");
diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index 5fa945742..cfe1d8076 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -77,6 +77,7 @@ $(document).ready(function() {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$settings = $this->params['settings'];
 		$folder = $this->params['folder'];
 		$document = $this->params['document'];
 		$strictformcheck = $this->params['strictformcheck'];
@@ -688,9 +689,22 @@ $(document).ready(function() {
 		$this->formSubmit(getMLText('checkin_document'));
 ?>
 </form>
-
 <?php
 		$this->contentContainerEnd();
+		if(!empty($settings->_enableCancelCheckout)) {
+			$this->contentContainerStart();
+			$this->warningMsg(getMLText('cancel_checkout_warning'));
+?>
+<form class="form-horizontal" action="../op/op.CancelCheckOut.php" method="post">
+	<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
+<?php
+	echo createHiddenFieldWithKey('cancelcheckout');
+			$this->formSubmit(getMLText('cancel_checkout'));
+?>
+</form>
+<?php
+			$this->contentContainerEnd();
+		}
 		} else {
 ?>
 <form action="../op/op.CheckInDocument.php" method="post">
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 4a3de21f1..b40ced0f6 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -485,6 +485,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
 <?php $this->showConfigCheckbox('settings_enableVersionModification', 'enableVersionModification'); ?>
 <?php $this->showConfigCheckbox('settings_enableDuplicateDocNames', 'enableDuplicateDocNames'); ?>
 <?php $this->showConfigCheckbox('settings_enableDuplicateSubFolderNames', 'enableDuplicateSubFolderNames'); ?>
+<?php $this->showConfigCheckbox('settings_enableCancelCheckout', 'enableCancelCheckout'); ?>
 <?php $this->showConfigCheckbox('settings_overrideMimeType', 'overrideMimeType'); ?>
 <?php $this->showConfigCheckbox('settings_advancedAcl', 'advancedAcl'); ?>
 <?php $this->showConfigCheckbox('settings_removeFromDropFolder', 'removeFromDropFolder'); ?>

From 3f595ff145c6732ae95fbbce39acba3f2e3522e7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Nov 2020 10:56:14 +0100
Subject: [PATCH 251/312] some minor updates

---
 languages/ar_EG/lang.inc |  9 ++++++++-
 languages/bg_BG/lang.inc |  9 ++++++++-
 languages/ca_ES/lang.inc | 17 ++++++++++++-----
 languages/cs_CZ/lang.inc | 13 ++++++++++---
 languages/de_DE/lang.inc | 11 +++++++++--
 languages/el_GR/lang.inc | 15 +++++++++++----
 languages/en_GB/lang.inc | 11 +++++++++--
 languages/es_ES/lang.inc | 15 +++++++++++----
 languages/fr_FR/lang.inc | 15 +++++++++++----
 languages/hr_HR/lang.inc |  9 ++++++++-
 languages/hu_HU/lang.inc |  9 ++++++++-
 languages/it_IT/lang.inc | 29 ++++++++++++++++++-----------
 languages/ko_KR/lang.inc |  9 ++++++++-
 languages/lo_LA/lang.inc |  9 ++++++++-
 languages/nb_NO/lang.inc |  9 ++++++++-
 languages/nl_NL/lang.inc | 13 ++++++++++---
 languages/pl_PL/lang.inc |  9 ++++++++-
 languages/pt_BR/lang.inc |  9 ++++++++-
 languages/ro_RO/lang.inc |  9 ++++++++-
 languages/ru_RU/lang.inc | 23 +++++++++++++++--------
 languages/sk_SK/lang.inc |  9 ++++++++-
 languages/sv_SE/lang.inc | 13 ++++++++++---
 languages/tr_TR/lang.inc | 15 +++++++++++----
 languages/uk_UA/lang.inc | 13 ++++++++++---
 languages/zh_CN/lang.inc |  9 ++++++++-
 languages/zh_TW/lang.inc |  9 ++++++++-
 26 files changed, 251 insertions(+), 69 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 858d8de51..12345a873 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -210,6 +210,8 @@ URL: [url]',
 'calendar' => 'التقويم',
 'calendar_week' => 'التقويم الأسبوعي',
 'cancel' => 'الغاء',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'لايمكن تعديل ملف مرفوض او مهمل',
 'cannot_change_final_states' => 'تحذير: لا يمكن تعديل حالة مستند مرفوض او منتهى صلاحيته او رهن المراجعة او الموافقة',
 'cannot_delete_user' => 'لا يمكن حذف مستخدم',
@@ -382,7 +384,8 @@ Parent folder: [folder_path]
 'document_duplicate_name' => 'اسم المستند متكرر',
 'document_has_no_workflow' => 'المستند لايحتوى مسار عمل',
 'document_infos' => 'معلومات المستند',
-'document_is_checked_out' => 'تم سحب المستند',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => 'تم سحب المستند',
 'document_is_not_locked' => 'هذا المستند غير محمي ضد التعديل',
 'document_link_by' => 'مربوط بواسطة',
 'document_link_public' => 'عام',
@@ -908,6 +911,7 @@ URL: [url]',
 'october' => 'اكتوبر',
 'old' => 'قديم',
 'only_jpg_user_images' => 'فقط يمكنك استخدام ملفات من تنسيق jpg كصورة المستخدم',
+'operation_disallowed' => '',
 'order_by_sequence_off' => 'الترتيب بالتسلسل موقف',
 'original_filename' => 'اسم الملف الاصلي',
 'overall_indexing_progress' => 'متابعة الفهرسة',
@@ -1300,6 +1304,8 @@ URL: [url]',
 'settings_enableAdminRevApp_desc' => 'تمكين المسؤول من مراجعة التطبيق',
 'settings_enableCalendar' => 'تمكين التقويم',
 'settings_enableCalendar_desc' => 'تمكين التقويم',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => 'تمكين الحافظة',
 'settings_enableClipboard_desc' => 'تمكين الحافظة',
 'settings_enableConverting' => 'تمكين التحويل',
@@ -1616,6 +1622,7 @@ URL: [url]',
 'splash_add_to_transmittal' => 'اضافة إلى الإحالة',
 'splash_add_transmittal' => 'إضافة إحالة',
 'splash_add_user' => 'اضافة مستخدم',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => 'مسح ذاكرة التخزين المؤقت',
 'splash_cleared_clipboard' => 'مسح الحافظة',
 'splash_delete_access' => 'حذف الوصول',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 544b94e02..cde4a2f94 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -193,6 +193,8 @@ $text = array(
 'calendar' => 'Календар',
 'calendar_week' => '',
 'cancel' => 'Отмяна',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Невозможно е да се измени остарял или отклонен документ',
 'cannot_change_final_states' => 'Невозможно е да се изменя статусът на отклонен, просрочен или чакащ рецензия или утверждаване',
 'cannot_delete_user' => '',
@@ -356,7 +358,8 @@ $text = array(
 'document_duplicate_name' => 'Дублирано име на документ',
 'document_has_no_workflow' => 'Документът няма процес',
 'document_infos' => 'Информация за документа',
-'document_is_checked_out' => '',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => '',
 'document_is_not_locked' => 'Документът не е блокиран',
 'document_link_by' => 'Свързан',
 'document_link_public' => 'Публичен',
@@ -813,6 +816,7 @@ $text = array(
 'october' => 'октомври',
 'old' => 'Стар',
 'only_jpg_user_images' => 'Разрешени са само .jpg-изображения',
+'operation_disallowed' => '',
 'order_by_sequence_off' => 'Подреждането по последователност е изключено в настройките. Ако искате този параметър да има ефект, ще трябва да го включите отново.',
 'original_filename' => 'Оригинално име на файл',
 'overall_indexing_progress' => '',
@@ -1163,6 +1167,8 @@ $text = array(
 'settings_enableAdminRevApp_desc' => 'Изключи, за да скрия админа от списъка с рецензиращи/утвърждаващи',
 'settings_enableCalendar' => 'Включи календаря',
 'settings_enableCalendar_desc' => 'Включване/изключване календар',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => '',
 'settings_enableClipboard_desc' => '',
 'settings_enableConverting' => 'Включи конвертирането',
@@ -1479,6 +1485,7 @@ $text = array(
 'splash_add_to_transmittal' => '',
 'splash_add_transmittal' => '',
 'splash_add_user' => '',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => '',
 'splash_cleared_clipboard' => '',
 'splash_delete_access' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index cdaf11271..d18909056 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -19,14 +19,14 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (758)
+//    Translators: Admin (762)
 
 $text = array(
 '2_factor_auth' => '',
 '2_factor_auth_info' => '',
 '2_fact_auth_secret' => '',
 'accept' => 'Acceptar',
-'access_control' => '',
+'access_control' => 'Control d\'accés',
 'access_control_is_off' => '',
 'access_denied' => 'Accés denegat',
 'access_inheritance' => 'Accés heretat',
@@ -198,6 +198,8 @@ URL: [url]',
 'calendar' => 'Calendari',
 'calendar_week' => '',
 'cancel' => 'Cancel.lar',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'No es poden assignar nous revisors a un document que no està pendent de revisió o d\'aprovació.',
 'cannot_change_final_states' => 'Atenció: No es pot canviar l\'estat de documents que han estat rebutjats, marcats com a obsolets o expirats.',
 'cannot_delete_user' => '',
@@ -361,7 +363,8 @@ URL: [url]',
 'document_duplicate_name' => '',
 'document_has_no_workflow' => '',
 'document_infos' => 'Informacions',
-'document_is_checked_out' => '',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => '',
 'document_is_not_locked' => 'Aquest document no està bloquejat',
 'document_link_by' => 'Vinculat per',
 'document_link_public' => 'Públic',
@@ -588,7 +591,7 @@ 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' => 'Importar usuaris',
 'import_users_addnew' => '',
 'import_users_update' => '',
 'include_content' => '',
@@ -744,7 +747,7 @@ URL: [url]',
 'my_documents' => 'Els meus documents',
 'my_transmittals' => 'Documents enviats per mi',
 'name' => 'Nom',
-'nb_NO' => '',
+'nb_NO' => 'Noruec',
 'needs_correction' => '',
 'needs_workflow_action' => '',
 'network_drive' => '',
@@ -818,6 +821,7 @@ URL: [url]',
 'october' => 'Octubre',
 'old' => 'Vell',
 'only_jpg_user_images' => 'Només pot utilitzar imatges .jpg com imatges d\'usuari',
+'operation_disallowed' => '',
 'order_by_sequence_off' => 'L\'ordenació per seqüència és desactivada a la configuració. Si vol que aquest paràmetre sigui efectiu, haurà d\'activar-lo.',
 'original_filename' => '',
 'overall_indexing_progress' => '',
@@ -1168,6 +1172,8 @@ URL: [url]',
 'settings_enableAdminRevApp_desc' => '',
 'settings_enableCalendar' => '',
 'settings_enableCalendar_desc' => '',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => '',
 'settings_enableClipboard_desc' => '',
 'settings_enableConverting' => '',
@@ -1484,6 +1490,7 @@ URL: [url]',
 'splash_add_to_transmittal' => '',
 'splash_add_transmittal' => '',
 'splash_add_user' => '',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => '',
 'splash_cleared_clipboard' => '',
 'splash_delete_access' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index fb031cc3c..64ef83ae9 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1535), kreml (579)
+//    Translators: Admin (1537), kreml (579)
 
 $text = array(
 '2_factor_auth' => 'dvoufaktorové ověření',
@@ -222,6 +222,8 @@ URL: [url]',
 'calendar' => 'Kalendář',
 'calendar_week' => 'Kaledářní týden',
 'cancel' => 'Zrušit',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Není možné přidělit schvalovatele dokumentu, který nečeká na kontrolu nebo na schválení.',
 'cannot_change_final_states' => 'Upozornění: Nemůžete měnit stav dokumentu: zamítnutého, s vypršenou platností, posuzovaného nebo schvalovaného.',
 'cannot_delete_user' => 'Uživatele nejde smazat',
@@ -327,7 +329,7 @@ URL: [url]',
 'daily' => 'Denně',
 'databasesearch' => 'Vyhledání v databázi',
 'database_schema_version' => '',
-'data_loading' => '',
+'data_loading' => 'Prosím vyčkejte dokud se data nenahrají...',
 'date' => 'Datum',
 'days' => 'dny',
 'debug' => 'odstranění chyb kódu',
@@ -401,7 +403,8 @@ Uživatel: [username]',
 'document_duplicate_name' => 'Duplicitní název dokumentu',
 'document_has_no_workflow' => 'Dokument nemá workflow',
 'document_infos' => 'Informace o dokumentu',
-'document_is_checked_out' => 'Dokument je aktuálně zkontrolován. Pokud nahrajete novou verzi, nemůžete již kontrolovanou verzi zkontrolovat.',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => 'Dokument je aktuálně zkontrolován. Pokud nahrajete novou verzi, nemůžete již kontrolovanou verzi zkontrolovat.',
 'document_is_not_locked' => 'Tento dokument není zamčený',
 'document_link_by' => 'Odkazuje sem',
 'document_link_public' => 'Veřejný',
@@ -939,6 +942,7 @@ URL: [url]',
 'october' => 'Říjen',
 'old' => 'Starý',
 'only_jpg_user_images' => 'Pro obrázky uživatelů je možné použít pouze obrázky .jpg',
+'operation_disallowed' => '',
 'order_by_sequence_off' => 'Pořadí podle řazení je v nastavení vypnuto. Chcete-li mít tento parametr vliv, musíte jej znovu zapnout.',
 'original_filename' => 'Originální název souboru',
 'overall_indexing_progress' => 'Celkový průběh indexování',
@@ -1372,6 +1376,8 @@ Jméno: [username]
 'settings_enableAdminRevApp_desc' => 'Povolte, pokud chcete, aby správci byli uvedeni jako recenzenti/schvalující a pro přechody workflow.',
 'settings_enableCalendar' => 'Povolit kalendář',
 'settings_enableCalendar_desc' => 'Povolení / zakázání kalendáře',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => 'Povolit schránku',
 'settings_enableClipboard_desc' => 'Povolit/zakázat schránku',
 'settings_enableConverting' => 'Povolit konverzi',
@@ -1688,6 +1694,7 @@ Jméno: [username]
 'splash_add_to_transmittal' => 'Přidáno k přenosu',
 'splash_add_transmittal' => 'Přidán přenos',
 'splash_add_user' => 'Přidán nový uživatel',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => 'Mezipaměť vymazána',
 'splash_cleared_clipboard' => 'Schránka vymazána',
 'splash_delete_access' => 'Přístupová práva smazána',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index abe59576d..4aa96c904 100644
--- 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 (2821), dgrutsch (22)
+//    Translators: Admin (2828), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -222,6 +222,8 @@ URL: [url]',
 'calendar' => 'Kalender',
 'calendar_week' => 'Kalenderwoche',
 'cancel' => 'Abbrechen',
+'cancel_checkout' => 'Auschecken abbrechen',
+'cancel_checkout_warning' => 'Das Auschecken kann beendet werden, auch wenn bereits Änderung am ausgecheckten Dokument vorgenommen worden sind. In dem Fall wird die Datei gelöscht und die Änderungen gehen verloren.',
 'cannot_assign_invalid_state' => 'Die Zuweisung eines neuen Prüfers zu einem Dokument, welches noch nachbearbeitet oder überprüft wird ist nicht möglich',
 'cannot_change_final_states' => 'Warnung: Nicht imstande, Dokumentstatus für Dokumente, die zurückgewiesen worden sind, oder als abgelaufen bzw. überholt markiert wurden zu ändern',
 'cannot_delete_user' => 'Benutzer kann nicht gelöscht werden',
@@ -401,7 +403,8 @@ Benutzer: [username]',
 'document_duplicate_name' => 'Doppelter Dokumentenname',
 'document_has_no_workflow' => 'Dokument hat keinen Workflow',
 'document_infos' => 'Informationen',
-'document_is_checked_out' => 'Das Dokument ist zur Zeit ausgecheckt. Wenn Sie eine neue Version hochladen, werden Sie die ausgecheckte Version nicht mehr einchecken können.',
+'document_is_checked_out_remove' => 'Das Dokument ist zur Zeit ausgecheckt. Wenn Sie das Dokument löschen kann die ausgecheckte Version nicht mehr hochgeladen werden und verbleibt im Auscheck-Bereich.',
+'document_is_checked_out_update' => 'Das Dokument ist zur Zeit ausgecheckt. Wenn Sie eine neue Version hochladen, werden Sie die ausgecheckte Version nicht mehr einchecken können.',
 'document_is_not_locked' => 'Dieses Dokument ist nicht gesperrt',
 'document_link_by' => 'Verknüpfung erstellt von',
 'document_link_public' => 'Für alle sichtbar',
@@ -938,6 +941,7 @@ URL: [url]',
 'october' => 'Oktober',
 'old' => 'Alt',
 'only_jpg_user_images' => 'Es sind nur JPG-Bilder erlaubt',
+'operation_disallowed' => 'Operation nicht erlaubt',
 'order_by_sequence_off' => 'Die Sortierung nach Folge ist in den Einstellungen ausgeschaltet. Wenn dieser Parameter wirksam sein soll, muss sie wieder eingeschaltet werden.',
 'original_filename' => 'Original filename',
 'overall_indexing_progress' => 'Gesamtfortschritt bei der Indizierung',
@@ -1383,6 +1387,8 @@ Name: [username]
 'settings_enableAdminRevApp_desc' => 'Anwählen, um Administratoren in der Liste der Prüfer und Freigeber und als Beteiligte in Workflows auszugeben',
 'settings_enableCalendar' => 'Kalender einschalten',
 'settings_enableCalendar_desc' => 'Kalender ein/ausschalten',
+'settings_enableCancelCheckout' => 'Erlaube den Abbruch ausgecheckter Dokumente',
+'settings_enableCancelCheckout_desc' => 'Auswählen, wenn es möglich sein soll auch bereits modifizierte ausgecheckte Dokumente zu verwerfen.',
 'settings_enableClipboard' => 'Zwischenablage einschalten',
 'settings_enableClipboard_desc' => 'Schaltet die Zwischenablage auf der \'View Folder\' Seite ein/aus',
 'settings_enableConverting' => 'Dokumentenkonvertierung einschalten',
@@ -1699,6 +1705,7 @@ Name: [username]
 'splash_add_to_transmittal' => 'Zur Dokumentenliste hinzugefügt',
 'splash_add_transmittal' => 'Dokumentenliste angelegt',
 'splash_add_user' => 'Neuen Benutzer hinzugefügt',
+'splash_cancel_checkout' => 'Auschecken abgebrochen',
 'splash_cleared_cache' => 'Cache geleert',
 'splash_cleared_clipboard' => 'Zwischenablage geleert',
 'splash_delete_access' => 'Zugriffsrecht gelöscht',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 9f7fdf84d..54725b3e7 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (328)
+//    Translators: Admin (330)
 
 $text = array(
 '2_factor_auth' => '',
@@ -193,6 +193,8 @@ $text = array(
 'calendar' => 'Ημερολόγιο',
 'calendar_week' => 'Εβδομάδα',
 'cancel' => 'Ακύρωση',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => '',
 'cannot_change_final_states' => '',
 'cannot_delete_user' => '',
@@ -294,7 +296,7 @@ $text = array(
 'current_password' => '',
 'current_quota' => '',
 'current_state' => '',
-'current_version' => '',
+'current_version' => 'Τρέχουσα έκδοση',
 'daily' => '',
 'databasesearch' => '',
 'database_schema_version' => '',
@@ -356,7 +358,8 @@ $text = array(
 'document_duplicate_name' => '',
 'document_has_no_workflow' => '',
 'document_infos' => 'Πληροφορίες Εγγράφου',
-'document_is_checked_out' => '',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => '',
 'document_is_not_locked' => '',
 'document_link_by' => '',
 'document_link_public' => 'Δημόσιο',
@@ -440,7 +443,7 @@ $text = array(
 'edit_user_details' => '',
 'edit_version' => '',
 'el_GR' => 'Greek/Ελληνικά',
-'email' => '',
+'email' => 'Email',
 'email_error_title' => '',
 'email_footer' => '',
 'email_header' => '',
@@ -824,6 +827,7 @@ URL: [url]',
 'october' => 'Οκτώβριος',
 'old' => 'Παλιό',
 'only_jpg_user_images' => '',
+'operation_disallowed' => '',
 'order_by_sequence_off' => '',
 'original_filename' => '',
 'overall_indexing_progress' => '',
@@ -1174,6 +1178,8 @@ URL: [url]',
 'settings_enableAdminRevApp_desc' => '',
 'settings_enableCalendar' => '',
 'settings_enableCalendar_desc' => '',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => '',
 'settings_enableClipboard_desc' => '',
 'settings_enableConverting' => '',
@@ -1490,6 +1496,7 @@ URL: [url]',
 'splash_add_to_transmittal' => '',
 'splash_add_transmittal' => '',
 'splash_add_user' => '',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => '',
 'splash_cleared_clipboard' => '',
 'splash_delete_access' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index b382ad7b3..37b075a84 100644
--- 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 (1927), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1934), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -222,6 +222,8 @@ URL: [url]',
 'calendar' => 'Calendar',
 'calendar_week' => 'Calendar week',
 'cancel' => 'Cancel',
+'cancel_checkout' => 'Cancel checkout',
+'cancel_checkout_warning' => 'The check out can canceled thought the checked out file has been changed. In that case the file will be deleted from the check out space and your modification will be lost.',
 'cannot_assign_invalid_state' => 'Cannot modify an obsolete or rejected document',
 'cannot_change_final_states' => 'Warning: You cannot alter status for document rejected, expired or with pending review or approval',
 'cannot_delete_user' => 'Cannot delete user',
@@ -401,7 +403,8 @@ User: [username]',
 'document_duplicate_name' => 'Duplicate document name',
 'document_has_no_workflow' => 'Document has no workflow',
 'document_infos' => 'Document Information',
-'document_is_checked_out' => 'Document is currently checked out. If you upload a new version, then the checked out version cannot be checked back in anymore.',
+'document_is_checked_out_remove' => 'Document is currently checked out. If you delete the document, the checked out version can not be added anymore and remains in the checkout area.',
+'document_is_checked_out_update' => 'Document is currently checked out. If you upload a new version, then the checked out version cannot be checked back in anymore.',
 'document_is_not_locked' => 'This document is not locked',
 'document_link_by' => 'Linked by',
 'document_link_public' => 'Public',
@@ -939,6 +942,7 @@ URL: [url]',
 'october' => 'October',
 'old' => 'Old',
 'only_jpg_user_images' => 'Only .jpg-images may be used as user-images',
+'operation_disallowed' => 'Operation not permitted',
 'order_by_sequence_off' => 'Ordering by sequence is turned off in the settings. If you want this parameter to have effect, you will have to turn it back on.',
 'original_filename' => 'Original filename',
 'overall_indexing_progress' => 'Overall indexing progress',
@@ -1377,6 +1381,8 @@ Name: [username]
 'settings_enableAdminRevApp_desc' => 'Enable this if you want administrators to be listed as reviewers/approvers and for workflow transitions.',
 'settings_enableCalendar' => 'Enable Calendar',
 'settings_enableCalendar_desc' => 'Enable/disable calendar',
+'settings_enableCancelCheckout' => 'Allow to cancel check outs',
+'settings_enableCancelCheckout_desc' => 'If checked, a checked out document which has already been modified can be discarded.',
 'settings_enableClipboard' => 'Enable Clipboard',
 'settings_enableClipboard_desc' => 'Enable/disable the clipboard on the \'View Folder\' page',
 'settings_enableConverting' => 'Enable Converting',
@@ -1693,6 +1699,7 @@ Name: [username]
 'splash_add_to_transmittal' => 'Add to transmittal',
 'splash_add_transmittal' => 'Added transmittal',
 'splash_add_user' => 'New user added',
+'splash_cancel_checkout' => 'Checkout canceled',
 'splash_cleared_cache' => 'Cache cleared',
 'splash_cleared_clipboard' => 'Clipboard cleared',
 'splash_delete_access' => 'Access right deleted',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 924940bb8..5a7021f42 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: acabello (20), Admin (1285), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1287), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -217,6 +217,8 @@ URL: [url]',
 'calendar' => 'Calendario',
 'calendar_week' => 'Calendario semanal',
 'cancel' => 'Cancelar',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'No se puede modificar un documento obsoleto o rechazado',
 'cannot_change_final_states' => 'Cuidado: No se puede cambiar el estado de documentos que han sido rechazados, marcados como obsoletos o expirados.',
 'cannot_delete_user' => 'No es posible eliminar el usuario',
@@ -322,7 +324,7 @@ URL: [url]',
 'daily' => 'Diaria',
 'databasesearch' => 'Búsqueda en base de datos',
 'database_schema_version' => 'Versión del esquema de base de datos',
-'data_loading' => '',
+'data_loading' => 'Por favor, espere hasta que los datos sean cargados ...',
 'date' => 'Fecha',
 'days' => 'días',
 'debug' => 'Depuración',
@@ -389,7 +391,8 @@ Usuario: [username]',
 'document_duplicate_name' => 'Nombre de documento duplicado',
 'document_has_no_workflow' => 'Documento sin flujo de trabajo',
 'document_infos' => 'Informaciones',
-'document_is_checked_out' => '',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => '',
 'document_is_not_locked' => 'Este documento no está bloqueado',
 'document_link_by' => 'Vinculado por',
 'document_link_public' => 'Público',
@@ -915,6 +918,7 @@ URL: [url]',
 'october' => 'Octubre',
 'old' => 'Viejo',
 'only_jpg_user_images' => 'Sólo puede usar imágenes .jpg como imágenes de usuario',
+'operation_disallowed' => '',
 'order_by_sequence_off' => 'El orden secuencial está desactivado en la configuración. Si quiere utilizar este parámetro, deberá activarlo.',
 'original_filename' => 'Nombre de fichero original',
 'overall_indexing_progress' => 'Proceso de indexación global',
@@ -1315,6 +1319,8 @@ URL: [url]',
 'settings_enableAdminRevApp_desc' => 'Deseleccione para no mostrar al administrador como revisor/aprobador',
 'settings_enableCalendar' => 'Habilitar calendario',
 'settings_enableCalendar_desc' => 'Habilitar/Deshabilitar calendario',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => 'Habilitar portapapeles',
 'settings_enableClipboard_desc' => 'Habilitar/deshabilitar el portapapeles',
 'settings_enableConverting' => 'Habilitar conversión',
@@ -1429,7 +1435,7 @@ URL: [url]',
 'settings_initialDocumentStatus_draft' => 'Borrador',
 'settings_initialDocumentStatus_released' => 'Liberado',
 'settings_inlineEditing' => '',
-'settings_inlineEditing_desc' => '',
+'settings_inlineEditing_desc' => 'Si se encuentra habilitado, será posible editar el nombre del documentos en la página de detalles',
 'settings_installADOdb' => 'Instalar ADOdb',
 'settings_install_disabled' => 'El archivo ENABLE_INSTALL_TOOL ha sido eliminado. Ahora puede conectarse a SeedDMS y seguir con la configuración.',
 'settings_install_pear_package_log' => 'Instale el paquete Pear \'Log\'',
@@ -1631,6 +1637,7 @@ URL: [url]',
 'splash_add_to_transmittal' => '',
 'splash_add_transmittal' => '',
 'splash_add_user' => 'Nuevo usuario agregado',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => '',
 'splash_cleared_clipboard' => 'Portapapeles limpiado',
 'splash_delete_access' => '',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 5636061b1..3991013c6 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1105), jeromerobert (50), lonnnew (9), Oudiceval (970)
+//    Translators: Admin (1107), jeromerobert (50), lonnnew (9), Oudiceval (970)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -222,6 +222,8 @@ URL: [url]',
 'calendar' => 'Agenda',
 'calendar_week' => 'Semaine',
 'cancel' => 'Annuler',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Impossible de modifier un document obsolète ou rejeté',
 'cannot_change_final_states' => 'Attention : Vous ne pouvez pas modifier l’état d\'un document rejeté, expiré ou en attente de vérification ou d’approbation.',
 'cannot_delete_user' => 'Impossible de supprimer l’utilisateur',
@@ -327,7 +329,7 @@ URL: [url]',
 'daily' => 'Journalier',
 'databasesearch' => 'Recherche dans la base de données',
 'database_schema_version' => 'Version du schéma de base de données',
-'data_loading' => '',
+'data_loading' => 'Veuillez patienter, jusqu\'à ce que les données soient chargées',
 'date' => 'Date',
 'days' => 'jours',
 'debug' => 'Débogage',
@@ -401,7 +403,8 @@ Utilisateur : [username]',
 'document_duplicate_name' => 'Un document porte déjà ce nom !',
 'document_has_no_workflow' => 'Le document n\'a pas de workflow',
 'document_infos' => 'Informations sur le document',
-'document_is_checked_out' => 'Le document est actuellement bloqué. Si vous ajoutez une nouvelle version, la version bloquée ne pourra plus être débloquée.',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => 'Le document est actuellement bloqué. Si vous ajoutez une nouvelle version, la version bloquée ne pourra plus être débloquée.',
 'document_is_not_locked' => 'Ce document n\'est pas verrouillé',
 'document_link_by' => 'Lié par',
 'document_link_public' => 'Public',
@@ -939,6 +942,7 @@ URL: [url]',
 'october' => 'Octobre',
 'old' => 'Ancien',
 'only_jpg_user_images' => 'Images d\'utilisateur au format .jpg seulement',
+'operation_disallowed' => '',
 'order_by_sequence_off' => 'Le tri par position est désactivé dans les préférences. Si vous souhaitez que ce paramètre prenne effet, vous devez l’activer.',
 'original_filename' => 'Nom de fichier original',
 'overall_indexing_progress' => 'Progression globale de l’indexation',
@@ -1375,6 +1379,8 @@ Nom : [username]
 'settings_enableAdminRevApp_desc' => 'Activer cette option pour ajouter les administrateurs à la liste des examinateurs/approbateurs et pour les transitions de workflow.',
 'settings_enableCalendar' => 'Activer agenda',
 'settings_enableCalendar_desc' => 'Active/désactive l’agenda',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => 'Activer le presse-papier',
 'settings_enableClipboard_desc' => 'Active/désactive le presse-papier',
 'settings_enableConverting' => 'Activer conversion des fichiers',
@@ -1691,6 +1697,7 @@ Nom : [username]
 'splash_add_to_transmittal' => 'Ajouté à la transmission',
 'splash_add_transmittal' => 'Ajouté à la transmission',
 'splash_add_user' => 'Nouvel utilisateur ajouté',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => 'Cache vidé',
 'splash_cleared_clipboard' => 'Presse-papier vidé',
 'splash_delete_access' => 'Droits d’accès supprimés',
@@ -1952,7 +1959,7 @@ URL: [url]',
 'version_deleted_email_subject' => '[sitename] : [name] - Version supprimée',
 'version_info' => 'Informations de version',
 'view' => 'Aperçu',
-'view_document' => '',
+'view_document' => 'Voir le document',
 'view_folder' => '',
 'view_online' => 'Aperçu en ligne',
 'warning' => 'Avertissement',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 12752f784..27f7a1db0 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -222,6 +222,8 @@ Internet poveznica: [url]',
 'calendar' => 'Kalendar',
 'calendar_week' => 'kalendarski tjedan',
 'cancel' => 'Odustani',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Ne možete mijenjati zastarjeli ili odbijeni dokument',
 'cannot_change_final_states' => 'Upozorenje: Ne možete mijenjati status odbijenog, isteklog ili dokumenta koji čeka na ovjeru ili odobrenje',
 'cannot_delete_user' => 'Ne možete izbrisati korisnika',
@@ -394,7 +396,8 @@ Korisnik: [username]',
 'document_duplicate_name' => 'Duplicate document name',
 'document_has_no_workflow' => 'Dokument nema tok rada',
 'document_infos' => 'Informacije o dokumentu',
-'document_is_checked_out' => 'Dokument je trenutno odjavljen. Ako učitate novu verziju, tada odjavljena verzija ne može više biti ponovno prijavljena.',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => 'Dokument je trenutno odjavljen. Ako učitate novu verziju, tada odjavljena verzija ne može više biti ponovno prijavljena.',
 'document_is_not_locked' => 'Ovaj dokument nije zaključan',
 'document_link_by' => 'Povezao',
 'document_link_public' => 'Javno',
@@ -919,6 +922,7 @@ Internet poveznica: [url]',
 'october' => 'Listopad',
 'old' => 'Staro',
 'only_jpg_user_images' => 'Kao korisničke slike mogu se koristiti samo .jpg slike',
+'operation_disallowed' => '',
 'order_by_sequence_off' => 'Sortiranje po sekvencei ne isključeno u postavkama. Ako želite da ovaj parametar ima utjecaja, morat ćete ga ponovno uključiti.',
 'original_filename' => 'Izvorni naziv datoteke',
 'overall_indexing_progress' => '',
@@ -1336,6 +1340,8 @@ Internet poveznica: [url]',
 'settings_enableAdminRevApp_desc' => 'Omogući ovo ako želiš da administratori budu navedeni kao recezenti/validatori i za promjenu toka rada.',
 'settings_enableCalendar' => 'Omogući Kalendar',
 'settings_enableCalendar_desc' => 'Omogući/onemogući kalendar',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => 'Omogući međuspremnik',
 'settings_enableClipboard_desc' => 'Omogući/onemogući međuspremnik na \'Vidi mapu\' stranici',
 'settings_enableConverting' => 'Omogući pretvaranje',
@@ -1652,6 +1658,7 @@ Internet poveznica: [url]',
 'splash_add_to_transmittal' => '',
 'splash_add_transmittal' => '',
 'splash_add_user' => 'Dodan novi korisnik',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => '',
 'splash_cleared_clipboard' => 'Očišćen međuspremnik',
 'splash_delete_access' => '',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 1fa5a0883..dd0dbd9f8 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -217,6 +217,8 @@ URL: [url]',
 'calendar' => 'Naptár',
 'calendar_week' => 'Naptári hét',
 'cancel' => 'Mé‰gsem',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Nem lehet új felülvizsgálót hozzárendelni olyan dokumentumhoz, amely nincs felülvizsgálat vagy jóváhagyás alatt.',
 'cannot_change_final_states' => 'Figyelem: Nem lehet olyan dokumentum állapotát módosítani, amely visszautasított, elavultnak jelölt vagy lejárt.',
 'cannot_delete_user' => 'Nem törölhet felhasználót',
@@ -389,7 +391,8 @@ Felhasználó: [username]',
 'document_duplicate_name' => 'Duplikált dokumentum név',
 'document_has_no_workflow' => 'Dokumentumhoz nincs munkafolyamat',
 'document_infos' => 'Dokumentum információ',
-'document_is_checked_out' => '',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => '',
 'document_is_not_locked' => 'Ez a dokumentum NEM zßrolt',
 'document_link_by' => 'Hivatkozást létrehozta:',
 'document_link_public' => 'Nyilvános',
@@ -915,6 +918,7 @@ URL: [url]',
 'october' => 'Október',
 'old' => 'Régi',
 'only_jpg_user_images' => 'Felhasználói képként csak .jpg állományok adhatók meg',
+'operation_disallowed' => '',
 'order_by_sequence_off' => '',
 'original_filename' => 'Eredeti fájlnév',
 'overall_indexing_progress' => 'Teljes indexelési folyamat',
@@ -1314,6 +1318,8 @@ URL: [url]',
 'settings_enableAdminRevApp_desc' => 'Engedélyezze, ha szeretné, hogy az adminisztrátorok listázva legyenek a felülvizsgálóknál/jóváhagyóknál és a munkamenet átmeneteknél.',
 'settings_enableCalendar' => 'Naptár engedélyezése',
 'settings_enableCalendar_desc' => 'Naptár engedélyezés/tiltás',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => 'Vágólap engedélyezése',
 'settings_enableClipboard_desc' => 'Vágólap engedélyezés/tiltás',
 'settings_enableConverting' => 'Konvertálás engedélyezése',
@@ -1630,6 +1636,7 @@ URL: [url]',
 'splash_add_to_transmittal' => '',
 'splash_add_transmittal' => '',
 'splash_add_user' => 'Új felhasználó hozzáadva',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => '',
 'splash_cleared_clipboard' => 'Vágólap törölve',
 'splash_delete_access' => '',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index cbd2a01cd..bbe1bfdd9 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2026), rickr (144), s.pnt (26)
+//    Translators: Admin (2035), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -222,6 +222,8 @@ URL: [url]',
 'calendar' => 'Calendario',
 'calendar_week' => 'Calendario settimanale',
 'cancel' => 'Annulla',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Non è possibile modificare le assegnazioni di un documento obsoleto o rifiutato',
 'cannot_change_final_states' => 'Attenzione: non si può modificare lo stato dei documenti rifiutati, scaduti o in attesa di revisione o approvazione',
 'cannot_delete_user' => 'Impossibile eliminare l\'utente',
@@ -327,7 +329,7 @@ URL: [url]',
 'daily' => 'Giornaliero',
 'databasesearch' => 'Ricerca nel Database',
 'database_schema_version' => '',
-'data_loading' => '',
+'data_loading' => 'Attendere il caricamento dei dati...',
 'date' => 'Data',
 'days' => 'Giorni',
 'debug' => 'Localizzare e rimuovere errori da (Debug)',
@@ -394,7 +396,8 @@ Utente: [username]',
 'document_duplicate_name' => 'Nome del Documento duplicato',
 'document_has_no_workflow' => 'Il documento non ha un flusso di lavoro',
 'document_infos' => 'Informazioni documento',
-'document_is_checked_out' => 'Il documento é approvato. Se aggiorni il documento, la versione approvata verrà sovrascritta definitivamente',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => 'Il documento é approvato. Se aggiorni il documento, la versione approvata verrà sovrascritta definitivamente',
 'document_is_not_locked' => 'Questo documento non è bloccato',
 'document_link_by' => 'Collegato da',
 'document_link_public' => 'Pubblico',
@@ -869,7 +872,7 @@ URL: [url]',
 'next_state' => 'Nuovo stato',
 'nl_NL' => 'Olandese',
 'no' => 'No',
-'notification' => '',
+'notification' => 'Notifica',
 'notify_added_email' => 'Sei stato aggiunto alla lista di notifica',
 'notify_added_email_body' => 'Aggiunto alla lista di notifica
 Nome: [name]
@@ -925,6 +928,7 @@ URL: [url]',
 'october' => 'Ottobre',
 'old' => 'Vecchio',
 'only_jpg_user_images' => 'Possono essere utilizzate solo immagini di tipo jpeg',
+'operation_disallowed' => '',
 'order_by_sequence_off' => 'Ordina in sequenza disabilitato',
 'original_filename' => 'Nome file originale',
 'overall_indexing_progress' => 'Totale processo di indicizzazione',
@@ -1222,7 +1226,7 @@ URL: [url]',
 'search_time' => 'Tempo trascorso: [time] secondi.',
 'seconds' => 'secondi',
 'seeddms_info' => '',
-'seeddms_version' => '',
+'seeddms_version' => 'Versione di SeedDMS',
 'selection' => 'Selezione',
 'select_attrdefgrp_show' => 'Scegli quando mostrare',
 'select_attribute_value' => 'Seleziona il valore dell\'attributo',
@@ -1285,8 +1289,8 @@ Name: [username]
 'settings_apache_mod_rewrite' => 'Apache - Mod Rewrite',
 'settings_apiKey' => '',
 'settings_apiKey_desc' => '',
-'settings_apiOrigin' => '',
-'settings_apiOrigin_desc' => '',
+'settings_apiOrigin' => 'Origine consentita delle chiamate API',
+'settings_apiOrigin_desc' => 'Un elenco di indirizzi separati da punto e virgola. Ogni indirizzo ha la forma: // [:]. La porta può essere omessa. Se questo campo viene lasciato vuoto, non verranno applicate restrizioni.',
 'settings_apiUserId' => '',
 'settings_apiUserId_desc' => '',
 'settings_Authentication' => 'Impostazioni di Autenticazione',
@@ -1363,6 +1367,8 @@ Name: [username]
 'settings_enableAdminRevApp_desc' => 'Abilita per elencare gli amministratori tra i revisori/approvatori e per le transizioni del flusso di lavoro',
 'settings_enableCalendar' => 'Abilita calendario',
 'settings_enableCalendar_desc' => 'Abilita/disabilita il calendario',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => 'Abilita clipboard',
 'settings_enableClipboard_desc' => 'Abilita/disabilita la clipboard sulla pagina \'Vista cartella\'',
 'settings_enableConverting' => 'Abilita conversione',
@@ -1476,8 +1482,8 @@ Name: [username]
 'settings_initialDocumentStatus_desc' => 'Stato assegnato quando si aggiunge documento',
 'settings_initialDocumentStatus_draft' => 'Bozza',
 'settings_initialDocumentStatus_released' => 'Pubblicato',
-'settings_inlineEditing' => '',
-'settings_inlineEditing_desc' => '',
+'settings_inlineEditing' => 'Modifica in linea',
+'settings_inlineEditing_desc' => 'Se abilitato, sarà possibile modificare il nome del documento nella pagina dei dettagli',
 'settings_installADOdb' => 'Installa ADOdb',
 'settings_install_disabled' => 'Il file ENABLE_INSTALL_TOOL è stato cancellato. Ora puoi effettuare il login in SeedDMS e fare ulteriori configurazioni.',
 'settings_install_pear_package_log' => 'Installa il registro del pacchetto Pear',
@@ -1520,10 +1526,10 @@ Name: [username]
 'settings_notwritable' => 'La configurazione non può essere salvata perchè il file di configurazione non può essere sovrascritto.',
 'settings_no_content_dir' => 'Cartella contenitore',
 'settings_onePageMode' => 'Modalità ad una pagina',
-'settings_onePageMode_desc' => '',
+'settings_onePageMode_desc' => 'La modalità a una pagina, attiverà il codice javascript nella pagina ViewFolder, che aggiorna l\'elenco di cartelle/documenti, la navigazione, ecc. quando si fa clic su una cartella o si modifica il parametro di ordinamento.',
 'settings_overrideMimeType' => 'Ignora MimeType',
 'settings_overrideMimeType_desc' => 'Ignora il MimeType impostato dal browser, se un file viene caricato. Il MimeType è determinato ed impostato dal DMS stesso.',
-'settings_overrideTheme' => '',
+'settings_overrideTheme' => 'Ignora tema',
 'settings_overrideTheme_desc' => '',
 'settings_partitionSize' => 'Dimensione file parziale',
 'settings_partitionSize_desc' => 'Dimensione parziale dei files caricati da Jumploader in bytes. Non impostare un valore maggiore del massimo carico di upload attribuito dal server.',
@@ -1679,6 +1685,7 @@ Name: [username]
 'splash_add_to_transmittal' => 'Aggiungere alla trasmissione',
 'splash_add_transmittal' => 'Aggiungere trasmissione',
 'splash_add_user' => 'Utente aggiunto',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => 'Cache cancellata',
 'splash_cleared_clipboard' => 'Appunti cancellati',
 'splash_delete_access' => 'Diritto d\'accesso cancellato',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 222395b78..3f256d3ef 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -224,6 +224,8 @@ URL: [url]',
 'calendar' => '달력',
 'calendar_week' => '주',
 'cancel' => '취소',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => '사용되지 않거나 거부된 문서는 수정 불가',
 'cannot_change_final_states' => '경고 : 거부, 만료 또는 검토나 승인보류 중인 문서의 상태는 변경할 수 없습니다.',
 'cannot_delete_user' => '사용자를 삭제할 수 없습니다',
@@ -397,7 +399,8 @@ URL: [url]',
 'document_duplicate_name' => '중복 문서 이름',
 'document_has_no_workflow' => '문서에 워크플로우가 없습니다',
 'document_infos' => '문서 정보',
-'document_is_checked_out' => '문서가 현재 체크아웃 되어 있습니다. 새 버전을 업로드하면 체크아웃된 버전은 더 이상 확인 할 수 없습니다.',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => '문서가 현재 체크아웃 되어 있습니다. 새 버전을 업로드하면 체크아웃된 버전은 더 이상 확인 할 수 없습니다.',
 'document_is_not_locked' => '잠겨 있지 않은 문서',
 'document_link_by' => '연결',
 'document_link_public' => '공개',
@@ -921,6 +924,7 @@ URL : [url]',
 'october' => '10월',
 'old' => '이전',
 'only_jpg_user_images' => '.JPG - 이미지만 사용자가 이미지로 사용할 수 있습니다',
+'operation_disallowed' => '',
 'order_by_sequence_off' => '순서에 의한 정렬 설정이 켜져 있습니다. 이 매개 변수를 사용하고 싶은 경우 이것을 활성화 해야 합니다.',
 'original_filename' => '원래본 파일명',
 'overall_indexing_progress' => '전체 색인 진행률',
@@ -1330,6 +1334,8 @@ URL : [url]',
 'settings_enableAdminRevApp_desc' => '관리자가 검토 / 승인으로 워크플로우를 전환 할 경우에 사용.',
 'settings_enableCalendar' => '달력 활성화',
 'settings_enableCalendar_desc' => '활성화 / 비활성화 달력',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => '클립 보드 활성화',
 'settings_enableClipboard_desc' => '\'View Folder\'의 클립 보드 활성화/비활성화',
 'settings_enableConverting' => '변환 사용',
@@ -1646,6 +1652,7 @@ URL : [url]',
 'splash_add_to_transmittal' => '',
 'splash_add_transmittal' => '',
 'splash_add_user' => '새 사용자 추가',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => '',
 'splash_cleared_clipboard' => '클립 보드 비우기',
 'splash_delete_access' => '',
diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc
index 332bdc640..951558f0c 100644
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@@ -220,6 +220,8 @@ URL: [url]',
 'calendar' => 'ປະຕຶທຶນ',
 'calendar_week' => 'ປະຕຶທຶນປະຈຳອາທຶດ',
 'cancel' => 'ຍົກເລີກ',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'ບໍ່ສາມາດແກ້ໄຂເອກະສານທີ່ລ້າສະໄຫມ ຫຼື ເອກະສານທີ່ຖືກປະຕິເສດໄດ້',
 'cannot_change_final_states' => 'ຄຳເຕືອນ: ເຈົ້າບໍ່ສາມາດປ່ຽນແປງສະຖານະຂອງເອກະສານທີ່ຖືກປະຕິເສດ, ໝົດອາຍຸ ຫຼື ລໍຖ້າການກວດຄືນ ຫຼື ອະນຸມັດ',
 'cannot_delete_user' => 'ບໍ່ສາມາດລົບຜູ້ໄຊ້ໄດ້',
@@ -392,7 +394,8 @@ URL: [url]',
 'document_duplicate_name' => 'ຊື່ເອກະສານຊໍ້າ',
 'document_has_no_workflow' => 'ເອກະສານບໍ່ມີເວີກໂຟ',
 'document_infos' => 'ຂໍ້ມູນເອກະສານ',
-'document_is_checked_out' => 'ຂະນະນີ້ມີການກວດສອບເອກະສານ ຫາກເຈົ້າອັບໂຫລດເວີຊັນໄຫມ່ລະບົບຈະບໍ່ສາມາດກວດສອບລະບົບທີປິດອອກໄດ້ອີກຕໍ່ໄປ',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => 'ຂະນະນີ້ມີການກວດສອບເອກະສານ ຫາກເຈົ້າອັບໂຫລດເວີຊັນໄຫມ່ລະບົບຈະບໍ່ສາມາດກວດສອບລະບົບທີປິດອອກໄດ້ອີກຕໍ່ໄປ',
 'document_is_not_locked' => 'ເອກະສານນີ້ແມ່ນບໍ່ໄດ້ລັອກ',
 'document_link_by' => 'ເຊື່ອມໂຢງໂດຍ',
 'document_link_public' => 'ສາທາລະນະ',
@@ -918,6 +921,7 @@ URL: [url]',
 'october' => 'ເດືອນ ຕຸລາ',
 'old' => 'ເກົ່າ',
 'only_jpg_user_images' => 'ອາດໄຊ້ພາບ ຈິພີເຈ ເປັນພາບຂອງຜູ້ນຳໄຊ້ເທົ່ານັ້ນ',
+'operation_disallowed' => '',
 'order_by_sequence_off' => 'ການສັ່ງຊື້ຕາມລຳດັບຖືກປິດຢູ່ການຕັ້ງຄ່າ, ຖ້າເຈົ້າຕ້ອງການໃຫ້ພາລາມິດເຕີນີ້ໄດ້ຮັບຜົນ, ເຈົ້າຈະຕ້ອງເປີດໄຊ້ງານອີກຄັ້ງ',
 'original_filename' => 'ຊື່ໄຟລຕົ້ນສະບັບ',
 'overall_indexing_progress' => 'ຄວາມຄືບໜ້າການເຮັດດັດສະນີໂດຍລວມ',
@@ -1356,6 +1360,8 @@ URL: [url]',
 'settings_enableAdminRevApp_desc' => 'ເປີດໄຊ້ງານຄຸນລັກສະນະນີ້ຖ້າວ່າເຈົ້າຕ້ອງການໃຫ້ຜູ້ດູແລລະບົບສະແດງລາຍຊື່ຜູ້ກວດສອບ/ຜູ້ອະນຸມັດແລະສຳລັບການປ່ຽນວິທີການເຮັດວຽກ',
 'settings_enableCalendar' => 'ເປີດໄຊ້ງານປະຕິທິນ',
 'settings_enableCalendar_desc' => 'ເປີດ / ປິດ ປະຕິທິນ',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => 'ເປີດໄຊ້ຄິບບອດ',
 'settings_enableClipboard_desc' => 'ເປີດ/ ປິດການໄຊ້ຄິບບອສໃນໜ້າຕ່າງ ວິວໂຟລເດີ',
 'settings_enableConverting' => 'ເປີດໄຊ້ງານການແປງ',
@@ -1672,6 +1678,7 @@ URL: [url]',
 'splash_add_to_transmittal' => 'ເພີ່ມການສົ່ງຜ່ານ',
 'splash_add_transmittal' => 'ເພີ່ມການສົ່ງຜ່ານ',
 'splash_add_user' => 'ເພີ່ມຜູ້ໄຊ້ໄຫມ່ແລ້ວ',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => 'ລ້າງແຄຣແລ້ວ',
 'splash_cleared_clipboard' => 'ລ້າງຄິບບອດແລ້ວ',
 'splash_delete_access' => '',
diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc
index 9a8bf68ac..00df1287b 100644
--- a/languages/nb_NO/lang.inc
+++ b/languages/nb_NO/lang.inc
@@ -222,6 +222,8 @@ URL: [url]',
 'calendar' => 'Kalender',
 'calendar_week' => 'Kalenderuke',
 'cancel' => 'Avbryt',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Kan ikke endre et foreldet eller avvist dokument',
 'cannot_change_final_states' => 'Advarsel: Du kan ikke endre status for dokument som er avvist, utløpt eller i påvente av gjennomgang eller godkjenning',
 'cannot_delete_user' => 'Kan ikke slette bruker',
@@ -401,7 +403,8 @@ Bruker: [username]',
 'document_duplicate_name' => 'Dupliser dokumentnavn',
 'document_has_no_workflow' => 'Dokumentet har ingen arbeidsflyt',
 'document_infos' => 'Dokumentinformation',
-'document_is_checked_out' => 'Dokumentet er allerede utsjekket. Hvis du laster opp en ny version kan den utsjekkede versionen ikke sjekkes inn igen.',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => 'Dokumentet er allerede utsjekket. Hvis du laster opp en ny version kan den utsjekkede versionen ikke sjekkes inn igen.',
 'document_is_not_locked' => 'Dette dokumentet er ikke låst',
 'document_link_by' => 'Koblet av',
 'document_link_public' => 'Offentlig',
@@ -939,6 +942,7 @@ URL: [url]',
 'october' => 'Oktober',
 'old' => 'Gammel',
 'only_jpg_user_images' => 'Bare .jpg-bilder kan brukes som bruker-bilder',
+'operation_disallowed' => '',
 'order_by_sequence_off' => 'Sortering etter sekvens er slått av i innstillingene. Hvis du vil at denne parameteren skal ha effekt, må du slå den på igjen.',
 'original_filename' => 'Orginalt filnavn',
 'overall_indexing_progress' => 'Samlet fremgang for indeksering',
@@ -1369,6 +1373,8 @@ Bruker: [username]
 'settings_enableAdminRevApp_desc' => 'Aktiver dette hvis du vil at administratorer skal være oppført som korrekturlesere / godkjennere og for arbeidsflytoverganger.',
 'settings_enableCalendar' => 'Aktiver kalender',
 'settings_enableCalendar_desc' => 'Aktiver/deaktiver kalender',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => 'Aktiver utklippstavle',
 'settings_enableClipboard_desc' => 'Aktiver/deaktiver utklippstavlen på \'Vis mappe\' siden',
 'settings_enableConverting' => 'Aktiver konvertering',
@@ -1685,6 +1691,7 @@ Bruker: [username]
 'splash_add_to_transmittal' => 'Legg til overføring',
 'splash_add_transmittal' => 'Lagt til overføring',
 'splash_add_user' => 'Ny bruker lagt til',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => 'Cache ble slettet',
 'splash_cleared_clipboard' => 'Utklippstavlen ryddet',
 'splash_delete_access' => 'Adgangs retten er slettet',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 3464efecb..fe08544a9 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (780), gijsbertush (651), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (781), gijsbertush (651), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 '2_factor_auth' => '2-factor-authenticatie',
@@ -215,6 +215,8 @@ URL: [url]',
 'calendar' => 'Kalender',
 'calendar_week' => 'Weekkalender',
 'cancel' => 'Annuleren',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Kan document niet aanpassen in deze status',
 'cannot_change_final_states' => 'Waarschuwing: U kunt de Status [afgewezen], [vervallen], [in afwachting van] (nog) niet wijzigen.',
 'cannot_delete_user' => 'Kan gebruiker niet verwijderen',
@@ -320,7 +322,7 @@ URL: [url]',
 'daily' => 'Dagelijks',
 'databasesearch' => 'Zoek in Database',
 'database_schema_version' => '',
-'data_loading' => '',
+'data_loading' => 'Even geduld tot de data geladen is',
 'date' => 'Datum',
 'days' => 'Dagen',
 'debug' => 'debug',
@@ -387,7 +389,8 @@ Gebruiker: [username]',
 'document_duplicate_name' => 'Dupliceer documentnaam',
 'document_has_no_workflow' => 'Document bevat geen workflow',
 'document_infos' => 'Document Informatie',
-'document_is_checked_out' => 'Document is uitgecheckt.',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => 'Document is uitgecheckt.',
 'document_is_not_locked' => 'Dit document is niet geblokkeerd',
 'document_link_by' => 'Gekoppeld met',
 'document_link_public' => 'Publiek',
@@ -912,6 +915,7 @@ URL: [url]',
 'october' => 'oktober',
 'old' => 'Oude',
 'only_jpg_user_images' => 'U mag alleen .jpg afbeeldingen gebruiken als gebruikersafbeeldingen.',
+'operation_disallowed' => '',
 'order_by_sequence_off' => 'Volgorde uit',
 'original_filename' => 'Originele bestandsnaam',
 'overall_indexing_progress' => 'Indexerings voortgang totaal',
@@ -1353,6 +1357,8 @@ Name: [username]
 'settings_enableAdminRevApp_desc' => 'Uitvinken om beheerder niet te tonen als controleerder/beoordeler',
 'settings_enableCalendar' => 'Agenda inschakelen',
 'settings_enableCalendar_desc' => 'Inschakelen/uitschakelen agenda',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => 'Activeer klembord',
 'settings_enableClipboard_desc' => 'Activeer/ blokkeer het klembord',
 'settings_enableConverting' => 'Documenten converteren',
@@ -1669,6 +1675,7 @@ Name: [username]
 'splash_add_to_transmittal' => 'Toevoegen aan verzending',
 'splash_add_transmittal' => 'Verzending toegevoegd',
 'splash_add_user' => 'Nieuwe gebruiker toegevoegd',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => 'Cache leeggemaakt',
 'splash_cleared_clipboard' => 'Klembord leeg gemaakt',
 'splash_delete_access' => '',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index bdefae0d1..b6659034c 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -210,6 +210,8 @@ URL: [url]',
 'calendar' => 'Kalendarz',
 'calendar_week' => 'Kalendarz tygodniowy',
 'cancel' => 'Anuluj',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Nie można modyfikować zdezaktualizowanego lub odrzuconego dokumentu',
 'cannot_change_final_states' => 'Ostrzeżenie: Nie można zmienić statusu dla dokumentu odrzuconego, wygasłego, lub w trakcie recenzowania albo zatwierdzania.',
 'cannot_delete_user' => 'Nie można usunąć użytkownika',
@@ -382,7 +384,8 @@ Użytkownik: [username]',
 'document_duplicate_name' => 'Zduplikowana nazwa dokumentu',
 'document_has_no_workflow' => 'Dokument nie ma przypisanego procesu',
 'document_infos' => 'Informacje o dokumencie',
-'document_is_checked_out' => 'Ten dokument jest pobierany',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => 'Ten dokument jest pobierany',
 'document_is_not_locked' => 'Ten dokument nie jest zablokowany',
 'document_link_by' => 'Dowiązane przez',
 'document_link_public' => 'Publiczny',
@@ -908,6 +911,7 @@ URL: [url]',
 'october' => 'Październik',
 'old' => 'Stary',
 'only_jpg_user_images' => 'Wyłącznie pliki typu .jpg mogą być użyte jako obrazy użytkowników',
+'operation_disallowed' => '',
 'order_by_sequence_off' => 'Porządkowanie według sekwencji jest wyłączone w ustawieniach. Jeśli chcesz, aby ten parametr zadziałał, musisz go ponownie włączyć.',
 'original_filename' => 'Oryginalna nazwa pliku',
 'overall_indexing_progress' => 'Całkowity postęp indeksowania',
@@ -1299,6 +1303,8 @@ Name: [username]
 'settings_enableAdminRevApp_desc' => 'Odznacz aby usunąć Administratora z listy zatwierdzających/recenzentów',
 'settings_enableCalendar' => 'Włącz kalendarz',
 'settings_enableCalendar_desc' => 'Włącz/Wyłącz kalendarz',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => 'Włącz schowek',
 'settings_enableClipboard_desc' => 'Włącz/wyłącz schowek',
 'settings_enableConverting' => 'Włącz konwertowanie',
@@ -1615,6 +1621,7 @@ Name: [username]
 'splash_add_to_transmittal' => 'Dodaj do przekazu',
 'splash_add_transmittal' => 'Dodano przekaz',
 'splash_add_user' => 'Dodano nowego użytkownika',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => 'Pamięć podręczna wyczyszczona',
 'splash_cleared_clipboard' => 'Wyczyszczono schowek',
 'splash_delete_access' => 'Prawo dostępu zostało usunięte',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index adecb0592..7725ace29 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -222,6 +222,8 @@ URL: [url]',
 'calendar' => 'Calendário',
 'calendar_week' => 'Calendário semanal',
 'cancel' => 'Cancelar',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Não é possível atribuir novos revisores a um documento que não está pendente de revisão ou aprovação pendente.',
 'cannot_change_final_states' => 'Aviso: Você não pode alterar o estado do documento rejeitado, expirado ou com revisão ou aprovação.',
 'cannot_delete_user' => 'Não é possível excluir usuário',
@@ -401,7 +403,8 @@ Usuário: [username]',
 'document_duplicate_name' => 'Duplicar nome do documento',
 'document_has_no_workflow' => 'Documento não tem fluxo de trabalho',
 'document_infos' => 'Informações',
-'document_is_checked_out' => 'O documento está atualmente com estado de retirado. Se você fizer o envio de uma nova versão, a versão retirada não poderá mais ser registrada.',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => 'O documento está atualmente com estado de retirado. Se você fizer o envio de uma nova versão, a versão retirada não poderá mais ser registrada.',
 'document_is_not_locked' => 'Este documento não está travado',
 'document_link_by' => 'Ligado por',
 'document_link_public' => 'Público',
@@ -938,6 +941,7 @@ URL: [url]',
 'october' => 'Outubro',
 'old' => 'Antigo',
 'only_jpg_user_images' => 'Somente imagens jpg podem ser utilizadas como avatar',
+'operation_disallowed' => '',
 'order_by_sequence_off' => 'O pedido por sequência é desativado nas configurações. Se você quiser que este parâmetro tenha efeito, você terá que ativá-lo novamente.',
 'original_filename' => 'Arquivo original',
 'overall_indexing_progress' => 'Progresso geral da indexação',
@@ -1375,6 +1379,8 @@ Nome: [username]
 'settings_enableAdminRevApp_desc' => 'Ative esta opção se quiser que os administradores sejam listados como revisores/aprovadores e para transições de fluxo de trabalho.',
 'settings_enableCalendar' => 'Habilitar Calendário',
 'settings_enableCalendar_desc' => 'Habilitar/Desabilitar calendário',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => 'Habilitar Área de Transferência',
 'settings_enableClipboard_desc' => 'Habilitar/Desabilitar a área de transferência',
 'settings_enableConverting' => 'Ativar conversão',
@@ -1691,6 +1697,7 @@ Nome: [username]
 'splash_add_to_transmittal' => 'Adicionar à transmissão',
 'splash_add_transmittal' => 'Transmissão adicionada',
 'splash_add_user' => 'Novo usuário adicionado',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => 'Cache limpo',
 'splash_cleared_clipboard' => 'Área de transferência limpa',
 'splash_delete_access' => 'Direito de acesso removido',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 36f1f8af3..72933b3e4 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -222,6 +222,8 @@ URL: [url]',
 'calendar' => 'Calendar',
 'calendar_week' => 'Săptămână calendar',
 'cancel' => 'Anulare',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Nu se poate modifica un document învechit(absolete) sau respins(rejected)',
 'cannot_change_final_states' => 'Atenție: Nu puteți modifica status-ul unui document respins, expirat sau in așteptarea revizuirii/aprobarii',
 'cannot_delete_user' => 'Nu se poate șterge utilizatorul',
@@ -394,7 +396,8 @@ Utilizator: [username]',
 'document_duplicate_name' => 'Nume document duplicat',
 'document_has_no_workflow' => 'Documentul nu are workflow',
 'document_infos' => 'Informații document',
-'document_is_checked_out' => 'Documentul este in prezent verificat. Daca incarcati o noua versiune, versiunea verificata nu mai poate fi verificata din nou.',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => 'Documentul este in prezent verificat. Daca incarcati o noua versiune, versiunea verificata nu mai poate fi verificata din nou.',
 'document_is_not_locked' => 'Acest document nu este blocat',
 'document_link_by' => 'Corelat cu (Linked by)',
 'document_link_public' => 'Public',
@@ -920,6 +923,7 @@ URL: [url]',
 'october' => 'Octombrie',
 'old' => 'Vechi',
 'only_jpg_user_images' => 'Doar imagini .jpg pot fi utilizate ca imagine-utilizator',
+'operation_disallowed' => '',
 'order_by_sequence_off' => 'Ordonarea dupa secventa este dezactivata in setari. Daca doriti acest parametru sa aiba efect, va trebui sa-l reactivati.',
 'original_filename' => 'Nume de fișier original',
 'overall_indexing_progress' => 'Progres indexare total',
@@ -1337,6 +1341,8 @@ URL: [url]',
 'settings_enableAdminRevApp_desc' => 'Activați această opțiune dacă doriți ca administratorii să fie listati ca revizuitori/aprobatori sau in tranzițiile workflow-ului.',
 'settings_enableCalendar' => 'Activare Calendar',
 'settings_enableCalendar_desc' => 'Activare/dezactivare calendar',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => 'Activare Clipboard',
 'settings_enableClipboard_desc' => 'Activare/dezactivare clipboard în pagina \'Vizualizare Folder\'',
 'settings_enableConverting' => 'Activare Conversie',
@@ -1653,6 +1659,7 @@ URL: [url]',
 'splash_add_to_transmittal' => '',
 'splash_add_transmittal' => '',
 'splash_add_user' => 'Utilizator nou adăugat',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => '',
 'splash_cleared_clipboard' => 'Clipboard golit',
 'splash_delete_access' => '',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 4d710bbf2..509a18fbd 100644
--- 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 (1697)
+//    Translators: Admin (1703)
 
 $text = array(
 '2_factor_auth' => 'Двухфакторная аутентификация',
@@ -222,6 +222,8 @@ URL: [url]',
 'calendar' => 'Календарь',
 'calendar_week' => 'Неделя',
 'cancel' => 'Отмена',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Невозможно изменить устаревший или отклонённый документ',
 'cannot_change_final_states' => 'Нельзя изменять статус отклонённого, устаревшего или ожидающего рецензии или утверждения',
 'cannot_delete_user' => 'Невозможно удалить пользователя',
@@ -327,7 +329,7 @@ URL: [url]',
 'daily' => 'Ежедневно',
 'databasesearch' => 'Поиск по БД',
 'database_schema_version' => '',
-'data_loading' => '',
+'data_loading' => 'Пожалуйста подождите, данные загружаются...',
 'date' => 'Дата',
 'days' => 'дни',
 'debug' => 'Отладка',
@@ -394,7 +396,8 @@ URL: [url]',
 'document_duplicate_name' => 'Одноимённый документ уже существует.',
 'document_has_no_workflow' => 'Для документа не назначен процесс',
 'document_infos' => 'Информация о документе',
-'document_is_checked_out' => 'Документ в настоящее время проверяется. Если вы загрузить новую версию, то проверяемая версия не может быть возвращена обратно.',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => 'Документ в настоящее время проверяется. Если вы загрузить новую версию, то проверяемая версия не может быть возвращена обратно.',
 'document_is_not_locked' => 'Документ не заблокирован',
 'document_link_by' => 'Связан',
 'document_link_public' => 'Публичный',
@@ -540,16 +543,16 @@ URL: [url]',
 'expired_documents' => '',
 'expires' => 'Срок действия',
 'expire_by_date' => 'дата',
-'expire_in_1d' => '',
-'expire_in_1h' => '',
+'expire_in_1d' => 'Истекает в течении 1 дня',
+'expire_in_1h' => 'Истекает через час',
 'expire_in_1m' => '1 месяц',
 'expire_in_1w' => '1 неделя',
 'expire_in_1y' => '1 год',
-'expire_in_2h' => '',
+'expire_in_2h' => 'Истекает через два часа',
 'expire_in_2y' => '2 года',
 'expire_in_3y' => '',
-'expire_today' => '',
-'expire_tomorrow' => '',
+'expire_today' => 'Истекает сегодня',
+'expire_tomorrow' => 'Истекает завтра',
 'expiry_changed_email' => 'Срок действия изменен',
 'expiry_changed_email_body' => 'Срок действия изменен
 Документ: [name]
@@ -919,6 +922,7 @@ URL: [url]',
 'october' => 'Октябрь',
 'old' => 'Старый',
 'only_jpg_user_images' => 'Разрешены только .jpg-изображения',
+'operation_disallowed' => '',
 'order_by_sequence_off' => 'Сортировка последовательности выключена в настройках. Если вы хотите применить этот эффект, вам необходимо его включить',
 'original_filename' => 'Исходное имя файла',
 'overall_indexing_progress' => 'Общий прогресс индексации',
@@ -1344,6 +1348,8 @@ URL: [url]',
 'settings_enableAdminRevApp_desc' => 'Если отключено, администратор не отображается в списке рецензирующих и утверждающих.',
 'settings_enableCalendar' => 'Включить календарь',
 'settings_enableCalendar_desc' => 'Включить/отключить календарь.',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => 'Включить буфер обмена',
 'settings_enableClipboard_desc' => 'Включить/отключить буфер обмена.',
 'settings_enableConverting' => 'Включить преобразование',
@@ -1660,6 +1666,7 @@ URL: [url]',
 'splash_add_to_transmittal' => '',
 'splash_add_transmittal' => '',
 'splash_add_user' => 'Добавлен новый пользователь',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => '',
 'splash_cleared_clipboard' => 'Буфер обмена очищен',
 'splash_delete_access' => '',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 6b339e3ab..e38dc6a35 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -222,6 +222,8 @@ URL: [url]',
 'calendar' => 'Kalendár',
 'calendar_week' => 'Kalendárny týždeň',
 'cancel' => 'Zrušiť',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Cannot modify an obsolete or rejected document',
 'cannot_change_final_states' => 'Warning: You cannot alter status for document rejected, expired or with pending review or approval',
 'cannot_delete_user' => 'Nie je možné odstrániť používateľa',
@@ -401,7 +403,8 @@ Používateľ: [username]',
 'document_duplicate_name' => 'Duplicitný názov dokumentu',
 'document_has_no_workflow' => 'Dokument nemá pracovný postup',
 'document_infos' => 'Informácie o dokumente',
-'document_is_checked_out' => 'Document is currently checked out. If you upload a new version, then the checked out version cannot be checked back in anymore.',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => 'Document is currently checked out. If you upload a new version, then the checked out version cannot be checked back in anymore.',
 'document_is_not_locked' => 'Tento dokument nie je zamknutý',
 'document_link_by' => 'Odkazuje sem',
 'document_link_public' => 'Verejný',
@@ -939,6 +942,7 @@ URL: [url]',
 'october' => 'Október',
 'old' => 'Staré',
 'only_jpg_user_images' => 'Ako obrázky používateľov je možné použiť iba obrázky .jpg',
+'operation_disallowed' => '',
 'order_by_sequence_off' => 'Ordering by sequence is turned off in the settings. If you want this parameter to have effect, you will have to turn it back on.',
 'original_filename' => 'Pôvodný názov súboru',
 'overall_indexing_progress' => 'Celkový priebeh indexovania',
@@ -1377,6 +1381,8 @@ Meno: [username]
 'settings_enableAdminRevApp_desc' => 'Enable this if you want administrators to be listed as reviewers/approvers and for workflow transitions.',
 'settings_enableCalendar' => 'Zapnúť kalendár',
 'settings_enableCalendar_desc' => 'Zapnúť/vypnúť kalendár',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => 'Aktivovať schránky',
 'settings_enableClipboard_desc' => 'Enable/disable the clipboard on the \'View Folder\' page',
 'settings_enableConverting' => 'Povoliť konverziu',
@@ -1693,6 +1699,7 @@ Meno: [username]
 'splash_add_to_transmittal' => 'Add to transmittal',
 'splash_add_transmittal' => 'Added transmittal',
 'splash_add_user' => 'Pridaný nový používateľ',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => 'Vymazanie vyrovnávacej pamäte',
 'splash_cleared_clipboard' => 'Schránka bola vymazaná',
 'splash_delete_access' => 'Access right deleted',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index e873a1957..9ffb5987e 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1165), MagnusI (649), tmichelfelder (106)
+//    Translators: Admin (1166), MagnusI (649), tmichelfelder (106)
 
 $text = array(
 '2_factor_auth' => '2-faktors autentisering',
@@ -223,6 +223,8 @@ URL: [url]',
 'calendar' => 'Kalender',
 'calendar_week' => 'Kalendervecka',
 'cancel' => 'Avbryt',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Kan inte ändra ett dokument som har gått ut eller avvisats.',
 'cannot_change_final_states' => 'OBS: Du kan inte ändra status för ett dokument som har avvisats, gått ut eller som väntar på att bli godkänt.',
 'cannot_delete_user' => 'Du kan inte ta bort användaren.',
@@ -328,7 +330,7 @@ URL: [url]',
 'daily' => 'Dagligen',
 'databasesearch' => 'Sök databas',
 'database_schema_version' => '',
-'data_loading' => '',
+'data_loading' => 'Vänta tills data har laddats ...',
 'date' => 'Datum',
 'days' => 'dagar',
 'debug' => 'Felsökning',
@@ -395,7 +397,8 @@ Användare: [username]',
 'document_duplicate_name' => 'Dubblett av dokumentnamn',
 'document_has_no_workflow' => 'Dokumentet saknar arbetsflöde',
 'document_infos' => 'Dokumentinformation',
-'document_is_checked_out' => 'Dokumentet är redan utcheckat. Om du laddar upp en ny version kan den utcheckade versionen inte checkas in igen.',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => 'Dokumentet är redan utcheckat. Om du laddar upp en ny version kan den utcheckade versionen inte checkas in igen.',
 'document_is_not_locked' => 'Detta dokument är inte låst',
 'document_link_by' => 'Länkat av',
 'document_link_public' => 'Offentlig länk',
@@ -926,6 +929,7 @@ URL: [url]',
 'october' => 'Oktober',
 'old' => 'gammalt',
 'only_jpg_user_images' => 'Bara .jpg-bilder kan användas som användarbild',
+'operation_disallowed' => '',
 'order_by_sequence_off' => 'Sortering efter sekvens är inaktiverat i inställningarna.',
 'original_filename' => 'Ursprungligt filnamn',
 'overall_indexing_progress' => 'Total indexeringsprocess',
@@ -1350,6 +1354,8 @@ Kommentar: [comment]',
 'settings_enableAdminRevApp_desc' => 'Ta bort utval, så att administratören inte kan väljas som person som kan granska/godkänna',
 'settings_enableCalendar' => 'Aktivera kalendern',
 'settings_enableCalendar_desc' => 'Aktivera/Inaktivera kalendar',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => 'Aktivera urklipp',
 'settings_enableClipboard_desc' => 'Aktivera/Inaktivera urklipp funktionen.',
 'settings_enableConverting' => 'Aktivera filkonvertering',
@@ -1666,6 +1672,7 @@ Kommentar: [comment]',
 'splash_add_to_transmittal' => 'Lägg till meddelande',
 'splash_add_transmittal' => 'Meddelande tillagt',
 'splash_add_user' => 'Ny användare tillagd',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => 'Cachen är rensad',
 'splash_cleared_clipboard' => 'Urklipp rensat',
 'splash_delete_access' => '',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index f41a8528e..2e3425a7c 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1111), aydin (83)
+//    Translators: Admin (1114), aydin (83)
 
 $text = array(
 '2_factor_auth' => 'İki faktörlü yetkilendirme',
@@ -216,6 +216,8 @@ URL: [url]',
 'calendar' => 'Takvim',
 'calendar_week' => 'Takvim haftası',
 'cancel' => 'İptal',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Geçersiz veya reddedilmiş doküman değiştirilemez.',
 'cannot_change_final_states' => 'Dikkat: Reddedilen, süresi dolan, kontrol veya onay bekleyen dokümanın durumununu değiştiremezsiniz.',
 'cannot_delete_user' => 'Kullanıcı silinemez',
@@ -321,7 +323,7 @@ URL: [url]',
 'daily' => 'Günlük',
 'databasesearch' => 'Veritabanı arama',
 'database_schema_version' => '',
-'data_loading' => '',
+'data_loading' => 'Lütfen veriler yüklenene kadar bekleyin…',
 'date' => 'Tarih',
 'days' => 'gün',
 'debug' => '',
@@ -388,7 +390,8 @@ Kullanıcı: [username]',
 'document_duplicate_name' => 'Mükerrer doküman ismi',
 'document_has_no_workflow' => 'Dokümanın iş akışı yok',
 'document_infos' => 'Doküman Bilgisi',
-'document_is_checked_out' => '',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => '',
 'document_is_not_locked' => 'Bu doküman kilitli değil',
 'document_link_by' => 'Link veren',
 'document_link_public' => 'Genel',
@@ -914,6 +917,7 @@ URL: [url]',
 'october' => 'Ekim',
 'old' => 'Eski',
 'only_jpg_user_images' => 'Kullanıcı resmi olarak sadece .jpg uzantı resimler kullanılabilir',
+'operation_disallowed' => '',
 'order_by_sequence_off' => '',
 'original_filename' => 'Orijinal dosya adı',
 'overall_indexing_progress' => '',
@@ -1180,7 +1184,7 @@ URL: [url]',
 'search_time' => 'Arama süresi: [time] sn.',
 'seconds' => 'saniye',
 'seeddms_info' => '',
-'seeddms_version' => '',
+'seeddms_version' => 'SeedDMS Sürümü',
 'selection' => 'Seçim',
 'select_attrdefgrp_show' => '',
 'select_attribute_value' => '',
@@ -1316,6 +1320,8 @@ URL: [url]',
 'settings_enableAdminRevApp_desc' => 'Yöneticilerin kontrol/onay listesine eklenmesi ve iş akış süreçlerini yapabilmeleri için bu ayarı etkinleştirin.',
 'settings_enableCalendar' => 'Takvimi Etkinleştir',
 'settings_enableCalendar_desc' => 'Takvimi etkinleştir/devre dışı bırak',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => 'Panoyu Etkinleştir',
 'settings_enableClipboard_desc' => '\'Klasör Görüntüle\' sayfasında panoyu etkinleştir/devredışı bırak',
 'settings_enableConverting' => 'Dönüştürmeyi etkinleştir',
@@ -1632,6 +1638,7 @@ URL: [url]',
 'splash_add_to_transmittal' => '',
 'splash_add_transmittal' => '',
 'splash_add_user' => 'Yeni kullanıcı eklendi',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => '',
 'splash_cleared_clipboard' => 'Pano temizlendi',
 'splash_delete_access' => '',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index f4b8adba1..332a8933d 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1339)
+//    Translators: Admin (1340)
 
 $text = array(
 '2_factor_auth' => '',
@@ -222,6 +222,8 @@ URL: [url]',
 'calendar' => 'Календар',
 'calendar_week' => 'Тиждень',
 'cancel' => 'Відміна',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Неможливо змінити застарілий чи відхилений документ',
 'cannot_change_final_states' => 'Не можна змінювати статус відхиленого, застарілого документа або документа, що очікує на рецензію чи затвердження',
 'cannot_delete_user' => 'Неможливо видалити користувача',
@@ -394,7 +396,8 @@ URL: [url]',
 'document_duplicate_name' => 'Документ з такою назвою вже існує',
 'document_has_no_workflow' => 'Документові не призначено процес',
 'document_infos' => 'Інформація про документ',
-'document_is_checked_out' => 'Документ на опрацюванні',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => 'Документ на опрацюванні',
 'document_is_not_locked' => 'Документ не заблокований',
 'document_link_by' => 'Пов\'язаний',
 'document_link_public' => 'Публічний',
@@ -822,7 +825,7 @@ URL: [url]',
 'my_documents' => 'Мої документи',
 'my_transmittals' => 'Мої перенесення',
 'name' => 'Назва',
-'nb_NO' => '',
+'nb_NO' => 'Норвезька (букмол)',
 'needs_correction' => '',
 'needs_workflow_action' => 'Цей документ потребує вашої уваги. Див. вкладку «Процес».',
 'network_drive' => '',
@@ -919,6 +922,7 @@ URL: [url]',
 'october' => 'Жовтень',
 'old' => 'Старий',
 'only_jpg_user_images' => 'Дозволені лише .jpg-зображення',
+'operation_disallowed' => '',
 'order_by_sequence_off' => 'Можливість ручного сортування відключена в налаштуваннях. Якщо ви хочете використовувати цю функцію, ви повинні знову її включити.',
 'original_filename' => 'Початкова назва файлу',
 'overall_indexing_progress' => 'Загальне просування індексації"',
@@ -1337,6 +1341,8 @@ URL: [url]',
 'settings_enableAdminRevApp_desc' => 'Якщо відключено, адміністратор не відображається у списку рецензентів і затверджувачів.',
 'settings_enableCalendar' => 'Увімкнути календар',
 'settings_enableCalendar_desc' => 'Увімкнути/вимкнути календар.',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => 'Увімкнути буфер обміну',
 'settings_enableClipboard_desc' => 'Увімкнути/вимкнути буфер обміну.',
 'settings_enableConverting' => 'Увімкнути перетворення',
@@ -1653,6 +1659,7 @@ URL: [url]',
 'splash_add_to_transmittal' => '',
 'splash_add_transmittal' => '',
 'splash_add_user' => 'Додано нового користувача',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => '',
 'splash_cleared_clipboard' => 'Буфер обміну очищено',
 'splash_delete_access' => '',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index a2da52d22..d1f6f9b26 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -214,6 +214,8 @@ URL: [url]',
 'calendar' => '日历',
 'calendar_week' => '周历',
 'cancel' => '取消',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => '不能修改文档的最终状态',
 'cannot_change_final_states' => '警告:您不能更改文档的拒绝、过期、待校对、或是待审核等状态',
 'cannot_delete_user' => '不能删除用户',
@@ -388,7 +390,8 @@ URL: [url]',
 'document_duplicate_name' => '文档名称重复',
 'document_has_no_workflow' => '文档未配置工作流',
 'document_infos' => '文档信息',
-'document_is_checked_out' => '文档已签出。如上传了新版本，则已签出的版本则不能再被签回。',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => '文档已签出。如上传了新版本，则已签出的版本则不能再被签回。',
 'document_is_not_locked' => '该文档没有被锁定',
 'document_link_by' => '链接',
 'document_link_public' => '公开',
@@ -910,6 +913,7 @@ URL: [url]',
 'october' => '十 月',
 'old' => 'Old',
 'only_jpg_user_images' => '只用jpg格式的图片才可以作为用户身份图片',
+'operation_disallowed' => '',
 'order_by_sequence_off' => '按顺序排序功能设置已关闭。 如果你需要此参数设定有效，请在设置中打开它。',
 'original_filename' => '原始文件名',
 'overall_indexing_progress' => '所有索引进程',
@@ -1312,6 +1316,8 @@ URL: [url]',
 'settings_enableAdminRevApp_desc' => '',
 'settings_enableCalendar' => '开启日历',
 'settings_enableCalendar_desc' => '启用/禁用日历模块',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => '允许剪切板',
 'settings_enableClipboard_desc' => '在【查看文件夹】页，启用/禁用粘贴板',
 'settings_enableConverting' => '打开转换',
@@ -1628,6 +1634,7 @@ URL: [url]',
 'splash_add_to_transmittal' => '',
 'splash_add_transmittal' => '',
 'splash_add_user' => '用户已添加',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => 'Cache 缓存已清理',
 'splash_cleared_clipboard' => '剪贴板已清空',
 'splash_delete_access' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index a45ff9011..01fae5c39 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -222,6 +222,8 @@ URL: [url]',
 'calendar' => '日曆',
 'calendar_week' => '日曆週',
 'cancel' => '取消',
+'cancel_checkout' => '',
+'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => '不能修改文件的最終狀態',
 'cannot_change_final_states' => '警告:您不能更改文件的拒絕、過期、待校對、或是待審核等狀態',
 'cannot_delete_user' => '不能刪除使用者',
@@ -401,7 +403,8 @@ URL: [url]',
 'document_duplicate_name' => '文件名稱重複',
 'document_has_no_workflow' => '文件沒有工作流程',
 'document_infos' => '文件資訊',
-'document_is_checked_out' => '當前已簽出文檔。如果您上傳新版本，那麼簽出的版本將無法再簽回。',
+'document_is_checked_out_remove' => '',
+'document_is_checked_out_update' => '當前已簽出文檔。如果您上傳新版本，那麼簽出的版本將無法再簽回。',
 'document_is_not_locked' => '該文件沒有被鎖定',
 'document_link_by' => '連結',
 'document_link_public' => '公開',
@@ -939,6 +942,7 @@ URL: [url]',
 'october' => '十 月',
 'old' => 'Old',
 'only_jpg_user_images' => '只用jpg格式的圖片才可以作為使用者身份圖片',
+'operation_disallowed' => '',
 'order_by_sequence_off' => '在設置中關閉了按順序排序。如果希望此參數生效，則必須重新打開它。',
 'original_filename' => '原始檔名',
 'overall_indexing_progress' => '整體索引編制進度',
@@ -1375,6 +1379,8 @@ URL: [url]',
 'settings_enableAdminRevApp_desc' => '如果希望管理員被列為審閱者/批准者並進行工作流轉換，請啟用此選項。',
 'settings_enableCalendar' => '啟動月曆',
 'settings_enableCalendar_desc' => '啟用/禁用日曆',
+'settings_enableCancelCheckout' => '',
+'settings_enableCancelCheckout_desc' => '',
 'settings_enableClipboard' => '啟動剪貼簿',
 'settings_enableClipboard_desc' => '在“查看文件夾”頁面上啟用/禁用剪貼簿',
 'settings_enableConverting' => '啟動轉換',
@@ -1691,6 +1697,7 @@ URL: [url]',
 'splash_add_to_transmittal' => '新增到傳送',
 'splash_add_transmittal' => '加入傳送',
 'splash_add_user' => '新增新的使用者',
+'splash_cancel_checkout' => '',
 'splash_cleared_cache' => '快取清除',
 'splash_cleared_clipboard' => '剪貼簿已清除',
 'splash_delete_access' => '訪問權限已刪除',

From ab7de0d0d011ff2fc0137ffea79d5335d1b1ca16 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 27 Nov 2020 09:24:25 +0100
Subject: [PATCH 252/312] undo a replacement of 'icon' by 'fa fa'

---
 styles/bootstrap/application.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 5a1e60d72..56caad400 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -12,8 +12,8 @@ chzn_template_func =  function (state) {
 	if($(state.element).data('warning'))
 		warning = $(state.element).data('warning')+''; /* make sure it is a string */
 	var html = '<span>';
-	if($(state.element).data('fa fa-before'))
-		html += '<i class="fa fa-'+$(state.element).data('fa fa-before')+'"></i> ';
+	if($(state.element).data('icon-before'))
+		html += '<i class="fa fa-'+$(state.element).data('icon-before')+'"></i> ';
 	html += state.text.replace(/</g, '&lt;')+'';
 	if(subtitle)
 		html += '<br /><i>'+subtitle.replace(/</g, '&lt;')+'</i>';

From 5c9ddac11d2279f5088b81e7fc2d910666fb4add Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 30 Nov 2020 15:40:33 +0100
Subject: [PATCH 253/312] pass params to $dms->search() by array

---
 restapi/index.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index 10feb57ed..74e5f637b 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -1492,8 +1492,18 @@ class RestapiController { /* {{{ */
         if(!isset($params['searchin']) || !$searchin = explode(",",$params['searchin']))
             $searchin = array();
         if(!isset($params['objects']) || !$objects = $params['objects'])
-            $objects = 0x3;
-        $resArr = $dms->search($querystr, $limit, $offset, 'AND', $searchin, null, null, array(), array(), array(), array(), array(), array(), array(), $objects);
+					$objects = 0x3;
+				$sparams = array(
+					'query'=>$querystr,
+					'limit'=>$limit,
+					'offset'=>$offset,
+					'logicalmode'=>'AND',
+					'searchin'=>$searchin,
+					'mode'=>$objects,
+//					'creationstartdate'=>array('hour'=>1, 'minute'=>0, 'second'=>0, 'year'=>date('Y')-1, 'month'=>date('m'), 'day'=>date('d')),
+				);
+        $resArr = $dms->search($sparams);
+//        $resArr = $dms->search($querystr, $limit, $offset, 'AND', $searchin, null, null, array(), array('hour'=>1, 'minute'=>0, 'second'=>0, 'year'=>date('Y')-1, 'month'=>date('m'), 'day'=>date('d')), array(), array(), array(), array(), array(), $objects);
         if($resArr === false) {
             return $response->withJson(array(), 200);
         }

From d64af2b3b1e1f085213e1912bf4f4f7e6d75e0aa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 30 Nov 2020 15:41:33 +0100
Subject: [PATCH 254/312] add new methode typeahead() which is to replace the
 restapi method

---
 views/bootstrap/class.Search.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 2d8bdf61f..787c6d3d5 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -65,6 +65,26 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 		$this->printClickFolderJs();
 	} /* }}} */
 
+	function typeahead() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$query = $this->params['query'];
+		$entries = $this->params['searchhits'];
+		$recs = array();
+		if($entries) {
+			foreach ($entries as $entry) {
+				if($entry->isType('document')) {
+					$recs[] = 'D'.$entry->getName();
+				} elseif($entry->isType('folder')) {
+					$recs[] = 'F'.$entry->getName();
+				}
+			}
+		}
+		array_unshift($recs, ' '.$query);
+		header('Content-Type: application/json');
+		echo json_encode($recs);
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];

From 1e55c2af5057069ea6485b5926ee2def4433e8db Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 30 Nov 2020 15:42:07 +0100
Subject: [PATCH 255/312] prepare to use new method
 SeedDMS_Bootstrap_Search::typeahead()

---
 styles/bootstrap/application.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 56caad400..1e8b7ae84 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -100,7 +100,13 @@ $(document).ready( function() {
 	$("#searchfield").typeahead({ /* {{{ */
 		minLength: 3,
 		source: function(query, process) {
+			var d = new Date();
+			var pastYear = d.getFullYear() - 1;
+			d.setFullYear(pastYear);
+			console.log(d.toISOString().split('T')[0]);
+
 			$.get('../restapi/index.php/search', { query: query, limit: 8, mode: 'typeahead' }, function(data) {
+//			$.get('../out/out.Search.php', { query: query, limit: 8, creationdate: 1, createstart: d.toISOString().split('T')[0], action: 'typeahead' }, function(data) {
 					process(data);
 			});
 		},

From 2158225795e4397bcb258fc398aaac7718f514f1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Dec 2020 12:37:13 +0100
Subject: [PATCH 256/312] put revision date into log messages

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index d9adfb97a..cd5d172af 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -933,7 +933,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 				/* We have sleeping revision, next check if the revision is already due */
 				if($lc->getRevisionDate() && $lc->getRevisionDate() <= date('Y-m-d 00:00:00')) {
-					if($lc->startRevision($user, 'Automatic start of revision workflow')) {
+					if($lc->startRevision($user, 'Automatic start of revision workflow scheduled for '.$lc->getRevisionDate())) {
 						if($next) {
 							$tmp = explode('-', substr($next, 0, 10));
 							if(checkdate($tmp[1], $tmp[2], $tmp[0]))
@@ -5657,7 +5657,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
 		/* Set status only if at least one revision was started */
 		if($startedrev)
-			if(!$this->setStatus(S_IN_REVISION, "Started revision", $requestUser)) {
+			if(!$this->setStatus(S_IN_REVISION, "Started revision scheduled for ".$this->getRevisionDate(), $requestUser)) {
 				$db->rollbackTransaction();
 				return false;
 			}

From 1ce88fcb137297527137ea7ea4511636c1624096 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Dec 2020 12:41:09 +0100
Subject: [PATCH 257/312] pass orderby and orderdir to hook searchListHeader,
 fix icons

---
 views/bootstrap/class.Search.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 787c6d3d5..b88d8a1dd 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -535,7 +535,7 @@ foreach($facets as $facetname=>$values) {
 			$this->pageList($pageNumber, $totalpages, "../out/out.Search.php", $urlparams);
 //			$this->contentContainerStart();
 
-			$txt = $this->callHook('searchListHeader');
+			$txt = $this->callHook('searchListHeader', $orderby, $orderdir);
 			if(is_string($txt))
 				echo $txt;
 			else {
@@ -546,9 +546,9 @@ foreach($facets as $facetname=>$values) {
 				print "<th></th>\n";
 				print "<th>".getMLText("name");
 				if(!$fullsearch) {
-					print " <a href=\"../out/out.Search.php?".http_build_query($tmp)."\" title=\"".getMLText("sort_by_name")."\">".($orderby=="n"||$orderby=="na"?' <i class="icon-sort-by-alphabet selected"></i>':($orderby=="nd"?' <i class="icon-sort-by-alphabet-alt selected"></i>':' <i class="icon-sort-by-alphabet"></i>'))."</a>";
+					print " <a href=\"../out/out.Search.php?".http_build_query($tmp)."\" title=\"".getMLText("sort_by_name")."\">".($orderby=="n"||$orderby=="na"?' <i class="fa fa-sort-alpha-asc selected"></i>':($orderby=="nd"?' <i class="fa fa-sort-alpha-desc selected"></i>':' <i class="fa fa-sort-alpha-asc"></i>'))."</a>";
 					$tmp['orderby'] = $orderby=="d"||$orderby=="da)"?"dd":"d";
-					print " <a href=\"../out/out.Search.php?".http_build_query($tmp)."\" title=\"".getMLText("sort_by_date")."\">".($orderby=="d"||$orderby=="da"?' <i class="icon-sort-by-attributes selected"></i>':($orderby=="dd"?' <i class="icon-sort-by-attributes-alt selected"></i>':' <i class="icon-sort-by-attributes"></i>'))."</a>";
+					print " <a href=\"../out/out.Search.php?".http_build_query($tmp)."\" title=\"".getMLText("sort_by_date")."\">".($orderby=="d"||$orderby=="da"?' <i class="fa fa-sort-amount-asc selected"></i>':($orderby=="dd"?' <i class="fa fa-sort-amount-desc selected"></i>':' <i class="fa fa-sort-amount-asc"></i>'))."</a>";
 				}
 				print "</th>\n";
 				//print "<th>".getMLText("attributes")."</th>\n";

From 532d5964d91cde555f741620d524547247bf82bb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Dec 2020 18:21:18 +0100
Subject: [PATCH 258/312] call filter function before notification can be used
 to filter out certain notifications

---
 inc/inc.Authentication.php           |  2 +-
 inc/inc.ClassNotificationService.php | 26 ++++++++++++++++++--------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index 36fb1dd6a..c5d3f066c 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -102,7 +102,7 @@ if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
 }
 
 if($settings->_enableEmail) {
-	$notifier->addService(new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword));
+	$notifier->addService(new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword), 'email');
 }
 
 if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
diff --git a/inc/inc.ClassNotificationService.php b/inc/inc.ClassNotificationService.php
index c44c4018d..bb1ff71c2 100644
--- a/inc/inc.ClassNotificationService.php
+++ b/inc/inc.ClassNotificationService.php
@@ -30,25 +30,35 @@ class SeedDMS_NotificationService {
 		$this->services = array();
 	}
 
-	public function addService($service) {
-		$this->services[] = $service;
+	public function addService($service, $name='') {
+		$this->services[$name ? $name : md5(uniqid())] = $service;
+	}
+
+	public function getServices() {
+		return $this->services;
 	}
 
 	public function toIndividual($sender, $recipient, $subject, $message, $params=array()) {
-		foreach($this->services as $service) {
-			return $service->toIndividual($sender, $recipient, $subject, $message, $params);
+		foreach($this->services as $name => $service) {
+			if(!is_callable([$service, 'filter']) || $service->filter($sender, $recipient, $subject, $message, $params)) {
+				return $service->toIndividual($sender, $recipient, $subject, $message, $params);
+			}
 		}
 	}
 
 	public function toGroup($sender, $groupRecipient, $subject, $message, $params=array()) {
-		foreach($this->services as $service) {
-			return $service->toGroup($sender, $groupRecipient, $subject, $message, $params);
+		foreach($this->services as $name => $service) {
+			if(!is_callable([$service, 'filter']) || $service->filter($sender, $groupRecipient, $subject, $message, $params)) {
+				return $service->toGroup($sender, $groupRecipient, $subject, $message, $params);
+			}
 		}
 	}
 
 	public function toList($sender, $recipients, $subject, $message, $params=array()) {
-		foreach($this->services as $service) {
-			return $service->toList($sender, $recipients, $subject, $message, $params);
+		foreach($this->services as $name => $service) {
+			if(!is_callable([$service, 'filter']) || $service->filter($sender, $recipients, $subject, $message, $params)) {
+				return $service->toList($sender, $recipients, $subject, $message, $params);
+			}
 		}
 	}
 

From 0124f6cc743a32e829af6db7e7005155022511e2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Dec 2020 18:23:48 +0100
Subject: [PATCH 259/312] use require_once instead of include

---
 op/op.Ajax.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 6c965d60b..d27678ce5 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -16,21 +16,21 @@
 //    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.ClassNotificationService.php");
-include("../inc/inc.ClassEmailNotify.php");
-include("../inc/inc.ClassUI.php");
-include("../inc/inc.ClassController.php");
+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.ClassNotificationService.php");
+require_once("../inc/inc.ClassEmailNotify.php");
+require_once("../inc/inc.ClassUI.php");
+require_once("../inc/inc.ClassController.php");
 
 require_once("../inc/inc.ClassSession.php");
-include("../inc/inc.ClassPasswordStrength.php");
-include("../inc/inc.ClassPasswordHistoryManager.php");
+require_once("../inc/inc.ClassPasswordStrength.php");
+require_once("../inc/inc.ClassPasswordHistoryManager.php");
 
 /* Load session */
 if (isset($_COOKIE["mydms_session"])) {

From 132c643433345ef709e50b74c016ae85c977c9cf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Dec 2020 18:24:29 +0100
Subject: [PATCH 260/312] user getReadableDate() instead of date()

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 07a9cc4d9..caf807779 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2650,7 +2650,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 				$content .= "<a draggable=\"false\" href=\"../out/out.ViewDocument.php?documentid=".$docID."&showtree=".$showtree."\">" . htmlspecialchars($document->getName()) . "</a>";
 			if(isset($extracontent['below_title']))
 				$content .= $extracontent['below_title'];
-			$content .= "<br /><span style=\"font-size: 85%; font-style: italic; color: #666; \">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $document->getDate())."</b>, ".getMLText('version')." <b>".$version."</b> - <b>".date('Y-m-d', $latestContent->getDate())."</b>".($document->expires() ? ", ".getMLText('expires').": <b>".getReadableDate($document->getExpires())."</b>" : "")."</span>";
+			$content .= "<br /><span style=\"font-size: 85%; font-style: italic; color: #666; \">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".getReadableDate($document->getDate())."</b>, ".getMLText('version')." <b>".$version."</b> - <b>".getReadableDate($latestContent->getDate())."</b>".($document->expires() ? ", ".getMLText('expires').": <b>".getReadableDate($document->getExpires())."</b>" : "")."</span>";
 			if($comment) {
 				$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
 			}

From f482c42db389d945b9224e781ad8014bb9b030b9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Dec 2020 18:24:55 +0100
Subject: [PATCH 261/312] pass 'asc' as order dir to hook searchHeaderList

---
 views/bootstrap/class.Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index b88d8a1dd..5ac7a1810 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -535,7 +535,7 @@ foreach($facets as $facetname=>$values) {
 			$this->pageList($pageNumber, $totalpages, "../out/out.Search.php", $urlparams);
 //			$this->contentContainerStart();
 
-			$txt = $this->callHook('searchListHeader', $orderby, $orderdir);
+			$txt = $this->callHook('searchListHeader', $orderby, 'asc');
 			if(is_string($txt))
 				echo $txt;
 			else {

From 6bb4218e44961ff29d8400d0e7da05d476452d8c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Dec 2020 18:25:22 +0100
Subject: [PATCH 262/312] initial support customizable date format

---
 inc/inc.ClassSettings.php          |  8 ++++++++
 inc/inc.Utils.php                  | 12 ++++++++++--
 op/op.Settings.php                 |  2 ++
 views/bootstrap/class.Settings.php |  2 ++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 3f302c050..3b14e6889 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -132,6 +132,10 @@ class Settings { /* {{{ */
 	var $_availablelanguages = array();
 	// default language (name of a subfolder in folder "languages")
 	var $_language = "en_GB";
+	// default date format
+	var $_dateformat = "Y-m-d";
+	// default date/time format
+	var $_datetimformat = "Y-m-d H:i:s";
 	// users are notified about document-changes that took place within the last $_updateNotifyTime seconds
 	var $_updateNotifyTime = 86400;
 	// files with one of the following endings can be viewed online
@@ -453,6 +457,8 @@ class Settings { /* {{{ */
 		$this->_footNote = strval($tab["footNote"]);
 		$this->_printDisclaimer = Settings::boolVal($tab["printDisclaimer"]);
 		$this->_language = strval($tab["language"]);
+		$this->_dateformat = strval($tab["dateformat"]);
+		$this->_datetimeformat = strval($tab["datetimeformat"]);
 		if(trim(strval($tab["availablelanguages"])))
 			$this->_availablelanguages = explode(',',strval($tab["availablelanguages"]));
 		$this->_theme = strval($tab["theme"]);
@@ -826,6 +832,8 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "footNote", $this->_footNote);
     $this->setXMLAttributValue($node, "printDisclaimer", $this->_printDisclaimer);
     $this->setXMLAttributValue($node, "language", $this->_language);
+    $this->setXMLAttributValue($node, "dateformat", $this->_dateformat);
+    $this->setXMLAttributValue($node, "datetimeformat", $this->_datetimeformat);
     $this->setXMLAttributValue($node, "availablelanguages", implode(',', $this->_availablelanguages));
     $this->setXMLAttributValue($node, "theme", $this->_theme);
     $this->setXMLAttributValue($node, "overrideTheme", $this->_overrideTheme);
diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 750d9226c..73a1c33a0 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -27,11 +27,19 @@ function formatted_size($size_bytes) { /* {{{ */
 } /* }}} */
 
 function getReadableDate($timestamp) { /* {{{ */
-	return date("Y-m-d", $timestamp);
+	global $settings;
+	if($settings->_dateformat)
+		return date($settings->_dateformat, $timestamp);
+	else
+		return date("Y-m-d", $timestamp);
 } /* }}} */
 
 function getLongReadableDate($timestamp) { /* {{{ */
-	return date("Y-m-d H:i:s", $timestamp);
+	global $settings;
+	if($settings->_datetimeformat)
+		return date($settings->_datetimeformat, $timestamp);
+	else
+		return date("Y-m-d H:i:s", $timestamp);
 } /* }}} */
 
 /*
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 908e4ef75..5a45bef32 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -59,6 +59,8 @@ if ($action == "saveSettings")
   $settings->_footNote = $_POST["footNote"];
   $settings->_printDisclaimer = getBoolValue("printDisclaimer");
 	$settings->_language = $_POST["language"];
+	$settings->_dateformat = $_POST["dateformat"];
+	$settings->_datetimeformat = $_POST["datetimeformat"];
 	if(empty($_POST["availablelanguages"]))
 		$settings->_availablelanguages = array();
 	else
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index c30bbaf3e..5733c6302 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -284,6 +284,8 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
 <?php $this->showConfigCheckbox('settings_printDisclaimer', 'printDisclaimer'); ?>
 <?php $this->showConfigOption('settings_available_languages', 'availablelanguages', getAvailableLanguages(), true, true); ?>
 <?php $this->showConfigOption('settings_language', 'language', getAvailableLanguages(), false, true); ?>
+<?php $this->showConfigText('settings_dateformat', 'dateformat'); ?>
+<?php $this->showConfigText('settings_datetimeformat', 'datetimeformat'); ?>
 <?php $this->showConfigOption('settings_theme', 'theme', UI::getStyles(), false, false); ?>
 <?php $this->showConfigCheckbox('settings_overrideTheme', 'overrideTheme'); ?>
 <?php $this->showConfigCheckbox('settings_onePageMode', 'onePageMode'); ?>

From 363ce485e36c76aea281885bdc2b509aec714232 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Dec 2020 18:33:30 +0100
Subject: [PATCH 263/312] get[Long]ReadableDate() takes argument as 'yyyy-mm-dd
 hh:ii:ss'

---
 inc/inc.Utils.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 73a1c33a0..cbda98f98 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -28,6 +28,8 @@ function formatted_size($size_bytes) { /* {{{ */
 
 function getReadableDate($timestamp) { /* {{{ */
 	global $settings;
+	if(!is_numeric($timestamp))
+		$timestamp = strtotime($timestamp);
 	if($settings->_dateformat)
 		return date($settings->_dateformat, $timestamp);
 	else
@@ -36,6 +38,8 @@ function getReadableDate($timestamp) { /* {{{ */
 
 function getLongReadableDate($timestamp) { /* {{{ */
 	global $settings;
+	if(!is_numeric($timestamp))
+		$timestamp = strtotime($timestamp);
 	if($settings->_datetimeformat)
 		return date($settings->_datetimeformat, $timestamp);
 	else

From 29c0d889cdcf5d7eddf8ec288a6214cdba896780 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Dec 2020 21:43:10 +0100
Subject: [PATCH 264/312] format dates with getLongReadableDate()

---
 views/bootstrap/class.Bootstrap.php             | 2 +-
 views/bootstrap/class.DocumentVersionDetail.php | 6 +++---
 views/bootstrap/class.ViewDocument.php          | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index caf807779..f678f9022 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -3082,7 +3082,7 @@ $(document).ready(function() {
 			echo $reqName;
 			echo "</td>";
 			echo "<td>";
-			echo "<i style=\"font-size: 80%;\">".$rec['date']." - ";
+			echo "<i style=\"font-size: 80%;\">".getLongReadableDate($rec['date'])." - ";
 			$updateuser = $dms->getUser($rec["userID"]);
 			if(!is_object($updateuser))
 				echo getMLText("unknown_user");
diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index 99d9fc537..833bdb67d 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -382,7 +382,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 				}
 				print "<tr".($r['status'] == 1 ? ' class="success"' : ($r['status'] == -1 ? ' class="error"' : '')).">\n";
 				print "<td>".$reqName."</td>\n";
-				print "<td><i style=\"font-size: 80%;\">".$r["date"]." - ";
+				print "<td><i style=\"font-size: 80%;\">".getLongReadableDate($r["date"])." - ";
 				/* $updateUser is the user who has done the review */
 				$updateUser = $dms->getUser($r["userID"]);
 				print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</i><br />";
@@ -436,7 +436,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 				}
 				print "<tr".($a['status'] == 1 ? ' class="success"' : ($a['status'] == -1 ? ' class="error"' : ($a['status'] == -2 ? ' class=""' : ''))).">\n";
 				print "<td>".$reqName."</td>\n";
-				print "<td><i style=\"font-size: 80%;\">".$a["date"]." - ";
+				print "<td><i style=\"font-size: 80%;\">".getLongReadableDate($a["date"])." - ";
 				/* $updateUser is the user who has done the approval */
 				$updateUser = $dms->getUser($a["userID"]);
 				print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$a["userID"]."'")."</i><br />";	
@@ -549,7 +549,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 					$fullname = $suser->getFullName();
 				else
 					$fullname = "--";
-				echo "<tr><td>".$entry['date']."</td><td>".getOverallStatusText($entry['status'])."</td><td>".$fullname."</td><td>".$entry['comment']."</td></tr>\n";
+				echo "<tr><td>".getLongReadableDate($entry['date'])."</td><td>".getOverallStatusText($entry['status'])."</td><td>".$fullname."</td><td>".$entry['comment']."</td></tr>\n";
 			}
 			print "</tbody>\n</table>\n";
 			$this->contentContainerEnd();
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 7f9fa4c98..b64051ed9 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -742,7 +742,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					$fullname = htmlspecialchars($suser->getFullName());
 				else
 					$fullname = "--";
-				echo "<tr><td>".$entry['date']."</td><td>".getOverallStatusText($entry['status'])."</td><td>".$fullname."</td><td>".htmlspecialchars($entry['comment'])."</td></tr>\n";
+				echo "<tr><td>".getLongReadableDate($entry['date'])."</td><td>".getOverallStatusText($entry['status'])."</td><td>".$fullname."</td><td>".htmlspecialchars($entry['comment'])."</td></tr>\n";
 			}
 			print "</tbody>\n</table>\n";
 			$this->contentContainerEnd();
@@ -847,7 +847,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				if($user->isAdmin() || $r["status"] > -2) {
 					print "<tr>\n";
 					print "<td>".$reqName."</td>\n";
-					print "<td><i style=\"font-size: 80%;\">".$r["date"]." - ";
+					print "<td><i style=\"font-size: 80%;\">".getLongReadableDate($r["date"])." - ";
 					/* $updateUser is the user who has done the review */
 					$updateUser = $dms->getUser($r["userID"]);
 					print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</i><br />";
@@ -949,7 +949,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				if($user->isAdmin() || $a["status"] > -2) {
 					print "<tr>\n";
 					print "<td>".$reqName."</td>\n";
-					print "<td><i style=\"font-size: 80%;\">".$a["date"]." - ";
+					print "<td><i style=\"font-size: 80%;\">".getLongReadableDate($a["date"])." - ";
 					/* $updateUser is the user who has done the approval */
 					$updateUser = $dms->getUser($a["userID"]);
 					print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$a["userID"]."'")."</i><br />";	

From 47307ccd3de0f5ecd43fc7e19832ed49a1360742 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Dec 2020 21:44:22 +0100
Subject: [PATCH 265/312] add changes for 5.1.21

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 5b8e75ed6..bf7c03cbe 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,8 @@
   SeedDMS_Bootstrap_Style::getDropFolderChooserHtml() (CVE-2020-28726)
 - prevent cross site scripting in views/bootstrap/class.DropFileChooser.php
   folderid wasn't checked propperly for being an integer (CVE-2020-28727)
+- output format for dates can be configured
+- add filter function to notification service
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.20

From fcab6f5a091c574c5fc293aba88125abe02ca281 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Dec 2020 21:59:02 +0100
Subject: [PATCH 266/312] format date with getLongReadableDate()

---
 views/bootstrap/class.ViewDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index b77ac22a6..20e367cef 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1363,7 +1363,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					}
 					print "<tr>\n";
 					print "<td>".$reqName."</td>\n";
-					print "<td><ul class=\"unstyled\"><li>".$r["date"]."</li>";
+					print "<td><ul class=\"unstyled\"><li>".getLongReadableDate($r["date"])."</li>";
 					/* $updateUser is the user who has done the receipt */
 					$updateUser = $dms->getUser($r["userID"]);
 					print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
@@ -1494,7 +1494,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				if($user->isAdmin() || $r["status"] != -2) {
 					print "<tr>\n";
 					print "<td>".$reqName."</td>\n";
-					print "<td><ul class=\"unstyled\"><li>".$r["date"]."</li>";
+					print "<td><ul class=\"unstyled\"><li>".getLongReadableDate($r["date"])."</li>";
 					/* $updateUser is the user who has done the revision */
 					if($r['status'] != 0) {
 						$updateUser = $dms->getUser($r["userID"]);

From e407f82d3abb25d02ef7ef0dcf3aaedcae4adf1e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Dec 2020 22:04:19 +0100
Subject: [PATCH 267/312] add extra output of date attributes

---
 views/bootstrap/class.Bootstrap.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index f678f9022..449f1a7ff 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1536,6 +1536,14 @@ $(document).ready(function() {
 			}
 			return implode('<br />', $tmp);
 			break;
+		case SeedDMS_Core_AttributeDefinition::type_date:
+			$attrs = $attribute->getValueAsArray();
+			$tmp = array();
+			foreach($attrs as $attr) {
+				$tmp[] = getReadableDate($attr);
+			}
+			return implode(', ', $tmp);
+			break;
 		default:
 			return htmlspecialchars(implode(', ', $attribute->getValueAsArray()));
 		}

From c29de3a7ca4297d58b42ff81dcfadc544b581b0b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 5 Dec 2020 15:27:40 +0100
Subject: [PATCH 268/312] set audio preload to false

---
 views/bootstrap/class.ViewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index b64051ed9..3960d6fd6 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -386,7 +386,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			case 'audio/wav':
 				$this->contentHeading(getMLText("preview"));
 	?>
-			<audio controls style="width: 100%;">
+			<audio controls style="width: 100%;" preload="false">
 			<source  src="../op/op.ViewOnline.php?documentid=<?php echo $latestContent->getDocument()->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" type="audio/mpeg">
 			</audio>
 	<?php

From f2d5b160c5381720d64f07ee1fb03e5f31c46489 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 7 Dec 2020 10:24:30 +0100
Subject: [PATCH 269/312] add function getPeriodOfTime() and isAjax()

---
 inc/inc.Utils.php | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index cbda98f98..fe42e9253 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -46,6 +46,29 @@ function getLongReadableDate($timestamp) { /* {{{ */
 		return date("Y-m-d H:i:s", $timestamp);
 } /* }}} */
 
+function getPeriodOfTime($timestamp) { /* {{{ */
+	if(!is_numeric($timestamp))
+		$timestamp = strtotime($timestamp);
+
+	$time = time() - $timestamp; // to get the time since that moment
+	$time = ($time<1)? 1 : $time;
+	$tokens = array (
+		31536000 => getMLText('abbr_year'),
+		2592000 => getMLText('abbr_month'),
+		604800 => getMLText('abbr_week'),
+		86400 => getMLText('abbr_day'),
+		3600 => getMLText('abbr_hour'),
+		60 => getMLText('abbr_minute'),
+		1 => getMLText('abbr_second')
+	);
+
+	foreach ($tokens as $unit => $text) {
+		if ($time < $unit) continue;
+		$numberOfUnits = floor($time / $unit);
+		return $numberOfUnits.' '.$text.(($numberOfUnits>1)?'s':'');
+	}
+} /* }}} */
+
 /*
  * Converts a date/time string into a timestamp
  *
@@ -624,6 +647,13 @@ function getToken($length){ /* {{{ */
 	return $token;
 } /* }}} */
 
+function isAjax() { /* {{{ */
+	if(!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')
+		return true;
+	else	
+		return false;
+} /* }}} */
+
 /**
  * Hash a password 
  *

From 153163fcb7707d22a7a110e1aa6f729d99870562 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 7 Dec 2020 10:25:35 +0100
Subject: [PATCH 270/312] add abbreviations for min, sec, day, year, etc.

---
 languages/ar_EG/lang.inc |  7 +++++++
 languages/bg_BG/lang.inc |  7 +++++++
 languages/ca_ES/lang.inc |  7 +++++++
 languages/cs_CZ/lang.inc |  7 +++++++
 languages/de_DE/lang.inc | 13 ++++++++++---
 languages/el_GR/lang.inc | 11 +++++++++--
 languages/en_GB/lang.inc | 11 +++++++++--
 languages/es_ES/lang.inc |  7 +++++++
 languages/fr_FR/lang.inc | 25 ++++++++++++++++---------
 languages/hr_HR/lang.inc |  7 +++++++
 languages/hu_HU/lang.inc |  7 +++++++
 languages/it_IT/lang.inc | 35 +++++++++++++++++++++--------------
 languages/ko_KR/lang.inc |  7 +++++++
 languages/lo_LA/lang.inc |  7 +++++++
 languages/nb_NO/lang.inc | 11 +++++++++--
 languages/nl_NL/lang.inc |  7 +++++++
 languages/pl_PL/lang.inc | 11 +++++++++--
 languages/pt_BR/lang.inc | 11 +++++++++--
 languages/ro_RO/lang.inc |  7 +++++++
 languages/ru_RU/lang.inc | 11 +++++++++--
 languages/sk_SK/lang.inc |  7 +++++++
 languages/sv_SE/lang.inc |  7 +++++++
 languages/tr_TR/lang.inc | 19 +++++++++++++------
 languages/uk_UA/lang.inc |  7 +++++++
 languages/zh_CN/lang.inc |  7 +++++++
 languages/zh_TW/lang.inc |  7 +++++++
 26 files changed, 226 insertions(+), 44 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 12345a873..ad62f7e8e 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -25,6 +25,13 @@ $text = array(
 '2_factor_auth' => 'توثيق ذو عاملين',
 '2_factor_auth_info' => 'معلومات عن توثيق ذو عاملين',
 '2_fact_auth_secret' => '',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => 'وافق',
 'access_control' => 'صلاحيات الدخول',
 'access_control_is_off' => 'صلاحيات الدخول غير مفعلة',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index cde4a2f94..c1840a18c 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -25,6 +25,13 @@ $text = array(
 '2_factor_auth' => '',
 '2_factor_auth_info' => '',
 '2_fact_auth_secret' => '',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => 'Приеми',
 'access_control' => '',
 'access_control_is_off' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index d18909056..70fc001c9 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -25,6 +25,13 @@ $text = array(
 '2_factor_auth' => '',
 '2_factor_auth_info' => '',
 '2_fact_auth_secret' => '',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => 'Acceptar',
 'access_control' => 'Control d\'accés',
 'access_control_is_off' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 64ef83ae9..e7ddcc9e1 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -25,6 +25,13 @@ $text = array(
 '2_factor_auth' => 'dvoufaktorové ověření',
 '2_factor_auth_info' => 'Tento systém vyžaduje dvoufaktorové ověření. Na svém mobilním telefonu budete potřebovat Google Authenticator. Níže vidíte dva QR kódy. Správný je vaše současné tajemství. Vlevo můžete nastavit nové tajemství. Pokud nastavíte nové tajemství, ujistěte se, že jste jej znovu otestovali pomocí služby Google Authenticator.',
 '2_fact_auth_secret' => 'tajemství',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => 'Přijmout',
 'access_control' => 'Řízení přístupu',
 'access_control_is_off' => 'Řízení přístupu je vypnuté',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 4aa96c904..5ce70c694 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,12 +19,19 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2828), dgrutsch (22)
+//    Translators: Admin (2839), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
 '2_factor_auth_info' => 'Dieses System erfordert 2-Faktor-Authentifikation. Dazu brauchen Sie den Google Authenticator auf Ihrem Mobiltelefon. Unten sehen Sie zwei QR-Codes. Der rechte Code beinhaltet Ihren aktuellen geheimen Schlüssel. Auf der linken Seite wird ein neuer Schlüssel angezeigt. Wenn Sie den neuen Schlüssel speichern, dann stellen Sie zuvor sicher, dass sie ihn mit dem Google Authenticator zuvor eingescant haben.',
 '2_fact_auth_secret' => 'Schlüssel',
+'abbr_day' => 'T.',
+'abbr_hour' => 'St.',
+'abbr_minute' => 'Min.',
+'abbr_month' => 'M.',
+'abbr_second' => 'Sek.',
+'abbr_week' => 'W.',
+'abbr_year' => 'J.',
 'accept' => 'Übernehmen',
 'access_control' => 'Zugriffskontrolle',
 'access_control_is_off' => 'Erweiterte Zugriffskontrolle ist ausgeschaltet',
@@ -129,7 +136,7 @@ Status: [status]
 Kommentar: [comment]
 Benutzer: [username]
 URL: [url]',
-'approval_submit_email_subject' => '[sitename]: [name] - Freigabe erteilen',
+'approval_submit_email_subject' => '[sitename]: [name] - Freigabe erteilt',
 'approval_summary' => 'Übersicht Freigaben',
 'approval_update_failed' => 'Störung bei der Aktualisierung des Berechtigungsstatus. Aktualisierung gescheitert',
 'approvers' => 'Freigebender',
@@ -1163,7 +1170,7 @@ Status: [status]
 Kommentar: [comment]
 Benutzer: [username]
 URL: [url]',
-'revision_submit_email_subject' => '[sitename]: [name] - Erneute Freigabe erteilen',
+'revision_submit_email_subject' => '[sitename]: [name] - Erneute Freigabe erteilt',
 'revision_summary' => 'Übersicht Wiederholungsprüfungen',
 'revisors' => 'Wiederholungsprüfer',
 'revisor_already_assigned' => 'Benutzer bereits als Wiederholungsprüfer eingetragen.',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 54725b3e7..c1da94464 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -19,12 +19,19 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (330)
+//    Translators: Admin (331)
 
 $text = array(
 '2_factor_auth' => '',
 '2_factor_auth_info' => '',
 '2_fact_auth_secret' => '',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => '',
 'access_control' => '',
 'access_control_is_off' => '',
@@ -586,7 +593,7 @@ $text = array(
 'import_extension' => '',
 'import_fs' => 'Εισαγωγή από το σύστημα',
 'import_fs_warning' => '',
-'import_users' => '',
+'import_users' => 'Εισαγωγή χειριστών',
 'import_users_addnew' => '',
 'import_users_update' => '',
 'include_content' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 37b075a84..d3a3d3564 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,12 +19,19 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1934), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1945), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
 '2_factor_auth_info' => 'This system enforces 2 factor authentication. You will need the Google Authenticator on your mobile phone. Below you see two QR codes. The right one is your current secret. On the left you can set a new secret. If you set a new secret make sure to rescan it with Google Authenticator.',
 '2_fact_auth_secret' => 'Secret',
+'abbr_day' => 'd',
+'abbr_hour' => 'h',
+'abbr_minute' => 'min',
+'abbr_month' => 'M',
+'abbr_second' => 's',
+'abbr_week' => 'wk',
+'abbr_year' => 'Y',
 'accept' => 'Accept',
 'access_control' => 'Access control',
 'access_control_is_off' => 'Advanced access control is turned off',
@@ -1157,7 +1164,7 @@ URL: [url]',
 'revision_request_email_subject' => '[sitename]: [name] - Revision request',
 'revision_status' => 'Status',
 'revision_submit_email_body' => '',
-'revision_submit_email_subject' => '',
+'revision_submit_email_subject' => '[sitename]: [name] - Submitted revision',
 'revision_summary' => 'Revision summary',
 'revisors' => 'Revisors',
 'revisor_already_assigned' => 'User is already assigned as an revisor.',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 5a7021f42..f19e2551a 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -25,6 +25,13 @@ $text = array(
 '2_factor_auth' => '',
 '2_factor_auth_info' => '',
 '2_fact_auth_secret' => '',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => 'Aceptar',
 'access_control' => 'Control de acceso',
 'access_control_is_off' => 'Control de acceso avanzado está desconectado',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 3991013c6..470505b8a 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -19,12 +19,19 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1107), jeromerobert (50), lonnnew (9), Oudiceval (970)
+//    Translators: Admin (1108), jeromerobert (50), lonnnew (9), Oudiceval (977)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
 '2_factor_auth_info' => 'Ce système requiert une authentification à deux facteurs. Cela nécessite l’installation de Google Authenticator sur votre téléphone mobile. Ci-dessous sont visibles deux QR codes. Celui de droite correspond à votre clé secrète actuelle. Celui de gauche permet de définir une nouvelle clé secrète. Lorsque vous définissez une nouvelle clé secrète, assurez-vous de la scanner avec Google Authenticator.',
 '2_fact_auth_secret' => 'Clé secrète',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => 'Accepter',
 'access_control' => 'Contrôle d’accès',
 'access_control_is_off' => 'Le contrôle d’accès avancé est désactivé',
@@ -481,7 +488,7 @@ URL: [url]',
 'dropfolderdir_missing' => 'Votre dossier de dépôt personnel n\'existe pas sur le serveur ! Veuillez faire une demande à l\'administrateur.',
 'dropfolder_file' => 'Fichier du dossier de dépôt',
 'dropfolder_folder' => 'Répertoire du dossier de dépôt',
-'dropfolder_metadata' => '',
+'dropfolder_metadata' => 'Métadonnées du dossier de dépôt',
 'dropupload' => 'Téléchargement rapide',
 'drop_files_here' => 'Glissez les fichiers ici !',
 'dump_creation' => 'Sauvegarder la base de données',
@@ -820,7 +827,7 @@ URL: [url]',
 'may' => 'Mai',
 'menu_dropfolder' => 'Dossier de dépôt',
 'menu_upload_from_dropfolder' => 'Importer ce fichier',
-'message' => '',
+'message' => 'Message',
 'mimetype' => 'Type MIME',
 'minutes' => 'minutes',
 'misc' => 'Divers',
@@ -1161,7 +1168,7 @@ Statut : [status]
 Commentaire : [comment]
 Utilisateur : [username]
 URL : [url]',
-'revision_submit_email_subject' => '[sitename] : [name] - Publié à nouveau',
+'revision_submit_email_subject' => '[sitename]: [name] - Publié à nouveau',
 'revision_summary' => 'Récapitulatif révision',
 'revisors' => 'Réviseurs',
 'revisor_already_assigned' => 'L’utilisateur est déjà attribué en tant que réviseur.',
@@ -1260,13 +1267,13 @@ URL : [url]',
 'select_ind_recipients' => 'Cliquer pour choisir un destinataire individuel',
 'select_ind_reviewers' => 'Cliquer pour choisir un examinateur individuel',
 'select_ind_revisors' => 'Cliquer pour choisir un réviseur individuel',
-'select_mimetype' => '',
+'select_mimetype' => 'Sélectionner un type MIME',
 'select_one' => 'Selectionner',
 'select_owner' => 'Sélectionner un propriétaire',
 'select_user' => 'Sélectionner un utilisateur',
 'select_users' => 'Cliquer pour choisir un utilisateur',
 'select_value' => 'Sélectionner une valeur',
-'select_workflow' => 'Choisir un workflow',
+'select_workflow' => 'Sélectionner un workflow',
 'send_email' => 'Envoyer un e-mail',
 'send_login_data' => 'Envoyer les informations de connexion',
 'send_login_data_body' => 'Informations de connexion
@@ -1494,8 +1501,8 @@ Nom : [username]
 'settings_initialDocumentStatus_desc' => 'État du document défini lors de l’ajout',
 'settings_initialDocumentStatus_draft' => 'ébauche',
 'settings_initialDocumentStatus_released' => 'publié',
-'settings_inlineEditing' => '',
-'settings_inlineEditing_desc' => '',
+'settings_inlineEditing' => 'Édition en ligne',
+'settings_inlineEditing_desc' => 'Permet d’éditer le nom du document directement depuis la page des détails.',
 'settings_installADOdb' => 'Installer ADOdb',
 'settings_install_disabled' => 'Le fichier ENABLE_INSTALL_TOOL a été supprimé. Vous pouvez maintenant vous connecter à SeedDMS et poursuivre la configuration.',
 'settings_install_pear_package_log' => 'Installer le paquet Pear \'Log\'',
@@ -1960,7 +1967,7 @@ URL: [url]',
 'version_info' => 'Informations de version',
 'view' => 'Aperçu',
 'view_document' => 'Voir le document',
-'view_folder' => '',
+'view_folder' => 'Voir les détails du dossier',
 'view_online' => 'Aperçu en ligne',
 'warning' => 'Avertissement',
 'webauthn_auth' => 'Authentification WebAuthn',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 27f7a1db0..d4e2f080d 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -25,6 +25,13 @@ $text = array(
 '2_factor_auth' => '',
 '2_factor_auth_info' => '',
 '2_fact_auth_secret' => '',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => 'Prihvati',
 'access_control' => 'Kontrola pristupa',
 'access_control_is_off' => '',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index dd0dbd9f8..34da09171 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -25,6 +25,13 @@ $text = array(
 '2_factor_auth' => 'Kétfaktoros azonosítás',
 '2_factor_auth_info' => 'A rendszernek két faktoros hitelesítése van. Szükséged lesz a Google Authenticator-ra a mobil telefonodon. Lejebb látható két QR kód. A jobb oldali a saját jelszavát, a baloldali egy új titkos jelszót tartalmaz. Ha új jelszót szeretne beállítani, szkennelje be újra a Goolge Authenticator-al.',
 '2_fact_auth_secret' => 'Titkos',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => 'Elfogad',
 'access_control' => 'Hozzáférés vezérlés',
 'access_control_is_off' => 'A speciális vezérlés hozzáférése ki van kapcsolva',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index bbe1bfdd9..d3208489e 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -19,12 +19,19 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2035), rickr (144), s.pnt (26)
+//    Translators: Admin (2048), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
 '2_factor_auth_info' => 'Questo sistema usa autenticazione a due fattori. Sarà necessario il “Google Authenticator” sul tuo telephono cellulare. Qui potete vedere due codici QR. Quello di destra è il tuo segreto. è sulla sinistra chè un nuovo segreto. Se si imposta un nuovo segreto per assicurarsi  si deve scansione con “Google Authenticator” di nuovo.',
 '2_fact_auth_secret' => 'Segreto',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => 'Accetta',
 'access_control' => 'Il controllo degli accessi',
 'access_control_is_off' => 'Controlo avanzate è spento',
@@ -813,7 +820,7 @@ URL: [url]',
 'missing_checksum' => 'Checksum mancante',
 'missing_file' => 'File mancante',
 'missing_filesize' => 'Dimensione mancante',
-'missing_php_extensions' => '',
+'missing_php_extensions' => 'Estensioni php mancanti',
 'missing_reception' => 'Ricezione mancante',
 'missing_request_object' => 'Manca oggetto di richiesta',
 'missing_transition_user_group' => 'Utente/Gruppo per la transizione mancanti',
@@ -1287,12 +1294,12 @@ Name: [username]
 'settings_allowReviewerOnly' => 'Abilita l\'impostazione del solo revisore',
 'settings_allowReviewerOnly_desc' => 'Abilita se si vuole concedere di impostare solo un revisore ma non un apporvatore nel flusso di lavoro tradizionale',
 'settings_apache_mod_rewrite' => 'Apache - Mod Rewrite',
-'settings_apiKey' => '',
-'settings_apiKey_desc' => '',
+'settings_apiKey' => 'Chiave di autenticazione per api',
+'settings_apiKey_desc' => 'Questa chiave viene utilizzata come autenticazione alternativa per api. Scegli una stringa lunga 32 caratteri.',
 'settings_apiOrigin' => 'Origine consentita delle chiamate API',
 'settings_apiOrigin_desc' => 'Un elenco di indirizzi separati da punto e virgola. Ogni indirizzo ha la forma: // [:]. La porta può essere omessa. Se questo campo viene lasciato vuoto, non verranno applicate restrizioni.',
 'settings_apiUserId' => '',
-'settings_apiUserId_desc' => '',
+'settings_apiUserId_desc' => 'Questo utente verrà utilizzato dalle altre API, se l\'autenticazione è stata eseguita con la chiave API configurata.',
 'settings_Authentication' => 'Impostazioni di Autenticazione',
 'settings_autoLoginUser' => 'Login automatico',
 'settings_autoLoginUser_desc' => 'Utilizzare questo ID utente per l\'accesso se l\'utente non è già connesso. Questo tipo di accesso non creerà una sessione.',
@@ -1373,8 +1380,8 @@ Name: [username]
 'settings_enableClipboard_desc' => 'Abilita/disabilita la clipboard sulla pagina \'Vista cartella\'',
 'settings_enableConverting' => 'Abilita conversione',
 'settings_enableConverting_desc' => 'Abilita/disabilita la conversione dei files',
-'settings_enableDebugMode' => '',
-'settings_enableDebugMode_desc' => '',
+'settings_enableDebugMode' => 'Modo debug',
+'settings_enableDebugMode_desc' => 'Abilitalo per attivare la modalità di debug che aggiunge un nuovo menu negli strumenti di amministrazione',
 'settings_enableDropFolderList' => 'Abilita lista dei file nella cartella di pubblicazione',
 'settings_enableDropFolderList_desc' => 'Abilita la lista dei file nella cartella di pubblicazione. La lista viene mostrata nel menù principale.',
 'settings_enableDropUpload' => 'Abilita caricamento veloce',
@@ -1424,7 +1431,7 @@ Name: [username]
 'settings_enableRecursiveCount' => 'Abilita il conteggio ricursivo di documenti/cartelle',
 'settings_enableRecursiveCount_desc' => 'Se selezionato il numero di documenti e sottocartelle accessibili all\'utente sarà calcolato con un conteggio ricursivo di tutti gli oggetti contenuti nella cartella.',
 'settings_enableRevisionOneVoteReject' => 'Respinto da un revisore',
-'settings_enableRevisionOneVoteReject_desc' => '',
+'settings_enableRevisionOneVoteReject_desc' => 'Se abilitato, lo stato del documento verrà impostato su ""necessita correzione"" una volta che il primo revisore rifiuta il documento. Se disabilitato, lo stato del documento non cambierà fino a quando tutti i revisori non avranno terminato la revisione.',
 'settings_enableRevisionOnVoteReject' => 'Rifiutato da un revisore',
 'settings_enableRevisionOnVoteReject_desc' => 'Se impostato, il documento verrà rifiutato se un revisore rifiuta il documento.',
 'settings_enableRevisionWorkflow' => 'Abilita riesame dei documenti',
@@ -1562,12 +1569,12 @@ Name: [username]
 'settings_previewWidthMenuList_desc' => 'Larghezza immagine di anteprima mostrata come articolo nel menu cartella di pubblicazione.',
 'settings_printDisclaimer' => 'Mostra disclaimer',
 'settings_printDisclaimer_desc' => 'Se abilitato il messaggio circa i termini e le condizioni d\'uso verrà mostrato nel pié di pagina.',
-'settings_proxyUPassword' => '',
-'settings_proxyUPassword_desc' => '',
-'settings_proxyUrl' => '',
-'settings_proxyUrl_desc' => '',
-'settings_proxyUser' => '',
-'settings_proxyUser_desc' => '',
+'settings_proxyUPassword' => 'Password per il proxy',
+'settings_proxyUPassword_desc' => 'Password per l\'autenticazione al proxy',
+'settings_proxyUrl' => 'URL del proxy',
+'settings_proxyUrl_desc' => 'URL del proxy utilizzato per accedere al repository delle estensioni.',
+'settings_proxyUser' => 'Nome utente utilizzato per il proxy',
+'settings_proxyUser_desc' => 'Nome utente utilizzato per l\'autenticazione con il proxy',
 'settings_quota' => 'Quota utente',
 'settings_quota_desc' => 'La quantità Max di spazio su disco che può essere occupata da ciascun utente. Impostare il valore 0 offre spazio illimitato.',
 'settings_removeFromDropFolder' => 'Rimuovere file dalla cartella di ricezione dopo il caricamento',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 3f256d3ef..4655b4fa5 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -25,6 +25,13 @@ $text = array(
 '2_factor_auth' => '이중 인증',
 '2_factor_auth_info' => '',
 '2_fact_auth_secret' => '시크릿',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => '동의',
 'access_control' => '접근 제어',
 'access_control_is_off' => '고급 접근 제어 꺼짐',
diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc
index 951558f0c..b8975c1d8 100644
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@@ -25,6 +25,13 @@ $text = array(
 '2_factor_auth' => 'ການກວດສອບແບບ 2 ປັດໃຈ',
 '2_factor_auth_info' => 'ລະບົບນີ້ໄຊ້ການກວດສອບແບບ 02 ປັດໃຈ. ເຈົ້າຈະຕ້ອງມີ Google Authenticator  ໃນໂທລະສັບມືຖືຂອງທ່ານ. ດ້ານລຸ່ມແມ່ນມີ QR Codes ສອງແບບ ທາງດ້ານຂວາຈະມີຄວາມເປັນສ່ວນຕົວຂອງເຈົ້າ, ສ່ວນດ້ານຊ້າຍຂອງເຈົ້າແມ່ນຈະສາມາດຕັ້ງຄ່າຄວາມເປັນສ່ວນຕົວໄຫມ່. ຖ້າເຈົ້າຕັ້ງຄ່າຄວາມເປັນສ່ວນຕົວໄຫມ່ຮຽບຮ້ອຍ ແລ້ວນັ້ນໃຫ້ແນ່ໃຈວ່າໄດ້ສະແກນອີກຄັ້ງດ້ວຍ Google Authenticator',
 '2_fact_auth_secret' => 'ຄວາມລັບ',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => 'ຍອມຮັບ',
 'access_control' => 'ການຄວບຄຸມການເຂົ້າເຖິງ',
 'access_control_is_off' => 'ການຄວບຄຸມການເຂົ້າເຖິງຂັນສຸງໄດ້ຖືກປິດ',
diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc
index 00df1287b..1fea0e9eb 100644
--- a/languages/nb_NO/lang.inc
+++ b/languages/nb_NO/lang.inc
@@ -19,12 +19,19 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1730)
+//    Translators: Admin (1731)
 
 $text = array(
 '2_factor_auth' => '2-trinns autentisering',
 '2_factor_auth_info' => 'Dette systemet håndhever 2-faktor autentisering. Du trenger Google Authenticator på mobiltelefonen din. Nedenfor ser du to QR-koder. Den rette er din nåværende hemmelighet. På venstre side kan du angi en ny hemmelighet. Hvis du angir en ny hemmelighet, må du huske å skanne den på nytt med Google Authenticator.',
 '2_fact_auth_secret' => 'Hemmelig',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => 'Godkjenn',
 'access_control' => 'Adgangskontroll',
 'access_control_is_off' => 'Avansert adgangskontroll er deaktivert',
@@ -1151,7 +1158,7 @@ URL: [url]',
 'revision_request_email_subject' => '[sitename]: [name] - Korrektur forespørsel',
 'revision_status' => 'Status',
 'revision_submit_email_body' => 'Revisjon av sendt e-post emne',
-'revision_submit_email_subject' => 'Revisjon av sendt e-post emne',
+'revision_submit_email_subject' => '[sitename]: [name] - Revisjon av sendt e-post emne',
 'revision_summary' => 'Korrektur sammendrag',
 'revisors' => 'Korrekturlesere',
 'revisor_already_assigned' => 'Bruker er allerede tilordnet som korrekturleser.',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index fe08544a9..c58a88aa2 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -25,6 +25,13 @@ $text = array(
 '2_factor_auth' => '2-factor-authenticatie',
 '2_factor_auth_info' => 'Dit systeem werkt met 2-factor-authenticatie. U heeft de Google Authenticator nodig op uf mobiele telfoon. Hieronder staan 2 QR-codes. De rechter is uw huidige geheime code. Met de linker kunt u een nieuwe geheime code instellen. Denk erom de nieuwe code opnieuw te scannen met Googke Authenticator.',
 '2_fact_auth_secret' => 'Toegangscode 2-factor-authenticatie',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => 'Accepteren',
 'access_control' => 'Toegangscontrole',
 'access_control_is_off' => 'Toegangscontrole staat uit',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index b6659034c..fb329140d 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -19,12 +19,19 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1455), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (1456), netixw (84), romi (93), uGn (112)
 
 $text = array(
 '2_factor_auth' => 'Uwierzytelnianie dwuetapowe',
 '2_factor_auth_info' => 'Uwierzytelnianie dwuetapowe',
 '2_fact_auth_secret' => 'Uwierzytelnianie dwuetapowe poufny kod',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => 'Akceptuj',
 'access_control' => 'Kontrola dostępu',
 'access_control_is_off' => 'Kontrola dostepu jest wyłączona',
@@ -161,7 +168,7 @@ URL: [url]',
 'attrdef_type_email' => 'Email',
 'attrdef_type_float' => 'Liczna zmiennoprzecinkowa',
 'attrdef_type_folder' => '',
-'attrdef_type_group' => '',
+'attrdef_type_group' => 'Grupa',
 'attrdef_type_int' => 'Liczba całkowita',
 'attrdef_type_string' => 'Ciąg znaków',
 'attrdef_type_url' => 'URL',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 7725ace29..a1d85f234 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -19,12 +19,19 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1843), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (1844), flaviove (627), lfcristofoli (352)
 
 $text = array(
 '2_factor_auth' => 'Autenticação de dois fatores',
 '2_factor_auth_info' => 'Este sistema impõe a autenticação de 2 fatores. Você precisará do Google Authenticator no seu celular. Abaixo você vê dois códigos QR. O caminho certo é o seu atual segredo. À esquerda, você pode definir um novo segredo. Se você definir um novo segredo, verifique novamente com o Google Authenticator.',
 '2_fact_auth_secret' => 'Segredo',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => 'Aceitar',
 'access_control' => 'Controle de acesso',
 'access_control_is_off' => 'O controle de acesso avançado está desativado.',
@@ -1155,7 +1162,7 @@ URL: [url]',
 'revision_request_email_subject' => '[sitename]: [name] - solicitação de revisão',
 'revision_status' => 'Estado',
 'revision_submit_email_body' => 'revisão enviar corpo do e-mail',
-'revision_submit_email_subject' => 'Revisão enviar assunto de e-mail',
+'revision_submit_email_subject' => '[sitename]: [name] - Revisão enviar assunto de e-mail',
 'revision_summary' => 'Resumo das revisões',
 'revisors' => 'Revisores',
 'revisor_already_assigned' => 'O usuário já está designado como revisor.',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 72933b3e4..caad21606 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -25,6 +25,13 @@ $text = array(
 '2_factor_auth' => '',
 '2_factor_auth_info' => '',
 '2_fact_auth_secret' => '',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => 'Accept',
 'access_control' => 'Controlul accesului',
 'access_control_is_off' => '',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 509a18fbd..05a0257b4 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -19,12 +19,19 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1703)
+//    Translators: Admin (1704)
 
 $text = array(
 '2_factor_auth' => 'Двухфакторная аутентификация',
 '2_factor_auth_info' => 'Использовать усиленную проверку подлинности',
 '2_fact_auth_secret' => 'Кдюч двухфакторной аутентификации',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => 'Принять',
 'access_control' => 'Контроль достпуа',
 'access_control_is_off' => 'Контроль достпуа отключен',
@@ -136,7 +143,7 @@ URL: [url]',
 'approver_already_assigned' => 'Пользователь уже назначен в качестве утверждающего.',
 'approver_already_removed' => 'Утверждающий уже удален из процесса утверждения или уже оставил утверждение.',
 'april' => 'Апрель',
-'archive' => '',
+'archive' => 'Архив',
 'archive_creation' => 'Создать архив',
 'archive_creation_warning' => 'Эта операция создаст архив, содержащий все каталоги. После создания архив будет сохранен в каталоге данных сервера.<br><b>Внимание:</b> архив созданный как понятный человеку, будет непригоден в качестве резервной копии для восстановления!',
 'ar_EG' => 'Arabic',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index e38dc6a35..f9d1cb683 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -25,6 +25,13 @@ $text = array(
 '2_factor_auth' => '2-faktorové overovanie',
 '2_factor_auth_info' => 'This system enforces 2 factor authentication. You will need the Google Authenticator on your mobile phone. Below you see two QR codes. The right one is your current secret. On the left you can set a new secret. If you set a new secret make sure to rescan it with Google Authenticator.',
 '2_fact_auth_secret' => 'Tajný',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => 'Prijať',
 'access_control' => 'Kontrola prístupu',
 'access_control_is_off' => 'Pokročilá kontrola prístupu je vypnutá',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 9ffb5987e..fdd4bcfaf 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -26,6 +26,13 @@ $text = array(
 '2_factor_auth_info' => 'För stöd av 2-faktors autentisering behöver du Google Authenticator installerad på din mobiltelefon.
 Nedan ser du två QR-koder. Den högra är din hemliga kod och till vänster kan du skapa en ny kod. Om du skapar en ny kod måste du skanna den på nytt med Google Authenticator.',
 '2_fact_auth_secret' => 'Hemlighet',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => 'Godkänn',
 'access_control' => 'Åtkomstkontroll',
 'access_control_is_off' => 'Avancerad åtkomstkontroll är inaktiverad',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 2e3425a7c..87137fc6a 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -19,12 +19,19 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1114), aydin (83)
+//    Translators: Admin (1119), aydin (83)
 
 $text = array(
 '2_factor_auth' => 'İki faktörlü yetkilendirme',
 '2_factor_auth_info' => '',
 '2_fact_auth_secret' => '',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => 'Kabul',
 'access_control' => 'Erişim Kontrolü',
 'access_control_is_off' => '',
@@ -322,7 +329,7 @@ URL: [url]',
 'current_version' => 'Mevcut versiyon',
 'daily' => 'Günlük',
 'databasesearch' => 'Veritabanı arama',
-'database_schema_version' => '',
+'database_schema_version' => 'Veritabanı tasarım sürümü',
 'data_loading' => 'Lütfen veriler yüklenene kadar bekleyin…',
 'date' => 'Tarih',
 'days' => 'gün',
@@ -685,7 +692,7 @@ URL: [url]',
 'inherits_access_copy_msg' => 'Devralınan erişim listesini kopyala',
 'inherits_access_empty_msg' => 'Boş erişim listesiyle başla',
 'inherits_access_msg' => 'Erişim devralınıyor',
-'installed_php_extensions' => '',
+'installed_php_extensions' => 'Kurulu php eklentileri',
 'internal_error' => 'İç hata',
 'internal_error_exit' => 'İç hata. İstek tamamlanmadı.',
 'invalid_access_mode' => 'Gereçsiz Erişim Modu',
@@ -802,7 +809,7 @@ URL: [url]',
 'missing_checksum' => 'Sağlama toplamı eksik',
 'missing_file' => '',
 'missing_filesize' => 'Dosya boyutu eksik',
-'missing_php_extensions' => '',
+'missing_php_extensions' => 'Eksik php eklentileri',
 'missing_reception' => '',
 'missing_request_object' => '',
 'missing_transition_user_group' => 'Geçiş için kullanıcı/grup bilgisi eksik',
@@ -882,7 +889,7 @@ URL: [url]',
 'no_approval_needed' => 'Onay bekleyen yok.',
 'no_attached_files' => 'Ek dosya yok',
 'no_attribute_definitions' => '',
-'no_backup_dir' => '',
+'no_backup_dir' => 'Yedekleme dizini belirlenmedi',
 'no_current_version' => 'Kullandığınız SeedDMS versiyonu eski görünüyor. Son versiyon [latestversion].',
 'no_default_keywords' => 'Anahtar kelime yok',
 'no_docs_checked_out' => '',
@@ -1183,7 +1190,7 @@ URL: [url]',
 'search_results_access_filtered' => 'Arama sonuçları içerisinde erişimin kısıtlandığı içerik bulunabilir.',
 'search_time' => 'Arama süresi: [time] sn.',
 'seconds' => 'saniye',
-'seeddms_info' => '',
+'seeddms_info' => 'SeedDMS hakkında bilgi',
 'seeddms_version' => 'SeedDMS Sürümü',
 'selection' => 'Seçim',
 'select_attrdefgrp_show' => '',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 332a8933d..3389534b2 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -25,6 +25,13 @@ $text = array(
 '2_factor_auth' => '',
 '2_factor_auth_info' => '',
 '2_fact_auth_secret' => '',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => 'Прийняти',
 'access_control' => '',
 'access_control_is_off' => '',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index d1f6f9b26..17ffb0e6a 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -25,6 +25,13 @@ $text = array(
 '2_factor_auth' => '双重认证',
 '2_factor_auth_info' => '该系统启用双重认证。您需要在手机上进行 Google 认证。下面你会看到两个 QR 码。正确的是你目前的密码。在左边你可以设置一个新的密码。如果您设置了新的密码，请重新扫描并通过 Google 认证。',
 '2_fact_auth_secret' => '双重认证密码',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => '接受',
 'access_control' => '访问控制',
 'access_control_is_off' => '高级访问控制已关闭',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 01fae5c39..22b7dfc37 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -25,6 +25,13 @@ $text = array(
 '2_factor_auth' => '2階段認證',
 '2_factor_auth_info' => '此系統強制執行2階段身份驗證。您將需要在手機上使用Google Authenticator。在下面，您可以看到兩個QR碼。正確的是您當前的秘密。在左側，您可以設置一個新的秘密。如果您設置了新的機密，請確保使用Google Authenticator重新掃描它。',
 '2_fact_auth_secret' => '秘密',
+'abbr_day' => '',
+'abbr_hour' => '',
+'abbr_minute' => '',
+'abbr_month' => '',
+'abbr_second' => '',
+'abbr_week' => '',
+'abbr_year' => '',
 'accept' => '接受',
 'access_control' => '存取控制',
 'access_control_is_off' => '進階存取控制(ACL)關閉',

From f70973e80d17be3850ebf1d06284f4bd22203a87 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 7 Dec 2020 20:43:27 +0100
Subject: [PATCH 271/312] translate phrases in getPeriodOfTime()

---
 inc/inc.Utils.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index fe42e9253..49cef3443 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -53,19 +53,19 @@ function getPeriodOfTime($timestamp) { /* {{{ */
 	$time = time() - $timestamp; // to get the time since that moment
 	$time = ($time<1)? 1 : $time;
 	$tokens = array (
-		31536000 => getMLText('abbr_year'),
-		2592000 => getMLText('abbr_month'),
-		604800 => getMLText('abbr_week'),
-		86400 => getMLText('abbr_day'),
-		3600 => getMLText('abbr_hour'),
-		60 => getMLText('abbr_minute'),
-		1 => getMLText('abbr_second')
+		31536000 => 'abbr_year',
+		2592000 => 'abbr_month',
+		604800 => 'abbr_week',
+		86400 => 'abbr_day',
+		3600 => 'abbr_hour',
+		60 => 'abbr_minute',
+		1 => 'abbr_second'
 	);
 
 	foreach ($tokens as $unit => $text) {
 		if ($time < $unit) continue;
 		$numberOfUnits = floor($time / $unit);
-		return $numberOfUnits.' '.$text.(($numberOfUnits>1)?'s':'');
+		return $numberOfUnits.' '.(($numberOfUnits>1) ? getMLText($text):getMLText($text));
 	}
 } /* }}} */
 

From 7162a2b2e153b94fbb31a03e00d9a12c3858f0ce Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 9 Dec 2020 17:35:39 +0100
Subject: [PATCH 272/312] check if session exists in globalNavigation()

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 449f1a7ff..36acbae13 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -308,7 +308,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "     <span class=\"fa fa-bars\"></span>\n";
 		echo "   </a>\n";
 		echo "   <a class=\"brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['rootfolderid']."\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n";
-		if(isset($this->params['user']) && $this->params['user']) {
+		if(isset($this->params['session']) && isset($this->params['user']) && $this->params['user']) {
 			echo "   <div class=\"nav-collapse nav-col1\">\n";
 			echo "   <ul id=\"main-menu-admin\" class=\"nav pull-right\">\n";
 			echo "    <li class=\"dropdown\">\n";

From 4b4595181bd098d71407bfbaf67994da22f23822 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 9 Dec 2020 19:54:31 +0100
Subject: [PATCH 273/312] move preview of attachments into controller

---
 controllers/class.Preview.php | 32 ++++++++++++++++++++++++++++++++
 op/op.Preview.php             | 17 +++++++++++++++--
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/controllers/class.Preview.php b/controllers/class.Preview.php
index e0cc065f2..688ed7a0a 100644
--- a/controllers/class.Preview.php
+++ b/controllers/class.Preview.php
@@ -72,6 +72,38 @@ class SeedDMS_Controller_Preview extends SeedDMS_Controller_Common {
 					$previewer->getPreview($content);
 				}
 				break;
+			case "file":
+				$object = $this->params['object'];
+				$document = $this->params['document'];
+				$width = $this->params['width'];
+				if (!is_object($object)) {
+					$this->errormsg = 'invalid_version';
+					return false;
+				}
+
+				if(null === $this->callHook('file')) {
+					if($width)
+						$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $width, $settings->_cmdTimeout);
+					else
+						$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
+					$previewer->setConverters($settings->_converters['preview']);
+					$previewer->setXsendfile($settings->_enableXsendfile);
+
+					if(!$previewer->hasPreview($object)) {
+						add_log_line("");
+						if(!$previewer->createPreview($object)) {
+							add_log_line("", PEAR_LOG_ERR);
+						}
+					}
+					if(!$previewer->hasPreview($object)) {
+						header('Content-Type: image/svg+xml');
+						readfile('../views/'.$theme.'/images/empty.svg');
+						exit;
+					}
+					header('Content-Type: image/png');
+					$previewer->getPreview($object);
+				}
+				break;
 		}
 		return true;
 	}
diff --git a/op/op.Preview.php b/op/op.Preview.php
index 5b1fed579..da3c11a9a 100644
--- a/op/op.Preview.php
+++ b/op/op.Preview.php
@@ -64,7 +64,9 @@ if(isset($_GET['version'])) {
 	$controller->setParam('version', $version);
 	$controller->setParam('type', 'version');
 	if(!$controller->run()) {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
+		header('Content-Type: image/svg+xml');
+		readfile('../views/'.$theme.'/images/empty.svg');
+		exit;
 	}
 	exit;
 } elseif(isset($_GET['file'])) {
@@ -72,10 +74,21 @@ if(isset($_GET['version'])) {
 	if (!is_numeric($file) || intval($file)<1)
 		exit;
 	$object = $document->getDocumentFile($file);
+	$controller->setParam('width', !empty($_GET["width"]) ? $_GET["width"] : null);
+	$controller->setParam('document', $document);
+	$controller->setParam('object', $object);
+	$controller->setParam('type', 'file');
+	if(!$controller->run()) {
+		header('Content-Type: image/svg+xml');
+		readfile('../views/'.$theme.'/images/empty.svg');
+		exit;
+	}
+	exit;
 } else {
 	exit;
 }
 
+/* From here on old code which isn't used anymore
 if (!is_object($object)) {
 	exit;
 }
@@ -98,5 +111,5 @@ if(!$previewer->hasPreview($object)) {
 }
 header('Content-Type: image/png');
 $previewer->getPreview($object);
-
+ */
 ?>

From 063b950b3a159940f44d419ee73143fe4dea83de Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 9 Dec 2020 19:54:58 +0100
Subject: [PATCH 274/312] add fold marks

---
 op/op.ViewOnline.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/op/op.ViewOnline.php b/op/op.ViewOnline.php
index 79cdef8da..ef15a0a7d 100644
--- a/op/op.ViewOnline.php
+++ b/op/op.ViewOnline.php
@@ -46,7 +46,7 @@ if ($document->getAccessMode($user) < M_READ) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
 
-if(isset($_GET["version"])) {
+if(isset($_GET["version"])) { /* {{{ */
 	$version = $_GET["version"];
 
 	if (!is_numeric($version)) {
@@ -59,7 +59,8 @@ if(isset($_GET["version"])) {
 	if(!$controller->run()) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 	}
-} elseif(isset($_GET["file"])) {
+} /* }}} */
+elseif(isset($_GET["file"])) { /* {{{ */
 	$fileid = $_GET["file"];
 
 	if (!is_numeric($fileid) || intval($fileid)<1) {
@@ -83,7 +84,7 @@ if(isset($_GET["version"])) {
 
 	ob_clean();
 	readfile($dms->contentDir . $file->getPath());
-}
+} /* }}} */
 
 add_log_line();
 exit;

From 19bb70af406da1e9f520a9a12bde00f78257f08f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 10 Dec 2020 13:47:00 +0100
Subject: [PATCH 275/312] reindex document after editing it

---
 controllers/class.EditDocument.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/controllers/class.EditDocument.php b/controllers/class.EditDocument.php
index d84ceae8d..c344df0a1 100644
--- a/controllers/class.EditDocument.php
+++ b/controllers/class.EditDocument.php
@@ -26,6 +26,7 @@ class SeedDMS_Controller_EditDocument extends SeedDMS_Controller_Common {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$settings = $this->params['settings'];
+		$fulltextservice = $this->params['fulltextservice'];
 		$document = $this->params['document'];
 		$name = $this->params['name'];
 
@@ -156,6 +157,14 @@ class SeedDMS_Controller_EditDocument extends SeedDMS_Controller_Common {
 				}
 			}
 
+			if($fulltextservice && ($index = $fulltextservice->Indexer()) && $document) {
+				$idoc = $fulltextservice->IndexedDocument($document);
+				if(false !== $this->callHook('preIndexDocument', $document, $idoc)) {
+					$index->addDocument($idoc);
+					$index->commit();
+				}
+			}
+ 
 			if(!$this->callHook('postEditDocument')) {
 			}
 

From 46264c49d6422ff9d10126fa0ec88902eea6e44d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 10 Dec 2020 13:47:44 +0100
Subject: [PATCH 276/312] pass fulltextservice to controller

---
 op/op.EditDocument.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php
index 9854e28ca..2911cbbe9 100644
--- a/op/op.EditDocument.php
+++ b/op/op.EditDocument.php
@@ -121,6 +121,7 @@ foreach($document->getAttributes() as $ai=>$aa)
 	$oldattributes[$ai] = clone $aa;
 //$oldattributes = $document->getAttributes();
 
+$controller->setParam('fulltextservice', $fulltextservice);
 $controller->setParam('document', $document);
 $controller->setParam('name', $name);
 $controller->setParam('comment', $comment);

From 401ecf11146d0cb3736c01aaa8155c5a18ce9abb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 10 Dec 2020 13:48:29 +0100
Subject: [PATCH 277/312] add mouseover and mouseleave events for
 dropfoldermenu

---
 styles/bootstrap/application.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 1e8b7ae84..9bf2afabe 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -1231,6 +1231,14 @@ $(document).ready(function() { /* {{{ */
 		$(this).parent().hide();
 		e.stopPropagation();
 	});
+
+	$("body").on("mouseenter", "#main-menu-dropfolderlist ul.dropdown-menu li a", function(e) {
+		$(e.currentTarget).find('.dropfolder-menu-img').css('display', 'inline');
+	});
+	$("body").on("mouseleave", "#main-menu-dropfolderlist ul.dropdown-menu li a", function(e) {
+		$(e.currentTarget).find('.dropfolder-menu-img').hide();
+	});
+
 }); /* }}} */
 
 (function( SeedDMSTask, $, undefined ) { /* {{{ */

From 0aad307607990a605d129b18957a077571cb031c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 10 Dec 2020 13:49:15 +0100
Subject: [PATCH 278/312] do not make nodes in tree selectable, unfold if
 clicked on a folder

---
 views/bootstrap/class.Bootstrap.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 36acbae13..9f46a82c5 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -192,7 +192,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			$this->addFooterJS('SeedDMSTask.run();');
 		}
 		if($this->params['enabledropfolderlist'] && isset($this->params['user']) && $this->params['user']) {
-			$this->addFooterJS("SeedDMSTask.add({name: 'dropfolder', interval: 15, func: function(){\$('#menu-dropfolder > div.ajax').trigger('update', {folderid: seeddms_folder});}});");
+			$this->addFooterJS("SeedDMSTask.add({name: 'dropfolder', interval: 30, func: function(){\$('#menu-dropfolder > div.ajax').trigger('update', {folderid: seeddms_folder});}});");
 		}
 		if($this->footerjs) {
 			$jscode = "$(document).ready(function () {\n";
@@ -1935,7 +1935,7 @@ $(function() {
 	const $tree = $('#jqtree<?php echo $formid ?>');
 	$tree.tree({
 //		saveState: false,
-		selectable: true,
+		selectable: false,
 		data: data,
 		saveState: 'jqtree<?php echo $formid; ?>',
 		openedIcon: $('<i class="fa fa-minus-circle"></i>'),
@@ -1970,8 +1970,8 @@ $(function() {
 			if(!node)
 				return;
 			if(node.is_folder) {
-<?php if($showdocs) { ?>
 				$('#jqtree<?php echo $formid ?>').tree('openNode', node);
+<?php if($showdocs) { ?>
 //			event.preventDefault();
 				if(typeof node.fetched == 'undefined') {
 					node.fetched = true;

From ad6f8b5ff12c49c06d29510ad206c368cd827e41 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 10 Dec 2020 13:50:21 +0100
Subject: [PATCH 279/312] show image in dropfoldermenu after mouseover, make
 menu 400px wide

---
 views/bootstrap/class.DropFolderChooser.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.DropFolderChooser.php b/views/bootstrap/class.DropFolderChooser.php
index 68ba7d4b1..3fc9f7766 100644
--- a/views/bootstrap/class.DropFolderChooser.php
+++ b/views/bootstrap/class.DropFolderChooser.php
@@ -85,10 +85,10 @@ $('.folderselect').click(function(ev) {
 							if($previewwidth) {
 								$previewer->createRawPreview($dir.'/'.$entry, 'dropfolder/', $mimetype);
 								if($previewer->hasRawPreview($dir.'/'.$entry, 'dropfolder/')) {
-									$filecontent .= "<div style=\"float: left; display:inline; width:40px; max-height:40px;overflow:hidden;\"><img filename=\"".$entry."\" width=\"".$previewwidth."\" src=\"../op/op.DropFolderPreview.php?filename=".$entry."&width=".$previewwidth."\" title=\"".htmlspecialchars($mimetype)."\"></div>";
+									$filecontent .= "<div class=\"dropfolder-menu-img\" style=\"_float: left; display: none; _width:40px; _max-height:40px;overflow:hidden;\"><img filename=\"".$entry."\" width=\"".$previewwidth."\" src=\"../op/op.DropFolderPreview.php?filename=".$entry."&width=".$previewwidth."\" title=\"".htmlspecialchars($mimetype)."\"></div>";
 								}
 							}
-							$filecontent .= "<div style=\"margin-left:10px; margin-right: 40px; display:inline-block;\">".$entry."<br /><span style=\"font-size: 85%;\">".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry)).", ".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."</span></div></a></li>\n";
+							$filecontent .= "<div class=\"dropfolder-menu-text\" style=\"margin-left:10px; margin-right: 10px; display:inline-block;\">".$entry."<br /><span style=\"font-size: 85%;\">".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry)).", ".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."</span></div></a></li>\n";
 						} elseif($showfolders && is_dir($dir.'/'.$entry)) {
 							$filecontent .= "<li><a _href=\"\">".$entry."</a></li>";
 						}
@@ -101,7 +101,7 @@ $('.folderselect').click(function(ev) {
 			$content .= "   <ul id=\"main-menu-dropfolderlist\" class=\"nav pull-right\">\n";
 			$content .= "    <li class=\"dropdown add-dropfolderlist-area\">\n";
 			$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-dropfolderlist-area\">".getMLText('menu_dropfolder')." (".$c.") <i class=\"fa fa-caret-down\"></i></a>\n";
-			$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+			$content .= "     <ul class=\"dropdown-menu\" role=\"menu\" style=\"width: 400px;\">\n";
 			$content .= $filecontent;
 			$content .= "     </ul>\n";
 			$content .= "    </li>\n";

From f79eadf9b63bac29453a96f35480be56d1632b74 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 10 Dec 2020 13:51:00 +0100
Subject: [PATCH 280/312] add changes for 5.1.21

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index bf7c03cbe..0cfa88c81 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,8 @@
   folderid wasn't checked propperly for being an integer (CVE-2020-28727)
 - output format for dates can be configured
 - add filter function to notification service
+- reindex document after it was edited
+- show preview images in drop folder menu after mouse over
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.20

From e3d7a6f4643d6316b71515a9b3a63f6e04d49ad4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 11 Dec 2020 09:13:04 +0100
Subject: [PATCH 281/312] show path and name of selected doc/folder in
 doc/folder chooser as title

---
 views/bootstrap/class.Bootstrap.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 4b35c29e0..2421f5d96 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1471,13 +1471,13 @@ $(document).ready(function() {
 		$content = '';
 		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
 		$content .= "<div class=\"input-append\">\n";
-		$content .= "<input type=\"text\" id=\"choosedocsearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"docname".$formid."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" />";
+		$content .= "<input type=\"text\" id=\"choosedocsearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"docname".$formid."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\"".($default ? ' title="'.htmlspecialchars($default->getFolder()->getFolderPathPlain().' / '.$default->getName()).'"' : '')." />";
 		$content .= "<button type=\"button\" class=\"btn\" id=\"cleardocument".$form."\" data-target=\"".$formid."\"><i class=\"fa fa-remove\"></i></button>";
 		if(!$skiptree)
 			$content .= $this->getModalBoxLink(
 				array(
 					'target' => 'docChooser'.$formid,
-					'remote' => "out.DocumentChooser.php?form=".$formid."&folderid=".$folderid."&partialtree=".$partialtree,
+					'remote' => "../out/out.DocumentChooser.php?form=".$formid."&folderid=".$folderid."&partialtree=".$partialtree,
 					'title' => getMLText('document')
 				));
 		$content .= "</div>\n";
@@ -1535,7 +1535,7 @@ function folderSelected<?php echo $formid ?>(id, name) {
 		$content = '';
 		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
 		$content .= "<div class=\"input-append\">\n";
-		$content .= "<input type=\"text\" id=\"choosefoldersearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"targetname".$formid."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" target=\"".$formid."\"/>";
+		$content .= "<input type=\"text\" id=\"choosefoldersearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"targetname".$formid."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" target=\"".$formid."\"".($default ? ' title="'.htmlspecialchars($default->getFolderPathPlain()).'"' : '')."/>";
 		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfolder".$formid."\" data-target=\"".$formid."\"><i class=\"fa fa-remove\"></i></button>";
 		if(!$skiptree) {
 			$content .= $this->getModalBoxLink(

From 120ab5a0a99457d063fe5ac29a96ae685e5a621a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 11 Dec 2020 09:13:04 +0100
Subject: [PATCH 282/312] show path and name of selected doc/folder in
 doc/folder chooser as title

---
 views/bootstrap/class.Bootstrap.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 9f46a82c5..7bd063883 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1290,7 +1290,7 @@ $(document).ready(function() {
 		$content = '';
 		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
 		$content .= "<div class=\"input-append\">\n";
-		$content .= "<input type=\"text\" id=\"choosedocsearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"docname".$formid."\"value=\"" . (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" />";
+		$content .= "<input type=\"text\" id=\"choosedocsearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"docname".$formid."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\"".($default ? ' title="'.htmlspecialchars($default->getFolder()->getFolderPathPlain().' / '.$default->getName()).'"' : '')." />";
 		$content .= "<button type=\"button\" class=\"btn\" id=\"cleardocument".$form."\" data-target=\"".$formid."\"><i class=\"fa fa-remove\"></i></button>";
 		if(!$skiptree)
 			$content .= $this->getModalBoxLink(
@@ -1354,7 +1354,7 @@ function folderSelected<?php echo $formid ?>(id, name) {
 		$content = '';
 		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
 		$content .= "<div class=\"input-append\">\n";
-		$content .= "<input type=\"text\" id=\"choosefoldersearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"targetname".$formid."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" target=\"".$formid."\"/>";
+		$content .= "<input type=\"text\" id=\"choosefoldersearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"targetname".$formid."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" target=\"".$formid."\"".($default ? ' title="'.htmlspecialchars($default->getFolderPathPlain()).'"' : '')."/>";
 		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfolder".$formid."\" data-target=\"".$formid."\"><i class=\"fa fa-remove\"></i></button>";
 		if(!$skiptree) {
 			$content .= $this->getModalBoxLink(

From 858b01fac1d0841e5c773b86671e60c9dfa15092 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 11 Dec 2020 09:27:42 +0100
Subject: [PATCH 283/312] rename hash for footerjs into hashjs

---
 views/bootstrap/class.Bootstrap.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 7bd063883..beaf80089 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -208,7 +208,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				file_put_contents($this->params['cachedir'].'/js/'.$hashjs.'.js', $jscode);
 			}
 			$tmp['action'] = 'footerjs';
-			$tmp['hash'] = $hashjs;
+			$tmp['hashjs'] = $hashjs;
 			echo '<script src="'.$this->params['absbaseprefix'].'out/out.'.$this->params['class'].'.php?'.http_build_query($tmp).'"></script>'."\n";
 		}
 		if(method_exists($this, 'js')) {
@@ -234,8 +234,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 	function footerjs() { /* {{{ */
 		header('Content-Type: application/javascript');
-		if(file_exists($this->params['cachedir'].'/js/'.$_GET['hash'].'.js')) {
-			readfile($this->params['cachedir'].'/js/'.$_GET['hash'].'.js');
+		if(file_exists($this->params['cachedir'].'/js/'.$_GET['hashjs'].'.js')) {
+			readfile($this->params['cachedir'].'/js/'.$_GET['hashjs'].'.js');
 		}
 	} /* }}} */
 

From b65c62e37084960ff83b253db039bf467375bd24 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 12 Dec 2020 15:57:14 +0100
Subject: [PATCH 284/312] fix error when checking for manager

---
 SeedDMS_Core/Core/inc.ClassGroup.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Core/Core/inc.ClassGroup.php b/SeedDMS_Core/Core/inc.ClassGroup.php
index d9bd39069..5be182a7c 100644
--- a/SeedDMS_Core/Core/inc.ClassGroup.php
+++ b/SeedDMS_Core/Core/inc.ClassGroup.php
@@ -220,6 +220,7 @@ class SeedDMS_Core_Group { /* {{{ */
 
 		$managers = array();
 
+		$classnamerole = $this->_dms->getClassname('role');
 		$classname = $this->_dms->getClassname('user');
 		foreach ($resArr as $row) {
 			/** @var SeedDMS_Core_User $user */

From f02e0ca97741667d99377017f734030838dcbba1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 12 Dec 2020 16:26:21 +0100
Subject: [PATCH 285/312] add more documentation

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 5a0d00bcc..343b0c94b 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2460,6 +2460,12 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			$groupIDs = "";
 			$defAccess  = $this->getDefaultAccess();
 
+			/* Check if the default access is < read access or >= read access.
+			 * If default access is less than read access, then create a list
+			 * of users and groups with read access.
+			 * If default access is equal or greater then read access, then
+			 * create a list of users and groups without read access.
+			 */
 			if ($defAccess<M_READ) {
 				// Get the list of all users and groups that are listed in the ACL as
 				// having read access to the document.
@@ -2470,9 +2476,12 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 				// to the document.
 				$tmpList = $this->getAccessList(M_NONE, O_LTEQ);
 			}
+			/** @var SeedDMS_Core_GroupAccess $groupAccess */
 			foreach ($tmpList["groups"] as $groupAccess) {
 				$groupIDs .= (strlen($groupIDs)==0 ? "" : ", ") . $groupAccess->getGroupID();
 			}
+
+			/** @var SeedDMS_Core_UserAccess $userAccess */
 			foreach ($tmpList["users"] as $userAccess) {
 				$user = $userAccess->getUser();
 				if (!$listadmin && $user->isAdmin()) continue;
@@ -2504,7 +2513,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 					(strlen($userIDs) == 0 ? "" : " OR (`tblUsers`.`id` IN (". $userIDs ."))").
 					") ORDER BY `login`";
 			}
-			/* If default access is equal or greater then M_READ, $userIDs and
+			/* If default access is equal or greater than M_READ, $userIDs and
 			 * $groupIDs contains a list of user without read access
 			 */
 			else {

From f2c376cadca3ae0ef0a1c852866e74be542b657d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 12 Dec 2020 16:27:01 +0100
Subject: [PATCH 286/312] sync call of getReadAccessList() with
 SeedDMS_Core_Document::getReadAccessList()

---
 SeedDMS_Core/Core/inc.ClassFolder.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index 76d198db8..3602a4f54 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -1778,11 +1778,12 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 	 * administrators and the owner of the folder unless $listadmin resp.
 	 * $listowner is set to true.
 	 *
-	 * @param bool|int $listadmin if set to true any admin will be listed too
-	 * @param bool|int $listowner if set to true the owner will be listed too
+	 * @param boolean $listadmin if set to true any admin will be listed too
+	 * @param boolean $listowner if set to true the owner will be listed too
+	 * @param boolean $listguest if set to true any guest will be listed too
 	 * @return array list of users and groups
 	 */
-	function getReadAccessList($listadmin=0, $listowner=0) { /* {{{ */
+	function getReadAccessList($listadmin=0, $listowner=0, $listguest=0) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		if (!isset($this->_readAccessList)) {
@@ -1817,7 +1818,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 				$user = $userAccess->getUser();
 				if (!$listadmin && $user->isAdmin()) continue;
 				if (!$listowner && $user->getID() == $this->_ownerID) continue;
-				if ($user->isGuest()) continue;
+				if (!$listguest && $user->isGuest()) continue;
 				$userIDs .= (strlen($userIDs)==0 ? "" : ", ") . $userAccess->getUserID();
 			}
 
@@ -1844,7 +1845,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 					(strlen($userIDs) == 0 ? "" : " OR (`tblUsers`.`id` IN (". $userIDs ."))").
 					") ORDER BY `login`";
 			}
-			/* If default access is equal or greate then read, $userIDs and
+			/* If default access is equal or greater than M_READ, $userIDs and
 			 * $groupIDs contains a list of user without read access
 			 */
 			else {

From 82e5bf4687ad4e63dd9ed72a4e54755fa93cc6c3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 12 Dec 2020 16:27:53 +0100
Subject: [PATCH 287/312] add support for indexing folders, remove old
 predefined indexing commands

---
 SeedDMS_Lucene/Lucene/IndexedDocument.php     | 138 ++++++++-------
 SeedDMS_Lucene/Lucene/Search.php              |  13 +-
 SeedDMS_SQLiteFTS/SQLiteFTS/Document.php      |   3 +-
 .../SQLiteFTS/IndexedDocument.php             | 158 +++++++++---------
 SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php       |  42 ++++-
 SeedDMS_SQLiteFTS/SQLiteFTS/QueryHit.php      |   8 +-
 SeedDMS_SQLiteFTS/SQLiteFTS/Search.php        |  23 ++-
 SeedDMS_SQLiteFTS/SQLiteFTS/Term.php          |  23 +--
 8 files changed, 227 insertions(+), 181 deletions(-)

diff --git a/SeedDMS_Lucene/Lucene/IndexedDocument.php b/SeedDMS_Lucene/Lucene/IndexedDocument.php
index 03a164d94..91fee036e 100644
--- a/SeedDMS_Lucene/Lucene/IndexedDocument.php
+++ b/SeedDMS_Lucene/Lucene/IndexedDocument.php
@@ -91,7 +91,7 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 	 * Constructor. Creates our indexable document and adds all
 	 * necessary fields to it using the passed in document
 	 * @param SeedDMS_Core_DMS $dms
-	 * @param SeedDMS_Core_Document $document
+	 * @param SeedDMS_Core_Document|Folder $document
 	 * @param null $convcmd
 	 * @param bool $nocontent
 	 * @param int $timeout
@@ -100,44 +100,8 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 		$this->errormsg = '';
 		$this->cmd = '';
 		$this->mimetype = '';
-		$_convcmd = array(
-			'application/pdf' => 'pdftotext -enc UTF-8 -nopgbrk %s - |sed -e \'s/ [a-zA-Z0-9.]\{1\} / /g\' -e \'s/[0-9.]//g\'',
-			'application/postscript' => 'ps2pdf14 %s - | pdftotext -enc UTF-8 -nopgbrk - - | sed -e \'s/ [a-zA-Z0-9.]\{1\} / /g\' -e \'s/[0-9.]//g\'',
-			'application/msword' => 'catdoc %s',
-			'application/vnd.ms-excel' => 'ssconvert -T Gnumeric_stf:stf_csv -S %s fd://1',
-			'audio/mp3' => "id3 -l -R %s | egrep '(Title|Artist|Album)' | sed 's/^[^:]*: //g'",
-			'audio/mpeg' => "id3 -l -R %s | egrep '(Title|Artist|Album)' | sed 's/^[^:]*: //g'",
-			'text/plain' => 'cat %s',
-		);
-		if($convcmd) {
-			$_convcmd = $convcmd;
-		}
 
-		$version = $document->getLatestContent();
-		$this->addField(Zend_Search_Lucene_Field::Keyword('document_id', $document->getID()));
-		if($version) {
-			$this->addField(Zend_Search_Lucene_Field::Keyword('mimetype', $version->getMimeType()));
-			$this->addField(Zend_Search_Lucene_Field::Keyword('origfilename', $version->getOriginalFileName(), 'utf-8'));
-			if(!$nocontent)
-				$this->addField(Zend_Search_Lucene_Field::UnIndexed('created', $version->getDate()));
-			if($attributes = $version->getAttributes()) {
-				foreach($attributes as $attribute) {
-					$attrdef = $attribute->getAttributeDefinition();
-					if($attrdef->getValueSet() != '')
-						$this->addField(Zend_Search_Lucene_Field::Keyword('attr_'.str_replace(' ', '_', $attrdef->getName()), $attribute->getValue(), 'utf-8'));
-					else
-						$this->addField(Zend_Search_Lucene_Field::Text('attr_'.str_replace(' ', '_', $attrdef->getName()), $attribute->getValue(), 'utf-8'));
-				}
-			}
-		}
 		$this->addField(Zend_Search_Lucene_Field::Text('title', $document->getName(), 'utf-8'));
-		if($categories = $document->getCategories()) {
-			$names = array();
-			foreach($categories as $cat) {
-				$names[] = $cat->getName();
-			}
-			$this->addField(Zend_Search_Lucene_Field::Text('category', implode(' ', $names), 'utf-8'));
-		}
 		if($acllist = $document->getReadAccessList(1, 1, 1)) {
 			$allu = [];
 			foreach($acllist['users'] as $u)
@@ -159,49 +123,79 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 					$this->addField(Zend_Search_Lucene_Field::Text('attr_'.str_replace(' ', '_', $attrdef->getName()), $attribute->getValue(), 'utf-8'));
 			}
 		}
-
 		$owner = $document->getOwner();
 		$this->addField(Zend_Search_Lucene_Field::Text('owner', $owner->getLogin(), 'utf-8'));
-		if($keywords = $document->getKeywords()) {
-			$this->addField(Zend_Search_Lucene_Field::Text('keywords', $keywords, 'utf-8'));
-		}
 		if($comment = $document->getComment()) {
 			$this->addField(Zend_Search_Lucene_Field::Text('comment', $comment, 'utf-8'));
 		}
-		if($version) {
-			$status = $version->getStatus();
-			$this->addField(Zend_Search_Lucene_Field::Keyword('status', $status['status'], 'utf-8'));
-		}
-		if($version && !$nocontent) {
-			$path = $dms->contentDir . $version->getPath();
-			if(file_exists($path)) {
-				$content = '';
-				$mimetype = $version->getMimeType();
-				$this->mimetype = $mimetype;
-				$cmd = '';
-				$mimeparts = explode('/', $mimetype, 2);
-				if(isset($_convcmd[$mimetype])) {
-					$cmd = sprintf($_convcmd[$mimetype], $path);
-				} elseif(isset($_convcmd[$mimeparts[0].'/*'])) {
-					$cmd = sprintf($_convcmd[$mimetype], $path);
-				} elseif(isset($_convcmd['*'])) {
-					$cmd = sprintf($_convcmd[$mimetype], $path);
-				}
-				if($cmd) {
-					$this->cmd = $cmd;
-					try {
-						$content = self::execWithTimeout($cmd, $timeout);
-						if($content['stdout']) {
-							$this->addField(Zend_Search_Lucene_Field::UnStored('content', $content['stdout'], 'utf-8'));
-						}
-						if($content['stderr']) {
-							$this->errormsg = $content['stderr'];
-						}
-					} catch (Exception $e) {
+
+		if($document->isType('document')) {
+			$this->addField(Zend_Search_Lucene_Field::Keyword('document_id', 'D'.$document->getID()));
+			$version = $document->getLatestContent();
+			if($version) {
+				$this->addField(Zend_Search_Lucene_Field::Keyword('mimetype', $version->getMimeType()));
+				$this->addField(Zend_Search_Lucene_Field::Keyword('origfilename', $version->getOriginalFileName(), 'utf-8'));
+				if(!$nocontent)
+					$this->addField(Zend_Search_Lucene_Field::UnIndexed('created', $version->getDate()));
+				if($attributes = $version->getAttributes()) {
+					foreach($attributes as $attribute) {
+						$attrdef = $attribute->getAttributeDefinition();
+						if($attrdef->getValueSet() != '')
+							$this->addField(Zend_Search_Lucene_Field::Keyword('attr_'.str_replace(' ', '_', $attrdef->getName()), $attribute->getValue(), 'utf-8'));
+						else
+							$this->addField(Zend_Search_Lucene_Field::Text('attr_'.str_replace(' ', '_', $attrdef->getName()), $attribute->getValue(), 'utf-8'));
 					}
 				}
 			}
-		} 
+			if($categories = $document->getCategories()) {
+				$names = array();
+				foreach($categories as $cat) {
+					$names[] = $cat->getName();
+				}
+				$this->addField(Zend_Search_Lucene_Field::Text('category', implode(' ', $names), 'utf-8'));
+			}
+
+			if($keywords = $document->getKeywords()) {
+				$this->addField(Zend_Search_Lucene_Field::Text('keywords', $keywords, 'utf-8'));
+			}
+			if($version) {
+				$status = $version->getStatus();
+				$this->addField(Zend_Search_Lucene_Field::Keyword('status', $status['status'], 'utf-8'));
+			}
+			if($version && !$nocontent) {
+				$path = $dms->contentDir . $version->getPath();
+				if(file_exists($path)) {
+					$content = '';
+					$mimetype = $version->getMimeType();
+					$this->mimetype = $mimetype;
+					$cmd = '';
+					$mimeparts = explode('/', $mimetype, 2);
+					if(isset($convcmd[$mimetype])) {
+						$cmd = sprintf($convcmd[$mimetype], $path);
+					} elseif(isset($convcmd[$mimeparts[0].'/*'])) {
+						$cmd = sprintf($convcmd[$mimetype], $path);
+					} elseif(isset($convcmd['*'])) {
+						$cmd = sprintf($convcmd[$mimetype], $path);
+					}
+					if($cmd) {
+						$this->cmd = $cmd;
+						try {
+							$content = self::execWithTimeout($cmd, $timeout);
+							if($content['stdout']) {
+								$this->addField(Zend_Search_Lucene_Field::UnStored('content', $content['stdout'], 'utf-8'));
+							}
+							if($content['stderr']) {
+								$this->errormsg = $content['stderr'];
+							}
+						} catch (Exception $e) {
+						}
+					}
+				}
+			} 
+		} elseif($document->isType('folder')) {
+			$this->addField(Zend_Search_Lucene_Field::Keyword('document_id', 'F'.$document->getID()));
+			$this->addField(Zend_Search_Lucene_Field::UnIndexed('created', $document->getDate()));
+		}
 	} /* }}} */
 
 	public function getErrorMsg() { /* {{{ */
diff --git a/SeedDMS_Lucene/Lucene/Search.php b/SeedDMS_Lucene/Lucene/Search.php
index 9e6ef4c1b..330ceacc5 100644
--- a/SeedDMS_Lucene/Lucene/Search.php
+++ b/SeedDMS_Lucene/Lucene/Search.php
@@ -49,7 +49,18 @@ class SeedDMS_Lucene_Search {
 	 * @return object instance of SeedDMS_Lucene_Document of false
 	 */
 	function getDocument($id) { /* {{{ */
-		$hits = $this->index->find('document_id:'.$id);
+		$hits = $this->index->find('document_id:D'.$id);
+		return $hits ? $hits[0] : false;
+	} /* }}} */
+
+	/**
+	 * Get folder from index
+	 *
+	 * @param object $index lucene index
+	 * @return object instance of SeedDMS_Lucene_Document of false
+	 */
+	function getFolder($id) { /* {{{ */
+		$hits = $this->index->find('document_id:F'.$id);
 		return $hits ? $hits[0] : false;
 	} /* }}} */
 
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Document.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Document.php
index 7734848e5..956c8076c 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Document.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Document.php
@@ -44,7 +44,8 @@ class SeedDMS_SQLiteFTS_Document {
 	} /* }}} */
 
 	public function addField($key, $value) { /* {{{ */
-		if($key == 'document_id') {
+		//if($key == 'document_id') {
+		if($key == 'docid') {
 			$this->id = $this->fields[$key] = (int) $value;
 		} else {
 			if(isset($this->fields[$key]))
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
index 64383e3e3..fe567583d 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
@@ -94,62 +94,8 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 		$this->errormsg = '';
 		$this->cmd = '';
 		$this->mimetype = '';
-		$_convcmd = array(
-			'application/pdf' => 'pdftotext -enc UTF-8 -nopgbrk %s - |sed -e \'s/ [a-zA-Z0-9.]\{1\} / /g\' -e \'s/[0-9.]//g\'',
-			'application/postscript' => 'ps2pdf14 %s - | pdftotext -enc UTF-8 -nopgbrk - - | sed -e \'s/ [a-zA-Z0-9.]\{1\} / /g\' -e \'s/[0-9.]//g\'',
-			'application/msword' => 'catdoc %s',
-			'application/vnd.ms-excel' => 'ssconvert -T Gnumeric_stf:stf_csv -S %s fd://1',
-			'audio/mp3' => "id3 -l -R %s | egrep '(Title|Artist|Album)' | sed 's/^[^:]*: //g'",
-			'audio/mpeg' => "id3 -l -R %s | egrep '(Title|Artist|Album)' | sed 's/^[^:]*: //g'",
-			'text/plain' => 'cat %s',
-		);
-		if($convcmd) {
-			$_convcmd = $convcmd;
-		}
 
-		$version = $document->getLatestContent();
-		$this->addField('document_id', $document->getID());
-		if($version) {
-			$this->addField('mimetype', $version->getMimeType());
-			$this->addField('origfilename', $version->getOriginalFileName());
-			if(!$nocontent)
-				$this->addField('created', $version->getDate(), 'unindexed');
-			if($attributes = $version->getAttributes()) {
-				foreach($attributes as $attribute) {
-					$attrdef = $attribute->getAttributeDefinition();
-					if($attrdef->getValueSet() != '')
-						$this->addField('attr_'.str_replace(' ', '_', $attrdef->getName()), $attribute->getValue());
-					else
-						$this->addField('attr_'.str_replace(' ', '_', $attrdef->getName()), $attribute->getValue());
-				}
-			}
-		}
 		$this->addField('title', $document->getName());
-		if($categories = $document->getCategories()) {
-			$names = array();
-			foreach($categories as $cat) {
-				$names[] = $cat->getName();
-			}
-			$this->addField('category', implode(' ', $names));
-		}
-		if($attributes = $document->getAttributes()) {
-			foreach($attributes as $attribute) {
-				$attrdef = $attribute->getAttributeDefinition();
-				if($attrdef->getValueSet() != '')
-					$this->addField('attr_'.str_replace(' ', '_', $attrdef->getName()), $attribute->getValue());
-				else
-					$this->addField('attr_'.str_replace(' ', '_', $attrdef->getName()), $attribute->getValue());
-			}
-		}
-
-		$owner = $document->getOwner();
-		$this->addField('owner', $owner->getLogin());
-		if($keywords = $document->getKeywords()) {
-			$this->addField('keywords', $keywords);
-		}
-		if($comment = $document->getComment()) {
-			$this->addField('comment', $comment);
-		}
 		if($acllist = $document->getReadAccessList(1, 1, 1)) {
 			$allu = [];
 			foreach($acllist['users'] as $u)
@@ -162,39 +108,85 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 			$this->addField('groups', implode(' ', $allg));
 			 */
 		}
-		if($version) {
-			$status = $version->getStatus();
-			$this->addField('status', $status['status']+10);
+		if($attributes = $document->getAttributes()) {
+			foreach($attributes as $attribute) {
+				$attrdef = $attribute->getAttributeDefinition();
+				if($attrdef->getValueSet() != '')
+					$this->addField('attr_'.str_replace(' ', '_', $attrdef->getName()), $attribute->getValue());
+				else
+					$this->addField('attr_'.str_replace(' ', '_', $attrdef->getName()), $attribute->getValue());
+			}
 		}
-		if($version && !$nocontent) {
-			$path = $dms->contentDir . $version->getPath();
-			if(file_exists($path)) {
-				$content = '';
-				$mimetype = $version->getMimeType();
-				$this->mimetype = $mimetype;
-				$cmd = '';
-				$mimeparts = explode('/', $mimetype, 2);
-				if(isset($_convcmd[$mimetype])) {
-					$cmd = sprintf($_convcmd[$mimetype], $path);
-				} elseif(isset($_convcmd[$mimeparts[0].'/*'])) {
-					$cmd = sprintf($_convcmd[$mimetype], $path);
-				} elseif(isset($_convcmd['*'])) {
-					$cmd = sprintf($_convcmd[$mimetype], $path);
-				}
-				if($cmd) {
-					$this->cmd = $cmd;
-					try {
-						$content = self::execWithTimeout($cmd, $timeout);
-						if($content['stdout']) {
-							$this->addField('content', $content['stdout'], 'unstored');
-						}
-						if($content['stderr']) {
-							$this->errormsg = $content['stderr'];
-						}
-					} catch (Exception $e) {
+		$owner = $document->getOwner();
+		$this->addField('owner', $owner->getLogin());
+		if($comment = $document->getComment()) {
+			$this->addField('comment', $comment);
+		}
+
+		if($document->isType('document')) {
+			$this->addField('document_id', 'D'.$document->getID());
+			$version = $document->getLatestContent();
+			if($version) {
+				$this->addField('mimetype', $version->getMimeType());
+				$this->addField('origfilename', $version->getOriginalFileName());
+				if(!$nocontent)
+					$this->addField('created', $version->getDate(), 'unindexed');
+				if($attributes = $version->getAttributes()) {
+					foreach($attributes as $attribute) {
+						$attrdef = $attribute->getAttributeDefinition();
+						if($attrdef->getValueSet() != '')
+							$this->addField('attr_'.str_replace(' ', '_', $attrdef->getName()), $attribute->getValue());
+						else
+							$this->addField('attr_'.str_replace(' ', '_', $attrdef->getName()), $attribute->getValue());
 					}
 				}
 			}
+			if($categories = $document->getCategories()) {
+				$names = array();
+				foreach($categories as $cat) {
+					$names[] = $cat->getName();
+				}
+				$this->addField('category', implode(' ', $names));
+			}
+			if($keywords = $document->getKeywords()) {
+				$this->addField('keywords', $keywords);
+			}
+			if($version) {
+				$status = $version->getStatus();
+				$this->addField('status', $status['status']+10);
+			}
+			if($version && !$nocontent) {
+				$path = $dms->contentDir . $version->getPath();
+				if(file_exists($path)) {
+					$content = '';
+					$mimetype = $version->getMimeType();
+					$this->mimetype = $mimetype;
+					$cmd = '';
+					$mimeparts = explode('/', $mimetype, 2);
+					if(isset($convcmd[$mimetype])) {
+						$cmd = sprintf($convcmd[$mimetype], $path);
+					} elseif(isset($convcmd[$mimeparts[0].'/*'])) {
+						$cmd = sprintf($convcmd[$mimetype], $path);
+					} elseif(isset($convcmd['*'])) {
+						$cmd = sprintf($convcmd[$mimetype], $path);
+					}
+					if($cmd) {
+						$this->cmd = $cmd;
+						try {
+							$content = self::execWithTimeout($cmd, $timeout);
+							if($content['stdout']) {
+								$this->addField('content', $content['stdout'], 'unstored');
+							}
+							if($content['stderr']) {
+								$this->errormsg = $content['stderr'];
+							}
+						} catch (Exception $e) {
+						}
+					}
+				}
+			}
+		} elseif($document->isType('folder')) {
+			$this->addField('document_id', 'F'.$document->getID());
 		}
 	} /* }}} */
 
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
index 0682a7819..0f135b208 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
@@ -63,9 +63,9 @@ class SeedDMS_SQLiteFTS_Indexer {
 		 */
 		$version = SQLite3::version();
 		if($version['versionNumber'] >= 3008000)
-			$sql = 'CREATE VIRTUAL TABLE docs USING fts4(title, comment, keywords, category, mimetype, origfilename, owner, content, created, users, status, notindexed=created, matchinfo=fts3)';
+			$sql = 'CREATE VIRTUAL TABLE docs USING fts4(documentid, title, comment, keywords, category, mimetype, origfilename, owner, content, created, users, status, notindexed=created, matchinfo=fts3)';
 		else
-			$sql = 'CREATE VIRTUAL TABLE docs USING fts4(title, comment, keywords, category, mimetype, origfilename, owner, content, created, users, status, matchinfo=fts3)';
+			$sql = 'CREATE VIRTUAL TABLE docs USING fts4(documentid, title, comment, keywords, category, mimetype, origfilename, owner, content, created, users, status, matchinfo=fts3)';
 		$res = $index->_conn->exec($sql);
 		if($res === false) {
 			return null;
@@ -96,7 +96,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 		if(!$this->_conn)
 			return false;
 
-		$sql = "INSERT INTO docs (docid, title, comment, keywords, category, owner, content, mimetype, origfilename, created, users, status) VALUES(".$doc->getFieldValue('document_id').", ".$this->_conn->quote($doc->getFieldValue('title')).", ".$this->_conn->quote($doc->getFieldValue('comment')).", ".$this->_conn->quote($doc->getFieldValue('keywords')).", ".$this->_conn->quote($doc->getFieldValue('category')).", ".$this->_conn->quote($doc->getFieldValue('owner')).", ".$this->_conn->quote($doc->getFieldValue('content')).", ".$this->_conn->quote($doc->getFieldValue('mimetype')).", ".$this->_conn->quote($doc->getFieldValue('origfilename')).", ".(int)$doc->getFieldValue('created').", ".$this->_conn->quote($doc->getFieldValue('users')).", ".$this->_conn->quote($doc->getFieldValue('status'))/*time()*/.")";
+		$sql = "INSERT INTO docs (documentid, title, comment, keywords, category, owner, content, mimetype, origfilename, created, users, status) VALUES (".$this->_conn->quote($doc->getFieldValue('document_id')).", ".$this->_conn->quote($doc->getFieldValue('title')).", ".$this->_conn->quote($doc->getFieldValue('comment')).", ".$this->_conn->quote($doc->getFieldValue('keywords')).", ".$this->_conn->quote($doc->getFieldValue('category')).", ".$this->_conn->quote($doc->getFieldValue('owner')).", ".$this->_conn->quote($doc->getFieldValue('content')).", ".$this->_conn->quote($doc->getFieldValue('mimetype')).", ".$this->_conn->quote($doc->getFieldValue('origfilename')).", ".(int)$doc->getFieldValue('created').", ".$this->_conn->quote($doc->getFieldValue('users')).", ".$this->_conn->quote($doc->getFieldValue('status'))/*time()*/.")";
 		$res = $this->_conn->exec($sql);
 		if($res === false) {
 			return false;
@@ -150,7 +150,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 		$res = $this->_conn->query($sql);
 		$row = $res->fetch();
 
-		$sql = "SELECT docid FROM docs";
+		$sql = "SELECT docid, documentid FROM docs";
 		if($query)
 			$sql .= " WHERE docs MATCH ".$this->_conn->quote($query);
 		$res = $this->_conn->query($sql);
@@ -164,6 +164,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 			foreach($res as $rec) {
 				$hit = new SeedDMS_SQLiteFTS_QueryHit($this);
 				$hit->id = $rec['docid'];
+				$hit->documentid = $rec['documentid'];
 				$hits[] = $hit;
 			}
 		}
@@ -196,19 +197,21 @@ class SeedDMS_SQLiteFTS_Indexer {
 	/**
 	 * Get a single document from index
 	 *
-	 * @param integer $id id of document
+	 * @param integer $id id of index record
 	 * @return boolean false in case of an error, otherwise true
 	 */
 	public function getDocument($id) { /* {{{ */
 		if(!$this->_conn)
 			return false;
 
-		$sql = "SELECT title, comment, owner, keywords, category, mimetype, origfilename, created, users, status FROM docs WHERE docid=".(int) $id;
+		$sql = "SELECT docid, documentid, title, comment, owner, keywords, category, mimetype, origfilename, created, users, status FROM docs WHERE docid=".$id;
 		$res = $this->_conn->query($sql);
 		$doc = false;
 		if($res) {
 			$rec = $res->fetch(PDO::FETCH_ASSOC);
 			$doc = new SeedDMS_SQLiteFTS_Document();
+			$doc->addField('docid', $rec['docid']);
+			$doc->addField('document_id', $rec['documentid']);
 			$doc->addField('title', $rec['title']);
 			$doc->addField('comment', $rec['comment']);
 			$doc->addField('keywords', $rec['keywords']);
@@ -223,6 +226,33 @@ class SeedDMS_SQLiteFTS_Indexer {
 		return $doc;
 	} /* }}} */
 
+	/**
+	 * Get a single folder from index
+	 *
+	 * @param integer $id id of folder
+	 * @return boolean false in case of an error, otherwise true
+	 */
+	public function getFolder($id) { /* {{{ */
+		if(!$this->_conn)
+			return false;
+
+		$sql = "SELECT docid, documentid, title, comment, owner, keywords, category, mimetype, origfilename, created, users, status FROM docs WHERE documentid='F".$id."'";
+		$res = $this->_conn->query($sql);
+		$doc = false;
+		if($res) {
+			$rec = $res->fetch(PDO::FETCH_ASSOC);
+			$doc = new SeedDMS_SQLiteFTS_Document();
+			$doc->addField('docid', $rec['docid']);
+			$doc->addField('document_id', $rec['documentid']);
+			$doc->addField('title', $rec['title']);
+			$doc->addField('comment', $rec['comment']);
+			$doc->addField('owner', $rec['owner']);
+			$doc->addField('created', $rec['created']);
+			$doc->addField('users', $rec['users']);
+		}
+		return $doc;
+	} /* }}} */
+
 	/**
 	 * Return list of terms in index
 	 *
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/QueryHit.php b/SeedDMS_SQLiteFTS/SQLiteFTS/QueryHit.php
index d87486118..facbd9519 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/QueryHit.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/QueryHit.php
@@ -37,11 +37,17 @@ class SeedDMS_SQLiteFTS_QueryHit {
 	protected $_document;
 
 	/**
-	 * @var integer $id id of document
+	 * @var integer $id id of index document
 	 * @access public
 	 */
 	public $id;
 
+	/**
+	 * @var integer $id id of real document
+	 * @access public
+	 */
+	public $documentid;
+
 	/**
 	 *
 	 */
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
index 6a780e651..8f4fed509 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
@@ -43,14 +43,25 @@ class SeedDMS_SQliteFTS_Search {
 	} /* }}} */
 
 	/**
-	 * Get hit from index
+	 * Get document from index
 	 *
-	 * @param object $index lucene index
-	 * @return object instance of SeedDMS_Lucene_Document of false
+	 * @param int $id real document id
+	 * @return object instance of SeedDMS_SQliteFTS_QueryHit or false
 	 */
 	function getDocument($id) { /* {{{ */
-		$hits = $this->index->findById((int) $id);
-		return $hits ? $hits[0] : false;
+		$hits = $this->index->find('D'.$id);
+		return $hits['hits'] ? $hits['hits'][0] : false;
+	} /* }}} */
+
+	/**
+	 * Get folder from index
+	 *
+	 * @param int $id real folder id
+	 * @return object instance of SeedDMS_SQliteFTS_QueryHit or false
+	 */
+	function getFolder($id) { /* {{{ */
+		$hits = $this->index->find('F'.$id);
+		return $hits['hits'] ? $hits['hits'][0] : false;
 	} /* }}} */
 
 	/**
@@ -102,7 +113,7 @@ class SeedDMS_SQliteFTS_Search {
 			$result = $this->index->find($querystr, $limit);
 			$recs = array();
 			foreach($result["hits"] as $hit) {
-				$recs[] = array('id'=>$hit->id, 'document_id'=>$hit->id);
+				$recs[] = array('id'=>$hit->id, 'document_id'=>$hit->documentid);
 			}
 			return array('count'=>$result['count'], 'hits'=>$recs, 'facets'=>array());
 		} catch (Exception $e) {
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Term.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Term.php
index abfffbf0b..8fa4d398b 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Term.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Term.php
@@ -48,17 +48,18 @@ class SeedDMS_SQLiteFTS_Term {
 	public function __construct($term, $col, $occurrence) { /* {{{ */
 		$this->text = $term;
 		$fields = array(
-			0 => 'title',
-			1 => 'comment',
-			2 => 'keywords',
-			3 => 'category',
-			4 => 'mimetype',
-			5 => 'origfilename',
-			6 => 'owner',
-			7 => 'content',
-			8 => 'created',
-			9 => 'user',
-			10 => 'status'
+			0 => 'documentid',
+			1 => 'title',
+			2 => 'comment',
+			3 => 'keywords',
+			4 => 'category',
+			5 => 'mimetype',
+			6 => 'origfilename',
+			7 => 'owner',
+			8 => 'content',
+			9 => 'created',
+			10 => 'user',
+			11 => 'status'
 		);
 		$this->field = $fields[$col];
 		$this->_occurrence = $occurrence;

From bcb83d69429bea09cb391f21b3e028f961fbccd2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 12 Dec 2020 16:28:47 +0100
Subject: [PATCH 288/312] set $nocontent to false when indexing a folder

---
 inc/inc.ClassFulltextService.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassFulltextService.php b/inc/inc.ClassFulltextService.php
index f10c7939b..7a8165cbe 100644
--- a/inc/inc.ClassFulltextService.php
+++ b/inc/inc.ClassFulltextService.php
@@ -66,7 +66,10 @@ class SeedDMS_FulltextService {
 	}
 
 	public function IndexedDocument($document, $forceupdate=false) {
-		$nocontent = ($document->getLatestContent()->getFileSize() > $this->maxsize) && !$forceupdate;
+		if($document->isType('document'))
+			$nocontent = ($document->getLatestContent()->getFileSize() > $this->maxsize) && !$forceupdate;
+		else
+			$nocontent = true;
 		return new $this->services[0]['IndexedDocument']($document->getDMS(), $document, $this->converters, $nocontent, $this->cmdtimeout);
 	}
 

From e36a41eeae477c675308edc025dde8b84085946f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 12 Dec 2020 16:29:26 +0100
Subject: [PATCH 289/312] pass fulltextservice to view

---
 out/out.ViewDocument.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index 36ffbce1e..dbb1a6e67 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -65,6 +65,7 @@ if ($document->verifyLastestContentExpriry()){
 }
 
 if($view) {
+	$view->setParam('fulltextservice', $fulltextservice);
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
 	$view->setParam('accessobject', $accessop);

From efed9f2b9cd3e558584e396259169f53dec82b09 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 12 Dec 2020 16:29:56 +0100
Subject: [PATCH 290/312] add support for indexing folders

---
 op/op.Ajax.php                    | 31 +++++++++-----
 out/out.Search.php                | 27 ++++++++----
 utils/indexer.php                 | 68 +++++++++++++++++++++++++++----
 views/bootstrap/class.Indexer.php | 47 +++++++++++++++++----
 4 files changed, 136 insertions(+), 37 deletions(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index d27678ce5..ee4f4f4fa 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -914,19 +914,28 @@ switch($command) {
 		break; /* }}} */
 
 	case 'indexdocument': /* {{{ */
+	case 'indexfolder': /* {{{ */
 		if($user && $user->isAdmin()) {
 			if($fulltextservice) {
-				$document = $dms->getDocument($_REQUEST['id']);
-				if($document) {
+				if($command == 'indexdocument') {
+					$hook = 'indexDocument';
+					$object = $dms->getDocument($_REQUEST['id']);
+					$prefix = 'D';
+				} else {
+					$hook = 'indexFolder';
+					$object = $dms->getFolder($_REQUEST['id']);
+					$prefix = 'F';
+				}
+				if($object) {
 					if($index = $fulltextservice->Indexer()) {
-						$idoc = $fulltextservice->IndexedDocument($document, true);
+						$idoc = $fulltextservice->IndexedDocument($object, true);
 							$error = $idoc->getErrorMsg();
 							if(!$error) {
 								$ires = null;
-								if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) {
-									foreach($GLOBALS['SEEDDMS_HOOKS']['indexDocument'] as $hookObj) {
-										if (method_exists($hookObj, 'preIndexDocument')) {
-											$ires = $hookObj->preIndexDocument(null, $document, $idoc);
+								if(isset($GLOBALS['SEEDDMS_HOOKS'][$hook])) {
+									foreach($GLOBALS['SEEDDMS_HOOKS'][$hook] as $hookObj) {
+										if (method_exists($hookObj, 'pre'.ucfirst($hook))) {
+											$ires = $hookObj->preIndexDocument(null, $object, $idoc);
 										}
 									}
 								}
@@ -934,17 +943,17 @@ switch($command) {
 									$ires = $index->addDocument($idoc);
 								header('Content-Type: application/json');
 								if(false === $ires) {
-									echo json_encode(array('success'=>false, 'message'=>getMLText('error_document_indexed'), 'data'=>$document->getID()));
+									echo json_encode(array('success'=>false, 'message'=>getMLText('error_document_indexed'), 'data'=>$prefix.$object->getID()));
 								} else {
-									echo json_encode(array('success'=>true, 'message'=>getMLText('splash_document_indexed'), 'data'=>$document->getID(), 'cmd'=>$idoc->getCmd()));
+									echo json_encode(array('success'=>true, 'message'=>getMLText('splash_document_indexed'), 'data'=>$prefix.$object->getID(), 'cmd'=>$idoc->getCmd()));
 								}
 							} else {
 								header('Content-Type: application/json');
-								echo json_encode(array('success'=>false, 'message'=>$error, 'data'=>$document->getID(), 'mimetype'=>$idoc->getMimeType(), 'cmd'=>$idoc->getCmd()));
+								echo json_encode(array('success'=>false, 'message'=>$error, 'data'=>$object->getID(), 'mimetype'=>$idoc->getMimeType(), 'cmd'=>$idoc->getCmd()));
 							}
 						} else {
 							header('Content-Type: application/json');
-							echo json_encode(array('success'=>false, 'message'=>getMLText('error_occured'), 'data'=>$document->getID()));
+							echo json_encode(array('success'=>false, 'message'=>getMLText('error_occured'), 'data'=>$prefix.$object->getID()));
 						}
 				} else {
 					header('Content-Type: application/json');
diff --git a/out/out.Search.php b/out/out.Search.php
index 93384d91d..e0210b50b 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -195,22 +195,31 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 			} else {
 				$entries = array();
 				$facets = $searchresult['facets'];
-				$dcount = $searchresult['count']; //0;
+				$dcount = 0;
 				$fcount = 0;
 				if($searchresult) {
 					foreach($searchresult['hits'] as $hit) {
-						if($tmp = $dms->getDocument($hit['document_id'])) {
-							if($tmp->getAccessMode($user) >= M_READ) {
-								$tmp->verifyLastestContentExpriry();
-								$entries[] = $tmp;
-	//							$dcount++;
+						if($hit['document_id'][0] == 'D') {
+							if($tmp = $dms->getDocument(substr($hit['document_id'], 1))) {
+//								if($tmp->getAccessMode($user) >= M_READ) {
+									$tmp->verifyLastestContentExpriry();
+									$entries[] = $tmp;
+									$dcount++;
+//								}
+							}
+						} elseif($hit['document_id'][0] == 'F') {
+							if($tmp = $dms->getFolder(substr($hit['document_id'], 1))) {
+//								if($tmp->getAccessMode($user) >= M_READ) {
+									$entries[] = $tmp;
+									$fcount++;
+//								}
 							}
 						}
 					}
 				}
-				if($pageNumber != 'all' && $dcount > $limit) {
-					$totalPages = (int) ($dcount/$limit);
-					if($dcount%$limit)
+				if($pageNumber != 'all' && $searchresult['count'] > $limit) {
+					$totalPages = (int) ($searchresult['count']/$limit);
+					if($searchresult['count']%$limit)
 						$totalPages++;
 //					if($limit > 0)
 //						$entries = array_slice($entries, ($pageNumber-1)*$limit, $limit);
diff --git a/utils/indexer.php b/utils/indexer.php
index 156bcb346..47744609a 100644
--- a/utils/indexer.php
+++ b/utils/indexer.php
@@ -59,19 +59,65 @@ include($myincpath."/inc/inc.Init.php");
 include($myincpath."/inc/inc.Extension.php");
 include($myincpath."/inc/inc.DBInit.php");
 
-function tree($dms, $fulltextservice, $folder, $indent='') { /* {{{ */
+function tree($dms, $fulltextservice, $folder, $indent='', $numdocs) { /* {{{ */
 	global $settings, $themes;
-	echo $themes->black($indent."D ".$folder->getName()).PHP_EOL;
-	$subfolders = $folder->getSubFolders();
-	foreach($subfolders as $subfolder) {
-		tree($dms, $fulltextservice, $subfolder, $indent.'  ');
-	}
-	$documents = $folder->getDocuments();
+
 	$index = $fulltextservice->Indexer();
 	$lucenesearch = $fulltextservice->Search();
+
+//	echo $themes->black($indent."D ".$folder->getName()).PHP_EOL;
+	echo $themes->black($indent."D ".$folder->getId().":".$folder->getName()." ");
+	if(($numdocs == 0) || !($hit = $lucenesearch->getFolder($folder->getId()))) {
+		try {
+			$idoc = $fulltextservice->IndexedDocument($folder, true);
+			if(isset($GLOBALS['SEEDDMS_HOOKS']['indexFolder'])) {
+				foreach($GLOBALS['SEEDDMS_HOOKS']['indexFolder'] as $hookObj) {
+					if (method_exists($hookObj, 'preIndexFolder')) {
+						$hookObj->preIndexDocument(null, $folder, $idoc);
+					}
+				}
+			}
+			$index->addDocument($idoc);
+			echo $themes->green(" (Folder added)").PHP_EOL;
+		} catch(Exception $e) {
+			echo $themes->error(" (Timeout)").PHP_EOL;
+		}
+	} else {
+		try {
+			$created = (int) $hit->getDocument()->getFieldValue('created');
+		} catch (Exception $e) {
+			$created = 0;
+		}
+		if($created >= $folder->getDate()) {
+			echo $themes->italic(" (Folder unchanged)").PHP_EOL;
+		} else {
+			$index->delete($hit->id);
+			try {
+				$idoc = $fulltextservice->IndexedDocument($folder, true);
+				if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) {
+					foreach($GLOBALS['SEEDDMS_HOOKS']['indexDocument'] as $hookObj) {
+						if (method_exists($hookObj, 'preIndexDocument')) {
+							$hookObj->preIndexDocument(null, $folder, $idoc);
+						}
+					}
+				}
+				$index->addDocument($idoc);
+				echo $themes->green(" (Folder updated)").PHP_EOL;
+			} catch(Exception $e) {
+				echo $themes->error(" (Timeout)").PHP_EOL;
+			}
+		}
+	}
+
+	$subfolders = $folder->getSubFolders();
+	foreach($subfolders as $subfolder) {
+		tree($dms, $fulltextservice, $subfolder, $indent.'  ', $numdocs);
+	}
+
+	$documents = $folder->getDocuments();
 	foreach($documents as $document) {
 		echo $themes->black($indent."  ".$document->getId().":".$document->getName()." ");
-		if(!($hit = $lucenesearch->getDocument($document->getId()))) {
+		if(($numdocs == 0) || !($hit = $lucenesearch->getDocument($document->getId()))) {
 			try {
 				$idoc = $fulltextservice->IndexedDocument($document, true);
 				if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) {
@@ -124,8 +170,12 @@ if(!$index) {
 	exit(1);
 }
 
+$numdocs = $fulltextservice->Indexer()->count();
 $folder = $dms->getFolder($settings->_rootFolderID);
-tree($dms, $fulltextservice, $folder);
+/* if numdocs is 0, then there is no need to check if a document/folder is already
+ * indexed. That speeds up the indexing.
+ */
+tree($dms, $fulltextservice, $folder,'', $numdocs);
 
 $index->commit();
 $index->optimize();
diff --git a/views/bootstrap/class.Indexer.php b/views/bootstrap/class.Indexer.php
index 7613500f1..35e9540a3 100644
--- a/views/bootstrap/class.Indexer.php
+++ b/views/bootstrap/class.Indexer.php
@@ -32,18 +32,43 @@ class SeedDMS_View_Indexer_Process_Folder { /* {{{ */
 	public function __construct($fulltextservice, $forceupdate) { /* {{{ */
 		$this->fulltextservice = $fulltextservice;
 		$this->forceupdate = $forceupdate;
+		$this->numdocs = $this->fulltextservice->Indexer()->count();
 	} /* }}} */
 
 	public function process($folder) { /* {{{ */
+		$lucenesearch = $this->fulltextservice->Search();
+		echo "<div class=\"folder\">".$folder->getId().":".htmlspecialchars($folder->getFolderPathPlain());
+		/* If the document wasn't indexed before then just add it */
+		if(($this->numdocs == 0) || !($hit = $lucenesearch->getFolder($folder->getId()))) {
+			echo " <span id=\"status_F".$folder->getID()."\" class=\"indexme indexstatus\" data-docid=\"F".$folder->getID()."\">".getMLText('index_waiting')."</span>";
+		} else {
+			/* Check if the attribute created is set or has a value older
+			 * than the lastet content. Documents without such an attribute
+			 * where added when a new document was added to the dms. In such
+			 * a case the document content  wasn't indexed.
+			 */
+			try {
+				$created = (int) $hit->getDocument()->getFieldValue('created');
+			} catch (/* Zend_Search_Lucene_ */Exception $e) {
+				$created = 0;
+			}
+			if($created >= $folder->getDate() && !$this->forceupdate) {
+				echo "<span id=\"status_F".$folder->getID()."\" class=\"indexstatus\" data-docid=\"F".$folder->getID()."\">".getMLText('index_document_unchanged')."</span>";
+			} else {
+				$this->fulltextservice->Indexer()->delete($hit->id);
+				echo " <span id=\"status_F".$folder->getID()."\" class=\"indexme indexstatus\" data-docid=\"F".$folder->getID()."\">".getMLText('index_waiting')."</span>";
+			}
+		}
+		echo "</div>";
+
 		$documents = $folder->getDocuments();
 		if($documents) {
-			$lucenesearch = $this->fulltextservice->Search();
-			echo "<div class=\"folder\">".$folder->getFolderPathPlain()."</div>";
+//			echo "<div class=\"folder\">".htmlspecialchars($folder->getFolderPathPlain())."</div>";
 			foreach($documents as $document) {
 				echo "<div class=\"document\">".$document->getId().":".htmlspecialchars($document->getName());
 				/* If the document wasn't indexed before then just add it */
-				if(!($hit = $lucenesearch->getDocument($document->getId()))) {
-					echo " <span id=\"status_".$document->getID()."\" class=\"indexme indexstatus\" data-docid=\"".$document->getID()."\">".getMLText('index_waiting')."</span>";
+				if(($this->numdocs == 0) || !($hit = $lucenesearch->getDocument($document->getId()))) {
+					echo " <span id=\"status_D".$document->getID()."\" class=\"indexme indexstatus\" data-docid=\"D".$document->getID()."\">".getMLText('index_waiting')."</span>";
 				} else {
 					/* Check if the attribute created is set or has a value older
 					 * than the lastet content. Documents without such an attribute
@@ -57,10 +82,10 @@ class SeedDMS_View_Indexer_Process_Folder { /* {{{ */
 					}
 					$content = $document->getLatestContent();
 					if($created >= $content->getDate() && !$this->forceupdate) {
-						echo "<span id=\"status_".$document->getID()."\" class=\"indexstatus\" data-docid=\"".$document->getID()."\">".getMLText('index_document_unchanged')."</span>";
+						echo "<span id=\"status_D".$document->getID()."\" class=\"indexstatus\" data-docid=\"D".$document->getID()."\">".getMLText('index_document_unchanged')."</span>";
 					} else {
 						$this->fulltextservice->Indexer()->delete($hit->id);
-						echo " <span id=\"status_".$document->getID()."\" class=\"indexme indexstatus\" data-docid=\"".$document->getID()."\">".getMLText('index_waiting')."</span>";
+						echo " <span id=\"status_D".$document->getID()."\" class=\"indexme indexstatus\" data-docid=\"D".$document->getID()."\">".getMLText('index_waiting')."</span>";
 					}
 				}
 				echo "</div>";
@@ -105,12 +130,18 @@ function check_queue() {
 		if(funcArray.length == 0) {
 			return;
 		}
+		var command = '';
 		docid = funcArray.pop();
 		$('#status_'+docid).html('Processsing ...');
+		if(docid[0] == 'F') {
+			command = 'indexfolder';
+		} else {
+			command = 'indexdocument';
+		}
 		$.ajax({url: '../op/op.Ajax.php',
 			type: 'GET',
 			dataType: "json",
-			data: {command: 'indexdocument', id: docid},
+			data: {command: command, id: docid.substring(1)},
 			beforeSend: function() {
 				queue_count++;            // Add request to the counter
 				$('.queue-bar').css('width', (queue_count*100/MAX_REQUESTS)+'%');
@@ -153,7 +184,7 @@ function check_queue() {
 				if(funcArray.length+queue_count == 0)
 					$('.total-bar').addClass('bar-success');
 			}
-		}); 
+		});
 		setTimeout(function() { check_queue() }, CALL_WAIT);
 }
 

From 66711458ffeb0012153a6c7a6b197423f9be96fb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 12 Dec 2020 16:30:22 +0100
Subject: [PATCH 291/312] add entry for 5.1.21

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 0cfa88c81..d227fd8cb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,6 +22,7 @@
 - add filter function to notification service
 - reindex document after it was edited
 - show preview images in drop folder menu after mouse over
+- add support for indexing folders
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.20

From 2842375632b932c7bd0a4ee7e0e15c246bc4f0bd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 13 Dec 2020 09:06:03 +0100
Subject: [PATCH 292/312] add own version of bootstrap typeahead

---
 .../bootstrap/js/bootstrap-typeahead.js       | 338 ++++++++++++++++++
 1 file changed, 338 insertions(+)
 create mode 100644 styles/bootstrap/bootstrap/js/bootstrap-typeahead.js

diff --git a/styles/bootstrap/bootstrap/js/bootstrap-typeahead.js b/styles/bootstrap/bootstrap/js/bootstrap-typeahead.js
new file mode 100644
index 000000000..1380fc726
--- /dev/null
+++ b/styles/bootstrap/bootstrap/js/bootstrap-typeahead.js
@@ -0,0 +1,338 @@
+/* =============================================================
+ * bootstrap-typeahead.js v2.3.2
+ * http://twitter.github.com/bootstrap/javascript.html#typeahead
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+/* THIS IS A MODIFIED VERSION FOR SEEDDMS WHICH IS ABLE TO OVERRIDE THE render FUNCTION */
+
+!function($){
+
+  "use strict"; // jshint ;_;
+
+
+ /* TYPEAHEAD PUBLIC CLASS DEFINITION
+  * ================================= */
+
+  var Typeahead = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.typeahead.defaults, options)
+    this.matcher = this.options.matcher || this.matcher
+    this.render = this.options.render || this.render
+    this.sorter = this.options.sorter || this.sorter
+    this.highlighter = this.options.highlighter || this.highlighter
+    this.updater = this.options.updater || this.updater
+    this.source = this.options.source
+    this.$menu = $(this.options.menu)
+    this.shown = false
+    this.listen()
+  }
+
+  Typeahead.prototype = {
+
+    constructor: Typeahead
+
+  , select: function () {
+      var val = this.$menu.find('.active').attr('data-value')
+      this.$element
+        .val(this.updater(val))
+        .change()
+      return this.hide()
+    }
+
+  , updater: function (item) {
+      return item
+    }
+
+  , show: function () {
+      var pos = $.extend({}, this.$element.position(), {
+        height: this.$element[0].offsetHeight
+      })
+
+      this.$menu
+        .insertAfter(this.$element)
+        .css({
+          top: pos.top + pos.height
+        , left: pos.left
+        })
+        .show()
+
+      this.shown = true
+      return this
+    }
+
+  , hide: function () {
+      this.$menu.hide()
+      this.shown = false
+      return this
+    }
+
+  , lookup: function (event) {
+      var items
+
+      this.query = this.$element.val()
+
+      if (!this.query || this.query.length < this.options.minLength) {
+        return this.shown ? this.hide() : this
+      }
+
+      items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source
+
+      return items ? this.process(items) : this
+    }
+
+  , process: function (items) {
+      var that = this
+
+      items = $.grep(items, function (item) {
+        return that.matcher(item)
+      })
+
+      items = this.sorter(items)
+
+      if (!items.length) {
+        return this.shown ? this.hide() : this
+      }
+
+      return this.render(items.slice(0, this.options.items)).show()
+    }
+
+  , matcher: function (item) {
+      return ~item.toLowerCase().indexOf(this.query.toLowerCase())
+    }
+
+  , sorter: function (items) {
+      var beginswith = []
+        , caseSensitive = []
+        , caseInsensitive = []
+        , item
+
+      while (item = items.shift()) {
+        if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
+        else if (~item.indexOf(this.query)) caseSensitive.push(item)
+        else caseInsensitive.push(item)
+      }
+
+      return beginswith.concat(caseSensitive, caseInsensitive)
+    }
+
+  , highlighter: function (item) {
+      var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&')
+      return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) {
+        return '<strong>' + match + '</strong>'
+      })
+    }
+
+  , render: function (items) {
+      var that = this
+
+      items = $(items).map(function (i, item) {
+        i = $(that.options.item).attr('data-value', item)
+        i.find('a').html(that.highlighter(item))
+        return i[0]
+      })
+
+      items.first().addClass('active')
+      this.$menu.html(items)
+      return this
+    }
+
+  , next: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , next = active.next()
+
+      if (!next.length) {
+        next = $(this.$menu.find('li')[0])
+      }
+
+      next.addClass('active')
+    }
+
+  , prev: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , prev = active.prev()
+
+      if (!prev.length) {
+        prev = this.$menu.find('li').last()
+      }
+
+      prev.addClass('active')
+    }
+
+  , listen: function () {
+      this.$element
+        .on('focus',    $.proxy(this.focus, this))
+        .on('blur',     $.proxy(this.blur, this))
+        .on('keypress', $.proxy(this.keypress, this))
+        .on('keyup',    $.proxy(this.keyup, this))
+
+      if (this.eventSupported('keydown')) {
+        this.$element.on('keydown', $.proxy(this.keydown, this))
+      }
+
+      this.$menu
+        .on('click', $.proxy(this.click, this))
+        .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
+        .on('mouseleave', 'li', $.proxy(this.mouseleave, this))
+    }
+
+  , eventSupported: function(eventName) {
+      var isSupported = eventName in this.$element
+      if (!isSupported) {
+        this.$element.setAttribute(eventName, 'return;')
+        isSupported = typeof this.$element[eventName] === 'function'
+      }
+      return isSupported
+    }
+
+  , move: function (e) {
+      if (!this.shown) return
+
+      switch(e.keyCode) {
+        case 9: // tab
+        case 13: // enter
+        case 27: // escape
+          e.preventDefault()
+          break
+
+        case 38: // up arrow
+          e.preventDefault()
+          this.prev()
+          break
+
+        case 40: // down arrow
+          e.preventDefault()
+          this.next()
+          break
+      }
+
+      e.stopPropagation()
+    }
+
+  , keydown: function (e) {
+      this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27])
+      this.move(e)
+    }
+
+  , keypress: function (e) {
+      if (this.suppressKeyPressRepeat) return
+      this.move(e)
+    }
+
+  , keyup: function (e) {
+      switch(e.keyCode) {
+        case 40: // down arrow
+        case 38: // up arrow
+        case 16: // shift
+        case 17: // ctrl
+        case 18: // alt
+          break
+
+        case 9: // tab
+        case 13: // enter
+          if (!this.shown) return
+          this.select()
+          break
+
+        case 27: // escape
+          if (!this.shown) return
+          this.hide()
+          break
+
+        default:
+          this.lookup()
+      }
+
+      e.stopPropagation()
+      e.preventDefault()
+  }
+
+  , focus: function (e) {
+      this.focused = true
+    }
+
+  , blur: function (e) {
+      this.focused = false
+      if (!this.mousedover && this.shown) this.hide()
+    }
+
+  , click: function (e) {
+      e.stopPropagation()
+      e.preventDefault()
+      this.select()
+      this.$element.focus()
+    }
+
+  , mouseenter: function (e) {
+      this.mousedover = true
+      this.$menu.find('.active').removeClass('active')
+      $(e.currentTarget).addClass('active')
+    }
+
+  , mouseleave: function (e) {
+      this.mousedover = false
+      if (!this.focused && this.shown) this.hide()
+    }
+
+  }
+
+
+  /* TYPEAHEAD PLUGIN DEFINITION
+   * =========================== */
+
+  var old = $.fn.typeahead
+
+  $.fn.typeahead = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('typeahead')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('typeahead', (data = new Typeahead(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.typeahead.defaults = {
+    source: []
+  , items: 8
+  , menu: '<ul class="typeahead dropdown-menu"></ul>'
+  , item: '<li><a href="#"></a></li>'
+  , minLength: 1
+  }
+
+  $.fn.typeahead.Constructor = Typeahead
+
+
+ /* TYPEAHEAD NO CONFLICT
+  * =================== */
+
+  $.fn.typeahead.noConflict = function () {
+    $.fn.typeahead = old
+    return this
+  }
+
+
+ /* TYPEAHEAD DATA-API
+  * ================== */
+
+  $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
+    var $this = $(this)
+    if ($this.data('typeahead')) return
+    $this.typeahead($this.data())
+  })
+
+}(window.jQuery);
+

From 38e0b6876729c5182420d134a86116df16a6e6fc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 13 Dec 2020 09:06:28 +0100
Subject: [PATCH 293/312] new version 1.0.16

---
 SeedDMS_Lucene/package.xml | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/SeedDMS_Lucene/package.xml b/SeedDMS_Lucene/package.xml
index f158845fe..8d80f829e 100644
--- a/SeedDMS_Lucene/package.xml
+++ b/SeedDMS_Lucene/package.xml
@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2020-09-10</date>
+ <date>2020-12-12</date>
  <time>08:55:43</time>
  <version>
-  <release>1.1.15</release>
-  <api>1.1.15</api>
+  <release>1.1.16</release>
+  <api>1.1.16</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,12 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- add searching for document status
-- better error handling if opening index fails	
-- parameters for SeedDMS_Lucene_Search::search() has changed
-- SeedDMS_Lucene_Search::search() returns array of hits, count and facets
-- pass config array instead of index directory to SeedDMS_Lucene_Indexer::create()
-  and SeedDMS_Lucene_Indexer::open()
+- add indexing of folders
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -336,5 +331,26 @@ IndexedDocument() remembers cmd and mimetype
 Index users with at least read access on the document
    </notes>
   </release>
+  <release>
+   <date>2020-09-10</date>
+   <time>08:55:43</time>
+   <version>
+    <release>1.1.15</release>
+    <api>1.1.15</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- add searching for document status
+- better error handling if opening index fails	
+- parameters for SeedDMS_Lucene_Search::search() has changed
+- SeedDMS_Lucene_Search::search() returns array of hits, count and facets
+- pass config array instead of index directory to SeedDMS_Lucene_Indexer::create()
+  and SeedDMS_Lucene_Indexer::open()
+   </notes>
+  </release>
  </changelog>
 </package>

From a0557d489237b79de68d7ab76435842ac3c5c7e0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 13 Dec 2020 09:06:48 +0100
Subject: [PATCH 294/312] new version 1.0.15

---
 SeedDMS_SQLiteFTS/package.xml | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml
index ac53c4121..424c76ecc 100644
--- a/SeedDMS_SQLiteFTS/package.xml
+++ b/SeedDMS_SQLiteFTS/package.xml
@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2020-09-11</date>
+ <date>2020-12-12</date>
  <time>08:57:44</time>
  <version>
-  <release>1.0.14</release>
-  <api>1.0.14</api>
+  <release>1.0.15</release>
+  <api>1.0.15</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,12 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- add searching for document status
-- search even if query is empty	(will find all documents)
-- parameters for SeedDMS_SQLiteFTS_Search::search() has changed
-- SeedDMS_Lucene_Search::search() returns array of hits, count and facets
-- pass config array instead of index directory to SeedDMS_Lucene_Indexer::create()
-  and SeedDMS_Lucene_Indexer::open()
+- add indexing folders
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -296,5 +291,26 @@ Index users with at least read access on a document
 add user to list of terms
    </notes>
   </release>
+  <release>
+   <date>2020-09-11</date>
+   <time>08:57:44</time>
+   <version>
+    <release>1.0.14</release>
+    <api>1.0.14</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- add searching for document status
+- search even if query is empty	(will find all documents)
+- parameters for SeedDMS_SQLiteFTS_Search::search() has changed
+- SeedDMS_Lucene_Search::search() returns array of hits, count and facets
+- pass config array instead of index directory to SeedDMS_Lucene_Indexer::create()
+  and SeedDMS_Lucene_Indexer::open()
+   </notes>
+  </release>
  </changelog>
 </package>

From 582c00ce4ed621bf5365f06034b9833e25f1bbbd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 13 Dec 2020 09:10:50 +0100
Subject: [PATCH 295/312] use new typeahead search using json objects

---
 styles/bootstrap/application.js     | 74 +++++++++++++++++++++++------
 views/bootstrap/class.Bootstrap.php |  1 +
 views/bootstrap/class.Search.php    |  8 ++--
 3 files changed, 66 insertions(+), 17 deletions(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 9bf2afabe..c41b020a1 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -96,39 +96,85 @@ $(document).ready( function() {
 		}
 	}); /* }}} */
 
-	/* The typeahead functionality useѕ the rest api */
+	/* The typeahead functionality useѕ the modified version of
+	 * bootstrap-typeahead, which is able to set the render function.
+	 * This was needed because the search function return json objects
+	 * for each hit and render could only process strings.
+	 * */
 	$("#searchfield").typeahead({ /* {{{ */
 		minLength: 3,
+		items: 100, /* the query will limit the number of hits */
 		source: function(query, process) {
 			var d = new Date();
 			var pastYear = d.getFullYear() - 1;
 			d.setFullYear(pastYear);
-			console.log(d.toISOString().split('T')[0]);
+//			console.log(d.toISOString().split('T')[0]);
 
-			$.get('../restapi/index.php/search', { query: query, limit: 8, mode: 'typeahead' }, function(data) {
-//			$.get('../out/out.Search.php', { query: query, limit: 8, creationdate: 1, createstart: d.toISOString().split('T')[0], action: 'typeahead' }, function(data) {
-					process(data);
+//			$.get('../restapi/index.php/search', { query: query, limit: 8, mode: 'typeahead' }, function(data) {
+			var data = {
+				query: query,
+				limit: 18,
+//				fullsearch: 1,
+//				creationdate: 1,
+//				createstart: d.toISOString().split('T')[0],
+				action: 'typeahead'
+			};
+			/* Return a list of json objects, each containing
+			 * type: type of object (D=doc, F=folder, S=searchterm)
+			 * name: name of object
+			 */
+			$.get('../out/out.Search.php', data, function(data) {
+				process(data);
 			});
 		},
 		/* updater is called when the item in the list is clicked. It is
 		 * actually provided to update the input field, but here we use
-		 * it to set the document location. */
+		 * it to set the document location. The passed value is the string
+		 * set in data-value of the list items. */
 		updater: function (item) {
-			document.location = "../out/out.Search.php?query=" + encodeURIComponent(item.substring(1));
+			console.log(item);
+			document.location = "../out/out.Search.php?query=" + encodeURIComponent(item);
 			return item;
 		},
-		/* Set a matcher that allows any returned value */
+		sorter: function(items) {
+			return items;
+		},
+		/* matcher will always return true, because the initial search returns
+		 * matches only
+  	 */
 		matcher : function (item) {
 			return true;
 		},
 		highlighter : function (item) {
-			if(item.charAt(0) == 'D')
-				return '<i class="fa fa-file"></i> ' + item.substring(1).replace(/</g, '&lt;');
-			else if(item.charAt(0) == 'F')
-				return '<i class="fa fa-folder-o"></i> ' + item.substring(1).replace(/</g, '&lt;');
+			if(item.type.charAt(0) == 'D')
+				return '<i class="fa fa-file"></i> ' + item.name.replace(/</g, '&lt;');
+			else if(item.type.charAt(0) == 'F')
+				return '<i class="fa fa-folder-o"></i> ' + item.name.replace(/</g, '&lt;');
 			else
-				return '<i class="fa fa-search"></i> ' + item.substring(1).replace(/</g, '&lt;');
-		}
+				return '<i class="fa fa-search"></i> ' + item.name.replace(/</g, '&lt;');
+		},
+		/* This only works with a modified version of bootstrap typeahead located
+		 * in boostrap-typeahead.js Search for 'render'
+		 * The line
+		 * this.render = this.options.render || this.render
+		 * was added to bootstrap-typeahead.js
+		 * The following function is a copy of the original render function but
+		 * access item.name instead of item
+		 */
+		render : function (items) {
+      var that = this
+
+      items = $(items).map(function (i, item) {
+        i = $(that.options.item).attr('data-value', item.name)
+        i.find('a').html(that.highlighter(item))
+        return i[0]
+      })
+
+      items.first().addClass('active')
+      this.$menu.html(items)
+      return this
+    }
+
 	}); /* }}} */
 
 	/* Document chooser */
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index beaf80089..0d2f47f1b 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -177,6 +177,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			}
 		}
 		echo '<script src="../styles/'.$this->theme.'/bootstrap/js/bootstrap.min.js"></script>'."\n";
+		echo '<script src="../styles/'.$this->theme.'/bootstrap/js/bootstrap-typeahead.js"></script>'."\n";
 		echo '<script src="../views/'.$this->theme.'/vendors/bootstrap-datepicker/js/bootstrap-datepicker.js"></script>'."\n";
 		foreach(array('de', 'es', 'ar', 'el', 'bg', 'ru', 'hr', 'hu', 'ko', 'pl', 'ro', 'sk', 'tr', 'uk', 'ca', 'nl', 'fi', 'cs', 'it', 'fr', 'sv', 'sl', 'pt-BR', 'zh-CN', 'zh-TW') as $lang)
 			echo '<script src="../views/'.$this->theme.'/vendors/bootstrap-datepicker/locales/bootstrap-datepicker.'.$lang.'.min.js"></script>'."\n";
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 5ac7a1810..c35e684b4 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -74,13 +74,15 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 		if($entries) {
 			foreach ($entries as $entry) {
 				if($entry->isType('document')) {
-					$recs[] = 'D'.$entry->getName();
+//					$recs[] = 'D'.$entry->getName();
+					$recs[] = array('type'=>'D', 'name'=>$entry->getName());
 				} elseif($entry->isType('folder')) {
-					$recs[] = 'F'.$entry->getName();
+//					$recs[] = 'F'.$entry->getName();
+					$recs[] = array('type'=>'F', 'name'=>$entry->getName());
 				}
 			}
 		}
-		array_unshift($recs, ' '.$query);
+		array_unshift($recs, array('type'=>'S', 'name'=>$query));
 		header('Content-Type: application/json');
 		echo json_encode($recs);
 	} /* }}} */

From 7b4cad6aa923ca1ed35b6d0486876ccfed2a5fe5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 13 Dec 2020 09:37:38 +0100
Subject: [PATCH 296/312] use fulltext search if set as default or explixitly
 asked for

---
 out/out.Search.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index e0210b50b..2cb15b8b7 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -55,12 +55,12 @@ if (isset($_GET["navBar"])) {
 			header("Location: ../op/op.SearchFulltext.php?folderid=".$folderid."&query=".$_GET["query"]);
 		}
 	}
-	*/
+	 */
 }
 
 $accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
 
-if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSearch) {
+if((!empty($_GET["fullsearch"]) || $settings->_defaultSearchMethod == 'fulltext') && $settings->_enableFullSearch) {
 // Search in Fulltext {{{
 	if (isset($_GET["query"]) && is_string($_GET["query"])) {
 		$query = $_GET["query"];
@@ -537,10 +537,10 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
 		$view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount);
 		$view->setParam('totaldocs', $dcount /*resArr['totalDocs']*/);
 		$view->setParam('totalfolders', $fcount /*resArr['totalFolders']*/);
-		$view->setParam('fullsearch', (isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSearch) ? true : false);
+		$view->setParam('fullsearch', ((!empty($_GET["fullsearch"]) || $settings->_defaultSearchMethod == 'fulltext') && $settings->_enableFullSearch) ? true : false);
 		$view->setParam('mode', isset($mode) ? $mode : '');
 		$view->setParam('orderby', isset($orderby) ? $orderby : '');
-		$view->setParam('defaultsearchmethod', $settings->_defaultSearchMethod);
+		$view->setParam('defaultsearchmethod', !empty($_GET["fullsearch"]) || $settings->_defaultSearchMethod);
 		$view->setParam('resultmode', isset($resultmode) ? $resultmode : '');
 		$view->setParam('searchin', isset($searchin) ? $searchin : array());
 		$view->setParam('startfolder', isset($startFolder) ? $startFolder : null);

From 1e9e7c0e2f2364ace6a7d5be5e82b37f98594f31 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 13 Dec 2020 09:38:12 +0100
Subject: [PATCH 297/312] turn typeahead search on for fulltext search

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 0d2f47f1b..79b86d7d8 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -431,7 +431,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				echo "      <input type=\"hidden\" name=\"folderid\" value=\"".$folder->getID()."\" />";
 			}
 			echo "      <input type=\"hidden\" name=\"navBar\" value=\"1\" />";
-			echo "      <input name=\"query\" class=\"search-query\" ".($this->params['defaultsearchmethod'] == 'fulltext' ? "" : "id=\"searchfield\"")." data-provide=\"typeahead\" type=\"search\" style=\"width: 150px;\" placeholder=\"".getMLText("search")."\"/>";
+			echo "      <input name=\"query\" class=\"search-query\" ".($this->params['defaultsearchmethod'] == 'fulltext_' ? "" : "id=\"searchfield\"")." data-provide=\"typeahead\" type=\"search\" style=\"width: 150px;\" placeholder=\"".getMLText("search")."\"/>";
 			if($this->params['defaultsearchmethod'] == 'fulltext')
 				echo "      <input type=\"hidden\" name=\"fullsearch\" value=\"1\" />";
 //			if($this->params['enablefullsearch']) {

From 0c1cae25a92ed77d4b3cbe739f8df42ec162c441 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 13 Dec 2020 14:45:21 +0100
Subject: [PATCH 298/312] remove console.log()

---
 styles/bootstrap/application.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index c41b020a1..297376c36 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -132,7 +132,6 @@ $(document).ready( function() {
 		 * it to set the document location. The passed value is the string
 		 * set in data-value of the list items. */
 		updater: function (item) {
-			console.log(item);
 			document.location = "../out/out.Search.php?query=" + encodeURIComponent(item);
 			return item;
 		},

From beaa54ac924786cbb7cb2bdd0df99ea91efb6c41 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 13 Dec 2020 14:45:55 +0100
Subject: [PATCH 299/312] call hook folderListItem

---
 views/bootstrap/class.Search.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index c35e684b4..0fa8a8657 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -634,6 +634,10 @@ foreach($facets as $facetname=>$values) {
 						print $this->documentListRow($document, $previewer, false, 0, $extracontent);
 					}
 				} elseif($entry->isType('folder')) {
+					$txt = $this->callHook('folderListItem', $entry, false, 'search');
+					if(is_string($txt))
+						echo $txt;
+					else {
 					$folder = $entry;
 					$owner = $folder->getOwner();
 					if (in_array(2, $searchin)) {
@@ -657,6 +661,7 @@ foreach($facets as $facetname=>$values) {
 					if($attrstr)
 						$extracontent['bottom_title'] = '<br />'.$this->printPopupBox('<span class="btn btn-mini btn-secondary">'.getMLText('attributes').'</span>', $attrstr, true);
 					print $this->folderListRow($folder, false, $extracontent);
+					}
 				}
 			}
 			print "</tbody></table>\n";

From 44daf8cc109f08ddb7114794b3b0f71b605ff5cb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Dec 2020 07:08:14 +0100
Subject: [PATCH 300/312] remove folders from fulltext index

---
 controllers/class.RemoveFolder.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/controllers/class.RemoveFolder.php b/controllers/class.RemoveFolder.php
index 8ccac220a..4dfd686cf 100644
--- a/controllers/class.RemoveFolder.php
+++ b/controllers/class.RemoveFolder.php
@@ -44,17 +44,25 @@ class SeedDMS_Controller_RemoveFolder extends SeedDMS_Controller_Common {
 			/* Register a callback which removes each document from the fulltext index
 			 * The callback must return null other the removal will be canceled.
 			 */
-			function removeFromIndex($fulltextservice, $document) {
+			function removeFromIndex($arr, $document) {
+				$fulltextservice = $arr[0];
 				$lucenesearch = $fulltextservice->Search();
-				if($hit = $lucenesearch->getDocument($document->getID())) {
+				$hit = null;
+				if($document->isType('document'))
+					$hit = $lucenesearch->getDocument($document->getID());
+				elseif($document->isType('folder'))
+					$hit = $lucenesearch->getFolder($document->getID());
+				if($hit) {
 					$index = $fulltextservice->Indexer();
 					$index->delete($hit->id);
 					$index->commit();
 				}
 				return null;
 			}
-			if($fulltextservice && ($index = $fulltextservice->Indexer()))
-				$dms->setCallback('onPreRemoveDocument', 'removeFromIndex', array($fulltextservice));
+			if($fulltextservice && ($index = $fulltextservice->Indexer())) {
+				$dms->addCallback('onPreRemoveDocument', 'removeFromIndex', array($fulltextservice));
+				$dms->addCallback('onPreRemoveFolder', 'removeFromIndex', array($fulltextservice));
+			}
 
 			function removePreviews($arr, $document) {
 				$previewer = $arr[0];

From 98c12202603efde60b0f21701c6cd12849c3e54f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Dec 2020 07:08:48 +0100
Subject: [PATCH 301/312] =?UTF-8?q?start=20to=20add=20suggesestion=20to=20?=
 =?UTF-8?q?opensearcheng=D1=96ne=20(not=20working=20yet)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 views/bootstrap/class.OpensearchDesc.php |  3 +++
 views/bootstrap/class.Search.php         | 32 +++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.OpensearchDesc.php b/views/bootstrap/class.OpensearchDesc.php
index 924733585..edb27b7c7 100644
--- a/views/bootstrap/class.OpensearchDesc.php
+++ b/views/bootstrap/class.OpensearchDesc.php
@@ -44,7 +44,10 @@ class SeedDMS_View_OpensearchDesc extends SeedDMS_Bootstrap_Style {
 	<Description><?= $sitename ?></Description>
 	<Image height="16" width="16" type="image/x-icon"><?= "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot ?>styles/<?= $this->theme ?>/favicon.ico</Image>
 	<Url type="text/html" method="get" template="<?= "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.Search.php?query={searchTerms}" ?>" />
+	<Url type="application/x-suggestions+xml" rel="suggestions" method="get" template="<?= "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.Search.php?action=opensearchsuggestion&query={searchTerms}" ?>" />
 	<moz:SearchForm><?= "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.Search.php" ?></moz:SearchForm>
+  <OutputEncoding>UTF-8</OutputEncoding>
+  <InputEncoding>UTF-8</InputEncoding>
 </OpenSearchDescription>
 <?php
 	} /* }}} */
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 0fa8a8657..12487eef8 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -65,7 +65,37 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 		$this->printClickFolderJs();
 	} /* }}} */
 
-	function typeahead() { /* {{{ */
+		function opensearchsuggestion() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$query = $this->params['query'];
+		$entries = $this->params['searchhits'];
+		$recs = array();
+		$content = "<?xml version=\"1.0\"?>\n";
+		$content .= "<SearchSuggestion version=\"2.0\" xmlns=\"http://opensearch.org/searchsuggest2\">\n";
+		$content .= "<Query xml:space=\"preserve\">".$query."</Query>";
+		if($entries) {
+			$content .= "<Section>\n";
+			foreach ($entries as $entry) {
+				$content .= "<Item>\n";
+				if($entry->isType('document')) {
+					$content .= "<Text xml:space=\"preserve\">".$entry->getName()."</Text>\n";
+					$content .= "<Url xml:space=\"preserve\">http:".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$entry->getId()."</Url>\n";
+				} elseif($entry->isType('folder')) {
+					$content .= "<Text xml:space=\"preserve\">".$entry->getName()."</Text>\n";
+					$content .= "<Url xml:space=\"preserve\">http:".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$entry->getId()."</Url>\n";
+				}
+				$content .= "</Item>\n";
+			}
+			$content .= "</Section>\n";
+		}
+		$content .= "</SearchSuggestion>";
+		header("Content-Disposition: attachment; filename=\"search.xml\"; filename*=UTF-8''search.xml");
+		header('Content-Type: application/x-suggestions+xml');
+		echo $content;
+	} /* }}} */
+
+function typeahead() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$query = $this->params['query'];

From e91dd1c09ca37de70dbeb926b22f1f4dde9afe50 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Dec 2020 07:51:51 +0100
Subject: [PATCH 302/312] call hoock postEditDocument even after hook
 editDocument

---
 controllers/class.EditDocument.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/controllers/class.EditDocument.php b/controllers/class.EditDocument.php
index c344df0a1..ff98965d2 100644
--- a/controllers/class.EditDocument.php
+++ b/controllers/class.EditDocument.php
@@ -165,11 +165,14 @@ class SeedDMS_Controller_EditDocument extends SeedDMS_Controller_Common {
 				}
 			}
  
-			if(!$this->callHook('postEditDocument')) {
-			}
+		} elseif($result === false) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_editDocument_failed';
+			return false;
+		}
 
-		} else
-			return $result;
+		if(!$this->callHook('postEditDocument')) {
+		}
 
 		return true;
 	}

From a3d92f5b72ffb711a28df5801c1cabc94871740b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Dec 2020 07:52:39 +0100
Subject: [PATCH 303/312] return error if postAddDocument fails

---
 controllers/class.AddDocument.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/controllers/class.AddDocument.php b/controllers/class.AddDocument.php
index 0986a2961..482c5ec35 100644
--- a/controllers/class.AddDocument.php
+++ b/controllers/class.AddDocument.php
@@ -133,7 +133,7 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 				if($document->getGroupAccessMode($notgroup) >= M_READ)
 					$res = $document->addNotify($notgroup->getID(), false);
 			}
-		} elseif($result === false) {
+		} elseif($document === false) {
 			if(empty($this->errormsg))
 				$this->errormsg = 'hook_addDocument_failed';
 			return false;
@@ -147,7 +147,10 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 			}
 		}
 
-		if(!$this->callHook('postAddDocument', $document)) {
+		if(false ==== $this->callHook('postAddDocument', $document)) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_postAddDocument_failed';
+			return false;
 		}
 
 		return $document;

From f18ae4ff2d995eb4177c047ccd3c2df98c6a1ef6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Dec 2020 07:53:29 +0100
Subject: [PATCH 304/312] update fulltext index

---
 controllers/class.EditFolder.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/controllers/class.EditFolder.php b/controllers/class.EditFolder.php
index 02c6d1163..a2d27c34f 100644
--- a/controllers/class.EditFolder.php
+++ b/controllers/class.EditFolder.php
@@ -26,6 +26,7 @@ class SeedDMS_Controller_EditFolder extends SeedDMS_Controller_Common {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$settings = $this->params['settings'];
+		$fulltextservice = $this->params['fulltextservice'];
 		$folder = $this->params['folder'];
 
 		if(false === $this->callHook('preEditFolder')) {
@@ -89,6 +90,14 @@ class SeedDMS_Controller_EditFolder extends SeedDMS_Controller_Common {
 				}
 			}
 
+			if($fulltextservice && ($index = $fulltextservice->Indexer()) && $folder) {
+				$idoc = $fulltextservice->IndexedDocument($folder);
+				if(false !== $this->callHook('preIndexFolder', $folder, $idoc)) {
+					$index->addDocument($idoc);
+					$index->commit();
+				}
+			}
+ 
 		} elseif($result === false) {
 			if(empty($this->errormsg))
 				$this->errormsg = 'hook_editFolder_failed';

From 6b77e914d6f0c6d066aa74c3dbc56ad744d747c0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Dec 2020 07:53:51 +0100
Subject: [PATCH 305/312] pass fulltextservice to controller

---
 op/op.EditFolder.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/op/op.EditFolder.php b/op/op.EditFolder.php
index 6ea93f654..ea2c61510 100644
--- a/op/op.EditFolder.php
+++ b/op/op.EditFolder.php
@@ -74,6 +74,7 @@ $oldattributes = array();
 foreach($folder->getAttributes() as $ai=>$aa)
 	$oldattributes[$ai] = clone $aa;
 
+$controller->setParam('fulltextservice', $fulltextservice);
 $controller->setParam('folder', $folder);
 $controller->setParam('name', $name);
 $controller->setParam('comment', $comment);

From df29339c286d19948be4a7637cb7d2b44cdeadf8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Dec 2020 07:55:34 +0100
Subject: [PATCH 306/312] call hook postAddSubfoder, add folder to fulltext
 index

---
 op/op.AddSubFolder.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/op/op.AddSubFolder.php b/op/op.AddSubFolder.php
index 19012dd46..c7fe9f600 100644
--- a/op/op.AddSubFolder.php
+++ b/op/op.AddSubFolder.php
@@ -108,6 +108,7 @@ if(!$settings->_enableDuplicateSubFolderNames) {
 	}
 }
 
+$controller->setParam('fulltextservice', $fulltextservice);
 $controller->setParam('folder', $folder);
 $controller->setParam('name', $name);
 $controller->setParam('comment', $comment);

From 8bc8b3ae139a8daae1cb5cdae192f041cceaa413 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Dec 2020 07:56:15 +0100
Subject: [PATCH 307/312] call postAddSubfolder, add folder to fulltext index

---
 controllers/class.AddSubFolder.php | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/controllers/class.AddSubFolder.php b/controllers/class.AddSubFolder.php
index 539dcec12..68a5d7c0d 100644
--- a/controllers/class.AddSubFolder.php
+++ b/controllers/class.AddSubFolder.php
@@ -33,7 +33,7 @@ class SeedDMS_Controller_AddSubFolder extends SeedDMS_Controller_Common {
 		if(false === $this->callHook('preAddSubFolder')) {
 			if(empty($this->errormsg))
 				$this->errormsg = 'hook_preAddSubFolder_failed';
-			return null;
+			return false;
 		}
 
 		$name = $this->getParam('name');
@@ -61,8 +61,8 @@ class SeedDMS_Controller_AddSubFolder extends SeedDMS_Controller_Common {
 		$notificationgroups = $this->getParam('notificationgroups');
 		$notificationusers = $this->getParam('notificationusers');
 
-		$result = $this->callHook('addSubFolder');
-		if($result === null) {
+		$subFolder = $this->callHook('addSubFolder');
+		if($subFolder === null) {
 			$subFolder = $folder->addSubFolder($name, $comment, $user, $sequence, $attributes);
 			if (!is_object($subFolder)) {
 				$this->errormsg = "error_occured";
@@ -77,13 +77,27 @@ class SeedDMS_Controller_AddSubFolder extends SeedDMS_Controller_Common {
 				if($subFolder->getGroupAccessMode($notgroup) >= M_READ)
 					$res = $subFolder->addNotify($notgroup->getID(), false);
 			}
-
-			if(!$this->callHook('postAddSubFolder', $subFolder)) {
-			}
-			$result = $subFolder;
+		} elseif($subFolder === false) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_addFolder_failed';
+			return false;
 		}
 
-		return $result;
+		if($fulltextservice && ($index = $fulltextservice->Indexer()) && $document) {
+			$idoc = $fulltextservice->IndexedDocument($subFolder);
+			if(false !== $this->callHook('preIndexFolder', $document, $idoc)) {
+				$index->addDocument($idoc);
+				$index->commit();
+			}
+		}
+
+		if(false === $this->callHook('postAddSubFolder', $subFolder)) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_postAddSubFoder_failed';
+			return false;
+		}
+
+		return $subFolder;
 	} /* }}} */
 }
 

From 40fc45473c5b365a4c6082b7672d977b17dade0a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Dec 2020 07:56:50 +0100
Subject: [PATCH 308/312] add changes in 5.1.21

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index d227fd8cb..272400188 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -23,6 +23,7 @@
 - reindex document after it was edited
 - show preview images in drop folder menu after mouse over
 - add support for indexing folders
+- always call hook postAddSubFolder and postEditDocument
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.20

From 2d2375729e72a77452a0ab5a90e04573ffe2c88d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Dec 2020 07:58:34 +0100
Subject: [PATCH 309/312] get fulltextservice

---
 controllers/class.AddSubFolder.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/controllers/class.AddSubFolder.php b/controllers/class.AddSubFolder.php
index 68a5d7c0d..d39d10cf6 100644
--- a/controllers/class.AddSubFolder.php
+++ b/controllers/class.AddSubFolder.php
@@ -25,6 +25,7 @@ class SeedDMS_Controller_AddSubFolder extends SeedDMS_Controller_Common {
 	public function run() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$fulltextservice = $this->params['fulltextservice'];
 		$folder = $this->params['folder'];
 
 		/* Call preAddSubFolder early, because it might need to modify some

From 416568f1c49873970ec5f7683ab06baa68431563 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Dec 2020 08:02:02 +0100
Subject: [PATCH 310/312] fix indexing new folder

---
 controllers/class.AddSubFolder.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/controllers/class.AddSubFolder.php b/controllers/class.AddSubFolder.php
index d39d10cf6..9b1835a12 100644
--- a/controllers/class.AddSubFolder.php
+++ b/controllers/class.AddSubFolder.php
@@ -84,9 +84,9 @@ class SeedDMS_Controller_AddSubFolder extends SeedDMS_Controller_Common {
 			return false;
 		}
 
-		if($fulltextservice && ($index = $fulltextservice->Indexer()) && $document) {
+		if($fulltextservice && ($index = $fulltextservice->Indexer()) && $subFolder) {
 			$idoc = $fulltextservice->IndexedDocument($subFolder);
-			if(false !== $this->callHook('preIndexFolder', $document, $idoc)) {
+			if(false !== $this->callHook('preIndexFolder', $subFolder, $idoc)) {
 				$index->addDocument($idoc);
 				$index->commit();
 			}

From e69f7125bc5ced576c92ebfe08d5797fd803988f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Dec 2020 10:44:32 +0100
Subject: [PATCH 311/312] check if query term already has a trailing '*'

---
 SeedDMS_Lucene/Lucene/Search.php       | 6 ++++--
 SeedDMS_SQLiteFTS/SQLiteFTS/Search.php | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Lucene/Lucene/Search.php b/SeedDMS_Lucene/Lucene/Search.php
index 330ceacc5..5911360e3 100644
--- a/SeedDMS_Lucene/Lucene/Search.php
+++ b/SeedDMS_Lucene/Lucene/Search.php
@@ -72,8 +72,10 @@ class SeedDMS_Lucene_Search {
 	 */
 	function search($term, $fields=array(), $limit=array()) { /* {{{ */
 		$querystr = '';
-		if($term)
-			$querystr .= trim($term);
+		$term = trim($term);
+		if($term) {
+			$querystr = substr($term, -1) != '*' ? $term.'*' : $term;
+		}
 		if(!empty($fields['owner'])) {
 			if(is_string($owner)) {
 				if($querystr)
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
index 8f4fed509..75b840b1e 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
@@ -72,8 +72,10 @@ class SeedDMS_SQliteFTS_Search {
 	 */
 	function search($term, $fields=array(), $limit=array()) { /* {{{ */
 		$querystr = '';
-		if($term)
-			$querystr .= trim($term);
+		$term = trim($term);
+		if($term) {
+			$querystr = substr($term, -1) != '*' ? $term.'*' : $term;
+		}
 		if(!empty($fields['owner'])) {
 			if(is_string($fields['owner'])) {
 				if($querystr)

From 31e45022f142188cb6d1d9442ae635cf0fc80455 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Dec 2020 10:46:05 +0100
Subject: [PATCH 312/312] fix checking if search result came from database or
 fulltext

---
 out/out.Search.php               | 8 ++++++--
 views/bootstrap/class.Search.php | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index 2cb15b8b7..9c8ccf174 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -60,7 +60,7 @@ if (isset($_GET["navBar"])) {
 
 $accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
 
-if((!empty($_GET["fullsearch"]) || $settings->_defaultSearchMethod == 'fulltext') && $settings->_enableFullSearch) {
+if(((!isset($_GET["fullsearch"]) && $settings->_defaultSearchMethod == 'fulltext') || !empty($_GET["fullsearch"])) && $settings->_enableFullSearch) {
 // Search in Fulltext {{{
 	if (isset($_GET["query"]) && is_string($_GET["query"])) {
 		$query = $_GET["query"];
@@ -188,6 +188,7 @@ if((!empty($_GET["fullsearch"]) || $settings->_defaultSearchMethod == 'fulltext'
 				$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('splash_invalid_searchterm')));
 				$dcount = 0;
 				$fcount = 0;
+				$total = 0;
 				$totalPages = 0;
 				$entries = array();
 				$facets = array();
@@ -227,6 +228,7 @@ if((!empty($_GET["fullsearch"]) || $settings->_defaultSearchMethod == 'fulltext'
 					$totalPages = 1;
 				}
 			}
+			$total = $searchresult['total'];
 			$searchTime = getTime() - $startTime;
 			$searchTime = round($searchTime, 2);
 		} else {
@@ -480,6 +482,7 @@ if((!empty($_GET["fullsearch"]) || $settings->_defaultSearchMethod == 'fulltext'
 		'expirationenddate'=>$expirationdate ? $expstopdate : array(),
 		'orderby'=>$orderby
 	));
+	$total = $resArr['totalDocs'] + $res['totalFolders'];
 	$searchTime = getTime() - $startTime;
 	$searchTime = round($searchTime, 2);
 
@@ -535,9 +538,10 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
 		$view->setParam('showtree', showtree());
 		$view->setParam('enableRecursiveCount', $settings->_enableRecursiveCount);
 		$view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount);
+		$view->setParam('total', $total);
 		$view->setParam('totaldocs', $dcount /*resArr['totalDocs']*/);
 		$view->setParam('totalfolders', $fcount /*resArr['totalFolders']*/);
-		$view->setParam('fullsearch', ((!empty($_GET["fullsearch"]) || $settings->_defaultSearchMethod == 'fulltext') && $settings->_enableFullSearch) ? true : false);
+		$view->setParam('fullsearch', (!empty($_GET["fullsearch"]) && $settings->_enableFullSearch) ? true : false);
 		$view->setParam('mode', isset($mode) ? $mode : '');
 		$view->setParam('orderby', isset($orderby) ? $orderby : '');
 		$view->setParam('defaultsearchmethod', !empty($_GET["fullsearch"]) || $settings->_defaultSearchMethod);
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 12487eef8..df7974131 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -182,6 +182,7 @@ function typeahead() { /* {{{ */
 	<div class="tab-content">
 	  <div class="tab-pane <?php echo ($fullsearch == false) ? 'active' : ''; ?>" id="database">
 <form action="../out/out.Search.php" name="form1">
+<input type="hidden" name="fullsearch" value="0" />
 <?php
 // Database search Form {{{
 		$this->contentContainerStart();