From c56901147b6fc5eb0ddaaa12630e8baa0b17447c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 12 May 2021 15:32:25 +0200
Subject: [PATCH 001/143] add class action-list to list of version actions

---
 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 99ffbcaab..497c9dda6 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -444,7 +444,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 	} /* }}} */
 
 	protected function showActions($items) { /* {{{ */
-		print "<ul class=\"nav nav-pills mb-4\">";
+		print "<ul class=\"action-list nav nav-pills mb-4\">";
 		foreach($items as $item) {
 			if(is_string($item))
 				echo "<li class=\"nav-item\">".$item."</li>";

From 0b2ba1a8936aa408681e015f89ef79a70db2a1c8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 13 May 2021 16:46:18 +0200
Subject: [PATCH 002/143] fix layout of filter field

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

diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index 9dc1921a8..4ec1e035a 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -276,7 +276,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
 		</ul>
 		<div class="tab-content">
 			<div class="tab-pane <?php if(!$currenttab || $currenttab == 'installed') echo 'active'; ?>" id="installed" role="tabpanel">
-			<input id="extensionfilter" type="text">
+			<input id="extensionfilter" class="form-control" type="text" placeholder="<?= getMLText('type_to_filter'); ?>">
 	<div class="ajax" data-view="ExtensionMgr" data-action="installedList"></div>
 <?php
 //		$this->installedList();

From e76581f5b1f0bf70b0ab900a0ab0d588c24af9f9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 13 May 2021 17:01:55 +0200
Subject: [PATCH 003/143] add new and some missing translations

---
 languages/ar_EG/lang.inc |   9 +++
 languages/bg_BG/lang.inc |   9 +++
 languages/ca_ES/lang.inc |   9 +++
 languages/cs_CZ/lang.inc |   9 +++
 languages/de_DE/lang.inc |  33 ++++++----
 languages/el_GR/lang.inc |   9 +++
 languages/en_GB/lang.inc |  39 +++++++-----
 languages/es_ES/lang.inc |   9 +++
 languages/fr_FR/lang.inc | 127 +++++++++++++++++++++------------------
 languages/hr_HR/lang.inc |   9 +++
 languages/hu_HU/lang.inc |   9 +++
 languages/it_IT/lang.inc |   9 +++
 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 |   9 +++
 languages/sk_SK/lang.inc |   9 +++
 languages/sv_SE/lang.inc |   9 +++
 languages/tr_TR/lang.inc |   9 +++
 languages/uk_UA/lang.inc |   9 +++
 languages/zh_CN/lang.inc |   9 +++
 languages/zh_TW/lang.inc |   9 +++
 26 files changed, 322 insertions(+), 84 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 7976d05e8..3d9ce60ba 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -95,6 +95,7 @@ URL: [url]',
 'all_users' => 'كل المستخدمين',
 'already_subscribed' => 'بالفعل مشترك',
 'and' => 'و',
+'apikey' => '',
 'apply' => 'تطبيق',
 'approvals_accepted' => 'موافقةالطلب',
 'approvals_accepted_latest' => '',
@@ -257,6 +258,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => 'لم يتم تغيير سحب الملف',
 'checkin_document' => 'ملف',
 'checkoutpath_does_not_exist' => 'سير السحب غير موجود',
+'checkout_cancel_confirm' => '',
 'checkout_document' => 'سحب الملف',
 'checkout_is_disabled' => 'السحب معطل',
 'choose_attrdef' => 'من فضلك اختر تعريف السمة',
@@ -837,6 +839,7 @@ URL: [url]',
 'my_transmittals' => 'الإحالات الخاصة بي',
 'name' => 'اسم',
 'nav_brand_admin_tools' => 'أدوات-الإدارة',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => 'حسابي',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -965,6 +968,8 @@ URL: [url]',
 'password_forgotten_send_hash' => 'تم ارسال التعليمات اللازمة لبريدك الالكتروني',
 'password_forgotten_text' => 'قم بملء النموذج التالي واتبع التعليمات التى سيتم ارسالها اليك بالبريد الالكتروني',
 'password_forgotten_title' => 'ارسال كلمة السر',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => 'تكرار كلمة السر',
 'password_send' => 'أرسل كلمة السر',
 'password_send_text' => 'أرسل نموذج كلمة السر',
@@ -1182,6 +1187,7 @@ URL: [url]',
 'search' => 'البحث',
 'search_fulltext' => 'بحث في النص الكامل',
 'search_in' => 'بحث في',
+'search_mode' => '',
 'search_mode_and' => 'كل الكلمات',
 'search_mode_documents' => 'وضع البحث عن مستندات',
 'search_mode_folders' => 'وضع البحث عن مجلدات',
@@ -1223,6 +1229,7 @@ URL: [url]',
 'select_mimetype' => '',
 'select_one' => 'اختر واحد',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => 'اختر مستخدم',
 'select_users' => 'اضغط لاختيار المستخدم',
 'select_value' => 'ًاختار قيمة',
@@ -1813,6 +1820,7 @@ URL: [url]',
 'timeline_skip_add_file' => 'تخطى وأضف ملف',
 'timeline_skip_scheduled_revision' => 'تخطي المراجعة المحددة في التاريخ',
 'timeline_skip_status_change_-1' => 'تخطي تغيير الحالة -1',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => 'تخطي تغيير الحالة -3',
 'timeline_skip_status_change_0' => 'تخطي تغيير الحالة 0',
 'timeline_skip_status_change_1' => 'تخطي تغيير الحالة 1',
@@ -1871,6 +1879,7 @@ URL: [url]',
 'unknown_id' => 'معرف مجهول',
 'unknown_keyword_category' => 'قسم مجهول',
 'unknown_owner' => 'معرف مالك مجهول',
+'unknown_status' => '',
 'unknown_user' => 'معرف مستخدم مجهول',
 'unlinked_content' => 'محتوى غير مربوط',
 'unlinked_documents' => 'مستندات غير مربوطة',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index bda2b786d..82d16f625 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -91,6 +91,7 @@ $text = array(
 'all_users' => 'Всички потребители',
 'already_subscribed' => 'Вече е подписан',
 'and' => 'и',
+'apikey' => '',
 'apply' => 'Приложи',
 'approvals_accepted' => '',
 'approvals_accepted_latest' => '',
@@ -240,6 +241,7 @@ $text = array(
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '',
 'checkoutpath_does_not_exist' => '',
+'checkout_cancel_confirm' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
 'choose_attrdef' => 'Изберете attribute definition',
@@ -766,6 +768,7 @@ $text = array(
 'my_transmittals' => 'Моите предавания',
 'name' => 'Име',
 'nav_brand_admin_tools' => 'Администрация',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => 'Моя акаунт',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -864,6 +867,8 @@ $text = array(
 'password_forgotten_send_hash' => 'Инструкциите са изпратени на email',
 'password_forgotten_text' => 'Попълнете формата и следвайте инструкциите в писмото',
 'password_forgotten_title' => 'Парола изпратена',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => 'Повторете паролата',
 'password_send' => '',
 'password_send_text' => '',
@@ -1045,6 +1050,7 @@ $text = array(
 'search' => 'Търсене',
 'search_fulltext' => 'Пълнотекстово търсене',
 'search_in' => 'Търси в',
+'search_mode' => '',
 'search_mode_and' => 'всички думи',
 'search_mode_documents' => '',
 'search_mode_folders' => '',
@@ -1086,6 +1092,7 @@ $text = array(
 'select_mimetype' => '',
 'select_one' => 'Избери един',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => '',
 'select_users' => 'Кликни да избереш потребители',
 'select_value' => 'Избери стойност',
@@ -1676,6 +1683,7 @@ $text = array(
 'timeline_skip_add_file' => '',
 'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => '',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => '',
 'timeline_skip_status_change_0' => '',
 'timeline_skip_status_change_1' => '',
@@ -1725,6 +1733,7 @@ $text = array(
 'unknown_id' => 'неизвестен идентификатор',
 'unknown_keyword_category' => 'Неизвестна категория',
 'unknown_owner' => 'Неизвестен идентификатор на собственик',
+'unknown_status' => '',
 'unknown_user' => 'Неизвестен идентификатор на потребител',
 'unlinked_content' => 'Несвързано съдържание',
 'unlinked_documents' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index d808086f3..0a34c6df0 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -91,6 +91,7 @@ $text = array(
 'all_users' => 'Tots els usuaris',
 'already_subscribed' => 'Ja està subscrit',
 'and' => 'i',
+'apikey' => '',
 'apply' => 'Apply',
 'approvals_accepted' => '',
 'approvals_accepted_latest' => '',
@@ -245,6 +246,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '',
 'checkoutpath_does_not_exist' => '',
+'checkout_cancel_confirm' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
 'choose_attrdef' => '',
@@ -771,6 +773,7 @@ URL: [url]',
 'my_transmittals' => 'Documents enviats per mi',
 'name' => 'Nom',
 'nav_brand_admin_tools' => 'Eines d\'administració',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => 'El meu compte',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -869,6 +872,8 @@ URL: [url]',
 'password_forgotten_send_hash' => '',
 'password_forgotten_text' => '',
 'password_forgotten_title' => '',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => '',
 'password_send' => '',
 'password_send_text' => '',
@@ -1050,6 +1055,7 @@ URL: [url]',
 'search' => 'Cercar',
 'search_fulltext' => 'Search in fulltext',
 'search_in' => 'Buscar a',
+'search_mode' => '',
 'search_mode_and' => 'tots els mots',
 'search_mode_documents' => '',
 'search_mode_folders' => 'Només carpetes',
@@ -1091,6 +1097,7 @@ URL: [url]',
 'select_mimetype' => '',
 'select_one' => 'Seleccionar un',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => 'Seleccionar usuari',
 'select_users' => 'Prem per seleccionar els usuaris',
 'select_value' => 'Selecciona un valor',
@@ -1681,6 +1688,7 @@ URL: [url]',
 'timeline_skip_add_file' => '',
 'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => '',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => '',
 'timeline_skip_status_change_0' => '',
 'timeline_skip_status_change_1' => '',
@@ -1730,6 +1738,7 @@ URL: [url]',
 'unknown_id' => 'Id desconegut',
 'unknown_keyword_category' => 'Categoria desconeguda',
 'unknown_owner' => 'Id de propietari/a desconegut',
+'unknown_status' => '',
 'unknown_user' => 'ID d\'usuari desconegut',
 'unlinked_content' => '',
 'unlinked_documents' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 90d8cf129..b0d9e73c0 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -95,6 +95,7 @@ URL: [url]',
 'all_users' => 'Všichni uživatelé',
 'already_subscribed' => 'Již odebráno',
 'and' => 'a',
+'apikey' => '',
 'apply' => 'Použít',
 'approvals_accepted' => '[no_approvals] schválení již schváleno',
 'approvals_accepted_latest' => '',
@@ -269,6 +270,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => 'Soubor dokumentu, který jste zkontrolovali, je stále nezměněn. Přihlášení nebude možné. Pokud neplánujete žádné úpravy, můžete resetovat stav odhlášení.',
 'checkin_document' => 'Kontrolovat',
 'checkoutpath_does_not_exist' => 'Cesta ke kontrole neexistuje',
+'checkout_cancel_confirm' => '',
 'checkout_document' => 'Zkontrolovat',
 'checkout_is_disabled' => 'Kontrola dokumentů je zakázána v konfiguraci.',
 'choose_attrdef' => 'Zvolte definici atributů',
@@ -868,6 +870,7 @@ URL: [url]',
 'my_transmittals' => 'Moje přenosy',
 'name' => 'Název',
 'nav_brand_admin_tools' => 'Nástroje správce',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => 'Můj účet',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -1000,6 +1003,8 @@ Pokud budete mít problém s přihlášením i po změně hesla, kontaktujte Adm
 'password_forgotten_send_hash' => 'Instrukce byly poslány uživateli na emailovou adresu.',
 'password_forgotten_text' => 'Vyplňte následující formulář a následujte instrukce v emailu, který vám bude odeslán.',
 'password_forgotten_title' => 'Heslo odesláno',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => 'Opakujte heslo',
 'password_send' => 'Heslo odesláno',
 'password_send_text' => 'Vaše nové heslo bylo odesláno a zadanou emailovou adresu, pokud pro přihlašovací jméno a email existuje uživatel. Pokud neobdržíte email během příštích minut, pak se ujistěte se, že přihlašovací jméno a email jsou správné a proces zopakujte.',
@@ -1249,6 +1254,7 @@ URL: [url]',
 'search' => 'Hledat',
 'search_fulltext' => 'Vyhledat fulltextově',
 'search_in' => 'Prohledávat',
+'search_mode' => '',
 'search_mode_and' => 'všechna slova',
 'search_mode_documents' => 'Pouze dokumenty',
 'search_mode_folders' => 'Pouze složky',
@@ -1290,6 +1296,7 @@ URL: [url]',
 'select_mimetype' => '',
 'select_one' => 'Vybrat jeden',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => 'Vybrat uživatele',
 'select_users' => 'Kliknutím vybrat uživatele',
 'select_value' => 'Vybrat hodnotu',
@@ -1885,6 +1892,7 @@ Jméno: [username]
 'timeline_skip_add_file' => 'příloha byla přidána',
 'timeline_skip_scheduled_revision' => 'Plánovaná revize',
 'timeline_skip_status_change_-1' => 'zamítnuto',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => 'vypršela platnost',
 'timeline_skip_status_change_0' => 'čeká na přezkum',
 'timeline_skip_status_change_1' => 'čeká na schválení',
@@ -1943,6 +1951,7 @@ URL: [url]',
 'unknown_id' => 'neznámé id',
 'unknown_keyword_category' => 'Neznámá kategorie',
 'unknown_owner' => 'Neznámé ID vlastníka',
+'unknown_status' => '',
 'unknown_user' => 'Neznámé ID uživatele',
 'unlinked_content' => 'Nepropojený obsah',
 'unlinked_documents' => 'Nepropojené dokumenty',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 7c4c37b45..1b2a4dc33 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 (2886), dgrutsch (22)
+//    Translators: Admin (2906), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -95,6 +95,7 @@ URL: [url]',
 'all_users' => 'Alle Benutzer',
 'already_subscribed' => 'Bereits abonniert',
 'and' => 'und',
+'apikey' => 'API-Schlüssel',
 'apply' => 'Anwenden',
 'approvals_accepted' => '[no_approvals] Freigaben',
 'approvals_accepted_latest' => '(davon [no_approvals] in letzter Version)',
@@ -269,6 +270,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => 'Die Datei des ausgecheckten Dokuments ist noch unverändert. Das Einchecken ist daher nicht möglich. Wenn Sie keine weiteren Änderungen am Dokument vornehmen möchten, dann setzen Sie den CheckOut-Status zurück.',
 'checkin_document' => 'Einchecken',
 'checkoutpath_does_not_exist' => 'Verzeichnis für das Auschecken von Dokumenten exisitiert nicht',
+'checkout_cancel_confirm' => 'Beenden des Checkouts bestätigen',
 'checkout_document' => 'Auschecken',
 'checkout_is_disabled' => 'Auschecken von Dokumenten ist in der Konfiguration ausgeschaltet.',
 'choose_attrdef' => 'Attributdefinition wählen',
@@ -487,7 +489,7 @@ URL: [url]',
 'draft' => 'Entwurf',
 'draft_pending_approval' => 'Freigabe erforderlich',
 'draft_pending_review' => 'Prüfung erforderlich',
-'drag_icon_here' => 'Icon eines Ordners oder Dokuments hier hin ziehen!',
+'drag_icon_here' => 'Ordners oder Dokument hier hin ziehen!',
 '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',
@@ -501,17 +503,17 @@ URL: [url]',
 'duplicates' => 'Duplikate',
 'duplicate_content' => 'Doppelte Dateien',
 'edit' => 'Bearbeiten',
-'edit_attributes' => 'Edit attributes',
+'edit_attributes' => 'Attribute bearbeiten',
 'edit_comment' => 'Kommentar bearbeiten',
 'edit_default_keywords' => 'Stichworte bearbeiten',
-'edit_document_access' => 'Zugriffsrechte bearbeiten',
+'edit_document_access' => 'Zugriffsrechte',
 'edit_document_notify' => 'Beobachtung von Dokumenten',
 'edit_document_props' => 'Bearbeiten',
 'edit_event' => 'Ereignis editieren',
 'edit_existing_access' => 'Bestehende Berechtigungen bearbeiten',
 'edit_existing_attribute_groups' => 'Attributgruppen bearbeiten',
 'edit_existing_notify' => 'Beobachter bearbeiten',
-'edit_folder_access' => 'Zugriffsrechte bearbeiten',
+'edit_folder_access' => 'Zugriffsrechte',
 'edit_folder_attrdefgrp' => 'Attributgruppen bearbeiten',
 'edit_folder_notify' => 'Beobachtung von Ordnern',
 'edit_folder_props' => 'Bearbeiten',
@@ -868,6 +870,7 @@ URL: [url]',
 'my_transmittals' => 'Meine Dokumentenlisten',
 'name' => 'Name',
 'nav_brand_admin_tools' => 'Administration',
+'nav_brand_calendar' => 'Kalender',
 'nav_brand_my_account' => 'Mein Profil',
 'nav_brand_my_documents' => 'Meine Dokumente',
 'nav_brand_view_document' => 'Dokument',
@@ -1003,6 +1006,8 @@ Sollen Sie danach immer noch Probleme bei der Anmeldung haben, dann kontaktieren
 'password_forgotten_send_hash' => 'Anweisungen zum weiteren Vorgehen wurden an die E-Mail Adresse des Benutzers versandt',
 'password_forgotten_text' => 'Füllen Sie bitte untenstehendes Formular aus. Weitere Anweisungen erhalten Sie dann in einer E-Mail die an Sie gesandt wird',
 'password_forgotten_title' => 'Passwort gesendet',
+'password_mismatch_error' => 'Passwörter sind nicht identisch',
+'password_mismatch_error_title' => 'Passwörter sind nicht identisch',
 'password_repeat' => 'Passwort wiederholen',
 'password_send' => 'Passwort verschickt',
 'password_send_text' => 'Ihr neues Passwort wurde an die angegebene E-Mail-Adresse versandt, wenn ein Benutzer mit diesem Login und dieser E-Mail-Adresse existiert. Sollten Sie innerhalb der nächsten Minuten keine E-Mail bekommen, dann überprüfen Sie nochmal die Angaben und wiederholen Sie den Vorgang.',
@@ -1260,6 +1265,7 @@ URL: [url]',
 'search' => 'Suchen',
 'search_fulltext' => 'Suche im Volltext',
 'search_in' => 'Suchen in',
+'search_mode' => 'Suchmodus',
 'search_mode_and' => 'alle Begriffe',
 'search_mode_documents' => 'Nur Dokumente',
 'search_mode_folders' => 'Nur Ordner',
@@ -1301,6 +1307,7 @@ URL: [url]',
 'select_mimetype' => 'Klicken zur Auswahl eines Mimetypes',
 'select_one' => 'Bitte wählen',
 'select_owner' => 'Klicken zur Auswahl eines Besitzers',
+'select_status' => 'Klicken zur Auswaohl des Dokumentstatus',
 'select_user' => 'Benutzer auswählen',
 'select_users' => 'Klicken zur Auswahl eines Benutzers',
 'select_value' => 'Wert auswählen',
@@ -1312,7 +1319,9 @@ URL: [url]',
 Login: [login]
 Name: [username]
 
-[comment]',
+[comment]
+
+Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Vergessen-Funktion auf der Anmeldeseite, um ein neues Passwort zu setzen.',
 'send_login_data_subject' => '[sitename]: [login] - Ihre Login-Daten',
 'send_test_mail' => 'Sende Test-E-mail',
 'september' => 'September',
@@ -1896,12 +1905,13 @@ Name: [username]
 'timeline_skip_add_file' => 'Anhang hinzugefügt',
 'timeline_skip_scheduled_revision' => 'Geplante Wiederholungsprüfung',
 'timeline_skip_status_change_-1' => 'abgelehnt',
+'timeline_skip_status_change_-2' => 'veraltet',
 'timeline_skip_status_change_-3' => 'abgelaufen',
-'timeline_skip_status_change_0' => 'bevorstehende Prüfung',
-'timeline_skip_status_change_1' => 'bevorstehende Freigabe',
+'timeline_skip_status_change_0' => 'Prüfung erforderlich',
+'timeline_skip_status_change_1' => 'Freigabe erforderlich',
 'timeline_skip_status_change_2' => 'freigegeben',
 'timeline_skip_status_change_3' => 'im Workflow',
-'timeline_skip_status_change_4' => 'In Revision',
+'timeline_skip_status_change_4' => 'Wiederholungsprüfung erforderlich',
 'timeline_skip_status_change_5' => 'Entwurf',
 'timeline_status_change' => 'Version [version]: [status]',
 'to' => 'bis',
@@ -1947,13 +1957,14 @@ URL: [url]',
 'type_to_search' => 'Hier tippen zum Suchen',
 'uk_UA' => 'Ukrainisch',
 'under_folder' => 'In Ordner',
-'unknown_attrdef' => 'Unbekannte Attributdefinition',
+'unknown_attrdef' => 'unbekannte Attributdefinition',
 'unknown_command' => 'unbekannter Befehl',
-'unknown_document_category' => 'Unbekannte Kategorie',
+'unknown_document_category' => 'unbekannte Kategorie',
 'unknown_group' => 'unbekannte Gruppenidentifikation',
 'unknown_id' => 'unbekannte id',
 'unknown_keyword_category' => 'unbekannte Kategorie',
 'unknown_owner' => 'unbekannte Besitzeridentifikation',
+'unknown_status' => 'unbekannter Status',
 'unknown_user' => 'unbekannte Benutzeridentifikation',
 'unlinked_content' => 'Dokumenteninhalt ohne Dokument',
 'unlinked_documents' => 'Nicht verknüpfte Dokumente',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index e91a3c4db..be780a748 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -91,6 +91,7 @@ $text = array(
 'all_users' => 'Όλοι οι Χρήστες',
 'already_subscribed' => '',
 'and' => 'και',
+'apikey' => '',
 'apply' => 'Apply',
 'approvals_accepted' => '',
 'approvals_accepted_latest' => '',
@@ -240,6 +241,7 @@ $text = array(
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '',
 'checkoutpath_does_not_exist' => '',
+'checkout_cancel_confirm' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
 'choose_attrdef' => '',
@@ -766,6 +768,7 @@ $text = array(
 'my_transmittals' => 'Οι Διαβιβάσεις μου',
 'name' => 'Όνομα',
 'nav_brand_admin_tools' => 'Εργαλεία',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => '',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -875,6 +878,8 @@ URL: [url]',
 'password_forgotten_send_hash' => '',
 'password_forgotten_text' => '',
 'password_forgotten_title' => '',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => '',
 'password_send' => '',
 'password_send_text' => '',
@@ -1056,6 +1061,7 @@ URL: [url]',
 'search' => 'Αναζήτηση',
 'search_fulltext' => '',
 'search_in' => '',
+'search_mode' => '',
 'search_mode_and' => '',
 'search_mode_documents' => '',
 'search_mode_folders' => '',
@@ -1097,6 +1103,7 @@ URL: [url]',
 'select_mimetype' => '',
 'select_one' => 'Επιλογή',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => 'Επιλογή χρήστη',
 'select_users' => 'Κάντε κλικ για να επιλέξετε χρήστες',
 'select_value' => 'Επιλέξτε τιμή',
@@ -1687,6 +1694,7 @@ URL: [url]',
 'timeline_skip_add_file' => 'Η προσθήκη ολοκληρώθηκε',
 'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'Απορριφθέντα',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => 'Ληγμένα',
 'timeline_skip_status_change_0' => 'Προς ενημέρωση',
 'timeline_skip_status_change_1' => 'Προς έγκριση',
@@ -1736,6 +1744,7 @@ URL: [url]',
 'unknown_id' => '',
 'unknown_keyword_category' => '',
 'unknown_owner' => '',
+'unknown_status' => '',
 'unknown_user' => '',
 'unlinked_content' => '',
 'unlinked_documents' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index fbb6a800a..c98e46e1d 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 (1996), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (2010), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -95,6 +95,7 @@ URL: [url]',
 'all_users' => 'All users',
 'already_subscribed' => 'Already subscribed',
 'and' => 'and',
+'apikey' => 'API key',
 'apply' => 'Apply',
 'approvals_accepted' => '[no_approvals] approvals already accepted',
 'approvals_accepted_latest' => '(being [no_approvals] in latest version)',
@@ -269,6 +270,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => 'The file of the checked out document is still unchanged. Check in will not be possible. If do not plan any modifications, you can reset the check out status.',
 'checkin_document' => 'Check In',
 'checkoutpath_does_not_exist' => 'Checkout path does not exists',
+'checkout_cancel_confirm' => 'Confirm to cancel checkout',
 'checkout_document' => 'Check out',
 'checkout_is_disabled' => 'Check out of documents is disabled in the configuration.',
 'choose_attrdef' => 'Please choose attribute definition',
@@ -487,7 +489,7 @@ URL: [url]',
 'draft' => 'Draft',
 'draft_pending_approval' => 'pending approval',
 'draft_pending_review' => 'pending review',
-'drag_icon_here' => 'Drag icon of folder or document here!',
+'drag_icon_here' => 'Drag folder or document here!',
 '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',
@@ -504,14 +506,14 @@ URL: [url]',
 'edit_attributes' => 'Edit attributes',
 'edit_comment' => 'Edit comment',
 'edit_default_keywords' => 'Edit keywords',
-'edit_document_access' => 'Edit Access',
+'edit_document_access' => 'Access rights',
 'edit_document_notify' => 'Document Notification List',
 'edit_document_props' => 'Edit document',
 'edit_event' => 'Edit event',
 'edit_existing_access' => 'Edit Access List',
 'edit_existing_attribute_groups' => 'Edit attribute groups',
 'edit_existing_notify' => 'Edit notification list',
-'edit_folder_access' => 'Edit access',
+'edit_folder_access' => 'Access rights',
 'edit_folder_attrdefgrp' => 'Edit attribute groups',
 'edit_folder_notify' => 'Folder Notification List',
 'edit_folder_props' => 'Edit folder',
@@ -868,6 +870,7 @@ URL: [url]',
 'my_transmittals' => 'My Transmittals',
 'name' => 'Name',
 'nav_brand_admin_tools' => 'Admin tools',
+'nav_brand_calendar' => 'Calendar',
 'nav_brand_my_account' => 'My Account',
 'nav_brand_my_documents' => 'My documents',
 'nav_brand_view_document' => 'Document',
@@ -991,19 +994,21 @@ URL: [url]',
 'password_expired' => 'Password expired',
 'password_expires_in_days' => 'Password expires in %s days.',
 'password_forgotten' => 'Password forgotten',
-'password_forgotten_email_body' => 'Dear user of SeedDMS,
-
-we have received a request to change your password.
-
-This can be done by clicking on the following link:
-
-[url_prefix]out/out.ChangePassword.php?hash=[hash]
-
-If you have still problems to login, then please contact your administrator.',
+'password_forgotten_email_body' => 'Dear user of SeedDMS,
+
+we have received a request to change your password.
+
+This can be done by clicking on the following link:
+
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
+
+If you still have problems to login, then please contact your administrator.',
 'password_forgotten_email_subject' => '[sitename]: Password forgotten',
 'password_forgotten_send_hash' => 'Instructions on how to proceed has been send to the user\'s email address',
 'password_forgotten_text' => 'Fill out the form below and follow the instructions in the email, which will be sent to you.',
 'password_forgotten_title' => 'Password sent',
+'password_mismatch_error' => 'Passwords mismatch',
+'password_mismatch_error_title' => 'Passwords mismatch',
 'password_repeat' => 'Repeat password',
 'password_send' => 'Password send',
 'password_send_text' => 'Your new password has been send to the given email address, if the login and email matches an existing user. If you do not receive an email within the next minutes, then make sure both login and email are correct and restart the process again.',
@@ -1254,6 +1259,7 @@ URL: [url]',
 'search' => 'Search',
 'search_fulltext' => 'Search in fulltext',
 'search_in' => 'Search in',
+'search_mode' => 'Search mode',
 'search_mode_and' => 'all words',
 'search_mode_documents' => 'Documents only',
 'search_mode_folders' => 'Folders only',
@@ -1295,6 +1301,7 @@ URL: [url]',
 'select_mimetype' => 'Click to select mimetype',
 'select_one' => 'Select one',
 'select_owner' => 'Click to select owner',
+'select_status' => 'Click to select document status',
 'select_user' => 'Select user',
 'select_users' => 'Click to select users',
 'select_value' => 'Select value',
@@ -1306,7 +1313,9 @@ URL: [url]',
 Login: [login]
 Name: [username]
 
-[comment]',
+[comment]
+
+If you did not receive a password, please use the password forgotten function on the login page to set a new password.',
 'send_login_data_subject' => '[sitename]: [login] - Your login data',
 'send_test_mail' => 'Send test mail',
 'september' => 'September',
@@ -1890,6 +1899,7 @@ Name: [username]
 'timeline_skip_add_file' => 'attachment added',
 'timeline_skip_scheduled_revision' => 'Scheduled revision',
 'timeline_skip_status_change_-1' => 'rejected',
+'timeline_skip_status_change_-2' => 'obsolete',
 'timeline_skip_status_change_-3' => 'expired',
 'timeline_skip_status_change_0' => 'pending review',
 'timeline_skip_status_change_1' => 'pending approval',
@@ -1948,6 +1958,7 @@ URL: [url]',
 'unknown_id' => 'unknown id',
 'unknown_keyword_category' => 'Unknown category',
 'unknown_owner' => 'Unknown owner id',
+'unknown_status' => 'Unknown status',
 'unknown_user' => 'Unknown user id',
 'unlinked_content' => 'Unlinked content',
 'unlinked_documents' => 'Unlinked documents',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 4cbba0183..70f5d8fa8 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -95,6 +95,7 @@ URL: [url]',
 'all_users' => 'Todos los usuarios',
 'already_subscribed' => 'Ya está suscrito',
 'and' => 'y',
+'apikey' => '',
 'apply' => 'Aplicar',
 'approvals_accepted' => '',
 'approvals_accepted_latest' => '',
@@ -264,6 +265,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '',
 'checkoutpath_does_not_exist' => '',
+'checkout_cancel_confirm' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
 'choose_attrdef' => 'Por favor, seleccione definición de atributo',
@@ -844,6 +846,7 @@ URL: [url]',
 'my_transmittals' => 'Mi transmision',
 'name' => 'Nombre',
 'nav_brand_admin_tools' => 'Administración',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => 'Mi cuenta',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -980,6 +983,8 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado
 'password_forgotten_send_hash' => 'Las instrucciones para proceder al cambio se han enviado a la dirección de correo de usuario',
 'password_forgotten_text' => 'Rellene el siguiente formulario y siga las instrucciones del correo que se le enviará.',
 'password_forgotten_title' => 'Envío de contraseña',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => 'Repetir contraseña',
 'password_send' => 'Envío de contraseña',
 'password_send_text' => 'Su nueva contraseña fue enviada al e-mail registrado.',
@@ -1197,6 +1202,7 @@ URL: [url]',
 'search' => 'Buscar',
 'search_fulltext' => 'Buscar en texto completo',
 'search_in' => 'Buscar en',
+'search_mode' => '',
 'search_mode_and' => 'todas las palabras',
 'search_mode_documents' => 'Documentos sólo',
 'search_mode_folders' => 'Carpetas sólo',
@@ -1238,6 +1244,7 @@ URL: [url]',
 'select_mimetype' => '',
 'select_one' => 'Seleccionar uno',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => 'Seleccionar Usuario',
 'select_users' => 'Haga Click para seleccionar usuarios',
 'select_value' => 'Selecciona valor',
@@ -1828,6 +1835,7 @@ URL: [url]',
 'timeline_skip_add_file' => 'anexos agregados',
 'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'rechazado',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => 'expirado',
 'timeline_skip_status_change_0' => 'revisiones pendientes',
 'timeline_skip_status_change_1' => 'aprovaciones pendientes',
@@ -1886,6 +1894,7 @@ URL: [url]',
 'unknown_id' => 'Id desconocido',
 'unknown_keyword_category' => 'Categoría desconocida',
 'unknown_owner' => 'Id de propietario desconocido',
+'unknown_status' => '',
 'unknown_user' => 'ID de usuario desconocido',
 'unlinked_content' => 'Contenido desvinculado',
 'unlinked_documents' => 'Documentos desvinculados',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index e3ee03f37..05afd2c90 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -19,19 +19,19 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1113), jeromerobert (50), lonnnew (9), Oudiceval (977)
+//    Translators: Admin (1113), jeromerobert (50), lonnnew (9), Oudiceval (1038)
 
 $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' => '',
+'abbr_day' => 'j',
+'abbr_hour' => 'h',
+'abbr_minute' => 'min',
+'abbr_month' => 'm.',
+'abbr_second' => 's',
+'abbr_week' => 'sem',
+'abbr_year' => 'an.',
 'accept' => 'Accepter',
 'access_control' => 'Contrôle d’accès',
 'access_control_is_off' => 'Le contrôle d’accès avancé est désactivé',
@@ -95,6 +95,7 @@ URL : [url]',
 'all_users' => 'Tous les utilisateurs',
 'already_subscribed' => 'Déjà abonné',
 'and' => 'et',
+'apikey' => '',
 'apply' => 'Appliquer',
 'approvals_accepted' => '[no_approvals] approbations déjà confirmées',
 'approvals_accepted_latest' => '(dont [no_approvals] dans la dernière version)',
@@ -229,8 +230,8 @@ URL: [url]',
 'calendar' => 'Agenda',
 'calendar_week' => 'Semaine',
 'cancel' => 'Annuler',
-'cancel_checkout' => '',
-'cancel_checkout_warning' => '',
+'cancel_checkout' => 'Annuler la vérification',
+'cancel_checkout_warning' => 'La vérification peut être annulée même si des modifications ont été apportées au fichier. Dans ce cas, le fichier sera supprimé de l\'espace de vérification et votre modification sera perdue.',
 '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',
@@ -262,13 +263,14 @@ URL: [url]',
 'chart_docspermonth_title' => 'Nouveaux documents par mois',
 'chart_docsperstatus_title' => 'Documents par statut',
 'chart_docsperuser_title' => 'Documents par utilisateur',
-'chart_selection' => 'Sélectionnez un graphique',
+'chart_selection' => 'Sélectionner un graphique',
 'chart_sizeperuser_title' => 'Volume par utilisateur',
 'checkedout_file_has_different_version' => 'La version bloquée n’est pas identique à la version actuelle. Le déblocage ne modifiera pas le document.',
 'checkedout_file_has_disappeared' => 'Le fichier du document bloqué n’existe plus. Le déblocage est impossible.',
 'checkedout_file_is_unchanged' => 'Le fichier du document bloqué est inchangé. Le déblocage n’est pas possible. Si vous ne souhaitez pas apporter de modifications, désactivez le blocage.',
 'checkin_document' => 'Débloquer (check-in)',
 'checkoutpath_does_not_exist' => 'Le chemin de vérification n’existe pas',
+'checkout_cancel_confirm' => '',
 'checkout_document' => 'Bloquer (check-out)',
 'checkout_is_disabled' => 'Le blocage (check-out) de documents est désactivé dans la configuration.',
 'choose_attrdef' => 'Choisissez une définition d\'attribut',
@@ -284,7 +286,7 @@ URL: [url]',
 'choose_workflow' => 'Choisir un workflow',
 'choose_workflow_action' => 'Choisir une action de workflow',
 'choose_workflow_state' => 'Choisir un état de workflow',
-'class_finfo_missing' => '',
+'class_finfo_missing' => 'La classe finfo est requise lors du dépôt de nouveaux fichiers pour déterminer le type MIME.',
 'class_name' => 'Nom de classe',
 'clear_cache' => 'Vider le cache',
 'clear_clipboard' => 'Vider le presse-papier',
@@ -363,7 +365,7 @@ URL: [url]',
 'documents_locked' => 'Documents verrouillés',
 'documents_locked_by_you' => 'Documents verrouillés',
 'documents_only' => 'Documents uniquement',
-'documents_rejected' => '',
+'documents_rejected' => 'Rejeté',
 'documents_to_approve' => 'Documents en attente d\'approbation',
 'documents_to_correct' => 'Documents à corriger',
 'documents_to_process' => 'Documents à traiter',
@@ -413,8 +415,8 @@ Utilisateur : [username]',
 'document_has_no_workflow' => 'Le document n\'a pas de workflow',
 'document_infos' => 'Informations sur le document',
 'document_is_checked_out' => '',
-'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_checked_out_remove' => 'Le document est actuellement vérifié. Si vous supprimez le document, la version vérifiée ne pourra plus être ajoutée et restera dans la zone de vérification.',
+'document_is_checked_out_update' => 'Le document est actuellement vérifié. Si vous ajoutez une nouvelle version, la version vérifiée ne pourra plus être vérifiée à nouveau.',
 'document_is_not_locked' => 'Ce document n\'est pas verrouillé',
 'document_link_by' => 'Lié par',
 'document_link_public' => 'Public',
@@ -517,7 +519,7 @@ URL: [url]',
 'edit_folder_props' => 'Modifier le dossier',
 'edit_group' => 'Modifier un groupe',
 'edit_online' => 'Modification en ligne',
-'edit_online_not_allowed' => '',
+'edit_online_not_allowed' => 'Vous n’êtes pas autorisé à modifier ce fichier car vous n’avez pas créé la dernière version. Déposez simplement une nouvelle version du document.',
 'edit_online_warning' => 'L’enregistrement de vos modifications écrasera le contenu de la version actuelle au lieu de créer une nouvelle version.',
 'edit_task' => 'Modifier la tâche',
 'edit_transmittal_props' => 'Modifier les propriétés de la transmission',
@@ -528,9 +530,9 @@ URL: [url]',
 'email' => 'E-mail',
 'email_error_title' => 'Aucun e-mail indiqué',
 'email_footer' => 'Vous pouvez modifier vos notifications via « Mon compte ».',
-'email_footer_html' => '',
+'email_footer_html' => '<p>Vous pouvez modifier vos préférences e-mail à tout moment via \'Mon compte\'</p>',
 'email_header' => 'Ceci est un message automatique généré par le serveur DMS.',
-'email_header_html' => '',
+'email_header_html' => '<p>Ceci est un message automatique du serveur DMS.</p>',
 'email_not_given' => 'Veuillez entrer une adresse e-mail valide.',
 'empty_attribute_group_list' => 'Aucun groupe d’attributs',
 'empty_folder_list' => 'Pas de documents ou de dossier',
@@ -565,7 +567,7 @@ URL: [url]',
 'exclude_items' => 'Exclure des élements',
 'expired' => 'Expiré',
 'expired_at_date' => 'Expiré le [datetime]',
-'expired_docs_mail_subject' => '',
+'expired_docs_mail_subject' => 'Documents expirés',
 'expired_documents' => 'Documents expirés',
 'expires' => 'Expiration',
 'expire_by_date' => 'Expire à une date',
@@ -590,8 +592,8 @@ URL : [url]',
 'export_user_list_csv' => 'Exporter les utilisateurs en CSV',
 'extension_archive' => 'Extension',
 'extension_changelog' => 'Journal des modifications',
-'extension_is_off_now' => '',
-'extension_is_on_now' => '',
+'extension_is_off_now' => 'L’extension est désactivée',
+'extension_is_on_now' => 'L’extension est activée',
 'extension_loading' => 'Chargement des extensions…',
 'extension_manager' => 'Gestionnaire d\'extensions',
 'extension_mgr_error_upload' => 'Erreur lors du chargement de l’extension',
@@ -599,8 +601,8 @@ URL : [url]',
 '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' => 'L’extension chargée n’est pas un dossier zip',
 'extension_mgr_repository' => 'Disponibles',
-'extension_missing_name' => '',
-'extension_toggle_error' => '',
+'extension_missing_name' => 'Nom d’extension manquant',
+'extension_toggle_error' => 'Impossible d’activer/désactiver l’extension',
 'extension_version_list' => 'Versions',
 'february' => 'Février',
 'file' => 'Fichier',
@@ -671,7 +673,7 @@ URL: [url]',
 'fulltextsearch_disabled' => 'La recherche plein texte est désactivée.',
 'fulltext_converters' => 'Conversion des documents pour indexation',
 'fulltext_info' => 'Information sur l\'index plein texte',
-'func_proc_open_missing' => '',
+'func_proc_open_missing' => 'proc_open est nécessaire pour indexer le contenu des documents. Sans cette fonction, seules les métadonnées seront indexées.',
 'global_attributedefinitiongroups' => 'Groupes d’attributs',
 'global_attributedefinitions' => 'Définitions d\'attributs',
 'global_default_keywords' => 'Mots-clés globaux',
@@ -725,12 +727,12 @@ URL: [url]',
 'individuals' => 'Individuels',
 'individuals_in_groups' => 'Membres d’un groupe',
 'info_recipients_tab_not_released' => 'L’accusé de réception pour cette version du document n’est pas possible car la version n’est pas en état « publié ».',
-'info_rm_user_from_processes_user' => '',
+'info_rm_user_from_processes_user' => 'Seules les tâches non traitées peuvent être transférées à un autre utilisateur. Pour les tâches déjà traitées, une entrée sera ajoutée dans l’historique, comme si l’utilisateur lui-même avait été supprimé.',
 'inherited' => 'hérité',
 'inherits_access_copy_msg' => 'Recopier la liste des accès hérités',
 'inherits_access_empty_msg' => 'Commencer avec une liste d\'accès vide',
 'inherits_access_msg' => 'L\'accès est hérité.',
-'installed_apache_extensions' => '',
+'installed_apache_extensions' => 'Extensions Apache installées',
 'installed_php_extensions' => 'Extensions PHP installées',
 'internal_error' => 'Erreur interne',
 'internal_error_exit' => 'Erreur interne. Impossible d\'achever la demande.',
@@ -848,11 +850,11 @@ URL: [url]',
 'missing_checksum' => 'Checksum manquante',
 'missing_file' => 'Fichier manquant',
 'missing_filesize' => 'Taille de fichier manquante',
-'missing_func_class_note' => '',
+'missing_func_class_note' => 'Note',
 'missing_php_extensions' => 'Extensions PHP manquantes',
-'missing_php_functions_and_classes' => '',
+'missing_php_functions_and_classes' => 'Fonctions et classes PHP manquantes',
 'missing_reception' => 'Réception manquante',
-'missing_request_object' => '',
+'missing_request_object' => 'Demande d’objet manquante',
 'missing_transition_user_group' => 'Utilisateur/groupe manquant pour transition',
 'monday' => 'Lundi',
 'monday_abbr' => 'Lun.',
@@ -868,10 +870,11 @@ URL: [url]',
 'my_transmittals' => 'Mes transmissions',
 'name' => 'Nom',
 'nav_brand_admin_tools' => 'Outils d\'administration',
+'nav_brand_calendar' => 'Agenda',
 'nav_brand_my_account' => 'Mon compte',
-'nav_brand_my_documents' => '',
-'nav_brand_view_document' => '',
-'nav_brand_view_folder' => '',
+'nav_brand_my_documents' => 'Mes documents',
+'nav_brand_view_document' => 'Document',
+'nav_brand_view_folder' => 'Dossier',
 'nb_NO' => 'Norvégien bokmål',
 'needs_correction' => 'Nécessite une correction',
 'needs_workflow_action' => 'Ce document requiert votre attention. Consultez l\'onglet workflow.',
@@ -934,7 +937,7 @@ URL: [url]',
 'no_action' => 'Aucune action n\'est nécessaire',
 'no_approval_needed' => 'Aucune approbation en attente',
 'no_attached_files' => 'Aucun fichier attaché',
-'no_attribute_definitions' => '',
+'no_attribute_definitions' => 'Aucune définition d’attribut',
 'no_backup_dir' => 'Le répertoire de sauvegarde n’est pas défini.',
 'no_current_version' => 'Vous utilisez une ancienne version de SeedDMS. La dernière version disponible est la [latestversion].',
 'no_default_keywords' => 'Aucun mot-clé disponible',
@@ -970,7 +973,7 @@ URL: [url]',
 'october' => 'Octobre',
 'old' => 'Ancien',
 'only_jpg_user_images' => 'Images d\'utilisateur au format .jpg seulement',
-'operation_disallowed' => '',
+'operation_disallowed' => 'Opération non autorisée',
 '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',
@@ -1002,6 +1005,8 @@ En cas de problème persistant, veuillez contacter votre administrateur.',
 'password_forgotten_send_hash' => 'La procédure à suivre a bien été envoyée à l\'adresse indiquée',
 'password_forgotten_text' => 'Remplissez le formulaire ci-dessous et suivez les instructions dans le courrier électronique qui vous sera envoyé.',
 'password_forgotten_title' => 'Mot de passe envoyé',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => 'Répétez le mot de passe',
 'password_send' => 'Envoi du mot de passe',
 'password_send_text' => 'Votre nouveau mot de passe a été envoyé à l\'adresse fournie (si l\'identifiant et l\'adresse e-mail correspondent à un utilisateur existant). Si vous ne recevez rien dans les minutes qui suivent, assurez-vous que l\'identifiant et l\'adresse e-mail sont corrects puis relancez le processus.',
@@ -1161,7 +1166,7 @@ URL : [url]',
 'review_update_failed' => 'Erreur lors de la mise à jour du statut de vérification. Échec de la mise à jour.',
 'revise_document' => 'Réviser le document',
 'revise_document_on' => 'Prochaine révision de la version du document le [date]',
-'revision' => '',
+'revision' => 'Révision',
 'revisions_accepted' => '[no_revisions] révisions déjà confirmées',
 'revisions_accepted_latest' => '(dont [no_revisions] dans la dernière version)',
 'revisions_not_touched' => '[no_revisions] révisions non amorcées',
@@ -1252,6 +1257,7 @@ URL : [url]',
 'search' => 'Recherche',
 'search_fulltext' => 'Rechercher dans le texte',
 'search_in' => 'Rechercher dans',
+'search_mode' => '',
 'search_mode_and' => 'tous les mots',
 'search_mode_documents' => 'Seulement les documents',
 'search_mode_folders' => 'Seulement les dossiers',
@@ -1269,9 +1275,9 @@ URL : [url]',
 'seeddms_info' => 'Informations sur SeedDMS',
 'seeddms_version' => 'Version de SeedDMS',
 'selection' => 'Sélection',
-'select_attrdef' => '',
-'select_attrdefgrp_show' => 'Choisir quand afficher',
-'select_attribute_value' => 'Sélectionnez la valeur de l’attribut',
+'select_attrdef' => 'Sélectionner une définition d’attribut',
+'select_attrdefgrp_show' => 'Sélectionner quand afficher',
+'select_attribute_value' => 'Sélectionner la valeur de l’attribut',
 'select_category' => 'Cliquer pour choisir une catégorie',
 'select_group' => 'Sélectionner un groupe',
 'select_groups' => 'Cliquer pour choisir un groupe',
@@ -1293,6 +1299,7 @@ URL : [url]',
 'select_mimetype' => 'Sélectionner un type MIME',
 'select_one' => 'Selectionner',
 'select_owner' => 'Sélectionner un propriétaire',
+'select_status' => '',
 'select_user' => 'Sélectionner un utilisateur',
 'select_users' => 'Cliquer pour choisir un utilisateur',
 'select_value' => 'Sélectionner une valeur',
@@ -1369,9 +1376,9 @@ Nom : [username]
 'settings_currentvalue' => 'Valeur actuelle',
 'settings_Database' => 'Paramètres base de données',
 'settings_dateformat' => 'Format de date',
-'settings_dateformat_desc' => 'Ce format de date utilise la syntaxe de la fonction date() de php',
+'settings_dateformat_desc' => 'Ce format de date utilise la syntaxe de la fonction PHP date()',
 'settings_datetimeformat' => 'Format de date/heure',
-'settings_datetimeformat_desc' => '',
+'settings_datetimeformat_desc' => 'Ce format de date utilise la syntaxe de la fonction PHP date()',
 'settings_dbDatabase' => 'Base de données',
 'settings_dbDatabase_desc' => 'Le nom de votre base de données entré pendant le processus d\'installation. Ne pas modifier le champ sauf si absolument nécessaire, par exemple si la base de données a été déplacé.',
 'settings_dbDriver' => 'Type base de données',
@@ -1413,8 +1420,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_enableCancelCheckout' => 'Autoriser l’annulation des vérifications',
+'settings_enableCancelCheckout_desc' => 'Si coché, un document vérifié qui a déjà été modifié pourra être abandonné.',
 'settings_enableClipboard' => 'Activer le presse-papier',
 'settings_enableClipboard_desc' => 'Active/désactive le presse-papier',
 'settings_enableConverting' => 'Activer conversion des fichiers',
@@ -1575,8 +1582,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_overrideTheme' => 'Forcer le thème',
+'settings_overrideTheme_desc' => 'Activer pour remplacer le paramètre du thème dans le compte utilisateur par le paramètre de la configuration.',
 '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',
@@ -1672,11 +1679,11 @@ Nom : [username]
 'settings_System' => 'Système',
 'settings_tasksInMenu' => 'Tâches sélectionnées',
 'settings_tasksInMenu_approval' => 'Approbations',
-'settings_tasksInMenu_checkedout' => '',
+'settings_tasksInMenu_checkedout' => 'Vérifié',
 '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_rejected' => 'Rejeté',
 'settings_tasksInMenu_review' => 'Vérifications',
 'settings_tasksInMenu_revision' => 'Révisions',
 'settings_tasksInMenu_workflow' => 'Workflow',
@@ -1690,8 +1697,8 @@ Nom : [username]
 'settings_updateNotifyTime' => 'Délai de notification des modifications',
 'settings_updateNotifyTime_desc' => 'Les utilisateurs sont informés des modifications apportées aux documents qui ont eu lieu durant le délai précisé (en secondes).',
 'settings_upgrade_php' => 'Mettez à jour PHP vers une version au moins égale à 5.6.38',
-'settings_useHomeAsRootFolder' => '',
-'settings_useHomeAsRootFolder_desc' => '',
+'settings_useHomeAsRootFolder' => 'Utiliser le dossier de départ comme dossier racine',
+'settings_useHomeAsRootFolder_desc' => 'Activer pour que le dossier de départ de l’utilisateur (non admin) soit utilisé comme dossier racine (expérimental).',
 'settings_versioningFileName' => 'Nom des fichiers de versionnage',
 'settings_versioningFileName_desc' => 'Nom des fichiers textes d’information créés depuis les outils de sauvegarde',
 'settings_versiontolow' => 'Version trop ancienne',
@@ -1733,7 +1740,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_cancel_checkout' => 'Vérification annulée',
 'splash_cleared_cache' => 'Cache vidé',
 'splash_cleared_clipboard' => 'Presse-papier vidé',
 'splash_delete_access' => 'Droits d’accès supprimés',
@@ -1754,10 +1761,10 @@ Nom : [username]
 'splash_edit_user' => 'Utilisateur modifié',
 'splash_error_add_to_transmittal' => 'Erreur lors de l’ajout du document à la transmission',
 'splash_error_rm_download_link' => 'Erreur lors de la suppression du lien de téléchargement',
-'splash_error_saving_file' => '',
+'splash_error_saving_file' => 'Erreur lors de l’enregistrement du fichier',
 'splash_error_send_download_link' => 'Erreur lors de l’envoi du lien de téléchargement',
-'splash_expiration_date_cleared' => '',
-'splash_expiration_date_set' => '',
+'splash_expiration_date_cleared' => 'Date d’expiration retirée',
+'splash_expiration_date_set' => 'Date d’expiration définie au [date]',
 'splash_extension_getlist' => 'Liste des extensions du dépôt actualisée',
 'splash_extension_import' => 'Extension installée',
 'splash_extension_refresh' => 'Liste des extensions actualisée',
@@ -1808,7 +1815,7 @@ Nom : [username]
 'status_approval_rejected' => 'Ébauche rejetée',
 'status_approved' => 'Approuvé',
 'status_approver_removed' => 'Approbateur retiré du processus',
-'status_change' => '',
+'status_change' => 'Statut modifié',
 'status_needs_correction' => 'Nécessite une correction',
 'status_not_approved' => 'Non approuvé',
 'status_not_receipted' => 'Pas encore réceptionné',
@@ -1858,15 +1865,15 @@ Nom : [username]
 'takeOverIndApprovers' => 'Récupérer les approbateurs individuels',
 'takeOverIndReviewer' => 'Récupérer les examinateurs de la dernière version.',
 'takeOverIndReviewers' => 'Récupérer les examinateurs individuels',
-'target_equals_source_folder' => '',
+'target_equals_source_folder' => 'Le dossier de destination est identique au dossier source',
 'tasks' => 'Tâches',
 'task_core_expireddocs_days' => 'jours',
-'task_core_expireddocs_email' => '',
-'task_core_indexingdocs_recreate' => '',
+'task_core_expireddocs_email' => 'E-mail',
+'task_core_indexingdocs_recreate' => 'Régénérer l’index',
 'task_description' => 'Description',
 'task_disabled' => 'Désactivée',
 'task_frequency' => 'Fréquence',
-'task_frequency_placeholder' => '',
+'task_frequency_placeholder' => 'min h j m jsem',
 'task_last_run' => 'Dernière exécution',
 'task_name' => 'Nom',
 'task_next_run' => 'Prochaine exécution',
@@ -1888,6 +1895,7 @@ Nom : [username]
 'timeline_skip_add_file' => 'avec fichiers attachés',
 'timeline_skip_scheduled_revision' => 'Révision planifiée',
 'timeline_skip_status_change_-1' => 'rejetés',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => 'expirés',
 'timeline_skip_status_change_0' => 'en attente de revue',
 'timeline_skip_status_change_1' => 'en attente d\'approbation',
@@ -1904,7 +1912,7 @@ Nom : [username]
 'transfer_content' => 'Transférer le contenu',
 'transfer_document' => 'Transférer le document',
 'transfer_no_read_access' => 'L’utilisateur n’a pas le droit de lecture dans ce dossier',
-'transfer_no_users' => '',
+'transfer_no_users' => 'Il n’y a actuellement aucun utilisateur auquel le document peut être transféré.',
 'transfer_no_write_access' => 'L’utilisateur n’a pas le droit d’écriture dans ce dossier',
 'transfer_objects' => 'Transférer les objets',
 'transfer_objects_to_user' => 'Nouveau propriétaire',
@@ -1946,6 +1954,7 @@ URL : [url]',
 'unknown_id' => 'ID inconnu',
 'unknown_keyword_category' => 'Catégorie inconnue',
 'unknown_owner' => 'Identifiant de propriétaire inconnu',
+'unknown_status' => '',
 'unknown_user' => 'Identifiant d\'utilisateur inconnu',
 'unlinked_content' => 'Contenu non lié',
 'unlinked_documents' => 'Documents non liés',
@@ -2043,7 +2052,7 @@ URL: [url]',
 'workflow_title' => '',
 'workflow_transition_without_user_group' => 'Au moins une transition a ni utilisateur, ni groupe !',
 'workflow_user_summary' => 'Récapitulatif utilisateur',
-'wrong_checksum' => '',
+'wrong_checksum' => 'Mauvaise somme de contrôle',
 'wrong_filetype' => 'Mauvais type de fichier',
 'x_more_objects' => '[number] objets supplémentaires',
 'year_view' => 'Vue annuelle',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index a426f9453..9e5ec9c5e 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -95,6 +95,7 @@ Internet poveznica: [url]',
 'all_users' => 'Svi korisnici',
 'already_subscribed' => 'Već prijavljeno',
 'and' => 'i',
+'apikey' => '',
 'apply' => 'Primjeni',
 'approvals_accepted' => '',
 'approvals_accepted_latest' => '',
@@ -269,6 +270,7 @@ Internet poveznica: [url]',
 'checkedout_file_is_unchanged' => 'Datoteka odjavljenog dokumenta je još uvijek nepromijenjena. Prijava neće biti moguća. Ukoliko ne planirate izmjene, možete resetirati status odjave.',
 'checkin_document' => 'Prijava',
 'checkoutpath_does_not_exist' => '',
+'checkout_cancel_confirm' => '',
 'checkout_document' => 'Odjava',
 'checkout_is_disabled' => 'Odjava dokumenata je onemogućena u konfiguraciji.',
 'choose_attrdef' => 'Molim odaberite definiciju atributa',
@@ -849,6 +851,7 @@ Internet poveznica: [url]',
 'my_transmittals' => 'Moja proslijeđivanja',
 'name' => 'Naziv',
 'nav_brand_admin_tools' => '',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => '',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -984,6 +987,8 @@ Ako i dalje imate problema s prijavom, molimo kontaktirajte Vašeg administrator
 'password_forgotten_send_hash' => 'Upute kako postupiti su poslane na e-mail adresu korisnika',
 'password_forgotten_text' => 'Ispunite donji obrazac i slijedite upute iz e-maila koji će vam biti poslan.',
 'password_forgotten_title' => 'Lozinka je poslana',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => 'Ponovi lozinku',
 'password_send' => 'Pošalji lozinku',
 'password_send_text' => 'Vaša nova lozinka je poslana na navedenu e-mail adresu,  ako login i e-mail odgovaraju postojećem korisniku. Ako ne primite e-mail u narednim minutama, tada provjerite da su login i e-mail ispravni te ponovite postupak.',
@@ -1218,6 +1223,7 @@ Internet poveznica: [url]',
 'search' => 'Traži',
 'search_fulltext' => 'Traži u cijelom tekstu',
 'search_in' => 'Traži u',
+'search_mode' => '',
 'search_mode_and' => 'sve riječi',
 'search_mode_documents' => 'Samo dokumenti',
 'search_mode_folders' => 'Samo mape',
@@ -1259,6 +1265,7 @@ Internet poveznica: [url]',
 'select_mimetype' => '',
 'select_one' => 'Odaberite jednog',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => 'Izaberi korisnika',
 'select_users' => 'Kliknite za odabir korisnika',
 'select_value' => 'Odaberite vrijednost',
@@ -1849,6 +1856,7 @@ Internet poveznica: [url]',
 'timeline_skip_add_file' => 'dodan prilog',
 'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'odbijeno',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => 'isteklo',
 'timeline_skip_status_change_0' => 'na čekanju za pregled',
 'timeline_skip_status_change_1' => 'na čekanju za odobrenje',
@@ -1907,6 +1915,7 @@ Internet poveznica: [url]',
 'unknown_id' => 'nepoznati ID',
 'unknown_keyword_category' => 'Nepoznata kategorija',
 'unknown_owner' => 'Nepoznati ID vlasnika',
+'unknown_status' => '',
 'unknown_user' => 'Nepoznati ID korisnika',
 'unlinked_content' => 'Nepovezani sadržaj',
 'unlinked_documents' => 'Nepovezani dokumenti',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 3b84ee19c..8de858b69 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -95,6 +95,7 @@ URL: [url]',
 'all_users' => 'Minden felhasználó',
 'already_subscribed' => 'Már feliratkozott',
 'and' => '-',
+'apikey' => '',
 'apply' => 'Elfogad',
 'approvals_accepted' => '[no_approvals] már elfogadott jóváhagyások',
 'approvals_accepted_latest' => '',
@@ -264,6 +265,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '',
 'checkoutpath_does_not_exist' => '',
+'checkout_cancel_confirm' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
 'choose_attrdef' => 'Kérem válasszon jellemző meghatározást',
@@ -844,6 +846,7 @@ URL: [url]',
 'my_transmittals' => 'Átviteleim',
 'name' => 'Név',
 'nav_brand_admin_tools' => '',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => '',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -980,6 +983,8 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'password_forgotten_send_hash' => 'Utasítások arról, hogyan kell eljárni a felhasználók email címének elküldéséhez',
 'password_forgotten_text' => 'Töltse ki a következő űrlapot és kövesse az Önnek küldött, elektronikus levélben szereplő utasításokat.',
 'password_forgotten_title' => 'Jelszó küldés',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => 'Jelszó mégegyszer',
 'password_send' => 'Jelszó elküldve',
 'password_send_text' => 'Új jelszót küld Önnek a megadott email címre, amennyiben a felhasználónév és az email cím megfelel egy létező felhasználónak. Amennyiben néhány percen belül nem kapja meg az email-t, akkor ellenőrizze a felhasználónevet és email címet és indítsa újra a folyamatot.',
@@ -1196,6 +1201,7 @@ URL: [url]',
 'search' => 'Keresés',
 'search_fulltext' => 'Keresés a teljes szövegben',
 'search_in' => 'Keresés ebben a könyvtárban',
+'search_mode' => '',
 'search_mode_and' => 'egyezés minden szóra',
 'search_mode_documents' => 'Csak dokumentumok',
 'search_mode_folders' => 'Csak mappák',
@@ -1237,6 +1243,7 @@ URL: [url]',
 'select_mimetype' => '',
 'select_one' => 'Válasszon egyet',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => 'Felhasználó kiválasztása',
 'select_users' => 'Kattintson a felhasználó kiválasztásához',
 'select_value' => 'Érték kiválasztása',
@@ -1827,6 +1834,7 @@ URL: [url]',
 'timeline_skip_add_file' => 'melléklet hozzáadva',
 'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'visszautasítva',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => 'lejárt',
 'timeline_skip_status_change_0' => 'felülvizsgálatra vár',
 'timeline_skip_status_change_1' => 'jóváhagyásra vár',
@@ -1885,6 +1893,7 @@ URL: [url]',
 'unknown_id' => 'ismeretlen azonosító',
 'unknown_keyword_category' => 'Ismeretlen kategória',
 'unknown_owner' => 'Ismeretlen tulajdonos azonosító',
+'unknown_status' => '',
 'unknown_user' => 'Ismeretlen felhasználó azonosító',
 'unlinked_content' => 'Nem hivatkozott tartalom',
 'unlinked_documents' => 'Nem hivatkozott dokumentumok',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 4e6c5d46e..3888f65c9 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -95,6 +95,7 @@ URL: [url]',
 'all_users' => 'Tutti gli utenti',
 'already_subscribed' => 'L\'oggetto è già stato sottoscritto',
 'and' => 'e',
+'apikey' => '',
 'apply' => 'Applica',
 'approvals_accepted' => '[no_approvals] approvazioni già accettate',
 'approvals_accepted_latest' => '',
@@ -269,6 +270,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => 'La versione approvata è uguale alla versione corrente. Impossibile caricare.',
 'checkin_document' => 'Da approvare',
 'checkoutpath_does_not_exist' => 'Il percorso di approvazione non esiste',
+'checkout_cancel_confirm' => '',
 'checkout_document' => 'Approvato',
 'checkout_is_disabled' => 'Approvazione dei documenti disabilitata',
 'choose_attrdef' => 'Seleziona l\'Attributo',
@@ -854,6 +856,7 @@ URL: [url]',
 'my_transmittals' => 'Mie trasmissioni',
 'name' => 'Nome',
 'nav_brand_admin_tools' => '',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => '',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -990,6 +993,8 @@ Dovessero esserci ancora problemi al login, prego contatta l\'amministratore di
 'password_forgotten_send_hash' => 'Le istruzioni su come procedere sono state inviate all\'indirizzo e-mail dell\'utente',
 'password_forgotten_text' => 'Compilare i campi seguenti e seguire le istruzioni nell\'e-mail che sarà inviata a breve.',
 'password_forgotten_title' => 'Password inviata',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => 'Ripetere password',
 'password_send' => 'Invia la password',
 'password_send_text' => 'La nuova password è stata inviata all\'indirizzo email fornito, nel caso in cui login ed email siano nel database e corrispondano ad un utente. Qualora non si fosse ricevuto alcun messaggio nei prossimi minuti, si prega di controllare che login ed email siano corretti e provare di nuovo.',
@@ -1240,6 +1245,7 @@ URL: [url]',
 'search' => 'Ricerca',
 'search_fulltext' => 'Ricerca fulltext',
 'search_in' => 'Cerca in',
+'search_mode' => '',
 'search_mode_and' => 'tutte le parole',
 'search_mode_documents' => 'Solo documenti',
 'search_mode_folders' => 'Solo cartelle',
@@ -1281,6 +1287,7 @@ URL: [url]',
 'select_mimetype' => '',
 'select_one' => 'Seleziona uno',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => 'Seleziona utente',
 'select_users' => 'Clicca per selezionare gli utenti',
 'select_value' => 'Selezionare un valore',
@@ -1876,6 +1883,7 @@ Name: [username]
 'timeline_skip_add_file' => 'allegato aggiunto',
 'timeline_skip_scheduled_revision' => 'Riesame programmato',
 'timeline_skip_status_change_-1' => 'respinto',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => 'scaduto',
 'timeline_skip_status_change_0' => 'in attesa di revisione',
 'timeline_skip_status_change_1' => 'in attesa di approvazione',
@@ -1934,6 +1942,7 @@ URL: [url]',
 'unknown_id' => 'ID sconosciuto',
 'unknown_keyword_category' => 'Categoria sconosciuta',
 'unknown_owner' => 'ID proprietario sconosciuto',
+'unknown_status' => '',
 'unknown_user' => 'ID utente sconosciuto',
 'unlinked_content' => 'Contenuto non collegato',
 'unlinked_documents' => 'Documenti non collegati',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 904e7f936..86cc748eb 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -95,6 +95,7 @@ URL: [url]',
 'all_users' => '모든 사용자',
 'already_subscribed' => '가입된',
 'and' => '와',
+'apikey' => '',
 'apply' => '적용',
 'approvals_accepted' => '',
 'approvals_accepted_latest' => '',
@@ -271,6 +272,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => '요청한 문서가 아직 변경전 상태입니다. 변경을 원하지 않는 경우 재설정 할 수 있습니다.',
 'checkin_document' => '체크인',
 'checkoutpath_does_not_exist' => '',
+'checkout_cancel_confirm' => '',
 'checkout_document' => '체크아웃',
 'checkout_is_disabled' => '체크아웃된 문서는 설정에서 비활성화됩니다.',
 'choose_attrdef' => '속성의 정의를 선택하세요',
@@ -850,6 +852,7 @@ URL: [url]',
 'my_transmittals' => '내 송부',
 'name' => '이름',
 'nav_brand_admin_tools' => '',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => '',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -978,6 +981,8 @@ URL : [url]',
 'password_forgotten_send_hash' => '사용자의 이메일 주소로 전송 진행 방법에 대한  지침',
 'password_forgotten_text' => '아래의 양식을 작성하시고 당신에게 보낼 이메일에 있는 지시 사항을 따르십시오.',
 'password_forgotten_title' => '비밀번호 전송',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => '암호 반복',
 'password_send' => '비밀번호 전송',
 'password_send_text' => '로그인 및 이메일이 기존 사용자와 일치하는 경우 새 암호가 지정된 이메일 주소로 전송됩니다. 당신이 잠시후 이메일을 수신하지 못했으면 반드시 로그인 및 이메일 모두가 올바른지 확인하고 프로세스를 다시 시작 하세요.',
@@ -1212,6 +1217,7 @@ URL : [url]',
 'search' => '검색',
 'search_fulltext' => '전체 텍스트 검색',
 'search_in' => '검색내',
+'search_mode' => '',
 'search_mode_and' => '모든 단어',
 'search_mode_documents' => '문서만',
 'search_mode_folders' => '폴더만',
@@ -1253,6 +1259,7 @@ URL : [url]',
 'select_mimetype' => '',
 'select_one' => '선택',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => '',
 'select_users' => '사용자를 선택합니다',
 'select_value' => '',
@@ -1843,6 +1850,7 @@ URL : [url]',
 'timeline_skip_add_file' => '첨부 파일 이 추가 되었습니다',
 'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => '거부',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => '만료',
 'timeline_skip_status_change_0' => '보류된 검토',
 'timeline_skip_status_change_1' => '보류된 승인',
@@ -1901,6 +1909,7 @@ URL : [url]',
 'unknown_id' => '알 수없는 ID',
 'unknown_keyword_category' => '알 수없는 범주',
 'unknown_owner' => '알 수없는 소유자 ID',
+'unknown_status' => '',
 'unknown_user' => '알 수 없는 사용자 ID',
 'unlinked_content' => '연결되지 않은 내용',
 'unlinked_documents' => '연결되지 않은 문서',
diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc
index c1a0d6b3d..fc7ef9439 100644
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@@ -95,6 +95,7 @@ URL: [url]',
 'all_users' => 'ຜູ້ໃຊ້ທັງໝົດ',
 'already_subscribed' => 'ສະໝັກຮັບຂໍ້ມູນແລ້ວ',
 'and' => 'ແລະ',
+'apikey' => '',
 'apply' => 'ໃຊ້',
 'approvals_accepted' => '[no_approvals]  ອະນຸມັດໂດຍບໍ່ຕ້ອງສຳພັດ',
 'approvals_accepted_latest' => '',
@@ -267,6 +268,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => 'ໄຟລຂອງເອກະສານເຊັກເອົາຍັງຄົງເດີມ ບໍ່ສາມາດເຊັກອິນໄດ້ ຖ້າຫາກບໍ່ມີການວາງແຜນແກ້ໄຂໄດໆ ເຈົ້າສາມາດລີເຊັດສະຖານະເຊັກເອົາ',
 'checkin_document' => 'ເຊັກອຶນ',
 'checkoutpath_does_not_exist' => 'ບໍ່ມີເສັ້ນທາງເຊັກເອົາ',
+'checkout_cancel_confirm' => '',
 'checkout_document' => 'ເຊັກເອົາ',
 'checkout_is_disabled' => 'ໃນການກຳນົດຄ່າເຊັກເອົາເອກະສານໄດ້ຖືກປິດໄຊ້ງານ',
 'choose_attrdef' => 'ກະລຸນາເລືອກນິຍາມແອັດທິບິວ',
@@ -847,6 +849,7 @@ URL: [url]',
 'my_transmittals' => 'ການຂົນສົ່ງຂອງຂ້ອຍ',
 'name' => 'ຊື່',
 'nav_brand_admin_tools' => '',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => '',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -983,6 +986,8 @@ URL: [url]',
 'password_forgotten_send_hash' => 'ຄຳແນະນຳໃນການດຳເນີນການຖືກສົ່ງໄປຫາອີເມວຂອງຜູ້ນຳໄຊ້',
 'password_forgotten_text' => 'ກະລຸນາຂຽນແບບຟອມດ້ານລຸ່ມ ແລະເຮັດຕາມຄຳແນະນຳໃນອີເມວທີໄດ້ສົ່ງຫາເຈົ້າ',
 'password_forgotten_title' => 'ສົ່ງລະຫັດຜ່ານ',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => 'ຢຳລະຫັດຜ່ານ',
 'password_send' => 'ສົ່ງລະຫັດຜ່ານ',
 'password_send_text' => 'ລະຫັດຜ່ານໄຫມ່ຂອງເຈົ້າໄດ້ຖືກສົ່ງໄປຕາມທີ່ຢູ່ຂອງອີເມວ, ຖ້າການເຂົ້າລະບົບ ແລະອີເມວກົງກັບຜູ້ໄຊ້ທີມີຢູ່, ຖ້າເຈົ້າບໍ່ໄດ້ຮັບອີເມວພາຍຫຼັງນາທີທັດໄປ, ກວດຄືນໃຫ້ແນ່ໃຈວ່າທັ່ງການ Login ເຂົ້າສູ້ລະບົບ ແລະອີເມວວ່າຖືກຕ້ອງແລະເລີ່ມຕົ້ນດຳເນີນການໄຫມ່ອີກຄັ້ງ',
@@ -1233,6 +1238,7 @@ URL: [url]',
 'search' => 'ຄົ້ນຫາ',
 'search_fulltext' => 'ຄົ້ນຫາແບບເຕັມຮູບແບບ',
 'search_in' => 'ຄົ້ນຫາໃນ',
+'search_mode' => '',
 'search_mode_and' => 'ທຸກຄຳ',
 'search_mode_documents' => 'ເອກະສານຢ່າງດຽວ',
 'search_mode_folders' => 'ໂຟລເດີຢ່າງດຽວ',
@@ -1274,6 +1280,7 @@ URL: [url]',
 'select_mimetype' => '',
 'select_one' => 'ເລືອກໜື່ງອັນ',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => '',
 'select_users' => 'ຄິກເພື່ອເລືອກຜູ້ໄຊ້',
 'select_value' => '',
@@ -1869,6 +1876,7 @@ URL: [url]',
 'timeline_skip_add_file' => 'ເພີ່ມໄຟລແນບແລ້ວ',
 'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'ປະຕິເສດ',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => 'ວັນໝົດອາຍຸ',
 'timeline_skip_status_change_0' => 'ລໍການກວດສອບ',
 'timeline_skip_status_change_1' => 'ລໍຖ້າການອະນຸມັດ',
@@ -1927,6 +1935,7 @@ URL: [url]',
 'unknown_id' => 'ID ທີ່ບໍ່ຮູ້ຈັກ',
 'unknown_keyword_category' => 'ໝວດໝູ່ທີບໍ່ຮູ້ຈັກ',
 'unknown_owner' => 'ເຈົາຂອງ ID ທີ່ບໍ່ຮູ້ຈັກ',
+'unknown_status' => '',
 'unknown_user' => 'ລະຫັດຜູ້ໄຊ້ທີບໍ່ຮູ້ຈັກ ID',
 'unlinked_content' => 'ຍົກເລີກການເຊື່ອມໂຍງເນື້ອຫາ',
 'unlinked_documents' => 'ຍົກເລີກການເຊື່ອມໂຍງເອກະສານ',
diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc
index e0252b514..2b94135c1 100644
--- a/languages/nb_NO/lang.inc
+++ b/languages/nb_NO/lang.inc
@@ -95,6 +95,7 @@ URL: [url]',
 'all_users' => 'Alle brukere',
 'already_subscribed' => 'Abonnert allerede',
 'and' => 'og',
+'apikey' => '',
 'apply' => 'Søke om',
 'approvals_accepted' => '[no_approvals] godkjenninger allerede akseptert',
 'approvals_accepted_latest' => '(er [no_approvals] i siste versjon)',
@@ -269,6 +270,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => 'Filen til det utsjekkede dokumentet er fortsatt uendret. Innsjekking vil ikke være mulig. Hvis du ikke planlegger noen endringer, kan du tilbakestille statusen for utsjekking.',
 'checkin_document' => 'Innsjekking',
 'checkoutpath_does_not_exist' => 'Utsjekking sti mangler',
+'checkout_cancel_confirm' => '',
 'checkout_document' => 'Utsjekking',
 'checkout_is_disabled' => 'Sjekk ut av dokumentene er deaktivert i konfigurasjonen.',
 'choose_attrdef' => 'Velg egenskaps definition',
@@ -868,6 +870,7 @@ URL: [url]',
 'my_transmittals' => 'Mine sendinger',
 'name' => 'Navn',
 'nav_brand_admin_tools' => '',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => '',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -998,6 +1001,8 @@ Om du fortsatt har problemer med innloggingen, kontakt admin.',
 'password_forgotten_send_hash' => 'Instruksjoner om hvordan du går frem er sendt til din oppgitte e-postadresse.',
 'password_forgotten_text' => 'Fyll ut skjemaet nedenfor og følg instruksjonene i e-posten, som vil bli sendt til deg.',
 'password_forgotten_title' => 'Passord sendt',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => 'Gjenta passord',
 'password_send' => 'Passord sendt',
 'password_send_text' => 'Ditt nye passord er blitt sendt til den oppgitte e-postadressen, hvis påloggingen og e-posten samsvarer med en eksisterende bruker. Hvis du ikke mottar en e-post i løpet av de neste minuttene, må du sørge for at både innlogging og e-post er riktig og start prosessen på nytt.',
@@ -1248,6 +1253,7 @@ URL: [url]',
 'search' => 'Søk',
 'search_fulltext' => 'Søk i fulltekst',
 'search_in' => 'Søk i',
+'search_mode' => '',
 'search_mode_and' => 'alle ord',
 'search_mode_documents' => 'Kun dokumenter',
 'search_mode_folders' => 'Bare mapper',
@@ -1289,6 +1295,7 @@ URL: [url]',
 'select_mimetype' => '',
 'select_one' => 'Velg en',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => 'Velg bruker',
 'select_users' => 'Klikk for å velge flere brukere',
 'select_value' => 'Velg verdi',
@@ -1882,6 +1889,7 @@ Bruker: [username]
 'timeline_skip_add_file' => 'vedlegg lagt til',
 'timeline_skip_scheduled_revision' => 'Planlagt revisjon',
 'timeline_skip_status_change_-1' => 'avvist',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => 'utløpt',
 'timeline_skip_status_change_0' => 'avventer vurdering',
 'timeline_skip_status_change_1' => 'venter på godkjenning',
@@ -1940,6 +1948,7 @@ URL: [url]',
 'unknown_id' => 'ukjent navn',
 'unknown_keyword_category' => 'Ukjent kategori',
 'unknown_owner' => 'Ukjent eiernavn',
+'unknown_status' => '',
 'unknown_user' => 'Ukjent brukernavn',
 'unlinked_content' => 'U-linket innhold',
 'unlinked_documents' => 'U-linket dokumenter',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 173f65adf..bb5d52dc9 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -95,6 +95,7 @@ URL: [url]',
 'all_users' => 'Alle gebruikers',
 'already_subscribed' => 'Al ingetekend',
 'and' => 'en',
+'apikey' => '',
 'apply' => 'Toepassen',
 'approvals_accepted' => '[no_approvals] goedkeuringen',
 'approvals_accepted_latest' => 'Er zijn [no_approvals] goedkeuringen',
@@ -262,6 +263,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => 'Checkout-document ongewijzigd',
 'checkin_document' => 'Veranderd document',
 'checkoutpath_does_not_exist' => 'Checkout-pad bestaat niet',
+'checkout_cancel_confirm' => '',
 'checkout_document' => 'Checkout-document',
 'checkout_is_disabled' => 'Checkout is niet mogelijk',
 'choose_attrdef' => 'Kies een attribuutdefinitie',
@@ -861,6 +863,7 @@ URL: [url]',
 'my_transmittals' => 'Mijn zendingen',
 'name' => 'Naam',
 'nav_brand_admin_tools' => '',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => '',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -996,6 +999,8 @@ Als u nog steed problemen ondervind met het inloggen, neem aub contact op met uw
 'password_forgotten_send_hash' => 'Verdere instructies zijn naar uw gebruikers email adres verstuurd.',
 'password_forgotten_text' => 'Vul het formulier hieronder in en volg de instructie in de email, welke naar u verzonden zal worden.',
 'password_forgotten_title' => 'Wachtwoord verzonden',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => 'Herhaal wachtwoord',
 'password_send' => 'Wachtwoord verzonden',
 'password_send_text' => 'Als het opgegeven gebruikersnaam en emailadres overeenkomen met een bestaande gebruiker is er een nieuw wachtwoord verzonden naar het opgegeven emailadres. 
@@ -1245,6 +1250,7 @@ URL: [url]',
 'search' => 'Zoeken',
 'search_fulltext' => 'Zoek in volledige tekst',
 'search_in' => 'Zoek in',
+'search_mode' => '',
 'search_mode_and' => 'alle woorden',
 'search_mode_documents' => 'Alleen documenten',
 'search_mode_folders' => 'Alleen mappen',
@@ -1286,6 +1292,7 @@ URL: [url]',
 'select_mimetype' => 'Selecteer het mime-type',
 'select_one' => 'Kies er een',
 'select_owner' => 'Kies de eigenaar',
+'select_status' => '',
 'select_user' => 'Selecteer gebruiker',
 'select_users' => 'Klik om gebruikers te selecteren',
 'select_value' => 'selecteer waarde',
@@ -1881,6 +1888,7 @@ Name: [username]
 'timeline_skip_add_file' => 'Bijlage toegevoegd',
 'timeline_skip_scheduled_revision' => 'In revisie',
 'timeline_skip_status_change_-1' => 'afgewezenen',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => 'verlopen',
 'timeline_skip_status_change_0' => 'wacht op beoordeling',
 'timeline_skip_status_change_1' => 'wacht op goedkeuring',
@@ -1939,6 +1947,7 @@ URL: [url]',
 'unknown_id' => 'Onbekende id',
 'unknown_keyword_category' => 'Onbekend sleutelwoordcategorie',
 'unknown_owner' => 'Onbekende eigenaar ID',
+'unknown_status' => '',
 'unknown_user' => 'Onbekende gebruiker',
 'unlinked_content' => 'Ongekoppelde inhoud',
 'unlinked_documents' => 'nietgekoppelde documenten',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 598e6f979..5142826c0 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -95,6 +95,7 @@ URL: [url]',
 'all_users' => 'Wszyscy użytkownicy',
 'already_subscribed' => 'Aktualnie subskrybowane',
 'and' => 'i',
+'apikey' => '',
 'apply' => 'Zastosuj',
 'approvals_accepted' => 'Zatwierdzenia zaakceptowane',
 'approvals_accepted_latest' => 'Zatwierdzenia zaakceptowane później',
@@ -257,6 +258,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => 'Plik wyrejestrowanego dokumentu jest nadal niezmieniony. Zameldowanie nie będzie możliwe. Jeśli nie planujesz żadnych modyfikacji, możesz zresetować status transakcji.',
 'checkin_document' => 'Zamelduj się',
 'checkoutpath_does_not_exist' => 'Ścieżka realizacji transakcji nie istnieje',
+'checkout_cancel_confirm' => '',
 'checkout_document' => 'Wymelduj się',
 'checkout_is_disabled' => 'Wyewidencjonowywanie dokumentów jest wyłączone w konfiguracji.',
 'choose_attrdef' => 'Proszę wybrać definicję atrybutu',
@@ -837,6 +839,7 @@ URL: [url]',
 'my_transmittals' => 'Moi recenzenci',
 'name' => 'Nazwa',
 'nav_brand_admin_tools' => '',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => '',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -973,6 +976,8 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem
 'password_forgotten_send_hash' => 'Instrukcje dotyczące zmiany hasła zostały wysłane na adres email użytkownika.',
 'password_forgotten_text' => 'Wypełnij pola poniżej i postępuj wg instrukcji z emaila, który zostanie do Ciebie wysłany.',
 'password_forgotten_title' => 'Hasło wysłane',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => 'Powtórz hasło',
 'password_send' => 'Hasło wysłane',
 'password_send_text' => 'Twoje nowe hasło zostało wysłane na podany adres e-mail, jeśli login i adres e-mail odpowiadają istniejącemu użytkownikowi. Jeśli w ciągu kilku minut nie otrzymasz wiadomości e-mail, upewnij się, że login i e-mail są poprawne, i ponownie uruchom proces.',
@@ -1176,6 +1181,7 @@ URL: [url]',
 'search' => 'Szukaj',
 'search_fulltext' => 'Przeszukaj całe teksty',
 'search_in' => 'Szukaj w',
+'search_mode' => '',
 'search_mode_and' => 'wszystkie słowa',
 'search_mode_documents' => 'Tylko dokumenty',
 'search_mode_folders' => 'Tylko foldery',
@@ -1217,6 +1223,7 @@ URL: [url]',
 'select_mimetype' => '',
 'select_one' => 'Wybierz',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => 'Wybierz użytkownika',
 'select_users' => 'Kliknij by wybrać użytkowników',
 'select_value' => 'Wybrać wartość',
@@ -1812,6 +1819,7 @@ Name: [username]
 'timeline_skip_add_file' => 'dodano załącznik',
 'timeline_skip_scheduled_revision' => 'Zaplanowana wersja',
 'timeline_skip_status_change_-1' => 'odrzucony',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => 'przedawniony',
 'timeline_skip_status_change_0' => 'oczekuje na opinię',
 'timeline_skip_status_change_1' => 'oczekuje na zatwierdzenie',
@@ -1870,6 +1878,7 @@ URL: [url]',
 'unknown_id' => 'Nieznany ID',
 'unknown_keyword_category' => 'Nieznana kategoria',
 'unknown_owner' => 'Nieznany ID właściciela',
+'unknown_status' => '',
 'unknown_user' => 'Nieznany ID użytkownika',
 'unlinked_content' => 'Odłączone treści',
 'unlinked_documents' => 'Odłączone dokumenty',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index a03ab870e..83aa6355a 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -95,6 +95,7 @@ URL: [url]',
 'all_users' => 'Todos os usuários',
 'already_subscribed' => 'Já subscrito',
 'and' => 'e',
+'apikey' => '',
 'apply' => 'Aplicar',
 'approvals_accepted' => '[no_approvals] aprovações já aceitas',
 'approvals_accepted_latest' => 'aprovações aceitas mais recentes',
@@ -269,6 +270,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => 'O arquivo do documento retirado ainda está inalterado. A entrada não será possível. Se não planejar nenhuma modificação, você poderá redefinir o estado de retirada.',
 'checkin_document' => 'Entrada',
 'checkoutpath_does_not_exist' => 'O caminho de retirada não existe',
+'checkout_cancel_confirm' => '',
 'checkout_document' => 'Retirada',
 'checkout_is_disabled' => 'A retirada de documentos está desativada na configuração.',
 'choose_attrdef' => 'Por favor escolha a definição de atributo',
@@ -868,6 +870,7 @@ URL: [url]',
 'my_transmittals' => 'Minhas Transmissões',
 'name' => 'Nome',
 'nav_brand_admin_tools' => '',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => '',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -1003,6 +1006,8 @@ Se você ainda tiver problemas para fazer o login, por favor, contate o administ
 'password_forgotten_send_hash' => 'Instruções de como proceder para que seja enviada para o endereço de e-mail do usuário',
 'password_forgotten_text' => 'Preencha o formulário abaixo e siga as instruções do e-mail que será enviado para você.',
 'password_forgotten_title' => 'Senha enviada',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => 'Repetir a senha',
 'password_send' => 'Senha enviada',
 'password_send_text' => 'Sua nova senha foi enviada para o endereço de e-mail indicado, se o login e e-mail corresponde a um usuário existe. Se você não receber um e-mail nos próximos minutos, então certifique se login e e-mail estão corretos e reinicie o processo novamente.',
@@ -1252,6 +1257,7 @@ URL: [url]',
 'search' => 'Busca',
 'search_fulltext' => 'Pesquisa em texto completo',
 'search_in' => 'Busca em',
+'search_mode' => '',
 'search_mode_and' => 'todas as palavras',
 'search_mode_documents' => 'Só Documentos',
 'search_mode_folders' => 'Só Pastas',
@@ -1293,6 +1299,7 @@ URL: [url]',
 'select_mimetype' => '',
 'select_one' => 'Selecione um',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => 'Selecione o usuário',
 'select_users' => 'Clique para selecionar os usuários',
 'select_value' => 'Selecionar opção',
@@ -1888,6 +1895,7 @@ Nome: [username]
 'timeline_skip_add_file' => 'anexo adicionado',
 'timeline_skip_scheduled_revision' => 'Revisão agendada',
 'timeline_skip_status_change_-1' => 'rejeitado',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => 'expirado',
 'timeline_skip_status_change_0' => 'revisão pendente',
 'timeline_skip_status_change_1' => 'aprovação pendente',
@@ -1946,6 +1954,7 @@ URL: [url]',
 'unknown_id' => 'ID desconhecido',
 'unknown_keyword_category' => 'Categoria desconhecida',
 'unknown_owner' => 'ID do proprietário desconhecida',
+'unknown_status' => '',
 'unknown_user' => 'ID do usuário desconhecida',
 'unlinked_content' => 'Conteúdo não conectado',
 'unlinked_documents' => 'Documentos não conectados',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 303a97f25..d04b70e25 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -95,6 +95,7 @@ URL: [url]',
 'all_users' => 'Toti utilizatorii',
 'already_subscribed' => 'Deja trimis',
 'and' => 'si',
+'apikey' => '',
 'apply' => 'Aplică',
 'approvals_accepted' => '',
 'approvals_accepted_latest' => '',
@@ -269,6 +270,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => 'Fisierul documentului verificat este inca neschimbat. Check in-ul nu va fi posibil. Daca nu planuiti modificari, puteti reseta starea de Verificare.',
 'checkin_document' => 'Check In',
 'checkoutpath_does_not_exist' => '',
+'checkout_cancel_confirm' => '',
 'checkout_document' => 'Verifica',
 'checkout_is_disabled' => 'Verificarea documentelor este dezactivata in configurari.',
 'choose_attrdef' => 'Vă rugăm să alegeți definiția atributului',
@@ -849,6 +851,7 @@ URL: [url]',
 'my_transmittals' => 'Trimiterile mele',
 'name' => 'Nume',
 'nav_brand_admin_tools' => '',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => '',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -985,6 +988,8 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț
 'password_forgotten_send_hash' => 'Instrucțiuni privind modul cum trebuie procedat au fost trimise la adresa de email a utilizatorului',
 'password_forgotten_text' => 'Completați formularul de mai jos și urmați instrucțiunile ce vor fi trimise prin e-mail.',
 'password_forgotten_title' => 'Parola a fost trimisă',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => 'Repetați parola',
 'password_send' => 'Parola a fost trimisă',
 'password_send_text' => 'Noua dumneavoastră parolă a fost trimisă la adresa de e-mail furnizată, în cazul în care campurile de login și email se potrivesc cu un utilizator existent. Dacă nu primiți un e-mail în următoarele minute, asigurați-vă că atât campul de login cât și email sunt corecte și incercați din nou procesul.',
@@ -1219,6 +1224,7 @@ URL: [url]',
 'search' => 'Caută',
 'search_fulltext' => 'Caută în tot textul',
 'search_in' => 'Caută în',
+'search_mode' => '',
 'search_mode_and' => 'toate cuvintele',
 'search_mode_documents' => '',
 'search_mode_folders' => '',
@@ -1260,6 +1266,7 @@ URL: [url]',
 'select_mimetype' => '',
 'select_one' => 'Selectați unul',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => 'Selecteaza utilizator',
 'select_users' => 'Click pentru a selecta utilizatori',
 'select_value' => 'Valoare selectata',
@@ -1850,6 +1857,7 @@ URL: [url]',
 'timeline_skip_add_file' => 'atașament adăugat',
 'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'rejectat',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => 'expirat',
 'timeline_skip_status_change_0' => 'așteaptă revizuire',
 'timeline_skip_status_change_1' => 'așteaptă aprobare',
@@ -1908,6 +1916,7 @@ URL: [url]',
 'unknown_id' => 'ID necunoscut',
 'unknown_keyword_category' => 'Categorie necunoscută',
 'unknown_owner' => 'ID proprietar necunoscut',
+'unknown_status' => '',
 'unknown_user' => 'ID utilizator necunoscut',
 'unlinked_content' => 'Conținut dezasociat',
 'unlinked_documents' => 'Documente dezasociate',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index d1632dd99..b0ddbc4e7 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -95,6 +95,7 @@ URL: [url]',
 'all_users' => 'Все пользователи',
 'already_subscribed' => 'Уже подписан',
 'and' => 'и',
+'apikey' => '',
 'apply' => 'Применить',
 'approvals_accepted' => '',
 'approvals_accepted_latest' => '',
@@ -269,6 +270,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => 'Документ не изменен. Загрузка не возможна.',
 'checkin_document' => 'Получение',
 'checkoutpath_does_not_exist' => '',
+'checkout_cancel_confirm' => '',
 'checkout_document' => 'Загрузка',
 'checkout_is_disabled' => 'Загрузка отключена.',
 'choose_attrdef' => 'Выберите атрибут',
@@ -849,6 +851,7 @@ URL: [url]',
 'my_transmittals' => 'Мои пересылки',
 'name' => 'Имя',
 'nav_brand_admin_tools' => '',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => '',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -982,6 +985,8 @@ URL: [url]',
 'password_forgotten_send_hash' => 'Инструкции высланы на e-mail',
 'password_forgotten_text' => 'Заполните форму и следуйте инструкциям в письме',
 'password_forgotten_title' => 'Пароль выслан',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => 'Повторите пароль',
 'password_send' => 'Пароль выслан',
 'password_send_text' => 'Пароль отправлен',
@@ -1226,6 +1231,7 @@ URL: [url]',
 'search' => 'Поиск',
 'search_fulltext' => 'Полнотекстовый поиск',
 'search_in' => 'Поиск',
+'search_mode' => '',
 'search_mode_and' => 'Все слова',
 'search_mode_documents' => 'Только документы',
 'search_mode_folders' => 'Только папки',
@@ -1267,6 +1273,7 @@ URL: [url]',
 'select_mimetype' => '',
 'select_one' => 'Выберите',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => 'Выберите пользователя',
 'select_users' => 'Выберите пользователей',
 'select_value' => 'Выберите значение',
@@ -1857,6 +1864,7 @@ URL: [url]',
 'timeline_skip_add_file' => 'вложение добавлено',
 'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'отклонён',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => 'срок действия вышел',
 'timeline_skip_status_change_0' => 'ожидает рецензии',
 'timeline_skip_status_change_1' => 'ожидает подтверждения',
@@ -1915,6 +1923,7 @@ URL: [url]',
 'unknown_id' => 'неизвестный идентификатор',
 'unknown_keyword_category' => 'Неизвестная метка',
 'unknown_owner' => 'Неизвестный идентификатор собственника',
+'unknown_status' => '',
 'unknown_user' => 'Неизвестный идентификатор пользователя',
 'unlinked_content' => 'Удалённое содержимое',
 'unlinked_documents' => 'Удалённые документы',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 2453099c3..53426622a 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -95,6 +95,7 @@ URL: [url]',
 'all_users' => 'Všetci používatelia',
 'already_subscribed' => 'Už ste sa prihlásili na odber',
 'and' => 'a',
+'apikey' => '',
 'apply' => 'Použiť',
 'approvals_accepted' => '[no_approvals] approvals already accepted',
 'approvals_accepted_latest' => '',
@@ -269,6 +270,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => 'The file of the checked out document is still unchanged. Check in will not be possible. If do not plan any modifications, you can reset the check out status.',
 'checkin_document' => 'Check In',
 'checkoutpath_does_not_exist' => 'Checkout path does not exists',
+'checkout_cancel_confirm' => '',
 'checkout_document' => 'Pozrieť sa na dokument',
 'checkout_is_disabled' => 'Kontrola dokumentov je zakázaná v konfigurácii.',
 'choose_attrdef' => 'Vyberte prosím definíciu atribútu',
@@ -868,6 +870,7 @@ URL: [url]',
 'my_transmittals' => 'My Transmittals',
 'name' => 'Meno',
 'nav_brand_admin_tools' => '',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => '',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -1004,6 +1007,8 @@ If you have still problems to login, then please contact your administrator.',
 'password_forgotten_send_hash' => 'Instructions on how to proceed has been send to the user\'s email address',
 'password_forgotten_text' => 'Fill out the form below and follow the instructions in the email, which will be sent to you.',
 'password_forgotten_title' => 'Heslo bolo odoslané',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => 'Zopakovať heslo',
 'password_send' => 'Odoslať heslo',
 'password_send_text' => 'Your new password has been send to the given email address, if the login and email matches an existing user. If you do not receive an email within the next minutes, then make sure both login and email are correct and restart the process again.',
@@ -1254,6 +1259,7 @@ URL: [url]',
 'search' => 'Hľadať',
 'search_fulltext' => 'Vyhľadávanie vo fulltexte',
 'search_in' => 'Prehľadávať',
+'search_mode' => '',
 'search_mode_and' => 'všetky slová',
 'search_mode_documents' => 'Iba dokumenty',
 'search_mode_folders' => 'Iba zložky',
@@ -1295,6 +1301,7 @@ URL: [url]',
 'select_mimetype' => '',
 'select_one' => 'Vyberte',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => 'Vyberte používateľa',
 'select_users' => 'Kliknutím vyberte používateľov',
 'select_value' => 'Vyberte hodnotu',
@@ -1890,6 +1897,7 @@ Meno: [username]
 'timeline_skip_add_file' => 'príloha bola pridaná',
 'timeline_skip_scheduled_revision' => 'Scheduled revision',
 'timeline_skip_status_change_-1' => 'odmietnuté',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => 'expirovaný',
 'timeline_skip_status_change_0' => 'čaká na revíziu',
 'timeline_skip_status_change_1' => 'čaká na potvrdenie',
@@ -1948,6 +1956,7 @@ URL: [url]',
 'unknown_id' => 'Neznáme ID',
 'unknown_keyword_category' => 'Neznáma kategória',
 'unknown_owner' => 'Neznámy ID vlastníka',
+'unknown_status' => '',
 'unknown_user' => 'Neznámy ID používateľa',
 'unlinked_content' => 'Obsah bol odpojený',
 'unlinked_documents' => 'Dokumenty boli odpojené',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 4bcf3f192..2230960d3 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -96,6 +96,7 @@ URL: [url]',
 'all_users' => 'Alla användare',
 'already_subscribed' => 'Prenumererar redan',
 'and' => 'och',
+'apikey' => '',
 'apply' => 'Använd',
 'approvals_accepted' => '',
 'approvals_accepted_latest' => '',
@@ -270,6 +271,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => 'Filen för det utcheckade dokumentet är oförändrad och inchecknign är inte möjlig. Om du inte planerar att göra någon modifiering kan du återställa dokumentets utcheckningsstatus.',
 'checkin_document' => 'Incheckning',
 'checkoutpath_does_not_exist' => 'Sökvägen för utcheckning saknas',
+'checkout_cancel_confirm' => '',
 'checkout_document' => 'Utcheckning',
 'checkout_is_disabled' => 'Utcheckning av dokument är invaktiverad i systemets inställningar.',
 'choose_attrdef' => 'Välj attributdefinition',
@@ -855,6 +857,7 @@ URL: [url]',
 'my_transmittals' => 'Mina överföringar',
 'name' => 'Namn',
 'nav_brand_admin_tools' => '',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => '',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -988,6 +991,8 @@ Om du fortfarande har problem med inloggningen, kontakta administratören.',
 'password_forgotten_send_hash' => 'En beskrivning av vad du måste göra har nu skickats till din e-postadress.',
 'password_forgotten_text' => 'Fyll i formuläret nedan och följ instruktionerna som skickas till din e-postadress.',
 'password_forgotten_title' => 'Glömt lösenord',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => 'Upprepa lösenord',
 'password_send' => 'Lösenord skickat',
 'password_send_text' => 'Ditt nya lösenord har skickats till den angivna e-postadressen, förutsatt att användarnamn och e-postadressen matchar en existerande användare. Om du inte får ett epost inom några minuter, kontrollera att användarnamn och e-postadressen är rätt. Begär ett nytt lösenord igen.',
@@ -1227,6 +1232,7 @@ URL: [url]',
 'search' => 'Sök',
 'search_fulltext' => 'Fulltext-sökning',
 'search_in' => 'Sök i',
+'search_mode' => '',
 'search_mode_and' => 'alla ord',
 'search_mode_documents' => 'Endast dokument',
 'search_mode_folders' => 'Endast kataloger',
@@ -1268,6 +1274,7 @@ URL: [url]',
 'select_mimetype' => '',
 'select_one' => 'Välj',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => 'Välj användare',
 'select_users' => 'Välj användare',
 'select_value' => 'Välj värde',
@@ -1863,6 +1870,7 @@ Kommentar: [comment]',
 'timeline_skip_add_file' => 'Bilaga tillagd',
 'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'avvisad',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => 'utgånget',
 'timeline_skip_status_change_0' => 'väntar på granskning',
 'timeline_skip_status_change_1' => 'väntar på godkännande',
@@ -1921,6 +1929,7 @@ URL: [url]',
 'unknown_id' => 'Okänt ID',
 'unknown_keyword_category' => 'Okänd kategori',
 'unknown_owner' => 'Okänt ägar-ID',
+'unknown_status' => '',
 'unknown_user' => 'Okänt användar-ID',
 'unlinked_content' => 'Olänkat innehåll',
 'unlinked_documents' => 'Olänkade dokument',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index b597dd104..f40a4e19f 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -94,6 +94,7 @@ URL: [url]',
 'all_users' => 'Tüm kullanıcılar',
 'already_subscribed' => 'Zaten kayıtlı',
 'and' => 've',
+'apikey' => '',
 'apply' => 'Uygula',
 'approvals_accepted' => '',
 'approvals_accepted_latest' => '',
@@ -263,6 +264,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '',
 'checkoutpath_does_not_exist' => '',
+'checkout_cancel_confirm' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
 'choose_attrdef' => 'Lütfen nitelik tanımını seçiniz',
@@ -843,6 +845,7 @@ URL: [url]',
 'my_transmittals' => 'Çevirilerim',
 'name' => 'İsim',
 'nav_brand_admin_tools' => '',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => '',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -981,6 +984,8 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
 'password_forgotten_send_hash' => 'Yeni şifre alma talimatı kullanıcının e-posta adresine gönderilmiştir.',
 'password_forgotten_text' => 'Aşağıdaki formu doldurunuz ve e-posta adresinize gönderilecek olan talimatı uygulayınız.',
 'password_forgotten_title' => 'Parola gönderildi',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => 'Parolayı tekrar giriniz',
 'password_send' => 'Parola gönderildi',
 'password_send_text' => 'Kullanıcı adı ve e-posta adresiniz eşleştiyse yeni parolanız belirttiğiniz e-posta adresinize gönderilmiş olacaktır. Eğer birkaç dakika içerisinde e-posta adresinize mesaj gelmezse kullanıcı adı ve sisteme kayıtlı e-posta adresinizin doğru olduğundan emin olarak işlemi tekrarlayınız.',
@@ -1198,6 +1203,7 @@ URL: [url]',
 'search' => 'Ara',
 'search_fulltext' => 'Tam metinde ara',
 'search_in' => 'Şurada ara',
+'search_mode' => '',
 'search_mode_and' => 'tüm sözcükler',
 'search_mode_documents' => 'Sadece Belgeler',
 'search_mode_folders' => 'Sadece Klasörler',
@@ -1239,6 +1245,7 @@ URL: [url]',
 'select_mimetype' => '',
 'select_one' => 'Birini seçiniz',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => 'Kullanıcı Seç',
 'select_users' => 'Kullanıcı seçmek için tıklayın',
 'select_value' => 'Değeri seç',
@@ -1829,6 +1836,7 @@ URL: [url]',
 'timeline_skip_add_file' => 'ek eklendi',
 'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => '',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => '',
 'timeline_skip_status_change_0' => '',
 'timeline_skip_status_change_1' => '',
@@ -1887,6 +1895,7 @@ URL: [url]',
 'unknown_id' => 'bilinmeyen id',
 'unknown_keyword_category' => 'Bilinmeyen kategori',
 'unknown_owner' => 'Bilinmeyen sahip Id',
+'unknown_status' => '',
 'unknown_user' => 'Bilinmeyen kullanıcı ID',
 'unlinked_content' => 'Linki kaldırılmış içerik',
 'unlinked_documents' => 'Linki kaldırılmış dokümanlar',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 27113fab7..571525da2 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -95,6 +95,7 @@ URL: [url]',
 'all_users' => 'Всі користувачі',
 'already_subscribed' => 'Вже підписаний',
 'and' => 'і',
+'apikey' => '',
 'apply' => 'Застосувати',
 'approvals_accepted' => '',
 'approvals_accepted_latest' => '',
@@ -269,6 +270,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => 'Документ не змінено. Завантаження неможливе',
 'checkin_document' => 'Отримання',
 'checkoutpath_does_not_exist' => '',
+'checkout_cancel_confirm' => '',
 'checkout_document' => 'Завантаження',
 'checkout_is_disabled' => 'Завантаження відключене',
 'choose_attrdef' => 'Оберіть атрибут',
@@ -849,6 +851,7 @@ URL: [url]',
 'my_transmittals' => 'Мої перенесення',
 'name' => 'Назва',
 'nav_brand_admin_tools' => '',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => '',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -982,6 +985,8 @@ URL: [url]',
 'password_forgotten_send_hash' => 'Інструкції вислано на e-mail',
 'password_forgotten_text' => 'Заповніть форму і виконайте інструкції в листі',
 'password_forgotten_title' => 'Пароль вислано',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => 'Повторіть пароль',
 'password_send' => 'Пароль відіслано',
 'password_send_text' => 'Пароль відіслано.',
@@ -1219,6 +1224,7 @@ URL: [url]',
 'search' => 'Пошук',
 'search_fulltext' => 'Повнотекстовий пошук',
 'search_in' => 'Пошук',
+'search_mode' => '',
 'search_mode_and' => 'Всі слова',
 'search_mode_documents' => 'Режим пошуку документів',
 'search_mode_folders' => 'Режим пошуку каталогів',
@@ -1260,6 +1266,7 @@ URL: [url]',
 'select_mimetype' => '',
 'select_one' => 'Оберіть',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => '',
 'select_users' => 'Оберіть користувачів',
 'select_value' => 'Обрати значення',
@@ -1850,6 +1857,7 @@ URL: [url]',
 'timeline_skip_add_file' => 'додаток додано',
 'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => 'відхилений',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => 'термін виконання вийшов',
 'timeline_skip_status_change_0' => 'очікує рецензії',
 'timeline_skip_status_change_1' => 'очікую підтвердження',
@@ -1908,6 +1916,7 @@ URL: [url]',
 'unknown_id' => 'невідомий ідентифікатор',
 'unknown_keyword_category' => 'Невідома категорія',
 'unknown_owner' => 'Невідомий ідентифікатор власника',
+'unknown_status' => '',
 'unknown_user' => 'Невідомий ідентифікатор користувача',
 'unlinked_content' => 'Віддалений вміст',
 'unlinked_documents' => 'Видалені документи',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index d58972259..91ca89d14 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -95,6 +95,7 @@ URL: [url]',
 'all_users' => '所有用户',
 'already_subscribed' => '已经订阅',
 'and' => 'and',
+'apikey' => '',
 'apply' => '应用',
 'approvals_accepted' => '',
 'approvals_accepted_latest' => '',
@@ -261,6 +262,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => '',
 'checkin_document' => '签入',
 'checkoutpath_does_not_exist' => '签出路径不存在',
+'checkout_cancel_confirm' => '',
 'checkout_document' => '签出',
 'checkout_is_disabled' => '',
 'choose_attrdef' => '请选择属性',
@@ -839,6 +841,7 @@ URL: [url]',
 'my_transmittals' => '我的送达函',
 'name' => '名称',
 'nav_brand_admin_tools' => '',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => '',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -975,6 +978,8 @@ URL: [url]',
 'password_forgotten_send_hash' => '',
 'password_forgotten_text' => '填写以下表格，并遵循邮件中的指示找回遗失密码。',
 'password_forgotten_title' => '密码已发送',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => '重复密码',
 'password_send' => '发送密码',
 'password_send_text' => '您的新密码已通过邮件发送给您。若您尚未收到该邮件，请确认登陆用户名和对应的电子邮件填写是否正确，并重试。',
@@ -1189,6 +1194,7 @@ URL: [url]',
 'search' => '搜索',
 'search_fulltext' => '全文检索',
 'search_in' => '搜索于',
+'search_mode' => '',
 'search_mode_and' => '与模式',
 'search_mode_documents' => '仅文档',
 'search_mode_folders' => '仅目录',
@@ -1230,6 +1236,7 @@ URL: [url]',
 'select_mimetype' => '',
 'select_one' => '选择一个',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => '选择用户',
 'select_users' => '点击选择用户',
 'select_value' => '选择值',
@@ -1825,6 +1832,7 @@ URL: [url]',
 'timeline_skip_add_file' => '添加附件',
 'timeline_skip_scheduled_revision' => '',
 'timeline_skip_status_change_-1' => '拒绝',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => '过期',
 'timeline_skip_status_change_0' => '待审核',
 'timeline_skip_status_change_1' => '待批准',
@@ -1874,6 +1882,7 @@ URL: [url]',
 'unknown_id' => '未知ID号',
 'unknown_keyword_category' => '未知类别',
 'unknown_owner' => '未知所有者ID号',
+'unknown_status' => '',
 'unknown_user' => '未知用户ID号',
 'unlinked_content' => '未链接内容',
 'unlinked_documents' => '未链接的文档',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index adb741fe0..f4fa72eec 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -95,6 +95,7 @@ URL: [url]',
 'all_users' => '所有使用者',
 'already_subscribed' => '已經訂閱',
 'and' => '和',
+'apikey' => '',
 'apply' => '接受',
 'approvals_accepted' => '[no_approvals]個批准已被接受',
 'approvals_accepted_latest' => '（最新版本為[no_approvals]）',
@@ -269,6 +270,7 @@ URL: [url]',
 'checkedout_file_is_unchanged' => '簽出文件的文件仍保持不變。無法辦理入住手續。如果不計劃任何修改，則可以重置簽出狀態。',
 'checkin_document' => '簽入',
 'checkoutpath_does_not_exist' => '簽出路徑不存在',
+'checkout_cancel_confirm' => '',
 'checkout_document' => '簽出',
 'checkout_is_disabled' => '在配置中禁用了簽出文件功能。',
 'choose_attrdef' => '請選擇屬性',
@@ -868,6 +870,7 @@ URL: [url]',
 'my_transmittals' => '我的傳送',
 'name' => '名稱',
 'nav_brand_admin_tools' => '',
+'nav_brand_calendar' => '',
 'nav_brand_my_account' => '',
 'nav_brand_my_documents' => '',
 'nav_brand_view_document' => '',
@@ -1002,6 +1005,8 @@ URL: [url]',
 'password_forgotten_send_hash' => '有關如何進行操作的說明已發送到使用者的電子郵件地址',
 'password_forgotten_text' => '填寫以下表格，然後按照將發送給您的電子郵件中的說明進行操作。',
 'password_forgotten_title' => '密碼已寄出',
+'password_mismatch_error' => '',
+'password_mismatch_error_title' => '',
 'password_repeat' => '重複輸入密碼',
 'password_send' => '密碼寄出',
 'password_send_text' => '如果登錄名和電子郵件與現有使用者匹配，則您的新密碼已發送到給定的電子郵件地址。如果您在接下來的幾分鐘內沒有收到電子郵件，請確保登錄名和電子郵件均正確無誤，然後重新啟動該過程。',
@@ -1252,6 +1257,7 @@ URL: [url]',
 'search' => '搜索',
 'search_fulltext' => '全文檢索',
 'search_in' => '搜索於',
+'search_mode' => '',
 'search_mode_and' => '與模式',
 'search_mode_documents' => '只文件',
 'search_mode_folders' => '只資料夾',
@@ -1293,6 +1299,7 @@ URL: [url]',
 'select_mimetype' => '',
 'select_one' => '選擇一個',
 'select_owner' => '',
+'select_status' => '',
 'select_user' => '選擇使用者',
 'select_users' => '點擊選擇使用者',
 'select_value' => '選取值',
@@ -1888,6 +1895,7 @@ URL: [url]',
 'timeline_skip_add_file' => '新增附件',
 'timeline_skip_scheduled_revision' => '預定修訂',
 'timeline_skip_status_change_-1' => '拒絕',
+'timeline_skip_status_change_-2' => '',
 'timeline_skip_status_change_-3' => '已過期',
 'timeline_skip_status_change_0' => '等待審核',
 'timeline_skip_status_change_1' => '等待批准',
@@ -1946,6 +1954,7 @@ URL: [url]',
 'unknown_id' => '未知ID號',
 'unknown_keyword_category' => '未知類別',
 'unknown_owner' => '未知所有者ID號',
+'unknown_status' => '',
 'unknown_user' => '未知使用者ID號',
 'unlinked_content' => '未關聯的內容',
 'unlinked_documents' => '未關聯的文件',

From 9a2ebf80cc98fb7ff39e9f026fb3a04d0db77bb8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 14 May 2021 12:37:10 +0200
Subject: [PATCH 004/143] fix sending notification mail to group, add mandatory
 group rev/app

---
 op/op.Ajax.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index f9b4ce487..cc4f90e69 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -760,10 +760,14 @@ switch($command) {
 						$mreviewers = getMandatoryReviewers($folder, $user);
 						if($mreviewers['i'])
 							$reviewers['i'] = array_merge($reviewers['i'], $mreviewers['i']);
+						if($mreviewers['g'])
+							$reviewers['g'] = array_merge($reviewers['g'], $mreviewers['g']);
 					}
 					$mapprovers = getMandatoryApprovers($folder, $user);
 					if($mapprovers['i'])
 						$approvers['i'] = array_merge($approvers['i'], $mapprovers['i']);
+					if($mapprovers['g'])
+						$approvers['g'] = array_merge($approvers['g'], $mapprovers['g']);
 
 				} elseif($settings->_workflowMode == 'advanced') {
 					$workflow = $user->getMandatoryWorkflow();
@@ -889,7 +893,7 @@ switch($command) {
 									$notifier->toIndividual($user, $dms->getUser($reviewerid), $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
 								}
 								foreach($reviewers['g'] as $reviewergrpid) {
-									$notifier->toGroup($user, $dms->getGroup($reviewergrpid), $subject, $message, $params, $params, SeedDMS_NotificationService::RECV_REVIEWER);
+									$notifier->toGroup($user, $dms->getGroup($reviewergrpid), $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
 								}
 							}
 

From 5a74c3debfdd7a05b1c04ac536416d5bcf86629e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 14 May 2021 12:37:37 +0200
Subject: [PATCH 005/143] add mandatory group reviewer/approver

---
 op/op.AddDocument.php    | 4 ++++
 op/op.UpdateDocument.php | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 85da330b7..5ea2dec72 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -205,10 +205,14 @@ if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'tra
 		$mreviewers = getMandatoryReviewers($folder, $user);
 		if($mreviewers['i'])
 			$reviewers['i'] = array_merge($reviewers['i'], $mreviewers['i']);
+		if($mreviewers['g'])
+			$reviewers['g'] = array_merge($reviewers['g'], $mreviewers['g']);
 	}
 	$mapprovers = getMandatoryApprovers($folder, $user);
 	if($mapprovers['i'])
 		$approvers['i'] = array_merge($approvers['i'], $mapprovers['i']);
+	if($mapprovers['g'])
+		$approvers['g'] = array_merge($approvers['g'], $mapprovers['g']);
 
 	if($settings->_workflowMode == 'traditional' && !$settings->_allowReviewerOnly) {
 		/* Check if reviewers are set but no approvers */
diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index 331c801e4..ed058e325 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -214,10 +214,14 @@ default:
 			$mreviewers = getMandatoryReviewers($folder, $user);
 			if($mreviewers['i'])
 				$reviewers['i'] = array_merge($reviewers['i'], $mreviewers['i']);
+			if($mreviewers['g'])
+				$reviewers['g'] = array_merge($reviewers['g'], $mreviewers['g']);
 		}
 		$mapprovers = getMandatoryApprovers($folder, $user);
 		if($mapprovers['i'])
 			$approvers['i'] = array_merge($approvers['i'], $mapprovers['i']);
+		if($mapprovers['g'])
+			$approvers['g'] = array_merge($approvers['g'], $mapprovers['g']);
 	} elseif($settings->_workflowMode == 'advanced') {
 		if(!$workflows = $user->getMandatoryWorkflows()) {
 			if(isset($_POST["workflow"]))

From 639c280920d63baa545fde61716478fcd9dbe5b9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 14 May 2021 12:39:05 +0200
Subject: [PATCH 006/143] add changes for 5.1.23

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

diff --git a/CHANGELOG b/CHANGELOG
index 9860636a0..d5d0e3e0c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,8 @@
 - typeahead search for folders can search in subfolders
 - new theme based on bootstrap 4, including many improvements on small displays
 - propperly check for translation of html email body (Closes: #510)
+- set mandatory group reviewer/approver when adding a new document or version
+- fix sending notification mails to group when uploading document via drag&drop
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.22

From 1ac8f31105fd787e8c64768fbb6b1e4f2df46709 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 14 May 2021 19:05:02 +0200
Subject: [PATCH 007/143] check if shift key was preset when clicked in a
 folder/document row

---
 views/bootstrap/class.Bootstrap.php   | 20 ++++++++++++------
 views/bootstrap/class.ViewFolder.php  | 18 +++++++++-------
 views/bootstrap4/class.Bootstrap4.php | 30 ++++++++++++++++++---------
 3 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 79f27fac7..b93a16179 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2751,8 +2751,12 @@ $(document).ready( function() {
 ?>
 /* catch click on a document row in the list folders and documents */
 $('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(ev) {
-	attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3];
-	window.location = '../out/out.ViewDocument.php?documentid=' + attr_id;
+	if(ev.shiftKey) {
+		$(ev.currentTarget).parent().toggleClass('selected');
+	} else {
+		attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3];
+		window.location = '../out/out.ViewDocument.php?documentid=' + attr_id;
+	}
 });
 <?php
 		}
@@ -2772,10 +2776,14 @@ $('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(e
 ?>
 /* catch click on a document row in the list folders and documents */
 $('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];
-	window.location = '../out/out.ViewFolder.php?folderid=' + attr_id;
+	if(ev.shiftKey) {
+		$(ev.currentTarget).parent().toggleClass('selected');
+	} else {
+		attr_id = $(ev.currentTarget).parent().data('target-id');
+		if(typeof attr_id == 'undefined')
+			attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3];
+		window.location = '../out/out.ViewFolder.php?folderid=' + attr_id;
+	}
 });
 <?php
 		}
diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index 6af5228e5..aff68d62f 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -194,13 +194,17 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 	 * the table row when deleting the folder
 	 * This was added for the internal_link extensіon
 	 */
-	attr_id = $(ev.currentTarget).parent().data('target-id');
-	if(typeof attr_id == 'undefined')
-		attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3];
-	folderSelectedmaintree(attr_id, '');
-	$([document.documentElement, document.body]).animate({
-	scrollTop: 200
-	}, 200);
+	if(ev.shiftKey) {
+		$(ev.currentTarget).parent().toggleClass('selected');
+	} else {
+		attr_id = $(ev.currentTarget).parent().data('target-id');
+		if(typeof attr_id == 'undefined')
+			attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3];
+		folderSelectedmaintree(attr_id, '');
+		$([document.documentElement, document.body]).animate({
+		scrollTop: 200
+		}, 200);
+	}
 });
 <?php
 		$this->printClickDocumentJs();
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index ed720ed63..497b11c0d 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -2798,8 +2798,12 @@ $(document).ready( function() {
 ?>
 /* catch click on a document row in the list folders and documents */
 $('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(ev) {
-	attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3];
-	window.location = '../out/out.ViewDocument.php?documentid=' + attr_id;
+	if(ev.shiftKey) {
+		$(ev.currentTarget).parent().toggleClass('selected');
+	} else {
+		attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3];
+		window.location = '../out/out.ViewDocument.php?documentid=' + attr_id;
+	}
 });
 <?php
 		}
@@ -2819,10 +2823,14 @@ $('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(e
 ?>
 /* catch click on a document row in the list folders and documents */
 $('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];
-	window.location = '../out/out.ViewFolder.php?folderid=' + attr_id;
+	if(ev.shiftKey) {
+		$(ev.currentTarget).parent().toggleClass('selected');
+	} else {
+		attr_id = $(ev.currentTarget).parent().data('target-id');
+		if(typeof attr_id == 'undefined')
+			attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3];
+		window.location = '../out/out.ViewFolder.php?folderid=' + attr_id;
+	}
 });
 <?php
 		}
@@ -2858,10 +2866,12 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 	 * {@link SeedDMS_Bootstrap_Style::folderListRowStart()}
 	 */
 	function documentListRowStart($document, $class='') { /* {{{ */
-		if($class == 'error')
-			$class = 'table-danger';
-		else
-			$class = 'table-'.$class;
+		if($class) {
+			if($class == 'error')
+				$class = 'table-danger';
+			else
+				$class = 'table-'.$class;
+		}
 		$docID = $document->getID();
 		return "<tr id=\"table-row-document-".$docID."\" data-target-id=\"".$docID."\" class=\"table-row-document droptarget ".($class ? ' '.$class : '')."\" data-droptarget=\"document_".$docID."\" rel=\"document_".$docID."\" formtoken=\"".createFormKey('')."\" draggable=\"true\" data-name=\"".htmlspecialchars($document->getName(), ENT_QUOTES)."\">";
 	} /* }}} */

From e5159ca7f96df62954ff42071a66c1bcaa244265 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 14 May 2021 21:54:34 +0200
Subject: [PATCH 008/143] add methods
 SeedDMS_Core_DocumentContent::getReviewers() and                          
 SeedDMS_Core_DocumentContent::getApprovers()

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

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 4adf9f771..73b5604ec 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3382,6 +3382,35 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return M_NONE;
 	} /* }}} */
 
+	/**
+	 * Return a list of all reviewers separated by individuals and groups
+	 *
+	 * @return array|bool|null
+	 */
+	function getReviewers() { /* {{{ */
+		$dms = $this->_document->getDMS();
+		$db = $dms->getDB();
+
+		$queryStr=
+			"SELECT * FROM `tblDocumentReviewers` WHERE `version`='".$this->_version
+			."' AND `documentID` = '". $this->_document->getID() ."' ";
+
+		$recs = $db->getResultArray($queryStr);
+		if (is_bool($recs))
+			return false;
+		$reviewers = array('i'=>array(), 'g'=>array());
+		foreach($recs as $rec) {
+			if($rec['type'] == 0) {
+				if($u = $dms->getUser($rec['required']))
+					$reviewers['i'][] = $u;
+			} elseif($rec['type'] == 1) {
+				if($g = $dms->getGroup($rec['required']))
+					$reviewers['g'][] = $g;
+			}
+		}
+		return $reviewers;
+	} /* }}} */
+
 	/**
 	 * Get the current review status of the document content
 	 * The review status is a list of reviews and its current status
@@ -3510,6 +3539,35 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return true;
 	} /* }}} */
 
+	/**
+	 * Return a list of all approvers separated by individuals and groups
+	 *
+	 * @return array|bool|null
+	 */
+	function getApprovers() { /* {{{ */
+		$dms = $this->_document->getDMS();
+		$db = $dms->getDB();
+
+		$queryStr=
+			"SELECT * FROM `tblDocumentApprovers` WHERE `version`='".$this->_version
+			."' AND `documentID` = '". $this->_document->getID() ."' ";
+
+		$recs = $db->getResultArray($queryStr);
+		if (is_bool($recs))
+			return false;
+		$approvers = array('i'=>array(), 'g'=>array());
+		foreach($recs as $rec) {
+			if($rec['type'] == 0) {
+				if($u = $dms->getUser($rec['required']))
+					$approvers['i'][] = $u;
+			} elseif($rec['type'] == 1) {
+				if($g = $dms->getGroup($rec['required']))
+					$approvers['g'][] = $g;
+			}
+		}
+		return $approvers;
+	} /* }}} */
+
 	/**
 	 * Get the current approval status of the document content
 	 * The approval status is a list of approvals and its current status
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 43aa9050f..f09a4a087 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -25,6 +25,7 @@
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
 - SeedDMS_Core_DMS::getTimeline() uses status log instead of document content
+- add methods SeedDMS_Core_DocumentContent::getReviewers() and SeedDMS_Core_DocumentContent::getApprovers()	
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From e40fcf1c2cedc80db54ccf12b7f831aa4d931234 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 14 May 2021 21:55:00 +0200
Subject: [PATCH 009/143] add method sendNewDocumentMail(), settings can be
 passed to construct

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

diff --git a/inc/inc.Notification.php b/inc/inc.Notification.php
index cfc3ab615..e02404a13 100644
--- a/inc/inc.Notification.php
+++ b/inc/inc.Notification.php
@@ -13,7 +13,7 @@
  */
 
 global $logger;
-$notifier = new SeedDMS_NotificationService($logger);
+$notifier = new SeedDMS_NotificationService($logger, $settings);
 
 if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
 	foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {

From ca52671bac8a420231904a6e604d5b6ca1502f33 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 14 May 2021 21:55:48 +0200
Subject: [PATCH 010/143] add method sendNewDocumentMail(), settings can be
 passed to construct

---
 inc/inc.ClassNotificationService.php | 140 ++++++++++++++++++++++++---
 1 file changed, 126 insertions(+), 14 deletions(-)

diff --git a/inc/inc.ClassNotificationService.php b/inc/inc.ClassNotificationService.php
index 6a76f6396..aabd049cd 100644
--- a/inc/inc.ClassNotificationService.php
+++ b/inc/inc.ClassNotificationService.php
@@ -36,6 +36,11 @@ class SeedDMS_NotificationService {
 	 */
 	protected $logger;
 
+	/*
+	 * Configuration
+	 */
+	protected $settings;
+
 	/*
 	 * Possible types of receivers
 	 */
@@ -46,28 +51,29 @@ class SeedDMS_NotificationService {
 	const RECV_APPROVER = 4;
 	const RECV_WORKFLOW = 5;
 
-	public function __construct($logger = null) {
+	public function __construct($logger = null, $settings = null) { /* {{{ */
 		$this->services = array();
 		$this->errors = array();
 		$this->logger = $logger;
-	}
+		$this->settings = $settings;
+	} /* }}} */
 
-	public function addService($service, $name='') {
+	public function addService($service, $name='') { /* {{{ */
 		if(!$name)
 			$name = md5(uniqid());
 		$this->services[$name] = $service;
 		$this->errors[$name] = true;
-	}
+	} /* }}} */
 
-	public function getServices() {
+	public function getServices() { /* {{{ */
 		return $this->services;
-	}
+	} /* }}} */
 
-	public function getErrors() {
+	public function getErrors() { /* {{{ */
 		return $this->errors;
-	}
+	} /* }}} */
 
-	public function toIndividual($sender, $recipient, $subject, $message, $params=array(), $recvtype=0) {
+	public function toIndividual($sender, $recipient, $subject, $message, $params=array(), $recvtype=0) { /* {{{ */
 		$error = true;
 		foreach($this->services as $name => $service) {
 			/* Set $to to email address of user or the string passed in $recipient
@@ -96,13 +102,13 @@ class SeedDMS_NotificationService {
 			}
 		}
 		return $error;
-	}
+	} /* }}} */
 
 	/**
 	 * Send a notification to each user of a group
 	 *
 	 */
-	public function toGroup($sender, $groupRecipient, $subject, $message, $params=array(), $recvtype=0) {
+	public function toGroup($sender, $groupRecipient, $subject, $message, $params=array(), $recvtype=0) { /* {{{ */
 		$error = true;
 		foreach($this->services as $name => $service) {
 			$ret = true;
@@ -115,7 +121,7 @@ class SeedDMS_NotificationService {
 			}
 		}
 		return $error;
-	}
+	} /* }}} */
 
 	/**
 	 * Send a notification to a list of recipients
@@ -130,7 +136,7 @@ class SeedDMS_NotificationService {
 	 * @param int $recvtype type of receiver
 	 * @return boolean true on success, otherwise false
 	 */
-	public function toList($sender, $recipients, $subject, $message, $params=array(), $recvtype=0) {
+	public function toList($sender, $recipients, $subject, $message, $params=array(), $recvtype=0) { /* {{{ */
 		$error = true;
 		foreach($this->services as $name => $service) {
 			$ret = true;
@@ -143,7 +149,113 @@ class SeedDMS_NotificationService {
 			}
 		}
 		return $error;
-	}
+	} /* }}} */
 
+	/**
+	 *
+	 */
+	public function sendNewDocumentMail($document, $user) {
+		$folder = $document->getFolder();
+			$fnl = $folder->getNotifyList();
+			$dnl = $document->getNotifyList();
+			$nl = array(
+				'users'=>array_unique(array_merge($dnl['users'], $fnl['users']), SORT_REGULAR),
+				'groups'=>array_unique(array_merge($dnl['groups'], $fnl['groups']), SORT_REGULAR)
+			);
+
+			$lc = $document->getLatestContent();
+			$subject = "new_document_email_subject";
+			$message = "new_document_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['folder_name'] = $folder->getName();
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['username'] = $user->getFullName();
+			$params['comment'] = $document->getComment();
+			$params['version_comment'] = $lc->getComment();
+			$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+			$params['sitename'] = $this->settings->_siteName;
+			$params['http_root'] = $this->settings->_httpRoot;
+			$this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+			foreach ($nl["groups"] as $grp) {
+				$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+			}
+
+			/* Get workflow from controller in case it was modified in a hook */
+//			$workflow = $controller->getParam('workflow');
+			if($this->settings->_enableNotificationWorkflow && ($workflow = $lc->getWorkflow())) {
+				$subject = "request_workflow_action_email_subject";
+				$message = "request_workflow_action_email_body";
+				$params = array();
+				$params['name'] = $document->getName();
+				$params['version'] = $lc->getVersion();
+				$params['workflow'] = $workflow->getName();
+				$params['folder_path'] = $folder->getFolderPathPlain();
+				$params['current_state'] = $workflow->getInitState()->getName();
+				$params['username'] = $user->getFullName();
+				$params['sitename'] = $this->settings->_siteName;
+				$params['http_root'] = $this->settings->_httpRoot;
+				$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+
+				foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) {
+					foreach($ntransition->getUsers() as $tuser) {
+						$this->toIndividual($user, $tuser->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
+					}
+					foreach($ntransition->getGroups() as $tuser) {
+						$this->toGroup($user, $tuser->getGroup(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
+					}
+				}
+			}
+
+			if($this->settings->_enableNotificationAppRev) {
+				/* Reviewers and approvers will be informed about the new document */
+				/* Get reviewers and approvers from controller in case it was
+				 * modified in a hook
+				 */
+				$reviewers = $lc->getReviewers(); //$controller->getParam('reviewers');
+        $approvers = $lc->getApprovers(); //$controller->getParam('approvers');
+				if($reviewers['i'] || $reviewers['g']) {
+					$subject = "review_request_email_subject";
+					$message = "review_request_email_body";
+					$params = array();
+					$params['name'] = $document->getName();
+					$params['folder_path'] = $folder->getFolderPathPlain();
+					$params['version'] = $lc->getVersion();
+					$params['comment'] = $document->getComment();
+					$params['username'] = $user->getFullName();
+					$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+					$params['sitename'] = $this->settings->_siteName;
+					$params['http_root'] = $this->settings->_httpRoot;
+
+					foreach($reviewers['i'] as $reviewer) {
+						$this->toIndividual($user, $reviewer, $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
+					}
+					foreach($reviewers['g'] as $reviewergrp) {
+						$this->toGroup($user, $reviewergrp, $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
+					}
+				}
+
+				elseif($approvers['i'] || $approvers['g']) {
+					$subject = "approval_request_email_subject";
+					$message = "approval_request_email_body";
+					$params = array();
+					$params['name'] = $document->getName();
+					$params['folder_path'] = $folder->getFolderPathPlain();
+					$params['version'] = $lc->getVersion();
+					$params['comment'] = $document->getComment();
+					$params['username'] = $user->getFullName();
+					$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+					$params['sitename'] = $this->settings->_siteName;
+					$params['http_root'] = $this->settings->_httpRoot;
+
+					foreach($approvers['i'] as $approver) {
+						$this->toIndividual($user, $approver, $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
+					}
+					foreach($approvers['g'] as $approvergrp) {
+						$this->toGroup($user, $approvergrp, $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
+					}
+				}
+			}
+	} /* }}} */
 }
 

From e436e7fb05e427f9035369abd5524da19cc1aa35 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 14 May 2021 21:56:09 +0200
Subject: [PATCH 011/143] pass settings to notification

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

diff --git a/webdav/index.php b/webdav/index.php
index d035c2d42..89d89245d 100644
--- a/webdav/index.php
+++ b/webdav/index.php
@@ -28,7 +28,7 @@ require_once("../inc/inc.ClassEmailNotify.php");
 require_once("../inc/inc.Notification.php");
 require_once("../inc/inc.ClassController.php");
 
-$notifier = new SeedDMS_NotificationService($logger);
+$notifier = new SeedDMS_NotificationService($logger, $settings);
 
 if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
 	foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {

From 423f42c1f4312ba42ba1b33794551341a660f7eb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 14 May 2021 21:56:37 +0200
Subject: [PATCH 012/143] use new method sendNewDocumentMail() to send
 notification mail

---
 op/op.AddDocument.php | 100 +---------------------------------------
 op/op.Ajax.php        | 103 +-----------------------------------------
 2 files changed, 3 insertions(+), 200 deletions(-)

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 5ea2dec72..6176b54d8 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -376,105 +376,7 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 	} else {
 		// Send notification to subscribers of folder.
 		if($notifier) {
-			$fnl = $folder->getNotifyList();
-			$dnl = $document->getNotifyList();
-			$nl = array(
-				'users'=>array_unique(array_merge($dnl['users'], $fnl['users']), SORT_REGULAR),
-				'groups'=>array_unique(array_merge($dnl['groups'], $fnl['groups']), SORT_REGULAR)
-			);
-
-			$subject = "new_document_email_subject";
-			$message = "new_document_email_body";
-			$params = array();
-			$params['name'] = $name;
-			$params['folder_name'] = $folder->getName();
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['username'] = $user->getFullName();
-			$params['comment'] = $comment;
-			$params['version_comment'] = $version_comment;
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
-
-			/* Get workflow from controller in case it was modified in a hook */
-			$workflow = $controller->getParam('workflow');
-			if($workflow && $settings->_enableNotificationWorkflow) {
-				$subject = "request_workflow_action_email_subject";
-				$message = "request_workflow_action_email_body";
-				$params = array();
-				$params['name'] = $document->getName();
-				$params['version'] = $reqversion;
-				$params['workflow'] = $workflow->getName();
-				$params['folder_path'] = $folder->getFolderPathPlain();
-				$params['current_state'] = $workflow->getInitState()->getName();
-				$params['username'] = $user->getFullName();
-				$params['sitename'] = $settings->_siteName;
-				$params['http_root'] = $settings->_httpRoot;
-				$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-
-				foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) {
-					foreach($ntransition->getUsers() as $tuser) {
-						$notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
-					}
-					foreach($ntransition->getGroups() as $tuser) {
-						$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
-					}
-				}
-			}
-
-			if($settings->_enableNotificationAppRev) {
-				/* Reviewers and approvers will be informed about the new document */
-				/* Get reviewers and approvers from controller in case it was
-				 * modified in a hook
-				 */
-				$reviewers = $controller->getParam('reviewers');
-        $approvers = $controller->getParam('approvers');
-				if($reviewers['i'] || $reviewers['g']) {
-					$subject = "review_request_email_subject";
-					$message = "review_request_email_body";
-					$params = array();
-					$params['name'] = $document->getName();
-					$params['folder_path'] = $folder->getFolderPathPlain();
-					$params['version'] = $reqversion;
-					$params['comment'] = $comment;
-					$params['username'] = $user->getFullName();
-					$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-					$params['sitename'] = $settings->_siteName;
-					$params['http_root'] = $settings->_httpRoot;
-
-					foreach($reviewers['i'] as $reviewerid) {
-						$notifier->toIndividual($user, $dms->getUser($reviewerid), $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
-					}
-					foreach($reviewers['g'] as $reviewergrpid) {
-						$notifier->toGroup($user, $dms->getGroup($reviewergrpid), $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
-					}
-				}
-
-				elseif($approvers['i'] || $approvers['g']) {
-					$subject = "approval_request_email_subject";
-					$message = "approval_request_email_body";
-					$params = array();
-					$params['name'] = $document->getName();
-					$params['folder_path'] = $folder->getFolderPathPlain();
-					$params['version'] = $reqversion;
-					$params['comment'] = $comment;
-					$params['username'] = $user->getFullName();
-					$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-					$params['sitename'] = $settings->_siteName;
-					$params['http_root'] = $settings->_httpRoot;
-
-					foreach($approvers['i'] as $approverid) {
-						$notifier->toIndividual($user, $dms->getUser($approverid), $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
-					}
-					foreach($approvers['g'] as $approvergrpid) {
-						$notifier->toGroup($user, $dms->getGroup($approvergrpid), $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
-					}
-				}
-			}
+			$notifier->sendNewDocumentMail($document, $user);
 		}
 		if($settings->_removeFromDropFolder) {
 			if(file_exists($userfiletmp)) {
diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index cc4f90e69..dbc1e7333 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -64,7 +64,7 @@ if (isset($_COOKIE["mydms_session"])) {
 	}
 
 	global $logger;
-	$notifier = new SeedDMS_NotificationService($logger);
+	$notifier = new SeedDMS_NotificationService($logger, $settings);
 	if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
 		foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
 			if(method_exists($notificationObj, 'preAddService')) {
@@ -819,106 +819,7 @@ switch($command) {
 				} else {
 					// Send notification to subscribers of folder.
 					if($notifier) {
-						$fnl = $folder->getNotifyList();
-						$dnl = $document->getNotifyList();
-						$nl = array(
-							'users'=>array_unique(array_merge($dnl['users'], $fnl['users']), SORT_REGULAR),
-							'groups'=>array_unique(array_merge($dnl['groups'], $fnl['groups']), SORT_REGULAR)
-						);
-
-						$subject = "new_document_email_subject";
-						$message = "new_document_email_body";
-						$params = array();
-						$params['name'] = $name;
-						$params['folder_name'] = $folder->getName();
-						$params['folder_path'] = $folder->getFolderPathPlain();
-						$params['username'] = $user->getFullName();
-						$params['comment'] = '';
-						$params['version_comment'] = '';
-						$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-						$params['sitename'] = $settings->_siteName;
-						$params['http_root'] = $settings->_httpRoot;
-						$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-						foreach ($nl["groups"] as $grp) {
-							$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-						}
-
-						/* Get workflow from controller in case it was modified in a hook */
-						$workflow = $controller->getParam('workflow');
-						if($workflow && $settings->_enableNotificationWorkflow) {
-							$subject = "request_workflow_action_email_subject";
-							$message = "request_workflow_action_email_body";
-							$params = array();
-							$params['name'] = $document->getName();
-							$params['version'] = 1;
-							$params['workflow'] = $workflow->getName();
-							$params['folder_path'] = $folder->getFolderPathPlain();
-							$params['current_state'] = $workflow->getInitState()->getName();
-							$params['username'] = $user->getFullName();
-							$params['sitename'] = $settings->_siteName;
-							$params['http_root'] = $settings->_httpRoot;
-							$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-
-							foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) {
-								foreach($ntransition->getUsers() as $tuser) {
-									$notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
-								}
-								foreach($ntransition->getGroups() as $tuser) {
-									$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
-								}
-							}
-						}
-
-						if($settings->_enableNotificationAppRev) {
-							/* Reviewers and approvers will be informed about the new document */
-							/* Get reviewers and approvers from controller in case it was
-							 * modified in a hook
-							 */
-							$reviewers = $controller->getParam('reviewers');
-							$approvers = $controller->getParam('approvers');
-							if($reviewers['i'] || $reviewers['g']) {
-								$subject = "review_request_email_subject";
-								$message = "review_request_email_body";
-								$params = array();
-								$params['name'] = $document->getName();
-								$params['folder_path'] = $folder->getFolderPathPlain();
-								$params['version'] = 1;
-								$params['comment'] = '';
-								$params['username'] = $user->getFullName();
-								$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-								$params['sitename'] = $settings->_siteName;
-								$params['http_root'] = $settings->_httpRoot;
-
-								foreach($reviewers['i'] as $reviewerid) {
-									$notifier->toIndividual($user, $dms->getUser($reviewerid), $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
-								}
-								foreach($reviewers['g'] as $reviewergrpid) {
-									$notifier->toGroup($user, $dms->getGroup($reviewergrpid), $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
-								}
-							}
-
-							elseif($approvers['i'] || $approvers['g']) {
-								$subject = "approval_request_email_subject";
-								$message = "approval_request_email_body";
-								$params = array();
-								$params['name'] = $document->getName();
-								$params['folder_path'] = $folder->getFolderPathPlain();
-								$params['version'] = 1;
-								$params['comment'] = '';
-								$params['username'] = $user->getFullName();
-								$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-								$params['sitename'] = $settings->_siteName;
-								$params['http_root'] = $settings->_httpRoot;
-
-								foreach($approvers['i'] as $approverid) {
-									$notifier->toIndividual($user, $dms->getUser($approverid), $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
-								}
-								foreach($approvers['g'] as $approvergrpid) {
-									$notifier->toGroup($user, $dms->getGroup($approvergrpid), $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
-								}
-							}
-						}
-
+						$notifier->sendNewDocumentMail($document, $user);
 					}
 				}
 				header('Content-Type: application/json');

From c6a74605335c513f071ca480eb98931c11702105 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 15 May 2021 07:37:21 +0200
Subject: [PATCH 013/143] add missing case in getAttributeValidationError()

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

diff --git a/inc/inc.Language.php b/inc/inc.Language.php
index ef9950862..bf9636993 100644
--- a/inc/inc.Language.php
+++ b/inc/inc.Language.php
@@ -273,7 +273,7 @@ function getAttributeValidationError($error, $attrname='', $attrvalue='', $regex
 		case 10:
 			return array("attr_not_in_valueset", array('attrname'=>$attrname, 'value'=>$attrvalue));
 			break;
-		case 8:
+		case 9:
 			return array("attr_malformed_date", array('attrname'=>$attrname, 'value'=>$attrvalue));
 			break;
 		case 8:

From 64c6c2159298180ccd8107deb11e0ebd735a70bb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 15 May 2021 07:38:04 +0200
Subject: [PATCH 014/143] fix error in creating list of notifier

---
 op/op.RemoveVersion.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/op/op.RemoveVersion.php b/op/op.RemoveVersion.php
index 764d44827..4857f3955 100644
--- a/op/op.RemoveVersion.php
+++ b/op/op.RemoveVersion.php
@@ -110,19 +110,19 @@ else {
 	$emailGroupListA = array();
 	$status = $version->getReviewStatus();
 	foreach ($status as $st) {
-		if ($st["status"]==0 && !in_array($st["required"], $emailUserList)) {
-			if($st['type'] == 0)
+		if ($st["status"]==0) {
+			if($st['type'] == 0 && !in_array($st["required"], $emailUserListR))
 				$emailUserListR[] = $st["required"];
-			else
+			elseif(!in_array($st["required"], $emailGroupListR))
 				$emailGroupListR[] = $st["required"];
 		}
 	}
 	$status = $version->getApprovalStatus();
 	foreach ($status as $st) {
-		if ($st["status"]==0 && !in_array($st["required"], $emailUserList)) {
-			if($st['type'] == 0)
+		if ($st["status"]==0) {
+			if($st['type'] == 0 && !in_array($st["required"], $emailUserListA))
 				$emailUserListA[] = $st["required"];
-			else
+			elseif(!in_array($st["required"], $emailGroupListA))
 				$emailGroupListA[] = $st["required"];
 		}
 	}

From d6a296c0716001fbc02372be6745fed861e66e05 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 15 May 2021 07:38:46 +0200
Subject: [PATCH 015/143] add more methods for sending mails

---
 inc/inc.ClassNotificationService.php | 257 +++++++++++++++++----------
 1 file changed, 165 insertions(+), 92 deletions(-)

diff --git a/inc/inc.ClassNotificationService.php b/inc/inc.ClassNotificationService.php
index aabd049cd..65d66d7b8 100644
--- a/inc/inc.ClassNotificationService.php
+++ b/inc/inc.ClassNotificationService.php
@@ -152,110 +152,183 @@ class SeedDMS_NotificationService {
 	} /* }}} */
 
 	/**
-	 *
+	 * This notification is sent when a workflow action is needed.
 	 */
-	public function sendNewDocumentMail($document, $user) {
+	public function sendRequestWorkflowActionMail($content, $user) { /* {{{ */
+		$document = $content->getDocument();
 		$folder = $document->getFolder();
-			$fnl = $folder->getNotifyList();
-			$dnl = $document->getNotifyList();
-			$nl = array(
-				'users'=>array_unique(array_merge($dnl['users'], $fnl['users']), SORT_REGULAR),
-				'groups'=>array_unique(array_merge($dnl['groups'], $fnl['groups']), SORT_REGULAR)
-			);
 
-			$lc = $document->getLatestContent();
-			$subject = "new_document_email_subject";
-			$message = "new_document_email_body";
+		/* Send mail only if enabled in the configuration */
+		if($this->settings->_enableNotificationWorkflow && ($workflow = $content->getWorkflow())) {
+			$subject = "request_workflow_action_email_subject";
+			$message = "request_workflow_action_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['version'] = $content->getVersion();
+			$params['workflow'] = $workflow->getName();
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['current_state'] = $workflow->getInitState()->getName();
+			$params['username'] = $user->getFullName();
+			$params['sitename'] = $this->settings->_siteName;
+			$params['http_root'] = $this->settings->_httpRoot;
+			$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+
+			foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) {
+				foreach($ntransition->getUsers() as $tuser) {
+					$this->toIndividual($user, $tuser->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
+				}
+				foreach($ntransition->getGroups() as $tuser) {
+					$this->toGroup($user, $tuser->getGroup(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
+				}
+			}
+		}
+	} /* }}} */
+
+	/**
+	 * This notification is sent when a review or approval is needed.
+	 */
+	public function sendRequestRevAppActionMail($content, $user) { /* {{{ */
+		$document = $content->getDocument();
+		$folder = $document->getFolder();
+
+		if($this->settings->_enableNotificationAppRev) {
+			/* Reviewers and approvers will be informed about the new document */
+			$reviewers = $content->getReviewers(); //$controller->getParam('reviewers');
+			$approvers = $content->getApprovers(); //$controller->getParam('approvers');
+			if($reviewers['i'] || $reviewers['g']) {
+				$subject = "review_request_email_subject";
+				$message = "review_request_email_body";
+				$params = array();
+				$params['name'] = $document->getName();
+				$params['folder_path'] = $folder->getFolderPathPlain();
+				$params['version'] = $content->getVersion();
+				$params['comment'] = $document->getComment();
+				$params['username'] = $user->getFullName();
+				$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+				$params['sitename'] = $this->settings->_siteName;
+				$params['http_root'] = $this->settings->_httpRoot;
+
+				foreach($reviewers['i'] as $reviewer) {
+					$this->toIndividual($user, $reviewer, $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
+				}
+				foreach($reviewers['g'] as $reviewergrp) {
+					$this->toGroup($user, $reviewergrp, $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
+				}
+			}
+
+			elseif($approvers['i'] || $approvers['g']) {
+				$subject = "approval_request_email_subject";
+				$message = "approval_request_email_body";
+				$params = array();
+				$params['name'] = $document->getName();
+				$params['folder_path'] = $folder->getFolderPathPlain();
+				$params['version'] = $content->getVersion();
+				$params['comment'] = $document->getComment();
+				$params['username'] = $user->getFullName();
+				$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+				$params['sitename'] = $this->settings->_siteName;
+				$params['http_root'] = $this->settings->_httpRoot;
+
+				foreach($approvers['i'] as $approver) {
+					$this->toIndividual($user, $approver, $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
+				}
+				foreach($approvers['g'] as $approvergrp) {
+					$this->toGroup($user, $approvergrp, $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
+				}
+			}
+		}
+	} /* }}} */
+
+	/**
+	 * This notification is sent when a new document is created.
+	 */
+	public function sendNewDocumentMail($document, $user) { /* {{{ */
+		$folder = $document->getFolder();
+		$fnl = $folder->getNotifyList();
+		$dnl = $document->getNotifyList();
+		$nl = array(
+			'users'=>array_unique(array_merge($dnl['users'], $fnl['users']), SORT_REGULAR),
+			'groups'=>array_unique(array_merge($dnl['groups'], $fnl['groups']), SORT_REGULAR)
+		);
+
+		$lc = $document->getLatestContent();
+		$subject = "new_document_email_subject";
+		$message = "new_document_email_body";
+		$params = array();
+		$params['name'] = $document->getName();
+		$params['folder_name'] = $folder->getName();
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['username'] = $user->getFullName();
+		$params['comment'] = $document->getComment();
+		$params['version_comment'] = $lc->getComment();
+		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+		$params['sitename'] = $this->settings->_siteName;
+		$params['http_root'] = $this->settings->_httpRoot;
+		$this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		foreach ($nl["groups"] as $grp) {
+			$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		}
+
+		$this->sendRequestWorkflowActionMail($lc, $user);
+
+		$this->sendRequestRevAppActionMail($lc, $user);
+
+	} /* }}} */
+
+	/**
+	 * This notification is sent when a new document version is created.
+	 */
+	public function sendNewDocumentVersionMail($document, $user) { /* {{{ */
+		$lc = $document->getLatestContent();
+		$folder = $document->getFolder();
+		$notifyList = $document->getNotifyList();
+
+		$subject = "document_updated_email_subject";
+		$message = "document_updated_email_body";
+		$params = array();
+		$params['name'] = $document->getName();
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['username'] = $user->getFullName();
+		$params['comment'] = $document->getComment();
+		$params['version_comment'] = $lc->getComment();
+		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+		$params['sitename'] = $this->settings->_siteName;
+		$params['http_root'] = $this->settings->_httpRoot;
+		$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		foreach ($notifyList["groups"] as $grp) {
+			$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		}
+//	 if user is not owner send notification to owner
+//		if ($user->getID() != $document->getOwner()->getID()) 
+//			$this->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+
+		$this->sendRequestWorkflowActionMail($lc, $user);
+
+		$this->sendRequestRevAppActionMail($lc, $user);
+
+	} /* }}} */
+
+	public function sendChangedExpiryMail($document, $user, $oldexpires) { /* {{{ */
+		$folder = $document->getFolder();
+		$notifyList = $document->getNotifyList();
+
+		if($oldexpires != $document->getExpires()) {
+			// Send notification to subscribers.
+			$subject = "expiry_changed_email_subject";
+			$message = "expiry_changed_email_body";
 			$params = array();
 			$params['name'] = $document->getName();
-			$params['folder_name'] = $folder->getName();
 			$params['folder_path'] = $folder->getFolderPathPlain();
 			$params['username'] = $user->getFullName();
-			$params['comment'] = $document->getComment();
-			$params['version_comment'] = $lc->getComment();
 			$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 			$params['sitename'] = $this->settings->_siteName;
 			$params['http_root'] = $this->settings->_httpRoot;
-			$this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($nl["groups"] as $grp) {
+			$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+			foreach ($notifyList["groups"] as $grp) {
 				$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
-
-			/* Get workflow from controller in case it was modified in a hook */
-//			$workflow = $controller->getParam('workflow');
-			if($this->settings->_enableNotificationWorkflow && ($workflow = $lc->getWorkflow())) {
-				$subject = "request_workflow_action_email_subject";
-				$message = "request_workflow_action_email_body";
-				$params = array();
-				$params['name'] = $document->getName();
-				$params['version'] = $lc->getVersion();
-				$params['workflow'] = $workflow->getName();
-				$params['folder_path'] = $folder->getFolderPathPlain();
-				$params['current_state'] = $workflow->getInitState()->getName();
-				$params['username'] = $user->getFullName();
-				$params['sitename'] = $this->settings->_siteName;
-				$params['http_root'] = $this->settings->_httpRoot;
-				$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-
-				foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) {
-					foreach($ntransition->getUsers() as $tuser) {
-						$this->toIndividual($user, $tuser->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
-					}
-					foreach($ntransition->getGroups() as $tuser) {
-						$this->toGroup($user, $tuser->getGroup(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
-					}
-				}
-			}
-
-			if($this->settings->_enableNotificationAppRev) {
-				/* Reviewers and approvers will be informed about the new document */
-				/* Get reviewers and approvers from controller in case it was
-				 * modified in a hook
-				 */
-				$reviewers = $lc->getReviewers(); //$controller->getParam('reviewers');
-        $approvers = $lc->getApprovers(); //$controller->getParam('approvers');
-				if($reviewers['i'] || $reviewers['g']) {
-					$subject = "review_request_email_subject";
-					$message = "review_request_email_body";
-					$params = array();
-					$params['name'] = $document->getName();
-					$params['folder_path'] = $folder->getFolderPathPlain();
-					$params['version'] = $lc->getVersion();
-					$params['comment'] = $document->getComment();
-					$params['username'] = $user->getFullName();
-					$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-					$params['sitename'] = $this->settings->_siteName;
-					$params['http_root'] = $this->settings->_httpRoot;
-
-					foreach($reviewers['i'] as $reviewer) {
-						$this->toIndividual($user, $reviewer, $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
-					}
-					foreach($reviewers['g'] as $reviewergrp) {
-						$this->toGroup($user, $reviewergrp, $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
-					}
-				}
-
-				elseif($approvers['i'] || $approvers['g']) {
-					$subject = "approval_request_email_subject";
-					$message = "approval_request_email_body";
-					$params = array();
-					$params['name'] = $document->getName();
-					$params['folder_path'] = $folder->getFolderPathPlain();
-					$params['version'] = $lc->getVersion();
-					$params['comment'] = $document->getComment();
-					$params['username'] = $user->getFullName();
-					$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-					$params['sitename'] = $this->settings->_siteName;
-					$params['http_root'] = $this->settings->_httpRoot;
-
-					foreach($approvers['i'] as $approver) {
-						$this->toIndividual($user, $approver, $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
-					}
-					foreach($approvers['g'] as $approvergrp) {
-						$this->toGroup($user, $approvergrp, $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
-					}
-				}
-			}
+		}
 	} /* }}} */
+
 }
 

From 07b8ab9706184cb3ac07292158f717a634a7d5ed Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 15 May 2021 07:39:18 +0200
Subject: [PATCH 016/143] use methods in notification service for sending mails

---
 op/op.UpdateDocument.php | 117 +--------------------------------------
 1 file changed, 3 insertions(+), 114 deletions(-)

diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index ed058e325..a89c93bc1 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -280,121 +280,10 @@ default:
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));
 	} else {
 		// Send notification to subscribers.
-		if ($notifier){
-			$notifyList = $document->getNotifyList();
-			$folder = $document->getFolder();
+		if($notifier) {
+			$notifier->sendNewDocumentVersionMail($document, $user);
 
-			$subject = "document_updated_email_subject";
-			$message = "document_updated_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['username'] = $user->getFullName();
-			$params['comment'] = $document->getComment();
-			$params['version_comment'] = $content->getComment();
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
-			// if user is not owner send notification to owner
-//			if ($user->getID() != $document->getOwner()->getID()) 
-//				$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
-
-			/* Get workflow from controller in case it was modified in a hook */
-			$workflow = $controller->getParam('workflow');
-			if($workflow && $settings->_enableNotificationWorkflow) {
-				$subject = "request_workflow_action_email_subject";
-				$message = "request_workflow_action_email_body";
-				$params = array();
-				$params['name'] = $document->getName();
-				$params['version'] = $content->getVersion();
-				$params['workflow'] = $workflow->getName();
-				$params['folder_path'] = $folder->getFolderPathPlain();
-				$params['current_state'] = $workflow->getInitState()->getName();
-				$params['username'] = $user->getFullName();
-				$params['sitename'] = $settings->_siteName;
-				$params['http_root'] = $settings->_httpRoot;
-				$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-
-				foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) {
-					foreach($ntransition->getUsers() as $tuser) {
-						$notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
-					}
-					foreach($ntransition->getGroups() as $tuser) {
-						$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
-					}
-				}
-			}
-
-			if($settings->_enableNotificationAppRev) {
-				/* Reviewers and approvers will be informed about the new document */
-				/* Get reviewers and approvers from controller in case it was
-				 * modified in a hook
-				 */
-				$reviewers = $controller->getParam('reviewers');
-				$approvers = $controller->getParam('approvers');
-				if($reviewers['i'] || $reviewers['g']) {
-					$subject = "review_request_email_subject";
-					$message = "review_request_email_body";
-					$params = array();
-					$params['name'] = $document->getName();
-					$params['folder_path'] = $folder->getFolderPathPlain();
-					$params['version'] = $content->getVersion();
-					$params['comment'] = $content->getComment();
-					$params['username'] = $user->getFullName();
-					$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-					$params['sitename'] = $settings->_siteName;
-					$params['http_root'] = $settings->_httpRoot;
-
-					foreach($reviewers['i'] as $reviewerid) {
-						$notifier->toIndividual($user, $dms->getUser($reviewerid), $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
-					}
-					foreach($reviewers['g'] as $reviewergrpid) {
-						$notifier->toGroup($user, $dms->getGroup($reviewergrpid), $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
-					}
-				}
-
-				elseif($approvers['i'] || $approvers['g']) {
-					$subject = "approval_request_email_subject";
-					$message = "approval_request_email_body";
-					$params = array();
-					$params['name'] = $document->getName();
-					$params['folder_path'] = $folder->getFolderPathPlain();
-					$params['version'] = $content->getVersion();
-					$params['comment'] = $content->getComment();
-					$params['username'] = $user->getFullName();
-					$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-					$params['sitename'] = $settings->_siteName;
-					$params['http_root'] = $settings->_httpRoot;
-
-					foreach($approvers['i'] as $approverid) {
-						$notifier->toIndividual($user, $dms->getUser($approverid), $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
-					}
-					foreach($approvers['g'] as $approvergrpid) {
-						$notifier->toGroup($user, $dms->getGroup($approvergrpid), $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
-					}
-				}
-			}
-
-			if($oldexpires != $document->getExpires()) {
-				// Send notification to subscribers.
-				$subject = "expiry_changed_email_subject";
-				$message = "expiry_changed_email_body";
-				$params = array();
-				$params['name'] = $document->getName();
-				$params['folder_path'] = $folder->getFolderPathPlain();
-				$params['username'] = $user->getFullName();
-				$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-				$params['sitename'] = $settings->_siteName;
-				$params['http_root'] = $settings->_httpRoot;
-				$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-				foreach ($notifyList["groups"] as $grp) {
-					$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-				}
-			}
+			$notifier->sendChangedExpiryMail($document, $user, $oldexpires);
 		}
 
 		if($settings->_removeFromDropFolder) {

From 7f417157f8c7713158651800b96418894ee6639a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 15 May 2021 12:17:07 +0200
Subject: [PATCH 017/143] move sending mails into NotificationService

---
 inc/inc.ClassNotificationService.php | 240 +++++++++++++++++++++++++--
 op/op.Ajax.php                       |  12 ++
 op/op.EditComment.php                |  41 +----
 op/op.EditDocument.php               | 142 +---------------
 op/op.MoveClipboard.php              |  51 +-----
 op/op.MoveDocument.php               |  25 +--
 op/op.MoveFolder.php                 |  26 +--
 7 files changed, 244 insertions(+), 293 deletions(-)

diff --git a/inc/inc.ClassNotificationService.php b/inc/inc.ClassNotificationService.php
index 65d66d7b8..15626e544 100644
--- a/inc/inc.ClassNotificationService.php
+++ b/inc/inc.ClassNotificationService.php
@@ -110,15 +110,12 @@ class SeedDMS_NotificationService {
 	 */
 	public function toGroup($sender, $groupRecipient, $subject, $message, $params=array(), $recvtype=0) { /* {{{ */
 		$error = true;
-		foreach($this->services as $name => $service) {
-			$ret = true;
-			foreach ($groupRecipient->getUsers() as $recipient) {
-				$ret &= $this->toIndividual($sender, $recipient, $subject, $message, $params, $recvtype);
-			}
-			$this->errors[$name] = $ret;
-			if(!$ret) {
-				$error = false;
-			}
+		$ret = true;
+		foreach ($groupRecipient->getUsers() as $recipient) {
+			$ret &= $this->toIndividual($sender, $recipient, $subject, $message, $params, $recvtype);
+		}
+		if(!$ret) {
+			$error = false;
 		}
 		return $error;
 	} /* }}} */
@@ -138,15 +135,12 @@ class SeedDMS_NotificationService {
 	 */
 	public function toList($sender, $recipients, $subject, $message, $params=array(), $recvtype=0) { /* {{{ */
 		$error = true;
-		foreach($this->services as $name => $service) {
-			$ret = true;
-			foreach ($recipients as $recipient) {
-				$ret &= $this->toIndividual($sender, $recipient, $subject, $message, $params, $recvtype);
-			}
-			$this->errors[$name] = $ret;
-			if(!$ret) {
-				$error = false;
-			}
+		$ret = true;
+		foreach ($recipients as $recipient) {
+			$ret &= $this->toIndividual($sender, $recipient, $subject, $message, $params, $recvtype);
+		}
+		if(!$ret) {
+			$error = false;
 		}
 		return $error;
 	} /* }}} */
@@ -323,6 +317,12 @@ class SeedDMS_NotificationService {
 			$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 			$params['sitename'] = $this->settings->_siteName;
 			$params['http_root'] = $this->settings->_httpRoot;
+			// if user is not owner and owner not already in list of notifiers, then
+			// send notification to owner
+			if ($user->getID() != $document->getOwner()->getID() &&
+				false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
+				$this->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+			}
 			$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			foreach ($notifyList["groups"] as $grp) {
 				$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
@@ -330,5 +330,209 @@ class SeedDMS_NotificationService {
 		}
 	} /* }}} */
 
+	public function sendChangedAttributesMail($document, $user, $oldattributes) { /* {{{ */
+		$folder = $document->getFolder();
+		$notifyList = $document->getNotifyList();
+
+		$newattributes = $document->getAttributes();
+		if($oldattributes) {
+			foreach($oldattributes as $attrdefid=>$attribute) {
+				if(!isset($newattributes[$attrdefid]) || $newattributes[$attrdefid]->getValueAsArray() !== $oldattributes[$attrdefid]->getValueAsArray()) {
+					$subject = "document_attribute_changed_email_subject";
+					$message = "document_attribute_changed_email_body";
+					$params = array();
+					$params['name'] = $document->getName();
+					$params['attribute_name'] = $attribute->getAttributeDefinition()->getName();
+					$params['attribute_old_value'] = $oldattributes[$attrdefid]->getValue();
+					$params['attribute_new_value'] = isset($newattributes[$attrdefid]) ? $newattributes[$attrdefid]->getValue() : '';
+					$params['folder_path'] = $folder->getFolderPathPlain();
+					$params['username'] = $user->getFullName();
+					$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+					$params['sitename'] = $this->settings->_siteName;
+					$params['http_root'] = $this->settings->_httpRoot;
+
+					$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+					foreach ($notifyList["groups"] as $grp) {
+						$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+					}
+				}
+			}
+		}
+		/* Check for new attributes which didn't have a value before */
+		if($newattributes) {
+			foreach($newattributes as $attrdefid=>$attribute) {
+				if(!isset($oldattributes[$attrdefid]) && $attribute) {
+					$subject = "document_attribute_changed_email_subject";
+					$message = "document_attribute_changed_email_body";
+					$params = array();
+					$params['name'] = $document->getName();
+					$params['attribute_name'] = $dms->getAttributeDefinition($attrdefid)->getName();
+					$params['attribute_old_value'] = '';
+					$params['attribute_new_value'] = $attribute->getValue();
+					$params['folder_path'] = $folder->getFolderPathPlain();
+					$params['username'] = $user->getFullName();
+					$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+					$params['sitename'] = $this->settings->_siteName;
+					$params['http_root'] = $this->settings->_httpRoot;
+
+					$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+					foreach ($notifyList["groups"] as $grp) {
+						$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+					}
+				}
+			}
+		}
+	} /* }}} */
+
+	public function sendChangedCommentMail($document, $user, $oldcomment) { /* {{{ */
+		if($oldcomment != $document->getComment()) {
+			$notifyList = $document->getNotifyList();
+			$folder = $document->getFolder();
+			$subject = "document_comment_changed_email_subject";
+			$message = "document_comment_changed_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['old_comment'] = $oldcomment;
+			$params['new_comment'] = $document->getComment();
+			$params['username'] = $user->getFullName();
+			$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+			$params['sitename'] = $this->settings->_siteName;
+			$params['http_root'] = $this->settings->_httpRoot;
+
+			// if user is not owner send notification to owner
+			if ($user->getID() != $document->getOwner()->getID() &&
+				false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
+				$this->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+			}
+			$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+			foreach ($notifyList["groups"] as $grp) {
+				$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+			}
+		}
+	} /* }}} */
+
+	public function sendChangedVersionCommentMail($content, $user, $oldcomment) { /* {{{ */
+		// FIXME: use extra mail template which includes the version
+		if($oldcomment != $content->getComment()) {
+			$document = $content->getDocument();
+			$notifyList = $document->getNotifyList();
+			$folder = $document->getFolder();
+			$subject = "document_comment_changed_email_subject";
+			$message = "document_comment_changed_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['old_comment'] = $oldcomment;
+			$params['new_comment'] = $content->getComment();
+			$params['username'] = $user->getFullName();
+			$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+			$params['sitename'] = $this->settings->_siteName;
+			$params['http_root'] = $this->settings->_httpRoot;
+
+			// if user is not owner send notification to owner
+			if ($user->getID() != $document->getOwner()->getID() &&
+				false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
+				$this->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+			}
+			$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+			foreach ($notifyList["groups"] as $grp) {
+				$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+			}
+		}
+	} /* }}} */
+
+	public function sendChangedNameMail($document, $user, $oldname) { /* {{{ */
+		if($oldname != $document->getName()) {
+			$notifyList = $document->getNotifyList();
+			$folder = $document->getFolder();
+			$subject = "document_renamed_email_subject";
+			$message = "document_renamed_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['old_name'] = $oldname;
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['username'] = $user->getFullName();
+			$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+			$params['sitename'] = $this->settings->_siteName;
+			$params['http_root'] = $this->settings->_httpRoot;
+
+			// if user is not owner send notification to owner
+			if ($user->getID() != $document->getOwner()->getID() &&
+				false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
+				$this->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+			}
+			$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+			foreach ($notifyList["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+			}
+		}
+	} /* }}} */
+
+	public function sendMovedDocumentMail($document, $user, $oldfolder) { /* {{{ */
+		$targetfolder = $document->getFolder();
+		if($targetfolder->getId() == $oldfolder->getId())
+			return;
+
+		$nl1 = $oldfolder->getNotifyList();
+		$nl2 = $document->getNotifyList();
+		$nl3 = $targetfolder->getNotifyList();
+		$nl = array(
+			'users'=>array_unique(array_merge($nl1['users'], $nl2['users'], $nl3['users']), SORT_REGULAR),
+			'groups'=>array_unique(array_merge($nl1['groups'], $nl2['groups'], $nl3['groups']), SORT_REGULAR)
+		);
+		$subject = "document_moved_email_subject";
+		$message = "document_moved_email_body";
+		$params = array();
+		$params['name'] = $document->getName();
+		$params['old_folder_path'] = $oldfolder->getFolderPathPlain();
+		$params['new_folder_path'] = $targetfolder->getFolderPathPlain();
+		$params['username'] = $user->getFullName();
+		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+		$params['sitename'] = $this->settings->_siteName;
+		$params['http_root'] = $this->settings->_httpRoot;
+		$this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		foreach ($nl["groups"] as $grp) {
+			$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		}
+		// if user is not owner send notification to owner
+		if ($user->getID() != $document->getOwner()->getID() &&
+			false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
+			$this->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+		}
+	} /* }}} */
+
+	public function sendMovedFolderMail($folder, $user, $oldfolder) { /* {{{ */
+		$targetfolder = $folder->getParent();
+		if($targetfolder->getId() == $oldfolder->getId())
+			return;
+
+		$nl1 = $oldfolder->getNotifyList();
+		$nl2 = $folder->getNotifyList();
+		$nl3 = $targetfolder->getNotifyList();
+		$nl = array(
+			'users'=>array_unique(array_merge($nl1['users'], $nl2['users'], $nl3['users']), SORT_REGULAR),
+			'groups'=>array_unique(array_merge($nl1['groups'], $nl2['groups'], $nl3['groups']), SORT_REGULAR)
+		);
+		$subject = "folder_moved_email_subject";
+		$message = "folder_moved_email_body";
+		$params = array();
+		$params['name'] = $folder->getName();
+		$params['old_folder_path'] = $oldfolder->getFolderPathPlain();
+		$params['new_folder_path'] = $targetfolder->getFolderPathPlain();
+		$params['username'] = $user->getFullName();
+		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
+		$params['sitename'] = $this->settings->_siteName;
+		$params['http_root'] = $this->settings->_httpRoot;
+		$this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		foreach ($nl["groups"] as $grp) {
+			$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		}
+		// if user is not owner send notification to owner
+		if ($user->getID() != $folder->getOwner()->getID() &&
+			false === SeedDMS_Core_DMS::inList($folder->getOwner(), $notifyList['users'])) {
+			$this->toIndividual($user, $folder->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+		}
+	} /* }}} */
 }
 
diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index dbc1e7333..217316fa7 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -310,7 +310,11 @@ switch($command) {
 					if ($mfolder->getAccessMode($user, 'moveFolder') >= M_READWRITE) {
 						if($folder = $dms->getFolder($_REQUEST['targetfolderid'])) {
 							if($folder->getAccessMode($user, 'moveFolder') >= M_READWRITE) {
+								$oldFolder = $mfolder->getParent();
 								if($mfolder->setParent($folder)) {
+									if($notifier) {
+										$notifier->sendMovedFolderMail($mfolder, $user, $oldFolder);
+									}
 									header('Content-Type: application/json');
 									echo json_encode(array('success'=>true, 'message'=>getMLText('splash_move_folder'), 'data'=>''));
 									add_log_line();
@@ -349,10 +353,14 @@ switch($command) {
 					if ($mdocument->getAccessMode($user, 'moveDocument') >= M_READWRITE) {
 						if($folder = $dms->getFolder($_REQUEST['targetfolderid'])) {
 							if($folder->getAccessMode($user, 'moveDocument') >= M_READWRITE) {
+								$oldFolder = $mdocument->getFolder();
 								if($mdocument->setFolder($folder)) {
 									if(isset($_REQUEST['sequence'])) {
 										$mdocument->setSequence((float) $_REQUEST['sequence']);
 									}
+									if($notifier) {
+										$notifier->sendMovedDocumentMail($mdocument, $user, $oldFolder);
+									}
 									header('Content-Type: application/json');
 									echo json_encode(array('success'=>true, 'message'=>getMLText('splash_move_document'), 'data'=>''));
 									add_log_line();
@@ -634,10 +642,14 @@ switch($command) {
 			$document = $dms->getDocument($_REQUEST['id']);
 			if($document) {
 				if ($document->getAccessMode($user) >= M_READWRITE) {
+					$oldname = $document->getName();
 					if (!$document->setName($_REQUEST['name'])) {
 						header('Content-Type: application/json');
 						echo json_encode(array('success'=>false, 'message'=>'Error setting name', 'data'=>''));
 					} else {
+						if($notifier) {
+							$notifier->sendChangedNameMail($document, $user, $oldname);
+						}
 						header('Content-Type: application/json');
 						echo json_encode(array('success'=>true, 'message'=>getMLText('splash_document_name_changed'), 'data'=>''));
 						add_log_line();
diff --git a/op/op.EditComment.php b/op/op.EditComment.php
index 7da9cc26a..381e1d97d 100644
--- a/op/op.EditComment.php
+++ b/op/op.EditComment.php
@@ -68,46 +68,7 @@ $comment =  $_POST["comment"];
 if (($oldcomment = $version->getComment()) != $comment) {
 	if($version->setComment($comment)) {
 		if($notifier) {
-			$notifyList = $document->getNotifyList();
-			$folder = $document->getFolder();
-
-/*
-			$subject = "###SITENAME###: ".$document->getName().", v.".$version->_version." - ".getMLText("document_comment_changed_email");
-			$message = getMLText("document_comment_changed_email")."\r\n";
-			$message .= 
-				getMLText("document").": ".$document->getName()."\r\n".
-				getMLText("version").": ".$version->_version."\r\n".
-				getMLText("comment").": ".$comment."\r\n".
-				getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".
-				"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$version->_version."\r\n";
-
-			if(isset($document->_notifyList["users"])) {
-				$notifier->toList($user, $document->_notifyList["users"], $subject, $message);
-			}
-			if(isset($document->_notifyList["groups"])) {
-				foreach ($document->_notifyList["groups"] as $grp) {
-					$notifier->toGroup($user, $grp, $subject, $message);
-				}
-			}
-*/
-
-			$subject = "document_comment_changed_email_subject";
-			$message = "document_comment_changed_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['version'] = $version->getVersion();
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['username'] = $user->getFullName();
-			$params['new_comment'] = $comment;
-			$params['old_comment'] = $oldcomment;
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$version->getVersion();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
-
+			$notifier->sendChangedVersionCommentMail($version, $user, $oldcomment);
 		}
 	}
 	else {
diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php
index 538d3a050..8e9f21518 100644
--- a/op/op.EditDocument.php
+++ b/op/op.EditDocument.php
@@ -148,146 +148,14 @@ if(!$controller->run()) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())), $errmsg);
 }
 
-if ($oldname != $name) {
-		// Send notification to subscribers.
-		if($notifier) {
-			$notifyList = $document->getNotifyList();
-			$folder = $document->getFolder();
-			$subject = "document_renamed_email_subject";
-			$message = "document_renamed_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['old_name'] = $oldname;
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['username'] = $user->getFullName();
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
+if($notifier) {
+	$notifier->sendChangedNameMail($document, $user, $oldname);
 
-			// if user is not owner send notification to owner
-			if ($user->getID() != $document->getOwner()->getID() &&
-				false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
-				$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
-			}
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
-		}
-}
+	$notifier->sendChangedCommentMail($document, $user, $oldcomment);
 
-if ($oldcomment != $comment) {
-		// Send notification to subscribers.
-		if($notifier) {
-			$notifyList = $document->getNotifyList();
-			$folder = $document->getFolder();
-			$subject = "document_comment_changed_email_subject";
-			$message = "document_comment_changed_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['old_comment'] = $oldcomment;
-			$params['new_comment'] = $comment;
-			$params['username'] = $user->getFullName();
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
+	$notifier->sendChangedExpiryMail($document, $user, $oldexpires);
 
-			// if user is not owner send notification to owner
-			if ($user->getID() != $document->getOwner()->getID() &&
-				false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
-				$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
-			}
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
-		}
-}
-
-if ($expires != $oldexpires) {
-		if($notifier) {
-			$notifyList = $document->getNotifyList();
-			$folder = $document->getFolder();
-			// Send notification to subscribers.
-			$subject = "expiry_changed_email_subject";
-			$message = "expiry_changed_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['username'] = $user->getFullName();
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-
-			// if user is not owner send notification to owner
-			if ($user->getID() != $document->getOwner()->getID() &&
-				false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
-				$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
-			}
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
-		}
-}
-
-if ($oldkeywords != $keywords) {
-}
-
-$newattributes = $document->getAttributes();
-if($oldattributes) {
-	foreach($oldattributes as $attrdefid=>$attribute) {
-		if(!isset($newattributes[$attrdefid]) || $newattributes[$attrdefid]->getValueAsArray() !== $oldattributes[$attrdefid]->getValueAsArray()) {
-			if($notifier) {
-				$notifyList = $document->getNotifyList();
-				$subject = "document_attribute_changed_email_subject";
-				$message = "document_attribute_changed_email_body";
-				$params = array();
-				$params['name'] = $document->getName();
-				$params['attribute_name'] = $attribute->getAttributeDefinition()->getName();
-				$params['attribute_old_value'] = $oldattributes[$attrdefid]->getValue();
-				$params['attribute_new_value'] = isset($newattributes[$attrdefid]) ? $newattributes[$attrdefid]->getValue() : '';
-				$params['folder_path'] = $folder->getFolderPathPlain();
-				$params['username'] = $user->getFullName();
-				$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-				$params['sitename'] = $settings->_siteName;
-				$params['http_root'] = $settings->_httpRoot;
-
-				$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-				foreach ($notifyList["groups"] as $grp) {
-					$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-				}
-			}
-		}
-	}
-}
-/* Check for new attributes which didn't have a value before */
-if($newattributes) {
-	foreach($newattributes as $attrdefid=>$attribute) {
-		if(!isset($oldattributes[$attrdefid]) && $attribute) {
-			if($notifier) {
-				$notifyList = $document->getNotifyList();
-				$subject = "document_attribute_changed_email_subject";
-				$message = "document_attribute_changed_email_body";
-				$params = array();
-				$params['name'] = $document->getName();
-				$params['attribute_name'] = $dms->getAttributeDefinition($attrdefid)->getName();
-				$params['attribute_old_value'] = '';
-				$params['attribute_new_value'] = $attribute->getValue();
-				$params['folder_path'] = $folder->getFolderPathPlain();
-				$params['username'] = $user->getFullName();
-				$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-				$params['sitename'] = $settings->_siteName;
-				$params['http_root'] = $settings->_httpRoot;
-
-				$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-				foreach ($notifyList["groups"] as $grp) {
-					$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-				}
-			}
-		}
-	}
+	$notifier->sendChangedAttributesMail($document, $user, $oldattributes);
 }
 
 $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_document_edited')));
diff --git a/op/op.MoveClipboard.php b/op/op.MoveClipboard.php
index 2e77ffca4..bff27c200 100644
--- a/op/op.MoveClipboard.php
+++ b/op/op.MoveClipboard.php
@@ -56,30 +56,7 @@ foreach($clipboard['docs'] as $documentid) {
 			if ($document->setFolder($targetFolder)) {
 				// Send notification to subscribers.
 				if($notifier) {
-					$nl1 = $oldFolder->getNotifyList();
-					$nl2 = $document->getNotifyList();
-					$nl3 = $targetFolder->getNotifyList();
-					$nl = array(
-						'users'=>array_unique(array_merge($nl1['users'], $nl2['users'], $nl3['users']), SORT_REGULAR),
-						'groups'=>array_unique(array_merge($nl1['groups'], $nl2['groups'], $nl3['groups']), SORT_REGULAR)
-					);
-					$subject = "document_moved_email_subject";
-					$message = "document_moved_email_body";
-					$params = array();
-					$params['name'] = $document->getName();
-					$params['old_folder_path'] = $oldFolder->getFolderPathPlain();
-					$params['new_folder_path'] = $targetFolder->getFolderPathPlain();
-					$params['username'] = $user->getFullName();
-					$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-					$params['sitename'] = $settings->_siteName;
-					$params['http_root'] = $settings->_httpRoot;
-					$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-					foreach ($nl["groups"] as $grp) {
-						$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-					}
-					// if user is not owner send notification to owner
-//					if ($user->getID() != $document->getOwner()->getID()) 
-//						$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+					$notifier->sendMovedDocumentMail($document, $user, $oldFolder);
 				}
 				$session->removeFromClipboard($document);
 
@@ -103,31 +80,7 @@ foreach($clipboard['folders'] as $folderid) {
 		if ($folder->setParent($targetFolder)) {
 			// Send notification to subscribers.
 			if($notifier) {
-				$nl1 = $oldFolder->getNotifyList();
-				$nl2 = $folder->getNotifyList();
-				$nl3 = $targetFolder->getNotifyList();
-				$nl = array(
-					'users'=>array_unique(array_merge($nl1['users'], $nl2['users'], $nl3['users']), SORT_REGULAR),
-					'groups'=>array_unique(array_merge($nl1['groups'], $nl2['groups'], $nl3['groups']), SORT_REGULAR)
-				);
-				$subject = "folder_moved_email_subject";
-				$message = "folder_moved_email_body";
-				$params = array();
-				$params['name'] = $folder->getName();
-				$params['old_folder_path'] = $oldFolder->getFolderPathPlain();
-				$params['new_folder_path'] = $targetFolder->getFolderPathPlain();
-				$params['username'] = $user->getFullName();
-				$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
-				$params['sitename'] = $settings->_siteName;
-				$params['http_root'] = $settings->_httpRoot;
-				$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-				foreach ($nl["groups"] as $grp) {
-					$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-				}
-				// if user is not owner send notification to owner
-//				if ($user->getID() != $folder->getOwner()->getID()) 
-//					$notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
-
+				$notifier->sendMovedFolderMail($folder, $user, $oldFolder);
 			}
 			$session->removeFromClipboard($folder);
 		} else {
diff --git a/op/op.MoveDocument.php b/op/op.MoveDocument.php
index 56c7a2515..e1ebc227a 100644
--- a/op/op.MoveDocument.php
+++ b/op/op.MoveDocument.php
@@ -82,30 +82,7 @@ if(!$settings->_enableDuplicateDocNames) {
 if ($document->setFolder($targetFolder)) {
 	// Send notification to subscribers.
 	if($notifier) {
-		$nl1 = $oldFolder->getNotifyList();
-		$nl2 = $document->getNotifyList();
-		$nl3 = $targetFolder->getNotifyList();
-		$nl = array(
-			'users'=>array_unique(array_merge($nl1['users'], $nl2['users'], $nl3['users']), SORT_REGULAR),
-			'groups'=>array_unique(array_merge($nl1['groups'], $nl2['groups'], $nl3['groups']), SORT_REGULAR)
-		);
-		$subject = "document_moved_email_subject";
-		$message = "document_moved_email_body";
-		$params = array();
-		$params['name'] = $document->getName();
-		$params['old_folder_path'] = $oldFolder->getFolderPathPlain();
-		$params['new_folder_path'] = $targetFolder->getFolderPathPlain();
-		$params['username'] = $user->getFullName();
-		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-		$params['sitename'] = $settings->_siteName;
-		$params['http_root'] = $settings->_httpRoot;
-		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-		foreach ($nl["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-		}
-		// if user is not owner send notification to owner
-//			if ($user->getID() != $document->getOwner()->getID()) 
-//				$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+		$notifier->sendMovedDocumentMail($document, $user, $oldFolder);
 	}
 
 } else {
diff --git a/op/op.MoveFolder.php b/op/op.MoveFolder.php
index dbdad0f88..d0fc96886 100644
--- a/op/op.MoveFolder.php
+++ b/op/op.MoveFolder.php
@@ -81,31 +81,7 @@ if(!$settings->_enableDuplicateSubFolderNames) {
 if ($folder->setParent($targetFolder)) {
 	// Send notification to subscribers.
 	if($notifier) {
-		$nl1 = $oldFolder->getNotifyList();
-		$nl2 = $folder->getNotifyList();
-		$nl3 = $targetFolder->getNotifyList();
-		$nl = array(
-			'users'=>array_unique(array_merge($nl1['users'], $nl2['users'], $nl3['users']), SORT_REGULAR),
-			'groups'=>array_unique(array_merge($nl1['groups'], $nl2['groups'], $nl3['groups']), SORT_REGULAR)
-		);
-		$subject = "folder_moved_email_subject";
-		$message = "folder_moved_email_body";
-		$params = array();
-		$params['name'] = $folder->getName();
-		$params['old_folder_path'] = $oldFolder->getFolderPathPlain();
-		$params['new_folder_path'] = $targetFolder->getFolderPathPlain();
-		$params['username'] = $user->getFullName();
-		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
-		$params['sitename'] = $settings->_siteName;
-		$params['http_root'] = $settings->_httpRoot;
-		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-		foreach ($nl["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-		}
-		// if user is not owner send notification to owner
-		//if ($user->getID() != $folder->getOwner()->getID()) 
-		//	$notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
-
+		$notifier->sendMovedFolderMail($folder, $user, $oldFolder);
 	}
 } else {
 	UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured"));

From 33c6436c16b30414924a1dd1dc481465abff55bb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 15 May 2021 22:46:46 +0200
Subject: [PATCH 018/143] move more emails into class NotificationService

---
 inc/inc.ClassNotificationService.php | 120 +++++++++++++++++++++++++++
 op/op.AddFile.php                    |  18 +---
 op/op.AddSubFolder.php               |   3 +
 op/op.Ajax.php                       |  38 ++-------
 op/op.RemoveDocument.php             |  23 ++---
 op/op.RemoveFolder.php               |   3 +
 op/op.SetWorkflow.php                |  27 +-----
 7 files changed, 141 insertions(+), 91 deletions(-)

diff --git a/inc/inc.ClassNotificationService.php b/inc/inc.ClassNotificationService.php
index 15626e544..728ef5077 100644
--- a/inc/inc.ClassNotificationService.php
+++ b/inc/inc.ClassNotificationService.php
@@ -302,6 +302,126 @@ class SeedDMS_NotificationService {
 
 	} /* }}} */
 
+	/**
+	 * This notification is sent when a document is deleted.
+	 * Keep in mind that $document refers to a document which has just been
+	 * deleted from the database, but all the data needed is still in the
+	 * object.
+	 */
+	public function sendDeleteDocumentMail($document, $user) { /* {{{ */
+		$folder = $document->getFolder();
+		$dnl =	$document->getNotifyList();
+		$fnl =	$folder->getNotifyList();
+		$nl = array(
+			'users'=>array_unique(array_merge($dnl['users'], $fnl['users']), SORT_REGULAR),
+			'groups'=>array_unique(array_merge($dnl['groups'], $fnl['groups']), SORT_REGULAR)
+		);
+		$subject = "document_deleted_email_subject";
+		$message = "document_deleted_email_body";
+		$params = array();
+		$params['name'] = $document->getName();
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['username'] = $user->getFullName();
+		$params['sitename'] = $this->settings->_siteName;
+		$params['http_root'] = $this->settings->_httpRoot;
+		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
+		$this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		foreach ($nl["groups"] as $grp) {
+			$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		}
+	} /* }}} */
+
+	/**
+	 * This notification is sent when a new folder is created.
+	 */
+	public function sendNewFolderMail($folder, $user) { /* {{{ */
+		$parent = $folder->getParent();
+		$fnl = $parent->getNotifyList();
+		$snl = $folder->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)
+		);
+
+		$subject = "new_subfolder_email_subject";
+		$message = "new_subfolder_email_body";
+		$params = array();
+		$params['name'] = $folder->getName();
+		$params['folder_name'] = $parent->getName();
+		$params['folder_path'] = $parent->getFolderPathPlain();
+		$params['username'] = $user->getFullName();
+		$params['comment'] = $folder->getComment();
+		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
+		$params['sitename'] = $this->settings->_siteName;
+		$params['http_root'] = $this->settings->_httpRoot;
+		$this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		foreach ($nl["groups"] as $grp) {
+			$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		}
+	} /* }}} */
+
+	/**
+	 * This notification is sent when a folder is deleted.
+	 * Keep in mind that $folder refers to a folder which has just been
+	 * deleted from the database, but all the data needed is still in the
+	 * object.
+	 */
+	public function sendDeleteFolderMail($folder, $user) { /* {{{ */
+		$parent = $folder->getParent();
+		$fnl = $folder->getNotifyList();
+		$pnl = $parent->getNotifyList();
+		$nl = array(
+			'users'=>array_unique(array_merge($fnl['users'], $pnl['users']), SORT_REGULAR),
+			'groups'=>array_unique(array_merge($fnl['groups'], $pnl['groups']), SORT_REGULAR)
+		);
+
+		$subject = "folder_deleted_email_subject";
+		$message = "folder_deleted_email_body";
+		$params = array();
+		$params['name'] = $folder->getName();
+		$params['folder_path'] = $parent->getFolderPathPlain();
+		$params['username'] = $user->getFullName();
+		$params['sitename'] = $this->settings->_siteName;
+		$params['http_root'] = $this->settings->_httpRoot;
+		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$parent->getID();
+		$this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		foreach ($nl["groups"] as $grp) {
+			$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		}
+	} /* }}} */
+
+	/**
+	 * This notification is sent when a new attachment is created.
+	 */
+	public function sendNewFileMail($file, $user) { /* {{{ */
+		$document = $file->getDocument();
+		$folder = $document->getFolder();
+		$notifyList = $document->getNotifyList();
+
+		$subject = "new_file_email_subject";
+		$message = "new_file_email_body";
+		$params = array();
+		$params['name'] = $file->getName();
+		$params['document'] = $document->getName();
+		$params['folder_name'] = $folder->getName();
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['username'] = $user->getFullName();
+		$params['comment'] = $file->getComment();
+		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+		$params['sitename'] = $this->settings->_siteName;
+		$params['http_root'] = $this->settings->_httpRoot;
+		// if user is not owner and owner not already in list of notifiers, then
+		// send notification to owner
+		if ($user->getID() != $document->getOwner()->getID() &&
+			false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
+			$this->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+		}
+		$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		foreach ($notifyList["groups"] as $grp) {
+			$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		}
+	} /* }}} */
+
 	public function sendChangedExpiryMail($document, $user, $oldexpires) { /* {{{ */
 		$folder = $document->getFolder();
 		$notifyList = $document->getNotifyList();
diff --git a/op/op.AddFile.php b/op/op.AddFile.php
index 5f970afdd..305972af5 100644
--- a/op/op.AddFile.php
+++ b/op/op.AddFile.php
@@ -111,22 +111,7 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 	} else {
 		// Send notification to subscribers.
 		if($notifier) {
-			$notifyList = $document->getNotifyList();
-
-			$subject = "new_file_email_subject";
-			$message = "new_file_email_body";
-			$params = array();
-			$params['name'] = $name;
-			$params['document'] = $document->getName();
-			$params['username'] = $user->getFullName();
-			$params['comment'] = $comment;
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
+			$notifier->sendNewFileMail($res, $user);
 		}
 	}
 }
@@ -135,5 +120,4 @@ add_log_line("?name=".$name."&documentid=".$documentid);
 
 header("Location:../out/out.ViewDocument.php?documentid=".$documentid."&currenttab=attachments");
 
-
 ?>
diff --git a/op/op.AddSubFolder.php b/op/op.AddSubFolder.php
index a98c9d7ac..efac68b40 100644
--- a/op/op.AddSubFolder.php
+++ b/op/op.AddSubFolder.php
@@ -121,6 +121,8 @@ if(!$subFolder = $controller->run()) {
 } else {
 	// Send notification to subscribers.
 	if($notifier) {
+		$notifier->sendNewFolderMail($subFolder, $user);
+		/*
 		$fnl = $folder->getNotifyList();
 		$snl = $subFolder->getNotifyList();
 		$nl = array(
@@ -143,6 +145,7 @@ if(!$subFolder = $controller->run()) {
 		foreach ($nl["groups"] as $grp) {
 			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		}
+		 */
 	}
 }
 
diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 217316fa7..71dc69af3 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -74,7 +74,7 @@ if (isset($_COOKIE["mydms_session"])) {
 	}
 
 	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'])) {
@@ -507,19 +507,7 @@ switch($command) {
 
 						if($folder->remove()) {
 							if ($notifier) {
-								$subject = "folder_deleted_email_subject";
-								$message = "folder_deleted_email_body";
-								$params = array();
-								$params['name'] = $foldername;
-								$params['folder_path'] = $parent->getFolderPathPlain();
-								$params['username'] = $user->getFullName();
-								$params['sitename'] = $settings->_siteName;
-								$params['http_root'] = $settings->_httpRoot;
-								$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$parent->getID();
-								$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-								foreach ($nl["groups"] as $grp) {
-									$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-								}
+								$notifier->sendDeleteFolderMail($folder, $user);
 							}
 							header('Content-Type: application/json');
 							echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
@@ -553,10 +541,6 @@ switch($command) {
 						/* Get the notify list before removing the document */
 						$dnl =	$document->getNotifyList();
 						$fnl =	$folder->getNotifyList();
-						$nl = array(
-							'users'=>array_unique(array_merge($dnl['users'], $fnl['users']), SORT_REGULAR),
-							'groups'=>array_unique(array_merge($dnl['groups'], $fnl['groups']), SORT_REGULAR)
-						);
 						$docname = $document->getName();
 
 						$controller = Controller::factory('RemoveDocument', array('dms'=>$dms, 'user'=>$user));
@@ -564,18 +548,10 @@ switch($command) {
 						$controller->setParam('fulltextservice', $fulltextservice);
 						if($controller->run()) {
 							if ($notifier){
-								$subject = "document_deleted_email_subject";
-								$message = "document_deleted_email_body";
-								$params = array();
-								$params['name'] = $docname;
-								$params['folder_path'] = $folder->getFolderPathPlain();
-								$params['username'] = $user->getFullName();
-								$params['sitename'] = $settings->_siteName;
-								$params['http_root'] = $settings->_httpRoot;
-								$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-								foreach ($nl["groups"] as $grp) {
-									$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-								}
+								/* $document still has the data from the just deleted document,
+								 * which is just enough to send the email.
+								 */
+								$notifier->sendDeleteDocumentMail($document, $user);
 							}
 
 							header('Content-Type: application/json');
@@ -844,7 +820,7 @@ switch($command) {
 		}
 		break; /* }}} */
 
-	case 'indexdocument': /* {{{ */
+	case 'indexdocument':
 	case 'indexfolder': /* {{{ */
 		if($user && $user->isAdmin()) {
 			if($fulltextservice) {
diff --git a/op/op.RemoveDocument.php b/op/op.RemoveDocument.php
index 9d554b335..f700b96ac 100644
--- a/op/op.RemoveDocument.php
+++ b/op/op.RemoveDocument.php
@@ -69,13 +69,11 @@ $previewer->deleteDocumentPreviews($document);
 
 /* Get the notify list before removing the document
  * Also inform the users/groups of the parent folder
+ * Getting the list now will keep them in the document object
+ * even after the document has been deleted.
  */
 $dnl =	$document->getNotifyList();
 $fnl =	$folder->getNotifyList();
-$nl = array(
-	'users'=>array_unique(array_merge($dnl['users'], $fnl['users']), SORT_REGULAR),
-	'groups'=>array_unique(array_merge($dnl['groups'], $fnl['groups']), SORT_REGULAR)
-);
 $docname = $document->getName();
 
 $controller->setParam('document', $document);
@@ -89,19 +87,10 @@ if(!$controller->run()) {
 }
 
 if ($notifier){
-	$subject = "document_deleted_email_subject";
-	$message = "document_deleted_email_body";
-	$params = array();
-	$params['name'] = $docname;
-	$params['folder_path'] = $folder->getFolderPathPlain();
-	$params['username'] = $user->getFullName();
-	$params['sitename'] = $settings->_siteName;
-	$params['http_root'] = $settings->_httpRoot;
-	$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
-	$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-	foreach ($nl["groups"] as $grp) {
-		$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-	}
+	/* $document still has the data from the just deleted document,
+	 * which is just enough to send the email.
+	 */
+	$notifier->sendDeleteDocumentMail($document, $user);
 }
 
 $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_rm_document')));
diff --git a/op/op.RemoveFolder.php b/op/op.RemoveFolder.php
index 0d0c948e3..a2a25da55 100644
--- a/op/op.RemoveFolder.php
+++ b/op/op.RemoveFolder.php
@@ -85,6 +85,8 @@ if(!$controller->run()) {
 }
 
 if ($notifier) {
+	$notifier->sendDeleteFolderMail($folder, $user);
+	/*
 	$subject = "folder_deleted_email_subject";
 	$message = "folder_deleted_email_body";
 	$params = array();
@@ -98,6 +100,7 @@ if ($notifier) {
 	foreach ($nl["groups"] as $grp) {
 		$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 	}
+	 */
 }
 
 add_log_line("?folderid=".$folderid."&name=".$foldername);
diff --git a/op/op.SetWorkflow.php b/op/op.SetWorkflow.php
index b679ab885..13a961c00 100644
--- a/op/op.SetWorkflow.php
+++ b/op/op.SetWorkflow.php
@@ -72,32 +72,7 @@ if (!$version->setWorkflow($workflow, $user)){
 }
 
 if ($notifier) {
-	$nl =	$document->getNotifyList();
-	$folder = $document->getFolder();
-
-	if($settings->_enableNotificationWorkflow) {
-		$subject = "request_workflow_action_email_subject";
-		$message = "request_workflow_action_email_body";
-		$params = array();
-		$params['name'] = $document->getName();
-		$params['version'] = $version->getVersion();
-		$params['workflow'] = $workflow->getName();
-		$params['folder_path'] = $folder->getFolderPathPlain();
-		$params['current_state'] = $workflow->getInitState()->getName();
-		$params['username'] = $user->getFullName();
-		$params['sitename'] = $settings->_siteName;
-		$params['http_root'] = $settings->_httpRoot;
-		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-
-		foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) {
-			foreach($ntransition->getUsers() as $tuser) {
-				$notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
-			}
-			foreach($ntransition->getGroups() as $tuser) {
-				$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
-			}
-		}
-	}
+	$notifier->sendRequestWorkflowActionMail($version, $user);
 }
 
 add_log_line("?documentid=".$documentid);

From abd52ea2193ed62aaff809ffb801f852aa7978a8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 17 May 2021 07:01:03 +0200
Subject: [PATCH 019/143] set version in sendChangedVersionCommentMail()

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

diff --git a/inc/inc.ClassNotificationService.php b/inc/inc.ClassNotificationService.php
index 728ef5077..37d11b092 100644
--- a/inc/inc.ClassNotificationService.php
+++ b/inc/inc.ClassNotificationService.php
@@ -542,6 +542,7 @@ class SeedDMS_NotificationService {
 			$message = "document_comment_changed_email_body";
 			$params = array();
 			$params['name'] = $document->getName();
+			$params['version'] = $content->getVersion();
 			$params['folder_path'] = $folder->getFolderPathPlain();
 			$params['old_comment'] = $oldcomment;
 			$params['new_comment'] = $content->getComment();

From cd99928cd49fadb14cd459da986380331bf13901 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 17 May 2021 07:01:50 +0200
Subject: [PATCH 020/143] remove superflous fold mark

---
 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 7a05bbd02..be23970c9 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -902,7 +902,7 @@ switch($command) {
 		}
 		break; /* }}} */
 
-	case 'indexdocument': /* {{{ */
+	case 'indexdocument':
 	case 'indexfolder': /* {{{ */
 		if($user && $user->isAdmin()) {
 			if($fulltextservice) {

From 72dcae36a29d44b4634568991f5d2b07c21834bc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 17 May 2021 13:31:32 +0200
Subject: [PATCH 021/143] place submit button outside content area

---
 views/bootstrap/class.AddSubFolder.php   |  4 ++--
 views/bootstrap/class.DocumentAccess.php | 27 +++++++++++-----------
 views/bootstrap/class.EditDocument.php   |  4 ++--
 views/bootstrap/class.EditFolder.php     |  4 ++--
 views/bootstrap/class.FolderAccess.php   | 29 ++++++++++++------------
 views/bootstrap/class.UpdateDocument.php |  4 ++--
 6 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/views/bootstrap/class.AddSubFolder.php b/views/bootstrap/class.AddSubFolder.php
index 393e67510..56737ca70 100644
--- a/views/bootstrap/class.AddSubFolder.php
+++ b/views/bootstrap/class.AddSubFolder.php
@@ -81,7 +81,6 @@ $(document).ready( function() {
 <?php
 		 */
 		$this->contentHeading(getMLText("add_subfolder"));
-		$this->contentContainerStart();
 ?>
 
 <form class="form-horizontal" action="../op/op.AddSubFolder.php" id="form1" name="form1" method="post">
@@ -89,6 +88,7 @@ $(document).ready( function() {
 	<input type="hidden" name="folderid" value="<?php print $folder->getId();?>">
 	<input type="hidden" name="showtree" value="<?php echo showtree();?>">
 <?php	
+		$this->contentContainerStart();
 		$this->formField(
 			getMLText("name"),
 			array(
@@ -143,11 +143,11 @@ $(document).ready( function() {
 			echo $arrs;
 		}
 
+		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('add_subfolder'));
 ?>
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.DocumentAccess.php b/views/bootstrap/class.DocumentAccess.php
index 994017c7b..f0f0bfa9a 100644
--- a/views/bootstrap/class.DocumentAccess.php
+++ b/views/bootstrap/class.DocumentAccess.php
@@ -95,16 +95,16 @@ $(document).ready( function() {
 		$this->contentHeading(getMLText("edit_document_access"));
 		$this->rowStart();
 		$this->columnStart(4);
-		$this->contentContainerStart();
 
 		if ($user->isAdmin()) {
 
 ?>
-	<form action="../op/op.DocumentAccess.php">
+	<form class="form-horizontal mb-4" action="../op/op.DocumentAccess.php">
   <?php echo createHiddenFieldWithKey('documentaccess'); ?>
 	<input type="Hidden" name="action" value="setowner">
 	<input type="Hidden" name="documentid" value="<?php print $document->getId();?>">
 <?php
+		$this->contentContainerStart();
 		$owner = $document->getOwner();
 		$options = array();
 		foreach ($allUsers as $currUser) {
@@ -120,16 +120,17 @@ $(document).ready( function() {
 				'options'=>$options
 			)
 		);
+		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 	</form>
 <?php
 		}
 
-		$this->contentSubHeading(getMLText("access_inheritance"));
+		$this->contentHeading(getMLText("access_inheritance"));
 
 		if ($document->inheritsAccess()) {
-			printMLText("inherits_access_msg");
+			$this->infoMsg(getMLText("inherits_access_msg"));
 ?>
   <p>
 	<form action="../op/op.DocumentAccess.php" style="display: inline-block;">
@@ -148,7 +149,6 @@ $(document).ready( function() {
 	</form>
 	</p>
 <?php
-			$this->contentContainerEnd();
 			$this->columnEnd();
 			$this->rowEnd();
 			$this->contentEnd();
@@ -163,23 +163,23 @@ $(document).ready( function() {
 	<input type="submit" class="btn btn-primary" value="<?php printMLText("does_not_inherit_access_msg")?>">
 	</form>
 <?php
-		$this->contentContainerEnd();
 		$this->columnEnd();
 		$this->columnStart(4);
-		$this->contentContainerStart();
 
 		$accessList = $document->getAccessList();
 
 ?>
-<form class="form-horizontal" action="../op/op.DocumentAccess.php">
+<form class="form-horizontal mb-4" action="../op/op.DocumentAccess.php">
   <?php echo createHiddenFieldWithKey('documentaccess'); ?>
 	<input type="Hidden" name="documentid" value="<?php print $document->getId();?>">
 	<input type="Hidden" name="action" value="setdefault">
 <?php
+		$this->contentContainerStart();
 		$this->formField(
 			getMLText("default_access"),
 			$this->getAccessModeSelection($document->getDefaultAccess())
 		);
+		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
@@ -189,6 +189,7 @@ $(document).ready( function() {
 <input type="Hidden" name="documentid" value="<?php print $document->getId()?>">
 <input type="Hidden" name="action" value="addaccess">
 <?php
+		$this->contentContainerStart();
 		$memusers = array();
 		foreach ($accessList["users"] as $userAccess) {
 			$userObj = $userAccess->getUser();
@@ -234,11 +235,11 @@ $(document).ready( function() {
 			getMLText("access_mode"),
 			$this->getAccessModeSelection(M_READ)
 		);
+		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add'));
 ?>
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->columnEnd();
 		$this->columnStart(4);
 		/* memorize users with access rights */
@@ -264,7 +265,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=\"fa fa-save\"></i> ".getMLText("save")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-primary btn-mini btn-sm\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
 				print "</td>\n";
 				print "</form>\n";
 				print "<form action=\"../op/op.DocumentAccess.php\">\n";
@@ -273,7 +274,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=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-danger btn-mini btn-sm\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 				print "<span></td>\n";
 				print "</form>\n";
 				print "</tr>\n";
@@ -295,7 +296,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=\"fa fa-save\"></i> ".getMLText("save")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-primary btn-mini btn-sm\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
 				print "</span></td>\n";
 				print "</form>";
 				print "<form action=\"../op/op.DocumentAccess.php\">\n";
@@ -304,7 +305,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=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-danger btn-mini btn-sm\"\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 				print "</form>";
 				print "</span></td>\n";
 				print "</tr>\n";
diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php
index 89f49bdde..f29b919fb 100644
--- a/views/bootstrap/class.EditDocument.php
+++ b/views/bootstrap/class.EditDocument.php
@@ -82,7 +82,6 @@ $(document).ready( function() {
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 
 		$this->contentHeading(getMLText("edit_document_props"));
-		$this->contentContainerStart();
 
 		if($document->expires())
 			$expdate = getReadableDate($document->getExpires());
@@ -93,6 +92,7 @@ $(document).ready( function() {
 		<?php echo createHiddenFieldWithKey('editdocument'); ?>
 	<input type="hidden" name="documentid" value="<?php echo $document->getID() ?>">
 <?php
+		$this->contentContainerStart();
 		$this->formField(
 			getMLText("name"),
 			array(
@@ -232,11 +232,11 @@ $(document).ready( function() {
 		} elseif(is_string($arrs)) {
 			echo $arrs;
 		}
+		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.EditFolder.php b/views/bootstrap/class.EditFolder.php
index 927a37ba7..7501012d5 100644
--- a/views/bootstrap/class.EditFolder.php
+++ b/views/bootstrap/class.EditFolder.php
@@ -78,13 +78,13 @@ $(document).ready(function() {
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder);
 		$this->contentHeading(getMLText("edit_folder_props"));
-		$this->contentContainerStart();
 ?>
 <form class="form-horizontal" action="../op/op.EditFolder.php" id="form1" name="form1" method="post">
 		<?php echo createHiddenFieldWithKey('editfolder'); ?>
 		<input type="hidden" name="folderid" value="<?php print $folder->getID();?>">
 		<input type="hidden" name="showtree" value="<?php echo showtree();?>">
 <?php
+		$this->contentContainerStart();
 		$this->formField(
 			getMLText("name"),
 			array(
@@ -133,11 +133,11 @@ $(document).ready(function() {
 		} elseif(is_string($arrs)) {
 			echo $arrs;
 		}
+		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.FolderAccess.php b/views/bootstrap/class.FolderAccess.php
index dd77941b1..ab7609afb 100644
--- a/views/bootstrap/class.FolderAccess.php
+++ b/views/bootstrap/class.FolderAccess.php
@@ -92,16 +92,16 @@ $(document).ready(function() {
 		$this->contentHeading(getMLText("edit_folder_access"));
 		$this->rowStart();
 		$this->columnStart(4);
-		$this->contentContainerStart();
 
 		if ($user->isAdmin()) {
 
 ?>
-	<form action="../op/op.FolderAccess.php">
+	<form class="form-horizontal mb-4" action="../op/op.FolderAccess.php">
 	<?php echo createHiddenFieldWithKey('folderaccess'); ?>
 	<input type="hidden" name="action" value="setowner">
 	<input type="hidden" name="folderid" value="<?php print $folder->getID();?>">
 <?php
+		$this->contentContainerStart();
 		$owner = $folder->getOwner();
 		$options = array();
 		foreach ($allUsers as $currUser) {
@@ -117,6 +117,7 @@ $(document).ready(function() {
 				'options'=>$options
 			)
 		);
+		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 	</form>
@@ -125,10 +126,10 @@ $(document).ready(function() {
 
 		if ($folder->getID() != $rootfolderid && $folder->getParent()){
 
-			$this->contentSubHeading(getMLText("access_inheritance"));
+			$this->contentHeading(getMLText("access_inheritance"));
 			
 			if ($folder->inheritsAccess()) {
-				printMLText("inherits_access_msg");
+				$this->infoMsg(getMLText("inherits_access_msg"));
 ?>
   <p>
 	<form action="../op/op.FolderAccess.php" style="display: inline-block;">
@@ -147,7 +148,6 @@ $(document).ready(function() {
 	</form>
 	</p>
 <?php
-				$this->contentContainerEnd();
 				$this->columnEnd();
 				$this->rowEnd();
 				$this->contentEnd();
@@ -163,35 +163,34 @@ $(document).ready(function() {
 	</form>
 <?php
 		}
-		$this->contentContainerEnd();
 		$this->columnEnd();
 		$this->columnStart(4);
-		$this->contentContainerStart();
 
 		$accessList = $folder->getAccessList();
 
 ?>
-<form class="form-horizontal" action="../op/op.FolderAccess.php">
+<form class="form-horizontal mb-4" action="../op/op.FolderAccess.php">
   <?php echo createHiddenFieldWithKey('folderaccess'); ?>
 	<input type="hidden" name="folderid" value="<?php print $folder->getID();?>">
 	<input type="hidden" name="action" value="setdefault">
 <?php
+		$this->contentContainerStart();
 		$this->formField(
 			getMLText("default_access"),
 			$this->getAccessModeSelection($folder->getDefaultAccess())
 		);
+		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
-		$this->contentContainerEnd();
-		$this->contentContainerStart();
 ?>
 <form class="form-horizontal" action="../op/op.FolderAccess.php" id="form1" name="form1">
 <?php echo createHiddenFieldWithKey('folderaccess'); ?>
 <input type="hidden" name="folderid" value="<?php print $folder->getID()?>">
 <input type="hidden" name="action" value="addaccess">
 <?php
+		$this->contentContainerStart();
 		$options = array();
 		$options[] = array(-1, getMLText('select_one'));
 		foreach ($allUsers as $currUser) {
@@ -228,11 +227,11 @@ $(document).ready(function() {
 			getMLText("access_mode"),
 			$this->getAccessModeSelection(M_READ)
 		);
+		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add'));
 ?>
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->columnEnd();
 		$this->columnStart(4);
 
@@ -254,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=\"fa fa-save\"></i> ".getMLText("save")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-primary btn-mini btn-sm\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
 				print "</td>\n";
 				print "</form>\n";
 				print "<form action=\"../op/op.FolderAccess.php\">\n";
@@ -263,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=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-danger btn-mini btn-sm\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 				print "</td>\n";
 				print "</form>\n";
 				print "</tr>\n";
@@ -284,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=\"fa fa-save\"></i> ".getMLText("save")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-primary btn-mini btn-sm\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
 				print "</span></td>\n";
 				print "</form>";
 				print "<form action=\"../op/op.FolderAccess.php\">\n";
@@ -293,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=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-danger btn-mini btn-sm\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 				print "</td>\n";
 				print "</form>";
 				print "</tr>\n";
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 9edbaea03..ced0ed44d 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -220,13 +220,13 @@ console.log(element);
 		}
 		if($msg)
 			$this->warningMsg($msg);
-		$this->contentContainerStart();
 ?>
 
 <form class="form-horizontal" action="../op/op.UpdateDocument.php" enctype="multipart/form-data" method="post" name="form1" id="form1">
 	<?php echo createHiddenFieldWithKey('updatedocument'); ?>
 	<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
 <?php
+		$this->contentContainerStart();
 		$this->formField(
 			getMLText("local_file"),
 			$enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooserHtml('userfile', false)
@@ -649,12 +649,12 @@ console.log(element);
 				}
 			$this->warningMsg(getMLText("add_doc_reviewer_approver_warning"));
 		}
+		$this->contentContainerEnd();
 		$this->formSubmit(getMLText('update_document'));
 ?>
 </form>
 
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From 3422e5a906f9a1f5ab0859da121038a9361ff37b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 18 May 2021 16:58:16 +0200
Subject: [PATCH 022/143] move sending notification mail in class
 NotificationService

---
 inc/inc.ClassNotificationService.php | 21 +++++++++++++++++++++
 op/op.TransferDocument.php           | 21 ++-------------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/inc/inc.ClassNotificationService.php b/inc/inc.ClassNotificationService.php
index 37d11b092..afe52388e 100644
--- a/inc/inc.ClassNotificationService.php
+++ b/inc/inc.ClassNotificationService.php
@@ -655,5 +655,26 @@ class SeedDMS_NotificationService {
 			$this->toIndividual($user, $folder->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 		}
 	} /* }}} */
+
+	public function sendTransferDocumentMail($document, $user, $oldowner) { /* {{{ */
+		$folder = $document->getFolder();
+		$nl =	$document->getNotifyList();
+		$subject = "document_transfered_email_subject";
+		$message = "document_transfered_email_body";
+		$params = array();
+		$params['name'] = $document->getName();
+		$params['newuser'] = $document->getOwner()->getFullName();
+		$params['olduser'] = $oldowner->getFullName();
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['username'] = $user->getFullName();
+		$params['sitename'] = $this->settings->_siteName;
+		$params['http_root'] = $this->settings->_httpRoot;
+		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+		$this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		foreach ($nl["groups"] as $grp) {
+			$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		}
+	} /* }}} */
+
 }
 
diff --git a/op/op.TransferDocument.php b/op/op.TransferDocument.php
index 69056506a..b3080a82c 100644
--- a/op/op.TransferDocument.php
+++ b/op/op.TransferDocument.php
@@ -30,10 +30,6 @@ include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-if (!$accessop->check_controller_access($controller, $_POST)) {
-	UI::exitError(getMLText("document_title", array("documentname" => "")),getMLText("access_denied"));
-}
 
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('transferdocument')) {
@@ -61,6 +57,7 @@ if (!is_object($newuser)) {
 }
 
 $folder = $document->getFolder();
+$oldowner = $document->getOwner();
 
 $controller->setParam('document', $document);
 $controller->setParam('newuser', $newuser);
@@ -70,21 +67,7 @@ if(!$controller->run()) {
 
 if ($notifier){
 	/* Get the notify list before removing the document */
-	$nl =	$document->getNotifyList();
-	$subject = "document_transfered_email_subject";
-	$message = "document_transfered_email_body";
-	$params = array();
-	$params['name'] = $document->getName();
-	$params['newuser'] = $newuser->getFullName();
-	$params['folder_path'] = $folder->getFolderPathPlain();
-	$params['username'] = $user->getFullName();
-	$params['sitename'] = $settings->_siteName;
-	$params['http_root'] = $settings->_httpRoot;
-	$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-	$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-	foreach ($nl["groups"] as $grp) {
-		$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-	}
+	$notifier->sendTransferDocumentMail($document, $user, $oldowner);
 }
 
 $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_transfer_document')));

From 040793034b68e98b7260da8dc36d69bea2fc6731 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 18 May 2021 17:07:14 +0200
Subject: [PATCH 023/143] move notification mail into class NotificationService

---
 inc/inc.ClassNotificationService.php | 26 ++++++++++++++++++++++++++
 op/op.OverrideContentStatus.php      | 21 +--------------------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/inc/inc.ClassNotificationService.php b/inc/inc.ClassNotificationService.php
index afe52388e..62835bad4 100644
--- a/inc/inc.ClassNotificationService.php
+++ b/inc/inc.ClassNotificationService.php
@@ -676,5 +676,31 @@ class SeedDMS_NotificationService {
 		}
 	} /* }}} */
 
+	public function sendChangedDocumentStatusMail($document, $user, $oldstatus) { /* {{{ */
+		$content = $document->getLatestContent();
+			$overallStatus = $content->getStatus();
+			$nl = $document->getNotifyList();
+			$folder = $document->getFolder();
+			$subject = "document_status_changed_email_subject";
+			$message = "document_status_changed_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['status'] = getOverallStatusText($overallStatus["status"]);
+			$params['old_status'] = getOverallStatusText($oldstatus);
+			$params['new_status_code'] = $overallStatus["status"];
+			$params['old_status_code'] = $oldstatus;
+			$params['username'] = $user->getFullName();
+			$params['sitename'] = $this->settings->_siteName;
+			$params['http_root'] = $this->settings->_httpRoot;
+			$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+			$this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+			foreach ($nl["groups"] as $grp) {
+				$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+			}
+
+//			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+	} /* }}} */
+
 }
 
diff --git a/op/op.OverrideContentStatus.php b/op/op.OverrideContentStatus.php
index 58d0e7f9b..a92d9470c 100644
--- a/op/op.OverrideContentStatus.php
+++ b/op/op.OverrideContentStatus.php
@@ -80,26 +80,7 @@ if ($overrideStatus != $overallStatus["status"]) {
 	} else {
 		// Send notification to subscribers.
 		if($notifier) {
-			$nl = $document->getNotifyList();
-			$folder = $document->getFolder();
-			$subject = "document_status_changed_email_subject";
-			$message = "document_status_changed_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['status'] = getOverallStatusText($overrideStatus);
-			$params['new_status_code'] = $overrideStatus;
-			$params['old_status_code'] = $overallStatus["status"];
-			$params['username'] = $user->getFullName();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
-
-//			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+			$notifier->sendChangedDocumentStatusMail($document, $user, $overallStatus["status"]);
 		}
 	}
 }

From 97c001acbed6aa753fa31ab7c8ac5b3fdf2b1446 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 18 May 2021 17:39:14 +0200
Subject: [PATCH 024/143] move notification mail into notification service

---
 inc/inc.ClassNotificationService.php | 112 ++++++++++++++++++++++-----
 op/op.DocumentNotify.php             |  43 +---------
 op/op.FolderNotify.php               |  46 +----------
 3 files changed, 99 insertions(+), 102 deletions(-)

diff --git a/inc/inc.ClassNotificationService.php b/inc/inc.ClassNotificationService.php
index 62835bad4..3bc65319f 100644
--- a/inc/inc.ClassNotificationService.php
+++ b/inc/inc.ClassNotificationService.php
@@ -678,28 +678,98 @@ class SeedDMS_NotificationService {
 
 	public function sendChangedDocumentStatusMail($document, $user, $oldstatus) { /* {{{ */
 		$content = $document->getLatestContent();
-			$overallStatus = $content->getStatus();
-			$nl = $document->getNotifyList();
-			$folder = $document->getFolder();
-			$subject = "document_status_changed_email_subject";
-			$message = "document_status_changed_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['status'] = getOverallStatusText($overallStatus["status"]);
-			$params['old_status'] = getOverallStatusText($oldstatus);
-			$params['new_status_code'] = $overallStatus["status"];
-			$params['old_status_code'] = $oldstatus;
-			$params['username'] = $user->getFullName();
-			$params['sitename'] = $this->settings->_siteName;
-			$params['http_root'] = $this->settings->_httpRoot;
-			$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($nl["groups"] as $grp) {
-				$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
+		$overallStatus = $content->getStatus();
+		$nl = $document->getNotifyList();
+		$folder = $document->getFolder();
+		$subject = "document_status_changed_email_subject";
+		$message = "document_status_changed_email_body";
+		$params = array();
+		$params['name'] = $document->getName();
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['status'] = getOverallStatusText($overallStatus["status"]);
+		$params['old_status'] = getOverallStatusText($oldstatus);
+		$params['new_status_code'] = $overallStatus["status"];
+		$params['old_status_code'] = $oldstatus;
+		$params['username'] = $user->getFullName();
+		$params['sitename'] = $this->settings->_siteName;
+		$params['http_root'] = $this->settings->_httpRoot;
+		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+		$this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		foreach ($nl["groups"] as $grp) {
+			$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		}
 
-//			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+//		$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+	} /* }}} */
+
+	public function sendNewDocumentNotifyMail($document, $user, $obj) { /* {{{ */
+		$folder = $document->getFolder();
+		$subject = "notify_added_email_subject";
+		$message = "notify_added_email_body";
+		$params = array();
+		$params['name'] = $document->getName();
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['username'] = $user->getFullName();
+		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+		$params['sitename'] = $this->settings->_siteName;
+		$params['http_root'] = $this->settings->_httpRoot;
+
+		if($obj->isType('user'))
+			$this->toIndividual($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		elseif($obj->isType('group'))
+			$notifier->toGroup($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+	} /* }}} */
+
+	public function sendNewFolderNotifyMail($folder, $user, $obj) { /* {{{ */
+		$subject = "notify_added_email_subject";
+		$message = "notify_added_email_body";
+		$params = array();
+		$params['name'] = $folder->getName();
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['username'] = $user->getFullName();
+		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
+		$params['sitename'] = $this->settings->_siteName;
+		$params['http_root'] = $this->settings->_httpRoot;
+
+		if($obj->isType('user'))
+			$this->toIndividual($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		elseif($obj->isType('group'))
+			$notifier->toGroup($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+	} /* }}} */
+
+	public function sendDeleteDocumentNotifyMail($document, $user, $obj) { /* {{{ */
+		$folder = $document->getFolder();
+		$subject = "notify_deleted_email_subject";
+		$message = "notify_deleted_email_body";
+		$params = array();
+		$params['name'] = $folder->getName();
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['username'] = $user->getFullName();
+		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+		$params['sitename'] = $this->settings->_siteName;
+		$params['http_root'] = $this->settings->_httpRoot;
+
+		if($obj->isType('user'))
+			$this->toIndividual($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		elseif($obj->isType('group'))
+			$notifier->toGroup($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+	} /* }}} */
+
+	public function sendDeleteFolderNotifyMail($folder, $user, $obj) { /* {{{ */
+		$subject = "notify_deleted_email_subject";
+		$message = "notify_deleted_email_body";
+		$params = array();
+		$params['name'] = $folder->getName();
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['username'] = $user->getFullName();
+		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
+		$params['sitename'] = $this->settings->_siteName;
+		$params['http_root'] = $this->settings->_httpRoot;
+
+		if($obj->isType('user'))
+			$this->toIndividual($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		elseif($obj->isType('group'))
+			$notifier->toGroup($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 	} /* }}} */
 
 }
diff --git a/op/op.DocumentNotify.php b/op/op.DocumentNotify.php
index abcbf632e..9e061c247 100644
--- a/op/op.DocumentNotify.php
+++ b/op/op.DocumentNotify.php
@@ -94,7 +94,7 @@ if ($action == "delnotify"){
 			UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 			break;
 		case -3:
-			UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("already_subscribed"));
+			UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("not_subscribed"));
 			break;
 		case -4:
 			UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("internal_error"));
@@ -102,22 +102,7 @@ if ($action == "delnotify"){
 		case 0:
 			// Email user / group, informing them of subscription change.
 			if($notifier) {
-				$subject = "notify_deleted_email_subject";
-				$message = "notify_deleted_email_body";
-				$params = array();
-				$params['name'] = $document->getName();
-				$params['folder_path'] = $folder->getFolderPathPlain();
-				$params['username'] = $user->getFullName();
-				$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-				$params['sitename'] = $settings->_siteName;
-				$params['http_root'] = $settings->_httpRoot;
-
-				if ($userid > 0) {
-					$notifier->toIndividual($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-				}
-				else {
-					$notifier->toGroup($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-				}
+				$notifier->sendDeleteFolderNotifyMail($folder, $user, $obj);
 			}
 			break;
 	}
@@ -145,17 +130,7 @@ else if ($action == "addnotify") {
 				// Email user / group, informing them of subscription.
 				if ($notifier){
 					$obj = $dms->getUser($userid);
-					$subject = "notify_added_email_subject";
-					$message = "notify_added_email_body";
-					$params = array();
-					$params['name'] = $document->getName();
-					$params['folder_path'] = $folder->getFolderPathPlain();
-					$params['username'] = $user->getFullName();
-					$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-					$params['sitename'] = $settings->_siteName;
-					$params['http_root'] = $settings->_httpRoot;
-
-					$notifier->toIndividual($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+					$notifier->sendNewDocumentNotifyMail($document, $user, $obj);
 				}
 
 				break;
@@ -179,17 +154,7 @@ else if ($action == "addnotify") {
 			case 0:
 				if ($notifier){
 					$obj = $dms->getGroup($groupid);
-					$subject = "notify_added_email_subject";
-					$message = "notify_added_email_body";
-					$params = array();
-					$params['name'] = $document->getName();
-					$params['folder_path'] = $folder->getFolderPathPlain();
-					$params['username'] = $user->getFullName();
-					$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-					$params['sitename'] = $settings->_siteName;
-					$params['http_root'] = $settings->_httpRoot;
-
-					$notifier->toGroup($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+					$notifier->sendNewDocumentNotifyMail($document, $user, $obj);
 				}
 				break;
 		}
diff --git a/op/op.FolderNotify.php b/op/op.FolderNotify.php
index f2dbca2ce..0390ab7b7 100644
--- a/op/op.FolderNotify.php
+++ b/op/op.FolderNotify.php
@@ -89,30 +89,14 @@ if ($action == "delnotify") {
 			UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("access_denied"));
 			break;
 		case -3:
-			UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("already_subscribed"));
+			UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("not_subscribed"));
 			break;
 		case -4:
 			UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("internal_error"));
 			break;
 		case 0:
 			if($notifier) {
-				// Email user / group, informing them of subscription.
-				$subject = "notify_deleted_email_subject";
-				$message = "notify_deleted_email_body";
-				$params = array();
-				$params['name'] = $folder->getName();
-				$params['folder_path'] = $folder->getFolderPathPlain();
-				$params['username'] = $user->getFullName();
-				$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
-				$params['sitename'] = $settings->_siteName;
-				$params['http_root'] = $settings->_httpRoot;
-
-				if ($userid > 0) {
-					$notifier->toIndividual($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-				}
-				else {
-					$notifier->toGroup($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-				}
+				$notifier->sendDeleteFolderNotifyMail($folder, $user, $obj);
 			}
 			break;
 	}
@@ -139,18 +123,7 @@ else if ($action == "addnotify") {
 			case 0:
 				if($notifier) {
 					$obj = $dms->getUser($userid);
-					// Email user / group, informing them of subscription.
-					$subject = "notify_added_email_subject";
-					$message = "notify_added_email_body";
-					$params = array();
-					$params['name'] = $folder->getName();
-					$params['folder_path'] = $folder->getFolderPathPlain();
-					$params['username'] = $user->getFullName();
-					$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
-					$params['sitename'] = $settings->_siteName;
-					$params['http_root'] = $settings->_httpRoot;
-
-					$notifier->toIndividual($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+					$notifier->sendNewFolderNotifyMail($folder, $user, $obj);
 				}
 
 				break;
@@ -174,18 +147,7 @@ else if ($action == "addnotify") {
 			case 0:
 				if($notifier) {
 					$obj = $dms->getGroup($groupid);
-					// Email user / group, informing them of subscription.
-					$subject = "notify_added_email_subject";
-					$message = "notify_added_email_body";
-					$params = array();
-					$params['name'] = $folder->getName();
-					$params['folder_path'] = $folder->getFolderPathPlain();
-					$params['username'] = $user->getFullName();
-					$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
-					$params['sitename'] = $settings->_siteName;
-					$params['http_root'] = $settings->_httpRoot;
-
-					$notifier->toGroup($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+					$notifier->sendNewFolderNotifyMail($folder, $user, $obj);
 				}
 				break;
 		}

From 0852d10df4afddb1acba227796592be831a8aa83 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 May 2021 08:32:38 +0200
Subject: [PATCH 025/143] add version to document update mail, add stub for
 remove version mail

---
 inc/inc.ClassNotificationService.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/inc/inc.ClassNotificationService.php b/inc/inc.ClassNotificationService.php
index 3bc65319f..edc06b04b 100644
--- a/inc/inc.ClassNotificationService.php
+++ b/inc/inc.ClassNotificationService.php
@@ -284,6 +284,7 @@ class SeedDMS_NotificationService {
 		$params['folder_path'] = $folder->getFolderPathPlain();
 		$params['username'] = $user->getFullName();
 		$params['comment'] = $document->getComment();
+		$params['version'] = $lc->getVersion();
 		$params['version_comment'] = $lc->getComment();
 		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 		$params['sitename'] = $this->settings->_siteName;
@@ -331,6 +332,15 @@ class SeedDMS_NotificationService {
 		}
 	} /* }}} */
 
+	/**
+	 * This notification is sent when a document version is deleted.
+	 * Keep in mind that $document refers to a document which has just been
+	 * deleted from the database, but all the data needed is still in the
+	 * object.
+	 */
+	public function sendDeleteDocumentVersionMail($document, $user) { /* {{{ */
+	} /* }}} */
+
 	/**
 	 * This notification is sent when a new folder is created.
 	 */

From ba381d8e85e816f084fbb0439a0a31895b9bcb54 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 May 2021 08:33:15 +0200
Subject: [PATCH 026/143] use controller RemoveDocument, send mail with
 notification class

---
 op/op.RemoveVersion.php | 56 +++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 30 deletions(-)

diff --git a/op/op.RemoveVersion.php b/op/op.RemoveVersion.php
index 4857f3955..ca68b62f4 100644
--- a/op/op.RemoveVersion.php
+++ b/op/op.RemoveVersion.php
@@ -67,37 +67,33 @@ $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();
-	$docname = $document->getName();
-	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($fulltextservice && ($index = $fulltextservice->Index())) {
-			$lucenesearch = $fulltextservice->Search();
-			if($hit = $lucenesearch->getDocument($documentid)) {
-				$index->delete($hit->id);
-				$index->commit();
-			}
-		}
 
-		if ($notifier){
-			$subject = "document_deleted_email_subject";
-			$message = "document_deleted_email_body";
-			$params = array();
-			$params['name'] = $docname;
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['username'] = $user->getFullName();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
-		}
+	/* Get the notify list before removing the document
+	 * Also inform the users/groups of the parent folder
+	 * Getting the list now will keep them in the document object
+	 * even after the document has been deleted.
+	 */
+	$dnl =	$document->getNotifyList();
+	$fnl =	$folder->getNotifyList();
+	$docname = $document->getName();
+
+	$controller->setParam('document', $document);
+	$controller->setParam('fulltextservice', $fulltextservice);
+	if(!$controller->run()) {
+		if ($controller->getErrorMsg() != '')
+			$errormsg = $controller->getErrorMsg();
+		else
+			$errormsg = "error_remove_document";
+		UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($docname))),getMLText($errormsg));
 	}
+
+	if ($notifier){
+		/* $document still has the data from the just deleted document,
+		 * which is just enough to send the email.
+		 */
+		$notifier->sendDeleteDocumentMail($document, $user);
+	}
+	$nexturl = "../out/out.ViewFolder.php?folderid=".$folder->getId();
 }
 else {
 	/* Before deleting the content get a list of all users that should
@@ -129,7 +125,7 @@ else {
 
 	$previewer->deletePreview($version, $settings->_previewWidthDetail);
 	$previewer->deletePreview($version, $settings->_previewWidthList);
-	/* Check if the version to be delete is the latest version. This is
+	/* Check if the version to be deleted is the latest version. This is
 	 * later used to set the redirect url.
 	 */
 	$islatest = $version->getVersion() == $document->getLatestContent()->getVersion();

From 6feb6d7121497a3f3bdd60480093a3af51dce682 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 May 2021 08:34:31 +0200
Subject: [PATCH 027/143] remove already commented code

---
 op/op.RemoveFolder.php | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/op/op.RemoveFolder.php b/op/op.RemoveFolder.php
index a2a25da55..5d0e09b64 100644
--- a/op/op.RemoveFolder.php
+++ b/op/op.RemoveFolder.php
@@ -86,21 +86,6 @@ if(!$controller->run()) {
 
 if ($notifier) {
 	$notifier->sendDeleteFolderMail($folder, $user);
-	/*
-	$subject = "folder_deleted_email_subject";
-	$message = "folder_deleted_email_body";
-	$params = array();
-	$params['name'] = $foldername;
-	$params['folder_path'] = $parent->getFolderPathPlain();
-	$params['username'] = $user->getFullName();
-	$params['sitename'] = $settings->_siteName;
-	$params['http_root'] = $settings->_httpRoot;
-	$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$parent->getID();
-	$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-	foreach ($nl["groups"] as $grp) {
-		$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-	}
-	 */
 }
 
 add_log_line("?folderid=".$folderid."&name=".$foldername);

From 92ff13afc60eee2601ab4a4c4ffdf1d4ea09cb91 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 May 2021 15:13:49 +0200
Subject: [PATCH 028/143] move notification mail into notification service

---
 inc/inc.ClassNotificationService.php | 104 ++++++++++++++++++++++++++
 op/op.EditFolder.php                 | 108 ++-------------------------
 2 files changed, 109 insertions(+), 103 deletions(-)

diff --git a/inc/inc.ClassNotificationService.php b/inc/inc.ClassNotificationService.php
index edc06b04b..f86fdc415 100644
--- a/inc/inc.ClassNotificationService.php
+++ b/inc/inc.ClassNotificationService.php
@@ -461,6 +461,7 @@ class SeedDMS_NotificationService {
 	} /* }}} */
 
 	public function sendChangedAttributesMail($document, $user, $oldattributes) { /* {{{ */
+		$dms = $document->getDMS();
 		$folder = $document->getFolder();
 		$notifyList = $document->getNotifyList();
 
@@ -514,6 +515,60 @@ class SeedDMS_NotificationService {
 		}
 	} /* }}} */
 
+	public function sendChangedFolderAttributesMail($folder, $user, $oldattributes) { /* {{{ */
+		$dms = $folder->getDMS();
+		$notifyList = $folder->getNotifyList();
+
+		$newattributes = $folder->getAttributes();
+		if($oldattributes) {
+			foreach($oldattributes as $attrdefid=>$attribute) {
+				if(!isset($newattributes[$attrdefid]) || $newattributes[$attrdefid]->getValueAsArray() !== $oldattributes[$attrdefid]->getValueAsArray()) {
+					$subject = "folder_attribute_changed_email_subject";
+					$message = "folder_attribute_changed_email_body";
+					$params = array();
+					$params['name'] = $folder->getName();
+					$params['attribute_name'] = $attribute->getAttributeDefinition()->getName();
+					$params['attribute_old_value'] = $oldattributes[$attrdefid]->getValue();
+					$params['attribute_new_value'] = isset($newattributes[$attrdefid]) ? $newattributes[$attrdefid]->getValue() : '';
+					$params['folder_path'] = $folder->getFolderPathPlain();
+					$params['username'] = $user->getFullName();
+					$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
+					$params['sitename'] = $this->settings->_siteName;
+					$params['http_root'] = $this->settings->_httpRoot;
+
+					$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+					foreach ($notifyList["groups"] as $grp) {
+						$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+					}
+				}
+			}
+		}
+		/* Check for new attributes which didn't have a value before */
+		if($newattributes) {
+			foreach($newattributes as $attrdefid=>$attribute) {
+				if(!isset($oldattributes[$attrdefid]) && $attribute) {
+					$subject = "folder_attribute_changed_email_subject";
+					$message = "folder_attribute_changed_email_body";
+					$params = array();
+					$params['name'] = $folder->getName();
+					$params['attribute_name'] = $dms->getAttributeDefinition($attrdefid)->getName();
+					$params['attribute_old_value'] = '';
+					$params['attribute_new_value'] = $attribute->getValue();
+					$params['folder_path'] = $folder->getFolderPathPlain();
+					$params['username'] = $user->getFullName();
+					$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
+					$params['sitename'] = $this->settings->_siteName;
+					$params['http_root'] = $this->settings->_httpRoot;
+
+					$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+					foreach ($notifyList["groups"] as $grp) {
+						$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+					}
+				}
+			}
+		}
+	} /* }}} */
+
 	public function sendChangedCommentMail($document, $user, $oldcomment) { /* {{{ */
 		if($oldcomment != $document->getComment()) {
 			$notifyList = $document->getNotifyList();
@@ -542,6 +597,31 @@ class SeedDMS_NotificationService {
 		}
 	} /* }}} */
 
+	public function sendChangedFolderCommentMail($folder, $user, $oldcomment) { /* {{{ */
+		if($oldcomment != $folder->getComment()) {
+			$notifyList = $folder->getNotifyList();
+
+			$subject = "folder_comment_changed_email_subject";
+			$message = "folder_comment_changed_email_body";
+			$params = array();
+			$params['name'] = $folder->getName();
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['old_comment'] = $oldcomment;
+			$params['new_comment'] = $comment;
+			$params['username'] = $user->getFullName();
+			$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
+			$params['sitename'] = $this->settings->_siteName;
+			$params['http_root'] = $this->settings->_httpRoot;
+			$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+			foreach ($notifyList["groups"] as $grp) {
+				$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+			}
+			// if user is not owner send notification to owner
+	//		if ($user->getID() != $folder->getOwner()->getID()) 
+	//			$notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+		}
+	} /* }}} */
+
 	public function sendChangedVersionCommentMail($content, $user, $oldcomment) { /* {{{ */
 		// FIXME: use extra mail template which includes the version
 		if($oldcomment != $content->getComment()) {
@@ -600,6 +680,30 @@ class SeedDMS_NotificationService {
 		}
 	} /* }}} */
 
+	public function sendChangedFolderNameMail($folder, $user, $oldname) { /* {{{ */
+		if($oldname != $folder->getName()) {
+			$notifyList = $folder->getNotifyList();
+
+			$subject = "folder_renamed_email_subject";
+			$message = "folder_renamed_email_body";
+			$params = array();
+			$params['name'] = $folder->getName();
+			$params['old_name'] = $oldname;
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['username'] = $user->getFullName();
+			$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
+			$params['sitename'] = $this->settings->_siteName;
+			$params['http_root'] = $this->settings->_httpRoot;
+			$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+			foreach ($notifyList["groups"] as $grp) {
+				$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+			}
+			// if user is not owner send notification to owner
+	//		if ($user->getID() != $folder->getOwner()->getID()) 
+	//			$this->toIndividual($user, $folder->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+		}
+	} /* }}} */
+
 	public function sendMovedDocumentMail($document, $user, $oldfolder) { /* {{{ */
 		$targetfolder = $document->getFolder();
 		if($targetfolder->getId() == $oldfolder->getId())
diff --git a/op/op.EditFolder.php b/op/op.EditFolder.php
index 485069bb8..d834329b1 100644
--- a/op/op.EditFolder.php
+++ b/op/op.EditFolder.php
@@ -97,111 +97,13 @@ if(!$controller->run()) {
 	UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())), $errmsg);
 }
 
-if($oldname != $name) {
-	// Send notification to subscribers.
-	if($notifier) {
-		$notifyList = $folder->getNotifyList();
+// Send notification to subscribers.
+if($notifier) {
+	$notifier->sendChangedFolderNameMail($folder, $user, $oldname);
 
-		$subject = "folder_renamed_email_subject";
-		$message = "folder_renamed_email_body";
-		$params = array();
-		$params['name'] = $folder->getName();
-		$params['old_name'] = $oldname;
-		$params['folder_path'] = $folder->getFolderPathPlain();
-		$params['username'] = $user->getFullName();
-		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
-		$params['sitename'] = $settings->_siteName;
-		$params['http_root'] = $settings->_httpRoot;
-		$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-		foreach ($notifyList["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-		}
-		// if user is not owner send notification to owner
-//		if ($user->getID() != $folder->getOwner()->getID()) 
-//			$notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
-	}
-}
+	$notifier->sendChangedFolderCommentMail($folder, $user, $oldcomment);
 
-if($oldcomment != $comment) {
-	// Send notification to subscribers.
-	if($notifier) {
-		$notifyList = $folder->getNotifyList();
-
-		$subject = "folder_comment_changed_email_subject";
-		$message = "folder_comment_changed_email_body";
-		$params = array();
-		$params['name'] = $folder->getName();
-		$params['folder_path'] = $folder->getFolderPathPlain();
-		$params['old_comment'] = $oldcomment;
-		$params['new_comment'] = $comment;
-		$params['username'] = $user->getFullName();
-		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
-		$params['sitename'] = $settings->_siteName;
-		$params['http_root'] = $settings->_httpRoot;
-		$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-		foreach ($notifyList["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-		}
-		// if user is not owner send notification to owner
-//		if ($user->getID() != $folder->getOwner()->getID()) 
-//			$notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
-
-	}
-}
-
-$newattributes = $folder->getAttributes();
-if($oldattributes) {
-	foreach($oldattributes as $attrdefid=>$attribute) {
-		if(!isset($newattributes[$attrdefid]) || $newattributes[$attrdefid]->getValueAsArray() !== $oldattributes[$attrdefid]->getValueAsArray()) {
-			if($notifier) {
-				$notifyList = $folder->getNotifyList();
-				$subject = "folder_attribute_changed_email_subject";
-				$message = "folder_attribute_changed_email_body";
-				$params = array();
-				$params['name'] = $folder->getName();
-				$params['attribute_name'] = $attribute->getAttributeDefinition()->getName();
-				$params['attribute_old_value'] = $oldattributes[$attrdefid]->getValue();
-				$params['attribute_new_value'] = isset($newattributes[$attrdefid]) ? $newattributes[$attrdefid]->getValue() : '';
-				$params['folder_path'] = $folder->getFolderPathPlain();
-				$params['username'] = $user->getFullName();
-				$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
-				$params['sitename'] = $settings->_siteName;
-				$params['http_root'] = $settings->_httpRoot;
-
-				$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-				foreach ($notifyList["groups"] as $grp) {
-					$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-				}
-			}
-		}
-	}
-}
-/* Check for new attributes which didn't have a value before */
-if($newattributes) {
-	foreach($newattributes as $attrdefid=>$attribute) {
-		if(!isset($oldattributes[$attrdefid]) && $attribute) {
-			if($notifier) {
-				$notifyList = $folder->getNotifyList();
-				$subject = "folder_attribute_changed_email_subject";
-				$message = "folder_attribute_changed_email_body";
-				$params = array();
-				$params['name'] = $folder->getName();
-				$params['attribute_name'] = $dms->getAttributeDefinition($attrdefid)->getName();
-				$params['attribute_old_value'] = '';
-				$params['attribute_new_value'] = $attribute->getValue();
-				$params['folder_path'] = $folder->getFolderPathPlain();
-				$params['username'] = $user->getFullName();
-				$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
-				$params['sitename'] = $settings->_siteName;
-				$params['http_root'] = $settings->_httpRoot;
-
-				$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-				foreach ($notifyList["groups"] as $grp) {
-					$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-				}
-			}
-		}
-	}
+	$notifier->sendChangedFolderAttributesMail($folder, $user, $oldattributes);
 }
 
 $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_folder_edited')));

From 4d84aa2ce29f53e2372f356a30ff9e5259cb804c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 May 2021 16:11:18 +0200
Subject: [PATCH 029/143] remove old commented code

---
 op/op.AddSubFolder.php | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/op/op.AddSubFolder.php b/op/op.AddSubFolder.php
index efac68b40..5c8efb226 100644
--- a/op/op.AddSubFolder.php
+++ b/op/op.AddSubFolder.php
@@ -122,30 +122,6 @@ if(!$subFolder = $controller->run()) {
 	// Send notification to subscribers.
 	if($notifier) {
 		$notifier->sendNewFolderMail($subFolder, $user);
-		/*
-		$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)
-		);
-
-		$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, SeedDMS_NotificationService::RECV_NOTIFICATION);
-		foreach ($nl["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-		}
-		 */
 	}
 }
 

From acf85728c386714a3203d173ec0170d6b2e1caf7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 May 2021 16:18:03 +0200
Subject: [PATCH 030/143] move sending notification mail into Notification
 Service

---
 inc/inc.ClassNotificationService.php | 21 +++++++++++++++++++++
 op/op.RemoveDocumentFile.php         | 15 +--------------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/inc/inc.ClassNotificationService.php b/inc/inc.ClassNotificationService.php
index f86fdc415..0293d8643 100644
--- a/inc/inc.ClassNotificationService.php
+++ b/inc/inc.ClassNotificationService.php
@@ -432,6 +432,27 @@ class SeedDMS_NotificationService {
 		}
 	} /* }}} */
 
+	/**
+	 * This notification is sent when a new attachment is created.
+	 */
+	public function sendDeleteFileMail($file, $user) { /* {{{ */
+		$document = $file->getDocument();
+		$notifyList = $document->getNotifyList();
+
+		$subject = "removed_file_email_subject";
+		$message = "removed_file_email_body";
+		$params = array();
+		$params['document'] = $document->getName();
+		$params['username'] = $user->getFullName();
+		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+		$params['sitename'] = $this->settings->_siteName;
+		$params['http_root'] = $this->settings->_httpRoot;
+		$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		foreach ($notifyList["groups"] as $grp) {
+			$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		}
+	} /* }}} */
+
 	public function sendChangedExpiryMail($document, $user, $oldexpires) { /* {{{ */
 		$folder = $document->getFolder();
 		$notifyList = $document->getNotifyList();
diff --git a/op/op.RemoveDocumentFile.php b/op/op.RemoveDocumentFile.php
index dbda46a6d..f01114f94 100644
--- a/op/op.RemoveDocumentFile.php
+++ b/op/op.RemoveDocumentFile.php
@@ -68,20 +68,7 @@ if (!$document->removeDocumentFile($fileid)) {
 } else {
 	// Send notification to subscribers.
 	if($notifier) {
-		$notifyList = $document->getNotifyList();
-
-		$subject = "removed_file_email_subject";
-		$message = "removed_file_email_body";
-		$params = array();
-		$params['document'] = $document->getName();
-		$params['username'] = $user->getFullName();
-		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-		$params['sitename'] = $settings->_siteName;
-		$params['http_root'] = $settings->_httpRoot;
-		$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-		foreach ($notifyList["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-		}
+		$notifier->sendDeleteFileMail($file, $user);
 	}
 }
 

From 1d4bd6d1f09bed9d9ef72d4f9706e6ebfb4b49eb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 May 2021 17:01:18 +0200
Subject: [PATCH 031/143] place submit outside of content area

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

diff --git a/views/bootstrap/class.AddFile.php b/views/bootstrap/class.AddFile.php
index 7e7f51e2d..f01617664 100644
--- a/views/bootstrap/class.AddFile.php
+++ b/views/bootstrap/class.AddFile.php
@@ -147,12 +147,12 @@ $(document).ready( function() {
 			$msg = getMLText("max_upload_size").": ".SeedDMS_Core_File::format_filesize($mus2);
 		$this->warningMsg($msg);
 
-		$this->contentContainerStart();
 ?>
 
 <form class="form-horizontal" action="../op/op.AddFile.php" enctype="multipart/form-data" method="post" name="form1" id="form1">
 <input type="hidden" name="documentid" value="<?php print $document->getId(); ?>">
 <?php
+		$this->contentContainerStart();
 		$this->formField(
 			getMLText("local_file"),
 			($enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooserHtml('userfile[]', false))
@@ -205,11 +205,11 @@ $(document).ready( function() {
 				)
 			);
 		}
+		$this->contentContainerEnd();
 		$this->formSubmit(getMLText('add'));
 ?>
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 

From 24be00ccd1abedbcf9198f7e03aa2fc07a45d12f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 May 2021 20:40:45 +0200
Subject: [PATCH 032/143] add methods getApproveLog() and getReviewLog()

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

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 73b5604ec..c0850dabe 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3468,6 +3468,27 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return $this->_reviewStatus;
 	} /* }}} */
 
+	/**
+	 * Get the latest entries from the review log of the document content
+	 *
+	 * @param integer $limit the number of log entries returned, defaults to 1
+	 * @return array list of review log entries
+	 */
+	function getReviewLog($limit=1) { /* {{{ */
+		$db = $this->_document->getDMS()->getDB();
+
+		if (!is_numeric($limit)) return false;
+
+		$queryStr=
+			"SELECT * FROM `tblDocumentReviewLog` LEFT JOIN `tblDocumentReviewers` ON  `tblDocumentReviewLog`.`reviewID` = `tblDocumentReviewers`.`reviewID` WHERE `version`='".$this->_version
+			."' AND `documentID` = '". $this->_document->getID() ."' "
+			."ORDER BY `tblDocumentReviewLog`.`reviewLogID` DESC LIMIT ".(int) $limit;
+		$recs = $db->getResultArray($queryStr);
+		if (is_bool($recs) && !$recs)
+			return false;
+		return($recs);
+	} /* }}} */
+
 	/**
 	 * Rewrites the complete review log
 	 *
@@ -3625,6 +3646,27 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return $this->_approvalStatus;
 	} /* }}} */
 
+	/**
+	 * Get the latest entries from the approval log of the document content
+	 *
+	 * @param integer $limit the number of log entries returned, defaults to 1
+	 * @return array list of approval log entries
+	 */
+	function getApproveLog($limit=1) { /* {{{ */
+		$db = $this->_document->getDMS()->getDB();
+
+		if (!is_numeric($limit)) return false;
+
+		$queryStr=
+			"SELECT * FROM `tblDocumentApproveLog` LEFT JOIN `tblDocumentApprovers` ON  `tblDocumentApproveLog`.`approveID` = `tblDocumentApprovers`.`approveID` WHERE `version`='".$this->_version
+			."' AND `documentID` = '". $this->_document->getID() ."' "
+			."ORDER BY `tblDocumentApproveLog`.`approveLogID` DESC LIMIT ".(int) $limit;
+		$recs = $db->getResultArray($queryStr);
+		if (is_bool($recs) && !$recs)
+			return false;
+		return($recs);
+	} /* }}} */
+
 	/**
 	 * Rewrites the complete approval log
 	 *

From 5028f37accda01172a8bd2cca8225146798f174e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 May 2021 20:41:50 +0200
Subject: [PATCH 033/143] move notification emails into notification service

---
 inc/inc.ClassNotificationService.php | 51 +++++++++++++++-
 op/op.ApproveDocument.php            | 87 +++-------------------------
 op/op.OverrideContentStatus.php      |  2 +-
 op/op.ReviewDocument.php             | 41 ++-----------
 4 files changed, 61 insertions(+), 120 deletions(-)

diff --git a/inc/inc.ClassNotificationService.php b/inc/inc.ClassNotificationService.php
index 0293d8643..b586381d1 100644
--- a/inc/inc.ClassNotificationService.php
+++ b/inc/inc.ClassNotificationService.php
@@ -811,8 +811,8 @@ class SeedDMS_NotificationService {
 		}
 	} /* }}} */
 
-	public function sendChangedDocumentStatusMail($document, $user, $oldstatus) { /* {{{ */
-		$content = $document->getLatestContent();
+	public function sendChangedDocumentStatusMail($content, $user, $oldstatus) { /* {{{ */
+		$document = $content->getDocument();
 		$overallStatus = $content->getStatus();
 		$nl = $document->getNotifyList();
 		$folder = $document->getFolder();
@@ -907,5 +907,52 @@ class SeedDMS_NotificationService {
 			$notifier->toGroup($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 	} /* }}} */
 
+	public function sendSubmittedReviewMail($content, $user, $reviewlog) { /* {{{ */
+		$document = $content->getDocument();
+		$nl=$document->getNotifyList();
+		$folder = $document->getFolder();
+		$subject = "review_submit_email_subject";
+		$message = "review_submit_email_body";
+		$params = array();
+		$params['name'] = $document->getName();
+		$params['version'] = $content->getVersion();
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['status'] = getReviewStatusText($reviewlog["status"]);
+		$params['comment'] = $reviewlog['comment'];
+		$params['username'] = $user->getFullName();
+		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+		$params['sitename'] = $this->settings->_siteName;
+		$params['http_root'] = $this->settings->_httpRoot;
+		$this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		foreach ($nl["groups"] as $grp) {
+			$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		}
+//			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+	} /* }}} */
+
+	public function sendSubmittedApprovalMail($content, $user, $approvelog) { /* {{{ */
+		$document = $content->getDocument();
+		$nl=$document->getNotifyList();
+		$folder = $document->getFolder();
+		$subject = "approval_submit_email_subject";
+		$message = "approval_submit_email_body";
+		$params = array();
+		$params['name'] = $document->getName();
+		$params['version'] = $content->getVersion();
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['status'] = getApprovalStatusText($approvelog["status"]);
+		$params['comment'] = $approvelog['comment'];
+		$params['username'] = $user->getFullName();
+		$params['sitename'] = $this->settings->_siteName;
+		$params['http_root'] = $this->settings->_httpRoot;
+		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."&currenttab=revapp";
+
+		$this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		foreach ($nl["groups"] as $grp)
+			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+//		$this->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+
+	} /* }}} */
+
 }
 
diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php
index 0eb9f08f4..2314b64e4 100644
--- a/op/op.ApproveDocument.php
+++ b/op/op.ApproveDocument.php
@@ -100,29 +100,10 @@ if ($_POST["approvalType"] == "ind") {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("approval_update_failed"));
 	}
 	else {
-		// Send an email notification to the document updater.
 		if($notifier) {
-			$subject = "approval_submit_email_subject";
-			$message = "approval_submit_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['version'] = $version;
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['status'] = getApprovalStatusText($_POST["approvalStatus"]);
-			$params['comment'] = $comment;
-			$params['username'] = $user->getFullName();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."&currenttab=revapp";
-
-			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
-
 			// Send notification to subscribers.
-			$nl=$document->getNotifyList();
-			$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
+			$approvelog = $latestContent->getApproveLog();
+			$notifier->sendSubmittedApprovalMail($latestContent, $user, $approvelog ? $approvelog[0] : false);
 		}
 	}
 }
@@ -138,29 +119,10 @@ else if ($_POST["approvalType"] == "grp") {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("approval_update_failed"));
 	}
 	else {
-		// Send an email notification to the document updater.
 		if($notifier) {
-			$subject = "approval_submit_email_subject";
-			$message = "approval_submit_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['version'] = $version;
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['status'] = getApprovalStatusText($_POST["approvalStatus"]);
-			$params['comment'] = $comment;
-			$params['username'] = $user->getFullName();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."&currenttab=revapp";
-
-			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
-
 			// Send notification to subscribers.
-			$nl=$document->getNotifyList();
-			$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
+			$approvelog = $latestContent->getApproveLog();
+			$notifier->sendSubmittedApprovalMail($latestContent, $user, $approvelog ? $approvelog[0] : false);
 		}
 	}
 }
@@ -170,29 +132,12 @@ else if ($_POST["approvalType"] == "grp") {
 // updated.
 //
 
+$overallStatus = $content->getStatus();
 if ($_POST["approvalStatus"]==-1){
 	if($content->setStatus(S_REJECTED,$comment,$user)) {
 		// Send notification to subscribers.
 		if($notifier) {
-			$nl=$document->getNotifyList();
-			$folder = $document->getFolder();
-			$subject = "document_status_changed_email_subject";
-			$message = "document_status_changed_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['status'] = getOverallStatusText(S_REJECTED);
-			$params['new_status_code'] = S_REJECTED;
-			$params['comment'] = $document->getComment();
-			$params['username'] = $user->getFullName();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-
-			$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
+			$notifier->sendChangedDocumentStatusMail($content, $user, $overallStatus["status"]);
 		}
 		
 		if(isset($GLOBALS['SEEDDMS_HOOKS']['approveDocument'])) {
@@ -227,25 +172,7 @@ if ($_POST["approvalStatus"]==-1){
 		if($content->setStatus($newStatus, getMLText("automatic_status_update"), $user)) {
 			// Send notification to subscribers.
 			if($notifier) {
-				$nl=$document->getNotifyList();
-				$folder = $document->getFolder();
-				$subject = "document_status_changed_email_subject";
-				$message = "document_status_changed_email_body";
-				$params = array();
-				$params['name'] = $document->getName();
-				$params['folder_path'] = $folder->getFolderPathPlain();
-				$params['status'] = getOverallStatusText($newStatus);
-				$params['new_status_code'] = $newStatus;
-				$params['comment'] = $document->getComment();
-				$params['username'] = $user->getFullName();
-				$params['sitename'] = $settings->_siteName;
-				$params['http_root'] = $settings->_httpRoot;
-				$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-
-				$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-				foreach ($nl["groups"] as $grp) {
-					$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-				}
+				$notifier->sendChangedDocumentStatusMail($content, $user, $overallStatus["status"]);
 			}
 			
 			if(isset($GLOBALS['SEEDDMS_HOOKS']['approveDocument'])) {
diff --git a/op/op.OverrideContentStatus.php b/op/op.OverrideContentStatus.php
index a92d9470c..e313844ed 100644
--- a/op/op.OverrideContentStatus.php
+++ b/op/op.OverrideContentStatus.php
@@ -80,7 +80,7 @@ if ($overrideStatus != $overallStatus["status"]) {
 	} else {
 		// Send notification to subscribers.
 		if($notifier) {
-			$notifier->sendChangedDocumentStatusMail($document, $user, $overallStatus["status"]);
+			$notifier->sendChangedDocumentStatusMail($content, $user, $overallStatus["status"]);
 		}
 	}
 }
diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index dcd734ff4..1547f1541 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -100,25 +100,8 @@ if ($_POST["reviewType"] == "ind") {
 	else {
 		// Send an email notification to the document updater.
 		if($notifier) {
-			$nl=$document->getNotifyList();
-			$folder = $document->getFolder();
-			$subject = "review_submit_email_subject";
-			$message = "review_submit_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['version'] = $version;
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['status'] = getReviewStatusText($_POST["reviewStatus"]);
-			$params['comment'] = $comment;
-			$params['username'] = $user->getFullName();
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."&currenttab=revapp";
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
-//			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+			$reviewlog = $latestContent->getReviewLog();
+			$notifier->sendSubmittedReviewMail($latestContent, $user, $reviewlog ? $reviewlog[0] : false);
 		}
 	}
 }
@@ -136,24 +119,8 @@ else if ($_POST["reviewType"] == "grp") {
 	else {
 		// Send an email notification to the document updater.
 		if($notifier) {
-			$nl=$document->getNotifyList();
-			$folder = $document->getFolder();
-			$subject = "review_submit_email_subject";
-			$message = "review_submit_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['version'] = $version;
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['status'] = getReviewStatusText($_POST["reviewStatus"]);
-			$params['comment'] = $comment;
-			$params['username'] = $user->getFullName();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
-//			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+			$reviewlog = $latestContent->getReviewLog();
+			$notifier->sendSubmittedReviewMail($latestContent, $user, $reviewlog ? $reviewlog[0] : false);
 		}
 	}
 }

From 8de5b0ab150a6848b24471d7f24ba4c0f9bd2ac4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 May 2021 20:44:37 +0200
Subject: [PATCH 034/143] add notes for 5.1.23

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

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index f09a4a087..8be3616fd 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -26,6 +26,7 @@
  <notes>
 - SeedDMS_Core_DMS::getTimeline() uses status log instead of document content
 - add methods SeedDMS_Core_DocumentContent::getReviewers() and SeedDMS_Core_DocumentContent::getApprovers()	
+- add methods SeedDMS_Core_DocumentContent::getApproveLog() and SeedDMS_Core_DocumentContent::getReviewLog()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From aa8f6250b3fc61e5b3519b9e7f67697827d51b4d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 May 2021 21:19:32 +0200
Subject: [PATCH 035/143] move sending notification emails into notification
 service

---
 inc/inc.ClassNotificationService.php |  85 +++++++++++++++++++++
 op/op.DocumentAccess.php             |  93 ++++-------------------
 op/op.FolderAccess.php               | 109 +++------------------------
 3 files changed, 111 insertions(+), 176 deletions(-)

diff --git a/inc/inc.ClassNotificationService.php b/inc/inc.ClassNotificationService.php
index b586381d1..ff4d29444 100644
--- a/inc/inc.ClassNotificationService.php
+++ b/inc/inc.ClassNotificationService.php
@@ -954,5 +954,90 @@ class SeedDMS_NotificationService {
 
 	} /* }}} */
 
+	public function sendChangedDocumentOwnerMail($document, $user, $oldowner) { /* {{{ */
+		if($oldowner->getID() != $document->getOwner()->getID()) {
+			$notifyList = $document->getNotifyList();
+			$folder = $document->getFolder();
+			$subject = "ownership_changed_email_subject";
+			$message = "ownership_changed_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['username'] = $user->getFullName();
+			$params['old_owner'] = $oldowner->getFullName();
+			$params['new_owner'] = $document->getOwner()->getFullName();
+			$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+			$params['sitename'] = $this->settings->_siteName;
+			$params['http_root'] = $this->settings->_httpRoot;
+			$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+			foreach ($notifyList["groups"] as $grp) {
+				$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+			}
+//			$notifier->toIndividual($user, $oldowner, $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+		}
+	} /* }}} */
+
+	public function sendChangedFolderOwnerMail($folder, $user, $oldowner) { /* {{{ */
+		if($oldowner->getID() != $folder->getOwner()->getID()) {
+			$notifyList = $folder->getNotifyList();
+			$subject = "ownership_changed_email_subject";
+			$message = "ownership_changed_email_body";
+			$params = array();
+			$params['name'] = $folder->getName();
+			if($folder->getParent())
+				$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
+			else
+				$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['username'] = $user->getFullName();
+			$params['old_owner'] = $oldowner->getFullName();
+			$params['new_owner'] = $folder->getOwner()->getFullName();
+			$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
+			$params['sitename'] = $this->settings->_siteName;
+			$params['http_root'] = $this->settings->_httpRoot;
+			$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+			foreach ($notifyList["groups"] as $grp) {
+				$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+			}
+		}
+	} /* }}} */
+
+	public function sendChangedDocumentAccessMail($document, $user) { /* {{{ */
+		$notifyList = $document->getNotifyList();
+		$folder = $document->getFolder();
+		$subject = "access_permission_changed_email_subject";
+		$message = "access_permission_changed_email_body";
+		$params = array();
+		$params['name'] = $document->getName();
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['username'] = $user->getFullName();
+		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+		$params['sitename'] = $this->settings->_siteName;
+		$params['http_root'] = $this->settings->_httpRoot;
+		$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		foreach ($notifyList["groups"] as $grp) {
+			$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		}
+	} /* }}} */
+
+	public function sendChangedFolderAccessMail($folder, $user) { /* {{{ */
+		$notifyList = $folder->getNotifyList();
+		$subject = "access_permission_changed_email_subject";
+		$message = "access_permission_changed_email_body";
+		$params = array();
+		$params['name'] = $folder->getName();
+		if($folder->getParent())
+			$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
+		else
+			$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['username'] = $user->getFullName();
+		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
+		$params['sitename'] = $this->settings->_siteName;
+		$params['http_root'] = $this->settings->_httpRoot;
+		$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		foreach ($notifyList["groups"] as $grp) {
+			$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		}
+	} /* }}} */
+
 }
 
diff --git a/op/op.DocumentAccess.php b/op/op.DocumentAccess.php
index af69f0aa0..e256435af 100644
--- a/op/op.DocumentAccess.php
+++ b/op/op.DocumentAccess.php
@@ -121,7 +121,7 @@ if($action == 'setowner') {
 	if (!$user->isAdmin()) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 	}
-	if (empty($_GET["ownerid"])) {
+	if (!isset($_GET["ownerid"]) || !is_numeric($_GET["ownerid"]) || $_GET["ownerid"]<1) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_group"));
 	}
 	if (!($newowner = $dms->getUser($_GET["ownerid"]))) {
@@ -130,7 +130,6 @@ if($action == 'setowner') {
 	$oldowner = $document->getOwner();
 }
 
-
 $controller->setParam('document', $document);
 $controller->setParam('folder', $folder);
 $controller->setParam('settings', $settings);
@@ -145,27 +144,10 @@ if(!$controller->run()) {
 
 // Change owner -----------------------------------------------------------
 if ($action == "setowner") {
+	if($notifier) {
+		$notifier->sendChangedDocumentOwnerMail($document, $user, $oldowner);
+	}
 	if($oldowner->getID() != $newowner->getID()) {
-		if($notifier) {
-			$notifyList = $document->getNotifyList();
-			$folder = $document->getFolder();
-			$subject = "ownership_changed_email_subject";
-			$message = "ownership_changed_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['username'] = $user->getFullName();
-			$params['old_owner'] = $oldowner->getFullName();
-			$params['new_owner'] = $newowner->getFullName();
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
-//			$notifier->toIndividual($user, $oldowner, $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
-		}
 		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_setowner')));
 	}
 }
@@ -173,69 +155,26 @@ if ($action == "setowner") {
 // Change to not inherit ---------------------------------------------------
 else if ($action == "notinherit") {
 
-		if($notifier) {
-			$notifyList = $document->getNotifyList();
-			$folder = $document->getFolder();
-			$subject = "access_permission_changed_email_subject";
-			$message = "access_permission_changed_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['username'] = $user->getFullName();
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
-
-		}
-		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_notinherit_access')));
+	if($notifier) {
+		$notifier->sendChangedDocumentAccessMail($document, $user);
+	}
+	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_notinherit_access')));
 }
 
 // Change to inherit-----------------------------------------------------
 else if ($action == "inherit") {
-		if($notifier) {
-			$notifyList = $document->getNotifyList();
-			$folder = $document->getFolder();
-			$subject = "access_permission_changed_email_subject";
-			$message = "access_permission_changed_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['username'] = $user->getFullName();
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
-		}
-		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_inherit_access')));
+	if($notifier) {
+		$notifier->sendChangedDocumentAccessMail($document, $user);
+	}
+	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_inherit_access')));
 }
 
 // Set default permissions ----------------------------------------------
 else if ($action == "setdefault") {
-		if($notifier) {
-			$notifyList = $document->getNotifyList();
-			$folder = $document->getFolder();
-			$subject = "access_permission_changed_email_subject";
-			$message = "access_permission_changed_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['username'] = $user->getFullName();
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
-		}
-		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_set_default_access')));
+	if($notifier) {
+		$notifier->sendChangedDocumentAccessMail($document, $user);
+	}
+	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_set_default_access')));
 } elseif($action == "delaccess") {
 	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_delete_access')));
 } elseif($action == "addaccess") {
diff --git a/op/op.FolderAccess.php b/op/op.FolderAccess.php
index 00bb30468..004abd871 100644
--- a/op/op.FolderAccess.php
+++ b/op/op.FolderAccess.php
@@ -110,40 +110,20 @@ if (isset($_GET["groupid"])) {
 
 // Change owner -----------------------------------------------------------
 if ($action == "setowner") {
-
 	if (!$user->isAdmin()) {
 		UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("access_denied"));
 	}
 	if (!isset($_GET["ownerid"]) || !is_numeric($_GET["ownerid"]) || $_GET["ownerid"]<1) {
 		UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("unknown_user"));
 	}
-	$newOwner = $dms->getUser($_GET["ownerid"]);
-	if (!is_object($newOwner)) {
+	if (!($newowner = $dms->getUser($_GET["ownerid"]))) {
 		UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("unknown_user"));
 	}
 	$oldOwner = $folder->getOwner();
-	if($folder->setOwner($newOwner)) {
+	if($folder->setOwner($newowner)) {
 		if($notifier) {
 			// Send notification to subscribers.
-			$notifyList = $folder->getNotifyList();
-			$subject = "ownership_changed_email_subject";
-			$message = "ownership_changed_email_body";
-			$params = array();
-			$params['name'] = $folder->getName();
-			if($folder->getParent())
-				$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
-			else
-				$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['username'] = $user->getFullName();
-			$params['old_owner'] = $oldOwner->getFullName();
-			$params['new_owner'] = $newOwner->getFullName();
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
+			$notifier->sendChangedFolderOwnerMail($folder, $user, $oldOwner);
 		}
 		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_setowner')));
 	} else {
@@ -156,49 +136,12 @@ else if ($action == "notinherit") {
 
 	$defAccess = $folder->getDefaultAccess();
 	if($folder->setInheritAccess(false)) {
-		if($notifier) {
-			// Send notification to subscribers.
-			$notifyList = $folder->getNotifyList();
-			$subject = "access_permission_changed_email_subject";
-			$message = "access_permission_changed_email_body";
-			$params = array();
-			$params['name'] = $folder->getName();
-			if($folder->getParent())
-				$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
-			else
-				$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['username'] = $user->getFullName();
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		if($folder->setDefaultAccess($defAccess)) {
+			if($notifier) {
+				// Send notification to subscribers.
+				$notifier->sendChangedFolderAccessMail($folder, $user);
 			}
-		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_notinherit_access')));
-		}
-	}
-	if($folder->setDefaultAccess($defAccess)) {
-		if($notifier) {
-			// Send notification to subscribers.
-			$notifyList = $folder->getNotifyList();
-			$subject = "access_permission_changed_email_subject";
-			$message = "access_permission_changed_email_body";
-			$params = array();
-			$params['name'] = $folder->getName();
-			if($folder->getParent())
-				$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
-			else
-				$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['username'] = $user->getFullName();
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
-
+			$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_notinherit_access')));
 		}
 	}
 	if ($mode == "copy") {
@@ -220,23 +163,7 @@ else if ($action == "inherit") {
 	if($folder->setInheritAccess(true)) {
 		if($notifier) {
 			// Send notification to subscribers.
-			$notifyList = $folder->getNotifyList();
-			$subject = "access_permission_changed_email_subject";
-			$message = "access_permission_changed_email_body";
-			$params = array();
-			$params['name'] = $folder->getName();
-			if($folder->getParent())
-				$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
-			else
-				$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['username'] = $user->getFullName();
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
+			$notifier->sendChangedFolderAccessMail($folder, $user);
 		}
 		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_inherit_access')));
 	}
@@ -247,23 +174,7 @@ else if ($action == "setdefault") {
 	if($folder->setDefaultAccess($mode)) {
 		if($notifier) {
 			// Send notification to subscribers.
-			$notifyList = $folder->getNotifyList();
-			$subject = "access_permission_changed_email_subject";
-			$message = "access_permission_changed_email_body";
-			$params = array();
-			$params['name'] = $folder->getName();
-			if($folder->getParent())
-				$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
-			else
-				$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['username'] = $user->getFullName();
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
+			$notifier->sendChangedFolderAccessMail($folder, $user);
 		}
 		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_set_default_access')));
 	}

From 9ed96e2a2af420cfb0852819b093a63389b0b1bb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 May 2021 08:51:08 +0200
Subject: [PATCH 036/143] init $statusstartdate and $statusenddate in search()

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

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 21e221d90..f5e67f18f 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1459,6 +1459,8 @@ class SeedDMS_Core_DMS {
 	 */
 	function search($query, $limit=0, $offset=0, $logicalmode='AND', $searchin=array(), $startFolder=null, $owner=null, $status = array(), $creationstartdate=array(), $creationenddate=array(), $modificationstartdate=array(), $modificationenddate=array(), $categories=array(), $attributes=array(), $mode=0x3, $expirationstartdate=array(), $expirationenddate=array()) { /* {{{ */
 		$orderby = '';
+		$statusstartdate = array();
+		$statusenddate = array();
 		if(is_array($query)) {
 			foreach(array('limit', 'offset', 'logicalmode', 'searchin', 'startFolder', 'owner', 'status', 'creationstartdate', 'creationenddate', 'modificationstartdate', 'modificationenddate', 'categories', 'attributes', 'mode', 'expirationstartdate', 'expirationenddate') as $paramname)
 				${$paramname} = isset($query[$paramname]) ? $query[$paramname] : ${$paramname};

From 477d1a69b86f5631ce67e8ae8183959fae3d105c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 May 2021 08:51:47 +0200
Subject: [PATCH 037/143] issue splash message

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

diff --git a/op/op.DocumentNotify.php b/op/op.DocumentNotify.php
index 9e061c247..1ce87d163 100644
--- a/op/op.DocumentNotify.php
+++ b/op/op.DocumentNotify.php
@@ -100,6 +100,7 @@ if ($action == "delnotify"){
 			UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("internal_error"));
 			break;
 		case 0:
+			$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_rm_notify')));
 			// Email user / group, informing them of subscription change.
 			if($notifier) {
 				$notifier->sendDeleteFolderNotifyMail($folder, $user, $obj);
@@ -111,6 +112,7 @@ if ($action == "delnotify"){
 // add notification
 else if ($action == "addnotify") {
 
+	/* Both $userid and $groupid can be set */
 	if ($userid > 0) {
 		$res = $document->addNotify($userid, true);
 		switch ($res) {
@@ -127,12 +129,11 @@ else if ($action == "addnotify") {
 				UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("internal_error"));
 				break;
 			case 0:
-				// Email user / group, informing them of subscription.
+				$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_add_notify')));
 				if ($notifier){
 					$obj = $dms->getUser($userid);
 					$notifier->sendNewDocumentNotifyMail($document, $user, $obj);
 				}
-
 				break;
 		}
 	}
@@ -152,6 +153,7 @@ else if ($action == "addnotify") {
 				UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("internal_error"));
 				break;
 			case 0:
+				$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_add_notify')));
 				if ($notifier){
 					$obj = $dms->getGroup($groupid);
 					$notifier->sendNewDocumentNotifyMail($document, $user, $obj);

From eacd59c2ef533769bc37712d57a3d752a7c2354f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 May 2021 08:53:43 +0200
Subject: [PATCH 038/143] issue splash messages

---
 op/op.FolderNotify.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/op/op.FolderNotify.php b/op/op.FolderNotify.php
index 0390ab7b7..ffca554c2 100644
--- a/op/op.FolderNotify.php
+++ b/op/op.FolderNotify.php
@@ -95,6 +95,7 @@ if ($action == "delnotify") {
 			UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("internal_error"));
 			break;
 		case 0:
+			$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_rm_notify')));
 			if($notifier) {
 				$notifier->sendDeleteFolderNotifyMail($folder, $user, $obj);
 			}
@@ -121,6 +122,7 @@ else if ($action == "addnotify") {
 				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("internal_error"));
 				break;
 			case 0:
+				$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_add_notify')));
 				if($notifier) {
 					$obj = $dms->getUser($userid);
 					$notifier->sendNewFolderNotifyMail($folder, $user, $obj);
@@ -145,6 +147,7 @@ else if ($action == "addnotify") {
 				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("internal_error"));
 				break;
 			case 0:
+				$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_add_notify')));
 				if($notifier) {
 					$obj = $dms->getGroup($groupid);
 					$notifier->sendNewFolderNotifyMail($folder, $user, $obj);

From a9d912bce29a13d114cca551b4fb39ff6310d6ec Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 May 2021 08:54:07 +0200
Subject: [PATCH 039/143] better error checking, send notification mail via
 notification service

---
 op/op.ManageNotify.php | 64 +++++++++++++++++++++++++++++++++---------
 1 file changed, 50 insertions(+), 14 deletions(-)

diff --git a/op/op.ManageNotify.php b/op/op.ManageNotify.php
index 0dc92afdf..e6c493977 100644
--- a/op/op.ManageNotify.php
+++ b/op/op.ManageNotify.php
@@ -81,8 +81,55 @@ if ($_GET["type"]=="document"){
 	if ($document->getAccessMode($user) < M_READ) 
 		UI::exitError(getMLText("my_account"),getMLText("error_occured"));
 
-	if ($_GET["action"]=="add") $document->addNotify($userid, true);
-	else if ($_GET["action"]=="del") $document->removeNotify($userid, true);
+	if ($_GET["action"]=="add") {
+		$res = $document->addNotify($userid, true);
+		switch ($res) {
+			case -1:
+				UI::exitError(getMLText("my_account"), getMLText("unknown_user"));
+				break;
+			case -2:
+				UI::exitError(getMLText("my_account"), getMLText("access_denied"));
+				break;
+			case -3:
+				UI::exitError(getMLText("my_account"), getMLText("already_subscribed"));
+				break;
+			case -4:
+				UI::exitError(getMLText("my_account"), getMLText("internal_error"));
+				break;
+			case 0:
+				$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_add_notify')));
+				// Email user / group, informing them of subscription.
+				if ($notifier){
+					$obj = $dms->getUser($userid);
+					$notifier->sendNewDocumentNotifyMail($document, $user, $obj);
+				}
+				break;
+		}
+	} elseif ($_GET["action"]=="del") {
+		$res = $document->removeNotify($userid, true);
+		switch ($res) {
+			case -1:
+				UI::exitError(getMLText("my_account"), getMLText("unknown_user"));
+				break;
+			case -2:
+				UI::exitError(getMLText("my_account"), getMLText("access_denied"));
+				break;
+			case -3:
+				UI::exitError(getMLText("my_account"), getMLText("not_subscribed"));
+				break;
+			case -4:
+				UI::exitError(getMLText("my_account"), getMLText("internal_error"));
+				break;
+			case 0:
+				$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_rm_notify')));
+				// Email user / group, informing them of subscription change.
+				if($notifier) {
+					$obj = $dms->getUser($userid);
+					$notifier->sendDeleteDocumentNotifyMail($document, $user, $obj);
+				}
+				break;
+		}
+	}
 	
 } else if ($_GET["type"]=="folder") {
 
@@ -113,18 +160,7 @@ if ($_GET["type"]=="document"){
 		if(0 == $folder->removeNotify($userid, true)) {
 			if($notifier) {
 				$obj = $dms->getUser($userid);
-				// Email user / group, informing them of subscription.
-				$subject = "notify_deleted_email_subject";
-				$message = "notify_deleted_email_body";
-				$params = array();
-				$params['name'] = $folder->getName();
-				$params['folder_path'] = $folder->getFolderPathPlain();
-				$params['username'] = $user->getFullName();
-				$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
-				$params['sitename'] = $settings->_siteName;
-				$params['http_root'] = $settings->_httpRoot;
-
-				$notifier->toIndividual($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+				$notifier->sendDeleteFolderNotifyMail($folder, $user, $obj);
 			}
 		}
 	}

From b12dbd8e02cc97b7bfcdf97f68e30e94b7233812 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 May 2021 09:14:55 +0200
Subject: [PATCH 040/143] move sending notification mail into Notification
 service

---
 inc/inc.ClassNotificationService.php | 27 +++++++++++++++++++++++++++
 op/op.EditOnline.php                 | 20 +-------------------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/inc/inc.ClassNotificationService.php b/inc/inc.ClassNotificationService.php
index ff4d29444..b760cc593 100644
--- a/inc/inc.ClassNotificationService.php
+++ b/inc/inc.ClassNotificationService.php
@@ -432,6 +432,33 @@ class SeedDMS_NotificationService {
 		}
 	} /* }}} */
 
+	/**
+	 * This notification is sent when a document content is replaced.
+	 */
+	public function sendReplaceContentMail($content, $user) { /* {{{ */
+		$document = $content->getDocument();
+		$folder = $document->getFolder();
+		$notifyList = $document->getNotifyList();
+
+		$subject = "replace_content_email_subject";
+		$message = "replace_content_email_body";
+		$params = array();
+		$params['name'] = $document->getName();
+		$params['folder_name'] = $folder->getName();
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['username'] = $user->getFullName();
+		$params['comment'] = $document->getComment();
+		$params['version'] = $content->getVersion();
+		$params['version_comment'] = $content->getComment();
+		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+		$params['sitename'] = $this->settings->_siteName;
+		$params['http_root'] = $this->settings->_httpRoot;
+		$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		foreach ($notifyList["groups"] as $grp) {
+			$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		}
+	} /* }}} */
+
 	/**
 	 * This notification is sent when a new attachment is created.
 	 */
diff --git a/op/op.EditOnline.php b/op/op.EditOnline.php
index 2ad2327b4..152fd3c59 100644
--- a/op/op.EditOnline.php
+++ b/op/op.EditOnline.php
@@ -63,25 +63,7 @@ if($lc->getChecksum() == SeedDMS_Core_File::checksum($tmpfname)) {
 } else {
 	if($document->replaceContent(0, $user, $tmpfname, $lc->getOriginalFileName(), $lc->getFileType(), $lc->getMimeType())) {
 		if($notifier) {
-			$notifyList = $folder->getNotifyList();
-
-			$subject = "replace_content_email_subject";
-			$message = "replace_content_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['folder_name'] = $folder->getName();
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['username'] = $user->getFullName();
-			$params['comment'] = $document->getComment();
-			$params['version'] = $lc->getVersion();
-			$params['version_comment'] = $lc->getComment();
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-			}
+			$notifier->sendReplaceContentMail($lc, $user);
 		}
 		echo json_encode(array('success'=>true, 'message'=>getMLText('splash_saved_file')));
 	} else {

From 19600dd7caba541696aae025602b1bab6af7971e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 May 2021 10:37:09 +0200
Subject: [PATCH 041/143] no need to include bootbox.js anymore

---
 views/bootstrap/class.ApprovalSummary.php  | 2 --
 views/bootstrap/class.ExpiredDocuments.php | 2 --
 views/bootstrap/class.MyDocuments.php      | 2 --
 views/bootstrap/class.ObjectCheck.php      | 2 --
 views/bootstrap/class.ReviewSummary.php    | 2 --
 views/bootstrap/class.Timeline.php         | 2 --
 views/bootstrap/class.ViewDocument.php     | 1 -
 views/bootstrap/class.ViewFolder.php       | 2 --
 8 files changed, 15 deletions(-)

diff --git a/views/bootstrap/class.ApprovalSummary.php b/views/bootstrap/class.ApprovalSummary.php
index 5dba410e8..f4094d53d 100644
--- a/views/bootstrap/class.ApprovalSummary.php
+++ b/views/bootstrap/class.ApprovalSummary.php
@@ -54,8 +54,6 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Theme_Style {
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
-
 		$this->htmlStartPage(getMLText("approval_summary"));
 		$this->globalNavigation();
 		$this->contentStart();
diff --git a/views/bootstrap/class.ExpiredDocuments.php b/views/bootstrap/class.ExpiredDocuments.php
index 72ae52a5f..4c3aacc61 100644
--- a/views/bootstrap/class.ExpiredDocuments.php
+++ b/views/bootstrap/class.ExpiredDocuments.php
@@ -58,8 +58,6 @@ class SeedDMS_View_ExpiredDocuments extends SeedDMS_Theme_Style {
 		$xsendfile = $this->params['xsendfile'];
 		$order = $orderby.$orderdir;
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
-
 		$db = $dms->getDB();
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
 
diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index dc4ece7c7..dd3136c03 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -58,8 +58,6 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Theme_Style {
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
-
 		$db = $dms->getDB();
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
 
diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index e12a55e6a..52af51825 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -197,8 +197,6 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
 		$previewer->setConverters($previewconverters);
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
-
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
 		$this->contentStart();
diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php
index 575e9e7e7..39b669cd1 100644
--- a/views/bootstrap/class.ReviewSummary.php
+++ b/views/bootstrap/class.ReviewSummary.php
@@ -54,8 +54,6 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Theme_Style {
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
-
 		$this->htmlStartPage(getMLText("my_documents"));
 		$this->globalNavigation();
 		$this->contentStart();
diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php
index 7b15ecd6e..a32107e19 100644
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@@ -223,8 +223,6 @@ div.timeline-event-selected {
 		$todate = $this->params['todate'];
 		$skip = $this->params['skip'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
-
 		if($fromdate) {
 			$from = makeTsFromLongDate($fromdate.' 00:00:00');
 		} else {
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 497c9dda6..7adbd297a 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -643,7 +643,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 		if($versions === null)
 			$versions = $document->getContent();
 
-//		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
 		$this->htmlAddHeader('<link href="../styles/bootstrap/timeline/timeline.css" rel="stylesheet">'."\n", 'css');
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/bootstrap/timeline/timeline-min.js"></script>'."\n", 'js');
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/bootstrap/timeline/timeline-locales.js"></script>'."\n", 'js');
diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index aff68d62f..2793f8c1c 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -572,8 +572,6 @@ $('body').on('click', '.order-btn', function(ev) {
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
 		$previewer->setConverters($previewconverters);
 
-		//$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
-
 //		echo $this->callHook('startPage');
 		$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
 		$this->globalNavigation($folder);

From 165eaec67e651e68ff53b949eb9daf2deb1d10fb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 May 2021 14:53:42 +0200
Subject: [PATCH 042/143] set zIndexOffset of datepicker to 1040, which is
 above the header

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

diff --git a/views/bootstrap4/styles/application.js b/views/bootstrap4/styles/application.js
index 0798e8c89..5e12d0509 100644
--- a/views/bootstrap4/styles/application.js
+++ b/views/bootstrap4/styles/application.js
@@ -49,7 +49,7 @@ function treeDocumentSelected(formid, nodeid, nodename) {
 
 function initMost() {
 	$('.datepicker, #expirationdate, #createstartdate, #createenddate, #expirationstartdate, #expirationenddate')
-		.datepicker({todayHighlight: true, toggleActive: true, autoclose: "true"})
+		.datepicker({todayHighlight: true, toggleActive: true, autoclose: "true", zIndexOffset: "1040"})
 	/*
 		.on('changeDate', function(ev){
 			if(ev.date && $(ev.target).data('selectmenu')) {

From 635c40bd84ff7fbc5ef07b8d5bfff9175d1304e2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 May 2021 14:54:23 +0200
Subject: [PATCH 043/143] put menu items into one global menu

---
 views/bootstrap4/class.Bootstrap4.php | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 497b11c0d..ed6236474 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -320,22 +320,19 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			echo "</form>\n";
 			/* }}} End of search form */
 
-		echo " <button class=\"navbar-toggler\" type=\"button\" data-toggle=\"collapse\" data-target=\"#navbarMain\" aria-controls=\"navbarMain\" aria-expanded=\"false\" aria-label=\"Toggle navigation\">\n";
-		echo "  <span class=\"navbar-toggler-icon\"></span>\n";
-		echo " </button>\n";
+			echo " <button class=\"navbar-toggler\" type=\"button\" data-toggle=\"collapse\" data-target=\"#navbarMain\" aria-controls=\"navbarMain\" aria-expanded=\"false\" aria-label=\"Toggle navigation\">\n";
+			echo "  <span class=\"navbar-toggler-icon\"></span>\n";
+			echo " </button>\n";
 
 			echo " <div class=\"collapse navbar-collapse\" id=\"navbarMain\">\n";
 			echo "  <ul class=\"navbar-nav\">\n";
-			if ($this->params['enablecalendar']) echo "    <li class=\"nav-item\"><a class=\"nav-link\" href=\"../out/out.Calendar.php?mode=".$this->params['calendardefaultview']."\">".getMLText("calendar")."</a></li>\n";
-			if ($this->params['user']->isAdmin()) echo "    <li class=\"nav-item\"><a class=\"nav-link\" href=\"../out/out.AdminTools.php\">".getMLText("admin_tools")."</a></li>\n";
-			if($this->params['enablehelp']) {
-			$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-			echo "    <li class=\"nav-item\"><a class=\"nav-link\" href=\"../out/out.Help.php?context=".$tmp[1]."\">".getMLText("help")."</a></li>\n";
-			}
-			echo "   </ul>\n";
-
-			echo "   <ul class=\"navbar-nav\">\n";
 			$menuitems = array();
+			if ($this->params['enablecalendar'] && $accessobject->check_view_access('Calendar')) $menuitems['calendar'] = array('link'=>'../out/out.Calendar.php?mode='.$this->params['calendardefaultview'], 'label'=>"calendar");
+			if ($this->params['user']->isAdmin()) $menuitems['admintools'] = array('link'=>'../out/out.AdminTools.php', 'label'=>"admin_tools");
+			if($this->params['enablehelp']) {
+				$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+				$menuitems['help'] = array('link'=>'../out/out.Help.php?context='.$tmp[1], 'label'=>"help");
+			}
 			/* Check if hook exists because otherwise callHook() will override $menuitems */
 			if($this->hasHook('globalNavigationBar'))
 				$menuitems = $this->callHook('globalNavigationBar', $menuitems);
@@ -1404,7 +1401,7 @@ $(document).ready(function() {
 			$dateformat = getConvertDateFormat();
 		$content = '
 <div class="input-group date" id="'.$varName.'date">
-	<input type="text" class="form-control" name="'.$varName.'" value="'.$defDate. '" 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.'"' : '').' data-date-autoclose="true" data-provide="datepicker">
+	<input type="text" class="form-control datepicker" name="'.$varName.'" id="'.$varName.'" value="'.$defDate. '" 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.'"' : '').' data-date-autoclose="true" data-provide="datepicker">
 	<div class="input-group-append">
 		<span class="input-group-text"><i class="fa fa-calendar"></i></span>
 	</div>

From 3614bae91b7ebebac451aba3643796f132e73a66 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 22 May 2021 13:12:38 +0200
Subject: [PATCH 044/143] get status of latest content

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

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index e19541901..c4b63e960 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1476,6 +1476,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 ?>
 			<div class="tab-pane <?php if($currenttab == 'revision') echo 'active'; ?>" id="revision">
 <?php
+			$status = $latestContent->getStatus();
 			if($status['status'] == S_RELEASED) {
 				if($latestContent->getRevisionDate()) {
 ?>

From aef421a581495197f29e4c7dc306e37de65914f0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 22 May 2021 13:14:17 +0200
Subject: [PATCH 045/143] fix color change of header after substituion of user

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

diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index ed6236474..b2b6bb29e 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -127,7 +127,7 @@ class SeedDMS_Theme_Style extends SeedDMS_View_Common {
 		if($this->params['session'] && $this->params['session']->getSu()) {
 ?>
 <style type="text/css">
-.navbar-inverse .navbar-inner {
+nav.navbar.fixed-top {
 background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#882222), to(#111111));
 background-image: webkit-linear-gradient(top, #882222, #111111);
 background-image: linear-gradient(to bottom, #882222, #111111);;

From f1a17f18a41ee0a409c7bb664eac34d70022f2cd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 22 May 2021 13:57:55 +0200
Subject: [PATCH 046/143] minor updates

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

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 3d9ce60ba..b87933c64 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -24,6 +24,8 @@
 $text = array(
 '2_factor_auth' => 'توثيق ذو عاملين',
 '2_factor_auth_info' => 'معلومات عن توثيق ذو عاملين',
+'2_fact_auth_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => '',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -784,6 +786,7 @@ URL: [url]',
 'lock_document' => 'حماية',
 'lock_message' => 'هذا الملف محمي بواسطة [username]. فقط المستخدمين المصرح لهم يمكنهم تعديله.',
 'lock_status' => 'حالة',
+'logfile' => '',
 'logfile_loading' => '',
 'login' => 'دخول',
 'login_disabled_text' => 'حسابك معطل, غالبا بسبب المحاولات العديدة الخاطئة للدخول',
@@ -901,6 +904,7 @@ Parent folder: [folder_path]
 مستخدم: [username]
 URL: [url]',
 'notify_deleted_email_subject' => '[sitename]: [name] - تم ازالتك من قائمة التنبيهات',
+'not_subscribed' => '',
 'november' => 'نوفمبر',
 'now' => 'الان',
 'no_action' => 'لايوجد اجراء مطلوب',
@@ -1051,6 +1055,8 @@ URL: [url]',
 'remove_marked_files' => 'ازالة الملفات المختارة',
 'repaired' => 'تم اصلاحه',
 'repairing_objects' => 'تحضير المستندات والمجلدات.',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => 'طلب سير عمل في نشاط محتوى البريد الإلكتروني',
 'request_workflow_action_email_subject' => 'طلب سير العمل في نشاط موضوع البريد الإلكتروني',
 'reset_checkout' => 'إعادة تعيين الخروج',
@@ -1660,6 +1666,7 @@ URL: [url]',
 'splash_add_attribute' => 'اضافة سمة',
 'splash_add_group' => 'اضافة مجموعة',
 'splash_add_group_member' => 'اضافة مستخدم الى المجموعة',
+'splash_add_notify' => '',
 'splash_add_role' => 'اضافة دور',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => 'اضافة إلى الإحالة',
@@ -1713,6 +1720,7 @@ URL: [url]',
 'splash_rm_folder' => 'تم حذف المجلد',
 'splash_rm_group' => 'تم حذف المجموعة',
 'splash_rm_group_member' => 'تم حذف مستخدم من المجموعة',
+'splash_rm_notify' => '',
 'splash_rm_role' => 'تم حذف دور',
 'splash_rm_transmittal' => 'تم حذف إحالة',
 'splash_rm_user' => 'تم حذف مستخدم',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 82d16f625..eaaa0d697 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -24,6 +24,8 @@
 $text = array(
 '2_factor_auth' => '',
 '2_factor_auth_info' => '',
+'2_fact_auth_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => '',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -713,6 +715,7 @@ $text = array(
 'lock_document' => 'Блокирай',
 'lock_message' => 'Документът е блокиран [username]. Само имащите права могат да го разблокират.',
 'lock_status' => 'Статус',
+'logfile' => '',
 'logfile_loading' => '',
 'login' => 'Име',
 'login_disabled_text' => 'Вашия акаунт е забранен, вероятно заради прекалено много погрешни опити за влизане.',
@@ -806,6 +809,7 @@ $text = array(
 'notify_deleted_email' => 'Вие сте махнати от списка с уведомявани',
 'notify_deleted_email_body' => '',
 'notify_deleted_email_subject' => '',
+'not_subscribed' => '',
 'november' => 'ноември',
 'now' => 'сега',
 'no_action' => 'Действие не е нужно',
@@ -941,6 +945,8 @@ $text = array(
 'remove_marked_files' => '',
 'repaired' => '',
 'repairing_objects' => 'Поправка на папки и документи',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
@@ -1523,6 +1529,7 @@ $text = array(
 'splash_add_attribute' => '',
 'splash_add_group' => '',
 'splash_add_group_member' => '',
+'splash_add_notify' => '',
 'splash_add_role' => '',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => '',
@@ -1576,6 +1583,7 @@ $text = array(
 'splash_rm_folder' => 'Папката е изтрита',
 'splash_rm_group' => '',
 'splash_rm_group_member' => '',
+'splash_rm_notify' => '',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 0a34c6df0..9d5806975 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -24,6 +24,8 @@
 $text = array(
 '2_factor_auth' => '',
 '2_factor_auth_info' => '',
+'2_fact_auth_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => '',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -718,6 +720,7 @@ URL: [url]',
 'lock_document' => 'Bloquejar',
 'lock_message' => 'Aquest document ha estat bloquejat per [username]. Només els usuaris autoritzats poden desbloquejar aquest document (vegeu al final de la pàgina).',
 'lock_status' => 'Estat',
+'logfile' => '',
 'logfile_loading' => '',
 'login' => '',
 'login_disabled_text' => '',
@@ -811,6 +814,7 @@ URL: [url]',
 'notify_deleted_email' => 'Se us ha eliminat de la llista de notificació',
 'notify_deleted_email_body' => '',
 'notify_deleted_email_subject' => '',
+'not_subscribed' => '',
 'november' => 'Novembre',
 'now' => '',
 'no_action' => 'No és necessària cap acció',
@@ -946,6 +950,8 @@ URL: [url]',
 'remove_marked_files' => '',
 'repaired' => '',
 'repairing_objects' => '',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
@@ -1528,6 +1534,7 @@ URL: [url]',
 'splash_add_attribute' => '',
 'splash_add_group' => '',
 'splash_add_group_member' => '',
+'splash_add_notify' => '',
 'splash_add_role' => '',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => '',
@@ -1581,6 +1588,7 @@ URL: [url]',
 'splash_rm_folder' => 'Carpeta esborrada',
 'splash_rm_group' => '',
 'splash_rm_group_member' => '',
+'splash_rm_notify' => '',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index b0d9e73c0..9bbb3e261 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -24,6 +24,8 @@
 $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_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => 'tajemství',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -815,6 +817,7 @@ URL: [url]',
 'lock_document' => 'Zamknout',
 'lock_message' => 'Tento dokument zamknul [username]. Pouze oprávnění uživatelé ho mohou odemknout (viz konec stránky).',
 'lock_status' => 'Stav',
+'logfile' => '',
 'logfile_loading' => '',
 'login' => 'Přihlášení',
 'login_disabled_text' => 'Váš účet je zakázán, pravděpodobně z důvodu příliš mnoha neúspěšných přihlášení.',
@@ -932,6 +935,7 @@ Nadřazená složka: [folder_path]
 Uživatel: [username]
 URL: [url]',
 'notify_deleted_email_subject' => '[sitename]: [name] - Odstraněno ze seznamu oznámení',
+'not_subscribed' => '',
 'november' => 'Listopad',
 'now' => 'nyní',
 'no_action' => 'Nic se nevykoná',
@@ -1097,6 +1101,8 @@ URL: [url]',
 'remove_marked_files' => 'Odstranit označené soubory',
 'repaired' => 'opraveno',
 'repairing_objects' => 'Opravuji dokumenty a složky.',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => 'Workflow dosáhlo stavu, který vyžaduje vaši akci.
 Dokument: [name]
 Verze: [verze]
@@ -1732,6 +1738,7 @@ Jméno: [username]
 'splash_add_attribute' => 'Přidán nový atribut',
 'splash_add_group' => 'Přidána nová skupina',
 'splash_add_group_member' => 'Přidán nový člen skupiny',
+'splash_add_notify' => '',
 'splash_add_role' => 'Přidána nová role',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => 'Přidáno k přenosu',
@@ -1785,6 +1792,7 @@ Jméno: [username]
 'splash_rm_folder' => 'Složka smazána',
 'splash_rm_group' => 'Skupina odstraněna',
 'splash_rm_group_member' => 'Člen skupiny odstraněn',
+'splash_rm_notify' => '',
 'splash_rm_role' => 'Role odstraněna',
 'splash_rm_transmittal' => 'Přenos odstraněn',
 'splash_rm_user' => 'Uživatel odstraněn',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 1b2a4dc33..2c097c503 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,11 +19,13 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2906), dgrutsch (22)
+//    Translators: Admin (2921), 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_current_secret' => 'Aktuelles Geheimnis',
+'2_fact_auth_new_secret' => 'Neues Geheimnis',
 '2_fact_auth_secret' => 'Schlüssel',
 'abbr_day' => 'T.',
 'abbr_hour' => 'St.',
@@ -449,6 +451,7 @@ URL: [url]',
 'document_transfered_email_body' => 'Dokument an anderen Benutzer übertragen
 Dokument: [name]
 Neuer Besitzer: [newuser]
+Alter Besitzer: [olduser]
 Elternordner: [folder_path]
 Benutzer: [username]
 URL: [url]',
@@ -456,6 +459,7 @@ URL: [url]',
 'document_updated_email' => 'Dokument aktualisiert',
 'document_updated_email_body' => 'Dokument aktualisiert
 Dokument: [name]
+Version: [version]
 Elternordner: [folder_path]
 Benutzer: [username]
 Kommentar: [comment]
@@ -815,6 +819,7 @@ URL: [url]',
 'lock_document' => 'Sperren',
 'lock_message' => 'Dieses Dokument ist durch [username] gesperrt. Nur authorisierte Benutzer können diese Sperrung aufheben.',
 'lock_status' => 'Status',
+'logfile' => 'Log-Datei',
 'logfile_loading' => 'Bitte warten, bis die Log-Datei geladen ist …',
 'login' => 'Login',
 'login_disabled_text' => 'Ihr Konto ist gesperrt. Der Grund sind möglicherweise zu viele gescheiterte Anmeldeversuche.',
@@ -931,6 +936,7 @@ Elternordner: [folder_path]
 Benutzer: [username]
 URL: [url]',
 'notify_deleted_email_subject' => '[sitename]: [name] - Removed from notification list',
+'not_subscribed' => 'Nicht abonniert',
 'november' => 'November',
 'now' => 'sofort',
 'no_action' => 'Keine Aktion erforderlich.',
@@ -981,8 +987,8 @@ URL: [url]',
 'ownership_changed_email_body' => 'Besitzer geändert
 Dokument: [name]
 Elternordner: [folder_path]
-Old owner: [old_owner]
-New owner: [new_owner]
+Bisheriger Besitzer: [old_owner]
+Neuer Besitzer: [new_owner]
 Benutzer: [username]
 URL: [url]',
 'ownership_changed_email_subject' => '[sitename]: [name] - Besitzer geändert',
@@ -1100,6 +1106,13 @@ URL: [url]',
 'remove_marked_files' => 'Markierte Dateien löschen',
 'repaired' => 'repariert',
 'repairing_objects' => 'Repariere Dokumente und Ordner.',
+'replace_content_email_body' => 'Die letzte Version des Dokuments wurde ersetzt
+Dokument: [name]
+Version: [version]
+Elternordner: [folder_path]
+Benutzer: [username]
+URL: [url]',
+'replace_content_email_subject' => '[sitename]: [name] - Dokumentenversion ersetzt',
 'request_workflow_action_email_body' => 'Der Workflow hat einen Status erreicht welcher Ihre Aktion benötigt.
 Dokument: [name]
 Version: [version]
@@ -1597,7 +1610,7 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 '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',
-'settings_passwordExpiration_desc' => 'Die Zahl der Tage nach der ein Passwort verällt und neu gesetzt werden muss. 0 schaltet den Passwortverfall aus.',
+'settings_passwordExpiration_desc' => 'Die Zahl der Tage nach der ein Passwort verfällt und neu gesetzt werden muss. 0 schaltet den Passwortverfall aus.',
 'settings_passwordHistory' => 'Passwort-Historie',
 'settings_passwordHistory_desc' => 'Die Zahl der Passwörter, die ein Benutzer verwendet hat, bevor er ein altes Passwort wiederverwenden darf. 0 schaltet die Passwort-Historie aus.',
 'settings_passwordStrength' => 'Min. Passwortstärke',
@@ -1741,14 +1754,15 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'sort_by_sequence' => 'Nach Reihenfolge sortieren',
 'space_used_on_data_folder' => 'Benutzter Plattenplatz',
 'splash_added_to_clipboard' => 'Der Zwischenablage hinzugefügt',
-'splash_add_access' => 'Zugriffsrecht hinzugefügt',
+'splash_add_access' => 'Neues Zugriffsrecht hinzugefügt',
 'splash_add_attribute' => 'Neues Attribut hinzugefügt',
 'splash_add_group' => 'Neue Gruppe hinzugefügt',
 'splash_add_group_member' => 'Neues Gruppenmitglied hinzugefügt',
+'splash_add_notify' => 'Neue Benachrichtigung hinzugefügt',
 'splash_add_role' => 'Neue Rolle hinzugefügt',
 'splash_add_task' => 'Neuer Task hinzugefügt',
 'splash_add_to_transmittal' => 'Zur Dokumentenliste hinzugefügt',
-'splash_add_transmittal' => 'Dokumentenliste angelegt',
+'splash_add_transmittal' => 'Neue Dokumentenliste angelegt',
 'splash_add_user' => 'Neuen Benutzer hinzugefügt',
 'splash_cancel_checkout' => 'Auschecken abgebrochen',
 'splash_cleared_cache' => 'Cache geleert',
@@ -1798,6 +1812,7 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'splash_rm_folder' => 'Ordner gelöscht',
 'splash_rm_group' => 'Gruppe gelöscht',
 'splash_rm_group_member' => 'Mitglied der Gruppe gelöscht',
+'splash_rm_notify' => 'Benachrichtigung gelöscht',
 'splash_rm_role' => 'Rolle gelöscht',
 'splash_rm_transmittal' => 'Dokumentenliste gelöscht',
 'splash_rm_user' => 'Benutzer gelöscht',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index be780a748..ca9b653ac 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -24,6 +24,8 @@
 $text = array(
 '2_factor_auth' => '',
 '2_factor_auth_info' => '',
+'2_fact_auth_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => '',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -713,6 +715,7 @@ $text = array(
 'lock_document' => 'Κλείδωμα',
 'lock_message' => 'Αυτό το έγγραφο είναι κλειδωμένο από [username]. Μόνο εξουσιοδοτημένοι χρήστες μπορούν να ξεκλειδώσουν αυτό το έγγραφο.',
 'lock_status' => 'Κατάσταση',
+'logfile' => '',
 'logfile_loading' => '',
 'login' => 'Είσοδος',
 'login_disabled_text' => '',
@@ -817,6 +820,7 @@ URL: [url]',
 'notify_deleted_email' => '',
 'notify_deleted_email_body' => '',
 'notify_deleted_email_subject' => '',
+'not_subscribed' => '',
 'november' => 'Νοέμβριος',
 'now' => 'τώρα',
 'no_action' => '',
@@ -952,6 +956,8 @@ URL: [url]',
 'remove_marked_files' => '',
 'repaired' => '',
 'repairing_objects' => '',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
@@ -1534,6 +1540,7 @@ URL: [url]',
 'splash_add_attribute' => '',
 'splash_add_group' => '',
 'splash_add_group_member' => '',
+'splash_add_notify' => '',
 'splash_add_role' => '',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => '',
@@ -1587,6 +1594,7 @@ URL: [url]',
 'splash_rm_folder' => '',
 'splash_rm_group' => '',
 'splash_rm_group_member' => '',
+'splash_rm_notify' => '',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index c98e46e1d..cf14e85a8 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,11 +19,13 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2010), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (2025), 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_current_secret' => 'Current secret',
+'2_fact_auth_new_secret' => 'New secret',
 '2_fact_auth_secret' => 'Secret',
 'abbr_day' => 'd',
 'abbr_hour' => 'h',
@@ -449,17 +451,19 @@ URL: [url]',
 'document_transfered_email_body' => 'Document transfer to other user
 Document: [name]
 New owner: [newuser]
+Old owner: [olduser]
 Parent folder: [folder_path]
 User: [username]
 URL: [url]',
 'document_transfered_email_subject' => '[sitename]: [name] - Transfer Document',
 'document_updated_email' => 'Document updated',
-'document_updated_email_body' => 'Document updated
-Document: [name]
-Parent folder: [folder_path]
-User: [username]
-Comment: [comment]
-Version comment: [version_comment]
+'document_updated_email_body' => 'Document updated
+Document: [name]
+Version: [version]
+Parent folder: [folder_path]
+User: [username]
+Comment: [comment]
+Version comment: [version_comment]
 URL: [url]',
 'document_updated_email_subject' => '[sitename]: [name] - Document updated',
 'does_not_expire' => 'Does not expire',
@@ -815,6 +819,7 @@ URL: [url]',
 'lock_document' => 'Lock',
 'lock_message' => 'This document is locked by [username]. Only authorized users can unlock this document.',
 'lock_status' => 'Status',
+'logfile' => 'Log file',
 'logfile_loading' => 'Pleae wait, until log file is loaded …',
 'login' => 'Login',
 'login_disabled_text' => 'Your account is disabled, probably because of too many failed logins.',
@@ -932,6 +937,7 @@ Parent folder: [folder_path]
 User: [username]
 URL: [url]',
 'notify_deleted_email_subject' => '[sitename]: [name] - Removed from notification list',
+'not_subscribed' => 'Not subscribed',
 'november' => 'November',
 'now' => 'now',
 'no_action' => 'No action required',
@@ -1101,6 +1107,13 @@ URL: [url]',
 'remove_marked_files' => 'Remove marked files',
 'repaired' => 'repaired',
 'repairing_objects' => 'Repairing documents and folders.',
+'replace_content_email_body' => 'The last version of the document has been replaced
+Document: [name]
+Version: [version]
+Parent folder: [folder_path]
+User: [username]
+URL: [url]',
+'replace_content_email_subject' => '[sitename]: [name] - Document content replaced',
 'request_workflow_action_email_body' => 'The workflow has reached a state which requires your action.
 Document: [name]
 Version: [version]
@@ -1735,15 +1748,16 @@ If you did not receive a password, please use the password forgotten function on
 'sort_by_sequence' => 'Sort by sequence',
 'space_used_on_data_folder' => 'Space used on data folder',
 'splash_added_to_clipboard' => 'Added to clipboard',
-'splash_add_access' => 'Access right added',
+'splash_add_access' => 'New Access right added',
 'splash_add_attribute' => 'New attribute added',
 'splash_add_group' => 'New group added',
 'splash_add_group_member' => 'New group member added',
+'splash_add_notify' => 'Added new notification',
 'splash_add_role' => 'Added new role',
 'splash_add_task' => 'Added new task',
-'splash_add_to_transmittal' => 'Add to transmittal',
-'splash_add_transmittal' => 'Added transmittal',
-'splash_add_user' => 'New user added',
+'splash_add_to_transmittal' => 'Added to transmittal',
+'splash_add_transmittal' => 'Added new transmittal',
+'splash_add_user' => 'Added new user',
 'splash_cancel_checkout' => 'Checkout canceled',
 'splash_cleared_cache' => 'Cache cleared',
 'splash_cleared_clipboard' => 'Clipboard cleared',
@@ -1792,6 +1806,7 @@ If you did not receive a password, please use the password forgotten function on
 'splash_rm_folder' => 'Folder deleted',
 'splash_rm_group' => 'Group removed',
 'splash_rm_group_member' => 'Member of group removed',
+'splash_rm_notify' => 'Notification deleted',
 'splash_rm_role' => 'Role deleted',
 'splash_rm_transmittal' => 'Transmittal deleted',
 'splash_rm_user' => 'User removed',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 70f5d8fa8..bb452f307 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -24,6 +24,8 @@
 $text = array(
 '2_factor_auth' => 'Autenticación de doble factor',
 '2_factor_auth_info' => '',
+'2_fact_auth_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => '',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -791,6 +793,7 @@ URL: [url]',
 'lock_document' => 'Bloquear',
 'lock_message' => 'Este documento ha sido bloqueado por [username]. Sólo usuarios autorizados pueden desbloquear este documento (vea el final de la página).',
 'lock_status' => 'Estado',
+'logfile' => '',
 'logfile_loading' => 'Por favor espera, hasta que el archivo se haya cargado',
 'login' => 'Iniciar sesión',
 'login_disabled_text' => 'Su cuenta está deshabilitada, probablemente es debido a demasiados intentos de acceso fallidos.',
@@ -908,6 +911,7 @@ Carpeta principal: [folder_path]
 Usuario: [username]
 URL: [url]',
 'notify_deleted_email_subject' => '[sitename]: [name] - Eliminado de la lista de notificación',
+'not_subscribed' => '',
 'november' => 'Noviembre',
 'now' => 'ahora',
 'no_action' => 'No es necesaria ninguna acción',
@@ -1066,6 +1070,8 @@ nURL: [url]',
 'remove_marked_files' => 'Eliminar ficheros marcados',
 'repaired' => 'Reparado',
 'repairing_objects' => 'Reparando documentos y carpetas.',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
@@ -1675,6 +1681,7 @@ URL: [url]',
 'splash_add_attribute' => 'Nuevo atributo agregado',
 'splash_add_group' => 'Nuevo grupo agregado',
 'splash_add_group_member' => 'Nuevo miembro del grupo agregado',
+'splash_add_notify' => '',
 'splash_add_role' => '',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => '',
@@ -1728,6 +1735,7 @@ URL: [url]',
 'splash_rm_folder' => 'Carpeta eliminada',
 'splash_rm_group' => 'Grupo eliminado',
 'splash_rm_group_member' => 'Miembro eliminado del grupo',
+'splash_rm_notify' => '',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Usuario eliminado',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 05afd2c90..27971c61d 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -24,6 +24,8 @@
 $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_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => 'Clé secrète',
 'abbr_day' => 'j',
 'abbr_hour' => 'h',
@@ -815,6 +817,7 @@ URL: [url]',
 'lock_document' => 'Verrouiller',
 'lock_message' => 'Ce document a été verrouillé par [username]. Seuls les utilisateurs autorisés peuvent déverrouiller ce document.',
 'lock_status' => 'Statut',
+'logfile' => '',
 'logfile_loading' => 'Veuillez patienter pendant le chargement du fichier journal…',
 'login' => 'Identification',
 'login_disabled_text' => 'Votre compte est désactivé, sans doute à cause de trop nombreuses connexions qui ont échoué.',
@@ -932,6 +935,7 @@ Dossier parent: [folder_path]
 Utilisateur: [username]
 URL: [url]',
 'notify_deleted_email_subject' => '[sitename] : [name] - Supprimé de la liste des notifications',
+'not_subscribed' => '',
 'november' => 'Novembre',
 'now' => 'Maintenant',
 'no_action' => 'Aucune action n\'est nécessaire',
@@ -1098,6 +1102,8 @@ URL: [url]',
 'remove_marked_files' => 'Supprimer les fichiers sélectionnés',
 'repaired' => 'réparé',
 'repairing_objects' => 'Réparation des documents et des dossiers.',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => 'Le workflow a atteint un état nécessitant une action de votre part.
 Document : [name]
 Version : [version]
@@ -1735,6 +1741,7 @@ Nom : [username]
 'splash_add_attribute' => 'Attribut ajouté',
 'splash_add_group' => 'Nouveau groupe ajouté',
 'splash_add_group_member' => 'Nouveau membre ajouté au groupe',
+'splash_add_notify' => '',
 'splash_add_role' => 'Nouveau rôle ajouté',
 'splash_add_task' => 'Nouvelle tâche ajoutée',
 'splash_add_to_transmittal' => 'Ajouté à la transmission',
@@ -1788,6 +1795,7 @@ Nom : [username]
 'splash_rm_folder' => 'Dossier supprimé',
 'splash_rm_group' => 'Groupe supprimé',
 'splash_rm_group_member' => 'Membre retiré du groupe',
+'splash_rm_notify' => '',
 'splash_rm_role' => 'Rôle supprimé',
 'splash_rm_transmittal' => 'Transmission supprimée',
 'splash_rm_user' => 'Utilisateur supprimé',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 9e5ec9c5e..c8df485a4 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -24,6 +24,8 @@
 $text = array(
 '2_factor_auth' => '',
 '2_factor_auth_info' => '',
+'2_fact_auth_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => '',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -796,6 +798,7 @@ Internet poveznica: [url]',
 'lock_document' => 'Zaključaj',
 'lock_message' => 'Ovaj dokument je zaključao [username]. Samo ovlašteni korisnici mogu otključati ovaj dokument.',
 'lock_status' => 'Status',
+'logfile' => '',
 'logfile_loading' => '',
 'login' => 'Prijava',
 'login_disabled_text' => 'Vaš korisnički račun je onemogućen, vjerojatno zbog previše neispravnih prijava.',
@@ -912,6 +915,7 @@ Glavna mapa: [folder_path]
 Korisnik: [username]
 Internet poveznica: [url]',
 'notify_deleted_email_subject' => '[sitename]: [name] - Ukonjeno iz popisa obavijesti',
+'not_subscribed' => '',
 'november' => 'Studeni',
 'now' => 'sada',
 'no_action' => 'Nema zahtjevane radnje',
@@ -1070,6 +1074,8 @@ Internet poveznica: [url]',
 'remove_marked_files' => 'Ukloni označene datoteke',
 'repaired' => 'popravljeno',
 'repairing_objects' => 'Popravljanje dokumenata ili mapa.',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => 'Poslovni tok je došao u stanje koje zahtijeva Vašu pažnju i aktivnost.
 Dokument: [name]
 Verzija: [version]
@@ -1696,6 +1702,7 @@ Internet poveznica: [url]',
 'splash_add_attribute' => 'Dodan novi atribut',
 'splash_add_group' => 'Dodana nova grupa',
 'splash_add_group_member' => 'Dodan novi član grupe',
+'splash_add_notify' => '',
 'splash_add_role' => '',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => '',
@@ -1749,6 +1756,7 @@ Internet poveznica: [url]',
 'splash_rm_folder' => 'Mapa izbrisana',
 'splash_rm_group' => 'Grupa uklonjena',
 'splash_rm_group_member' => 'Član grupe uklonjen',
+'splash_rm_notify' => '',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Korisnik uklonjen',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 8de858b69..27825c3b0 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -24,6 +24,8 @@
 $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_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => 'Titkos',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -791,6 +793,7 @@ URL: [url]',
 'lock_document' => 'Zárol',
 'lock_message' => 'Ezt a dokumentumot [username] zárolta. Csak az arra jogosult felhasználó törölheti a zárolást (Lásd: lap alja).',
 'lock_status' => 'Állapot',
+'logfile' => '',
 'logfile_loading' => '',
 'login' => 'Bejelentkezés',
 'login_disabled_text' => 'Fiókja letiltásra került, valószínűleg a túl sok érvénytelen bejelentkezési kísérlet miatt.',
@@ -908,6 +911,7 @@ Szülő mappa: [folder_path]
 Felhasználó: [username]
 URL: [url]',
 'notify_deleted_email_subject' => '[sitename]: [name] - Eltávolítva az értesítési listáról',
+'not_subscribed' => '',
 'november' => 'November',
 'now' => 'most',
 'no_action' => 'Nincs teendő',
@@ -1066,6 +1070,8 @@ URL: [url]',
 'remove_marked_files' => 'Megjelölt állományok eltávolítása',
 'repaired' => 'javított',
 'repairing_objects' => 'Dokumentumok és mappák helyreállítása',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
@@ -1674,6 +1680,7 @@ URL: [url]',
 'splash_add_attribute' => 'Új jellemző hozzáadva',
 'splash_add_group' => 'Új csoport hozzáadva',
 'splash_add_group_member' => 'Új csoporttag hozzáadva',
+'splash_add_notify' => '',
 'splash_add_role' => '',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => '',
@@ -1727,6 +1734,7 @@ URL: [url]',
 'splash_rm_folder' => 'Mappa törölve',
 'splash_rm_group' => 'Csoport eltávolítva',
 'splash_rm_group_member' => 'Csoporttag eltávolítva',
+'splash_rm_notify' => '',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Felhasználó eltávolítva',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 3888f65c9..b2b3da346 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -24,6 +24,8 @@
 $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_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => 'Segreto',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -801,6 +803,7 @@ URL: [url]',
 'lock_document' => 'Blocca',
 'lock_message' => 'Questo documento è bloccato da [username]. Solo gli utenti autorizzati possono sbloccare questo documento.',
 'lock_status' => 'Stato bloccaggio',
+'logfile' => '',
 'logfile_loading' => '',
 'login' => 'Accesso',
 'login_disabled_text' => 'Il tuo account è stato disabilitato: troppi login falliti.',
@@ -918,6 +921,7 @@ Cartella: [folder_path]
 Utente: [username]
 URL: [url]',
 'notify_deleted_email_subject' => '[sitename]: [name] - Rimosso dalla lista di notifica',
+'not_subscribed' => '',
 'november' => 'Novembre',
 'now' => 'Adesso',
 'no_action' => 'Non è richiesto alcun intervento',
@@ -1087,6 +1091,8 @@ URL: [url]',
 'remove_marked_files' => 'Rimuovi i files contrassegnati',
 'repaired' => 'riparato',
 'repairing_objects' => 'Riparazione documenti e cartelle in corso...',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => 'Il flusso di lavoro richiede che tu esegua un\'azione.
 Documento: [name]
 Versione: [version]
@@ -1723,6 +1729,7 @@ Name: [username]
 'splash_add_attribute' => 'Attributo aggiunto',
 'splash_add_group' => 'Gruppo aggiunto',
 'splash_add_group_member' => 'Membro aggiunto al gruppo',
+'splash_add_notify' => '',
 'splash_add_role' => 'Aggiunto nuovo ruolo',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => 'Aggiungere alla trasmissione',
@@ -1776,6 +1783,7 @@ Name: [username]
 'splash_rm_folder' => 'Cartella eliminata',
 'splash_rm_group' => 'Gruppo eliminato',
 'splash_rm_group_member' => 'Membro del gruppo eliminato',
+'splash_rm_notify' => '',
 'splash_rm_role' => 'Ruolo cancellato',
 'splash_rm_transmittal' => 'Trasmissione cancellato',
 'splash_rm_user' => 'Utente eliminato',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 86cc748eb..03feb00fe 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -24,6 +24,8 @@
 $text = array(
 '2_factor_auth' => '이중 인증',
 '2_factor_auth_info' => '',
+'2_fact_auth_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => '시크릿',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -797,6 +799,7 @@ URL: [url]',
 'lock_document' => '잠그기',
 'lock_message' => '이 문서는 [username].에 의해 잠겨 있습니다. 허가 된 사용자 만이 문서를 잠금을 해제 할 수 있습니다.',
 'lock_status' => '상태',
+'logfile' => '',
 'logfile_loading' => '',
 'login' => '로그인',
 'login_disabled_text' => '귀정 이상 로그인 실패로 당신의 계정을사용할 수 없습니다.',
@@ -914,6 +917,7 @@ URL: [url]',
 사용자: [username]
 URL : [url]',
 'notify_deleted_email_subject' => '[sitename]: [name] - 알림목록으로부터 제거됨',
+'not_subscribed' => '',
 'november' => '11월',
 'now' => '지금',
 'no_action' => '조치가 필요하지 않습니다',
@@ -1064,6 +1068,8 @@ URL: [url]',
 'remove_marked_files' => '마크 파일을 제거',
 'repaired' => '복구',
 'repairing_objects' => '문서 및 폴더 복구',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => '워크플로우는 당신의 작업을 필요로 하는 상태에 도달했습니다.
 문서: [name]
 버전: [version]
@@ -1690,6 +1696,7 @@ URL : [url]',
 'splash_add_attribute' => '새로운 속성 추가',
 'splash_add_group' => '새 그룹이 추가',
 'splash_add_group_member' => '새 그룹 구성원 추가',
+'splash_add_notify' => '',
 'splash_add_role' => '',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => '',
@@ -1743,6 +1750,7 @@ URL : [url]',
 'splash_rm_folder' => '폴더 삭제',
 'splash_rm_group' => '그룹 제거',
 'splash_rm_group_member' => '회원 그룹 제거',
+'splash_rm_notify' => '',
 'splash_rm_role' => '역할 지워짐',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '사용자 제거',
diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc
index fc7ef9439..969fe33f5 100644
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@@ -24,6 +24,8 @@
 $text = array(
 '2_factor_auth' => 'ການກວດສອບແບບ 2 ປັດໃຈ',
 '2_factor_auth_info' => 'ລະບົບນີ້ໄຊ້ການກວດສອບແບບ 02 ປັດໃຈ. ເຈົ້າຈະຕ້ອງມີ Google Authenticator  ໃນໂທລະສັບມືຖືຂອງທ່ານ. ດ້ານລຸ່ມແມ່ນມີ QR Codes ສອງແບບ ທາງດ້ານຂວາຈະມີຄວາມເປັນສ່ວນຕົວຂອງເຈົ້າ, ສ່ວນດ້ານຊ້າຍຂອງເຈົ້າແມ່ນຈະສາມາດຕັ້ງຄ່າຄວາມເປັນສ່ວນຕົວໄຫມ່. ຖ້າເຈົ້າຕັ້ງຄ່າຄວາມເປັນສ່ວນຕົວໄຫມ່ຮຽບຮ້ອຍ ແລ້ວນັ້ນໃຫ້ແນ່ໃຈວ່າໄດ້ສະແກນອີກຄັ້ງດ້ວຍ Google Authenticator',
+'2_fact_auth_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => 'ຄວາມລັບ',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -794,6 +796,7 @@ URL: [url]',
 'lock_document' => 'ລັອກ',
 'lock_message' => 'ເອກະສານນີ້ຖືກລັອກໂດຍ [username] ສະເພາະຜູ້ໄຊ້ທີ່ໄດ້ຮັບອະນຸຍາດເທົ່ານັ້ນທີ່ສາມາດປົດລັອກເອກະສານນີ້ໄດ້',
 'lock_status' => 'ສະຖານະ',
+'logfile' => '',
 'logfile_loading' => '',
 'login' => 'ເຂົ້າສຸ່ລະບົບ',
 'login_disabled_text' => 'ບັນຊີຂອງເຈົ້າໄດ້ຖືກປິດໄຊ້ງານອາດເປັນເພາະການລັອກອິນເຂົ້າລະບົບລົ້ມເຫຼວຫລາຍຄັ້ງເກີນໄປ',
@@ -911,6 +914,7 @@ URL: [url]',
 ຜູ້ໄຊ້: [username]
 URL: [url]',
 'notify_deleted_email_subject' => '[sitename]:[name] - ນຳອອກຈາກການແຈ້ງເຕືອນແລ້ວ',
+'not_subscribed' => '',
 'november' => 'ເດືອນພະຈິກ',
 'now' => 'ຕອນນີ້',
 'no_action' => 'ບໍ່ຕ້ອງດຳເນີນການໄດໆ',
@@ -1080,6 +1084,8 @@ URL: [url]',
 'remove_marked_files' => 'ລົບໄຟລທີມີເຄື່ອງໝາຍໄວ້',
 'repaired' => 'ການສ້ອມແປງ',
 'repairing_objects' => 'ການສ້ອມແປງເອກະສານແລະໂຟລເດີ',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => 'ຂັນຕອນການເຮັດວຽກເປັນສະຖານະຂອງການປະຕິບັດງານຂອງເຈົ້າແລ້ວ
 ເອກະສານ: [name]
 ເວີຊັນ: [version]
@@ -1716,6 +1722,7 @@ URL: [url]',
 'splash_add_attribute' => 'ເພີ່ມແອັດທີບິວໄຫມ່',
 'splash_add_group' => 'ເພີ່ມກຸ່ມໄຫມ່ແລ້ວ',
 'splash_add_group_member' => 'ເພີ່ມສະມາຊິກໄໝ່ແລ້ວ',
+'splash_add_notify' => '',
 'splash_add_role' => 'ເພີ່ມບົດບາດໄຫມ່',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => 'ເພີ່ມການສົ່ງຜ່ານ',
@@ -1769,6 +1776,7 @@ URL: [url]',
 'splash_rm_folder' => 'ລົບໂຟລເດີແລ້ວ',
 'splash_rm_group' => 'ລົບກຸ່ມແລ້ວ',
 'splash_rm_group_member' => 'ສະມະຊິກຂອງກຸ່ມໄດ້ຖືກລົບອອກຈາກກູຸ່ມ',
+'splash_rm_notify' => '',
 'splash_rm_role' => 'ລົບບົດບາດແລ້ວ',
 'splash_rm_transmittal' => 'ຍົກເລີກການລົບແລ້ວ',
 'splash_rm_user' => 'ລົບຜູ້ໄຊ້ແລ້ວ',
diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc
index 2b94135c1..366602d57 100644
--- a/languages/nb_NO/lang.inc
+++ b/languages/nb_NO/lang.inc
@@ -24,6 +24,8 @@
 $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_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => 'Hemmelig',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -815,6 +817,7 @@ URL: [url]',
 'lock_document' => 'Låst',
 'lock_message' => 'Detta dokumentet er låst av [username]. Bara autoriserte brukere kan låse opp dokumentet.',
 'lock_status' => 'Status',
+'logfile' => '',
 'logfile_loading' => 'Vent til loggfilen er lastet inn...',
 'login' => 'Innlogging',
 'login_disabled_text' => 'Kontoen din er deaktivert, sannsynligvis på grunn av for mange mislykkede pålogginger.',
@@ -932,6 +935,7 @@ Overordnt mappe: [folder_path]
 Bruker: [username]
 URL: [url]',
 'notify_deleted_email_subject' => '[sitename]: [name] - Fjernet fra varslingslisten',
+'not_subscribed' => '',
 'november' => 'November',
 'now' => 'nå',
 'no_action' => 'Ingen handling nødvendig',
@@ -1095,6 +1099,8 @@ URL: [url]',
 'remove_marked_files' => 'Fjern markerte filer',
 'repaired' => 'reparert',
 'repairing_objects' => 'Reparere dokumenter og mapper.',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => 'Arbeidsflyten har nådd en tilstand som krever handling.
 Dokument: [name]
 Versjon: [version]
@@ -1729,6 +1735,7 @@ Bruker: [username]
 'splash_add_attribute' => 'Ny egenskap lagt til',
 'splash_add_group' => 'Ny gruppe lagt til',
 'splash_add_group_member' => 'Nytt gruppemedlem lagt til',
+'splash_add_notify' => '',
 'splash_add_role' => 'Lagt til ny rolle',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => 'Legg til overføring',
@@ -1782,6 +1789,7 @@ Bruker: [username]
 'splash_rm_folder' => 'Mappen slettet',
 'splash_rm_group' => 'Gruppen fjernet',
 'splash_rm_group_member' => 'Gruppemedlem fjernet',
+'splash_rm_notify' => '',
 'splash_rm_role' => 'Rolle slettet',
 'splash_rm_transmittal' => 'Overføring slettet',
 'splash_rm_user' => 'Bruker fjernet',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index bb5d52dc9..af8ae22b0 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -24,6 +24,8 @@
 $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 uw 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_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => 'Toegangscode 2-factor-authenticatie',
 'abbr_day' => 'd',
 'abbr_hour' => 'u',
@@ -808,6 +810,7 @@ URL: [url]',
 'lock_document' => 'Blokkeer',
 'lock_message' => 'Dit document is geblokkeerd door [username]. Alleen geautoriseerde Gebruikers kunnen het de-blokeren.',
 'lock_status' => 'Status',
+'logfile' => '',
 'logfile_loading' => 'De logfile wordt geladen...',
 'login' => 'Login',
 'login_disabled_text' => 'Uw account is gedeactiveerd, mogelijk door te veel foutieve inlogpogingen.',
@@ -924,6 +927,7 @@ Bovenliggende map: [folder_path]
 Gebruiker: [username]
 URL: [url]',
 'notify_deleted_email_subject' => '[sitename]: [name] - Verwijderd van notificatielijst',
+'not_subscribed' => '',
 'november' => 'november',
 'now' => 'nu',
 'no_action' => 'Geen actie nodig',
@@ -1093,6 +1097,8 @@ URL: [url]',
 'remove_marked_files' => 'Geselecteerde bestanden worden verwijderd',
 'repaired' => 'Gerepareerd',
 'repairing_objects' => 'Documenten en mappen repareren.',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => 'De workflow vereist actie van uw kant.
 Document: [name]
 Versie: [version]
@@ -1728,6 +1734,7 @@ Name: [username]
 'splash_add_attribute' => 'Nieuw attribuut toegevoegd',
 'splash_add_group' => 'Nieuwe groep toegevoegd',
 'splash_add_group_member' => 'Nieuwe groepslid toegevoegd',
+'splash_add_notify' => '',
 'splash_add_role' => 'Nieuwe rol toegevoegd',
 'splash_add_task' => 'Taak toegevoegd',
 'splash_add_to_transmittal' => 'Toevoegen aan verzending',
@@ -1781,6 +1788,7 @@ Name: [username]
 'splash_rm_folder' => 'Map verwijderd',
 'splash_rm_group' => 'Groep verwijderd',
 'splash_rm_group_member' => 'Lid van de groep verwijderd',
+'splash_rm_notify' => '',
 'splash_rm_role' => 'Rol verwijderd',
 'splash_rm_transmittal' => 'Verzending verwijderd',
 'splash_rm_user' => 'Gebruiker verwijderd',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 5142826c0..0c010d889 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -24,6 +24,8 @@
 $text = array(
 '2_factor_auth' => 'Uwierzytelnianie dwuetapowe',
 '2_factor_auth_info' => 'Uwierzytelnianie dwuetapowe',
+'2_fact_auth_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => 'Uwierzytelnianie dwuetapowe poufny kod',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -784,6 +786,7 @@ URL: [url]',
 'lock_document' => 'Zablokuj',
 'lock_message' => 'Ten dokument jest zablokowany przez [username]. Tylko uprawnieni użytkownicy mogą odblokować dokument.',
 'lock_status' => 'Status',
+'logfile' => '',
 'logfile_loading' => 'Proszę czekać, aż plik dziennika zostanie załadowany…',
 'login' => 'Login',
 'login_disabled_text' => 'Twoje konto jest zablokowane. Prawdopodobnie z powodu zbyt wielu nieudanych prób logowania.',
@@ -901,6 +904,7 @@ Folder nadrzędny: [folder_path]
 Użytkownik: [username]
 URL: [url]',
 'notify_deleted_email_subject' => '[sitename]: [name] - Usunięto z listy powiadomień',
+'not_subscribed' => '',
 'november' => 'Listopad',
 'now' => 'teraz',
 'no_action' => 'Żadne działanie nie jest wymagane',
@@ -1059,6 +1063,8 @@ URL: [url]',
 'remove_marked_files' => 'Usuń zaznaczone pliki',
 'repaired' => 'naprawiony',
 'repairing_objects' => 'Naprawa dokumentów i katalogów.',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => 'Zakończ i sprawdź',
@@ -1659,6 +1665,7 @@ Name: [username]
 'splash_add_attribute' => 'Dodano nowy atrybut',
 'splash_add_group' => 'Dodano nową grupę',
 'splash_add_group_member' => 'Dodano nowego członka grupy',
+'splash_add_notify' => '',
 'splash_add_role' => 'Dodano nową rolę',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => 'Dodaj do przekazu',
@@ -1712,6 +1719,7 @@ Name: [username]
 'splash_rm_folder' => 'Folder usunięty',
 'splash_rm_group' => 'Grupę usunięto',
 'splash_rm_group_member' => 'Usunięto członka grupy',
+'splash_rm_notify' => '',
 'splash_rm_role' => 'Rola usunięta',
 'splash_rm_transmittal' => 'Przekazywanie usunięte',
 'splash_rm_user' => 'Użytkownika usunięto',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 83aa6355a..e72b32189 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -24,6 +24,8 @@
 $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_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => 'Segredo',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -815,6 +817,7 @@ URL: [url]',
 'lock_document' => 'Travar',
 'lock_message' => 'Este documento foi travado por [username]. Somente usuários autorizados podem remover a trava deste documento (veja no final da página).',
 'lock_status' => 'Estado',
+'logfile' => '',
 'logfile_loading' => 'Por favor, aguarde, até o arquivo de log ser carregado…',
 'login' => 'Login',
 'login_disabled_text' => 'Sua conta está desativada, provavelmente por causa de muitos logins falhos.',
@@ -931,6 +934,7 @@ Pasta mãe: [folder_path]
 Usuário: [username]
 URL: [url]',
 'notify_deleted_email_subject' => '[sitename]: [name] - Removido da lista de notificação',
+'not_subscribed' => '',
 'november' => 'Novembro',
 'now' => 'agora',
 'no_action' => 'Nenhuma ação é requerida',
@@ -1100,6 +1104,8 @@ URL: [url]',
 'remove_marked_files' => 'Remover arquivos marcados',
 'repaired' => 'reparado',
 'repairing_objects' => 'Reparando documentos e pastas',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => 'O fluxo de trabalho atingiu um estado que requer sua ação.
 Documento: [name]
 Versão: [version]
@@ -1735,6 +1741,7 @@ Nome: [username]
 'splash_add_attribute' => 'Novo atributo adicionado',
 'splash_add_group' => 'Novo grupo adicionado',
 'splash_add_group_member' => 'Novo membro do grupo adicionado',
+'splash_add_notify' => '',
 'splash_add_role' => 'Novo papel adicionado',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => 'Adicionar à transmissão',
@@ -1788,6 +1795,7 @@ Nome: [username]
 'splash_rm_folder' => 'Pasta excluida',
 'splash_rm_group' => 'Grupo removido',
 'splash_rm_group_member' => 'Membro do grupo removido',
+'splash_rm_notify' => '',
 'splash_rm_role' => 'Papel removido',
 'splash_rm_transmittal' => 'Transmissão excluída',
 'splash_rm_user' => 'Usuário removido',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index d04b70e25..f18d6d2a6 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -24,6 +24,8 @@
 $text = array(
 '2_factor_auth' => '',
 '2_factor_auth_info' => '',
+'2_fact_auth_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => '',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -796,6 +798,7 @@ URL: [url]',
 'lock_document' => 'Blocare',
 'lock_message' => 'Acest document este blocat de [username]. Numai utilizatorii autorizați pot debloca acest document.',
 'lock_status' => 'Status',
+'logfile' => '',
 'logfile_loading' => '',
 'login' => 'Login',
 'login_disabled_text' => 'Contul dumneavoastră este dezactivat, probabil din cauza prea multor login-uri eșuate.',
@@ -913,6 +916,7 @@ Folder parinte: [folder_path]
 Utilizator: [username]
 URL: [url]',
 'notify_deleted_email_subject' => '[sitename]: [name] - Scos din lista de notificări',
+'not_subscribed' => '',
 'november' => 'Noiembrie',
 'now' => 'nou',
 'no_action' => 'Nici o acțiune necesară',
@@ -1071,6 +1075,8 @@ URL: [url]',
 'remove_marked_files' => 'Eliminați fișierele marcate',
 'repaired' => 'reparat',
 'repairing_objects' => 'Reparare documente și foldere.',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => 'Workflow-ul a ajuns la o stare care necesita actiunea ta.
 Document: [name]
 Versiune: [version]
@@ -1697,6 +1703,7 @@ URL: [url]',
 'splash_add_attribute' => 'Atribut nou adăugat',
 'splash_add_group' => 'Grup nou adăugat',
 'splash_add_group_member' => 'Membru grup nou adăugat',
+'splash_add_notify' => '',
 'splash_add_role' => '',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => '',
@@ -1750,6 +1757,7 @@ URL: [url]',
 'splash_rm_folder' => 'Folder șters',
 'splash_rm_group' => 'Grup eliminat',
 'splash_rm_group_member' => 'Membru grup eliminat',
+'splash_rm_notify' => '',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Uilizator eliminat',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index b0ddbc4e7..62a70d943 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -24,6 +24,8 @@
 $text = array(
 '2_factor_auth' => 'Двухфакторная аутентификация',
 '2_factor_auth_info' => 'Использовать усиленную проверку подлинности',
+'2_fact_auth_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => 'Кдюч двухфакторной аутентификации',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -796,6 +798,7 @@ URL: [url]',
 'lock_document' => 'Заблокировать',
 'lock_message' => 'Документ заблокировал(а) [username]. Только имеющие права могут его разблокировать.',
 'lock_status' => 'Статус',
+'logfile' => '',
 'logfile_loading' => 'Подождите, идет загрузка лог-файла',
 'login' => 'Логин',
 'login_disabled_text' => 'Ваша учётная запись заблокирована, возможно, из-за нескольких неудачных попыток входа.',
@@ -912,6 +915,7 @@ URL: [url]',
 Пользователь: [username]
 URL: [url]',
 'notify_deleted_email_subject' => '[sitename]: вы удалены из списка уведомлений для «[name]»',
+'not_subscribed' => '',
 'november' => 'Ноябрь',
 'now' => 'сейчас',
 'no_action' => 'Действие не требуется',
@@ -1073,6 +1077,8 @@ URL: [url]',
 'remove_marked_files' => 'Удалить выбранные файлы',
 'repaired' => 'исправлено',
 'repairing_objects' => 'Восстановление каталогов и документов',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => 'Процесс достиг состояния требующего вашего внимания.
 Документ: [name]
 Версия: [version]
@@ -1704,6 +1710,7 @@ URL: [url]',
 'splash_add_attribute' => 'Добавлен новый атрибут',
 'splash_add_group' => 'Добавлена новая группа',
 'splash_add_group_member' => 'Добавлен новый член группы',
+'splash_add_notify' => '',
 'splash_add_role' => '',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => '',
@@ -1757,6 +1764,7 @@ URL: [url]',
 'splash_rm_folder' => 'Папка удалена',
 'splash_rm_group' => 'Группа удалена',
 'splash_rm_group_member' => 'Удалён член группы',
+'splash_rm_notify' => '',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Пользователь удалён',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 53426622a..a62164ed1 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -24,6 +24,8 @@
 $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_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => 'Tajný',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -815,6 +817,7 @@ URL: [url]',
 'lock_document' => 'Zamknúť',
 'lock_message' => 'Tento dokument zamkol [username]. Iba oprávnení používatelia ho môžu odomknúť.',
 'lock_status' => 'Stav',
+'logfile' => '',
 'logfile_loading' => '',
 'login' => 'Prihlásiť sa',
 'login_disabled_text' => 'Váš účet bol zablokovaný, pravdepodobne veľa pokusov o prihlásenie zlyhalo.',
@@ -932,6 +935,7 @@ Nadradená zložka: [folder_path]
 Používateľ: [username]
 URL: [url]',
 'notify_deleted_email_subject' => '[sitename]: [name] - Odstránené z notifikačného zoznamu',
+'not_subscribed' => '',
 'november' => 'November',
 'now' => 'teraz',
 'no_action' => 'Nič sa nevykoná',
@@ -1101,6 +1105,8 @@ URL: [url]',
 'remove_marked_files' => 'Odstrániť označené súbory',
 'repaired' => 'opravené',
 'repairing_objects' => 'Oprava dokumentov a zložiek.',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => 'The workflow has reached a state which requires your action.
 Document: [name]
 Version: [version]
@@ -1737,6 +1743,7 @@ Meno: [username]
 'splash_add_attribute' => 'Bol pridaný nový atribút',
 'splash_add_group' => 'Bola pridaná nová skupina',
 'splash_add_group_member' => 'New group member added',
+'splash_add_notify' => '',
 'splash_add_role' => 'Nová rola bola pridaná',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => 'Add to transmittal',
@@ -1790,6 +1797,7 @@ Meno: [username]
 'splash_rm_folder' => 'Zložka zmazaná',
 'splash_rm_group' => 'Skupina bola odstránená',
 'splash_rm_group_member' => 'Člen skupiny odstránený',
+'splash_rm_notify' => '',
 'splash_rm_role' => 'Rola bola odstránená',
 'splash_rm_transmittal' => 'Transmittal deleted',
 'splash_rm_user' => 'Používateľ bol odstránený',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 2230960d3..872bdf5e6 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -25,6 +25,8 @@ $text = array(
 '2_factor_auth' => '2-faktors autentisering',
 '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_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => 'Hemlighet',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -802,6 +804,7 @@ URL: [url]',
 'lock_document' => 'Lås',
 'lock_message' => 'Detta dokument har låsts av [username]. Bara auktoriserade användare kan låsa upp dokumentet.',
 'lock_status' => 'Status',
+'logfile' => '',
 'logfile_loading' => '',
 'login' => 'Inloggning',
 'login_disabled_text' => 'Ditt konto är inaktivt, förmodligen för att du har överskridit antalet tillåtna inloggningsförsök.',
@@ -919,6 +922,7 @@ Namn: [name]
 Användare: [username]
 URL: [url]',
 'notify_deleted_email_subject' => '[sitename]: [name] - Borttagen från meddelandelistan',
+'not_subscribed' => '',
 'november' => 'November',
 'now' => 'nu',
 'no_action' => 'Ingen åtgärd behövs.',
@@ -1074,6 +1078,8 @@ URL: [url]',
 'remove_marked_files' => 'Ta bort markerade filer',
 'repaired' => 'reparerat',
 'repairing_objects' => 'Reparerar dokument och kataloger.',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => 'Arbetsflödet har nått en status som kräver åtgärd av dig.
 Dokument: [name]
 Version: [version]
@@ -1710,6 +1716,7 @@ Kommentar: [comment]',
 'splash_add_attribute' => 'Nytt attribut tillagt',
 'splash_add_group' => 'Ny grupp tillagd',
 'splash_add_group_member' => 'Ny gruppmedlem tillagt',
+'splash_add_notify' => '',
 'splash_add_role' => 'Lägg till ny roll',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => 'Lägg till meddelande',
@@ -1763,6 +1770,7 @@ Kommentar: [comment]',
 'splash_rm_folder' => 'Katalog raderad',
 'splash_rm_group' => 'Grupp har tagits bort',
 'splash_rm_group_member' => 'Gruppmedlem har tagits bort',
+'splash_rm_notify' => '',
 'splash_rm_role' => 'Rollen raderad',
 'splash_rm_transmittal' => 'Meddelande raderat',
 'splash_rm_user' => 'Användare har tagits bort',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index f40a4e19f..df6349532 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -24,6 +24,8 @@
 $text = array(
 '2_factor_auth' => 'İki faktörlü yetkilendirme',
 '2_factor_auth_info' => '',
+'2_fact_auth_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => '',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -790,6 +792,7 @@ URL: [url]',
 'lock_document' => 'Kilitle',
 'lock_message' => 'Bu doküman [username] tarafından kilitlenmiştir. Sadece yetkilendirilmiş kişiler bu dokümanı açabilirler.',
 'lock_status' => 'Durum',
+'logfile' => '',
 'logfile_loading' => '',
 'login' => 'Giriş',
 'login_disabled_text' => 'Hesabınız devre dışı. Muhtemelen çok fazla hatalı giriş denemesi yapıldı.',
@@ -907,6 +910,7 @@ URL: [url]',
 Kullanıcı: [username]
 URL: [url]',
 'notify_deleted_email_subject' => '[sitename]: [name] - Bildirim listesinden çıkarıldınız',
+'not_subscribed' => '',
 'november' => 'Kasım',
 'now' => 'şimdi',
 'no_action' => 'İşlem gerekmiyor',
@@ -1067,6 +1071,8 @@ URL: [url]',
 'remove_marked_files' => 'İşaretli dosyaları sil',
 'repaired' => 'onarıldı',
 'repairing_objects' => 'Doküman ve klasörler onarılıyor.',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
@@ -1676,6 +1682,7 @@ URL: [url]',
 'splash_add_attribute' => 'Yeni nitelik eklendi',
 'splash_add_group' => 'Yeni grup eklendi',
 'splash_add_group_member' => 'Yeni grup üyesi eklendi',
+'splash_add_notify' => '',
 'splash_add_role' => '',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => '',
@@ -1729,6 +1736,7 @@ URL: [url]',
 'splash_rm_folder' => 'Klasör silindi',
 'splash_rm_group' => 'Grup silindi',
 'splash_rm_group_member' => 'Grup üyesi silindi',
+'splash_rm_notify' => '',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Kullanıcı silindi',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 571525da2..431fc3288 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -24,6 +24,8 @@
 $text = array(
 '2_factor_auth' => '',
 '2_factor_auth_info' => '',
+'2_fact_auth_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => '',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -796,6 +798,7 @@ URL: [url]',
 'lock_document' => 'Заблокувати',
 'lock_message' => 'Документ заблокував користувач [username]. Тільки користувачі, які мають відповідні права, можуть його розблокувати.',
 'lock_status' => 'Статус',
+'logfile' => '',
 'logfile_loading' => '',
 'login' => 'Логін',
 'login_disabled_text' => 'Ваш обліковий запис заблоковано, можливо, через кілька невдалих спроб входу.',
@@ -912,6 +915,7 @@ URL: [url]',
 Користувач: [username]
 URL: [url]',
 'notify_deleted_email_subject' => '[sitename]: вас видалено зі списку сповіщення для «[name]»',
+'not_subscribed' => '',
 'november' => 'Листопад',
 'now' => 'зараз',
 'no_action' => 'Дій не потрібно',
@@ -1073,6 +1077,8 @@ URL: [url]',
 'remove_marked_files' => 'Видалити обрані файли',
 'repaired' => 'виправлено',
 'repairing_objects' => 'Відновлення каталогів і документів',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => 'Запит дії по процесу',
 'request_workflow_action_email_subject' => '[sitename]: [name] - Запит дії для процесу',
 'reset_checkout' => 'Зняти стан опрацювання',
@@ -1697,6 +1703,7 @@ URL: [url]',
 'splash_add_attribute' => 'Додано новий атрибут',
 'splash_add_group' => 'Додана нова група',
 'splash_add_group_member' => 'Додано нового члена групи',
+'splash_add_notify' => '',
 'splash_add_role' => '',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => '',
@@ -1750,6 +1757,7 @@ URL: [url]',
 'splash_rm_folder' => 'Папку видалено',
 'splash_rm_group' => 'Групу видалено',
 'splash_rm_group_member' => 'Члена групи видалено',
+'splash_rm_notify' => '',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Користувача видалено',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 91ca89d14..95515d8b9 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -24,6 +24,8 @@
 $text = array(
 '2_factor_auth' => '双重认证',
 '2_factor_auth_info' => '该系统启用双重认证。您需要在手机上进行 Google 认证。下面你会看到两个 QR 码。正确的是你目前的密码。在左边你可以设置一个新的密码。如果您设置了新的密码，请重新扫描并通过 Google 认证。',
+'2_fact_auth_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => '双重认证密码',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -786,6 +788,7 @@ URL: [url]',
 'lock_document' => '锁定',
 'lock_message' => '此文档已被 [username] 锁定. 只有授权用户才能解锁.',
 'lock_status' => '锁定状态',
+'logfile' => '',
 'logfile_loading' => '',
 'login' => '登录',
 'login_disabled_text' => '',
@@ -903,6 +906,7 @@ URL: [url]',
 用户: [username]
 URL: [url]',
 'notify_deleted_email_subject' => '[sitename]: [name] - 从通知列表中移除',
+'not_subscribed' => '',
 'november' => '十一月',
 'now' => '现在',
 'no_action' => '无动作请求',
@@ -1066,6 +1070,8 @@ URL: [url]',
 'remove_marked_files' => '删除选中的文件',
 'repaired' => '已修复',
 'repairing_objects' => '',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '完成签出',
@@ -1672,6 +1678,7 @@ URL: [url]',
 'splash_add_attribute' => '属性已添加',
 'splash_add_group' => '组已添加',
 'splash_add_group_member' => '组成员已添加',
+'splash_add_notify' => '',
 'splash_add_role' => '添加新角色',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => '',
@@ -1725,6 +1732,7 @@ URL: [url]',
 'splash_rm_folder' => '已删除的文件夹',
 'splash_rm_group' => '组信息已删除',
 'splash_rm_group_member' => '组成员已移除',
+'splash_rm_notify' => '',
 'splash_rm_role' => '角色已删除',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '用户信息已删除',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index f4fa72eec..a42bf04ad 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -24,6 +24,8 @@
 $text = array(
 '2_factor_auth' => '2階段認證',
 '2_factor_auth_info' => '此系統強制執行2階段身份驗證。您將需要在手機上使用Google Authenticator。在下面，您可以看到兩個QR碼。正確的是您當前的秘密。在左側，您可以設置一個新的秘密。如果您設置了新的機密，請確保使用Google Authenticator重新掃描它。',
+'2_fact_auth_current_secret' => '',
+'2_fact_auth_new_secret' => '',
 '2_fact_auth_secret' => '秘密',
 'abbr_day' => '',
 'abbr_hour' => '',
@@ -815,6 +817,7 @@ URL: [url]',
 'lock_document' => '鎖定',
 'lock_message' => '此文件已被 [username] 鎖定. 只有授權使用者才能解鎖.',
 'lock_status' => '鎖定狀態',
+'logfile' => '',
 'logfile_loading' => '請稍等，直到加載日誌文件……',
 'login' => '登入',
 'login_disabled_text' => '您的帳戶被禁用，可能是由於登錄失敗太多。',
@@ -932,6 +935,7 @@ URL: [url]',
 使用者：[username]
 網址：[url]',
 'notify_deleted_email_subject' => '[sitename]: [name] - 從通知列表中刪除',
+'not_subscribed' => '',
 'november' => '十一月',
 'now' => '現在',
 'no_action' => '無動作請求',
@@ -1099,6 +1103,8 @@ URL: [url]',
 'remove_marked_files' => '刪除勾選的檔案',
 'repaired' => '修復',
 'repairing_objects' => '修復文檔和文件夾。',
+'replace_content_email_body' => '',
+'replace_content_email_subject' => '',
 'request_workflow_action_email_body' => '工作流程已達到需要您採取措施的狀態。
 文件：[name]
 版本：[version]
@@ -1735,6 +1741,7 @@ URL: [url]',
 'splash_add_attribute' => '新增屬性',
 'splash_add_group' => '新增群組',
 'splash_add_group_member' => '新群組會員新增',
+'splash_add_notify' => '',
 'splash_add_role' => '新增一個角色',
 'splash_add_task' => '',
 'splash_add_to_transmittal' => '新增到傳送',
@@ -1788,6 +1795,7 @@ URL: [url]',
 'splash_rm_folder' => '已刪除的資料夾',
 'splash_rm_group' => '組已刪除',
 'splash_rm_group_member' => '組成員已刪除',
+'splash_rm_notify' => '',
 'splash_rm_role' => '角色已刪除',
 'splash_rm_transmittal' => '傳送已刪除',
 'splash_rm_user' => '用戶已刪除',

From 1132bd134ed4a86d2d15826b223e658eae0546b3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 25 May 2021 09:02:59 +0200
Subject: [PATCH 047/143] fix strict php warning

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

diff --git a/views/bootstrap/class.TriggerWorkflow.php b/views/bootstrap/class.TriggerWorkflow.php
index 6753082bb..f8fc63ff8 100644
--- a/views/bootstrap/class.TriggerWorkflow.php
+++ b/views/bootstrap/class.TriggerWorkflow.php
@@ -79,7 +79,8 @@ $(document).ready(function() {
 
 		$action = $transition->getAction();
 		$currentstate = $latestContent->getWorkflowState();
-		$wkflog = array_shift($latestContent->getWorkflowLog());
+		$wkflogs = $latestContent->getWorkflowLog();
+		$wkflog = array_shift($wkflogs);
 		$workflow = $latestContent->getWorkflow();
 
 		$msg = "The document is currently in state: ".$currentstate->getName()."<br />";

From 9691a106e298cb4fa71e450839e1db6b5d168150 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 25 May 2021 09:03:32 +0200
Subject: [PATCH 048/143] fix typo

---
 doc/README.Install.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/README.Install.md b/doc/README.Install.md
index 083b02117..42541f21e 100644
--- a/doc/README.Install.md
+++ b/doc/README.Install.md
@@ -69,7 +69,7 @@ set an alias like described above).
 
 It will first ask to unlock the installer by creating a file
 `ENABLE_INSTALL_TOOL` in the diretory `seeddms51x/conf/`. Change all paths by
-replacing `/home/wwww-data` with your base directory where you put seeddms51x.
+replacing `/home/www-data` with your base directory where you put seeddms51x.
 Set httpRoot to '/' (if  the document root points to`seeddms51x/www`) or
 '/seeddms51x' (if you have set an alias like described above).
 

From bbb9d5c0d6bb4a605c0f65d64fc298fedac560a6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 25 May 2021 15:15:27 +0200
Subject: [PATCH 049/143] set class="btn" in link to open modal box, otherwise
 the button disappears

---
 views/bootstrap/class.Bootstrap.php   | 2 ++
 views/bootstrap4/class.Bootstrap4.php | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index b93a16179..5c6cc6875 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1280,6 +1280,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$attrs[] = array('role', 'button');
 		if(isset($config['class']))
 			$attrs[] = array('class', $config['class']);
+		else
+			$attrs[] = array('class', 'btn');
 		return $attrs;
 	} /* }}} */
 
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index b2b6bb29e..2c286409c 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1274,6 +1274,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$attrs[] = array('role', 'button');
 		if(isset($config['class']))
 			$attrs[] = array('class', $config['class']);
+		else
+			$attrs[] = array('class', 'btn');
 		return $attrs;
 	} /* }}} */
 

From 7406ad6297ecdb184efd74cf17bd4971f45a5a72 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 May 2021 12:56:31 +0200
Subject: [PATCH 050/143] check if guest user actually exists

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

diff --git a/controllers/class.Login.php b/controllers/class.Login.php
index 380253277..3d6f5634a 100644
--- a/controllers/class.Login.php
+++ b/controllers/class.Login.php
@@ -58,17 +58,15 @@ class SeedDMS_Controller_Login extends SeedDMS_Controller_Common {
 		 */
 		if(!$user && $settings->_enableGuestLogin && (int) $settings->_guestID) {
 			$guestUser = $dms->getUser((int) $settings->_guestID);
-			if(!$guestUser) {
-				$this->setErrorMsg("login_error_text");
-				return false;
-			}
-			if(($login != $guestUser->getLogin())) {
-				if ((!isset($pwd) || strlen($pwd)==0)) {
-					$this->setErrorMsg("login_error_text");
-					return false;
+			if($guestUser) {
+				if(($login != $guestUser->getLogin())) {
+					if ((!isset($pwd) || strlen($pwd)==0)) {
+						$this->setErrorMsg("login_error_text");
+						return false;
+					}
+				} else {
+					$user = $guestUser;
 				}
-			} else {
-				$user = $guestUser;
 			}
 		}
 

From 917b583d2abe683c79f3039f8ec0f8174e6328ac Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 May 2021 12:57:02 +0200
Subject: [PATCH 051/143] do not drop primary key of tblDocumentContent (it
 doesn't exist)

---
 install/update-3.4.0/update.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/update-3.4.0/update.sql b/install/update-3.4.0/update.sql
index 47ded5264..490c2131e 100644
--- a/install/update-3.4.0/update.sql
+++ b/install/update-3.4.0/update.sql
@@ -101,7 +101,7 @@ ALTER TABLE tblDocuments ADD CONSTRAINT `tblDocuments_folder` FOREIGN KEY (`fold
 
 CALL DROPFK('tblDocumentContent', 'tblDocumentContent_document');
 
-ALTER TABLE tblDocumentContent DROP PRIMARY KEY;
+-- ALTER TABLE tblDocumentContent DROP PRIMARY KEY;
 
 ALTER TABLE tblDocumentContent ADD CONSTRAINT `tblDocumentContent_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`);
 

From 43938a1c1937f57b5381cdc6fbfae360bce71a6f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 May 2021 12:57:44 +0200
Subject: [PATCH 052/143] set SQL_MODE to allow invalid date values

---
 install/update-4.0.0/update.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/install/update-4.0.0/update.sql b/install/update-4.0.0/update.sql
index bb9c5229b..8dd6607ee 100644
--- a/install/update-4.0.0/update.sql
+++ b/install/update-4.0.0/update.sql
@@ -1,3 +1,5 @@
+SET SQL_MODE='ALLOW_INVALID_DATES';
+
 START TRANSACTION;
 
 ALTER TABLE tblDocumentLinks ADD CONSTRAINT `tblDocumentLinks_target` FOREIGN KEY (`target`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE;

From a4d78cc0f6776995681c249cbc251e801c668412 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 May 2021 12:58:14 +0200
Subject: [PATCH 053/143] set all themes to bootstrap

---
 install/update-5.1.0/update.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/install/update-5.1.0/update.sql b/install/update-5.1.0/update.sql
index cb69d9f52..20345acc1 100644
--- a/install/update-5.1.0/update.sql
+++ b/install/update-5.1.0/update.sql
@@ -28,6 +28,8 @@ ALTER TABLE `tblWorkflowDocumentContent` CHANGE `date` `date` datetime NOT NULL;
 
 ALTER TABLE `tblVersion` CHANGE `date` `date` datetime NOT NULL;
 
+UPDATE `tblUsers` SET `theme`='bootstrap' WHERE `theme` != '';
+
 UPDATE tblVersion set major=5, minor=1, subminor=0;
 
 COMMIT;

From 730bcedc303e8bc3bd03c9f78ec4ca84e841dbde Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 May 2021 12:58:37 +0200
Subject: [PATCH 054/143] put header above error messages

---
 install/update.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/update.php b/install/update.php
index 4ddbc996c..d25a48b71 100644
--- a/install/update.php
+++ b/install/update.php
@@ -111,6 +111,7 @@ if(!empty($recs)) {
 			include('update-'.$_GET['version'].'/update.php');
 		}
 	} else {
+		echo "<h3>Error Messages</h3>";
 		echo $errorMsg;
 	}
 	echo "<p><a href=\"install.php\">Go back to installation and recheck.</a></p>";

From 8b69d859a438ce884fddc4178e24a0d515e38336 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 May 2021 19:51:50 +0200
Subject: [PATCH 055/143] check if comment is set

---
 op/op.EditComment.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/op/op.EditComment.php b/op/op.EditComment.php
index 381e1d97d..af2860f66 100644
--- a/op/op.EditComment.php
+++ b/op/op.EditComment.php
@@ -64,6 +64,9 @@ if (!is_object($version)) {
 }
 
 $comment =  $_POST["comment"];
+if ($settings->_strictFormCheck && !$comment) {
+	UI::exitError(getMLText("admin_tools"),getMLText("version_comment_missing"));
+}
 
 if (($oldcomment = $version->getComment()) != $comment) {
 	if($version->setComment($comment)) {

From 9575090fdd7b121709f524b07e85a3e7681c5c63 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 May 2021 19:52:13 +0200
Subject: [PATCH 056/143] check if name and comment is set

---
 op/op.GroupMgr.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/op/op.GroupMgr.php b/op/op.GroupMgr.php
index fa7f34deb..c427c6b70 100644
--- a/op/op.GroupMgr.php
+++ b/op/op.GroupMgr.php
@@ -44,7 +44,13 @@ if ($action == "addgroup") {
 	}
 
 	$name = $_POST["name"];
+	if(!$name) {
+		UI::exitError(getMLText("admin_tools"),getMLText("group_name_missing"));
+	}
 	$comment = $_POST["comment"];
+	if ($settings->_strictFormCheck && !$comment) {
+		UI::exitError(getMLText("admin_tools"),getMLText("group_comment_missing"));
+	}
 
 	if (is_object($dms->getGroupByName($name))) {
 		UI::exitError(getMLText("admin_tools"),getMLText("group_exists"));

From 386a18be09aa4f57c696dadf4613b77711843452 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 May 2021 21:52:01 +0200
Subject: [PATCH 057/143] check for name, email and comment, remove duplicate
 quota code

---
 op/op.UsrMgr.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php
index f0f919cd9..0982d019d 100644
--- a/op/op.UsrMgr.php
+++ b/op/op.UsrMgr.php
@@ -51,13 +51,18 @@ if ($action == "adduser") {
 		$pwdexpiration = '';
 	else
 		$pwdexpiration = $_POST["pwdexpiration"];
-	if(!isset($_POST["quota"]))
-		$quota = 0;
-	else
-		$quota = (int) $_POST["quota"];
 	$name    = $_POST["name"];
+	if(!$name) {
+		UI::exitError(getMLText("admin_tools"),getMLText("user_name_missing"));
+	}
 	$email   = $_POST["email"];
+	if(!$email) {
+		UI::exitError(getMLText("admin_tools"),getMLText("user_email_missing"));
+	}
 	$comment = $_POST["comment"];
+	if ($settings->_strictFormCheck && !$comment) {
+		UI::exitError(getMLText("admin_tools"),getMLText("user_comment_missing"));
+	}
 	$role    = preg_replace('/[^0-2]+/', '', $_POST["role"]);
 	$isHidden = (isset($_POST["ishidden"]) && $_POST["ishidden"]==1 ? 1 : 0);
 	$isDisabled = (isset($_POST["isdisabled"]) && $_POST["isdisabled"]==1 ? 1 : 0);

From 2ec025451bb1a07637222fbbd73bf2c2122fabbd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 May 2021 21:52:40 +0200
Subject: [PATCH 058/143] pass $dms and guestId to view

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

diff --git a/out/out.Login.php b/out/out.Login.php
index 77f4318ee..0683b57d6 100644
--- a/out/out.Login.php
+++ b/out/out.Login.php
@@ -47,9 +47,10 @@ if (isset($_GET["msg"]) && strlen($_GET["msg"])>0) {
 $themes = UI::getStyles();
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array());
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms));
 if($view) {
 	$view->setParam('enableguestlogin', $settings->_enableGuestLogin);
+	$view->setParam('guestid', $settings->_guestID);
 	$view->setParam('enablepasswordforgotten', $settings->_enablePasswordForgotten);
 	$view->setParam('referrer', $refer);
 	$view->setParam('themes', $themes);

From ea45ed5b7b0ce17b02e20818be9cd3ee78153a3f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 May 2021 21:53:49 +0200
Subject: [PATCH 059/143] issue warning if document has expired, validate form
 to add link

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

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 7adbd297a..a40fc1df1 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -179,17 +179,31 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 		$document = $this->params['document'];
 
 		header('Content-Type: application/javascript; charset=UTF-8');
-		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
+		parent::jsTranslations(array('js_form_error', 'js_form_errors', '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'));
 		if($user->isAdmin()) {
 			$latestContent = $this->callHook('documentLatestContent', $document);
 			if($latestContent === null)
 				$latestContent = $document->getLatestContent();
 			$this->printTimelineJs('out.ViewDocument.php?action=timelinedata&documentid='.$latestContent->getDocument()->getID(), 300, '', date('Y-m-d'));
 		}
-//		$this->printDocumentChooserJs("form1");
 		$this->printDeleteDocumentButtonJs();
 		/* Add js for catching click on document in one page mode */
 		$this->printClickDocumentJs();
+?>
+$(document).ready( function() {
+	$("#form1").validate({
+		ignore: [],
+		rules: {
+			docid: {
+				required: true
+			},
+		},
+		messages: {
+			docid: "<?php printMLText("js_no_document");?>",
+		},
+	});
+});
+<?php
 	} /* }}} */
 
 	function documentInfos() { /* {{{ */
@@ -646,6 +660,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 		$this->htmlAddHeader('<link href="../styles/bootstrap/timeline/timeline.css" rel="stylesheet">'."\n", 'css');
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/bootstrap/timeline/timeline-min.js"></script>'."\n", 'js');
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/bootstrap/timeline/timeline-locales.js"></script>'."\n", 'js');
+		$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.'/styles/validation-default.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
@@ -820,6 +836,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 ?>
 		  <div class="tab-pane <?php if($currenttab == 'revapp') echo 'active'; ?>" id="revapp" role="tabpanel">
 <?php
+				if($document->hasExpired())
+					$this->warningMsg(getMLText('cannot_revapp_expired_docs'));
 		$this->rowStart();
 		/* Just check fo an exting reviewStatus, even workflow mode is set
 		 * to traditional_only_approval. There may be old documents which
@@ -1413,7 +1431,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 		if (!$user->isGuest()){
 ?>
 			<br>
-			<form action="../op/op.AddDocumentLink.php" name="form1" class="form-horizontal">
+			<form action="../op/op.AddDocumentLink.php" id="form1" name="form1" class="form-horizontal">
 			<input type="hidden" name="documentid" value="<?php print $documentid;?>">
 			<?php echo createHiddenFieldWithKey('adddocumentlink'); ?>
 			<?php $this->contentContainerStart(); ?>

From cf411df04fb1dec1cb66b91b2dfb422d9eb3e2c7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 May 2021 21:55:34 +0200
Subject: [PATCH 060/143] add data-target-highlight for jquery validation

---
 views/bootstrap/class.Bootstrap.php   |  8 ++++----
 views/bootstrap4/class.Bootstrap4.php | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 5c6cc6875..43e7d2548 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1378,9 +1378,9 @@ $(document).ready(function() {
 	<div id="'.$id.'-upload-files">
 		<div id="'.$id.'-upload-file" class="upload-file">
 			<div class="input-append">
-				<input type="text" class="form-control" readonly>
+				<input type="text" class="form-control" id="kkll'.$id.'" readonly>
 				<span class="btn btn-secondary btn-file">
-					'.getMLText("browse").'&hellip; <input id="'.$id.'" type="file" name="'.$varname.'"'.($multiple ? " multiple" : "").($accept ? ' accept="'.$accept.'"' : "").'>
+					'.getMLText("browse").'&hellip; <input id="'.$id.'" type="file" name="'.$varname.'"'.($multiple ? " multiple" : "").($accept ? ' accept="'.$accept.'"' : "").' data-target-highlight="kkll'.$id.'">
 				</span>
 			</div>
 		</div>
@@ -1485,7 +1485,7 @@ $(document).ready(function() {
 		$formid = md5($formname.$form);
 
 		$content = '';
-		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
+		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" data-target-highlight=\"choosedocsearch".$formid."\" 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\"".($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>";
@@ -1549,7 +1549,7 @@ function folderSelected<?php echo $formid ?>(id, name) {
 			$formname = "targetid";
 		$formid = md5($formname.$form);
 		$content = '';
-		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
+		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\" data-target-highlight=\"choosefoldersearch".$formid."\">";
 		$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."\"".($default ? ' title="'.htmlspecialchars($default->getFolderPathPlain()).'"' : '')."/>";
 		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfolder".$formid."\" data-target=\"".$formid."\"><i class=\"fa fa-remove\"></i></button>";
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 2c286409c..1b3e2f021 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1050,7 +1050,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	function formField($title, $value, $params=array()) { /* {{{ */
 		if($title !== null) {
 			echo "<div class=\"form-group row\">";
-			echo "	<label class=\"col-sm-4 col-lg-4 pt-0 col-form-label\"".(!empty($params['help']) ? " title=\"".$params['help']."\" style=\"cursor: help;\"" : "").">".$title.":</label>";
+			echo "	<label class=\"col-sm-4 col-lg-4 pt-0 col-form-label\"".(!empty($params['help']) ? " title=\"".$params['help']."\" style=\"cursor: help;\"" : "").(!empty($value['id']) ? ' for="'.$value['id'].'"' : '').">".$title.":</label>";
 			echo "	<div class=\"col-sm-8 col-lg-8\">";
 		}
 		if(isset($params['field_wrap'][0]))
@@ -1377,10 +1377,10 @@ $(document).ready(function() {
 	<div id="'.$id.'-upload-files">
 		<div id="'.$id.'-upload-file" class="upload-file">
 			<div class="input-group">
-				<input type="text" class="form-control" readonly>
+				<input type="text" class="form-control" id="kkll'.$id.'" readonly>
 				<div class="input-group-append">
 				<button class="btn btn-secondary btn-file">
-					'.getMLText("browse").'&hellip; <input id="'.$id.'" type="file" name="'.$varname.'"'.($multiple ? " multiple" : "").($accept ? ' accept="'.$accept.'"' : "").'">
+					'.getMLText("browse").'&hellip; <input id="'.$id.'" type="file" name="'.$varname.'"'.($multiple ? " multiple" : "").($accept ? ' accept="'.$accept.'"' : "").' data-target-highlight="kkll'.$id.'">
 				</button>
 				</div>
 			</div>
@@ -1489,7 +1489,7 @@ $(document).ready(function() {
 		$formid = md5($formname.$form);
 
 		$content = '';
-		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
+		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" data-target-highlight=\"choosedocsearch".$formid."\" value=\"". (($default) ? $default->getID() : "") ."\">";
 		$content .= "<div class=\"input-group\">\n";
 		$content .= "<input class=\"form-control\" 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 .= '<div class="input-group-append">';
@@ -1556,7 +1556,7 @@ function folderSelected<?php echo $formid ?>(id, name) {
 			$formname = "targetid";
 		$formid = md5($formname.$form);
 		$content = '';
-		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
+		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\" data-target-highlight=\"choosefoldersearch".$formid."\">";
 		$content .= "<div class=\"input-group\">\n";
 		$content .= "<input class=\"form-control\" 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 .= '<div class="input-group-append">';

From 3a3b4ec9539ea30a0aaa05981d8c4bb0b36b0167 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 May 2021 21:56:33 +0200
Subject: [PATCH 061/143] add default values for jquery validation

---
 views/bootstrap/styles/validation-default.js  | 34 +++++++++++++++++++
 views/bootstrap4/styles/validation-default.js | 33 ++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 views/bootstrap/styles/validation-default.js
 create mode 100644 views/bootstrap4/styles/validation-default.js

diff --git a/views/bootstrap/styles/validation-default.js b/views/bootstrap/styles/validation-default.js
new file mode 100644
index 000000000..a7c064cfc
--- /dev/null
+++ b/views/bootstrap/styles/validation-default.js
@@ -0,0 +1,34 @@
+jQuery.validator.setDefaults({
+	errorElement: "em",
+	errorClass: 'help-block',
+	errorPlacement: function ( error, element ) {
+		// Add the `error` class to the control-group
+		$(element).closest('.control-group').addClass('error');
+		if ( element.prop( "type" ) === "checkbox" ) {
+			error.insertAfter( element.parent( "label" ) );
+		} else {
+			error.insertAfter( element );
+		}
+
+		// Add the span element, if doesn't exists, and apply the icon classes to it.
+		if ( !element.next( "span" )[ 0 ] ) {
+			$( "<span class='glyphicon glyphicon-remove form-control-feedback'></span>" ).insertAfter( element );
+		}
+	},
+	invalidHandler: function(e, validator) {
+		noty({
+			text: (validator.numberOfInvalids() == 1) ? trans.js_form_error.replace('#', validator.numberOfInvalids()) : trans.js_form_errors.replace('#', validator.numberOfInvalids()),
+			type: 'error',
+			dismissQueue: true,
+			layout: 'topRight',
+			theme: 'defaultTheme',
+			timeout: 3500,
+		});
+	},
+	highlight: function ( element, errorClass, validClass ) {
+		$( element ).parents( ".control-group" ).addClass( "error" ).removeClass( "success" );
+	},
+	unhighlight: function ( element, errorClass, validClass ) {
+		$( element ).parents( ".control-group" ).addClass( "success" ).removeClass( "error" );
+	}
+});
diff --git a/views/bootstrap4/styles/validation-default.js b/views/bootstrap4/styles/validation-default.js
new file mode 100644
index 000000000..88f77a4ad
--- /dev/null
+++ b/views/bootstrap4/styles/validation-default.js
@@ -0,0 +1,33 @@
+jQuery.validator.setDefaults({
+	errorElement: 'div',
+	errorClass: 'invalid-feedback',
+	errorPlacement: function(error, element) {
+		if(element.parent('.input-group').length) {
+			error.insertAfter(element.parent());
+		} else {
+			error.insertAfter(element);
+		}
+	},
+	invalidHandler: function(e, validator) {
+		noty({
+			text: (validator.numberOfInvalids() == 1) ? trans.js_form_error.replace('#', validator.numberOfInvalids()) : trans.js_form_errors.replace('#', validator.numberOfInvalids()),
+			type: 'error',
+			dismissQueue: true,
+			layout: 'topRight',
+			theme: 'defaultTheme',
+			timeout: 3500,
+		});
+	},
+	highlight: function (element, errorClass, validClass) {
+		if($(element).data('target-highlight'))
+			$('#'+$(element).data('target-highlight')).addClass('is-invalid');
+		else
+			$(element).addClass('is-invalid');
+	},
+	unhighlight: function (element, errorClass, validClass) {
+		if($(element).data('target-highlight'))
+			$('#'+$(element).data('target-highlight')).removeClass('is-invalid');
+		else
+			$(element).removeClass('is-invalid');
+	}
+});

From c75ae806ae7f50560d05a649a326344fd1334264 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 May 2021 21:57:12 +0200
Subject: [PATCH 062/143] switch to jquery validation of forms

---
 views/bootstrap/class.AddDocument.php         |  12 +-
 views/bootstrap/class.AddEvent.php            |  45 +++----
 views/bootstrap/class.AddFile.php             |  18 +--
 views/bootstrap/class.AddSubFolder.php        |  18 +--
 views/bootstrap/class.ApproveDocument.php     |  78 +++++-------
 views/bootstrap/class.AttributeMgr.php        |  26 ++--
 views/bootstrap/class.Calendar.php            |  12 +-
 views/bootstrap/class.DefaultKeywords.php     | 112 ++++++------------
 views/bootstrap/class.EditComment.php         |  45 +++----
 views/bootstrap/class.EditDocument.php        |  12 +-
 views/bootstrap/class.EditFolder.php          |  18 +--
 views/bootstrap/class.EditUserData.php        |  18 +--
 views/bootstrap/class.ForcePasswordChange.php |  38 +++++-
 views/bootstrap/class.GroupMgr.php            |  85 ++++++-------
 views/bootstrap/class.Login.php               |  86 ++++++--------
 views/bootstrap/class.ManageNotify.php        |  37 +++++-
 views/bootstrap/class.PasswordForgotten.php   |  36 +++---
 views/bootstrap/class.ReviewDocument.php      |  78 +++++-------
 views/bootstrap/class.Settings.php            |  26 ++--
 views/bootstrap/class.UpdateDocument.php      |  12 +-
 views/bootstrap/class.UsrMgr.php              |  69 ++++++-----
 views/bootstrap4/styles/application.js        |   2 +-
 22 files changed, 375 insertions(+), 508 deletions(-)

diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 5f6af7493..c1795c295 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -39,6 +39,7 @@ class SeedDMS_View_AddDocument extends SeedDMS_Theme_Style {
 		$enablemultiupload = $this->params['enablemultiupload'];
 		header('Content-Type: application/javascript; charset=UTF-8');
 
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 		if($enablelargefileupload) {
 			$this->printFineUploaderJs('../op/op.UploadChunks.php', $partitionsize, $maxuploadsize, $enablemultiupload);
 		}
@@ -73,16 +74,6 @@ $(document).ready(function() {
 	$("#adddocform").validate({
 		debug: false,
 		ignore: ":hidden:not(.do_validate)",
-		invalidHandler: function(e, validator) {
-			noty({
-				text:  (validator.numberOfInvalids() == 1) ? "<?php printMLText("js_form_error");?>".replace('#', validator.numberOfInvalids()) : "<?php printMLText("js_form_errors");?>".replace('#', validator.numberOfInvalids()),
-				type: 'error',
-				dismissQueue: true,
-				layout: 'topRight',
-				theme: 'defaultTheme',
-				timeout: 1500,
-			});
-		},
 <?php
 		if($enablelargefileupload) {
 ?>
@@ -165,6 +156,7 @@ $(document).ready(function() {
 		$folderid = $folder->getId();
 
 		$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.'/styles/validation-default.js"></script>'."\n", 'js');
 		if($enablelargefileupload) {
 			$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.AddEvent.php b/views/bootstrap/class.AddEvent.php
index b013885d7..59be716ef 100644
--- a/views/bootstrap/class.AddEvent.php
+++ b/views/bootstrap/class.AddEvent.php
@@ -34,37 +34,21 @@ class SeedDMS_View_AddEvent extends SeedDMS_Theme_Style {
 	function js() { /* {{{ */
 		$strictformcheck = $this->params['strictformcheck'];
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 ?>
-function checkForm()
-{
-	msg = new Array();
-	if (document.form1.name.value == "") msg.push("<?php printMLText("js_no_name");?>");
-<?php
-	if ($strictformcheck) {
-?>
-	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-<?php
-	}
-?>
-	if (msg != "") {
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
-
 $(document).ready(function() {
-	$('body').on('submit', '#form1', function(ev){
-		if(checkForm()) return;
-		ev.preventDefault();
+	$("#form1").validate({
+		rules: {
+			from: {
+				required: true
+			},
+			to: {
+				required: true
+			}
+		},
+		messages: {
+			name: "<?php printMLText("js_no_name");?>",
+		},
 	});
 });
 <?php
@@ -72,6 +56,9 @@ $(document).ready(function() {
 
 	function show() { /* {{{ */
 
+		$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.'/styles/validation-default.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("calendar"));
 		$this->globalNavigation();
 		$this->contentStart();
diff --git a/views/bootstrap/class.AddFile.php b/views/bootstrap/class.AddFile.php
index f01617664..bad6bbb4d 100644
--- a/views/bootstrap/class.AddFile.php
+++ b/views/bootstrap/class.AddFile.php
@@ -36,6 +36,7 @@ class SeedDMS_View_AddFile extends SeedDMS_Theme_Style {
 		$partitionsize = $this->params['partitionsize'];
 		$maxuploadsize = $this->params['maxuploadsize'];
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 		if($enablelargefileupload)
 			$this->printFineUploaderJs('../op/op.UploadChunks.php', $partitionsize, $maxuploadsize);
 
@@ -60,22 +61,6 @@ $(document).ready( function() {
 	$("#form1").validate({
 		debug: false,
 		ignore: ":hidden:not(.do_validate)",
-		invalidHandler: function(e, validator) {
-			noty({
-				text:  (validator.numberOfInvalids() == 1) ? "<?php printMLText("js_form_error");?>".replace('#', validator.numberOfInvalids()) : "<?php printMLText("js_form_errors");?>".replace('#', validator.numberOfInvalids()),
-				type: 'error',
-				dismissQueue: true,
-				layout: 'topRight',
-				theme: 'defaultTheme',
-				timeout: 1500,
-			});
-		},
-		highlight: function(e, errorClass, validClass) {
-			$(e).parent().parent().removeClass(validClass).addClass(errorClass);
-		},
-		unhighlight: function(e, errorClass, validClass) {
-			$(e).parent().parent().removeClass(errorClass).addClass(validClass);
-		},
 <?php
 		if($enablelargefileupload) {
 ?>
@@ -129,6 +114,7 @@ $(document).ready( function() {
 		$maxuploadsize = $this->params['maxuploadsize'];
 
 		$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.'/styles/validation-default.js"></script>'."\n", 'js');
 		if($enablelargefileupload) {
 			$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 56737ca70..f5d041cb0 100644
--- a/views/bootstrap/class.AddSubFolder.php
+++ b/views/bootstrap/class.AddSubFolder.php
@@ -34,25 +34,10 @@ class SeedDMS_View_AddSubFolder extends SeedDMS_Theme_Style {
 	function js() { /* {{{ */
 		$strictformcheck = $this->params['strictformcheck'];
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 ?>
 $(document).ready( function() {
 	$("#form1").validate({
-		invalidHandler: function(e, validator) {
-			noty({
-				text:  (validator.numberOfInvalids() == 1) ? "<?php printMLText("js_form_error");?>".replace('#', validator.numberOfInvalids()) : "<?php printMLText("js_form_errors");?>".replace('#', validator.numberOfInvalids()),
-				type: 'error',
-				dismissQueue: true,
-				layout: 'topRight',
-				theme: 'defaultTheme',
-				timeout: 1500,
-			});
-		},
-		highlight: function(e, errorClass, validClass) {
-			$(e).parent().parent().removeClass(validClass).addClass(errorClass);
-		},
-		unhighlight: function(e, errorClass, validClass) {
-			$(e).parent().parent().removeClass(errorClass).addClass(validClass);
-		},
 		messages: {
 			name: "<?php printMLText("js_no_name");?>",
 			comment: "<?php printMLText("js_no_comment");?>"
@@ -70,6 +55,7 @@ $(document).ready( function() {
 		$orderby = $this->params['orderby'];
 
 		$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.'/styles/validation-default.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
 		$this->globalNavigation($folder);
diff --git a/views/bootstrap/class.ApproveDocument.php b/views/bootstrap/class.ApproveDocument.php
index fa3a31af5..9ac4252db 100644
--- a/views/bootstrap/class.ApproveDocument.php
+++ b/views/bootstrap/class.ApproveDocument.php
@@ -33,59 +33,39 @@ class SeedDMS_View_ApproveDocument extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 ?>
-function checkIndForm()
-{
-	msg = new Array();
-	if (document.formind.approvalStatus.value == "") msg.push("<?php printMLText("js_no_approval_status");?>");
-	if (document.formind.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-	if (msg != "") {
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
-function checkGrpForm()
-{
-	msg = new Array();
-//	if (document.formgrp.approvalGroup.value == "") msg.push("<?php printMLText("js_no_approval_group");?>");
-	if (document.formgrp.approvalStatus.value == "") msg.push("<?php printMLText("js_no_approval_status");?>");
-	if (document.formgrp.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-	if (msg != "")
-	{
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
 $(document).ready(function() {
-	$('body').on('submit', '#formind', function(ev){
-		if(checkIndForm()) return;
-		ev.preventDefault();
+	$("#formind").validate({
+		rules: {
+			comment: {
+				required: true
+			},
+			approvalStatus: {
+				required: true
+			},
+		},
+		messages: {
+			comment: "<?php printMLText("js_no_comment");?>",
+			approvalStatus: "<?php printMLText("js_no_approval_status");?>",
+		},
 	});
-	$('body').on('submit', '#formgrp', function(ev){
-		if(checkGrpForm()) return;
-		ev.preventDefault();
+	$("#formgrp").validate({
+		rules: {
+			comment: {
+				required: true
+			},
+			approvalStatus: {
+				required: true
+			},
+		},
+		messages: {
+			comment: "<?php printMLText("js_no_comment");?>",
+			approvalStatus: "<?php printMLText("js_no_approval_status");?>",
+		},
 	});
 });
 <?php
-
 		$this->printFileChooserJs();
 	} /* }}} */
 
@@ -105,6 +85,9 @@ $(document).ready(function() {
 			}
 		}
 
+		$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.'/styles/validation-default.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
@@ -139,6 +122,7 @@ $(document).ready(function() {
 			array(
 				'element'=>'textarea',
 				'name'=>'comment',
+				'required'=>true,
 				'rows'=>4,
 				'cols'=>80
 			)
diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index 4bc5d844f..528a98500 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -39,14 +39,23 @@ class SeedDMS_View_AttributeMgr extends SeedDMS_Theme_Style {
 	function js() { /* {{{ */
 		$selattrdef = $this->params['selattrdef'];
 		header('Content-Type: application/javascript; charset=UTF-8');
-		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
+		parent::jsTranslations(array('js_form_error', 'js_form_errors', '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'));
 ?>
 
-$(document).ready( function() {
-	$('body').on('submit', '#form', function(ev){
-//		if(checkForm()) return;
-//		ev.preventDefault();
+function runValidation() {
+	$("#form1").validate({
+		rules: {
+			name: {
+				required: true
+			}
+		},
+		messages: {
+			name: "<?php printMLText("js_no_name");?>",
+		},
 	});
+}
+
+$(document).ready( function() {
 	$( "#selector" ).change(function() {
 		$('div.ajax').trigger('update', {attrdefid: $(this).val()});
 		window.history.pushState({"html":"","pageTitle":""},"", '../out/out.AttributeMgr.php?attrdefid=' + $(this).val());
@@ -180,7 +189,7 @@ $(document).ready( function() {
 
 	function showAttributeForm($attrdef) { /* {{{ */
 ?>
-			<form class="form-horizontal" action="../op/op.AttributeMgr.php" method="post">
+			<form class="form-horizontal" action="../op/op.AttributeMgr.php" id="form1" name="form1" method="post">
 <?php
 		if($attrdef) {
 			echo createHiddenFieldWithKey('editattrdef');
@@ -322,6 +331,9 @@ $(document).ready( function() {
 		$attrdefs = $this->params['attrdefs'];
 		$selattrdef = $this->params['selattrdef'];
 
+		$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.'/styles/validation-default.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
 		$this->contentStart();
@@ -401,7 +413,7 @@ $(document).ready( function() {
 		$this->columnEnd();
 		$this->columnStart(6);
 ?>
-		<div class="ajax" data-view="AttributeMgr" data-action="form" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div>
+		<div class="ajax" data-view="AttributeMgr" data-action="form" data-afterload="()=>{runValidation();}" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div>
 <?php
 		$this->columnEnd();
 		$this->rowEnd();
diff --git a/views/bootstrap/class.Calendar.php b/views/bootstrap/class.Calendar.php
index d59f8d1b8..ac7e91971 100644
--- a/views/bootstrap/class.Calendar.php
+++ b/views/bootstrap/class.Calendar.php
@@ -228,6 +228,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
 		$user = $this->params['user'];
 		$strictformcheck = $this->params['strictformcheck'];
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 ?>
 	$(document).ready(function() {
 		
@@ -307,16 +308,6 @@ class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
 									$('#calendar').fullCalendar('refetchEvents');
 								}, "json");
 							},
-							invalidHandler: function(e, validator) {
-								noty({
-									text:  (validator.numberOfInvalids() == 1) ? "<?php printMLText("js_form_error");?>".replace('#', validator.numberOfInvalids()) : "<?php printMLText("js_form_errors");?>".replace('#', validator.numberOfInvalids()),
-									type: 'error',
-									dismissQueue: true,
-									layout: 'topRight',
-									theme: 'defaultTheme',
-									timeout: 1500,
-								});
-							},
 							messages: {
 								name: "<?php printMLText("js_no_name");?>",
 								comment: "<?php printMLText("js_no_comment");?>"
@@ -382,6 +373,7 @@ $(document).ready(function() {
 		$user = $this->params['user'];
 
 		$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.'/styles/validation-default.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');
diff --git a/views/bootstrap/class.DefaultKeywords.php b/views/bootstrap/class.DefaultKeywords.php
index 79cbabcbd..8ecec6fdf 100644
--- a/views/bootstrap/class.DefaultKeywords.php
+++ b/views/bootstrap/class.DefaultKeywords.php
@@ -33,83 +33,42 @@ class SeedDMS_View_DefaultKeywords extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 ?>
-function checkForm()
-{
-	msg = new Array();
-
-	if($("#form .name").val() == "") msg.push("<?php printMLText("js_no_name");?>");
-	if (msg != "")
-	{
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
-
-function checkFormName()
-{
-	msg = new Array();
-
-	if($(".formn .name").val() == "") msg.push("<?php printMLText("js_no_name");?>");
-	if (msg != "")
-	{
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
-
-function checkKeywordForm()
-{
-	msg = new Array();
-
-	if($(".formk .keywords").val() == "") msg.push("<?php printMLText("js_no_name");?>");
-	if (msg != "")
-	{
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
+function runValidation() {
+	$("#form").validate({
+		rules: {
+			name: {
+				required: true
+			},
+		},
+		messages: {
+			name: "<?php printMLText("js_no_name");?>",
+		}
+	});
+	$(".formk").validate({
+		rules: {
+			keywords: {
+				required: true
+			},
+		},
+		messages: {
+			keywords: "<?php printMLText("js_no_name");?>",
+		}
+	});
+	$(".formn").validate({
+		rules: {
+			keywords: {
+				required: true
+			},
+		},
+		messages: {
+			keywords: "<?php printMLText("js_no_name");?>",
+		}
+	});
 }
 
 $(document).ready( function() {
-	$('body').on('submit', '#form', function(ev){
-		if(checkForm()) return;
-		ev.preventDefault();
-	});
-	$('body').on('submit', '.formk', function(ev){
-		if(checkKeywordForm()) return;
-		ev.preventDefault();
-	});
-	$('body').on('submit', '.formn', function(ev){
-		if(checkFormName()) return;
-		ev.preventDefault();
-	});
 	$( "#selector" ).change(function() {
 		$('div.ajax').trigger('update', {categoryid: $(this).val()});
 	});
@@ -199,7 +158,7 @@ $(document).ready( function() {
 							else
 								foreach ($lists as $list) {
 ?>
-									<form class="form-inline form mb-3" style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php">
+									<form class="form-inline form formn mb-3" style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php">
   								<?php echo createHiddenFieldWithKey('editkeywords'); ?>
 									<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
 									<input type="Hidden" name="keywordsid" value="<?php echo $list["id"]?>">
@@ -242,6 +201,9 @@ $(document).ready( function() {
 		$categories = $this->params['categories'];
 		$selcategory = $this->params['selcategory'];
 
+		$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.'/styles/validation-default.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
 		$this->contentStart();
@@ -278,7 +240,7 @@ $(document).ready( function() {
 		$this->columnEnd();
 		$this->columnStart(8);
 ?>
-		<div class="ajax" data-view="DefaultKeywords" data-action="form" <?php echo ($selcategory ? "data-query=\"categoryid=".$selcategory->getId()."\"" : "") ?>></div>
+		<div class="ajax" data-view="DefaultKeywords" data-action="form" data-afterload="()=>{runValidation();}" <?php echo ($selcategory ? "data-query=\"categoryid=".$selcategory->getId()."\"" : "") ?>></div>
 		</div>
 <?php
 		$this->columnEnd();
diff --git a/views/bootstrap/class.EditComment.php b/views/bootstrap/class.EditComment.php
index d0a049581..6477d5113 100644
--- a/views/bootstrap/class.EditComment.php
+++ b/views/bootstrap/class.EditComment.php
@@ -34,38 +34,24 @@ class SeedDMS_View_EditComment extends SeedDMS_Theme_Style {
 	function js() { /* {{{ */
 		$strictformcheck = $this->params['strictformcheck'];
 		header('Content-Type: application/javascript; charset=UTF-8');
-?>
-function checkForm()
-{
-	msg = new Array();
-<?php
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 		if ($strictformcheck) {
 ?>
-	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
+function runValidation() {
+	$("#form1").validate({
+		rules: {
+			comment: {
+				required: true
+			},
+		},
+		messages: {
+			comment: "<?php printMLText("js_no_comment");?>",
+		}
+	});
+}
+runValidation();
 <?php
 		}
-?>
-	if (msg != "")
-	{
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else return true;
-}
-$(document).ready(function() {
-	$('body').on('submit', '#form1', function(ev){
-		if(checkForm()) return;
-		ev.preventDefault();
-	});
-});
-<?php
 	} /* }}} */
 
 	function show() { /* {{{ */
@@ -76,6 +62,9 @@ $(document).ready(function() {
 		$version = $this->params['version'];
 		$strictformcheck = $this->params['strictformcheck'];
 
+		$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.'/styles/validation-default.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php
index f29b919fb..69432bd8b 100644
--- a/views/bootstrap/class.EditDocument.php
+++ b/views/bootstrap/class.EditDocument.php
@@ -34,20 +34,11 @@ class SeedDMS_View_EditDocument extends SeedDMS_Theme_Style {
 	function js() { /* {{{ */
 		$strictformcheck = $this->params['strictformcheck'];
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 		$this->printKeywordChooserJs('form1');
 ?>
 $(document).ready( function() {
 	$("#form1").validate({
-		invalidHandler: function(e, validator) {
-			noty({
-				text:  (validator.numberOfInvalids() == 1) ? "<?php printMLText("js_form_error");?>".replace('#', validator.numberOfInvalids()) : "<?php printMLText("js_form_errors");?>".replace('#', validator.numberOfInvalids()),
-				type: 'error',
-				dismissQueue: true,
-				layout: 'topRight',
-				theme: 'defaultTheme',
-				timeout: 1500,
-			});
-		},
 		messages: {
 			name: "<?php printMLText("js_no_name");?>",
 			comment: "<?php printMLText("js_no_comment");?>",
@@ -75,6 +66,7 @@ $(document).ready( function() {
 		$orderby = $this->params['orderby'];
 
 		$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.'/styles/validation-default.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
diff --git a/views/bootstrap/class.EditFolder.php b/views/bootstrap/class.EditFolder.php
index 7501012d5..4f15a6de4 100644
--- a/views/bootstrap/class.EditFolder.php
+++ b/views/bootstrap/class.EditFolder.php
@@ -34,25 +34,10 @@ class SeedDMS_View_EditFolder extends SeedDMS_Theme_Style {
 	function js() { /* {{{ */
 		$strictformcheck = $this->params['strictformcheck'];
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 ?>
 $(document).ready(function() {
 	$("#form1").validate({
-		invalidHandler: function(e, validator) {
-			noty({
-				text:  (validator.numberOfInvalids() == 1) ? "<?php printMLText("js_form_error");?>".replace('#', validator.numberOfInvalids()) : "<?php printMLText("js_form_errors");?>".replace('#', validator.numberOfInvalids()),
-				type: 'error',
-				dismissQueue: true,
-				layout: 'topRight',
-				theme: 'defaultTheme',
-				timeout: 1500,
-			});
-		},
-		highlight: function(e, errorClass, validClass) {
-			$(e).parent().parent().removeClass(validClass).addClass(errorClass);
-		},
-		unhighlight: function(e, errorClass, validClass) {
-			$(e).parent().parent().removeClass(errorClass).addClass(validClass);
-		},
 		messages: {
 			name: "<?php printMLText("js_no_name");?>",
 			comment: "<?php printMLText("js_no_comment");?>"
@@ -72,6 +57,7 @@ $(document).ready(function() {
 		$orderby = $this->params['orderby'];
 
 		$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.'/styles/validation-default.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
 		$this->globalNavigation($folder);
diff --git a/views/bootstrap/class.EditUserData.php b/views/bootstrap/class.EditUserData.php
index 2c79c39d9..7c3cb0d62 100644
--- a/views/bootstrap/class.EditUserData.php
+++ b/views/bootstrap/class.EditUserData.php
@@ -33,25 +33,10 @@ class SeedDMS_View_EditUserData extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 ?>
 $(document).ready( function() {
 	$("#form").validate({
-		invalidHandler: function(e, validator) {
-			noty({
-				text:  (validator.numberOfInvalids() == 1) ? "<?php printMLText("js_form_error");?>".replace('#', validator.numberOfInvalids()) : "<?php printMLText("js_form_errors");?>".replace('#', validator.numberOfInvalids()),
-				type: 'error',
-				dismissQueue: true,
-				layout: 'topRight',
-				theme: 'defaultTheme',
-				timeout: 1500,
-			});
-		},
-		highlight: function(e, errorClass, validClass) {
-			$(e).parent().parent().removeClass(validClass).addClass(errorClass);
-		},
-		unhighlight: function(e, errorClass, validClass) {
-			$(e).parent().parent().removeClass(errorClass).addClass(validClass);
-		},
 		rules: {
 			currentpwd: {
 				required: true
@@ -93,6 +78,7 @@ $(document).ready( function() {
 		$httproot = $this->params['httproot'];
 
 		$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.'/styles/validation-default.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("edit_user_details"));
 		$this->globalNavigation();
diff --git a/views/bootstrap/class.ForcePasswordChange.php b/views/bootstrap/class.ForcePasswordChange.php
index 21fa72f76..4a13df770 100644
--- a/views/bootstrap/class.ForcePasswordChange.php
+++ b/views/bootstrap/class.ForcePasswordChange.php
@@ -33,7 +33,30 @@ class SeedDMS_View_ForcePasswordChange extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 ?>
+function runValidation() {
+	$("#form").validate({
+		rules: {
+			currentpwd: {
+				required: true
+			},
+			pwd: {
+				required: true
+			},
+			pwdconf: {
+				equalTo: "#pwd"
+			}
+		},
+		messages: {
+			currentpwd: "<?php printMLText("js_no_pwd");?>",
+			pwd: "<?php printMLText("js_no_pwd");?>",
+			pwdconf: "<?php printMLText("js_pwd_not_conf");?>",
+		}
+	});
+}
+runValidation();
+
 function checkForm()
 {
 	msg = new Array();
@@ -57,10 +80,10 @@ function checkForm()
 }
 
 $(document).ready( function() {
-	$('body').on('submit', '#form', function(ev){
-		if(checkForm()) return;
-		ev.preventDefault();
-	});
+//	$('body').on('submit', '#form', function(ev){
+//		if(checkForm()) return;
+//		ev.preventDefault();
+//	});
 });
 <?php
 	} /* }}} */
@@ -70,16 +93,19 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$passwordstrength = $this->params['passwordstrength'];
 
+		$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.'/styles/validation-default.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("sign_in"), "forcepasswordchange");
 		$this->globalBanner();
 		$this->contentStart();
 		$this->contentHeading(getMLText('password_expiration'));
 		$this->warningMsg(getMLText('password_expiration_text'));
-		$this->contentContainerStart();
 ?>
 <form class="form-horizontal" action="../op/op.EditUserData.php" method="post" id="form" name="form1">
 	<?php echo createHiddenFieldWithKey('edituserdata'); ?>
 <?php
+		$this->contentContainerStart();
 		$this->formField(
 			getMLText("current_password"),
 			array(
@@ -111,6 +137,7 @@ $(document).ready( function() {
 				'autocomplete'=>'off',
 			)
 		);
+		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('submit_password'));
 ?>
 <input type="hidden" name="fullname" value="<?php print htmlspecialchars($user->getFullName());?>" />
@@ -119,7 +146,6 @@ $(document).ready( function() {
 </form>
 
 <?php
-		$this->contentContainerEnd();
 		$tmpfoot = array();
 		$tmpfoot[] = "<a href=\"../op/op.Logout.php\">" . getMLText("logout") . "</a>\n";
 		print "<p>";
diff --git a/views/bootstrap/class.GroupMgr.php b/views/bootstrap/class.GroupMgr.php
index e9a4946b1..8bac65855 100644
--- a/views/bootstrap/class.GroupMgr.php
+++ b/views/bootstrap/class.GroupMgr.php
@@ -41,64 +41,48 @@ class SeedDMS_View_GroupMgr extends SeedDMS_Theme_Style {
 		$strictformcheck = $this->params['strictformcheck'];
 
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 ?>
-function checkForm1() {
-	msg = new Array();
-	
-	if($("#name").val() == "") msg.push("<?php printMLText("js_no_name");?>");
+function runValidation() {
+	$("#form_1").validate({
+		rules: {
+			name: {
+				required: true
+			},
 <?php
 	if ($strictformcheck) {
 ?>
-	if($("#comment").val() == "") msg.push("<?php printMLText("js_no_comment");?>");
+			comment: {
+				required: true
+			},
 <?php
 	}
 ?>
-	if (msg != "") {
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	} else
-		return true;
+		},
+		messages: {
+			name: "<?php printMLText("js_no_name");?>",
+<?php
+	if ($strictformcheck) {
+?>
+			comment: "<?php printMLText("js_no_comment");?>",
+<?php
+	}
+?>
+		}
+	});
+	$("#form_2").validate({
+		rules: {
+			userid: {
+				required: true
+			},
+		},
+		messages: {
+			userid: "<?php printMLText("js_select_user");?>",
+		}
+	});
 }
 
-function checkForm2() {
-	msg = "";
-	
-		if($("#userid").val() == -1) msg += "<?php printMLText("js_select_user");?>\n";
-
-		if (msg != "") {
-			noty({
-				text: msg,
-				type: 'error',
-				dismissQueue: true,
-				layout: 'topRight',
-				theme: 'defaultTheme',
-				_timeout: 1500,
-			});
-			return false;
-		} else
-			return true;
-	}
-
 $(document).ready( function() {
-	$('body').on('submit', '#form_1', function(ev){
-		if(checkForm1())
-			return;
-		ev.preventDefault();
-	});
-
-	$('body').on('submit', '#form_2', function(ev){
-		if(checkForm2())
-			return;
-		ev.preventDefault();
-	});
-
 	$( "#selector" ).change(function() {
 		$('div.ajax').trigger('update', {groupid: $(this).val()});
 		window.history.pushState({"html":"","pageTitle":""},"", '../out/out.GroupMgr.php?groupid=' + $(this).val());
@@ -296,6 +280,9 @@ $(document).ready( function() {
 		$allGroups = $this->params['allgroups'];
 		$strictformcheck = $this->params['strictformcheck'];
 
+		$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.'/styles/validation-default.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
 		$this->contentStart();
@@ -331,7 +318,7 @@ $(document).ready( function() {
 		$this->columnEnd();
 		$this->columnStart(8);
 ?>
-		<div class="ajax" data-view="GroupMgr" data-action="form" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>
+		<div class="ajax" data-view="GroupMgr" data-action="form" data-afterload="()=>{runValidation();}" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>
 <?php
 		$this->columnEnd();
 		$this->rowEnd();
diff --git a/views/bootstrap/class.Login.php b/views/bootstrap/class.Login.php
index eaa0277c7..90e4cb4c1 100644
--- a/views/bootstrap/class.Login.php
+++ b/views/bootstrap/class.Login.php
@@ -32,65 +32,44 @@
 class SeedDMS_View_Login extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
+		$dms = $this->params['dms'];
+		$enableguestlogin = $this->params['enableguestlogin'];
+		$guest = null;
+		if($enableguestlogin) {
+			$guestid = $this->params['guestid'];
+			$guest = $dms->getUser((int) $guestid);
+		}
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 ?>
 document.form1.login.focus();
-function checkForm()
-{
-	msg = new Array()
-	if($("#login").val() == "") msg.push("<?php printMLText("js_no_login");?>");
-	if($("#pwd").val() == "") msg.push("<?php printMLText("js_no_pwd");?>");
-	if (msg != "") {
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
 
-function guestLogin()
-{
-	theme = $("#themeselector").val();
-	lang = $("#languageselector").val();
-	url = "../op/op.Login.php?login=guest";
-	if(theme)
-		url += "&sesstheme=" + theme;
-	if(lang)
-		url += "&lang=" + lang;
-	if (document.form1.referuri) {
-		url += "&referuri=" + escape(document.form1.referuri.value);
-	}
-	document.location.href = url;
-}
 $(document).ready( function() {
-/*
-	$('body').on('submit', '#form', function(ev){
-		if(checkForm()) return;
-		ev.preventDefault();
-	});
-*/
+<?php
+		if($guest) {
+?>
+	function guestLogin()
+	{
+		theme = $("#themeselector").val();
+		lang = $("#languageselector").val();
+		url = "../op/op.Login.php?login=<?= $guest->getLogin() ?>";
+		if(theme)
+			url += "&sesstheme=" + theme;
+		if(lang)
+			url += "&lang=" + lang;
+		if (document.form1.referuri) {
+			url += "&referuri=" + escape(document.form1.referuri.value);
+		}
+		document.location.href = url;
+	}
 	$('body').on('click', '#guestlogin', function(ev){
 		ev.preventDefault();
 		guestLogin();
 	});
+<?php
+		}
+?>
 	$("#form").validate({
-		invalidHandler: function(e, validator) {
-			noty({
-				text:  (validator.numberOfInvalids() == 1) ? "<?php printMLText("js_form_error");?>".replace('#', validator.numberOfInvalids()) : "<?php printMLText("js_form_errors");?>".replace('#', validator.numberOfInvalids()),
-				type: 'error',
-				dismissQueue: true,
-				layout: 'topRight',
-				theme: 'defaultTheme',
-				timeout: 1500,
-			});
-		},
 		messages: {
 			login: "<?php printMLText("js_no_login");?>",
 			pwd: "<?php printMLText("js_no_pwd");?>"
@@ -101,7 +80,9 @@ $(document).ready( function() {
 	} /* }}} */
 
 	function show() { /* {{{ */
+		$dms = $this->params['dms'];
 		$enableguestlogin = $this->params['enableguestlogin'];
+		$guestid = $this->params['guestid'];
 		$enablepasswordforgotten = $this->params['enablepasswordforgotten'];
 		$refer = $this->params['referrer'];
 		$themes = $this->params['themes'];
@@ -111,6 +92,7 @@ $(document).ready( function() {
 		$enableThemeSelector = $this->params['enablethemeselector'];
 
 		$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.'/styles/validation-default.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("sign_in"), "login");
 		$this->globalBanner();
@@ -119,9 +101,9 @@ $(document).ready( function() {
 		if($msg)
 			$this->errorMsg(htmlspecialchars($msg));
 ?>
-<?php $this->contentContainerStart(); ?>
 <form class="form-horizontal" action="../op/op.Login.php" method="post" name="form1" id="form">
 <?php
+		$this->contentContainerStart();
 		if ($refer) {
 			echo "<input type='hidden' name='referuri' value='".htmlspecialchars($refer)."'/>";
 		}
@@ -172,13 +154,13 @@ $(document).ready( function() {
 				$html
 			);
 		}
+		$this->contentContainerEnd();
 		$this->formSubmit(getMLText('submit_login'));
 ?>
 </form>
 <?php
-		$this->contentContainerEnd();
 		$tmpfoot = array();
-		if ($enableguestlogin)
+		if ($enableguestlogin && $guestid && $dms->getUser((int) $guestid))
 			$tmpfoot[] = "<a href=\"\" id=\"guestlogin\">" . getMLText("guest_login") . "</a>\n";
 		if ($enablepasswordforgotten)
 			$tmpfoot[] = "<a href=\"../out/out.PasswordForgotten.php\">" . getMLText("password_forgotten") . "</a>\n";
diff --git a/views/bootstrap/class.ManageNotify.php b/views/bootstrap/class.ManageNotify.php
index c2ccc6a28..533159659 100644
--- a/views/bootstrap/class.ManageNotify.php
+++ b/views/bootstrap/class.ManageNotify.php
@@ -132,9 +132,33 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
-
-//		$this->printFolderChooserJs("form1");
-//		$this->printDocumentChooserJs("form2");
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
+?>
+$(document).ready( function() {
+	$("#form1").validate({
+		ignore: [],
+		rules: {
+			targetid: {
+				required: true
+			},
+		},
+		messages: {
+			targetid: "<?php printMLText("js_no_folder");?>",
+		},
+	});
+	$("#form2").validate({
+		ignore: [],
+		rules: {
+			docid: {
+				required: true
+			},
+		},
+		messages: {
+			docid: "<?php printMLText("js_no_document");?>",
+		},
+	});
+});
+<?php
 		$this->printClickDocumentJs();
 		$this->printClickFolderJs();
 	} /* }}} */
@@ -148,6 +172,9 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Theme_Style {
 		$this->timeout = $this->params['timeout'];
 		$this->xsendfile = $this->params['xsendfile'];
 
+		$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.'/styles/validation-default.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("my_account"));
 		$this->globalNavigation();
 		$this->contentStart();
@@ -157,7 +184,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Theme_Style {
 		$this->columnStart(6);
 		$this->contentHeading(getMLText("edit_folder_notify"));
 
-		print "<form class=\"form-horizontal\" method=\"post\" action=\"../op/op.ManageNotify.php?type=folder&action=add\" name=\"form1\">";
+		print "<form class=\"form-horizontal\" method=\"post\" action=\"../op/op.ManageNotify.php?type=folder&action=add\" id=\"form1\" name=\"form1\">";
 		$this->contentContainerStart();
 		$this->formField(getMLText("choose_target_folder"), $this->getFolderChooserHtml("form1", M_READ));
 		$this->formField(
@@ -184,7 +211,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Theme_Style {
 		$this->columnEnd();
 		$this->columnStart(6);
 		$this->contentHeading(getMLText("edit_document_notify"));
-		print "<form method=\"post\" action=\"../op/op.ManageNotify.php?type=document&action=add\" name=\"form2\">";
+		print "<form method=\"post\" action=\"../op/op.ManageNotify.php?type=document&action=add\" id=\"form2\" name=\"form2\">";
 		/* 'form1' must be passed to printDocumentChooser() because the typeahead
 		 * function is currently hardcoded on this value */
 		$this->contentContainerStart();
diff --git a/views/bootstrap/class.PasswordForgotten.php b/views/bootstrap/class.PasswordForgotten.php
index 2114f2504..3ceef0ae6 100644
--- a/views/bootstrap/class.PasswordForgotten.php
+++ b/views/bootstrap/class.PasswordForgotten.php
@@ -33,30 +33,19 @@ class SeedDMS_View_PasswordForgotten extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 ?>
-function checkForm()
-{
-	msg = new Array();
-	if (document.form1.login.value == "") msg.push("<?php printMLText("js_no_login");?>");
-	if (document.form1.email.value == "") msg.push("<?php printMLText("js_no_email");?>");
-	if (msg != "") {
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
 $(document).ready(function() {
-	$('body').on('submit', '#form1', function(ev){
-		if(checkForm()) return;
-		ev.preventDefault();
+	$("#form1").validate({
+		rules: {
+			email: {
+				email: true
+			}
+		},
+		messages: {
+			login: "<?php printMLText("js_no_login");?>",
+			email: "<?php printMLText("js_no_email");?>"
+		},
 	});
 });
 document.form1.email.focus();
@@ -66,6 +55,9 @@ document.form1.email.focus();
 	function show() { /* {{{ */
 		$referrer = $this->params['referrer'];
 
+		$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.'/styles/validation-default.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("password_forgotten"), "passwordforgotten");
 		$this->globalBanner();
 		$this->contentStart();
diff --git a/views/bootstrap/class.ReviewDocument.php b/views/bootstrap/class.ReviewDocument.php
index 3d891b63f..5f1e6871d 100644
--- a/views/bootstrap/class.ReviewDocument.php
+++ b/views/bootstrap/class.ReviewDocument.php
@@ -33,59 +33,39 @@ class SeedDMS_View_ReviewDocument extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 ?>
-function checkIndForm()
-{
-	msg = new Array();
-	if (document.formind.reviewStatus.value == "") msg.push("<?php printMLText("js_no_review_status");?>");
-	if (document.formind.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-	if (msg != "") {
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
-function checkGrpForm()
-{
-	msg = new Array();
-//	if (document.formgrp.reviewGroup.value == "") msg.push("<?php printMLText("js_no_review_group");?>");
-	if (document.formgrp.reviewStatus.value == "") msg.push("<?php printMLText("js_no_review_status");?>");
-	if (document.formgrp.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-	if (msg != "")
-	{
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
 $(document).ready(function() {
-	$('body').on('submit', '#formind', function(ev){
-		if(checkIndForm()) return;
-		ev.preventDefault();
+	$("#formind").validate({
+		rules: {
+			comment: {
+				required: true
+			},
+			reviewStatus: {
+				required: true
+			},
+		},
+		messages: {
+			comment: "<?php printMLText("js_no_comment");?>",
+			reviewStatus: "<?php printMLText("js_no_review_status");?>",
+		},
 	});
-	$('body').on('submit', '#formgrp', function(ev){
-		if(checkGrpForm()) return;
-		ev.preventDefault();
+	$("#formgrp").validate({
+		rules: {
+			comment: {
+				required: true
+			},
+			reviewStatus: {
+				required: true
+			},
+		},
+		messages: {
+			comment: "<?php printMLText("js_no_comment");?>",
+			reviewStatus: "<?php printMLText("js_no_review_status");?>",
+		},
 	});
 });
 <?php
-
 		$this->printFileChooserJs();
 	} /* }}} */
 
@@ -104,6 +84,9 @@ $(document).ready(function() {
 			}
 		}
 
+		$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.'/styles/validation-default.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
@@ -138,6 +121,7 @@ $(document).ready(function() {
 			array(
 				'element'=>'textarea',
 				'name'=>'comment',
+				'required'=>true,
 				'rows'=>4,
 				'cols'=>80
 			)
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 0621e2da0..09635aa50 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -248,16 +248,13 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 		$this->contentHeading(getMLText("settings"));
 
+		$this->rowStart();
+		$this->columnStart(8);
 ?>
   <form action="../op/op.Settings.php" method="post" enctype="multipart/form-data" name="form0" >
 	<?php echo createHiddenFieldWithKey('savesettings'); ?>
   <input type="hidden" name="action" value="saveSettings" />
 	<input type="hidden" id="currenttab" name="currenttab" value="<?php echo $currenttab ? $currenttab : 'site'; ?>" />
-<?php
-		if(!is_writeable($settings->_configFilePath)) {
-			$this->warningMsg(getMLText("settings_notwritable"));
-		}
-?>
 
   <ul class="nav nav-pills" id="settingstab" role="tablist">
 <?php $this->showPaneHeader('site', getMLText('settings_Site'), (!$currenttab || $currenttab == 'site')); ?>
@@ -649,9 +646,24 @@ if(is_writeable($settings->_configFilePath)) {
 }
 ?>
 	</form>
-
-
 <?php
+		$this->columnEnd();
+		$this->columnStart(4);
+		if(!is_writeable($settings->_configFilePath)) {
+			$this->warningMsg(getMLText("settings_notwritable"));
+		}
+		if($settings->_enableGuestLogin && $settings->_guestID) {
+			$guest = $dms->getUser((int) $settings->_guestID);
+			if(!$guest) {
+				$this->warningMsg(getMLText("settings_invalid_guestid"));
+			} elseif($guest->isDisabled()) {
+				$this->warningMsg(getMLText("settings_guestid_is_disabled"));
+			} elseif($guest->isAdmin()) {
+				$this->warningMsg(getMLText("settings_guestid_is_admin"));
+			}
+		}
+		$this->columnEnd(4);
+		$this->rowEnd(4);
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index ced0ed44d..13f2b749c 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -38,6 +38,7 @@ class SeedDMS_View_UpdateDocument extends SeedDMS_Theme_Style {
 		$partitionsize = $this->params['partitionsize'];
 		$maxuploadsize = $this->params['maxuploadsize'];
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 		$this->printDropFolderChooserJs("form1");
 		$this->printSelectPresetButtonJs();
 		$this->printInputPresetButtonJs();
@@ -71,16 +72,6 @@ $(document).ready( function() {
 	$("#form1").validate({
 		debug: false,
 		ignore: ":hidden:not(.do_validate)",
-		invalidHandler: function(e, validator) {
-			noty({
-				text:  (validator.numberOfInvalids() == 1) ? "<?php printMLText("js_form_error");?>".replace('#', validator.numberOfInvalids()) : "<?php printMLText("js_form_errors");?>".replace('#', validator.numberOfInvalids()),
-				type: 'error',
-				dismissQueue: true,
-				layout: 'topRight',
-				theme: 'defaultTheme',
-				timeout: 1500,
-			});
-		},
 <?php
 		if($enablelargefileupload) {
 ?>
@@ -154,6 +145,7 @@ console.log(element);
 		$documentid = $document->getId();
 
 		$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.'/styles/validation-default.js"></script>'."\n", 'js');
 		if($enablelargefileupload) {
 			$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.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 67d1193ca..984bb91e7 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -36,43 +36,51 @@ class SeedDMS_View_UsrMgr extends SeedDMS_Theme_Style {
 		$strictformcheck = $this->params['strictformcheck'];
 
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 ?>
-function checkForm()
-{
-	msg = new Array();
-
-	if($("#login").val() == "") msg.push("<?php printMLText("js_no_login");?>");
-	if(($("#userid").val() == "0") && ($("#pwd").val() == "")) msg.push("<?php printMLText("js_no_pwd");?>");
-	if(($("#pwd").val() != $("#pwdconf").val())&&($("#pwd").val() != "")&&($("#pwdconf").val() != "")) msg.push("<?php printMLText("js_pwd_not_conf");?>");
-	if($("#name").val() == "") msg.push("<?php printMLText("js_no_name");?>");
-	if($("#email").val() == "") msg.push("<?php printMLText("js_no_email");?>");
+function runValidation() {
+	$("#form1").validate({
+		rules: {
+			login: {
+				required: true
+			},
+			name: {
+				required: true
+			},
 <?php
 	if ($strictformcheck) {
 ?>
-	if($("#comment").val() == "") msg.push("<?php printMLText("js_no_comment");?>");
+			comment: {
+				required: true
+			},
 <?php
 	}
 ?>
-	if (msg != "") {
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
+			email: {
+				required: true,
+				email: true
+			},
+			pwdconf: {
+				equalTo: "#pwd"
+			}
+		},
+		messages: {
+			login: "<?php printMLText("js_no_login");?>",
+			name: "<?php printMLText("js_no_name");?>",
+<?php
+	if ($strictformcheck) {
+?>
+			comment: "<?php printMLText("js_no_comment");?>",
+<?php
 	}
-	else
-		return true;
+?>
+			email: "<?php printMLText("js_no_email");?>",
+			pwdconf: "<?php printMLText("js_pwd_not_conf");?>",
+		}
+	});
 }
 
 $(document).ready( function() {
-	$('body').on('submit', '#form', function(ev){
-		if(checkForm()) return;
-		ev.preventDefault();
-	});
 	$( "#selector" ).change(function() {
 		$('div.ajax').trigger('update', {userid: $(this).val()});
 		window.history.pushState({"html":"","pageTitle":""},"", '../out/out.UsrMgr.php?userid=' + $(this).val());
@@ -212,7 +220,7 @@ $(document).ready( function() {
 		$workflowmode = $this->params['workflowmode'];
 		$quota = $this->params['quota'];
 ?>
-	<form class="form-horizontal" action="../op/op.UsrMgr.php" method="post" enctype="multipart/form-data" name="form" id="form">
+	<form class="form-horizontal" action="../op/op.UsrMgr.php" method="post" enctype="multipart/form-data" name="form1" id="form1">
 <?php
 		if($currUser) {
 			echo createHiddenFieldWithKey('edituser');
@@ -257,7 +265,7 @@ $(document).ready( function() {
 				'name'=>'pwdconf',
 			)
 		);
-		if($passwordexpiration > 0) {
+		if($passwordexpiration > 0 && (!$currUser || !$currUser->isAdmin())) {
 			$options = array();
 			if($currUser)
 				$options[] = array('', getMLText("keep"));
@@ -523,6 +531,9 @@ $(document).ready( function() {
 		$workflowmode = $this->params['workflowmode'];
 		$quota = $this->params['quota'];
 
+		$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.'/styles/validation-default.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
 		$this->contentStart();
@@ -558,7 +569,7 @@ $(document).ready( function() {
 		$this->columnEnd();
 		$this->columnStart(4);
  ?>
-		<div class="ajax" data-view="UsrMgr" data-action="form" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
+		<div class="ajax" data-view="UsrMgr" data-action="form" data-afterload="()=>{runValidation();}" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
 	</div>
 	<?php
 		$this->columnEnd();
diff --git a/views/bootstrap4/styles/application.js b/views/bootstrap4/styles/application.js
index 5e12d0509..e8d1cd6e6 100644
--- a/views/bootstrap4/styles/application.js
+++ b/views/bootstrap4/styles/application.js
@@ -23,6 +23,7 @@ chzn_template_func =  function (state) {
 	var $newstate = $(html);
 	return $newstate;
 };
+
 function escapeHtml(text) {
   var map = {
     '&': '&amp;',
@@ -245,7 +246,6 @@ function initMost() {
 }
 
 $(document).ready( function() {
-//	$('.dropdown-menu a.dropdown-toggle').on('click', function(e) {
 	$('body').on('click', '.dropdown-menu a.dropdown-toggle', function (e) {
 		if (!$(this).next().hasClass('show')) {
 			$(this).parents('.dropdown-menu').first().find('.show').removeClass("show");

From 8ed5d8cdc942b36a5d44b814bfd67ba65805b367 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 May 2021 21:57:57 +0200
Subject: [PATCH 063/143] add more changes to 5.1.22

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

diff --git a/CHANGELOG b/CHANGELOG
index d5d0e3e0c..71055a6b5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,10 @@
 - propperly check for translation of html email body (Closes: #510)
 - set mandatory group reviewer/approver when adding a new document or version
 - fix sending notification mails to group when uploading document via drag&drop
+- guest login can use any user account
+- issue warning if document cannot be approved/reviewed anymore, because it has
+  expired
+- much better form validation based on jquery validation
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.22

From d3b8202086797cc7d056c393321fa5d9ecc3d096 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 May 2021 10:35:39 +0200
Subject: [PATCH 064/143] set message after successful folder/document deletion

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

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 71dc69af3..e91ee335d 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -510,7 +510,7 @@ switch($command) {
 								$notifier->sendDeleteFolderMail($folder, $user);
 							}
 							header('Content-Type: application/json');
-							echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
+							echo json_encode(array('success'=>true, 'message'=>getMLText('splash_folder_deleted'), 'data'=>''));
 							add_log_line();
 						} else {
 							header('Content-Type: application/json');
@@ -555,7 +555,7 @@ switch($command) {
 							}
 
 							header('Content-Type: application/json');
-							echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
+							echo json_encode(array('success'=>true, 'message'=>getMLText('splash_document_deleted'), 'data'=>''));
 							add_log_line();
 						} else {
 							header('Content-Type: application/json');

From 1b566f8fdef1d063a0a3ad337b4e92b5fdc35243 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 May 2021 10:36:15 +0200
Subject: [PATCH 065/143] add '\n' after js statement

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

diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index 2793f8c1c..2543358c1 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -226,9 +226,9 @@ $('body').on('click', '.order-btn', function(ev) {
 			echo "SeedDMSUpload.setEditBtnLabel('".getMLText("edit_document_props")."');";
 			$mus2 = SeedDMS_Core_File::parse_filesize(ini_get("upload_max_filesize"));
 			if($maxuploadsize && $maxuploadsize < $mus2)
-				echo "SeedDMSUpload.setMaxFileSize($maxuploadsize);";
+				echo "SeedDMSUpload.setMaxFileSize($maxuploadsize);\n";
 			else
-				echo "SeedDMSUpload.setMaxFileSize($mus2);";
+				echo "SeedDMSUpload.setMaxFileSize($mus2);\n";
 			echo "SeedDMSUpload.setMaxFileSizeMsg('".getMLText("uploading_maxsize")."');";
 		}
 

From 16e4675d93dc4aed5c39f4c0066abac252ffe539 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 May 2021 10:36:39 +0200
Subject: [PATCH 066/143] add comment

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

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 43e7d2548..921e0a846 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1351,6 +1351,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	function printFileChooserJs() { /* {{{ */
 ?>
 $(document).ready(function() {
+	/* Triggered after the file has been selected */
 	$(document).on('change', '.btn-file :file', function() {
 		var input = $(this),
 		numFiles = input.get(0).files ? input.get(0).files.length : 1,
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 1b3e2f021..6884df265 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1350,6 +1350,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	function printFileChooserJs() { /* {{{ */
 ?>
 $(document).ready(function() {
+	/* Triggered after the file has been selected */
 	$(document).on('change', '.btn-file :file', function() {
 		var input = $(this),
 		numFiles = input.get(0).files ? input.get(0).files.length : 1,

From 07919b0810b4dd41f45e7185014f9a55807939db Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 May 2021 12:23:04 +0200
Subject: [PATCH 067/143] add code to use bootstrap's custom file input
 (currently not used)

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

diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 6884df265..e30ca8bed 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1350,6 +1350,14 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	function printFileChooserJs() { /* {{{ */
 ?>
 $(document).ready(function() {
+/* do not use bootstrap4 custom form element because it is difficult to localize
+	$(document).on('change', '.custom-file-input',function(){
+		//get the file name
+		var fileName = $(this).val().replace(/\\/g, '/').replace(/.*\//, '');
+		//replace the "Choose a file" label
+		$(this).next('.custom-file-label').html(fileName);
+	})
+*/
 	/* Triggered after the file has been selected */
 	$(document).on('change', '.btn-file :file', function() {
 		var input = $(this),
@@ -1374,6 +1382,15 @@ $(document).ready(function() {
 
 	function getFileChooserHtml($varname='userfile', $multiple=false, $accept='') { /* {{{ */
 		$id = preg_replace('/[^A-Za-z]/', '', $varname);
+/* do not use bootstrap4 custom form element because it is difficult to localize
+		$html = '
+<div class="custom-file">
+  <input type="file" class="custom-file-input" id="'.$id.'" name="'.$varname.'">
+  <label class="custom-file-label" for="'.$id.'">'.getMLText("browse").'&hellip;'.'</label>
+</div>
+';
+		return $html;
+ */
 		$html = '
 	<div id="'.$id.'-upload-files">
 		<div id="'.$id.'-upload-file" class="upload-file">

From d325340e0b9d8f30f33abc25914a01c9990c0ccf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 May 2021 14:18:26 +0200
Subject: [PATCH 068/143] use jquery validation

---
 views/bootstrap/class.WorkflowMgr.php | 31 +++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.WorkflowMgr.php b/views/bootstrap/class.WorkflowMgr.php
index 158fc0650..d7f9be7b5 100644
--- a/views/bootstrap/class.WorkflowMgr.php
+++ b/views/bootstrap/class.WorkflowMgr.php
@@ -33,7 +33,23 @@ class SeedDMS_View_WorkflowMgr extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 ?>
+function runValidation() {
+	$("#form1").validate({
+		rules: {
+			name: {
+				required: true
+			},
+			initstate: {
+				required: true
+			},
+		},
+		messages: {
+			name: "<?php printMLText("js_no_name");?>",
+		}
+	});
+}
 
 function checkForm(num)
 {
@@ -154,8 +170,7 @@ $(document).ready(function() {
 			}
 		}
 ?>
-	<?php	$this->contentContainerStart(); ?>
-	<form class="form-horizontal" action="../op/op.WorkflowMgr.php" method="post" enctype="multipart/form-data">
+	<form class="form-horizontal" action="../op/op.WorkflowMgr.php" method="post" enctype="multipart/form-data" id="form1" name="form1">
 <?php
 		if($workflow) {
 			echo createHiddenFieldWithKey('editworkflow');
@@ -169,6 +184,7 @@ $(document).ready(function() {
 		<input type="hidden" name="action" value="addworkflow">
 <?php
 		}
+		$this->contentContainerStart();
 		$this->formField(
 			getMLText("workflow_name"),
 			array(
@@ -191,10 +207,10 @@ $(document).ready(function() {
 				'options'=>$options
 			)
 		);
+		$this->contentContainerEnd();
 		$this->formSubmit('<i class="fa fa-save"></i> '.getMLText("save"));
 ?>
 	</form>
-	<?php	$this->contentContainerEnd(); ?>
 <?php
 		if($workflow) {
 		$actions = $dms->getAllWorkflowActions();
@@ -250,7 +266,7 @@ $(document).ready(function() {
 		}
 		echo "</tbody></table>";
 ?>
-<form class="form-inline" action="../op/op.AddTransitionToWorkflow.php" method="post">
+<form class="form-inline" action="../op/op.AddTransitionToWorkflow.php" method="post" id="form2" name="form2">
 <?php
 		echo "<table class=\"table table-condensed\"><thead></thead><tbody>";
 			echo "<tr>";
@@ -294,7 +310,7 @@ $(document).ready(function() {
 ?>
   <?php echo createHiddenFieldWithKey('addtransitiontoworkflow'); ?>
 	<input type="hidden" name="workflow" value="<?php print $workflow->getID();?>">
-	<input type="submit" class="btn" value="<?php printMLText("add");?>">
+	<input type="submit" class="btn btn-primary" value="<?php printMLText("add");?>">
 <?php
 			echo "</td>";
 			echo "</tr>\n";
@@ -319,6 +335,9 @@ $(document).ready(function() {
 		$workflows = $this->params['allworkflows'];
 		$workflowstates = $this->params['allworkflowstates'];
 
+		$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.'/styles/validation-default.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
 		$this->contentStart();
@@ -352,7 +371,7 @@ $(document).ready(function() {
 		$this->columnEnd();
 		$this->columnStart(7);
 ?>
-		<div class="ajax" data-view="WorkflowMgr" data-action="form" <?php echo ($selworkflow ? "data-query=\"workflowid=".$selworkflow->getID()."\"" : "") ?>></div>
+		<div class="ajax" data-view="WorkflowMgr" data-action="form" data-afterload="()=>{runValidation();}" <?php echo ($selworkflow ? "data-query=\"workflowid=".$selworkflow->getID()."\"" : "") ?>></div>
 <?php
 		$this->columnEnd();
 		$this->rowEnd();

From 8f5a699f0cd825bbf88e00537126b827e23acb8e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 May 2021 19:13:51 +0200
Subject: [PATCH 069/143] log successful authentication

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

diff --git a/webdav/webdav.php b/webdav/webdav.php
index a739a93a0..4b504bf91 100644
--- a/webdav/webdav.php
+++ b/webdav/webdav.php
@@ -160,6 +160,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			require_once("../inc/inc.ClassLdapAuthentication.php");
 			$authobj = new SeedDMS_LdapAuthentication($this->dms, $settings);
 			$userobj = $authobj->authenticate($user, $pass);
+			if($userobj && $this->logger)
+				$this->logger->log('check_auth: type='.$type.', user='.$user.' authenticated against LDAP', PEAR_LOG_INFO);
 		} /* }}} */
 
 		/* Authenticate against SeedDMS database {{{ */
@@ -167,6 +169,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			require_once("../inc/inc.ClassDbAuthentication.php");
 			$authobj = new SeedDMS_DbAuthentication($this->dms, $settings);
 			$userobj = $authobj->authenticate($user, $pass);
+			if($userobj && $this->logger)
+				$this->logger->log('check_auth: type='.$type.', user='.$user.' authenticated against database', PEAR_LOG_INFO);
 		} /* }}} */
 
 		if(!$userobj) {

From 13d1e92434fb20937c58f104a782f6324750e855 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 May 2021 19:14:19 +0200
Subject: [PATCH 070/143] use jquery validation

---
 views/bootstrap/class.WorkflowStatesMgr.php | 65 ++++++++-------------
 1 file changed, 24 insertions(+), 41 deletions(-)

diff --git a/views/bootstrap/class.WorkflowStatesMgr.php b/views/bootstrap/class.WorkflowStatesMgr.php
index 100f2951a..3cc2060b0 100644
--- a/views/bootstrap/class.WorkflowStatesMgr.php
+++ b/views/bootstrap/class.WorkflowStatesMgr.php
@@ -33,34 +33,22 @@ class SeedDMS_View_WorkflowStatesMgr extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 ?>
-
-function checkForm(num)
-{
-	msg = new Array();
-
-	if($("#name").val() == "") msg.push("<?php printMLText("js_no_name");?>");
-	if (msg != "")
-	{
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
+function runValidation() {
+	$("#form1").validate({
+		rules: {
+			name: {
+				required: true
+			},
+		},
+		messages: {
+			name: "<?php printMLText("js_no_name");?>",
+		}
+	});
 }
 
 $(document).ready(function() {
-	$('body').on('submit', '#form1', function(ev){
-		if(checkForm()) return;
-		ev.preventDefault();
-	});
 	$( "#selector" ).change(function() {
 		$('div.ajax').trigger('update', {workflowstateid: $(this).val()});
 	});
@@ -107,21 +95,13 @@ $(document).ready(function() {
 		$selworkflowstate = $this->params['selworkflowstate'];
 
 		if($selworkflowstate && !$selworkflowstate->isUsed()) {
-?>
-<div class="btn-group">
-  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-		<?php echo getMLText('action'); ?>
-    <span class="caret"></span>
-  </a>
-  <ul class="dropdown-menu">
-<?php
-			if(!$selworkflowstate->isUsed()) {
-				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>
-</div>
-<?php
+			$button = array(
+				'label'=>getMLText('action'),
+				'menuitems'=>array(
+				)
+			);
+			$button['menuitems'][] = array('label'=>'<i class="fa fa-remove"></i> '.getMLText("rm_workflow_state"), 'link'=>'../op/op.RemoveWorkflowState.php?workflowstateid='.$selworkflowstate->getID().'&formtoken='.createFormKey('removeworkflowstate'));
+			self::showButtonwithMenu($button);
 		}
 	} /* }}} */
 
@@ -132,7 +112,7 @@ $(document).ready(function() {
 			}
 		}
 ?>
-	<form action="../op/op.WorkflowStatesMgr.php" method="post" class="form-horizontal">
+	<form action="../op/op.WorkflowStatesMgr.php" method="post" class="form-horizontal" id="form1" name="form1">
 <?php
 		if($state) {
 			echo createHiddenFieldWithKey('editworkflowstate');
@@ -189,6 +169,9 @@ $(document).ready(function() {
 
 		$workflowstates = $dms->getAllWorkflowStates();
 
+		$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.'/styles/validation-default.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
 		$this->contentStart();
@@ -222,7 +205,7 @@ $(document).ready(function() {
 		$this->columnEnd();
 		$this->columnStart(8);
 ?>
-			<div class="ajax" data-view="WorkflowStatesMgr" data-action="form" <?php echo ($selworkflowstate ? "data-query=\"workflowstateid=".$selworkflowstate->getID()."\"" : "") ?>></div>
+			<div class="ajax" data-view="WorkflowStatesMgr" data-action="form" data-afterload="()=>{runValidation();}" <?php echo ($selworkflowstate ? "data-query=\"workflowstateid=".$selworkflowstate->getID()."\"" : "") ?>></div>
 <?php
 		$this->columnEnd();
 		$this->rowEnd();

From 9ae4a017050146a5c964743cf93795a62ca2f817 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 May 2021 19:32:39 +0200
Subject: [PATCH 071/143] check if download/viewonline is allowed

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

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index a40fc1df1..4a84d11e2 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -517,9 +517,11 @@ $(document).ready( function() {
 		$this->columnStart(4);
 		if ($file_exists) {
 			if ($viewonlinefiletypes && (in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes) || in_array(strtolower($latestContent->getMimeType()), $viewonlinefiletypes))) {
-				print "<a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$latestContent->getDocument()->getId()."&version=". $latestContent->getVersion()."\">";
+				if($accessop->check_controller_access('ViewOnline', array('action'=>'run')))
+					print "<a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$latestContent->getDocument()->getId()."&version=". $latestContent->getVersion()."\">";
 			} else {
-				print "<a href=\"../op/op.Download.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\">";
+				if($accessop->check_controller_access('Download', array('action'=>'version')))
+					print "<a href=\"../op/op.Download.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\">";
 			}
 		}
 		$previewer->createPreview($latestContent);
@@ -528,7 +530,7 @@ $(document).ready( function() {
 		} else {
 			print "<img class=\"mimeicon\" width=\"".$previewwidthdetail."\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 		}
-		if ($file_exists) {
+		if ($file_exists && ($accessop->check_controller_access('ViewOnline', array('action'=>'run')) || $accessop->check_controller_access('Download', array('action'=>'version')))) {
 			print "</a>";
 		}
 //		print "</td>\n";
@@ -572,9 +574,11 @@ $(document).ready( function() {
 		$this->columnStart(4);
 		if ($file_exists){
 			$items = array();
-			$items[] = array('link'=>"../op/op.Download.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'download', 'label'=>'download');
-			if ($viewonlinefiletypes && (in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes) || in_array(strtolower($latestContent->getMimeType()), $viewonlinefiletypes)))
-				$items[] = array('link'=>"../op/op.ViewOnline.php?documentid=".$latestContent->getDocument()->getId()."&version=". $latestContent->getVersion(), 'icon'=>'eye', 'label'=>'view_online', 'target'=>'_blank');
+			if($accessop->check_controller_access('Download', array('action'=>'version')))
+				$items[] = array('link'=>"../op/op.Download.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'download', 'label'=>'download');
+			if($accessop->check_controller_access('ViewOnline', array('action'=>'run')))
+				if ($viewonlinefiletypes && (in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes) || in_array(strtolower($latestContent->getMimeType()), $viewonlinefiletypes)))
+					$items[] = array('link'=>"../op/op.ViewOnline.php?documentid=".$latestContent->getDocument()->getId()."&version=". $latestContent->getVersion(), 'icon'=>'eye', 'label'=>'view_online', 'target'=>'_blank');
 			if($newitems = $this->callHook('extraVersionViews', $latestContent))
 				$items = array_merge($items, $newitems);
 			if($items) {

From 4d931b74e5ca9966d2761eb6955eaa022340f96f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 May 2021 19:38:26 +0200
Subject: [PATCH 072/143] use jquery validation

---
 views/bootstrap/class.WorkflowActionsMgr.php | 64 ++++++++------------
 1 file changed, 24 insertions(+), 40 deletions(-)

diff --git a/views/bootstrap/class.WorkflowActionsMgr.php b/views/bootstrap/class.WorkflowActionsMgr.php
index 3081a0a97..182e87b12 100644
--- a/views/bootstrap/class.WorkflowActionsMgr.php
+++ b/views/bootstrap/class.WorkflowActionsMgr.php
@@ -33,33 +33,22 @@ class SeedDMS_View_WorkflowActionsMgr extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 ?>
-function checkForm(num)
-{
-	msg = new Array()
-
-	if($("#name").val() == "") msg.push("<?php printMLText("js_no_name");?>");
-	if (msg != "")
-	{
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
+function runValidation() {
+	$("#form1").validate({
+		rules: {
+			name: {
+				required: true
+			},
+		},
+		messages: {
+			name: "<?php printMLText("js_no_name");?>",
+		}
+	});
 }
 
 $(document).ready( function() {
-	$('body').on('submit', '#form', function(ev){
-		if(checkForm()) return;
-		ev.preventDefault();
-	});
 	$( "#selector" ).change(function() {
 		$('div.ajax').trigger('update', {workflowactionid: $(this).val()});
 	});
@@ -106,21 +95,13 @@ $(document).ready( function() {
 		$selworkflowaction = $this->params['selworkflowaction'];
 
 		if($selworkflowaction && !$selworkflowaction->isUsed()) {
-?>
-<div class="btn-group">
-  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-		<?php echo getMLText('action'); ?>
-    <span class="caret"></span>
-  </a>
-  <ul class="dropdown-menu">
-<?php
-			if(!$selworkflowaction->isUsed()) {
-				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>
-</div>
-<?php
+			$button = array(
+				'label'=>getMLText('action'),
+				'menuitems'=>array(
+				)
+			);
+			$button['menuitems'][] = array('label'=>'<i class="fa fa-remove"></i> '.getMLText("rm_workflow_action"), 'link'=>'../op/op.RemoveWorkflowAction.php?workflowactionid='.$selworkflowaction->getID().'&formtoken='.createFormKey('removeworkflowaction'));
+			self::showButtonwithMenu($button);
 		}
 	} /* }}} */
 
@@ -131,7 +112,7 @@ $(document).ready( function() {
 			}
 		}
 ?>
-<form action="../op/op.WorkflowActionsMgr.php" method="post" class="form-horizontal">
+<form action="../op/op.WorkflowActionsMgr.php" method="post" class="form-horizontal" id="form1" name="form1">
 <?php
 		if($action) {
 			echo createHiddenFieldWithKey('editworkflowaction');
@@ -176,6 +157,9 @@ $(document).ready( function() {
 
 		$workflowactions = $dms->getAllWorkflowActions();
 
+		$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.'/styles/validation-default.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
 		$this->contentStart();
@@ -209,7 +193,7 @@ $(document).ready( function() {
 		$this->columnEnd();
 		$this->columnStart(8);
 ?>
-		<div class="ajax" data-view="WorkflowActionsMgr" data-action="form" <?php echo ($selworkflowaction ? "data-query=\"workflowactionid=".$selworkflowaction->getID()."\"" : "") ?>></div>
+		<div class="ajax" data-view="WorkflowActionsMgr" data-action="form" data-afterload="()=>{runValidation();}" <?php echo ($selworkflowaction ? "data-query=\"workflowactionid=".$selworkflowaction->getID()."\"" : "") ?>></div>
 	</div>
 </div>
 

From f187a80ac532c161c30f38a9bf5254b536f724de Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 May 2021 21:54:16 +0200
Subject: [PATCH 073/143] fix php warning because of missing $workflow

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

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 4a84d11e2..81ba70031 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -608,6 +608,7 @@ $(document).ready( function() {
 			}
 		} elseif($workflowmode == 'advanced') {
 			if($accessop->maySetWorkflow()) {
+				$workflow = $latestContent->getWorkflow();
 				if(!$workflow) {
 					$items[] = array('link'=>"../out/out.SetWorkflow.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'random', 'label'=>'set_workflow');
 				}

From 012c3b7d223f881ab5a3f21697d8ede3d11e14c2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Jun 2021 06:48:42 +0200
Subject: [PATCH 074/143] use jquery validatation

---
 views/bootstrap/class.ReviseDocument.php | 80 ++++++++++--------------
 1 file changed, 32 insertions(+), 48 deletions(-)

diff --git a/views/bootstrap/class.ReviseDocument.php b/views/bootstrap/class.ReviseDocument.php
index 351fe54bf..4068505f2 100644
--- a/views/bootstrap/class.ReviseDocument.php
+++ b/views/bootstrap/class.ReviseDocument.php
@@ -33,55 +33,36 @@ class SeedDMS_View_ReviseDocument extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 ?>
-function checkIndForm()
-{
-	msg = new Array();
-	if (document.formind.revisionStatus.value == "") msg.push("<?php printMLText("js_no_revision_status");?>");
-	if (document.formind.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-	if (msg != "") {
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
-function checkGrpForm()
-{
-	msg = new Array();
-	if (document.formgrp.revisionGroup.value == "") msg.push("<?php printMLText("js_no_revision_group");?>");
-	if (document.formgrp.revisionSatus.value == "") msg.push("<?php printMLText("js_no_revision_status");?>");
-	if (document.formgrp.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-	if (msg != "")
-	{
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
 $(document).ready(function() {
-	$('body').on('submit', '#formind', function(ev){
-		if(checkIndForm()) return;
-		event.preventDefault();
+	$("#formind").validate({
+		rules: {
+			comment: {
+				required: true
+			},
+			reviewStatus: {
+				required: true
+			},
+		},
+		messages: {
+			comment: "<?php printMLText("js_no_comment");?>",
+			reviewStatus: "<?php printMLText("js_no_review_status");?>",
+		},
 	});
-	$('body').on('submit', '#formgrp', function(ev){
-		if(checkGrpForm()) return;
-		event.preventDefault();
+	$("#formgrp").validate({
+		rules: {
+			comment: {
+				required: true
+			},
+			reviewStatus: {
+				required: true
+			},
+		},
+		messages: {
+			comment: "<?php printMLText("js_no_comment");?>",
+			reviewStatus: "<?php printMLText("js_no_review_status");?>",
+		},
 	});
 });
 <?php
@@ -103,12 +84,14 @@ $(document).ready(function() {
 			}
 		}
 
+		$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.'/styles/validation-default.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("submit_revision"));
-		$this->contentContainerStart();
 
 		// Display the Revision form.
 		$revisiontype = ($revisionStatus['type'] == 0) ? 'ind' : 'grp';
@@ -131,6 +114,7 @@ $(document).ready(function() {
 	<form class="form-horizontal" method="post" action="../op/op.ReviseDocument.php" id="form<?= $revisiontype ?>" name="form<?= $revisiontype ?>">
 	<?php echo createHiddenFieldWithKey('revisedocument'); ?>
 <?php
+		$this->contentContainerStart();
 		$this->formField(
 			getMLText("comment"),
 			array(
@@ -153,6 +137,7 @@ $(document).ready(function() {
 				'options'=>$options,
 			)
 		);
+		$this->contentContainerEnd();
 		$this->formSubmit(getMLText('submit_revision'), $revisiontype.'Revision');
 ?>
 	<input type='hidden' name='revisionType' value='<?= $revisiontype ?>'/>
@@ -163,7 +148,6 @@ $(document).ready(function() {
 	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
 	</form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From 554b10235621ba950f88822c5184ee5fe9826a69 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Jun 2021 06:49:16 +0200
Subject: [PATCH 075/143] fix layout (still not perfect)

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

diff --git a/views/bootstrap/class.SetRecipients.php b/views/bootstrap/class.SetRecipients.php
index f3083dab7..603576d54 100644
--- a/views/bootstrap/class.SetRecipients.php
+++ b/views/bootstrap/class.SetRecipients.php
@@ -66,13 +66,15 @@ class SeedDMS_View_SetRecipients extends SeedDMS_Theme_Style {
 		}
 ?>
 
+<form class="form-horizontal" action="../op/op.SetRecipients.php" method="post" name="form1">
+	<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
+	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
+
 <?php $this->contentContainerStart(); ?>
 
-<form action="../op/op.SetRecipients.php" method="post" name="form1">
-
-<?php $this->contentSubHeading(getMLText("update_recipients"));?>
-
-  <div class="cbSelectTitle"><?php printMLText("individuals")?>:</div>
+	<div class="control-group">
+		<label class="control-label"><?php printMLText("individuals")?>:</label>
+		<div class="controls">
   <select class="chzn-select span9" name="indRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
 <?php
 
@@ -96,8 +98,12 @@ class SeedDMS_View_SetRecipients extends SeedDMS_Theme_Style {
 		}
 ?>
   </select>
+		</div>
+	</div>
 
-  <div class="cbSelectTitle"><?php printMLText("individuals_in_groups")?>:</div>
+	<div class="control-group">
+		<label class="control-label"><?php printMLText("individuals_in_groups")?>:</label>
+		<div class="controls">
   <select class="chzn-select span9" name="grpIndRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
 <?php
 		foreach ($docAccess["groups"] as $group) {
@@ -105,8 +111,12 @@ class SeedDMS_View_SetRecipients extends SeedDMS_Theme_Style {
 		}
 ?>
   </select>
+		</div>
+	</div>
 
-  <div class="cbSelectTitle"><?php printMLText("groups")?>:</div>
+	<div class="control-group">
+		<label class="control-label"><?php printMLText("groups")?>:</label>
+		<div class="controls">
   <select 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 $group) {
@@ -128,15 +138,15 @@ class SeedDMS_View_SetRecipients extends SeedDMS_Theme_Style {
 		}
 ?>
   </select>
+		</div>
+	</div>
 
-<p>
-<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
-<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
-<input type="submit" class="btn btn-primary" value="<?php printMLText("update");?>">
-</p>
-</form>
 <?php
 		$this->contentContainerEnd();
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('update'));
+?>
+</form>
+<?php
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From 5d6235ec0b97be9036ded46ef5c4ea949e4ae66b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Jun 2021 06:49:55 +0200
Subject: [PATCH 076/143] place submit button outside of contentContainer

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

diff --git a/views/bootstrap/class.SetRevisors.php b/views/bootstrap/class.SetRevisors.php
index 7d7ef29bc..1c5c0135f 100644
--- a/views/bootstrap/class.SetRevisors.php
+++ b/views/bootstrap/class.SetRevisors.php
@@ -69,6 +69,8 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Theme_Style {
 ?>
 
 <form class="form-horizontal" action="../op/op.SetRevisors.php" method="post" name="form1">
+	<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
+	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
 
 <?php
 		$this->contentContainerStart();
@@ -152,8 +154,6 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Theme_Style {
 		</div>
 	</div>
 
-	<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
-	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
 <?php
 		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('update'));

From 7485d0291a76bfa992098b17b686f8bfdbc93a8b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Jun 2021 07:05:59 +0200
Subject: [PATCH 077/143] use jquery validation

---
 views/bootstrap/class.TransmittalMgr.php | 25 +++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
index 4280931b6..22dfa2392 100644
--- a/views/bootstrap/class.TransmittalMgr.php
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -36,13 +36,25 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Theme_Style {
 		$onepage = $this->params['onepage'];
 
 		header('Content-Type: application/javascript; charset=UTF-8');
-		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
+		parent::jsTranslations(array('js_form_error', 'js_form_errors', 'cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
 		$this->printDeleteDocumentButtonJs();
 		$this->printDeleteItemButtonJs();
 		$this->printUpdateItemButtonJs();
 		if($onepage)
 			$this->printClickDocumentJs();
 ?>
+function runValidation() {
+	$("#form1").validate({
+		rules: {
+			name: {
+				required: true
+			},
+		},
+		messages: {
+			name: "<?php printMLText("js_no_name");?>",
+		}
+	});
+}
 $(document).ready( function() {
 	$('body').on('click', '.selecttransmittal', function(ev){
 		ev.preventDefault();
@@ -209,7 +221,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$accessop = $this->params['accessobject'];
 ?>
-	<form action="../op/op.TransmittalMgr.php" method="post" enctype="multipart/form-data" name="form<?php print $transmittal ? $transmittal->getID() : '0';?>">
+	<form action="../op/op.TransmittalMgr.php" method="post" enctype="multipart/form-data" name="form<?php print $transmittal ? $transmittal->getID() : '0';?>" id="form1">
 <?php
 		if($transmittal) {
 			echo createHiddenFieldWithKey('edittransmittal');
@@ -223,6 +235,7 @@ $(document).ready( function() {
 	<input type="hidden" name="action" value="addtransmittal">
 <?php
 		}
+		$this->contentContainerStart();
 		$this->formField(
 			getMLText("name"),
 			array(
@@ -243,6 +256,7 @@ $(document).ready( function() {
 				'value'=>($transmittal ? htmlspecialchars($transmittal->getComment()) : '')
 			)
 		);
+		$this->contentContainerEnd();
 		if($transmittal && $accessop->check_controller_access('TransmittalMgr', array('action'=>'edittransmittal')) || !$transmittal && $accessop->check_controller_access('TransmittalMgr', array('action'=>'addtransmittal'))) {
 			$this->formSubmit("<i class=\"fa fa-save\"></i> ".($transmittal ? getMLText('save') : getMLText('add_transmittal')));
 		}
@@ -319,6 +333,9 @@ $(document).ready( function() {
 		$accessop = $this->params['accessobject'];
 		$seltransmittal = $this->params['seltransmittal'];
 
+		$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.'/styles/validation-default.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("my_transmittals"));
 		$this->globalNavigation();
 		$this->contentStart();
@@ -359,11 +376,9 @@ $(document).ready( function() {
 		$this->columnEnd();
 		$this->columnStart(8);
 		if($accessop->check_view_access($this, array('action'=>'form'))) {
-		$this->contentContainerStart();
 ?>
-		<div class="ajax" data-view="TransmittalMgr" data-action="form" <?php echo ($seltransmittal ? "data-query=\"transmittalid=".$seltransmittal->getID()."\"" : "") ?>></div>
+		<div class="ajax" data-view="TransmittalMgr" data-action="form" data-afterload="()=>{runValidation();}" <?php echo ($seltransmittal ? "data-query=\"transmittalid=".$seltransmittal->getID()."\"" : "") ?>></div>
 <?php
-		$this->contentContainerEnd();
 		}
 		if($accessop->check_view_access($this, array('action'=>'items'))) {
 ?>

From 04a5f21a07f9f6162651c13387ccc61560534831 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Jun 2021 07:06:37 +0200
Subject: [PATCH 078/143] place submit button and graph outside of content
 container

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

diff --git a/views/bootstrap/class.SetWorkflow.php b/views/bootstrap/class.SetWorkflow.php
index a9fbebdd1..3d60834d5 100644
--- a/views/bootstrap/class.SetWorkflow.php
+++ b/views/bootstrap/class.SetWorkflow.php
@@ -67,7 +67,6 @@ $(document).ready( function() {
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("set_workflow"));
 
-		$this->contentContainerStart();
 		// Display the Workflow form.
 		$this->rowStart();
 		$this->columnStart(4);
@@ -81,6 +80,7 @@ $(document).ready( function() {
 		<input type="hidden" name="showtree" value="<?php echo showtree();?>">
 
 <?php
+		$this->contentContainerStart();
 					$mandatoryworkflow = $user->getMandatoryWorkflow();
 					$workflows=$dms->getAllWorkflows();
 					$options = array();
@@ -97,6 +97,7 @@ $(document).ready( function() {
 							'options'=>$options
 						)
 					);
+		$this->contentContainerEnd();
 					$this->formSubmit(getMLText('set_workflow'));
 ?>
 
@@ -116,7 +117,6 @@ $(document).ready( function() {
 <?php
 		$this->columnEnd();
 		$this->rowEnd();
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From d5b21e0eca114d37fd1f8e943edfbe5d6d13909e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Jun 2021 07:15:52 +0200
Subject: [PATCH 079/143] place submit button outside of content container

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

diff --git a/views/bootstrap/class.EditAttributes.php b/views/bootstrap/class.EditAttributes.php
index 80d4c0559..45be4b2ba 100644
--- a/views/bootstrap/class.EditAttributes.php
+++ b/views/bootstrap/class.EditAttributes.php
@@ -45,7 +45,6 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Theme_Style {
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 
 		$this->contentHeading(getMLText("edit_attributes"));
-		$this->contentContainerStart();
 ?>
 <form class="form-horizontal" action="../op/op.EditAttributes.php" name="form1" method="POST">
 	<?php echo createHiddenFieldWithKey('editattributes'); ?>
@@ -53,6 +52,7 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Theme_Style {
 	<input type="hidden" name="version" value="<?php print $version->getVersion();?>">
 
 <?php
+		$this->contentContainerStart();
 		if($attrdefs) {
 			foreach($attrdefs as $attrdef) {
 				$arr = $this->callHook('editDocumentContentAttribute', $version, $attrdef);
@@ -75,11 +75,11 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Theme_Style {
 		} elseif(is_string($arrs)) {
 			echo $arrs;
 		}
+		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From b624cd0a6158e2ed2a84acde332b25462386db02 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Jun 2021 10:48:52 +0200
Subject: [PATCH 080/143] fix getWorkflowState(), can now handle empty state

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

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index c0850dabe..ccb05979a 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -4331,11 +4331,11 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 		if (!$this->_workflowState) {
 			$queryStr=
-				"SELECT b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflowStates` b ON a.`state` = b.`id` WHERE `workflow`=". intval($this->_workflow->getID())
+				"SELECT b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflowStates` b ON a.`state` = b.`id` WHERE a.`state` IS NOT NULL AND `workflow`=". intval($this->_workflow->getID())
 				." AND a.`version`='".$this->_version
 				."' AND a.`document` = '". $this->_document->getID() ."' ";
 			$recs = $db->getResultArray($queryStr);
-			if (is_bool($recs) && !$recs)
+			if (!$recs)
 				return false;
 			$this->_workflowState = new SeedDMS_Core_Workflow_State($recs[0]['id'], $recs[0]['name'], $recs[0]['maxtime'], $recs[0]['precondfunc'], $recs[0]['documentstatus']);
 			$this->_workflowState->setDMS($this->_document->getDMS());
@@ -4497,7 +4497,11 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return true;
 		}
 
-		if(SeedDMS_Core_DMS::checkIfEqual($this->_workflow->getInitState(), $this->getWorkflowState()) || $unlink == true) {
+		/* A workflow should always be in a state, but in case it isn't, the
+		 * at least allow to remove the workflow.
+		 */
+		$currentstate = $this->getWorkflowState();
+		if(!$currentstate || SeedDMS_Core_DMS::checkIfEqual($this->_workflow->getInitState(), $currentstate) || $unlink == true) {
 			$db->startTransaction();
 			$queryStr=
 				"DELETE FROM `tblWorkflowDocumentContent` WHERE "

From 116bf3d5ddade34ae06072b6f1716ac24a5d6f31 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Jun 2021 10:49:32 +0200
Subject: [PATCH 081/143] getNextTransitions() returns false if passed state is
 empty

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

diff --git a/SeedDMS_Core/Core/inc.ClassWorkflow.php b/SeedDMS_Core/Core/inc.ClassWorkflow.php
index 0374bfafb..329b79cc9 100644
--- a/SeedDMS_Core/Core/inc.ClassWorkflow.php
+++ b/SeedDMS_Core/Core/inc.ClassWorkflow.php
@@ -199,6 +199,9 @@ class SeedDMS_Core_Workflow { /* {{{ */
 	function getNextTransitions($state) { /* {{{ */
 		$db = $this->_dms->getDB();
 
+		if(!$state)
+			return false;
+
 		$queryStr = "SELECT * FROM `tblWorkflowTransitions` WHERE `workflow`=".$this->_id." AND `state`=".$state->getID();
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr == false)

From 1ef9e60297233f3d81378509821983f35413b677 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Jun 2021 10:50:28 +0200
Subject: [PATCH 082/143] add note for 5.1.23

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

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 8be3616fd..01f4f435f 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -27,6 +27,7 @@
 - SeedDMS_Core_DMS::getTimeline() uses status log instead of document content
 - add methods SeedDMS_Core_DocumentContent::getReviewers() and SeedDMS_Core_DocumentContent::getApprovers()	
 - add methods SeedDMS_Core_DocumentContent::getApproveLog() and SeedDMS_Core_DocumentContent::getReviewLog()
+- better handling of document with an empty workflow state
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 3003d6d0d385deef26faefb7dade4a11aadfa02f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Jun 2021 10:50:55 +0200
Subject: [PATCH 083/143] check for non empty workflow state

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

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 3f0b99b07..d4c904f8c 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -162,7 +162,8 @@ class SeedDMS_AccessOperation {
 		if($this->obj->isType('document')) {
 			$latestContent = $this->obj->getLatestContent();
 			$workflow = $latestContent->getWorkflow();
-			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && (!$workflow || ($workflow->getInitState()->getID() == $latestContent->getWorkflowState()->getID()))) {
+			$workflowstate = $latestContent->getWorkflowState();
+			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && (!$workflow || ($workflowstate && ($workflow->getInitState()->getID() == $workflowstate->getID())))) {
 				return true;
 			}
 		}
@@ -226,7 +227,8 @@ class SeedDMS_AccessOperation {
 			$latestContent = $this->obj->getLatestContent();
 			$status = $latestContent->getStatus();
 			$workflow = $latestContent->getWorkflow();
-			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) && (in_array($status["status"], array(S_DRAFT_REV, S_DRAFT_APP)) || ($workflow && $workflow->getInitState()->getID() == $latestContent->getWorkflowState()->getID()))) {
+			$workflowstate = $latestContent->getWorkflowState();
+			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) && (in_array($status["status"], array(S_DRAFT_REV, S_DRAFT_APP)) || ($workflow && $workflowstate && $workflow->getInitState()->getID() == $workflowstate->getID()))) {
 				return true;
 			}
 		}

From 6de32dcc2c0b19e1bd752bd6b26def2066cac8a8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Jun 2021 10:51:16 +0200
Subject: [PATCH 084/143] add class 'table-sm'

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

diff --git a/views/bootstrap/class.ApprovalSummary.php b/views/bootstrap/class.ApprovalSummary.php
index f4094d53d..d11d47976 100644
--- a/views/bootstrap/class.ApprovalSummary.php
+++ b/views/bootstrap/class.ApprovalSummary.php
@@ -80,7 +80,7 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Theme_Style {
 			if ($document && $version) {
 
 				if ($printheader){
-					print "<table class=\"table table-condensed\">";
+					print "<table class=\"table table-condensed table-sm\">";
 					print "<thead>\n<tr>\n";
 					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";
@@ -122,7 +122,7 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Theme_Style {
 			if (!in_array($st["documentID"], $iRev) && $document && $version) {
 
 				if ($printheader){
-					print "<table class=\"table table-condensed\">";
+					print "<table class=\"table table-condensed table-sm\">";
 					print "<thead>\n<tr>\n";
 					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";

From 3366d9a1493efa132ecf1b7cb2a82ff177ea2364 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Jun 2021 10:52:00 +0200
Subject: [PATCH 085/143] check for workflow state != null

---
 .../class.RemoveWorkflowFromDocument.php      | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/views/bootstrap/class.RemoveWorkflowFromDocument.php b/views/bootstrap/class.RemoveWorkflowFromDocument.php
index e80a73897..98fa89fac 100644
--- a/views/bootstrap/class.RemoveWorkflowFromDocument.php
+++ b/views/bootstrap/class.RemoveWorkflowFromDocument.php
@@ -49,18 +49,22 @@ class SeedDMS_View_RemoveWorkflowFromDocument extends SeedDMS_Theme_Style {
 		$wkflog = $latestContent->getWorkflowLog();
 		$workflow = $latestContent->getWorkflow();
 
-		$msg = "The document is currently in state: ".$currentstate->getName()."<br />";
-		if($wkflog) {
-			foreach($wkflog as $entry) {
-				if($entry->getTransition()->getNextState()->getID() == $currentstate->getID()) {
-					$enterdate = $entry->getDate();
-					$enterts = makeTsFromLongDate($enterdate);
+		if($currentstate) {
+			$msg = "The document is currently in state: ".$currentstate->getName()."<br />";
+			if($wkflog) {
+				foreach($wkflog as $entry) {
+					if($entry->getTransition()->getNextState()->getID() == $currentstate->getID()) {
+						$enterdate = $entry->getDate();
+						$enterts = makeTsFromLongDate($enterdate);
+					}
 				}
+				$msg .= "The state was entered at ".$enterdate." which was ";
+				$msg .= getReadableDuration((time()-$enterts))." ago.<br />";
 			}
-			$msg .= "The state was entered at ".$enterdate." which was ";
-			$msg .= getReadableDuration((time()-$enterts))." ago.<br />";
+			$msg .= "The document may stay in this state for ".$currentstate->getMaxTime()." sec.";
+		} else {
+			$msg = getMLText('workflow_in_unknown_state');
 		}
-		$msg .= "The document may stay in this state for ".$currentstate->getMaxTime()." sec.";
 		$this->infoMsg($msg);
 
 		$this->contentContainerStart();

From 0ba0724e82f8f55b208df8dda95dec4671273afd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Jun 2021 10:52:26 +0200
Subject: [PATCH 086/143] add class 'table-sm'

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

diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php
index 39b669cd1..46154d32b 100644
--- a/views/bootstrap/class.ReviewSummary.php
+++ b/views/bootstrap/class.ReviewSummary.php
@@ -83,7 +83,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Theme_Style {
 			if ($document && $version) {
 
 				if ($printheader){
-					print "<table class=\"table table-condensed\">";
+					print "<table class=\"table table-condensed table-sm\">";
 					print "<thead>\n<tr>\n";
 					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";
@@ -126,7 +126,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Theme_Style {
 			if (!in_array($st["documentID"], $iRev) && $document && $version) {
 
 				if ($printheader){
-					print "<table class=\"table table-condensed\">";
+					print "<table class=\"table table-condensed table-sm\">";
 					print "<thead>\n<tr>\n";
 					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";
@@ -138,7 +138,6 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Theme_Style {
 				}
 
 				$class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : ''));
-//				print "<tr id=\"table-row-document-".$st['documentID']."\" class=\"table-row-document".$class."\" rel=\"document_".$st['documentID']."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
 				echo $this->documentListRowStart($document, $class);
 				echo $this->documentListRow($document, $previewer, true, $st['version']);
 				print "<td><small>".getReviewStatusText($st['status'])."<br />".$st["date"]."<br />". htmlspecialchars($modgroup->getName()) ."</small></td>";

From 822aef2e53ee089d479814e29e06acded091b181 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Jun 2021 10:52:45 +0200
Subject: [PATCH 087/143] check if current workflow state != null

---
 views/bootstrap/class.RewindWorkflow.php | 26 +++++++++++++-----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/views/bootstrap/class.RewindWorkflow.php b/views/bootstrap/class.RewindWorkflow.php
index 3d2a4c63b..09b142c69 100644
--- a/views/bootstrap/class.RewindWorkflow.php
+++ b/views/bootstrap/class.RewindWorkflow.php
@@ -49,26 +49,29 @@ class SeedDMS_View_RewindWorkflow extends SeedDMS_Theme_Style {
 		$wkflog = $latestContent->getWorkflowLog();
 		$workflow = $latestContent->getWorkflow();
 
-		$msg = "The document is currently in state: ".$currentstate->getName()."<br />";
-		if($wkflog) {
-			foreach($wkflog as $entry) {
-				if($entry->getTransition()->getNextState()->getID() == $currentstate->getID()) {
-					$enterdate = $entry->getDate();
-					$enterts = makeTsFromLongDate($enterdate);
+		if($currentstate) {
+			$msg = "The document is currently in state: ".$currentstate->getName()."<br />";
+			if($wkflog) {
+				foreach($wkflog as $entry) {
+					if($entry->getTransition()->getNextState()->getID() == $currentstate->getID()) {
+						$enterdate = $entry->getDate();
+						$enterts = makeTsFromLongDate($enterdate);
+					}
 				}
+				$msg .= "The state was entered at ".$enterdate." which was ";
+				$msg .= getReadableDuration((time()-$enterts))." ago.<br />";
 			}
-			$msg .= "The state was entered at ".$enterdate." which was ";
-			$msg .= getReadableDuration((time()-$enterts))." ago.<br />";
+			$msg .= "The document may stay in this state for ".$currentstate->getMaxTime()." sec.";
+		} else {
+			$msg = getMLText('workflow_in_unknown_state');
 		}
-		$msg .= "The document may stay in this state for ".$currentstate->getMaxTime()." sec.";
 		$this->infoMsg($msg);
 
-		$this->contentContainerStart();
 		// Display the Workflow form.
 		$this->rowStart();
 		$this->columnStart(4);
 ?>
-	<p><?php printMLText("rewind_workflow_warning"); ?></p>
+	<?php $this->warningMsg(getMLText("rewind_workflow_warning")); ?>
 	<form method="post" action="../op/op.RewindWorkflow.php" name="form1">
 	<?php echo createHiddenFieldWithKey('rewindworkflow'); ?>
 	<input type='hidden' name='documentid' value='<?php echo $document->getId(); ?>'/>
@@ -85,7 +88,6 @@ class SeedDMS_View_RewindWorkflow extends SeedDMS_Theme_Style {
 <?php
 		$this->columnEnd();
 		$this->rowEnd();
-		$this->contentContainerEnd();
 
 		if($wkflog) {
 			echo "<table class=\"table table-condensed table-sm\">";

From 0f072fc9a95d17f6d988c82751301c7e28b093a7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Jun 2021 10:54:06 +0200
Subject: [PATCH 088/143] check if current workflow state != null

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

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 81ba70031..5d8487334 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -704,13 +704,17 @@ $(document).ready( function() {
 		$reverselinks = SeedDMS_Core_DMS::filterDocumentLinks($user, $reverselinks, 'source');
 
 		$needwkflaction = false;
+		$transitions = array();
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 		} elseif($workflowmode == 'advanced') {
 			$workflow = $latestContent->getWorkflow();
 			if($workflow) {
-				$workflowstate = $latestContent->getWorkflowState();
-				$transitions = $workflow->getNextTransitions($workflowstate);
-				$needwkflaction = $latestContent->needsWorkflowAction($user);
+				if($workflowstate = $latestContent->getWorkflowState()) {
+					$transitions = $workflow->getNextTransitions($workflowstate);
+					$needwkflaction = $latestContent->needsWorkflowAction($user);
+				} else {
+					$this->warningMsg(getMLText('workflow_in_unknown_state'));
+				}
 			}
 		}
 
@@ -1096,7 +1100,7 @@ $(document).ready( function() {
 				$this->columnStart(12);
 			$this->contentContainerStart();
 			if($user->isAdmin()) {
-				if(SeedDMS_Core_DMS::checkIfEqual($workflow->getInitState(), $latestContent->getWorkflowState())) {
+				if(!$workflowstate || SeedDMS_Core_DMS::checkIfEqual($workflow->getInitState(), $workflowstate)) {
 					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 btn-danger\"><i class=\"fa fa-refresh\"></i> ".getMLText('rewind_workflow')."</button></form>";
@@ -1107,7 +1111,7 @@ $(document).ready( function() {
 			if($parentworkflow = $latestContent->getParentWorkflow()) {
 				echo "<p>Sub workflow of '".htmlspecialchars($parentworkflow->getName())."'</p>";
 			}
-			echo "<h5>".getMLText('current_state').": ".htmlspecialchars($workflowstate->getName())."</h5>";
+			echo "<h5>".getMLText('current_state').": ".($workflowstate ? htmlspecialchars($workflowstate->getName()) : htmlspecialchars(getMLText('workflow_in_unknown_state')))."</h5>";
 			echo "<table class=\"table table-condensed table-sm\">\n";
 			echo "<tr>";
 			echo "<td>".getMLText('next_state').":</td>";
@@ -1211,7 +1215,7 @@ $(document).ready( function() {
 			if($workflows) {
 				$subworkflows = array();
 				foreach($workflows as $wkf) {
-					if($wkf->getInitState()->getID() == $workflowstate->getID()) {
+					if($workflowstate && ($wkf->getInitState()->getID() == $workflowstate->getID())) {
 						if($workflow->getID() != $wkf->getID()) {
 							$subworkflows[] = $wkf;
 						}

From 2ef409c197e07b5a57770292c8796144559172fc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Jun 2021 10:54:32 +0200
Subject: [PATCH 089/143] make it look like Review/Approval summary

---
 views/bootstrap/class.WorkflowSummary.php | 71 ++++++-----------------
 1 file changed, 17 insertions(+), 54 deletions(-)

diff --git a/views/bootstrap/class.WorkflowSummary.php b/views/bootstrap/class.WorkflowSummary.php
index 8060ec77d..19b79c1d1 100644
--- a/views/bootstrap/class.WorkflowSummary.php
+++ b/views/bootstrap/class.WorkflowSummary.php
@@ -70,46 +70,27 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Theme_Style {
 			$document = $dms->getDocument($st['document']);
 			if($document)
 				$version = $document->getContentByVersion($st['version']);
-			$workflow = $dms->getWorkflow($st['workflow']);
-			$state = $dms->getWorkflowState($st['state']);
-			$owner = $document->getOwner();
 			$moduser = $dms->getUser($st['userid']);
 
 			if ($document && $version) {
 			
 				if ($printheader){
-					print "<table class=\"table table-condensed\">";
+					print "<table class=\"table table-condensed table-sm\">";
 					print "<thead>\n<tr>\n";
 					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";
-					print "<th>".getMLText("version")."</th>\n";
-					print "<th>".getMLText("owner")."</th>\n";
-					print "<th>".getMLText("workflow")."</th>\n";
-					print "<th>".getMLText("workflow_state")."</th>\n";
+					print "<th>".getMLText("status")."</th>\n";
+					print "<th>".getMLText("action")."</th>\n";
 					print "<th>".getMLText("last_update")."</th>\n";
-					print "<th>".getMLText("expires")."</th>\n";
 					print "</tr>\n</thead>\n<tbody>\n";
 					$printheader=false;
 				}
 			
-				$previewer->createPreview($version);
-				print "<tr>\n";
-				print "<td><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$st['version']."\">";
-				if($previewer->hasPreview($version)) {
-					print "<img class=\"mimeicon\" width=\"".$previewwidth."\" src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
-				} else {
-					print "<img class=\"mimeicon\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
-				}
-				print "</a></td>";
-				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["document"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName());
-				print "</a></td>";
-				print "<td>".$st["version"]."</td>";
-				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-				print "<td>".$workflow->getName()."</td>";
-				print "<td>".$state->getName()."</td>";
-				print "<td>".$st["date"]." ". htmlspecialchars($moduser->getFullName()) ."</td>";
-				print "<td>".(!$document->expires() ? "-":getReadableDate($document->getExpires()))."</td>";				
-				print "</tr>\n";
+				echo $this->documentListRowStart($document, $class);
+				echo $this->documentListRow($document, $previewer, true, $st['version']);
+				print "<td><small>".getLongReadableDate($st["date"])."<br />". htmlspecialchars($moduser->getFullName()) ."</small></td>";
+				echo $this->documentListRowEnd($document);
+				$iRev[] = $document->getId();
 			}
 		}
 		if (!$printheader) {
@@ -125,45 +106,27 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Theme_Style {
 			$document = $dms->getDocument($st['document']);
 			if($document)
 				$version = $document->getContentByVersion($st['version']);
-			$workflow = $dms->getWorkflow($st['workflow']);
-			$state = $dms->getWorkflowState($st['state']);
-			$owner = $document->getOwner();
 			$modgroup = $dms->getGroup($st['groupid']);
 
 			if (!in_array($st["document"], $iRev) && $document && $version) {
 			
 				if ($printheader){
-					print "<table class=\"table table-condensed\">";
+					print "<table class=\"table table-condensed table-sm\">";
 					print "<thead>\n<tr>\n";
 					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";
-					print "<th>".getMLText("version")."</th>\n";
-					print "<th>".getMLText("owner")."</th>\n";
-					print "<th>".getMLText("workflow")."</th>\n";
-					print "<th>".getMLText("workflow_state")."</th>\n";
+					print "<th>".getMLText("status")."</th>\n";
+					print "<th>".getMLText("action")."</th>\n";
 					print "<th>".getMLText("last_update")."</th>\n";
-					print "<th>".getMLText("expires")."</th>\n";
 					print "</tr>\n</thead>\n<tbody>\n";
 					$printheader=false;
-				}		
-			
-				$previewer->createPreview($version);
-				print "<tr>\n";
-				print "<td><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$st['version']."\">";
-				if($previewer->hasPreview($version)) {
-					print "<img class=\"mimeicon\" width=\"".$previewwidth."\" src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
-				} else {
-					print "<img class=\"mimeicon\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
 				}
-				print "</a></td>";
-				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["document"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
-				print "<td>".$st["version"]."</td>";
-				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-				print "<td>".$workflow->getName()."</td>";
-				print "<td>".$state->getName()."</td>";
-				print "<td>".$st["date"]." ". htmlspecialchars($modgroup->getName()) ."</td>";
-				print "<td>".(!$document->expires() ? "-":getReadableDate($document->getExpires()))."</td>";				
-				print "</tr>\n";
+			
+				echo $this->documentListRowStart($document, $class);
+				echo $this->documentListRow($document, $previewer, true, $st['version']);
+				print "<td><small>".getLongReadableDate($st["date"])."<br />". htmlspecialchars($moduser->getFullName()) ."</small></td>";
+				echo $this->documentListRowEnd($document);
+				$iRev[] = $document->getId();
 			}
 		}
 		if (!$printheader) {

From 0d5ba3bc1e435626aede7d144ed1702dcf45a28c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 7 Jun 2021 21:15:18 +0200
Subject: [PATCH 090/143] pass $logger to migrate()

---
 inc/inc.ClassExtensionMgr.php | 4 ++--
 op/op.ExtensionMgr.php        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index a5a308c57..d098ad4d3 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -304,7 +304,7 @@ class SeedDMS_Extension_Mgr {
 	 * @param SeedDMS_Core_DMS $dms
 	 * @return boolean true on success, false on error
 	 */
-	public function migrate($extname, $settings, $dms) { /* {{{ */
+	public function migrate($extname, $settings, $dms, $logger) { /* {{{ */
 		if(!isset($this->extconf[$extname]))
 			return false;
 		$extconf = $this->extconf[$extname];
@@ -313,7 +313,7 @@ class SeedDMS_Extension_Mgr {
 			$classfile = $settings->_rootDir."/ext/".$extname."/".$extconf['class']['file'];
 			if(file_exists($classfile)) {
 				require_once($classfile);
-				$obj = new $extconf['class']['name']($settings, $dms);
+				$obj = new $extconf['class']['name']($settings, $dms, $logger);
 				if(method_exists($obj, 'migrate'))
 					$ret = $obj->migrate();
 			}
diff --git a/op/op.ExtensionMgr.php b/op/op.ExtensionMgr.php
index 0ef4dd3f0..528b6aa66 100644
--- a/op/op.ExtensionMgr.php
+++ b/op/op.ExtensionMgr.php
@@ -145,7 +145,7 @@ elseif ($action == "toggle") { /* {{{ */
 		if($settings->extensionIsDisabled($extname))
 			echo json_encode(array('success'=>true, 'msg'=>getMLText('extension_is_off_now')));
 		else {
-			$ret = $extMgr->migrate($extname, $settings, $dms);
+			$ret = $extMgr->migrate($extname, $settings, $dms, $logger);
 			if($ret !== null) {
 				if($ret === true)
 					echo json_encode(array('success'=>true, 'msg'=>getMLText('extension_migration_success')));

From 54b403882e245cb4e13fec3d08bc2bbec0a44d45 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 8 Jun 2021 07:07:34 +0200
Subject: [PATCH 091/143] fix downloading log file

---
 op/op.Download.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/op/op.Download.php b/op/op.Download.php
index 1fe1d7e73..c694bd128 100644
--- a/op/op.Download.php
+++ b/op/op.Download.php
@@ -155,18 +155,18 @@ elseif (isset($_GET["logname"])) { /* {{{ */
 		UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
 	}
 
-	if (!file_exists($settings->_contentDir.$filename) ) {
+	if (!file_exists($settings->_contentDir.'log/'.$filename) ) {
 		UI::exitError(getMLText("admin_tools"),getMLText("missing_file"));
 	}
 
 	header("Content-Type: text/plain");
 	header("Content-Transfer-Encoding: binary");
-	header("Content-Length: " . filesize($settings->_contentDir . $filename ));
+	header("Content-Length: " . filesize($settings->_contentDir.'log/' . $filename ));
 	$efilename = rawurlencode($filename);
 	header("Content-Disposition: attachment; filename=\"" .$efilename . "\"; filename*=UTF-8''".$efilename);
 	header("Cache-Control: must-revalidate");
 
-	sendFile($settings->_contentDir .$filename );
+	sendFile($settings->_contentDir . 'log/' . $filename );
 	
 } /* }}} */
 elseif (isset($_GET["vfile"])) { /* {{{ */

From 290a01c2b17de6d96fae1a1019db2d0268842238 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 8 Jun 2021 09:01:30 +0200
Subject: [PATCH 092/143] logo can be set in extraheader

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

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 921e0a846..f778753d1 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -31,7 +31,7 @@ class SeedDMS_Theme_Style extends SeedDMS_View_Common {
 
 	function __construct($params, $theme='bootstrap') {
 		parent::__construct($params, $theme);
-		$this->extraheader = array('js'=>'', 'css'=>'', 'favicon'=>'');
+		$this->extraheader = array('js'=>'', 'css'=>'', 'favicon'=>'', 'logo'=>'');
 		$this->footerjs = array();
 		$this->nonces = array();
 	}
@@ -303,7 +303,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "   <a class=\"btn btn-navbar\" href=\"../op/op.Logout.php\">\n";
 		echo "     <span class=\"fa fa-sign-out\"></span>\n";
 		echo "   </a>\n";
-		echo "   <a href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\"><img src=\"../views/bootstrap/images/seeddms-logo.svg\"></a>";
+		if(!empty($this->extraheader['favicon']))
+			echo $this->extraheader['favicon'];
+		echo "   <a href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\">".(!empty($this->extraheader['logo']) ? '<img src="'.$this->extraheader['logo'].'">' : '<img src="../views/bootstrap/images/seeddms-logo.svg">')."</a>";
 		echo "   <a class=\"brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\"><span class=\"hidden-phone\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</span></a>\n";
 
 		/* user profile menu {{{ */
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index e30ca8bed..531662e87 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -31,7 +31,7 @@ class SeedDMS_Theme_Style extends SeedDMS_View_Common {
 
 	function __construct($params, $theme='bootstrap') {
 		parent::__construct($params, $theme);
-		$this->extraheader = array('js'=>'', 'css'=>'', 'favicon'=>'');
+		$this->extraheader = array('js'=>'', 'css'=>'', 'favicon'=>'', 'logo'=>'');
 		$this->footerjs = array();
 		$this->nonces = array();
 	}
@@ -305,7 +305,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$dms = $this->params['dms'];
 		$accessobject = $this->params['accessobject'];
 		echo "<nav class=\"navbar navbar-expand-lg navbar-dark bg-dark border-bottom fixed-top\">\n";
-		echo " <a class=\"navbar-brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\"><img src=\"../views/bootstrap/images/seeddms-logo.svg\"> <span class=\"d-none d-md-inline-block ml-4\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</span></a>\n";
+		echo " <a class=\"navbar-brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\">".(!empty($this->extraheader['logo']) ? '<img src="'.$this->extraheader['logo'].'">' : '<img src="../views/bootstrap4/images/seeddms-logo.svg">')." <span class=\"d-none d-md-inline-block ml-4\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</span></a>\n";
 
 		if(isset($this->params['user']) && $this->params['user']) {
 			/* search form {{{ */

From dfb6061b4193b5eee3d6789a746ecba31afb76b0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 8 Jun 2021 18:16:43 +0200
Subject: [PATCH 093/143] fix classes of table

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

diff --git a/views/bootstrap/class.MyAccount.php b/views/bootstrap/class.MyAccount.php
index bc8149d26..69b27cd84 100644
--- a/views/bootstrap/class.MyAccount.php
+++ b/views/bootstrap/class.MyAccount.php
@@ -63,7 +63,7 @@ class SeedDMS_View_MyAccount extends SeedDMS_Theme_Style {
 			$this->columnStart(12);
 		}
 
-		print "<table class=\"table-condensed\">\n";
+		print "<table class=\"table table-condensed table-sm\">\n";
 		print "<tr>\n";
 		print "<td>".getMLText("name")." : </td>\n";
 		print "<td>".htmlspecialchars($user->getFullName()).($user->isAdmin() ? " (".getMLText("admin").")" : "")."</td>\n";

From ab546099f189b77110e7a6ca0cdd71b97d564918 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Jun 2021 09:09:36 +0200
Subject: [PATCH 094/143] fix possible CSRF attack by setting document name

---
 op/op.Ajax.php                         | 35 +++++++++++++++-----------
 views/bootstrap/class.Bootstrap.php    |  2 +-
 views/bootstrap4/class.Bootstrap4.php  |  2 +-
 views/bootstrap4/styles/application.js |  3 +--
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index e91ee335d..965a8156d 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -614,29 +614,34 @@ switch($command) {
 		break; /* }}} */
 
 	case 'setdocumentname': /* {{{ */
-		if(1||$user) {
-			$document = $dms->getDocument($_REQUEST['id']);
-			if($document) {
-				if ($document->getAccessMode($user) >= M_READWRITE) {
-					$oldname = $document->getName();
-					if (!$document->setName($_REQUEST['name'])) {
-						header('Content-Type: application/json');
-						echo json_encode(array('success'=>false, 'message'=>'Error setting name', 'data'=>''));
-					} else {
-						if($notifier) {
-							$notifier->sendChangedNameMail($document, $user, $oldname);
+		if($user) {
+			if(checkFormKey('setdocumentname')) {
+				$document = $dms->getDocument($_REQUEST['id']);
+				if($document) {
+					if ($document->getAccessMode($user) >= M_READWRITE) {
+						$oldname = $document->getName();
+						if (!$document->setName($_REQUEST['name'])) {
+							header('Content-Type: application/json');
+							echo json_encode(array('success'=>false, 'message'=>'Error setting name', 'data'=>''));
+						} else {
+							if($notifier) {
+								$notifier->sendChangedNameMail($document, $user, $oldname);
+							}
+							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'=>true, 'message'=>getMLText('splash_document_name_changed'), 'data'=>''));
-						add_log_line();
+						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('access_denied'), 'data'=>''));
+					echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id'), 'data'=>''));
 				}
 			} else {
 				header('Content-Type: application/json');
-				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id'), 'data'=>''));
+				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
 			}
 		}
 		break; /* }}} */
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index f778753d1..ab4dba193 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2307,7 +2307,7 @@ $(function() {
 		if(!empty($this->params['settings']->_inlineEditing)) {
 			echo "<span class=\"editable\" contenteditable=\"true\"";
 			if($object->isType('document'))
-				echo " data-document=\"".$object->getId()."\"";
+				echo " data-document=\"".$object->getId()."\" data-formtoken=\"".createFormKey('setdocumentname')."\"";
 			echo ">".$text;
 			echo "</span>\n";
 		} else
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 531662e87..eb509332d 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -2348,7 +2348,7 @@ $(function() {
 		if(!empty($this->params['settings']->_inlineEditing)) {
 			echo "<span class=\"editable\" contenteditable=\"true\"";
 			if($object->isType('document'))
-				echo " data-document=\"".$object->getId()."\"";
+				echo " data-document=\"".$object->getId()."\" data-formtoken=\"".createFormKey('setdocumentname')."\"";
 			echo ">".$text;
 			echo "</span>\n";
 		} else
diff --git a/views/bootstrap4/styles/application.js b/views/bootstrap4/styles/application.js
index e8d1cd6e6..fb0db9907 100644
--- a/views/bootstrap4/styles/application.js
+++ b/views/bootstrap4/styles/application.js
@@ -617,9 +617,8 @@ $(document).ready( function() {
 
 	$("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() })
+		$.post( "../op/op.Ajax.php", { command: "setdocumentname", id: $(this).data('document'), formtoken: $(this).data('formtoken'), name: $(this).text() })
 			.done(function( data ) {
 				noty({
 					text: data.message,

From 59130d1756f92ba22895693ddd96fd03dc185389 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Jun 2021 17:20:16 +0200
Subject: [PATCH 095/143] fix listing users in form

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

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index be607a93b..77f96887b 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -235,7 +235,7 @@ function typeahead() { /* {{{ */
 		);
 		$options = array();
 		foreach ($allUsers as $currUser) {
-			if($user->isAdmin() || (!$currUser->isGuest() && (!$currObj->isHidden() || $currObj->getID() == $user->getID())))
+			if($user->isAdmin() || (!$currUser->isGuest() && (!$currUser->isHidden() || $currUser->getID() == $user->getID())))
 				$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()), in_array($currUser->getID(), $owner), array(array('data-subtitle', htmlspecialchars($currUser->getFullName()))));
 		}
 		$this->formField(
@@ -432,7 +432,7 @@ function typeahead() { /* {{{ */
 			if(!isset($facets['owner'])) {
 			$options = array();
 			foreach ($allUsers as $currUser) {
-				if($user->isAdmin() || (!$currUser->isGuest() && (!$currObj->isHidden() || $currObj->getID() == $user->getID())))
+				if($user->isAdmin() || (!$currUser->isGuest() && (!$currUser->isHidden() || $currUser->getID() == $user->getID())))
 					$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()), in_array($currUser->getID(), $owner), array(array('data-subtitle', htmlspecialchars($currUser->getFullName()))));
 			}
 			$this->formField(
@@ -525,7 +525,6 @@ foreach($facets as $facetname=>$values) {
 ?>
 	</div>
 <?php
-		echo "</div>";
 		$this->columnEnd();
 		$this->columnStart(8);
 		$this->contentHeading(getMLText('search_results'));

From 22c4649d277e81fd9eb7db8f619b06bf99a794d3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Jun 2021 17:23:42 +0200
Subject: [PATCH 096/143] fix html for unfolding search form

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

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 77f96887b..1cde6daee 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -525,6 +525,9 @@ foreach($facets as $facetname=>$values) {
 ?>
 	</div>
 <?php
+		if($this->query) {
+			echo "</div>\n";
+		}
 		$this->columnEnd();
 		$this->columnStart(8);
 		$this->contentHeading(getMLText('search_results'));

From e425120d7da51edb7808155d856b338a356dfbf4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 16 Jun 2021 08:02:32 +0200
Subject: [PATCH 097/143] mails listing expired documents can be send for each
 owner

---
 inc/inc.Tasks.php | 62 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 47 insertions(+), 15 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 290604eaa..5c37c717a 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -24,27 +24,52 @@ class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 		$settings = $this->settings;
 		$logger = $this->logger;
 		$taskparams = $task->getParameter();
-		$docs = $dms->getDocumentsExpired(intval($taskparams['days']));
 		$tableformat = " %-10s %5d %-60s";
 		$tableformathead = " %-10s %5s %-60s";
 		$tableformathtml = "<tr><td>%s</td><td>%d</td><td>%s</td></tr>";
 		$tableformatheadhtml = "<tr><th>%s</th><th>%s</th><th>%s</th></tr>";
 		$body = '';
 		$bodyhtml = '';
-		if (count($docs)>0) {
-			$bodyhtml .= "<table>".PHP_EOL;
-			$bodyhtml .= sprintf($tableformatheadhtml."\n", getMLText("expiration_date", array(), ""), "ID", getMLText("name", array(), ""));
-			$body .= sprintf($tableformathead."\n", getMLText("expiration_date", array(), ""), "ID", getMLText("name", array(), ""));
-			$body .= "---------------------------------------------------------------------------------\n";
-			foreach($docs as $doc) {
-				$body .= sprintf($tableformat."\n", getReadableDate($doc->getExpires()), $doc->getId(), $doc->getName());
-				$bodyhtml .= sprintf($tableformathtml."\n", getReadableDate($doc->getExpires()), $doc->getId(), $doc->getName());
-			}
-			$bodyhtml .= "</table>".PHP_EOL;
-			if($taskparams['email'])
-				require_once('inc/inc.ClassEmailNotify.php');
-				$email = new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword);
 
+		require_once('inc/inc.ClassEmailNotify.php');
+		$email = new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword);
+
+		if(!empty($taskparams['peruser'])) {
+			$users = $dms->getAllUsers();
+			foreach($users as $u) {
+				$docs = $dms->getDocumentsExpired(intval($taskparams['days']), $u);
+				if (count($docs)>0) {
+					$bodyhtml .= "<table>".PHP_EOL;
+					$bodyhtml .= sprintf($tableformatheadhtml."\n", getMLText("expires", array(), ""), "ID", getMLText("name", array(), ""));
+					$body .= sprintf($tableformathead."\n", getMLText("expires", array(), ""), "ID", getMLText("name", array(), ""));
+					$body .= "---------------------------------------------------------------------------------\n";
+					foreach($docs as $doc) {
+						$body .= sprintf($tableformat."\n", getReadableDate($doc->getExpires()), $doc->getId(), $doc->getName());
+						$bodyhtml .= sprintf($tableformathtml."\n", getReadableDate($doc->getExpires()), $doc->getId(), $doc->getName());
+					}
+					$bodyhtml .= "</table>".PHP_EOL;
+					$params = array();
+					$params['count'] = count($docs);
+					$params['__body__'] = $body;
+					$params['__body_html__'] = $bodyhtml;
+					$params['sitename'] = $settings->_siteName;
+					$email->toIndividual('', $u, 'expired_docs_mail_subject', '', $params);
+
+					$logger->log('Task \'expired_docs\': Sending reminder \'expired_docs_mail_subject\' to user \''.$u->getLogin().'\'', PEAR_LOG_INFO);
+				}
+			}
+		} elseif($taskparams['email']) {
+			$docs = $dms->getDocumentsExpired(intval($taskparams['days']));
+			if (count($docs)>0) {
+				$bodyhtml .= "<table>".PHP_EOL;
+				$bodyhtml .= sprintf($tableformatheadhtml."\n", getMLText("expiration_date", array(), ""), "ID", getMLText("name", array(), ""));
+				$body .= sprintf($tableformathead."\n", getMLText("expiration_date", array(), ""), "ID", getMLText("name", array(), ""));
+				$body .= "---------------------------------------------------------------------------------\n";
+				foreach($docs as $doc) {
+					$body .= sprintf($tableformat."\n", getReadableDate($doc->getExpires()), $doc->getId(), $doc->getName());
+					$bodyhtml .= sprintf($tableformathtml."\n", getReadableDate($doc->getExpires()), $doc->getId(), $doc->getName());
+				}
+				$bodyhtml .= "</table>".PHP_EOL;
 				$params = array();
 				$params['count'] = count($docs);
 				$params['__body__'] = $body;
@@ -53,7 +78,9 @@ class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 				$email->toIndividual('', $taskparams['email'], 'expired_docs_mail_subject', '', $params);
 
 				$logger->log('Task \'expired_docs\': Sending reminder \'expired_docs_mail_subject\' to user \''.$taskparams['email'].'\'', PEAR_LOG_INFO);
-//				mail($taskparams['email'], getMLText('expired_docs_mail_subject',array('sitename'=>$settings->_siteName, 'count'=>count($docs))), $body);
+			}
+		} else {
+				$logger->log('Task \'expired_docs\': neither peruser nor email is set', PEAR_LOG_WARNING);
 		}
 		return true;
 	}
@@ -73,6 +100,11 @@ class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 				'name'=>'days',
 				'type'=>'integer',
 				'description'=> 'Number of days to check for. Negative values will look into the past. 0 will just check for documents expiring the current day. Keep in mind that the document is still valid on the expiration date.',
+			),
+			array(
+				'name'=>'peruser',
+				'type'=>'boolean',
+				'description'=> 'Send mail to each user. If set, a list of all expired documents will be send to the owner of the documents.',
 			)
 		);
 	}

From 1ab5f833956d1893a0b387bfcc11d4becf94e49b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 16 Jun 2021 08:04:42 +0200
Subject: [PATCH 098/143] output info message above form if it set

---
 views/bootstrap/class.ReceiptDocument.php | 2 ++
 views/bootstrap/class.ReviseDocument.php  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/views/bootstrap/class.ReceiptDocument.php b/views/bootstrap/class.ReceiptDocument.php
index 2ea3a0854..e3e310be8 100644
--- a/views/bootstrap/class.ReceiptDocument.php
+++ b/views/bootstrap/class.ReceiptDocument.php
@@ -108,6 +108,8 @@ $(document).ready(function() {
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("submit_receipt"));
+		if(getMLText('info_submit_receipt', array(), ''))
+			$this->infoMsg(getMLText('info_submit_receipt', array(), ''));
 		$this->contentContainerStart();
 
 		// Display the Receipt form.
diff --git a/views/bootstrap/class.ReviseDocument.php b/views/bootstrap/class.ReviseDocument.php
index 4068505f2..78b5848bb 100644
--- a/views/bootstrap/class.ReviseDocument.php
+++ b/views/bootstrap/class.ReviseDocument.php
@@ -92,6 +92,8 @@ $(document).ready(function() {
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("submit_revision"));
+		if(getMLText('info_submit_revision', array(), ''))
+			$this->infoMsg(getMLText('info_submit_revision', array(), ''));
 
 		// Display the Revision form.
 		$revisiontype = ($revisionStatus['type'] == 0) ? 'ind' : 'grp';

From a38f7fd4082adff5cfe10fb4df163ae27a2ad407 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 16 Jun 2021 14:23:53 +0200
Subject: [PATCH 099/143] secure locking/inlocking documents with security
 token

---
 op/op.Ajax.php                         | 49 ++++++++++++++------------
 op/op.LockDocument.php                 |  5 +++
 op/op.UnlockDocument.php               |  5 +++
 views/bootstrap/class.Bootstrap.php    |  6 ++--
 views/bootstrap4/class.Bootstrap4.php  |  6 ++--
 views/bootstrap4/styles/application.js |  2 +-
 6 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 965a8156d..c1adcac9d 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -575,40 +575,45 @@ switch($command) {
 
 	case 'tooglelockdocument': /* {{{ */
 		if($user) {
-			$document = $dms->getDocument($_REQUEST['id']);
-			if($document) {
-				if ($document->getAccessMode($user) >= M_READWRITE) {
-					if ($document->isLocked()) {
-						$lockingUser = $document->getLockingUser();
-						if (($lockingUser->getID() == $user->getID()) || ($document->getAccessMode($user) == M_ALL)) {
-							if (!$document->setLocked(false)) {
-								header('Content-Type: application/json');
-								echo json_encode(array('success'=>false, 'message'=>'Error unlocking document', 'data'=>''));
+			if(checkFormKey('tooglelockdocument', 'GET')) {
+				$document = $dms->getDocument($_REQUEST['id']);
+				if($document) {
+					if ($document->getAccessMode($user) >= M_READWRITE) {
+						if ($document->isLocked()) {
+							$lockingUser = $document->getLockingUser();
+							if (($lockingUser->getID() == $user->getID()) || ($document->getAccessMode($user) == M_ALL)) {
+								if (!$document->setLocked(false)) {
+									header('Content-Type: application/json');
+									echo json_encode(array('success'=>false, 'message'=>'Error unlocking document', 'data'=>''));
+								} else {
+									header('Content-Type: application/json');
+									echo json_encode(array('success'=>true, 'message'=>getMLText('splash_document_unlocked'), 'data'=>''));
+								}
 							} else {
 								header('Content-Type: application/json');
-								echo json_encode(array('success'=>true, 'message'=>getMLText('splash_document_unlocked'), 'data'=>''));
+								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('access_denied'), 'data'=>''));
+							if (!$document->setLocked($user)) {
+								header('Content-Type: application/json');
+								echo json_encode(array('success'=>false, 'message'=>'Error locking document', 'data'=>''));
+							} else {
+								header('Content-Type: application/json');
+								echo json_encode(array('success'=>true, 'message'=>getMLText('splash_document_locked'), 'data'=>''));
+								add_log_line();
+							}
 						}
 					} else {
-						if (!$document->setLocked($user)) {
-							header('Content-Type: application/json');
-							echo json_encode(array('success'=>false, 'message'=>'Error locking document', 'data'=>''));
-						} else {
-							header('Content-Type: application/json');
-							echo json_encode(array('success'=>true, 'message'=>getMLText('splash_document_locked'), 'data'=>''));
-							add_log_line();
-						}
+						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('access_denied'), 'data'=>''));
+					echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id'), 'data'=>''));
 				}
 			} else {
 				header('Content-Type: application/json');
-				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id'), 'data'=>''));
+				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
 			}
 		}
 		break; /* }}} */
diff --git a/op/op.LockDocument.php b/op/op.LockDocument.php
index a72b873fa..393119dc2 100644
--- a/op/op.LockDocument.php
+++ b/op/op.LockDocument.php
@@ -29,6 +29,11 @@ require_once("inc/inc.DBInit.php");
 require_once("inc/inc.ClassUI.php");
 require_once("inc/inc.Authentication.php");
 
+/* Check if the form data comes from a trusted request */
+if(!checkFormKey('lockdocument', 'GET')) {
+	UI::exitError(getMLText("document_title"), getMLText("invalid_request_token"));
+}
+
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
diff --git a/op/op.UnlockDocument.php b/op/op.UnlockDocument.php
index 7af019958..b457f842b 100644
--- a/op/op.UnlockDocument.php
+++ b/op/op.UnlockDocument.php
@@ -28,6 +28,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('unlockdocument', 'GET')) {
+	UI::exitError(getMLText("document_title"), getMLText("invalid_request_token"));
+}
+
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index ab4dba193..dd95dc547 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -714,7 +714,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				if($accessobject->check_controller_access('UpdateDocument'))
 					$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>getMLText('update_document'));
 				if($accessobject->check_controller_access('LockDocument'))
-					$menuitems['lock_document'] = array('link'=>"../op/op.LockDocument".$docid, 'label'=>getMLText('lock_document'));
+					$menuitems['lock_document'] = array('link'=>"../op/op.LockDocument".$docid."&formtoken=".createFormKey('lockdocument'), 'label'=>getMLText('lock_document'));
 				if($accessobject->check_controller_access('EditDocument'))
 					$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid , 'label'=>getMLText('edit_document_props'));
 				$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>getMLText('move_document'));
@@ -725,7 +725,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 					if($accessobject->check_controller_access('UpdateDocument'))
 						$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>getMLText('update_document'));
 					if($accessobject->check_controller_access('UnlockDocument'))
-						$menuitems['unlock_document'] = array('link'=>"../op/op.UnlockDocument".$docid, 'label'=>getMLText('unlock_document'));
+						$menuitems['unlock_document'] = array('link'=>"../op/op.UnlockDocument".$docid."&formtoken=".createFormKey('unlockdocument'), 'label'=>getMLText('unlock_document'));
 					if($accessobject->check_controller_access('EditDocument'))
 						$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid, 'label'=>getMLText('edit_document_props'));
 					$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>getMLText('move_document'));
@@ -2486,7 +2486,7 @@ $(function() {
 			$title = 'lock_document';
 		}
 		$content = '';
-		$content .= '<a class="lock-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" title="'.getMLText($title).'"><i class="fa fa-'.$icon.'"></i></a>';
+		$content .= '<a class="lock-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" title="'.getMLText($title).'" data-formtoken="'.createFormKey('tooglelockdocument').'"><i class="fa fa-'.$icon.'"></i></a>';
 		if($return)
 			return $content;
 		else
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index eb509332d..a578c4031 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -703,7 +703,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				if($accessobject->check_controller_access('UpdateDocument'))
 					$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>getMLText('update_document'));
 				if($accessobject->check_controller_access('LockDocument'))
-					$menuitems['lock_document'] = array('link'=>"../op/op.LockDocument".$docid, 'label'=>getMLText('lock_document'));
+					$menuitems['lock_document'] = array('link'=>"../op/op.LockDocument".$docid."&formtoken=".createFormKey('lockdocument'), 'label'=>getMLText('lock_document'));
 				if($accessobject->check_controller_access('EditDocument'))
 					$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid , 'label'=>getMLText('edit_document_props'));
 				$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>getMLText('move_document'));
@@ -714,7 +714,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 					if($accessobject->check_controller_access('UpdateDocument'))
 						$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>getMLText('update_document'));
 					if($accessobject->check_controller_access('UnlockDocument'))
-						$menuitems['unlock_document'] = array('link'=>"../op/op.UnlockDocument".$docid, 'label'=>getMLText('unlock_document'));
+						$menuitems['unlock_document'] = array('link'=>"../op/op.UnlockDocument".$docid."&formtoken=".createFormKey('unlockdocument'), 'label'=>getMLText('unlock_document'));
 					if($accessobject->check_controller_access('EditDocument'))
 						$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid, 'label'=>getMLText('edit_document_props'));
 					$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>getMLText('move_document'));
@@ -2539,7 +2539,7 @@ $(function() {
 			$title = 'lock_document';
 		}
 		$content = '';
-		$content .= '<a class="lock-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" title="'.getMLText($title).'"><i class="fa fa-'.$icon.'"></i></a>';
+		$content .= '<a class="lock-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" title="'.getMLText($title).'" data-formtoken="'.createFormKey('tooglelockdocument').'"><i class="fa fa-'.$icon.'"></i></a>';
 		if($return)
 			return $content;
 		else
diff --git a/views/bootstrap4/styles/application.js b/views/bootstrap4/styles/application.js
index fb0db9907..4958bdcd1 100644
--- a/views/bootstrap4/styles/application.js
+++ b/views/bootstrap4/styles/application.js
@@ -389,7 +389,7 @@ $(document).ready( function() {
 		attr_msg = $(ev.currentTarget).attr('msg');
 		id = attr_rel;
 		$.get('../op/op.Ajax.php',
-			{ command: 'tooglelockdocument', id: id },
+			{ command: 'tooglelockdocument', formtoken: $(ev.currentTarget).data('formtoken'), id: id },
 			function(data) {
 				if(data.success) {
 					//$("#table-row-document-"+id).html('Loading').load('../op/op.Ajax.php?command=view&view=documentlistrow&id='+id)

From a8921b67f8eec77c0e0a5bd1a14b9304856db4a8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 16 Jun 2021 14:26:31 +0200
Subject: [PATCH 100/143] add note about fixed security issue in 5.1.23

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

diff --git a/CHANGELOG b/CHANGELOG
index 71055a6b5..b13d7b8ed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,7 @@
 - issue warning if document cannot be approved/reviewed anymore, because it has
   expired
 - much better form validation based on jquery validation
+- secure unlocking/locking of a documents with form token to prevent CSRF attacks
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.22

From fff27af7e67050ace911321922fc2df4d1e41f40 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 18 Jun 2021 13:56:18 +0200
Subject: [PATCH 101/143] better documentation

---
 views/bootstrap/class.Bootstrap.php   | 3 +++
 views/bootstrap4/class.Bootstrap4.php | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index dd95dc547..935aaff02 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1319,6 +1319,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	 * @param array $config contains elements
 	 *   id: id of modal box (must match target of getModalBoxLink())
 	 *   title: title of modal box
+	 *   content: content to be shown in the body of the box. Can be left
+	 *   empty if the body is loaded from the remote link passed to the button
+	 *   to open this box.
 	 *   buttons: array of buttons, each having a title and an optional id
 	 * @return string
 	 */
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index a578c4031..bb6891d66 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1311,6 +1311,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	 * @param array $config contains elements
 	 *   id: id of modal box (must match target of getModalBoxLink())
 	 *   title: title of modal box
+	 *   content: content to be shown in the body of the box. Can be left
+	 *   empty if the body is loaded from the remote link passed to the button
+	 *   to open this box.
 	 *   buttons: array of buttons, each having a title and an optional id
 	 * @return string
 	 */

From 0b9435d36270523206968c87a0a409b7cdd63760 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Jun 2021 08:58:22 +0200
Subject: [PATCH 102/143] append referuri to base url to prevent redirects to
 arbitraty sites

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

diff --git a/op/op.Login.php b/op/op.Login.php
index 1cd9ebce6..d6d1dde6a 100644
--- a/op/op.Login.php
+++ b/op/op.Login.php
@@ -97,8 +97,7 @@ if(!$controller->run()) {
 $user = $controller->getUser();
 
 if (isset($referuri) && strlen($referuri)>0) {
-//	header("Location: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'] . $referuri);
-	header("Location: " . $referuri);
+	header("Location: " . getBaseUrl() . "/" . $referuri);
 }
 else {
 	header("Location: ".$settings->_httpRoot.(isset($settings->_siteDefaultPage) && strlen($settings->_siteDefaultPage)>0 ? $settings->_siteDefaultPage : "out/out.ViewFolder.php?folderid=".($user->getHomeFolder() ? $user->getHomeFolder() : $settings->_rootFolderID)));

From 525b6d45c9072f1ebe76af35f0f6af4eb4dd1066 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Jun 2021 08:59:17 +0200
Subject: [PATCH 103/143] add entry for 5.1.23

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

diff --git a/CHANGELOG b/CHANGELOG
index b13d7b8ed..45f2f2a19 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,7 @@
   expired
 - much better form validation based on jquery validation
 - secure unlocking/locking of a documents with form token to prevent CSRF attacks
+- append referuri to base url to prevent redirects to arbitraty sites in op.Login.php
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.22

From 369497ee3a1bbd3297eded0ed7822528431064b5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Jun 2021 18:09:59 +0200
Subject: [PATCH 104/143] fix validation of emails

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

diff --git a/SeedDMS_Core/Core/inc.ClassAttribute.php b/SeedDMS_Core/Core/inc.ClassAttribute.php
index 3e77a5c16..cac122db3 100644
--- a/SeedDMS_Core/Core/inc.ClassAttribute.php
+++ b/SeedDMS_Core/Core/inc.ClassAttribute.php
@@ -1233,7 +1233,8 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 			break;
 		case self::type_email:
 			foreach($values as $value) {
-				$success &= preg_match('/^[a-z0-9._-]+@+[a-z0-9._-]+\.+[a-z]{2,4}$/i', $value);
+				$success &= filter_var($value, FILTER_VALIDATE_EMAIL);
+				//preg_match('/^[a-z0-9._-]+@+[a-z0-9._-]+\.+[a-z]{2,63}$/i', $value);
 			}
 			if(!$success)
 				$this->_validation_error = 5;
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 01f4f435f..f93729797 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -28,6 +28,7 @@
 - add methods SeedDMS_Core_DocumentContent::getReviewers() and SeedDMS_Core_DocumentContent::getApprovers()	
 - add methods SeedDMS_Core_DocumentContent::getApproveLog() and SeedDMS_Core_DocumentContent::getReviewLog()
 - better handling of document with an empty workflow state
+- fix checking of email addresses by using filter_var instead of regex
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 79e926324a81265be41861cee7f966e55789f3d9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Jun 2021 09:47:16 +0200
Subject: [PATCH 105/143] add access check for EditFolder, MoveFolder, put logo
 in header

---
 op/op.EditFolder.php                  |  4 ++++
 op/op.MoveFolder.php                  |  5 +++++
 views/bootstrap/class.Bootstrap.php   | 20 +++++++++++++-------
 views/bootstrap4/class.Bootstrap4.php | 22 ++++++++++++++--------
 4 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/op/op.EditFolder.php b/op/op.EditFolder.php
index d834329b1..247235532 100644
--- a/op/op.EditFolder.php
+++ b/op/op.EditFolder.php
@@ -31,6 +31,10 @@ include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access($controller, $_POST)) {
+	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("access_denied"));
+}
 
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('editfolder')) {
diff --git a/op/op.MoveFolder.php b/op/op.MoveFolder.php
index d0fc96886..b80a15c49 100644
--- a/op/op.MoveFolder.php
+++ b/op/op.MoveFolder.php
@@ -33,6 +33,11 @@ if(!checkFormKey('movefolder', 'GET')) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
 }
 
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access('MoveFolder', $_POST)) {
+	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("access_denied"));
+}
+
 if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
 }
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 66ad6f4a4..8c0f9249f 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -752,9 +752,13 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				$menuitems['add_document'] = array('link'=>"../out/out.AddDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('add_document'));
 			if(0 && $this->params['enablelargefileupload'])
 				$menuitems['add_multiple_documents'] = array('link'=>"../out/out.AddMultiDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('add_multiple_documents'));
-			$menuitems['edit_folder_props'] = array('link'=>"../out/out.EditFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('edit_folder_props'));
-			if ($folderID != $this->params['rootfolderid'] && $folder->getParent())
-				$menuitems['move_folder'] = array('link'=>"../out/out.MoveFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('move_folder'));
+			if ($accessobject->check_view_access('EditFolder')) {
+				$menuitems['edit_folder_props'] = array('link'=>"../out/out.EditFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('edit_folder_props'));
+			}
+			if ($accessobject->check_view_access('MoveFolder')) {
+				if ($folderID != $this->params['rootfolderid'] && $folder->getParent())
+					$menuitems['move_folder'] = array('link'=>"../out/out.MoveFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('move_folder'));
+			}
 
 			if ($accessMode == M_ALL) {
 				if ($folderID != $this->params['rootfolderid'] && $folder->getParent())
@@ -3237,10 +3241,12 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 				$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="fa fa-edit"></i></a>';
-		} else {
-			$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
+		if ($accessop->check_view_access('EditFolder')) {
+			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="fa fa-edit"></i></a>';
+			} else {
+				$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
+			}
 		}
 		if($subFolderAccessMode >= M_READWRITE) {
 			$content .= $this->printAccessButton($subFolder, true);
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index adb5f0072..64e1c36e2 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -297,7 +297,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 	function globalBanner() { /* {{{ */
 		echo "<nav class=\"navbar navbar-expand-lg navbar-dark bg-dark fixed-top\">\n";
-		echo " <a class=\"navbar-brand\" href=\"../out/out.ViewFolder.php\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n";
+		echo " <a class=\"navbar-brand\" href=\"../out/out.ViewFolder.php\">".(!empty($this->extraheader['logo']) ? '<img src="'.$this->extraheader['logo'].'">' : '<img src="../views/bootstrap4/images/seeddms-logo.svg">')." <span class=\"d-none d-md-inline-block ml-4\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</span></a>\n";
 		echo "</nav>\n";
 	} /* }}} */
 
@@ -669,9 +669,13 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				$menuitems['add_document'] = array('link'=>"../out/out.AddDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('add_document'));
 			if(0 && $this->params['enablelargefileupload'])
 				$menuitems['add_multiple_documents'] = array('link'=>"../out/out.AddMultiDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('add_multiple_documents'));
-			$menuitems['edit_folder_props'] = array('link'=>"../out/out.EditFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('edit_folder_props'));
-			if ($folderID != $this->params['rootfolderid'] && $folder->getParent())
-				$menuitems['move_folder'] = array('link'=>"../out/out.MoveFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('move_folder'));
+			if ($accessobject->check_view_access('EditFolder')) {
+				$menuitems['edit_folder_props'] = array('link'=>"../out/out.EditFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('edit_folder_props'));
+			}
+			if ($accessobject->check_view_access('MoveFolder')) {
+				if ($folderID != $this->params['rootfolderid'] && $folder->getParent())
+					$menuitems['move_folder'] = array('link'=>"../out/out.MoveFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('move_folder'));
+			}
 
 			if ($accessMode == M_ALL) {
 				if ($folderID != $this->params['rootfolderid'] && $folder->getParent())
@@ -3233,10 +3237,12 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 				$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="fa fa-edit"></i></a>';
-		} else {
-			$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
+		if ($accessop->check_view_access('EditFolder')) {
+			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="fa fa-edit"></i></a>';
+			} else {
+				$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
+			}
 		}
 		if($subFolderAccessMode >= M_READWRITE) {
 			$content .= $this->printAccessButton($subFolder, true);

From aa4997a7e730251c6bfe7c3afc50417bc3567812 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Jun 2021 09:48:28 +0200
Subject: [PATCH 106/143] add access check

---
 out/out.EditFolder.php | 3 +++
 out/out.MoveFolder.php | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/out/out.EditFolder.php b/out/out.EditFolder.php
index ed47a1d72..5361f4cbe 100644
--- a/out/out.EditFolder.php
+++ b/out/out.EditFolder.php
@@ -32,6 +32,9 @@ 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, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"), false, $isajax);
+}
 
 if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
diff --git a/out/out.MoveFolder.php b/out/out.MoveFolder.php
index 0755feb4c..fc86bd506 100644
--- a/out/out.MoveFolder.php
+++ b/out/out.MoveFolder.php
@@ -32,6 +32,9 @@ 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, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"), false, $isajax);
+}
 
 if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));

From 846e8d490eabda6277d11aca0ed1845ca8626512 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Jun 2021 09:59:17 +0200
Subject: [PATCH 107/143] remove output of favicon in global navigation, add
 logo in global nav

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

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 935aaff02..02bd060ac 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -285,6 +285,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "<div class=\"navbar navbar-inverse navbar-fixed-top\">\n";
 		echo " <div class=\"navbar-inner\">\n";
 		echo "  <div class=\"container-fluid\">\n";
+		echo "   <a href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\">".(!empty($this->extraheader['logo']) ? '<img src="'.$this->extraheader['logo'].'">' : '<img src="../views/bootstrap/images/seeddms-logo.svg">')."</a>";
 		echo "   <a class=\"brand\" href=\"../out/out.ViewFolder.php\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n";
 		echo "  </div>\n";
 		echo " </div>\n";
@@ -303,8 +304,6 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "   <a class=\"btn btn-navbar\" href=\"../op/op.Logout.php\">\n";
 		echo "     <span class=\"fa fa-sign-out\"></span>\n";
 		echo "   </a>\n";
-		if(!empty($this->extraheader['favicon']))
-			echo $this->extraheader['favicon'];
 		echo "   <a href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\">".(!empty($this->extraheader['logo']) ? '<img src="'.$this->extraheader['logo'].'">' : '<img src="../views/bootstrap/images/seeddms-logo.svg">')."</a>";
 		echo "   <a class=\"brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\"><span class=\"hidden-phone\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</span></a>\n";
 

From aab0e356bb966381c381c9abec6a330ce8e334b6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Jun 2021 10:00:24 +0200
Subject: [PATCH 108/143] add logo in global navigation

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

diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index bb6891d66..b251c6b96 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -297,7 +297,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 	function globalBanner() { /* {{{ */
 		echo "<nav class=\"navbar navbar-expand-lg navbar-dark bg-dark fixed-top\">\n";
-		echo " <a class=\"navbar-brand\" href=\"../out/out.ViewFolder.php\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n";
+		echo " <a class=\"navbar-brand\" href=\"../out/out.ViewFolder.php\">".(!empty($this->extraheader['logo']) ? '<img src="'.$this->extraheader['logo'].'">' : '<img src="../views/bootstrap4/images/seeddms-logo.svg">')." <span class=\"d-none d-md-inline-block ml-4\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</span></a>\n";
 		echo "</nav>\n";
 	} /* }}} */
 

From 0f98640ba3bd4fc8101f9e2ef9f88ee006bcddb4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Jun 2021 10:00:55 +0200
Subject: [PATCH 109/143] make login form smaller and put it into a div

---
 views/bootstrap/class.Login.php         |  7 +++++--
 views/bootstrap4/styles/application.css | 13 +++++++++++--
 views/bootstrap4/styles/styles.css      |  4 ----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/views/bootstrap/class.Login.php b/views/bootstrap/class.Login.php
index 90e4cb4c1..834403f23 100644
--- a/views/bootstrap/class.Login.php
+++ b/views/bootstrap/class.Login.php
@@ -97,6 +97,7 @@ $(document).ready( function() {
 		$this->htmlStartPage(getMLText("sign_in"), "login");
 		$this->globalBanner();
 		$this->contentStart();
+		echo "<div id=\"login_wrapper\">\n";
 		$this->pageNavigation(getMLText("sign_in"));
 		if($msg)
 			$this->errorMsg(htmlspecialchars($msg));
@@ -114,7 +115,7 @@ $(document).ready( function() {
 				'type'=>'text',
 				'id'=>'login',
 				'name'=>'login',
-				'placeholder'=>'login',
+				'placeholder'=>getMLText('user_login'),
 				'autocomplete'=>'on',
 				'required'=>true
 			)
@@ -126,6 +127,7 @@ $(document).ready( function() {
 				'type'=>'password',
 				'id'=>'pwd',
 				'name'=>'pwd',
+				'placeholder'=>getMLText('password'),
 				'autocomplete'=>'off',
 				'required'=>true
 			)
@@ -154,8 +156,8 @@ $(document).ready( function() {
 				$html
 			);
 		}
-		$this->contentContainerEnd();
 		$this->formSubmit(getMLText('submit_login'));
+		$this->contentContainerEnd();
 ?>
 </form>
 <?php
@@ -169,6 +171,7 @@ $(document).ready( function() {
 			print implode(' | ', $tmpfoot);
 			print "</p>\n";
 		}
+		echo "</div>\n";
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap4/styles/application.css b/views/bootstrap4/styles/application.css
index 732abbef8..2ce7692c9 100644
--- a/views/bootstrap4/styles/application.css
+++ b/views/bootstrap4/styles/application.css
@@ -1,9 +1,18 @@
 body { /* Add top padding for full-width layout */
-	padding-top: 4.0rem;
+	padding-top: 3.7rem;
+}
+#login_wrapper {
+	margin: auto auto;
+	width: 360px;
+}
+@media (max-width: 575px) { 
+	#login_wrapper {
+		width: 100%;
+	}
 }
 
 a.navbar-brand img {
-	height: 2.3rem;
+	height: 2.0rem;
 }
 
 .dropdown-submenu {
diff --git a/views/bootstrap4/styles/styles.css b/views/bootstrap4/styles/styles.css
index d160ce347..95133c727 100644
--- a/views/bootstrap4/styles/styles.css
+++ b/views/bootstrap4/styles/styles.css
@@ -1,7 +1,3 @@
-.navbar-brand img {
-	height: 2.3rem;
-}
-
 ul.jqtree-tree ul.jqtree_common {
 	margin-left: 22px;
 }

From ea5efd75d70ffc51c2b78510846dbd379ef571eb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Jun 2021 11:33:54 +0200
Subject: [PATCH 110/143] add access control for EditComment and EditAttributes

---
 op/op.EditAttributes.php               |  5 +++++
 op/op.EditComment.php                  |  5 +++++
 out/out.EditAttributes.php             |  3 +++
 views/bootstrap/class.ViewDocument.php | 14 ++++++++------
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/op/op.EditAttributes.php b/op/op.EditAttributes.php
index 95a5740b7..a3fb4633d 100644
--- a/op/op.EditAttributes.php
+++ b/op/op.EditAttributes.php
@@ -34,6 +34,11 @@ if(!checkFormKey('editattributes')) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
 }
 
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access('EditAttributes', $_POST)) {
+	UI::exitError(getMLText("folder_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("access_denied"));
+}
+
 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"));
 }
diff --git a/op/op.EditComment.php b/op/op.EditComment.php
index af2860f66..b0fe19994 100644
--- a/op/op.EditComment.php
+++ b/op/op.EditComment.php
@@ -34,6 +34,11 @@ if(!checkFormKey('editcomment')) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
 }
 
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access('EditComment', $_POST)) {
+	UI::exitError(getMLText("folder_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("access_denied"));
+}
+
 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"));
 }
diff --git a/out/out.EditAttributes.php b/out/out.EditAttributes.php
index 6233cf8fd..4685b4474 100644
--- a/out/out.EditAttributes.php
+++ b/out/out.EditAttributes.php
@@ -34,6 +34,9 @@ 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, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"), false, $isajax);
+}
 
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index fa29dac0b..689d9cd21 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -656,12 +656,14 @@ $(document).ready( function() {
 				if($accessobject->check_view_access('AddToTransmittal'))
 					$items[] = array('link'=>"out.AddToTransmittal.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'list', 'label'=>'add_to_transmittal');
 			}
-		if($accessobject->mayEditComment($latestContent->getDocument())) {
-			$items[] = array('link'=>"out.EditComment.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'comment', 'label'=>'edit_comment');
-		}
-		if($accessobject->mayEditAttributes($latestContent->getDocument())) {
-			$items[] = array('link'=>"out.EditAttributes.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'edit', 'label'=>'edit_attributes');
-		}
+		if($accessobject->check_view_access('EditComment'))
+			if($accessobject->mayEditComment($latestContent->getDocument())) {
+				$items[] = array('link'=>"out.EditComment.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'comment', 'label'=>'edit_comment');
+			}
+		if($accessobject->check_view_access('EditAttributes'))
+			if($accessobject->mayEditAttributes($latestContent->getDocument())) {
+				$items[] = array('link'=>"out.EditAttributes.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'edit', 'label'=>'edit_attributes');
+			}
 		if(!$islatest)
 			$items[] = array('link'=>"out.DocumentVersionDetail.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'info', 'label'=>'details');
 

From e21ef794c4b42b82fb64f02544c8168897b62437 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Jun 2021 08:58:55 +0200
Subject: [PATCH 111/143] add access control

---
 op/op.TransferDocument.php       |  5 +++++
 op/op.UsrMgr.php                 |  6 ++++++
 out/out.SendLoginData.php        |  2 ++
 views/bootstrap/class.UsrMgr.php | 16 ++++++++++------
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/op/op.TransferDocument.php b/op/op.TransferDocument.php
index b3080a82c..12cd11810 100644
--- a/op/op.TransferDocument.php
+++ b/op/op.TransferDocument.php
@@ -24,12 +24,17 @@ include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassAccessOperation.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));
+$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
+if (!$accessop->check_controller_access($controller, $_POST)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("access_denied"));
+}
 
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('transferdocument')) {
diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php
index 0982d019d..f5991e74a 100644
--- a/op/op.UsrMgr.php
+++ b/op/op.UsrMgr.php
@@ -26,6 +26,7 @@ include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 include("../inc/inc.ClassPasswordStrength.php");
@@ -34,6 +35,11 @@ if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
+$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
+if (!$accessop->check_controller_access('UsrMgr', $_POST)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+}
+
 if (isset($_POST["action"])) $action=$_POST["action"];
 else $action=NULL;
 
diff --git a/out/out.SendLoginData.php b/out/out.SendLoginData.php
index c6a026da9..97db9e237 100644
--- a/out/out.SendLoginData.php
+++ b/out/out.SendLoginData.php
@@ -40,10 +40,12 @@ if (!is_object($newuser)) {
 	UI::exitError(getMLText("rm_user"),getMLText("invalid_user_id"));
 }
 
+$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('newuser', $newuser);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 984bb91e7..fa81cc378 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -181,6 +181,7 @@ $(document).ready( function() {
 		$quota = $this->params['quota'];
 		$undeluserids = $this->params['undeluserids'];
 		$enableemail = $this->params['enableemail'];
+		$accessobject = $this->params['accessobject'];
 
 		if($seluser) {
 			$button = array(
@@ -188,15 +189,18 @@ $(document).ready( function() {
 				'menuitems'=>array(
 				)
 			);
-			if(!in_array($seluser->getID(), $undeluserids)) {
+			if(!in_array($seluser->getID(), $undeluserids) && $accessobject->check_controller_access('UsrMgr', ['action'=>'removeuser'])) {
 				$button['menuitems'][] = array('label'=>'<i class="fa fa-remove"></i> '.getMLText("rm_user"), 'link'=>'../out/out.RemoveUser.php?userid='.$seluser->getID());
 			}
-			$button['menuitems'][] = array('label'=>'<i class="fa fa-unlink"></i> '.getMLText("rm_user_from_processes"), 'link'=>'../out/out.RemoveUserFromProcesses.php?userid='.$seluser->getID());
-			$button['menuitems'][] = array('label'=>'<i class="fa fa-share-square-o"></i> '.getMLText("transfer_objects"), 'link'=>'../out/out.TransferObjects.php?userid='.$seluser->getID());
+			if($accessobject->check_controller_access('UsrMgr', ['action'=>'removefromprocesses']))
+				$button['menuitems'][] = array('label'=>'<i class="fa fa-unlink"></i> '.getMLText("rm_user_from_processes"), 'link'=>'../out/out.RemoveUserFromProcesses.php?userid='.$seluser->getID());
+			if($accessobject->check_controller_access('UsrMgr', ['action'=>'transferobjects']))
+				$button['menuitems'][] = array('label'=>'<i class="fa fa-share-square-o"></i> '.getMLText("transfer_objects"), 'link'=>'../out/out.TransferObjects.php?userid='.$seluser->getID());
 			if($user->isAdmin() && $seluser->getID() != $user->getID())
-				$button['menuitems'][] = array('label'=>'<i class="fa fa-exchange"></i> '.getMLText("substitute_user"), 'link'=>'../op/op.SubstituteUser.php?userid='.$seluser->getID());
-			if($enableemail)
-				$button['menuitems'][] = array('label'=>'<i class="fa fa-envelope-o"></i> '.getMLText("send_login_data"), 'link'=>'../out/out.SendLoginData.php?userid='.$seluser->getID());
+				$button['menuitems'][] = array('label'=>'<i class="fa fa-exchange"></i> '.getMLText("substitute_user"), 'link'=>'../op/op.SubstituteUser.php?userid='.$seluser->getID()."&formtoken=".createFormKey('substituteuser'));
+			if($accessobject->check_controller_access('UsrMgr', ['action'=>'sendlogindata']))
+				if($enableemail)
+					$button['menuitems'][] = array('label'=>'<i class="fa fa-envelope-o"></i> '.getMLText("send_login_data"), 'link'=>'../out/out.SendLoginData.php?userid='.$seluser->getID());
 			self::showButtonwithMenu($button);
 		}
 	} /* }}} */

From 0754a794d3ddf242527003743bf2ba6fe61858ad Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Jun 2021 09:01:24 +0200
Subject: [PATCH 112/143] fix creating AccessOperation

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

diff --git a/out/out.SendLoginData.php b/out/out.SendLoginData.php
index 97db9e237..61fd76659 100644
--- a/out/out.SendLoginData.php
+++ b/out/out.SendLoginData.php
@@ -40,7 +40,7 @@ if (!is_object($newuser)) {
 	UI::exitError(getMLText("rm_user"),getMLText("invalid_user_id"));
 }
 
-$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {

From f8d81bd734e215db9009a5a32aaf1f4dc7b805a1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Jun 2021 14:49:53 +0200
Subject: [PATCH 113/143] theme can be set in user manager

---
 CHANGELOG                        |  1 +
 op/op.UsrMgr.php                 |  6 +++++-
 views/bootstrap/class.UsrMgr.php | 14 ++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 45f2f2a19..4e864b567 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,7 @@
 - much better form validation based on jquery validation
 - secure unlocking/locking of a documents with form token to prevent CSRF attacks
 - append referuri to base url to prevent redirects to arbitraty sites in op.Login.php
+- theme can be set in user manager
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.22
diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php
index f5991e74a..d94614bd9 100644
--- a/op/op.UsrMgr.php
+++ b/op/op.UsrMgr.php
@@ -66,6 +66,7 @@ if ($action == "adduser") {
 		UI::exitError(getMLText("admin_tools"),getMLText("user_email_missing"));
 	}
 	$comment = $_POST["comment"];
+	$theme = $_POST["theme"];
 	if ($settings->_strictFormCheck && !$comment) {
 		UI::exitError(getMLText("admin_tools"),getMLText("user_comment_missing"));
 	}
@@ -79,7 +80,7 @@ if ($action == "adduser") {
 		UI::exitError(getMLText("admin_tools"),getMLText("user_exists"));
 	}
 
-	$newUser = $dms->addUser($login, seed_pass_hash($pwd), $name, $email, $settings->_language, $settings->_theme, $comment, $role, $isHidden, $isDisabled, $pwdexpiration, $quota, $homefolder);
+	$newUser = $dms->addUser($login, seed_pass_hash($pwd), $name, $email, $settings->_language, $theme, $comment, $role, $isHidden, $isDisabled, $pwdexpiration, $quota, $homefolder);
 	if ($newUser) {
 
 		/* Set user image if uploaded */
@@ -350,6 +351,7 @@ else if ($action == "edituser") {
 	$name    = $_POST["name"];
 	$email   = $_POST["email"];
 	$comment = $_POST["comment"];
+	$theme = $_POST["theme"];
 	$role    = preg_replace('/[^0-2]+/', '', $_POST["role"]);
 	$isHidden = (isset($_POST["ishidden"]) && $_POST["ishidden"]==1 ? 1 : 0);
 	$isDisabled = (isset($_POST["isdisabled"]) && $_POST["isdisabled"]==1 ? 1 : 0);
@@ -387,6 +389,8 @@ else if ($action == "edituser") {
 		$editedUser->setEmail($email);
 	if ($editedUser->getComment() != $comment)
 		$editedUser->setComment($comment);
+	if ($editedUser->getTheme() != $theme)
+		$editedUser->setTheme($theme);
 	if ($editedUser->getRole() != $role)
 		$editedUser->setRole($role);
 	if ($editedUser->getQuota() != $quota)
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index fa81cc378..acb4f0ed3 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -214,6 +214,7 @@ $(document).ready( function() {
 	function showUserForm($currUser) { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$settings = $this->params['settings'];
 		$users = $this->params['allusers'];
 		$groups = $this->params['allgroups'];
 		$passwordstrength = $this->params['passwordstrength'];
@@ -328,6 +329,19 @@ $(document).ready( function() {
 				'options'=>$options
 			)
 		);
+		$themes = UI::getStyles();
+		$options = array();
+		foreach ($themes as $currTheme) {
+			$options[] = array($currTheme, $currTheme, ($currUser && ($currTheme == $currUser->getTheme())) || ($currTheme == $settings->_theme));
+		}
+		$this->formField(
+			getMLText("theme"),
+			array(
+				'element'=>'select',
+				'name'=>'theme',
+				'options'=>$options
+			)
+		);
 		$options = array();
 		foreach($groups as $group) {
 			$options[] = array($group->getID(), htmlspecialchars($group->getName()), ($currUser && $group->isMember($currUser)));

From 932835ef033f59db1c8703bdb95fa8baa6ff2c33 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Jun 2021 16:27:09 +0200
Subject: [PATCH 114/143] add field in configuration for hidden other fields in
 settings form

---
 inc/inc.ClassSettings.php          |  4 ++++
 views/bootstrap/class.Settings.php | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 230ed9465..bbc9333a5 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -24,6 +24,8 @@ class Settings { /* {{{ */
 	// Config File Path
 	var $_configFilePath = null;
 
+	// Fields not shown in gui
+	var $_hiddenConfFields = '';
 	// Name of site
 	var $_siteName = "SeedDMS";
 	// Message to display at the bottom of every page.
@@ -669,6 +671,7 @@ class Settings { /* {{{ */
 			$this->_useHomeAsRootFolder = Settings::boolval($tab["useHomeAsRootFolder"]);
 			$this->_titleDisplayHack = Settings::boolval($tab["titleDisplayHack"]);
 			$this->_showMissingTranslations = Settings::boolval($tab["showMissingTranslations"]);
+			$this->_hiddenConfFields = strval($tab["hiddenConfFields"]);
 		}
 
 		// XML Path: /configuration/advanced/authentication
@@ -1009,6 +1012,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "useHomeAsRootFolder", $this->_useHomeAsRootFolder);
     $this->setXMLAttributValue($node, "titleDisplayHack", $this->_titleDisplayHack);
     $this->setXMLAttributValue($node, "showMissingTranslations", $this->_showMissingTranslations);
+    $this->setXMLAttributValue($node, "hiddenConfFields", $this->_hiddenConfFields);
 
     // XML Path: /configuration/advanced/authentication
     $node = $this->getXMLNode($xml, '/configuration/advanced', 'authentication');
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 09635aa50..3f0f25313 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -88,6 +88,24 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
 		$this->showRawConfigHeadline(htmlspecialchars(getMLText($title)));
 	} /* }}} */
 
+	/**
+	 * Show a text input configuration option
+	 *
+	 * @param string $title title of the option
+	 * @param string $name name of html input field
+	 * @param string $type can be 'password', 'array'
+	 * @param string $placeholder placeholder for input field
+	 */
+	protected function isVisible($name) { /* {{{ */
+		$settings = $this->params['settings'];
+		if(!($hcf = $settings->_hiddenConfFields))
+			return true;
+		$hcfa = explode(';', $hcf);
+		if(in_array($name, $hcfa))
+			return false;
+		return true;
+	} /* }}} */
+
 	/**
 	 * Show a text input configuration option
 	 *
@@ -98,6 +116,8 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
 	 */
 	protected function showConfigText($title, $name, $type='', $placeholder='') { /* {{{ */
 		$settings = $this->params['settings'];
+		if(!$this->isVisible($name))
+			return;
 ?>
       <tr title="<?= getMLText($title."_desc") ?>">
 				<td><?= getMLText($title) ?>:</td>

From 5baac2b4ff0646dcdfcfae30dcc771d4d6070fa8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Jun 2021 17:17:16 +0200
Subject: [PATCH 115/143] add entry for 5.1.23

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

diff --git a/CHANGELOG b/CHANGELOG
index 4e864b567..a227957d6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,7 @@
 - secure unlocking/locking of a documents with form token to prevent CSRF attacks
 - append referuri to base url to prevent redirects to arbitraty sites in op.Login.php
 - theme can be set in user manager
+- fields in configuration can be omitted from display
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.22

From 98e5c868a4c961c520dbe348e182e730a4ba1fd9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Jun 2021 17:48:46 +0200
Subject: [PATCH 116/143] pass access object to view

---
 out/out.ImportUsers.php               | 2 ++
 views/bootstrap/class.ImportUsers.php | 1 +
 2 files changed, 3 insertions(+)

diff --git a/out/out.ImportUsers.php b/out/out.ImportUsers.php
index 1abf2d1b9..199763a26 100644
--- a/out/out.ImportUsers.php
+++ b/out/out.ImportUsers.php
@@ -30,6 +30,7 @@ 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, null, $user, $settings);
 if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
@@ -39,6 +40,7 @@ if($view) {
 	$view->setParam('log', array());
 	$view->setParam('newusers', array());
 	$view->setParam('colmap', array());
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/views/bootstrap/class.ImportUsers.php b/views/bootstrap/class.ImportUsers.php
index ca939d711..8afed5a54 100644
--- a/views/bootstrap/class.ImportUsers.php
+++ b/views/bootstrap/class.ImportUsers.php
@@ -39,6 +39,7 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Theme_Style {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$accessobject = $this->params['accessobject'];
 		$log = $this->params['log'];
 		$newusers = $this->params['newusers'];
 		$colmap = $this->params['colmap'];

From cefcdc966b26303e9f32d09bde207f05ea847c18 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Jun 2021 17:55:35 +0200
Subject: [PATCH 117/143] use check_view_access instead of checking for admin

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

diff --git a/out/out.ImportUsers.php b/out/out.ImportUsers.php
index 199763a26..b847f4754 100644
--- a/out/out.ImportUsers.php
+++ b/out/out.ImportUsers.php
@@ -30,8 +30,8 @@ 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, null, $user, $settings);
-if (!$user->isAdmin()) {
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 

From 6d1aa2f347348f33aafe9479a6e8abe03bccfc57 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Jun 2021 08:43:09 +0200
Subject: [PATCH 118/143] use translated text

---
 inc/inc.Tasks.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 5c37c717a..bcf0251e6 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -145,9 +145,9 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
 							}
 						}
 						$this->fulltextservice->Indexer()->addDocument($idoc);
-						echo " (Document added)".PHP_EOL;
+						echo "(".getMLText('index_document_added').")".PHP_EOL;
 					} catch(Exception $e) {
-						echo " (Timeout)".PHP_EOL;
+						echo "(Timeout)".PHP_EOL;
 					}
 				} else {
 					/* Check if the attribute created is set or has a value older
@@ -162,7 +162,7 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
 					}
 					$content = $document->getLatestContent();
 					if($created >= $content->getDate() && !$this->forceupdate) {
-						echo getMLText('index_document_unchanged').PHP_EOL;
+						echo "(".getMLText('index_document_unchanged').")".PHP_EOL;
 					} else {
 						$this->fulltextservice->Indexer()->delete($hit->id);
 						try {
@@ -175,9 +175,9 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
 								}
 							}
 							$this->fulltextservice->Indexer()->addDocument($idoc);
-							echo " (Document updated)".PHP_EOL;
+							echo "(".getMLText('index_document_updated').")".PHP_EOL;
 						} catch(Exception $e) {
-							echo " (Timeout)".PHP_EOL;
+							echo "(Timeout)".PHP_EOL;
 						}
 					}
 				}

From 1c839fd26ba4be13976549baad4ea5e9f73af61c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Jun 2021 09:26:17 +0200
Subject: [PATCH 119/143] pass depth of iterator to callback function

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

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 64633ad8a..c89782f66 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -1018,7 +1018,7 @@ class SeedDMS_FolderTree { /* {{{ */
     $iter = new \SeedDMS\RecursiveFolderIterator($folder);
     $iter2 = new RecursiveIteratorIterator($iter, RecursiveIteratorIterator::       SELF_FIRST);
 		foreach($iter2 as $ff) {
-			call_user_func($callback, $ff);
+			call_user_func($callback, $ff, $iter2->getDepth());
 //      echo $ff->getID().': '.$ff->getFolderPathPlain().'-'.$ff->getName()."<br />";
     }
 	} /* }}} */

From ec46d40194f558e07c24f34ed0dd8c00c33d9e70 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Jun 2021 09:26:37 +0200
Subject: [PATCH 120/143] indent folders, place folder icon in front of folder
 name

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

diff --git a/views/bootstrap/class.Indexer.php b/views/bootstrap/class.Indexer.php
index 99dc859dc..75e8b8110 100644
--- a/views/bootstrap/class.Indexer.php
+++ b/views/bootstrap/class.Indexer.php
@@ -35,9 +35,9 @@ class SeedDMS_View_Indexer_Process_Folder { /* {{{ */
 		$this->numdocs = $this->fulltextservice->Indexer()->count();
 	} /* }}} */
 
-	public function process($folder) { /* {{{ */
+	public function process($folder, $depth=0) { /* {{{ */
 		$lucenesearch = $this->fulltextservice->Search();
-		echo "<div class=\"folder\">".$folder->getId().":".htmlspecialchars($folder->getFolderPathPlain());
+		echo "<div class=\"folder\" style=\"margin-left: ".(($depth+1)*18)."px\"><i class=\"fa fa-folder\"></i> ".$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>";
@@ -65,7 +65,7 @@ class SeedDMS_View_Indexer_Process_Folder { /* {{{ */
 		if($documents) {
 //			echo "<div class=\"folder\">".htmlspecialchars($folder->getFolderPathPlain())."</div>";
 			foreach($documents as $document) {
-				echo "<div class=\"document\">".$document->getId().":".htmlspecialchars($document->getName());
+				echo "<div class=\"document\" style=\"margin-left: ".(($depth+2)*18)."px\">".$document->getId().":".htmlspecialchars($document->getName());
 				/* If the document wasn't indexed before then just add it */
 				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>";
@@ -246,7 +246,7 @@ div.folder {font-weight: bold; line-height: 20px; margin-top: 10px;}
 <?php
 		$folderprocess = new SeedDMS_View_Indexer_Process_Folder($fulltextservice, $forceupdate);
 		$tree = new SeedDMS_FolderTree($folder, array($folderprocess, 'process'));
-		call_user_func(array($folderprocess, 'process'), $folder);
+		call_user_func(array($folderprocess, 'process'), $folder, -1);
 		echo "</div>";
 
 		$index->commit();

From 50e8c8493267b05d9bdd7dc467f1ebfff8078c30 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Jun 2021 11:38:04 +0200
Subject: [PATCH 121/143] use findById instead of find in getDocument() and
 getFolder()

---
 SeedDMS_SQLiteFTS/SQLiteFTS/Search.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
index 77b3993f6..20381d1a8 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
@@ -45,23 +45,23 @@ class SeedDMS_SQliteFTS_Search {
 	/**
 	 * Get document from index
 	 *
-	 * @param int $id real document id
+	 * @param int $id id of seeddms document
 	 * @return object instance of SeedDMS_SQliteFTS_QueryHit or false
 	 */
 	function getDocument($id) { /* {{{ */
-		$hits = $this->index->find('D'.$id);
-		return $hits['hits'] ? $hits['hits'][0] : false;
+		$hits = $this->index->findById('D'.$id);
+		return $hits ? $hits[0] : false;
 	} /* }}} */
 
 	/**
 	 * Get folder from index
 	 *
-	 * @param int $id real folder id
+	 * @param int $id id of seeddms folder
 	 * @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;
+		$hits = $this->index->findById('F'.$id);
+		return $hits ? $hits[0] : false;
 	} /* }}} */
 
 	/**

From 04c494eaaaeddbe9c94733ecb5920a9a812a04be Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Jun 2021 11:39:13 +0200
Subject: [PATCH 122/143] set documentid in findById(), getDocument returns
 content, take out getFolder()

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

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
index cc5b39119..bb77b9835 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
@@ -165,7 +165,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 	 * @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'
+	 * 'count', 'hits', 'facets'. 'hits' is an array of SeedDMS_SQLiteFTS_QueryHit
 	 */
 	public function find($query, $limit=array()) { /* {{{ */
 		if(!$this->_conn)
@@ -206,20 +206,21 @@ class SeedDMS_SQLiteFTS_Indexer {
 	/**
 	 * Get a single document from index
 	 *
-	 * @param integer $id id of document
+	 * @param string $id id of document
 	 * @return boolean false in case of an error, otherwise true
 	 */
 	public function findById($id) { /* {{{ */
 		if(!$this->_conn)
 			return false;
 
-		$sql = "SELECT ".$this->_rawid." FROM docs WHERE ".$this->_rawid."=".(int) $id;
+		$sql = "SELECT ".$this->_rawid.", documentid FROM docs WHERE documentid=".$this->_conn->quote($id);
 		$res = $this->_conn->query($sql);
 		$hits = array();
 		if($res) {
 			while($rec = $res->fetch(PDO::FETCH_ASSOC)) {
 				$hit = new SeedDMS_SQLiteFTS_QueryHit($this);
 				$hit->id = $rec[$this->_rawid];
+				$hit->documentid = $rec['documentid'];
 				$hits[] = $hit;
 			}
 		}
@@ -232,11 +233,11 @@ class SeedDMS_SQLiteFTS_Indexer {
 	 * @param integer $id id of index record
 	 * @return boolean false in case of an error, otherwise true
 	 */
-	public function getDocument($id) { /* {{{ */
+	public function getDocument($id, $content=true) { /* {{{ */
 		if(!$this->_conn)
 			return false;
 
-		$sql = "SELECT ".$this->_rawid.", documentid, title, comment, owner, keywords, category, mimetype, origfilename, created, users, status, path FROM docs WHERE documentid='D".$id."'";
+		$sql = "SELECT ".$this->_rawid.", documentid, title, comment, owner, keywords, category, mimetype, origfilename, created, users, status, path".($content ? ", content" : "")." FROM docs WHERE ".$this->_rawid."='".$id."'";
 		$res = $this->_conn->query($sql);
 		$doc = false;
 		if($res) {
@@ -255,6 +256,8 @@ class SeedDMS_SQLiteFTS_Indexer {
 			$doc->addField('users', $rec['users']);
 			$doc->addField('status', $rec['status']);
 			$doc->addField('path', $rec['path']);
+			if($content)
+				$doc->addField('content', $rec['content']);
 		}
 		return $doc;
 	} /* }}} */
@@ -265,7 +268,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 	 * @param integer $id id of folder
 	 * @return boolean false in case of an error, otherwise true
 	 */
-	public function getFolder($id) { /* {{{ */
+	public function __getFolder($id) { /* {{{ */
 		if(!$this->_conn)
 			return false;
 

From 1ee2744256437d233e30fdf5906edf26fe9a74b7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Jun 2021 11:39:46 +0200
Subject: [PATCH 123/143] index current folder before tree

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

diff --git a/views/bootstrap/class.Indexer.php b/views/bootstrap/class.Indexer.php
index 75e8b8110..743e108c6 100644
--- a/views/bootstrap/class.Indexer.php
+++ b/views/bootstrap/class.Indexer.php
@@ -245,8 +245,8 @@ div.folder {font-weight: bold; line-height: 20px; margin-top: 10px;}
 		</div>
 <?php
 		$folderprocess = new SeedDMS_View_Indexer_Process_Folder($fulltextservice, $forceupdate);
-		$tree = new SeedDMS_FolderTree($folder, array($folderprocess, 'process'));
 		call_user_func(array($folderprocess, 'process'), $folder, -1);
+		$tree = new SeedDMS_FolderTree($folder, array($folderprocess, 'process'));
 		echo "</div>";
 
 		$index->commit();

From 363f417eb79ff20bda23f9d0d1898693982e185e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Jun 2021 12:51:44 +0200
Subject: [PATCH 124/143] index folders in task

---
 inc/inc.Tasks.php | 59 ++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 6 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index bcf0251e6..2551ac1d9 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -124,17 +124,64 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
 	public function __construct($fulltextservice, $forceupdate) { /* {{{ */
 		$this->fulltextservice = $fulltextservice;
 		$this->forceupdate = $forceupdate;
+		$this->numdocs = $this->fulltextservice->Indexer()->count();
 	} /* }}} */
 
-	public function process($folder) { /* {{{ */
+	public function process($folder, $depth=0) { /* {{{ */
+		$lucenesearch = $this->fulltextservice->Search();
 		$documents = $folder->getDocuments();
+		echo str_repeat('  ', $depth+1).$folder->getId().":".$folder->getFolderPathPlain()." ";
+		if(($this->numdocs == 0) || !($hit = $lucenesearch->getFolder($folder->getId()))) {
+			try {
+				$idoc = $this->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);
+						}
+					}
+				}
+				$this->fulltextservice->Indexer()->addDocument($idoc);
+				echo "(".getMLText('index_folder_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. Folders without such an attribute
+			 * where added when a new folder was added to the dms. In such
+			 * a case the folder 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 "(".getMLText('index_folder_unchanged').")".PHP_EOL;
+			} else {
+				$this->fulltextservice->Indexer()->delete($hit->id);
+				try {
+					$idoc = $this->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);
+							}
+						}
+					}
+					$this->fulltextservice->Indexer()->addDocument($idoc);
+					echo "(".getMLText('index_folder_updated').")".PHP_EOL;
+				} catch(Exception $e) {
+					echo "(Timeout)".PHP_EOL;
+				}
+			}
+		}
 		if($documents) {
-			$lucenesearch = $this->fulltextservice->Search();
-			echo $folder->getFolderPathPlain().PHP_EOL;
 			foreach($documents as $document) {
-				echo $document->getId().":".$document->getName()." ";
+				echo str_repeat('  ', $depth+2).$document->getId().":".$document->getName()." ";
 				/* If the document wasn't indexed before then just add it */
-				if(!($hit = $lucenesearch->getDocument($document->getId()))) {
+				if(($this->numdocs == 0) || !($hit = $lucenesearch->getDocument($document->getId()))) {
 					try {
 						$idoc = $this->fulltextservice->IndexedDocument($document, true);
 						if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) {
@@ -227,8 +274,8 @@ class SeedDMS_IndexingDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ *
 			}
 
 			$folderprocess = new SeedDMS_Task_Indexer_Process_Folder($fulltextservice, $recreate);
+			call_user_func(array($folderprocess, 'process'), $folder, -1);
 			$tree = new SeedDMS_FolderTree($folder, array($folderprocess, 'process'));
-			call_user_func(array($folderprocess, 'process'), $folder);
 		} else {
 			$logger->log('Task \'indexingdocs\': fulltext search is turned off', PEAR_LOG_WARNING);
 		}

From 9fd8465a43dfeb25afc9c7d621e34b7ddb23be1e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Jun 2021 12:52:27 +0200
Subject: [PATCH 125/143] pass fulltextservice to view

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

diff --git a/out/out.ViewFolder.php b/out/out.ViewFolder.php
index 19fb360cb..65f68eff0 100644
--- a/out/out.ViewFolder.php
+++ b/out/out.ViewFolder.php
@@ -76,6 +76,7 @@ if ($folder->getAccessMode($user) < M_READ) {
 if($view) {
 	if(isset($_GET['action']) && $_GET['action'] == 'subtree')
 		$view->setParam('node', $node);
+	$view->setParam('fulltextservice', $fulltextservice);
 	$view->setParam('folder', $folder);
 	$view->setParam('orderby', $orderby);
 	$view->setParam('enableFolderTree', $settings->_enableFolderTree);

From 3ad1c9aa38be2e7bb229c1a545ef63b406642c46 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Jun 2021 14:37:31 +0200
Subject: [PATCH 126/143] set field created of folders

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

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
index eb551ed4d..74c6ee234 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
@@ -204,6 +204,7 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 			}
 		} elseif($document->isType('folder')) {
 			$this->addField('document_id', 'F'.$document->getID());
+			$this->addField('created', $document->getDate(), 'unindexed');
 		}
 	} /* }}} */
 

From 97414a0971adfd2d00580340b6b164a8f06c11ad Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Jun 2021 22:32:04 +0200
Subject: [PATCH 127/143] just read hiddenConfFields but do not save

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

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index bbc9333a5..d20ca7a3c 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -671,7 +671,7 @@ class Settings { /* {{{ */
 			$this->_useHomeAsRootFolder = Settings::boolval($tab["useHomeAsRootFolder"]);
 			$this->_titleDisplayHack = Settings::boolval($tab["titleDisplayHack"]);
 			$this->_showMissingTranslations = Settings::boolval($tab["showMissingTranslations"]);
-			$this->_hiddenConfFields = strval($tab["hiddenConfFields"]);
+			$this->_hiddenConfFields = explode(';', strval($tab["hiddenConfFields"]));
 		}
 
 		// XML Path: /configuration/advanced/authentication
@@ -1012,7 +1012,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "useHomeAsRootFolder", $this->_useHomeAsRootFolder);
     $this->setXMLAttributValue($node, "titleDisplayHack", $this->_titleDisplayHack);
     $this->setXMLAttributValue($node, "showMissingTranslations", $this->_showMissingTranslations);
-    $this->setXMLAttributValue($node, "hiddenConfFields", $this->_hiddenConfFields);
+//    $this->setXMLAttributValue($node, "hiddenConfFields", $this->_hiddenConfFields);
 
     // XML Path: /configuration/advanced/authentication
     $node = $this->getXMLNode($xml, '/configuration/advanced', 'authentication');

From 7af5857df3ed99dfb5d923ee46ad21e90b074a77 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Jun 2021 22:33:17 +0200
Subject: [PATCH 128/143] add new methods setXXXValue which check if _POST data
 has value and it is not hidden

---
 op/op.Settings.php | 290 +++++++++++++++++++++++++--------------------
 1 file changed, 159 insertions(+), 131 deletions(-)

diff --git a/op/op.Settings.php b/op/op.Settings.php
index ca550b1e0..63f957f0b 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -56,175 +56,203 @@ else $action=NULL;
 // --------------------------------------------------------------------------
 if ($action == "saveSettings")
 {
+	/**
+	 * First check if config var is actually set in POST request. Hidden conf
+	 * vars will not be included and may not override existing conf vars.
+	 */
+	function setStrValue($name) {
+		global $_POST, $settings;
+		if(isset($_POST[$name]) && !in_array($name, $settings->_hiddenConfFields))
+			$settings->{"_".$name} = $_POST[$name];
+	}
+	function setBoolValue($name) {
+		global $_POST, $settings;
+		if(isset($_POST[$name]) && !in_array($name, $settings->_hiddenConfFields)) {
+			if ($_POST[$name]=="on")
+				$settings->{"_".$name} = true;
+			else
+				$settings->{"_".$name} = false;
+		}
+	}
+	function setIntValue($name) {
+		global $_POST, $settings;
+		if(isset($_POST[$name]) && !in_array($name, $settings->_hiddenConfFields))
+			$settings->{"_".$name} = intval($_POST[$name]);
+	}
+	function setDirValue($name) {
+		global $_POST, $settings;
+		if(isset($_POST[$name]) && !in_array($name, $settings->_hiddenConfFields))
+			$settings->{"_".$name} = addDirSep($_POST[$name]);
+	}
   // -------------------------------------------------------------------------
   // get values
   // -------------------------------------------------------------------------
   // SETTINGS - SITE - DISPLAY
-	$settings->_siteName = $_POST["siteName"];
-  $settings->_footNote = $_POST["footNote"];
-  $settings->_printDisclaimer = getBoolValue("printDisclaimer");
-	$settings->_language = $_POST["language"];
-	$settings->_dateformat = $_POST["dateformat"];
-	$settings->_datetimeformat = $_POST["datetimeformat"];
+	setStrValue('siteName');
+	setStrValue('footNote');
+	setBoolValue('printDisclaimer');
+	setStrValue('language');
+	setStrValue('dateformat');
+	setStrValue('datetimeformat');
 	if(empty($_POST["availablelanguages"]))
 		$settings->_availablelanguages = array();
 	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"];
-  $settings->_previewWidthDropFolderList = $_POST["previewWidthDropFolderList"];
-  $settings->_previewWidthDetail = $_POST["previewWidthDetail"];
-  $settings->_showFullPreview = getBoolValue("showFullPreview");
-  $settings->_convertToPdf = getBoolValue("convertToPdf");
-  $settings->_maxItemsPerPage = $_POST["maxItemsPerPage"];
-  $settings->_incItemsPerPage = $_POST["incItemsPerPage"];
+	setStrValue('theme');
+	setBoolValue('overrideTheme');
+	setBoolValue('onePageMode');
+	setIntValue('previewWidthList');
+	setIntValue('previewWidthMenuList');
+	setIntValue('previewWidthDropFolderList');
+	setIntValue('previewWidthDetail');
+	setBoolValue('showFullPreview');
+	setBoolValue('convertToPdf');
+	setIntValue('maxItemsPerPage');
+	setIntValue('incItemsPerPage');
 
   // SETTINGS - SITE - EDITION
-  $settings->_strictFormCheck = getBoolValue("strictFormCheck");
-  $settings->_inlineEditing = getBoolValue("inlineEditing");
+	setBoolValue('strictFormCheck');
+	setBoolValue('inlineEditing');
 	if(empty($_POST["noDocumentFormFields"]))
 		$settings->_noDocumentFormFields = array();
 	else
 		$settings->_noDocumentFormFields = $_POST["noDocumentFormFields"];
-  $settings->setViewOnlineFileTypesFromString($_POST["viewOnlineFileTypes"]);
-  $settings->setEditOnlineFileTypesFromString($_POST["editOnlineFileTypes"]);
-  $settings->_enableConverting = getBoolValue("enableConverting");
-  $settings->_enableEmail =getBoolValue("enableEmail");
-  $settings->_enableUsersView = getBoolValue("enableUsersView");
-  $settings->_enableFullSearch = getBoolValue("enableFullSearch");
-  $settings->_maxSizeForFullText = intval($_POST["maxSizeForFullText"]);
-  $settings->_fullSearchEngine = $_POST["fullSearchEngine"];
-  $settings->_defaultSearchMethod = $_POST["defaultSearchMethod"];
-  $settings->_showSingleSearchHit = getBoolValue("showSingleSearchHit");
-  $settings->_enableSessionList = getBoolValue("enableSessionList");
-  $settings->_enableClipboard = getBoolValue("enableClipboard");
-  $settings->_enableMenuTasks = getBoolValue("enableMenuTasks");
-  $settings->_enableDropFolderList = getBoolValue("enableDropFolderList");
-  $settings->_enableDropUpload = getBoolValue("enableDropUpload");
-  $settings->_enableMultiUpload = getBoolValue("enableMultiUpload");
-  $settings->_enableFolderTree = getBoolValue("enableFolderTree");
-  $settings->_enableRecursiveCount = getBoolValue("enableRecursiveCount");
-  $settings->_maxRecursiveCount = intval($_POST["maxRecursiveCount"]);
-  $settings->_enableLanguageSelector = getBoolValue("enableLanguageSelector");
-  $settings->_enableHelp = getBoolValue("enableHelp");
-  $settings->_enableThemeSelector = getBoolValue("enableThemeSelector");
-  $settings->_expandFolderTree = intval($_POST["expandFolderTree"]);
-  $settings->_stopWordsFile = $_POST["stopWordsFile"];
-  $settings->_sortUsersInList = $_POST["sortUsersInList"];
-  $settings->_sortFoldersDefault = $_POST["sortFoldersDefault"];
-  $settings->_defaultDocPosition = $_POST["defaultDocPosition"];
+	$settings->setViewOnlineFileTypesFromString($_POST["viewOnlineFileTypes"]);
+	$settings->setEditOnlineFileTypesFromString($_POST["editOnlineFileTypes"]);
+	setBoolValue('enableConverting');
+	setBoolValue('enableEmail');
+	setBoolValue('enableUsersView');
+	setBoolValue('enableFullSearch');
+	setIntValue('maxSizeForFullText');
+	setStrValue('fullSearchEngine');
+	setStrValue('defaultSearchMethod');
+  setBoolValue("showSingleSearchHit");
+  setBoolValue("enableSessionList");
+  setBoolValue("enableClipboard");
+  setBoolValue("enableMenuTasks");
+  setBoolValue("enableDropFolderList");
+  setBoolValue("enableDropUpload");
+  setBoolValue("enableMultiUpload");
+  setBoolValue("enableFolderTree");
+  setBoolValue("enableRecursiveCount");
+  setIntValue("maxRecursiveCount");
+  setBoolValue("enableLanguageSelector");
+  setBoolValue("enableHelp");
+  setBoolValue("enableThemeSelector");
+  setIntValue("expandFolderTree");
+  setStrValue("stopWordsFile");
+  setStrValue("sortUsersInList");
+  setStrValue("sortFoldersDefault");
+  setStrValue("defaultDocPosition");
 
   // SETTINGS - SITE - WEBDAV
-	$settings->_enableWebdavReplaceDoc = getBoolValue("enableWebdavReplaceDoc");
+	setBoolValue("enableWebdavReplaceDoc");
 
   // SETTINGS - SITE - CALENDAR
-  $settings->_enableCalendar = getBoolValue("enableCalendar");
-  $settings->_calendarDefaultView = $_POST["calendarDefaultView"];
-  $settings->_firstDayOfWeek = intval($_POST["firstDayOfWeek"]);
+	setBoolValue("enableCalendar");
+	setStrValue("calendarDefaultView");
+  setIntValue("firstDayOfWeek");
 
   // SETTINGS - SYSTEM - SERVER
-  $settings->_rootDir = addDirSep($_POST["rootDir"]);
-  $settings->_httpRoot = $_POST["httpRoot"];
-  $settings->_contentDir = addDirSep($_POST["contentDir"]);
-  $settings->_cacheDir = addDirSep($_POST["cacheDir"]);
-  $settings->_stagingDir = addDirSep($_POST["stagingDir"]);
-  $settings->_luceneDir = addDirSep($_POST["luceneDir"]);
-  $settings->_extraPath = addDirSep($_POST["extraPath"]);
-  $settings->_dropFolderDir = addDirSep($_POST["dropFolderDir"]);
-  $settings->_backupDir = addDirSep($_POST["backupDir"]);
-  $settings->_repositoryUrl = addDirSep($_POST["repositoryUrl"]);
-  $settings->_proxyUrl = addDirSep($_POST["proxyUrl"]);
-  $settings->_proxyUser = addDirSep($_POST["proxyUser"]);
-  $settings->_proxyPassword = addDirSep($_POST["proxyPassword"]);
-  $settings->_logFileEnable = getBoolValue("logFileEnable");
-  $settings->_logFileRotation = $_POST["logFileRotation"];
-  $settings->_enableLargeFileUpload = getBoolValue("enableLargeFileUpload");
-  $settings->_partitionSize = $_POST["partitionSize"];
-  $settings->_maxUploadSize = $_POST["maxUploadSize"];
-  $settings->_enableXsendfile = getBoolValue("enableXsendfile");
+	setDirValue("rootDir");
+	setStrValue("httpRoot");
+  setDirValue("contentDir");
+  setDirValue("cacheDir");
+  setDirValue("stagingDir");
+  setDirValue("luceneDir");
+  setDirValue("extraPath");
+  setDirValue("dropFolderDir");
+  setDirValue("backupDir");
+  setDirValue("repositoryUrl");
+  setDirValue("proxyUrl");
+  setDirValue("proxyUser");
+  setDirValue("proxyPassword");
+	setBoolValue("logFileEnable");
+	setStrValue("logFileRotation");
+	setBoolValue("enableLargeFileUpload");
+	setStrValue("partitionSize"); // TODO: check if valid value, e.g. 1M or 5K
+	setStrValue("maxUploadSize"); // TODO: check if valid value, e.g. 1M or 5K
+  setBoolValue("enableXsendfile");
 
   // SETTINGS - SYSTEM - AUTHENTICATION
-  $settings->_enableGuestLogin = getBoolValue("enableGuestLogin");
-  $settings->_enableGuestAutoLogin = getBoolValue("enableGuestAutoLogin");
-  $settings->_restricted = getBoolValue("restricted");
-  $settings->_enableUserImage = getBoolValue("enableUserImage");
-  $settings->_disableSelfEdit = getBoolValue("disableSelfEdit");
-  $settings->_enablePasswordForgotten = getBoolValue("enablePasswordForgotten");
-  $settings->_passwordStrength = intval($_POST["passwordStrength"]);
-  $settings->_passwordStrengthAlgorithm = strval($_POST["passwordStrengthAlgorithm"]);
-  $settings->_passwordExpiration = intval($_POST["passwordExpiration"]);
-  $settings->_passwordHistory = intval($_POST["passwordHistory"]);
-  $settings->_loginFailure = intval($_POST["loginFailure"]);
-  $settings->_autoLoginUser = intval($_POST["autoLoginUser"]);
-  $settings->_quota = intval($_POST["quota"]);
-  $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"]);
+  setBoolValue("enableGuestLogin");
+  setBoolValue("enableGuestAutoLogin");
+  setBoolValue("restricted");
+  setBoolValue("enableUserImage");
+  setBoolValue("disableSelfEdit");
+  setBoolValue("enablePasswordForgotten");
+	setIntValue("passwordStrength");
+	setStrValue("passwordStrengthAlgorithm");
+  setIntValue("passwordExpiration");
+  setIntValue("passwordHistory");
+  setIntValue("loginFailure");
+  setIntValue("autoLoginUser");
+  setIntValue("quota");
+	$settings->_undelUserIds = !empty($_POST["undelUserIds"]) ? (is_array($_POST["undelUserIds"]) ? implode(',', $_POST["undelUserIds"]) : strval($_POST["undelUserIds"])) : '';
+	setStrValue("encryptionKey");
+  setIntValue("cookieLifetime");
+  setIntValue("defaultAccessDocs");
 
   // TODO Connectors
 
-  // SETTINGS - SYSTEM - DATABASE
-  $settings->_dbDriver = $_POST["dbDriver"];
-  $settings->_dbHostname = $_POST["dbHostname"];
-  $settings->_dbDatabase = $_POST["dbDatabase"];
-  $settings->_dbUser = $_POST["dbUser"];
-  $settings->_dbPass = $_POST["dbPass"];
+	// SETTINGS - SYSTEM - DATABASE
+	setStrValue('dbDriver');
+	setStrValue('dbHostname');
+	setStrValue('dbDatabase');
+	setStrValue('dbUser');
+	setStrValue('dbPass');
 
   // SETTINGS - SYSTEM - SMTP
-  $settings->_smtpServer = $_POST["smtpServer"];
-  $settings->_smtpPort = $_POST["smtpPort"];
-  $settings->_smtpSendFrom = $_POST["smtpSendFrom"];
-  $settings->_smtpUser = $_POST["smtpUser"];
-  $settings->_smtpPassword = $_POST["smtpPassword"];
+  setStrValue("smtpServer");
+  setIntValue("smtpPort");
+  setStrValue("smtpSendFrom");
+  setStrValue("smtpUser");
+  setStrValue("smtpPassword");
 
   // SETTINGS -ADVANCED - DISPLAY
-  $settings->_siteDefaultPage = $_POST["siteDefaultPage"];
-  $settings->_rootFolderID = intval($_POST["rootFolderID"]);
-  $settings->_useHomeAsRootFolder = getBoolValue("useHomeAsRootFolder");
-  $settings->_titleDisplayHack = getBoolValue("titleDisplayHack");
-  $settings->_showMissingTranslations = getBoolValue("showMissingTranslations");
+  setStrValue("siteDefaultPage");
+  setIntValue("rootFolderID");
+  setBoolValue("useHomeAsRootFolder");
+  setBoolValue("titleDisplayHack");
+  setBoolValue("showMissingTranslations");
 
   // SETTINGS - ADVANCED - AUTHENTICATION
-  $settings->_guestID = intval($_POST["guestID"]);
-  $settings->_adminIP = $_POST["adminIP"];
-  $settings->_apiKey = strval($_POST["apiKey"]);
-  $settings->_apiUserId = intval($_POST["apiUserId"]);
-  $settings->_apiOrigin = strval($_POST["apiOrigin"]);
+  setIntValue("guestID");
+  setStrValue("adminIP");
+  setStrValue("apiKey");
+  setIntValue("apiUserId");
+  setStrValue("apiOrigin");
 
   // SETTINGS - ADVANCED - EDITION
-  $settings->_versioningFileName = $_POST["versioningFileName"];
-  $settings->_presetExpirationDate = $_POST["presetExpirationDate"];
-  $settings->_workflowMode = $_POST["workflowMode"];
-  $settings->_allowReviewerOnly = getBoolValue("allowReviewerOnly");
-  $settings->_enableAdminRevApp = getBoolValue("enableAdminRevApp");
-  $settings->_enableOwnerRevApp = getBoolValue("enableOwnerRevApp");
-  $settings->_enableSelfRevApp = getBoolValue("enableSelfRevApp");
-  $settings->_enableUpdateRevApp = getBoolValue("enableUpdateRevApp");
-  $settings->_enableVersionDeletion = getBoolValue("enableVersionDeletion");
-  $settings->_enableVersionModification = getBoolValue("enableVersionModification");
-  $settings->_enableDuplicateDocNames = getBoolValue("enableDuplicateDocNames");
-  $settings->_enableDuplicateSubFolderNames = getBoolValue("enableDuplicateSubFolderNames");
-  $settings->_overrideMimeType = getBoolValue("overrideMimeType");
-  $settings->_removeFromDropFolder = getBoolValue("removeFromDropFolder");
+  setStrValue("versioningFileName");
+  setStrValue("presetExpirationDate");
+  setStrValue("workflowMode");
+  setBoolValue("allowReviewerOnly");
+  setBoolValue("enableAdminRevApp");
+  setBoolValue("enableOwnerRevApp");
+  setBoolValue("enableSelfRevApp");
+  setBoolValue("enableUpdateRevApp");
+  setBoolValue("enableVersionDeletion");
+  setBoolValue("enableVersionModification");
+  setBoolValue("enableDuplicateDocNames");
+  setBoolValue("enableDuplicateSubFolderNames");
+  setBoolValue("overrideMimeType");
+  setBoolValue("removeFromDropFolder");
 
   // SETTINGS - ADVANCED - NOTIFICATION
-  $settings->_enableOwnerNotification = getBoolValue("enableOwnerNotification");
-  $settings->_enableNotificationAppRev = getBoolValue("enableNotificationAppRev");
-  $settings->_enableNotificationWorkflow = getBoolValue("enableNotificationWorkflow");
+  setBoolValue("enableOwnerNotification");
+  setBoolValue("enableNotificationAppRev");
+  setBoolValue("enableNotificationWorkflow");
 
   // SETTINGS - ADVANCED - SERVER
-  $settings->_coreDir = $_POST["coreDir"];
-  $settings->_luceneClassDir = $_POST["luceneClassDir"];
-  $settings->_contentOffsetDir = intval($_POST["contentOffsetDir"]);
-  $settings->_maxDirID = intval($_POST["maxDirID"]);
-  $settings->_updateNotifyTime = intval($_POST["updateNotifyTime"]);
-  $settings->_maxExecutionTime = intval($_POST["maxExecutionTime"]);
+  setStrValue("coreDir");
+  setStrValue("luceneClassDir");
+  setIntValue("contentOffsetDir");
+  setIntValue("maxDirID");
+  setIntValue("updateNotifyTime");
+  setIntValue("maxExecutionTime");
   $settings->_cmdTimeout = (intval($_POST["cmdTimeout"]) > 0) ?intval($_POST["cmdTimeout"]) : 1;
-  $settings->_enableDebugMode = getBoolValue("enableDebugMode");
+  setBoolValue("enableDebugMode");
 
 	// SETTINGS - ADVANCED - INDEX CMD
 	if(isset($_POST["converters"]["fulltext"]))

From a18bc970df1ecf35315453acc8a4e87b38ee306d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Jun 2021 22:34:04 +0200
Subject: [PATCH 129/143] do not explode hiddenConfFields, because it's done
 when reading the xml

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

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 3f0f25313..c31d4f06c 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -100,8 +100,7 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
 		$settings = $this->params['settings'];
 		if(!($hcf = $settings->_hiddenConfFields))
 			return true;
-		$hcfa = explode(';', $hcf);
-		if(in_array($name, $hcfa))
+		if(in_array($name, $hcf))
 			return false;
 		return true;
 	} /* }}} */

From d871bd6e62fc3dc5571e4a361271948cfbc74199 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Jun 2021 22:49:16 +0200
Subject: [PATCH 130/143] update note for 5.1.23

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

diff --git a/CHANGELOG b/CHANGELOG
index a227957d6..ddd4b221c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,7 +20,7 @@
 - secure unlocking/locking of a documents with form token to prevent CSRF attacks
 - append referuri to base url to prevent redirects to arbitraty sites in op.Login.php
 - theme can be set in user manager
-- fields in configuration can be omitted from display
+- fields in configuration can be omitted from display and saving
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.22

From ff9385bf1ecd337d4a631d5f4ea5cd2b9fad0735 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 25 Jun 2021 08:54:05 +0200
Subject: [PATCH 131/143] change behaviour of mayEditComment and
 mayEditAttributes

---
 CHANGELOG                        |  3 +++
 inc/inc.ClassAccessOperation.php | 15 +++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ddd4b221c..73454feb9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,6 +21,9 @@
 - append referuri to base url to prevent redirects to arbitraty sites in op.Login.php
 - theme can be set in user manager
 - fields in configuration can be omitted from display and saving
+- comment of document version may not be modified when document has expired
+- attributes of document version may be edited if enableVersionModification is true
+  even if the document has been released, obsoleted or has been expired
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.22
diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index d4c904f8c..e9e238297 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -192,12 +192,14 @@ class SeedDMS_AccessOperation {
 	 *
 	 * This check can only be done for documents. Setting the documents
 	 * comment date is only allowed if version modification is turned on in
-	 * the settings and the document has not been obsoleted.
+	 * the settings and the document has not been obsoleted or expired.
 	 * The admin may set the comment even if is
 	 * disallowed in the settings.
 	 */
 	function mayEditComment() { /* {{{ */
 		if($this->obj->isType('document')) {
+			if($this->obj->getAccessMode($this->user) < M_READWRITE)
+				return false;
 			if($this->obj->isLocked()) {
 				$lockingUser = $this->obj->getLockingUser();
 				if (($lockingUser->getID() != $this->user->getID()) && ($this->obj->getAccessMode($this->user) != M_ALL)) {
@@ -206,7 +208,7 @@ class SeedDMS_AccessOperation {
 			}
 			$latestContent = $this->obj->getLatestContent();
 			$status = $latestContent->getStatus();
-			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) && ($status["status"]!=S_OBSOLETE)) {
+			if (($this->settings->_enableVersionModification || $this->user->isAdmin()) && !in_array($status["status"], array(S_OBSOLETE, S_EXPIRED))) {
 				return true;
 			}
 		}
@@ -218,9 +220,8 @@ class SeedDMS_AccessOperation {
 	 *
 	 * Setting the object attributes
 	 * is only allowed if version modification is turned on in
-	 * the settings and the document has not been obsoleted.
-	 * The admin may set the comment even if is
-	 * disallowed in the settings.
+	 * the settings or the document is still in an approval/review
+	 * or intial workflow step.
 	 */
 	function mayEditAttributes() { /* {{{ */
 		if($this->obj->isType('document')) {
@@ -228,7 +229,9 @@ class SeedDMS_AccessOperation {
 			$status = $latestContent->getStatus();
 			$workflow = $latestContent->getWorkflow();
 			$workflowstate = $latestContent->getWorkflowState();
-			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) && (in_array($status["status"], array(S_DRAFT_REV, S_DRAFT_APP)) || ($workflow && $workflowstate && $workflow->getInitState()->getID() == $workflowstate->getID()))) {
+			if($this->obj->getAccessMode($this->user) < M_READWRITE)
+				return false;
+			if ($this->settings->_enableVersionModification || in_array($status["status"], array(S_DRAFT_REV, S_DRAFT_APP)) || ($workflow && $workflowstate && $workflow->getInitState()->getID() == $workflowstate->getID())) {
 				return true;
 			}
 		}

From 61a5dbc2b94cd5b42d58025a77bcea303dc2fda0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 25 Jun 2021 09:02:39 +0200
Subject: [PATCH 132/143] check if latest content exists

---
 inc/inc.ClassAccessOperation.php | 106 +++++++++++++++++--------------
 1 file changed, 57 insertions(+), 49 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index e9e238297..942ae7862 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -107,10 +107,11 @@ class SeedDMS_AccessOperation {
 	 */
 	function mayOverwriteStatus() { /* {{{ */
 		if($this->obj->isType('document')) {
-			$latestContent = $this->obj->getLatestContent();
-			$status = $latestContent->getStatus();
-			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED || $status["status"]==S_OBSOLETE )) {
-				return true;
+			if($latestContent = $this->obj->getLatestContent()) {
+				$status = $latestContent->getStatus();
+				if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED || $status["status"]==S_OBSOLETE )) {
+					return true;
+				}
 			}
 		}
 		return false;
@@ -128,22 +129,23 @@ class SeedDMS_AccessOperation {
 	 */
 	function maySetReviewersApprovers() { /* {{{ */
 		if($this->obj->isType('document')) {
-			$latestContent = $this->obj->getLatestContent();
-			$status = $latestContent->getStatus();
-			$reviewstatus = $latestContent->getReviewStatus();
-			$hasreview = false;
-			foreach($reviewstatus as $r) {
-				if($r['status'] == 1 || $r['status'] == -1)
-					$hasreview = true;
-			}
-			$approvalstatus = $latestContent->getApprovalStatus();
-			$hasapproval = false;
-			foreach($approvalstatus as $r) {
-				if($r['status'] == 1 || $r['status'] == -1)
-					$hasapproval = true;
-			}
-			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && (($status["status"]==S_DRAFT_REV && !$hasreview) || ($status["status"]==S_DRAFT_APP && !$hasreview && !$hasapproval))) {
-				return true;
+			if($latestContent = $this->obj->getLatestContent()) {
+				$status = $latestContent->getStatus();
+				$reviewstatus = $latestContent->getReviewStatus();
+				$hasreview = false;
+				foreach($reviewstatus as $r) {
+					if($r['status'] == 1 || $r['status'] == -1)
+						$hasreview = true;
+				}
+				$approvalstatus = $latestContent->getApprovalStatus();
+				$hasapproval = false;
+				foreach($approvalstatus as $r) {
+					if($r['status'] == 1 || $r['status'] == -1)
+						$hasapproval = true;
+				}
+				if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && (($status["status"]==S_DRAFT_REV && !$hasreview) || ($status["status"]==S_DRAFT_APP && !$hasreview && !$hasapproval))) {
+					return true;
+				}
 			}
 		}
 		return false;
@@ -160,11 +162,12 @@ class SeedDMS_AccessOperation {
 	 */
 	function maySetWorkflow() { /* {{{ */
 		if($this->obj->isType('document')) {
-			$latestContent = $this->obj->getLatestContent();
-			$workflow = $latestContent->getWorkflow();
-			$workflowstate = $latestContent->getWorkflowState();
-			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && (!$workflow || ($workflowstate && ($workflow->getInitState()->getID() == $workflowstate->getID())))) {
-				return true;
+			if($latestContent = $this->obj->getLatestContent()) {
+				$workflow = $latestContent->getWorkflow();
+				$workflowstate = $latestContent->getWorkflowState();
+				if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && (!$workflow || ($workflowstate && ($workflow->getInitState()->getID() == $workflowstate->getID())))) {
+					return true;
+				}
 			}
 		}
 		return false;
@@ -178,10 +181,11 @@ class SeedDMS_AccessOperation {
 	 */
 	function maySetExpires() { /* {{{ */
 		if($this->obj->isType('document')) {
-			$latestContent = $this->obj->getLatestContent();
-			$status = $latestContent->getStatus();
-			if ((($this->obj->getAccessMode($this->user) == M_ALL) || $this->user->isAdmin()) && ($status["status"]!=S_OBSOLETE)) {
-				return true;
+			if($latestContent = $this->obj->getLatestContent()) {
+				$status = $latestContent->getStatus();
+				if ((($this->obj->getAccessMode($this->user) == M_ALL) || $this->user->isAdmin()) && ($status["status"]!=S_OBSOLETE)) {
+					return true;
+				}
 			}
 		}
 		return false;
@@ -206,10 +210,11 @@ class SeedDMS_AccessOperation {
 					return false;
 				}
 			}
-			$latestContent = $this->obj->getLatestContent();
-			$status = $latestContent->getStatus();
-			if (($this->settings->_enableVersionModification || $this->user->isAdmin()) && !in_array($status["status"], array(S_OBSOLETE, S_EXPIRED))) {
-				return true;
+			if($latestContent = $this->obj->getLatestContent()) {
+				$status = $latestContent->getStatus();
+				if (($this->settings->_enableVersionModification || $this->user->isAdmin()) && !in_array($status["status"], array(S_OBSOLETE, S_EXPIRED))) {
+					return true;
+				}
 			}
 		}
 		return false;
@@ -225,14 +230,15 @@ class SeedDMS_AccessOperation {
 	 */
 	function mayEditAttributes() { /* {{{ */
 		if($this->obj->isType('document')) {
-			$latestContent = $this->obj->getLatestContent();
-			$status = $latestContent->getStatus();
-			$workflow = $latestContent->getWorkflow();
-			$workflowstate = $latestContent->getWorkflowState();
-			if($this->obj->getAccessMode($this->user) < M_READWRITE)
-				return false;
-			if ($this->settings->_enableVersionModification || in_array($status["status"], array(S_DRAFT_REV, S_DRAFT_APP)) || ($workflow && $workflowstate && $workflow->getInitState()->getID() == $workflowstate->getID())) {
-				return true;
+			if($latestContent = $this->obj->getLatestContent()) {
+				$status = $latestContent->getStatus();
+				$workflow = $latestContent->getWorkflow();
+				$workflowstate = $latestContent->getWorkflowState();
+				if($this->obj->getAccessMode($this->user) < M_READWRITE)
+					return false;
+				if ($this->settings->_enableVersionModification || in_array($status["status"], array(S_DRAFT_REV, S_DRAFT_APP)) || ($workflow && $workflowstate && $workflow->getInitState()->getID() == $workflowstate->getID())) {
+					return true;
+				}
 			}
 		}
 		return false;
@@ -247,10 +253,11 @@ class SeedDMS_AccessOperation {
 	 */
 	function mayReview() { /* {{{ */
 		if($this->obj->isType('document')) {
-			$latestContent = $this->obj->getLatestContent();
-			$status = $latestContent->getStatus();
-			if ($status["status"]==S_DRAFT_REV) {
-				return true;
+			if($latestContent = $this->obj->getLatestContent()) {
+				$status = $latestContent->getStatus();
+				if ($status["status"]==S_DRAFT_REV) {
+					return true;
+				}
 			}
 		}
 		return false;
@@ -282,10 +289,11 @@ class SeedDMS_AccessOperation {
 	 */
 	function mayApprove() { /* {{{ */
 		if($this->obj->isType('document')) {
-			$latestContent = $this->obj->getLatestContent();
-			$status = $latestContent->getStatus();
-			if ($status["status"]==S_DRAFT_APP) {
-				return true;
+			if($latestContent = $this->obj->getLatestContent()) {
+				$status = $latestContent->getStatus();
+				if ($status["status"]==S_DRAFT_APP) {
+					return true;
+				}
 			}
 		}
 		return false;

From bc50f2f8b6e752b393683efc0066ebacf0e8764f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 25 Jun 2021 09:34:54 +0200
Subject: [PATCH 133/143] add new method SeedDMS_Core_Document::hasCategory()

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

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index ccb05979a..4d9c45a1b 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -429,6 +429,26 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		return true;
 	} /* }}} */
 
+	/**
+	 * Check if document has a given category
+	 *
+	 * @param SeedDMS_Core_DocumentCategory $cat
+	 * @return bool true if document has category, otherwise false
+	 */
+	function hasCategory($cat) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		if(!$cat)
+			return false;
+
+		$queryStr = "SELECT * FROM `tblDocumentCategory` WHERE `documentID` = ".$this->_id." AND `categoryID`=".$cat->getId();
+		$resArr = $db->getResultArray($queryStr);
+		if (!$resArr)
+			return false;
+
+		return true;
+	} /* }}} */
+
 	/**
 	 * Retrieve a list of all categories this document belongs to
 	 *
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index f93729797..e1d424d98 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -29,6 +29,7 @@
 - add methods SeedDMS_Core_DocumentContent::getApproveLog() and SeedDMS_Core_DocumentContent::getReviewLog()
 - better handling of document with an empty workflow state
 - fix checking of email addresses by using filter_var instead of regex
+- add new method SeedDMS_Core_Document::hasCategory()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 1eb2c3ed9f65fde7592e99e96a8a1ab8abbabb2f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 26 Jun 2021 11:56:25 +0200
Subject: [PATCH 134/143] check if partitionsize is greater the max upload size

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

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index c31d4f06c..4948bc33c 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -201,7 +201,10 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
 <?php
 		$users = $dms->getAllUsers();
 		if($users) {
-			$selections = explode(',', $settings->{"_".$name});
+			if(is_array($settings->{"_".$name}))
+				$selections = $settings->{"_".$name};
+			else
+				$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>";
@@ -681,6 +684,11 @@ if(is_writeable($settings->_configFilePath)) {
 				$this->warningMsg(getMLText("settings_guestid_is_admin"));
 			}
 		}
+		$mus2 = SeedDMS_Core_File::parse_filesize(ini_get("upload_max_filesize"));
+		$mus1 = SeedDMS_Core_File::parse_filesize($settings->_partitionSize);
+		if($settings->_enableLargeFileUpload && $mus2 < $mus1) {
+			$this->warningMsg(getMLText("settings_partionsize_below_max_filesize"));
+		}
 		$this->columnEnd(4);
 		$this->rowEnd(4);
 		$this->contentEnd();

From ece38b9d22a13960eb41aaecb8739f0203ecb5db Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 26 Jun 2021 11:57:02 +0200
Subject: [PATCH 135/143] store undelUserIds as array in settings class

---
 inc/inc.ClassSettings.php |  7 ++++---
 op/op.Settings.php        | 21 ++++++++++++---------
 op/op.UsrMgr.php          |  2 +-
 out/out.UsrMgr.php        |  2 +-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index d20ca7a3c..62173030e 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -61,7 +61,7 @@ class Settings { /* {{{ */
 	// maximum amount of bytes a user may consume, 0 = unlimited
 	var $_quota = 0;
 	// comma separated list of undeleteable user ids
-	var $_undelUserIds = 0;
+	var $_undelUserIds = array();
 	// Restricted access: only allow users to log in if they have an entry in
 	// the local database (irrespective of successful authentication with LDAP).
 	var $_restricted = true;
@@ -574,7 +574,8 @@ class Settings { /* {{{ */
 			$this->_loginFailure = intval($tab["loginFailure"]);
 			$this->_autoLoginUser = intval($tab["autoLoginUser"]);
 			$this->_quota = intval($tab["quota"]);
-			$this->_undelUserIds = strval($tab["undelUserIds"]);
+			if(trim(strval($tab["undelUserIds"])))
+				$this->_undelUserIds = explode(',',strval($tab["undelUserIds"]));
 			$this->_encryptionKey = strval($tab["encryptionKey"]);
 			$this->_cookieLifetime = intval($tab["cookieLifetime"]);
 			$this->_defaultAccessDocs = intval($tab["defaultAccessDocs"]);
@@ -930,7 +931,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "loginFailure", $this->_loginFailure);
     $this->setXMLAttributValue($node, "autoLoginUser", $this->_autoLoginUser);
     $this->setXMLAttributValue($node, "quota", $this->_quota);
-    $this->setXMLAttributValue($node, "undelUserIds", $this->_undelUserIds);
+    $this->setXMLAttributValue($node, "undelUserIds", implode(',', $this->_undelUserIds));
     $this->setXMLAttributValue($node, "encryptionKey", $this->_encryptionKey);
     $this->setXMLAttributValue($node, "cookieLifetime", $this->_cookieLifetime);
     $this->setXMLAttributValue($node, "defaultAccessDocs", $this->_defaultAccessDocs);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 63f957f0b..5e033f6ae 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -79,6 +79,15 @@ if ($action == "saveSettings")
 		if(isset($_POST[$name]) && !in_array($name, $settings->_hiddenConfFields))
 			$settings->{"_".$name} = intval($_POST[$name]);
 	}
+	function setArrayValue($name) {
+		global $_POST, $settings;
+		if(isset($_POST[$name]) && !in_array($name, $settings->_hiddenConfFields)) {
+			if($_POST[$name])
+				$settings->{"_".$name} = $_POST[$name];
+			else
+				$settings->{"_".$name} = array();
+		}
+	}
 	function setDirValue($name) {
 		global $_POST, $settings;
 		if(isset($_POST[$name]) && !in_array($name, $settings->_hiddenConfFields))
@@ -94,10 +103,7 @@ if ($action == "saveSettings")
 	setStrValue('language');
 	setStrValue('dateformat');
 	setStrValue('datetimeformat');
-	if(empty($_POST["availablelanguages"]))
-		$settings->_availablelanguages = array();
-	else
-		$settings->_availablelanguages = $_POST["availablelanguages"];
+	setArrayValue('availablelanguages');
 	setStrValue('theme');
 	setBoolValue('overrideTheme');
 	setBoolValue('onePageMode');
@@ -113,10 +119,7 @@ if ($action == "saveSettings")
   // SETTINGS - SITE - EDITION
 	setBoolValue('strictFormCheck');
 	setBoolValue('inlineEditing');
-	if(empty($_POST["noDocumentFormFields"]))
-		$settings->_noDocumentFormFields = array();
-	else
-		$settings->_noDocumentFormFields = $_POST["noDocumentFormFields"];
+	setArrayValue('noDocumentFormFields');
 	$settings->setViewOnlineFileTypesFromString($_POST["viewOnlineFileTypes"]);
 	$settings->setEditOnlineFileTypesFromString($_POST["editOnlineFileTypes"]);
 	setBoolValue('enableConverting');
@@ -188,7 +191,7 @@ if ($action == "saveSettings")
   setIntValue("loginFailure");
   setIntValue("autoLoginUser");
   setIntValue("quota");
-	$settings->_undelUserIds = !empty($_POST["undelUserIds"]) ? (is_array($_POST["undelUserIds"]) ? implode(',', $_POST["undelUserIds"]) : strval($_POST["undelUserIds"])) : '';
+  setArrayValue("undelUserIds");
 	setStrValue("encryptionKey");
   setIntValue("cookieLifetime");
   setIntValue("defaultAccessDocs");
diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php
index d94614bd9..d80416601 100644
--- a/op/op.UsrMgr.php
+++ b/op/op.UsrMgr.php
@@ -159,7 +159,7 @@ else if ($action == "removeuser") {
 		UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));
 	}
 
-	if(in_array($userid, explode(',', $settings->_undelUserIds))) {
+	if(in_array($userid, $settings->_undelUserIds)) {
 		UI::exitError(getMLText("admin_tools"),getMLText("cannot_delete_user"));
 	}
 
diff --git a/out/out.UsrMgr.php b/out/out.UsrMgr.php
index e174c8cea..a56ae5f8f 100644
--- a/out/out.UsrMgr.php
+++ b/out/out.UsrMgr.php
@@ -60,7 +60,7 @@ if($view) {
 	$view->setParam('passwordexpiration', $settings->_passwordExpiration);
 	$view->setParam('httproot', $settings->_httpRoot);
 	$view->setParam('enableuserimage', $settings->_enableUserImage);
-	$view->setParam('undeluserids', explode(',', $settings->_undelUserIds));
+	$view->setParam('undeluserids', $settings->_undelUserIds);
 	$view->setParam('workflowmode', $settings->_workflowMode);
 	$view->setParam('quota', $settings->_quota);
 	$view->setParam('strictformcheck', $settings->_strictFormCheck);

From 8c130c06e4450e3bb26d50ecd01bfe406803bbcc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 28 Jun 2021 08:59:42 +0200
Subject: [PATCH 136/143] check remaining conf vars if disabled in
 hiddenConfFields

---
 op/op.Settings.php | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/op/op.Settings.php b/op/op.Settings.php
index 5e033f6ae..dde1ad91a 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -120,8 +120,10 @@ if ($action == "saveSettings")
 	setBoolValue('strictFormCheck');
 	setBoolValue('inlineEditing');
 	setArrayValue('noDocumentFormFields');
-	$settings->setViewOnlineFileTypesFromString($_POST["viewOnlineFileTypes"]);
-	$settings->setEditOnlineFileTypesFromString($_POST["editOnlineFileTypes"]);
+	if(isset($_POST['viewOnlineFileTypes']) && !in_array('viewOnlineFileTypes', $settings->_hiddenConfFields))
+		$settings->setViewOnlineFileTypesFromString($_POST["viewOnlineFileTypes"]);
+	if(isset($_POST['editOnlineFileTypes']) && !in_array('editOnlineFileTypes', $settings->_hiddenConfFields))
+		$settings->setEditOnlineFileTypesFromString($_POST["editOnlineFileTypes"]);
 	setBoolValue('enableConverting');
 	setBoolValue('enableEmail');
 	setBoolValue('enableUsersView');
@@ -254,10 +256,12 @@ if ($action == "saveSettings")
   setIntValue("maxDirID");
   setIntValue("updateNotifyTime");
   setIntValue("maxExecutionTime");
-  $settings->_cmdTimeout = (intval($_POST["cmdTimeout"]) > 0) ?intval($_POST["cmdTimeout"]) : 1;
+	if(isset($_POST['cmdTimeout']) && !in_array('cmdTimeout', $settings->_hiddenConfFields))
+		$settings->_cmdTimeout = (intval($_POST["cmdTimeout"]) > 0) ?intval($_POST["cmdTimeout"]) : 5;
   setBoolValue("enableDebugMode");
 
 	// SETTINGS - ADVANCED - INDEX CMD
+	if(isset($_POST['converters']) && !in_array('converters', $settings->_hiddenConfFields)) {
 	if(isset($_POST["converters"]["fulltext"]))
 		$settings->_converters['fulltext'] = $_POST["converters"]["fulltext"];
 	else
@@ -278,9 +282,17 @@ if ($action == "saveSettings")
 			unset($settings->_converters[$target]['newcmd']);
 		}
 	}
+	}
 
-  // SETTINGS - EXTENSIONS
-  $settings->_extensions = isset($_POST["extensions"]) ? $_POST["extensions"] : array();
+	// SETTINGS - EXTENSIONS
+	if(isset($_POST['extensions']) && !in_array('extensions', $settings->_hiddenConfFields)) {
+		foreach($_POST['extensions'] as $extname=>$conf) {
+			if(!in_array('extensions|'.$extname, $settings->_hiddenConfFields)) {
+				$settings->_extensions[$extname] = $conf;
+			}
+		}
+//		$settings->_extensions = isset($_POST["extensions"]) ? $_POST["extensions"] : array();
+	}
 
   // -------------------------------------------------------------------------
   // save

From b0478bec3c0146c69872c459fe28f4e4503b1798 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 28 Jun 2021 09:00:35 +0200
Subject: [PATCH 137/143] show a message if conf var is disabled, but do not
 hide it completely

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

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 4948bc33c..ade28bf13 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -115,18 +115,21 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
 	 */
 	protected function showConfigText($title, $name, $type='', $placeholder='') { /* {{{ */
 		$settings = $this->params['settings'];
-		if(!$this->isVisible($name))
-			return;
 ?>
-      <tr title="<?= getMLText($title."_desc") ?>">
+			<tr title="<?= getMLText($title."_desc") ?>">
 				<td><?= getMLText($title) ?>:</td>
 <?php
 		if($type == 'array')
 			$value = $settings->arrayToString($settings->{"_".$name});
 		else
 			$value = $settings->{"_".$name};
+		echo "				<td>";
+		if($this->isVisible($name))
+			$this->showTextField($name, $value, ($type=='password' || $type=='textarea' ? $type : ''), $placeholder);
+		else
+			echo getMLText('settings_conf_field_not_editable');
+		echo "</td>\n";
 ?>
-				<td><?php $this->showTextField($name, $value, ($type=='password' || $type=='textarea' ? $type : ''), $placeholder); ?></td>
 			</tr>
 <?php
 	} /* }}} */

From ee544eb4e771cde416d012a7e2174bcccac9f4e5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 28 Jun 2021 09:02:46 +0200
Subject: [PATCH 138/143] add new and update existing phrases

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

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index b87933c64..9729a6783 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -229,7 +229,9 @@ URL: [url]',
 'cannot_move_root' => 'خطأ: لايمكنك تحريك المجلد الرئيسي.',
 'cannot_retrieve_approval_snapshot' => 'لا يمكن استدعاء لقطة حالة الموافقة لهذا الاصدار من المستند',
 'cannot_retrieve_review_snapshot' => 'لا يمكن استدعاء لقطة حالة المراجعة لهذا الاصدار من المستند',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => 'خطأ: لايمكنك مسح المجلد الرئيسي.',
+'cannot_transfer_your_objects' => '',
 'categories' => 'اقسام',
 'categories_loading' => 'جار تحميل الأقسام',
 'category' => 'قسم',
@@ -688,10 +690,15 @@ URL: [url]',
 'include_subdirectories' => 'اشمل مجلدات فرعية',
 'indexing_tasks_in_queue' => 'فهرسة المهات بالترتيب',
 'index_converters' => 'تحويل الفهرسة',
+'index_document_added' => '',
 'index_document_unchanged' => '',
+'index_document_updated' => '',
 'index_done' => 'تمت الفهرسة',
 'index_error' => 'خطأ في الفهرسة',
 'index_folder' => 'فهرسة المجلد',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => 'فهرسة بلا محتوى',
 'index_pending' => 'الفهرسة قيد الإنتظار',
 'index_waiting' => 'الفهرسة قيد الإنتظار',
@@ -742,8 +749,10 @@ URL: [url]',
 'js_no_approval_status' => 'من فضلك اختر حالة الموافقة',
 'js_no_comment' => 'لايوجد تعليق',
 'js_no_currentpwd' => 'لا يوجد كلمة سر حالية',
+'js_no_document' => '',
 'js_no_email' => 'اكتب بريدك الالكتروني',
 'js_no_file' => 'من فضلك اختر ملف',
+'js_no_folder' => '',
 'js_no_keywords' => 'من فضلك اختر بعض الكلمات البحثية',
 'js_no_login' => 'من فضلك اكتب اسم المستخدم',
 'js_no_name' => 'من فضلك اكتب اسم',
@@ -1290,6 +1299,7 @@ URL: [url]',
 'settings_checkOutDir_desc' => 'checkOutDir',
 'settings_cmdTimeout' => 'انتهاء مدة cmd',
 'settings_cmdTimeout_desc' => 'انتهاء مدة cmd',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => 'مجلد المحتوى',
 'settings_contentDir_desc' => 'محتوى المجلد',
 'settings_contentOffsetDir' => 'محتوى المجلد',
@@ -1458,6 +1468,8 @@ URL: [url]',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLITEFTS',
 'settings_guestID' => 'معرف الضيف',
 'settings_guestID_desc' => 'معرف الضيف',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'httpRoot',
 'settings_httpRoot_desc' => 'httpRoot',
 'settings_incItemsPerPage' => 'زيادة العناصر في الصفحة',
@@ -1476,6 +1488,7 @@ URL: [url]',
 'settings_install_welcome_text' => 'تثبيت نص الترحيب',
 'settings_install_welcome_title' => 'تثبيت عنوان الترحيب',
 'settings_install_zendframework' => 'تثبيت إطار زند',
+'settings_invalid_guestid' => '',
 'settings_language' => 'اللغة',
 'settings_language_desc' => 'اللغة',
 'settings_libraryFolder' => 'مجلد المكتبة',
@@ -1678,6 +1691,7 @@ URL: [url]',
 'splash_delete_access' => 'حذف الوصول',
 'splash_document_added' => 'الوثيقة المضافة',
 'splash_document_checkedout' => 'تم سحب المستند',
+'splash_document_deleted' => '',
 'splash_document_edited' => 'تم تحرير المستند',
 'splash_document_indexed' => 'تم فهرسة المستند',
 'splash_document_locked' => 'تم قفل المستند',
@@ -1701,6 +1715,7 @@ URL: [url]',
 'splash_extension_import' => 'استيراد',
 'splash_extension_refresh' => 'تحديث',
 'splash_extension_upload' => 'تحميل',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => 'تحرير مجلد',
 'splash_importfs' => 'استيراد',
 'splash_inherit_access' => 'يرث الوصول',
@@ -1802,6 +1817,7 @@ URL: [url]',
 'tasks' => 'مهمات',
 'task_core_expireddocs_days' => '',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => 'تفصيل المهام',
 'task_disabled' => 'تم توقيف المهمة',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index eaaa0d697..f3f1e308b 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -212,7 +212,9 @@ $text = array(
 'cannot_move_root' => 'Невозможно е да се перемести руут папката',
 'cannot_retrieve_approval_snapshot' => 'Невозможно е да се получи утвърждаваща снимка за тази версия на документа',
 'cannot_retrieve_review_snapshot' => 'Невозможно е да се получи рецензираща снимка за тази версия на документа',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => 'Невозможно е да се изтрие руут папката',
+'cannot_transfer_your_objects' => '',
 'categories' => 'Категории',
 'categories_loading' => '',
 'category' => 'Категория',
@@ -617,10 +619,15 @@ $text = array(
 'include_subdirectories' => 'Включи под-папки',
 'indexing_tasks_in_queue' => '',
 'index_converters' => '',
+'index_document_added' => '',
 'index_document_unchanged' => '',
+'index_document_updated' => '',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Индекс на директорията',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
 'index_waiting' => '',
@@ -671,8 +678,10 @@ $text = array(
 'js_no_approval_status' => 'Изберете статусът на утвърждаване',
 'js_no_comment' => 'Няма коментар',
 'js_no_currentpwd' => '',
+'js_no_document' => '',
 'js_no_email' => 'Въведете своя Email',
 'js_no_file' => 'Изберете файл',
+'js_no_folder' => '',
 'js_no_keywords' => 'Укажете ключови думи',
 'js_no_login' => 'Въведъте логин',
 'js_no_name' => 'Въведете име',
@@ -1153,6 +1162,7 @@ $text = array(
 'settings_checkOutDir_desc' => '',
 'settings_cmdTimeout' => '',
 'settings_cmdTimeout_desc' => '',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => 'Папка със данните',
 'settings_contentDir_desc' => 'Къде да съхранява качените файлове (най-добре изберете папка, недостъпна за уеб-сървъра)',
 'settings_contentOffsetDir' => 'Content Offset Directory',
@@ -1321,6 +1331,8 @@ $text = array(
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'Идентификатор за гостенин',
 'settings_guestID_desc' => 'Идентификатор за гост (може да не се променя)',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'Корен Http',
 'settings_httpRoot_desc' => 'Относителен път в URL, след доменната част. Без http://. Например ако пълния URL http://www.example.com/letodms/, то трябва да укажем \'/letodms/\'. Ако URL http://www.example.com/, то \'/\'',
 'settings_incItemsPerPage' => '',
@@ -1339,6 +1351,7 @@ $text = array(
 'settings_install_welcome_text' => '<p>Преди да почнем, убедете се че сте създали файл \'ENABLE_INSTALL_TOOL\' в папка conf/  конфигурации, иначе инсталацията няма да работи. На NIX-подобните това може да стане с команда \'touch conf/ENABLE_INSTALL_TOOL\'. След инсталацията изтрийте файла.</p><p>letoDMS има минимални изисквания. Нужна е mysql БД и уеб-сървър с php. За да работи полнотекстното търсене lucene, също така е необходима Zend framework, инсталирана там, където я вижда php. От версия 3.2.0 letoDMS, ADOdb няма да бъде част от дистрибутива. Изтеклете от <a href="http://adodb.sourceforge.net/">http://adodb.sourceforge.net</a> и инсталирайте. Пътят към нея може да бъде указан по-късно при инсталацията.</p><p>Ако искате да създадете БД преди инсталацията, то създайте я ръчно (тут так и было написано)))), опционално създайте потребител с права над бд и импортирайте дъмпа от папка конфигурация. Инсталационният скрипт може да свърши това и сам, но ще му трябва достъп към БД с права за създаване на бази данни.</p>',
 'settings_install_welcome_title' => 'Добре дошли в инсталатора на  leto/seedDMS',
 'settings_install_zendframework' => 'Инсталирайте Zend Framework, ако ще използвате пълнотекстово търсене',
+'settings_invalid_guestid' => '',
 'settings_language' => 'Език по подразбиране',
 'settings_language_desc' => 'Език по подразбиране (име на подпапката в папка "languages")',
 'settings_libraryFolder' => '',
@@ -1541,6 +1554,7 @@ $text = array(
 'splash_delete_access' => '',
 'splash_document_added' => '',
 'splash_document_checkedout' => '',
+'splash_document_deleted' => '',
 'splash_document_edited' => '',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Документът е заключен',
@@ -1564,6 +1578,7 @@ $text = array(
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_extension_upload' => '',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => '',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
@@ -1665,6 +1680,7 @@ $text = array(
 'tasks' => '',
 'task_core_expireddocs_days' => '',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => '',
 'task_disabled' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 9d5806975..0cb2875df 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (772)
+//    Translators: Admin (774)
 
 $text = array(
 '2_factor_auth' => '',
@@ -217,7 +217,9 @@ URL: [url]',
 'cannot_move_root' => 'Error: No és possible moure la carpeta root.',
 'cannot_retrieve_approval_snapshot' => 'No és possible recuperar la instantànea de l\'estat d\'aprovació per a aquesta versió de document.',
 'cannot_retrieve_review_snapshot' => 'No és possible recuperar la instantània de revisió per a aquesta versió de document.',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => 'Error: No és possible eliminar la carpeta root.',
+'cannot_transfer_your_objects' => '',
 'categories' => 'Categories',
 'categories_loading' => '',
 'category' => 'Category',
@@ -622,10 +624,15 @@ URL: [url]',
 'include_subdirectories' => 'Incloure subdirectoris',
 'indexing_tasks_in_queue' => '',
 'index_converters' => '',
+'index_document_added' => '',
 'index_document_unchanged' => '',
+'index_document_updated' => '',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Carpeta d\'índex',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
 'index_waiting' => '',
@@ -676,8 +683,10 @@ URL: [url]',
 'js_no_approval_status' => 'Si us plau, seleccioneu l\'estat d\'aprovació',
 'js_no_comment' => 'No hi ha comentaris',
 'js_no_currentpwd' => '',
+'js_no_document' => '',
 'js_no_email' => 'Si us plau, escriviu la vostra adreça de correu electrònic',
 'js_no_file' => 'Si us plau, seleccioneu un arxiu',
+'js_no_folder' => '',
 'js_no_keywords' => 'Si us plau, especifiqueu mots clau',
 'js_no_login' => 'Si us plau, escriviu un nom d\'usuari',
 'js_no_name' => 'Si us plau, escriviu un nom',
@@ -1158,6 +1167,7 @@ URL: [url]',
 'settings_checkOutDir_desc' => '',
 'settings_cmdTimeout' => '',
 'settings_cmdTimeout_desc' => '',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => '',
 'settings_contentDir_desc' => '',
 'settings_contentOffsetDir' => '',
@@ -1324,8 +1334,10 @@ URL: [url]',
 'settings_fullSearchEngine_desc' => '',
 'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
-'settings_guestID' => 'Guest ID',
+'settings_guestID' => '',
 'settings_guestID_desc' => '',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => '',
 'settings_incItemsPerPage' => '',
@@ -1344,6 +1356,7 @@ URL: [url]',
 'settings_install_welcome_text' => '',
 'settings_install_welcome_title' => '',
 'settings_install_zendframework' => '',
+'settings_invalid_guestid' => '',
 'settings_language' => '',
 'settings_language_desc' => '',
 'settings_libraryFolder' => '',
@@ -1546,6 +1559,7 @@ URL: [url]',
 'splash_delete_access' => '',
 'splash_document_added' => '',
 'splash_document_checkedout' => '',
+'splash_document_deleted' => '',
 'splash_document_edited' => '',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Document blocat',
@@ -1569,6 +1583,7 @@ URL: [url]',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_extension_upload' => '',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => '',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
@@ -1670,6 +1685,7 @@ URL: [url]',
 'tasks' => '',
 'task_core_expireddocs_days' => '',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => '',
 'task_disabled' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 9bbb3e261..8dd14260f 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -241,7 +241,9 @@ URL: [url]',
 'cannot_move_root' => 'Chyba: Není možné přesunout kořenovovou složku.',
 'cannot_retrieve_approval_snapshot' => 'Není možné získat informaci o stavu schválení této verze dokumentu.',
 'cannot_retrieve_review_snapshot' => 'Není možné získat informaci o stavu recenze této verze dokumentu.',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => 'Chyba: Není možné smazat kořenovou složku.',
+'cannot_transfer_your_objects' => '',
 'categories' => 'Kategorie',
 'categories_loading' => 'Počkejte prosím, dokud nebude načten seznam kategorií ...',
 'category' => 'Kategorie',
@@ -719,10 +721,15 @@ URL: [url]',
 'include_subdirectories' => 'Včetně podadresářů',
 'indexing_tasks_in_queue' => 'Indexování úkolů ve frontě',
 'index_converters' => 'Indexování převodníků',
+'index_document_added' => '',
 'index_document_unchanged' => 'dokument nezměněn',
+'index_document_updated' => '',
 'index_done' => 'Indexování hotovo',
 'index_error' => 'Chyba',
 'index_folder' => 'Složka indexu',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => 'Nenaindexoval se obsah',
 'index_pending' => 'Probíhá indexování',
 'index_waiting' => 'Čekání',
@@ -773,8 +780,10 @@ URL: [url]',
 'js_no_approval_status' => 'Vyberte stav schválení',
 'js_no_comment' => 'Žádný komentář',
 'js_no_currentpwd' => 'Zadejte své aktuální heslo',
+'js_no_document' => '',
 'js_no_email' => 'Napište svou emailovou adresu',
 'js_no_file' => 'Vyberte soubor',
+'js_no_folder' => '',
 'js_no_keywords' => 'Zadejte nějaká klíčová slova',
 'js_no_login' => 'Napište jméno uživatele',
 'js_no_name' => 'Napište jméno',
@@ -1362,6 +1371,7 @@ Jméno: [username]
 'settings_checkOutDir_desc' => 'Adresář, kde je zkopírován nejnovější obsah dokumentu, pokud je dokument odbaven. Pokud zpřístupníte tento adresář uživatelům, mohou soubor upravit a znovu ho zkontrolovat.',
 'settings_cmdTimeout' => 'Časový limit pro externí příkazy',
 'settings_cmdTimeout_desc' => 'Toto trvání v sekundách určuje, kdy bude ukončen externí příkaz (např. Pro vytvoření fulltextového indexu).',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => 'Obsah adresáře',
 'settings_contentDir_desc' => 'Místo, kde jsou nahrané soubory uloženy (nejlepší zvolit adresář, který není přístupný přes váš web-server)',
 'settings_contentOffsetDir' => 'Adresář offsetů obsahu',
@@ -1530,6 +1540,8 @@ Jméno: [username]
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'ID hosta',
 'settings_guestID_desc' => 'ID hostovaného uživatele při přihlášení jako host (většinou není třeba měnit)',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => 'Relativní cesta v adrese URL po části domény. Nezadávejte předponu http:// nebo název hostitele webového serveru. např. Pokud je úplná adresa URL http://www.example.com/seeddms/, nastavte "/seeddms/". Pokud je adresa URL http://www.example.com/, nastavte "/"',
 'settings_incItemsPerPage' => 'Počet položek načtených na konci stránky',
@@ -1548,6 +1560,7 @@ Jméno: [username]
 'settings_install_welcome_text' => '<p> Než začnete instalovat aplikaci SeedDMS, ujistěte se, že jste vytvořili soubor \'ENABLE_INSTALL_TOOL \' ve svém konfiguračním adresáři, jinak nebude instalace fungovat. Na systému Unix lze to jednoduše provést pomocí \'touch conf/ENABLE_INSTALL_TOOL\'. Po dokončení instalace vymažte tento soubor. </P> <p> SeedDMS má velmi minimální požadavky. Budete potřebovat databázi mysql nebo podporu sqlite a php webový server. Musí být nainstalován také protokol o pear package. Pro fulltextové vyhledávání lucene budete také potřebovat Zend framework nainstalovaný na disku, kde jej může najít php. Pro server WebDAV budete potřebovat také HTTP_WebDAV_Server. Cesta k němu může být později nastavena během instalace. </P> <p> Chcete-li vytvořit databázi před zahájením instalace, stačí ji vytvořit ručně pomocí svého oblíbeného nástroje, volitelně vytvořit databázového uživatele s přístupem v databázi a importu jednoho z databázových dumps do konfiguračního adresáře. Instalační skript to může udělat i za vás, ale bude potřebovat přístup k databázi s dostatečnými právy k vytváření databází. </P>',
 'settings_install_welcome_title' => 'Vítejte v instalaci aplikace SeedDMS',
 'settings_install_zendframework' => 'Nainstalujte Zend Framework, pokud máte v úmyslu použít fulltextový vyhledávač založený na zend. V opačném případě ignorujte tuto zprávu a pokračujte v instalaci.',
+'settings_invalid_guestid' => '',
 'settings_language' => 'Výchozí jazyk',
 'settings_language_desc' => 'Výchozí jazyk (název podsložky v adresáři "languages")',
 'settings_libraryFolder' => 'složka knihovny',
@@ -1750,6 +1763,7 @@ Jméno: [username]
 'splash_delete_access' => 'Přístupová práva smazána',
 'splash_document_added' => 'Dokument přidán',
 'splash_document_checkedout' => 'Dokument odbaven',
+'splash_document_deleted' => '',
 'splash_document_edited' => 'Dokument uložen',
 'splash_document_indexed' => 'Dokument naindexován',
 'splash_document_locked' => 'Dokument zamčen',
@@ -1773,6 +1787,7 @@ Jméno: [username]
 'splash_extension_import' => 'Importováno rozšíření',
 'splash_extension_refresh' => 'Aktualizovaný seznam rozšíření',
 'splash_extension_upload' => 'Instalováno rozšíření',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => 'Změny složky uloženy',
 'splash_importfs' => 'Importováno [docs] dokumentů a [folders] složek',
 'splash_inherit_access' => 'Přístupové právo bude zděděno',
@@ -1874,6 +1889,7 @@ Jméno: [username]
 'tasks' => 'Úkoly',
 'task_core_expireddocs_days' => '',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => 'Popis',
 'task_disabled' => 'Vypnuto',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 2c097c503..e0618edbc 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 (2921), dgrutsch (22)
+//    Translators: Admin (2938), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -241,7 +241,9 @@ URL: [url]',
 'cannot_move_root' => 'Fehler: Verschieben des Hauptordners nicht möglich',
 'cannot_retrieve_approval_snapshot' => 'Nicht imstande, für diese Dokumentenversion die Freigabe für den Status Snapshot zurückzuholen.',
 'cannot_retrieve_review_snapshot' => 'Nicht imstande, Berichtstatus Snapshot für diese Dokumentversion zurückzuholen',
+'cannot_revapp_expired_docs' => 'Das Dokument kann nicht mehr geprüft oder freigegeben werden, weil es bereits abgelaufen ist.',
 'cannot_rm_root' => 'Fehler: Löschen des Hauptordners nicht möglich',
+'cannot_transfer_your_objects' => 'Sie können Ihre eigenen Objekte nicht transferieren.',
 'categories' => 'Kategorien',
 'categories_loading' => 'Bitte warten, bis die Liste der Kategorien geladen ist …',
 'category' => 'Kategorie',
@@ -721,10 +723,15 @@ URL: [url]',
 'include_subdirectories' => 'Unterverzeichnisse miteinbeziehen',
 'indexing_tasks_in_queue' => 'Indiziervorgänge in der Warteschleife',
 'index_converters' => '',
+'index_document_added' => 'Dokument hinzugefügt',
 'index_document_unchanged' => 'Dokument unverändert',
+'index_document_updated' => 'Dokument aktualisiert',
 'index_done' => 'Fertig',
 'index_error' => 'Fehler',
 'index_folder' => 'Indiziere Ordner',
+'index_folder_added' => 'Ordner hinzugefügt',
+'index_folder_unchanged' => 'Ordner unverändert',
+'index_folder_updated' => 'Ordner aktualisiert',
 'index_no_content' => 'Inhalt nicht indiziert',
 'index_pending' => 'Vorgemerkt',
 'index_waiting' => 'Warte',
@@ -775,8 +782,10 @@ URL: [url]',
 'js_no_approval_status' => 'Wählen Sie bitte einen Freigabe-Status aus',
 'js_no_comment' => 'Geben Sie einen Kommentar an',
 'js_no_currentpwd' => 'Bitte das aktuelle Passwort eintragen',
+'js_no_document' => 'Wählen Sie bitte ein Dokument aus',
 'js_no_email' => 'Geben Sie eine Email-Adresse an',
 'js_no_file' => 'Bitte wählen Sie eine Datei',
+'js_no_folder' => 'Wählen Sie bitte einen Ordner aus',
 'js_no_keywords' => 'Geben Sie einige Stichwörter an',
 'js_no_login' => 'Geben Sie einen Benutzernamen ein',
 'js_no_name' => 'Sie haben den Namen vergessen',
@@ -1382,6 +1391,7 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'settings_checkOutDir_desc' => 'Dies ist das Verzeichnis, in das Dokumenteninhalte bei einem Check out kopiert werden. Wenn dieses Verzeichnis für die Benutzer erreichbar ist, können die Dateien editiert und dann wieder eingecheckt werden.',
 'settings_cmdTimeout' => 'Timeout für externe Programme',
 'settings_cmdTimeout_desc' => 'Diese Zeit in Sekunden legt fest, wann ein externes Programm (z.B. für die Erstellung des Volltext-Index) beendet wird.',
+'settings_conf_field_not_editable' => 'Dieser Wert ist nicht editierbar',
 'settings_contentDir' => 'Content-Verzeichnis',
 'settings_contentDir_desc' => 'Verzeichnis, in dem die Dokumente gespeichert werden. Sie sollten ein Verzeichnis wählen, das nicht durch den Web-Server erreichbar ist.',
 'settings_contentOffsetDir' => 'Content Offset Directory',
@@ -1548,8 +1558,10 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'settings_fullSearchEngine_desc' => 'Setzt das Verfahren, welches für die Volltextsuche verwendet wird.',
 'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
-'settings_guestID' => 'Gast-ID',
+'settings_guestID' => 'Gastbenutzer',
 'settings_guestID_desc' => 'Id des Gast-Benutzers, wenn man sich als \'guest\' anmeldet.',
+'settings_guestid_is_admin' => 'Gastuser ist ein Administrator',
+'settings_guestid_is_disabled' => 'Gastuser ist deaktiviert',
 'settings_httpRoot' => 'HTTP Wurzelverzeichnis',
 'settings_httpRoot_desc' => 'Der relative Pfad in der URL nach der Domain, also ohne http:// und den hostnamen. z.B. wenn die komplette URL http://www.example.com/seeddms/ ist, dann setzen Sie diesen Wert auf \'/seeddms/\'. Wenn die URL http://www.example.com/ ist, tragen Sie \'/\' ein.',
 'settings_incItemsPerPage' => 'Zahl der Einträge, die nachgeladen werden',
@@ -1568,6 +1580,7 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'settings_install_welcome_text' => '<p>Before you start to install SeedDMS make sure you have created a file \'ENABLE_INSTALL_TOOL\' in your configuration directory, otherwise the installation will not work. On Unix-System this can easily be done with \'touch conf/ENABLE_INSTALL_TOOL\'. After you have finished the installation delete the file.</p><p>SeedDMS has very minimal requirements. You will need a mysql database or sqlite support and a php enabled web server. The pear package Log has to be installed too. For the lucene full text search, you will also need the Zend framework installed on disc where it can be found by php. For the WebDAV server you will also need the HTTP_WebDAV_Server. The path to it can later be set during installation.</p><p>If you like to create the database before you start installation, then just create it manually with your favorite tool, optionally create a database user with access on the database and import one of the database dumps in the configuration directory. The installation script can do that for you as well, but it will need database access with sufficient rights to create databases.</p>',
 'settings_install_welcome_title' => 'Willkommen zur Installation von SeedDMS',
 'settings_install_zendframework' => 'Installiere Zend Framework, wenn Sie die zend-basierte Volltextsuche einsetzen möchten. Anderenfalls, ignorieren Sie diese Meldung und fahren Sie mit der Installation fort.',
+'settings_invalid_guestid' => 'Ungültiger Gastbenutzer',
 'settings_language' => 'Voreingestellte Sprache',
 'settings_language_desc' => 'Voreingestellte Sprache (entspricht dem Unterverzeichnis im Verzeichnis \'languages\')',
 'settings_libraryFolder' => 'Bibliotheksordner',
@@ -1770,6 +1783,7 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'splash_delete_access' => 'Zugriffsrecht gelöscht',
 'splash_document_added' => 'Dokument hinzugefügt',
 'splash_document_checkedout' => 'Dokument ausgecheckt',
+'splash_document_deleted' => 'Dokument gelöscht',
 'splash_document_edited' => 'Dokument gespeichert',
 'splash_document_indexed' => 'Dokument \'[name]\' indiziert.',
 'splash_document_locked' => 'Dokument gesperrt',
@@ -1793,6 +1807,7 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'splash_extension_import' => 'Erweiterung installiert',
 'splash_extension_refresh' => 'Liste der Erweiterungen neu geladen',
 'splash_extension_upload' => 'Erweiterung installiert',
+'splash_folder_deleted' => 'Ordner gelöscht',
 'splash_folder_edited' => 'Änderungen am Ordner gespeichert',
 'splash_importfs' => '[docs] Dokumente und [folders] Ordner importiert',
 'splash_inherit_access' => 'Zugriffsrechte werden geerbt',
@@ -1894,6 +1909,7 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'tasks' => 'Aufgaben',
 'task_core_expireddocs_days' => 'Tage',
 'task_core_expireddocs_email' => 'E-Mail',
+'task_core_expireddocs_peruser' => 'Pro Benutzer',
 'task_core_indexingdocs_recreate' => 'Index neu erzeugen',
 'task_description' => 'Beschreibung',
 'task_disabled' => 'Deaktiviert',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index ca9b653ac..8b3773ba3 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -212,7 +212,9 @@ $text = array(
 'cannot_move_root' => '',
 'cannot_retrieve_approval_snapshot' => '',
 'cannot_retrieve_review_snapshot' => '',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => '',
+'cannot_transfer_your_objects' => '',
 'categories' => 'Κατηγορίες',
 'categories_loading' => '',
 'category' => 'Κατηγορία',
@@ -617,10 +619,15 @@ $text = array(
 'include_subdirectories' => '',
 'indexing_tasks_in_queue' => 'Δημιουργία δεικτών σε ουρά',
 'index_converters' => '',
+'index_document_added' => '',
 'index_document_unchanged' => '',
+'index_document_updated' => '',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Ταξινόμηση φακέλου',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
 'index_waiting' => 'Αναμονή',
@@ -671,8 +678,10 @@ $text = array(
 'js_no_approval_status' => '',
 'js_no_comment' => '',
 'js_no_currentpwd' => '',
+'js_no_document' => '',
 'js_no_email' => '',
 'js_no_file' => '',
+'js_no_folder' => '',
 'js_no_keywords' => '',
 'js_no_login' => '',
 'js_no_name' => '',
@@ -1164,6 +1173,7 @@ URL: [url]',
 'settings_checkOutDir_desc' => '',
 'settings_cmdTimeout' => '',
 'settings_cmdTimeout_desc' => '',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => '',
 'settings_contentDir_desc' => '',
 'settings_contentOffsetDir' => '',
@@ -1332,6 +1342,8 @@ URL: [url]',
 'settings_fullSearchEngine_valsqlitefts' => '',
 'settings_guestID' => '',
 'settings_guestID_desc' => '',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => '',
 'settings_httpRoot_desc' => '',
 'settings_incItemsPerPage' => '',
@@ -1350,6 +1362,7 @@ URL: [url]',
 'settings_install_welcome_text' => '',
 'settings_install_welcome_title' => '',
 'settings_install_zendframework' => '',
+'settings_invalid_guestid' => '',
 'settings_language' => '',
 'settings_language_desc' => '',
 'settings_libraryFolder' => '',
@@ -1552,6 +1565,7 @@ URL: [url]',
 'splash_delete_access' => '',
 'splash_document_added' => '',
 'splash_document_checkedout' => '',
+'splash_document_deleted' => '',
 'splash_document_edited' => '',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Κλειδωμένο έγγραφο',
@@ -1575,6 +1589,7 @@ URL: [url]',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_extension_upload' => '',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => '',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
@@ -1676,6 +1691,7 @@ URL: [url]',
 'tasks' => '',
 'task_core_expireddocs_days' => '',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => '',
 'task_disabled' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index cf14e85a8..52f835883 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 (2025), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (2043), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -241,7 +241,9 @@ URL: [url]',
 'cannot_move_root' => 'Error: Cannot move root folder.',
 'cannot_retrieve_approval_snapshot' => 'Unable to retrieve approval status snapshot for this document version.',
 'cannot_retrieve_review_snapshot' => 'Unable to retrieve review status snapshot for this document version.',
+'cannot_revapp_expired_docs' => 'The document cannot be reviewer or approved anymore, because it already expired.',
 'cannot_rm_root' => 'Error: Cannot delete root folder.',
+'cannot_transfer_your_objects' => 'You cannot transfer your own objects',
 'categories' => 'Categories',
 'categories_loading' => 'Please wait, until the list of categories is loaded …',
 'category' => 'Category',
@@ -721,10 +723,15 @@ URL: [url]',
 'include_subdirectories' => 'Include subdirectories',
 'indexing_tasks_in_queue' => 'Indexing tasks in queue',
 'index_converters' => '',
-'index_document_unchanged' => 'document unchanged',
+'index_document_added' => 'Document added',
+'index_document_unchanged' => 'Document unchanged',
+'index_document_updated' => 'Document updated',
 'index_done' => 'Done',
 'index_error' => 'Error',
 'index_folder' => 'Index folder',
+'index_folder_added' => 'Folder added',
+'index_folder_unchanged' => 'Folder unchanged',
+'index_folder_updated' => 'Folder updated',
 'index_no_content' => 'Did not index content',
 'index_pending' => 'Pending',
 'index_waiting' => 'Waiting',
@@ -775,8 +782,10 @@ URL: [url]',
 'js_no_approval_status' => 'Please select the approval status',
 'js_no_comment' => 'There is no comment',
 'js_no_currentpwd' => 'Please enter your current password',
+'js_no_document' => 'Please select a document',
 'js_no_email' => 'Type in your Email-address',
 'js_no_file' => 'Please select a file',
+'js_no_folder' => 'Please select a folder',
 'js_no_keywords' => 'Specify some keywords',
 'js_no_login' => 'Please type in a username',
 'js_no_name' => 'Please type in a name',
@@ -1376,6 +1385,7 @@ If you did not receive a password, please use the password forgotten function on
 'settings_checkOutDir_desc' => 'This is the directory where the latest content of a document is copied if the document is checked out. If you make this directory accessible for users, they can edit the file and check it back in when finished.',
 'settings_cmdTimeout' => 'Timeout for external commands',
 'settings_cmdTimeout_desc' => 'This duration in seconds determines when an external command (e.g. for creating the full text index) will be terminated.',
+'settings_conf_field_not_editable' => 'This value is not editable',
 'settings_contentDir' => 'Content directory',
 'settings_contentDir_desc' => 'Where the uploaded files are stored (best to choose a directory that is not accessible through your web-server)',
 'settings_contentOffsetDir' => 'Content Offset Directory',
@@ -1542,8 +1552,10 @@ If you did not receive a password, please use the password forgotten function on
 'settings_fullSearchEngine_desc' => 'Set the method used for the fulltext search.',
 'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
-'settings_guestID' => 'Guest ID',
+'settings_guestID' => 'Guest user',
 'settings_guestID_desc' => 'ID of guest-user used when logged in as guest (mostly no need to change)',
+'settings_guestid_is_admin' => 'Guest user is an administrator',
+'settings_guestid_is_disabled' => 'Guest user is disabled',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => 'The relative path in the URL, after the domain part. Do not include the http:// prefix or the web host name. e.g. If the full URL is http://www.example.com/seeddms/, set \'/seeddms/\'. If the URL is http://www.example.com/, set \'/\'',
 'settings_incItemsPerPage' => 'Number of entries loaded at end of page',
@@ -1562,6 +1574,7 @@ If you did not receive a password, please use the password forgotten function on
 'settings_install_welcome_text' => '<p>Before you start to install SeedDMS make sure you have created a file \'ENABLE_INSTALL_TOOL\' in your configuration directory, otherwise the installation will not work. On Unix-System this can easily be done with \'touch conf/ENABLE_INSTALL_TOOL\'. After you have finished the installation delete the file.</p><p>SeedDMS has very minimal requirements. You will need a mysql database or sqlite support and a php enabled web server. The pear package Log has to be installed too. For the lucene full text search, you will also need the Zend framework installed on disc where it can be found by php. For the WebDAV server you will also need the HTTP_WebDAV_Server. The path to it can later be set during installation.</p><p>If you like to create the database before you start installation, then just create it manually with your favorite tool, optionally create a database user with access on the database and import one of the database dumps in the configuration directory. The installation script can do that for you as well, but it will need database access with sufficient rights to create databases.</p>',
 'settings_install_welcome_title' => 'Welcome to the installation of SeedDMS',
 'settings_install_zendframework' => 'Install Zend Framework, if you intend to use the zend based full text search engine. Otherwise, ignore this message and continue the installation.',
+'settings_invalid_guestid' => 'Invalid guest user',
 'settings_language' => 'Default language',
 'settings_language_desc' => 'Default language (name of a subfolder in folder "languages")',
 'settings_libraryFolder' => 'Library folder',
@@ -1764,6 +1777,7 @@ If you did not receive a password, please use the password forgotten function on
 'splash_delete_access' => 'Access right deleted',
 'splash_document_added' => 'Document added',
 'splash_document_checkedout' => 'Document checked out',
+'splash_document_deleted' => 'Document deleted',
 'splash_document_edited' => 'Document saved',
 'splash_document_indexed' => 'Document \'[name]\' indexed.',
 'splash_document_locked' => 'Document locked',
@@ -1787,6 +1801,7 @@ If you did not receive a password, please use the password forgotten function on
 'splash_extension_import' => 'Extension installed',
 'splash_extension_refresh' => 'Refreshed list of extensions',
 'splash_extension_upload' => 'Extension installed',
+'splash_folder_deleted' => 'Folder deleted',
 'splash_folder_edited' => 'Save folder changes',
 'splash_importfs' => 'Imported [docs] documents and [folders] folders',
 'splash_inherit_access' => 'Access right will be inherited',
@@ -1888,6 +1903,7 @@ If you did not receive a password, please use the password forgotten function on
 'tasks' => 'Tasks',
 'task_core_expireddocs_days' => 'Days',
 'task_core_expireddocs_email' => 'Email',
+'task_core_expireddocs_peruser' => 'Per user',
 'task_core_indexingdocs_recreate' => 'Recreate index',
 'task_description' => 'Description',
 'task_disabled' => 'Disabled',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index bb452f307..602169de3 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 (1315), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1316), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => 'Autenticación de doble factor',
@@ -236,7 +236,9 @@ URL: [url]',
 'cannot_move_root' => 'Error: No es posible mover la carpeta raíz.',
 'cannot_retrieve_approval_snapshot' => 'No es posible recuperar la instantánea del estado de aprobación para esta versión de documento.',
 'cannot_retrieve_review_snapshot' => 'No es posible recuperar la instantánea de revisión para esta versión de documento.',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => 'Error: No es posible eliminar la carpeta raíz.',
+'cannot_transfer_your_objects' => '',
 'categories' => 'categorías',
 'categories_loading' => '',
 'category' => 'Categoría',
@@ -695,10 +697,15 @@ URL: [url]',
 'include_subdirectories' => 'Incluir subcarpetas',
 'indexing_tasks_in_queue' => 'Tareas de indexación en cola',
 'index_converters' => '',
-'index_document_unchanged' => 'documento sin cambios',
+'index_document_added' => '',
+'index_document_unchanged' => 'Documento sin cambios',
+'index_document_updated' => '',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Índice de carpetas',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
 'index_waiting' => 'Esperando',
@@ -749,8 +756,10 @@ URL: [url]',
 'js_no_approval_status' => 'Por favor, seleccione el estado de aprobación',
 'js_no_comment' => 'No hay comentarios',
 'js_no_currentpwd' => '',
+'js_no_document' => '',
 'js_no_email' => 'Escriba su dirección de correo electrónico',
 'js_no_file' => 'Por favor, seleccione un archivo',
+'js_no_folder' => '',
 'js_no_keywords' => 'Especifique palabras clave',
 'js_no_login' => 'Por favor, escriba un nombre de usuario',
 'js_no_name' => 'Por favor, escriba un nombre',
@@ -1305,6 +1314,7 @@ URL: [url]',
 'settings_checkOutDir_desc' => 'Este es el directorio donde se copia el último contenido de un documento, si el documento ya esta revisado. Si haces accesible este documento para los usuarios, podrán editar el archivo y volverlo a revisar cuando hayan terminado.',
 'settings_cmdTimeout' => 'Tiempo limite para comandos externos',
 'settings_cmdTimeout_desc' => 'Esta duración definirá cuando debe interrumpirse la ejecución de un comando externo (i.e. para crear el índice de texto completo).',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => 'Carpeta de contenidos',
 'settings_contentDir_desc' => 'Donde se almacenan los archivos subidos (es preferible seleccionar una carpeta que no sea accesible a través del servidor web)',
 'settings_contentOffsetDir' => 'Carpeta de contenidos de desplazamiento',
@@ -1473,6 +1483,8 @@ URL: [url]',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'ID de invitado',
 'settings_guestID_desc' => 'ID del usuario invitado cuando se conecta como invitado (mayormente no necesita cambiarlo)',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'Raíz Http',
 'settings_httpRoot_desc' => 'La ruta relativa de la URL, después de la parte del servidor. No incluir el prefijo http:// o el nombre del servidor. Por ejemplo, si la URL completa es http://www.example.com/seeddms/, configure «/seeddms/». Si la URL completa es http://www.example.com/, configure «/»',
 'settings_incItemsPerPage' => 'Número de entradas cargadas al final de la página',
@@ -1491,6 +1503,7 @@ URL: [url]',
 'settings_install_welcome_text' => '<p>Antes de instalar SeedDMS asegúrese de haber creado un archivo «ENABLE_INSTALL_TOOL» en su carpeta de instalación, en otro caso la instalación no funcionará. En sistemas Unix puede hacerse fácilmente con «touch conf/ENABLE_INSTALL_TOOL». Después de terminar la instalación elimine el archivo.</p><p>SeedDMS tiene unos requisitos mínimos. Necesitará una base de datos y un servidor web con soporte para php. Para la búsqueda de texto completo lucene, necesitará tener instalado también el framework Zend donde pueda ser utilizado por php. Desde la versión 3.2.0 de SeedDMS ADObd ya no forma parte de la distribución. Consiga una copia de él desde <a href="http://adodb.sourceforge.net/">http://adodb.sourceforge.net</a> e instálelo. La ruta hacia él podrá ser establecida durante la instalación.</p><p> Si prefiere crear la base de datos antes de comenzar la instalación, simplemente créela manualmente con su herramienta preferida, opcionalmente cree un usuario de base de datos con acceso a esta base de datos e importe uno de los volcados de la carpeta de configuración. El script de instalación puede hacer esto también, pero necesitará acceso con privilegios suficientes para crear bases de datos.</p>',
 'settings_install_welcome_title' => 'Bienvenido a la instalación de SeedDMS',
 'settings_install_zendframework' => 'Instale Zend Framework, si quiere usar el sistema de búsqueda de texto completo',
+'settings_invalid_guestid' => '',
 'settings_language' => 'Idioma por defecto',
 'settings_language_desc' => 'Idioma por defecto (nombre de una subcarpeta en la carpeta "languages")',
 'settings_libraryFolder' => 'Biblioteca de carpetas',
@@ -1693,6 +1706,7 @@ URL: [url]',
 'splash_delete_access' => '',
 'splash_document_added' => 'Documento añadido',
 'splash_document_checkedout' => '',
+'splash_document_deleted' => '',
 'splash_document_edited' => 'Documento guardado',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Documento bloqueado',
@@ -1716,6 +1730,7 @@ URL: [url]',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_extension_upload' => '',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => 'Cambios a la carpeta guardados',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
@@ -1817,6 +1832,7 @@ URL: [url]',
 'tasks' => 'Tareas',
 'task_core_expireddocs_days' => '',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => '',
 'task_disabled' => '',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 27971c61d..0e6a3a864 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -241,7 +241,9 @@ URL: [url]',
 'cannot_move_root' => 'Erreur : Impossible de déplacer le dossier racine.',
 'cannot_retrieve_approval_snapshot' => 'Impossible de retrouver l\'instantané de statut d\'approbation pour cette version de document.',
 'cannot_retrieve_review_snapshot' => 'Impossible de récupérer l’instantané du statut de vérification pour cette version du document.',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => 'Erreur : Dossier racine ineffaçable.',
+'cannot_transfer_your_objects' => '',
 'categories' => 'Catégories',
 'categories_loading' => 'Veuillez patienter pendant le chargement de la liste des catégories…',
 'category' => 'Catégorie',
@@ -719,10 +721,15 @@ URL: [url]',
 'include_subdirectories' => 'Inclure les sous-dossiers',
 'indexing_tasks_in_queue' => 'Opérations d’indexation en attente',
 'index_converters' => '',
+'index_document_added' => '',
 'index_document_unchanged' => 'Document inchangé',
+'index_document_updated' => '',
 'index_done' => 'Terminé',
 'index_error' => 'Erreur',
 'index_folder' => 'Dossier Index',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => 'Contenu non indexé',
 'index_pending' => 'En attente',
 'index_waiting' => 'Chargement…',
@@ -773,8 +780,10 @@ URL: [url]',
 'js_no_approval_status' => 'Veuillez sélectionner le statut d’approbation',
 'js_no_comment' => 'Il n’y a pas de commentaire',
 'js_no_currentpwd' => 'Veuillez entrer votre mot de passe actuel',
+'js_no_document' => '',
 'js_no_email' => 'Saisissez votre adresse e-mail',
 'js_no_file' => 'Veuillez sélectionner un fichier',
+'js_no_folder' => '',
 'js_no_keywords' => 'Spécifiez quelques mots-clés',
 'js_no_login' => 'Veuillez saisir un identifiant',
 'js_no_name' => 'Veuillez saisir un nom',
@@ -1365,6 +1374,7 @@ Nom : [username]
 'settings_checkOutDir_desc' => 'Il s’agit du répertoire dans lequel le dernier contenu d’un document est copié si le document est vérifié. Si vous rendez ce répertoire accessible aux utilisateurs, ils peuvent modifier le fichier et le refaire vérifier une fois terminé.',
 'settings_cmdTimeout' => 'Délai d\'expiration pour les commandes externes',
 'settings_cmdTimeout_desc' => 'Cette durée en secondes détermine quand une commande externe (par exemple pour la création de l\'index de texte intégral) sera terminée.',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => 'Répertoire du contenu',
 'settings_contentDir_desc' => 'Endroit ou les fichiers téléchargés sont stockés (il est préférable de choisir un répertoire qui n\'est pas accessible par votre serveur web)',
 'settings_contentOffsetDir' => 'Content Offset Directory',
@@ -1533,6 +1543,8 @@ Nom : [username]
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'ID invité',
 'settings_guestID_desc' => 'ID de l\'invité utilisé lorsque vous êtes connecté en tant qu\'invité (la plupart du temps pas besoin de changer)',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'Racine HTTP',
 'settings_httpRoot_desc' => 'Le chemin relatif dans l\'URL, après le nom de domaine. Ne pas inclure le préfixe http:// ou le nom d\'hôte Internet. Par exemple Si l\'URL complète est http://www.example.com/letodms/, mettez \'/letodms/\'. Si l\'URL est http://www.example.com/, mettez \'/\'',
 'settings_incItemsPerPage' => 'Nombre d\'entrées chargées à la fin de la page',
@@ -1551,6 +1563,7 @@ Nom : [username]
 'settings_install_welcome_text' => '<p>Avant de commencer l\'installation de SeedDMS, assurez-vous d\'avoir créé un fichier \'ENABLE_INSTALL_TOOL\' dans votre répertoire de configuration, sinon l\'installation ne fonctionnera pas. Sur des systèmes Unix, cela peut se faire simplement avec \'touch / ENABLE_INSTALL_TOOL\'. Une fois l\'installation terminée, supprimez le fichier.</p><p>SeedDMS a des exigences très minimes. Vous aurez besoin d\'une base de données MySQL ou SQLite et d\'un serveur web PHP. Le package Pear "Log" doit également être installé. Pour la recherche via Lucene, vous devez également installer le framework Zend sur le disque à un emplacement accessible par PHP. Pour le serveur WebDAV, vous aurez besoin d\'installer HTTP_WebDAV_Server. Le chemin d’accès peut être défini ultérieurement pendant l’installation.</p><p>Si vous préférez créer la base de données avant de commencer l\'installation, créez la manuellement avec votre outil favori, créez éventuellement un utilisateur de base de données avec accès sur la base et importez un export de base du répertoire de configuration. Le script d\'installation peut le faire pour vous, mais il requiert un accès à la base de données avec les droits suffisants pour créer des bases de données.</p>',
 'settings_install_welcome_title' => 'Bienvenue dans l\'installation de SeedDMS',
 'settings_install_zendframework' => 'Installez Zend Framework si vous avez l’intention d’utiliser le moteur de recherche plein texte basé sur Zend. Sinon, continuez l’installation en ignorant ce message.',
+'settings_invalid_guestid' => '',
 'settings_language' => 'Langue par défaut',
 'settings_language_desc' => 'Langue par défaut (nom d\'un sous-dossier dans le dossier "languages")',
 'settings_libraryFolder' => 'Dossier bibliothèque',
@@ -1753,6 +1766,7 @@ Nom : [username]
 'splash_delete_access' => 'Droits d’accès supprimés',
 'splash_document_added' => 'Document ajouté',
 'splash_document_checkedout' => 'Document bloqué',
+'splash_document_deleted' => '',
 'splash_document_edited' => 'Document sauvegardé',
 'splash_document_indexed' => 'Document « [name] » indexé.',
 'splash_document_locked' => 'Document verrouillé',
@@ -1776,6 +1790,7 @@ Nom : [username]
 'splash_extension_import' => 'Extension installée',
 'splash_extension_refresh' => 'Liste des extensions actualisée',
 'splash_extension_upload' => 'Extension installée',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => 'Dossier modifié',
 'splash_importfs' => '[docs] documents et [folders] dossiers importés',
 'splash_inherit_access' => 'Droits d’accès hérités',
@@ -1877,6 +1892,7 @@ Nom : [username]
 'tasks' => 'Tâches',
 'task_core_expireddocs_days' => 'jours',
 'task_core_expireddocs_email' => 'E-mail',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => 'Régénérer l’index',
 'task_description' => 'Description',
 'task_disabled' => 'Désactivée',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index c8df485a4..87bf1f756 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -241,7 +241,9 @@ Internet poveznica: [url]',
 'cannot_move_root' => 'Greška: Ne možete premještati root mapu.',
 'cannot_retrieve_approval_snapshot' => 'Nije moguće dohvatiti snimku statusa odobrenja za ovu verziju dokumenta.',
 'cannot_retrieve_review_snapshot' => 'Nije moguće dohvatiti snimku statusa pregleda za ovu verziju dokumenta.',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => 'Greška: Ne možete izbrisati root mapu.',
+'cannot_transfer_your_objects' => '',
 'categories' => 'Kategorije',
 'categories_loading' => 'Molimo pričekati dok se ne učita lista kategorija...',
 'category' => 'Kategorija',
@@ -700,10 +702,15 @@ Internet poveznica: [url]',
 'include_subdirectories' => 'Sadrži podmape',
 'indexing_tasks_in_queue' => '',
 'index_converters' => '',
+'index_document_added' => '',
 'index_document_unchanged' => '',
+'index_document_updated' => '',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Mapa indeksa',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
 'index_waiting' => '',
@@ -754,8 +761,10 @@ Internet poveznica: [url]',
 'js_no_approval_status' => 'Molim odaberite status odobrenja',
 'js_no_comment' => 'Nema komentara',
 'js_no_currentpwd' => '',
+'js_no_document' => '',
 'js_no_email' => 'Upišite vašu e-mail adresu',
 'js_no_file' => 'Molim odaberite datoteku',
+'js_no_folder' => '',
 'js_no_keywords' => 'Odredite neke ključne riječi',
 'js_no_login' => 'Molim upišite korisničko ime',
 'js_no_name' => 'MOlim upišite naziv',
@@ -1326,6 +1335,7 @@ Internet poveznica: [url]',
 'settings_checkOutDir_desc' => 'Ovo je mapa gdje se sprema kopija zadnjeg sadržaja dokumenta ako je dokument odjavljen. Ako korisnicima omogućite pristup ovoj mapi oni tada mogu mijenjati datoteku i ponovno prijaviti kad dovrše izmjene.',
 'settings_cmdTimeout' => 'Istek vremena za vanjske komande',
 'settings_cmdTimeout_desc' => 'Ovo trajanje u sekundama određuje kada će vanjska komanda (npr. Za kreiranje full-tekst indeksa) biti terminirana.',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => 'Mapa sadržaja',
 'settings_contentDir_desc' => 'Gdje se spremaju učitane datoteke (najbolje da odaberete mapu koja nije dostupna kroz vaš web-server)',
 'settings_contentOffsetDir' => 'Offset mapa sadržaja',
@@ -1494,6 +1504,8 @@ Internet poveznica: [url]',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'ID gosta',
 'settings_guestID_desc' => 'ID gost korisnika koja se koristi kada je prijavljen kao gost (uglavnom se ne treba mijenjati)',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'Http korijen',
 'settings_httpRoot_desc' => 'U URL-u, putanja na što se odnosi, nakon domene. Ne sadrži http:// prefiks ili naziv web hosta. Npr. ako je puni URL http://www.example.com/seeddms/, postavi \'/seeddms/\'. Ako je URL http://www.example.com/, postavi \'/\'',
 'settings_incItemsPerPage' => '',
@@ -1512,6 +1524,7 @@ Internet poveznica: [url]',
 'settings_install_welcome_text' => '<p>Prije nego počnete instalirati ProsperaDMS uvjerite se da ste izradili datoteku \'ENABLE_INSTALL_TOOL\' u vašoj mapi konfiguracije, jer u suprotnom instalacija neće raditi. Na Unix sustavu to se može lako učiniti s \'touch conf/ENABLE_INSTALL_TOOL\'. Nakon završteka instalacije izbrišite datoteku.</p><p>ProsperaDMS ima jako male zahtjeve. Trebat ćete mysql bazu podataka ili sqlite podršku i web server s omogućenim php-om. Pear paket Log također treba biti instaliran. Za lucene potpuno pretraživanje teksta, također će vam trebati Zend framework instaliran na disku gdje ga se može pronaći php-om. Za WebDAV server tađer ćete trebati HTTP_WebDAV_Server. Putanja do njega se može kasnije postaviti tijekom instalacije.</p><p>Ako želite izraditi bazu podataka prije nego započnete instalaciju, tada je ručno napravite s vama omiljenim alatom, po želji izradite korisnika baze podataka s pristupom bazi podataka i uvezite jedno od odlagališta baza podataka u mapu konfiguracije. Naravno to za vas može napraviti instalacijska skripta, ali će trebati pristup bazi podataka s pravima za izradu baza podataka.</p>',
 'settings_install_welcome_title' => 'Dobrodošli u instalaciju ProsperaDMS-a',
 'settings_install_zendframework' => 'Instalirajte Zend Framework, ako namjeravate koristiti pogon za pretraživanje cijelog teksta',
+'settings_invalid_guestid' => '',
 'settings_language' => 'Zadani jezik',
 'settings_language_desc' => 'Zadani jezik (jezik podmapa u mapi "jezici")',
 'settings_libraryFolder' => 'Mapa biblioteke',
@@ -1714,6 +1727,7 @@ Internet poveznica: [url]',
 'splash_delete_access' => '',
 'splash_document_added' => 'Dokument dodan',
 'splash_document_checkedout' => 'Dokument odjavljen',
+'splash_document_deleted' => '',
 'splash_document_edited' => 'Dokument pohranjen',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Dokument zaključan',
@@ -1737,6 +1751,7 @@ Internet poveznica: [url]',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_extension_upload' => '',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => 'Pohrani izmjene mape',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
@@ -1838,6 +1853,7 @@ Internet poveznica: [url]',
 'tasks' => 'Zadaci',
 'task_core_expireddocs_days' => '',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => '',
 'task_disabled' => '',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 27825c3b0..258a63992 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -236,7 +236,9 @@ URL: [url]',
 'cannot_move_root' => 'Hiba: A gyökér mappát nem lehet áthelyezni.',
 'cannot_retrieve_approval_snapshot' => 'Nem lehet lekérdezni a jóváhagyási állapot pillanatfelvételt erről a dokumentum változatról.',
 'cannot_retrieve_review_snapshot' => 'Nem lehet lekérdezni a felülvizsgálati állapot pillanatfelvételt erről a dokumentum változatról.',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => 'Hiba: A gyökér mappa nem törölhető.',
+'cannot_transfer_your_objects' => '',
 'categories' => 'Kategóriák',
 'categories_loading' => 'kategóriák betöltése',
 'category' => 'Kategória',
@@ -695,10 +697,15 @@ URL: [url]',
 'include_subdirectories' => 'Tartalmazó alkönyvtárak',
 'indexing_tasks_in_queue' => 'Indexelés folyamatban',
 'index_converters' => 'Index konvertáló',
+'index_document_added' => '',
 'index_document_unchanged' => '',
+'index_document_updated' => '',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Mappa indexelése',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
 'index_waiting' => '',
@@ -749,8 +756,10 @@ URL: [url]',
 'js_no_approval_status' => 'Kérjük válasszon jóváhagyási állapotot',
 'js_no_comment' => 'Nincs megjegyzés',
 'js_no_currentpwd' => '',
+'js_no_document' => '',
 'js_no_email' => 'Adja meg email címét',
 'js_no_file' => 'Kérjük válasszon egy állományt',
+'js_no_folder' => '',
 'js_no_keywords' => 'Adjon meg kulcsszavakat',
 'js_no_login' => 'Kérjük adjon meg egy felhasználó nevet',
 'js_no_name' => 'Kérjük adjon meg egy nevet',
@@ -1304,6 +1313,7 @@ URL: [url]',
 'settings_checkOutDir_desc' => '',
 'settings_cmdTimeout' => 'Külső parancsok időtúllépése',
 'settings_cmdTimeout_desc' => 'Ez az időtartam másodpercben határozza meg, hogy mikor fejezik be a külső parancsot (például a teljes szöveg index létrehozásához).',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => 'Tartalom könyvtár',
 'settings_contentDir_desc' => 'Feltöltött állományok tárolási helye (olyan könyvtárat érdemes választani, amelyhez nem lehet a webszerveren keresztül hozzáférni)',
 'settings_contentOffsetDir' => 'Tartalom eltérési könyvtár',
@@ -1472,6 +1482,8 @@ URL: [url]',
 'settings_fullSearchEngine_valsqlitefts' => 'Adatbázis keresés',
 'settings_guestID' => 'Vendég azonosító',
 'settings_guestID_desc' => 'A vendég felhasználó azonosítója ami a vendégként történő bejelentkezéskor lesz használva (általában nem szükséges módosítani)',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'Http gyökér',
 'settings_httpRoot_desc' => 'A relatív elérési út az URL-ben a tartomány rész után. Ne tartalmazza a http:// előtagot vag a web szerver nevét. Pl.: ha a teljes URL http://www.example.com/seeddms/, adja meg \'/seeddms/\'. Ha az URL http://www.example.com/, adja meg \'/\'',
 'settings_incItemsPerPage' => 'Az oldal végén betöltött bejegyzések száma',
@@ -1490,6 +1502,7 @@ URL: [url]',
 'settings_install_welcome_text' => '<p>Mielőtt elkezdi a SeedDMS telepítését hozzon létre egy \'ENABLE_INSTALL_TOOL\' nevű állományt a konfigurációs könyvtárban, különben a telepítés nem fog működni. Unix-rendszeren ez könnyen elvégezhető a \'touch conf/ENABLE_INSTALL_TOOL\' utasítással. Miután befejezte a telepítést törölje az állományt.</p><p>SeedDMS minimális rendszerkövetelményekkel rendelkezik. Szüksége van egy mysql adatbázisra vagy sqlite támogatásra és egy PHP képes web szerverre. A Log pear csomagot is telepíteni kell. A Lucene teljes szöveges kereséshez szüksége van még a Zend keretrendszer telepítésére a lemezen olyan helyen, ahol megtalálja a php. WebDAV szerverhez szükséges a HTTP_WebDAV_Server. Az elérési útvonalat a telepítés alatt lehet beállítani.</p><p>Amennyiben adatbázist kíván létrehozni a telepítés megkezdése előtt, hozza létre azt a kedvelt eszközzel. Opcionálisan hozzon létre egy adatbázis felhasználót az adatbázis eléréséhez és importálja be a konfigurációs könyvtárban található adatbázis mentések egyikét. A telepítő szkript elvégzi ezt megfelelő módon, de szüksége lesz adatbázis hozzáférésre megfelelő jogokkal az adatbázis létrehozásához.</p>',
 'settings_install_welcome_title' => 'Üdvözli a SeedDMS telepítője',
 'settings_install_zendframework' => 'Zend Framework telepítése, ha használni szeretné a teljes szöveges keresőt',
+'settings_invalid_guestid' => '',
 'settings_language' => 'Alapértelmezett nyelv',
 'settings_language_desc' => 'Alapértelmezett nyelv (a "languages" mappa alatt található almappa neve)',
 'settings_libraryFolder' => '',
@@ -1692,6 +1705,7 @@ URL: [url]',
 'splash_delete_access' => '',
 'splash_document_added' => '',
 'splash_document_checkedout' => '',
+'splash_document_deleted' => '',
 'splash_document_edited' => 'Dokumentum elmentve',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Dokumentum zárolva',
@@ -1715,6 +1729,7 @@ URL: [url]',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_extension_upload' => '',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => 'Mappa változásainak mentése',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
@@ -1816,6 +1831,7 @@ URL: [url]',
 'tasks' => '',
 'task_core_expireddocs_days' => '',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => '',
 'task_disabled' => '',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index b2b3da346..5a085a9d2 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -241,7 +241,9 @@ URL: [url]',
 'cannot_move_root' => 'Errore: impossibile spostare la cartella principale (root)',
 'cannot_retrieve_approval_snapshot' => 'Impossibile recuperare lo stato di approvazione per questa versione del documento',
 'cannot_retrieve_review_snapshot' => 'Impossibile recuperare lo stato di revisione per questa versione del documento',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => 'Impossibile cancellare la cartella principale (root)',
+'cannot_transfer_your_objects' => '',
 'categories' => 'Categorie',
 'categories_loading' => 'Si prega di aspettare, fino a quando viene caricato elenco delle categorie ...',
 'category' => 'Categoria',
@@ -705,10 +707,15 @@ URL: [url]',
 'include_subdirectories' => 'Includi sottocartelle',
 'indexing_tasks_in_queue' => 'Operazione di indicizzazione in corso',
 'index_converters' => '',
+'index_document_added' => '',
 'index_document_unchanged' => '',
+'index_document_updated' => '',
 'index_done' => 'Eseguito',
 'index_error' => 'Errore di indicizzazione',
 'index_folder' => 'Indicizza cartella',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => 'Non indicizzare contenuti',
 'index_pending' => 'Indicizzazione pendente',
 'index_waiting' => 'Attendi',
@@ -759,8 +766,10 @@ URL: [url]',
 'js_no_approval_status' => 'Si prega di selezionare lo stato di approvazione',
 'js_no_comment' => 'Non ci sono commenti',
 'js_no_currentpwd' => 'Per favore inserire la propria password attuale',
+'js_no_document' => '',
 'js_no_email' => 'Scrivi il tuo indirizzo di email',
 'js_no_file' => 'Per favore seleziona un file',
+'js_no_folder' => '',
 'js_no_keywords' => 'Specifica alcune parole-chiave',
 'js_no_login' => 'Per favore digita un ID utente',
 'js_no_name' => 'Per favore digita un nome',
@@ -1353,6 +1362,7 @@ Name: [username]
 'settings_checkOutDir_desc' => 'Questa eultima versione del documento viene copiata se approvato. Se accessibile agli utenti, possono editare il documento e ricopiarlo quando finito.',
 'settings_cmdTimeout' => 'Timeout per comandi esterni',
 'settings_cmdTimeout_desc' => 'La durata in secondi determina quando un comando esterno (come ad es. la creazione di un indice per la ricerca) sarà terminato.',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => 'Cartella contenitore',
 'settings_contentDir_desc' => 'Cartella in cui vengono conservati i files caricati, si consiglia di scegliere una cartella sul web-server che non sia direttamente accessibile.',
 'settings_contentOffsetDir' => 'Cartella Offset',
@@ -1521,6 +1531,8 @@ Name: [username]
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'ID Ospite',
 'settings_guestID_desc' => 'ID o utenza ospite utilizzata quando collegati al sito come ospite (da cambiare solo in casi eccezionali).',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'Cartella web principale',
 'settings_httpRoot_desc' => 'Percorso relativo nell\'URL dopo il dominio e senza il prefisso \'http://\'. Es: se l\'URL completo è http://www.esempio.com/SeedDMS/, impostare \'/SeedDMS/\'; se invece l\'URL è http://www.esempio.com/, impostare \'/\'',
 'settings_incItemsPerPage' => 'Numero di inserimenti caricati a fine pagina',
@@ -1539,6 +1551,7 @@ Name: [username]
 'settings_install_welcome_text' => '<p>Per poter iniziare l\'installazione di SeedDMS è necessario creare un file \'ENABLE_INSTALL_TOOL\' nella cartella di configurazione \'Conf\', altrimenti l\'installazione non si avvierà. Con sistemi di tipo Unix questo può essere fatto rapidamente digitando da terminale il comando \'touch conf/ENABLE_INSTALL_TOOL\'. Dopo il completamento dell\'installazione sarà necessario cancellare tale file per poter utilizzare SeedDMS.</p><p>SeedDMS ha requisiti di funzionamento minimi: è necessario unicamente un database mysql o sqlite e un web server con php attivo. Per la funzione di ricerca fulltext di Lucene, è necessario che sia installato anche il framework Zend e che questo sia visibile da php. Per il server WebDAV è necessario anche l\'HTTP_WebDAV_Server, il cui percorso può essere impostato in secondo luogo durante l\'installazione.</p><p>Se si preferisce creare il database prima dell\'inizio dell\'installazione, allora è necessario crearlo manualmente con il tool di gestione preferito, eventualmente creare un utente con accesso al database, ed importare uno dei dump del database disponibili nella cartella di configurazione. Lo script di installazione può effettuare l\'operazione in maniera automatica, ma necessita di un accesso al database con sufficienti diritti a creare nuovi database.</p>',
 'settings_install_welcome_title' => 'Benvenuti nell\'installazione di SeedDMS',
 'settings_install_zendframework' => 'Installare il framework Zend, se si intende usufruire del motore di ricerca fulltext.',
+'settings_invalid_guestid' => '',
 'settings_language' => 'Lingua di default',
 'settings_language_desc' => 'Lingua di default (nome della sottocartella corrispondente nella cartella "languages")',
 'settings_libraryFolder' => 'Libreria cartelle',
@@ -1741,6 +1754,7 @@ Name: [username]
 'splash_delete_access' => 'Diritto d\'accesso cancellato',
 'splash_document_added' => 'Documento aggiunto',
 'splash_document_checkedout' => 'Documento approvato',
+'splash_document_deleted' => '',
 'splash_document_edited' => 'Documento modificato',
 'splash_document_indexed' => 'Documento indicizzato',
 'splash_document_locked' => 'Documento bloccato',
@@ -1764,6 +1778,7 @@ Name: [username]
 'splash_extension_import' => 'Extensition installed',
 'splash_extension_refresh' => 'Refreshed list of extensions',
 'splash_extension_upload' => 'Extension installed',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => 'Cartella modificata',
 'splash_importfs' => 'Importati [Documenti] documenti e cartelle [cartelle]',
 'splash_inherit_access' => 'Il diritto di accesso verrà ereditato',
@@ -1865,6 +1880,7 @@ Name: [username]
 'tasks' => 'Attività',
 'task_core_expireddocs_days' => '',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => 'Descrizione',
 'task_disabled' => 'Disabilitata',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 03feb00fe..0ad72a862 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -243,7 +243,9 @@ URL: [url]',
 'cannot_move_root' => '오류: 루트 폴더를 이동할 수 없습니다',
 'cannot_retrieve_approval_snapshot' => '이 문서의 버전에 대한 승인 상태의 스냅 샷을 확인 할 수 없습니다',
 'cannot_retrieve_review_snapshot' => '이 문서의 버전에 대한 검토 상태의 스냅 샷을 확인 할 수 없습니다.',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => '오류 : 루트 폴더를 삭제할 수 없습니다.',
+'cannot_transfer_your_objects' => '',
 'categories' => '카테고리',
 'categories_loading' => '카테고리 목록을 가지고 오는 중 ...',
 'category' => '카테고리',
@@ -701,10 +703,15 @@ URL: [url]',
 'include_subdirectories' => '하위 디렉터리 포함',
 'indexing_tasks_in_queue' => '큐에서 대기중인 색인 작업들',
 'index_converters' => '',
+'index_document_added' => '',
 'index_document_unchanged' => '',
+'index_document_updated' => '',
 'index_done' => '마침',
 'index_error' => '오류',
 'index_folder' => '인덱스 폴더',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
 'index_waiting' => '기다리는 중',
@@ -755,8 +762,10 @@ URL: [url]',
 'js_no_approval_status' => '승인 상태를 선택하세요',
 'js_no_comment' => '코멘트가 없습니다',
 'js_no_currentpwd' => '',
+'js_no_document' => '',
 'js_no_email' => '귀하의 전자우편 주소를 기입해주세요.',
 'js_no_file' => '파일을 선택하세요',
+'js_no_folder' => '',
 'js_no_keywords' => '몇 가지 키워드를 지정',
 'js_no_login' => '사용자명을 입력해주십시오.',
 'js_no_name' => '이름을 입력해주십시오.',
@@ -1320,6 +1329,7 @@ URL : [url]',
 'settings_checkOutDir_desc' => '이것은 문서가 체크아웃된 문서의 최신 내용이 복사되는 디렉토리입니다. 사용자를 위해 이 디렉토리에 액세스 할 수 있도록 하면 파일을 편집하고 종료시 그것을 다시 확인할 수 있습니다.',
 'settings_cmdTimeout' => '작업 시간 초과',
 'settings_cmdTimeout_desc' => '외부로부터 요청된 명령의 종료시점 까지의 소요시간(예: 전체 텍스트 인덱스 생성시간)',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => '내용 디렉토리',
 'settings_contentDir_desc' => '업로드 된 파일의 저장 위치(웹 서버를 통해 액세스 할 수없는 디렉토리를 선택하는 것이 가장 좋습니다)',
 'settings_contentOffsetDir' => '내용 오프셋 디렉토리',
@@ -1488,6 +1498,8 @@ URL : [url]',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'Guest ID',
 'settings_guestID_desc' => 'Guest로 로그인 할 때 사용하는 ID (변경이 필요치 않음)',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'HTTP Root',
 'settings_httpRoot_desc' => 'URL의 상대 경로, 도메인 이후 부분 HTTP:// 접두사 를 포함하지 마십시오. 전체 URL이 http://www.example.com/seeddms/ 경우에는 \'/seeddms/\'로 설정합니다. URL이 http://www.example.com/에는 설정이 \'/\' 입니다.',
 'settings_incItemsPerPage' => '',
@@ -1506,6 +1518,7 @@ URL : [url]',
 'settings_install_welcome_text' => '<p>SeedDMS 설치를 시작하기 전에, 구성 디렉토리에 파일\'ENABLE_INSTALL_TOOL\'이 있는지 확인 바랍니다. 그렇지 않으면 설치가 작동하지 않습니다. 유닉스 시스템에서 다음 명령으로 쉽게 생성 가능 합니다. \'touch conf / ENABLE_INSTALL_TOOL\'. 설치f를 완료 한 후 파일을 삭제합니다.</p><p>SeedDMS는 설치시에 최소한의 요구 사항이 있습니다. MySQL 데이터베이스 또는 SQLite와 PHP를 지원하는 웹 서버가 필요합니다. pear package Log도 설치해야 합니다. 전체 텍스트 검색을 위해 lucene , Zend framework가 필요합니다. WebDAV를 위한 HTTP_WebDAV_Server가 필요합니다. 관련 경로는 설치 중이나 나중에 설정가능 합니다.</p><p>설치를 시작하기 전에 데이터베이스를 만들려면 경우, 데이터베이스에 액세스 할 수 있는 사용자를 생성해야 하고 이 사용자는 설치 스크립트뿐만 아니라 데이터베이스를 만들 수있는 충분한 권한을 가진 액세스 권한을 필요로 합니다.</p>',
 'settings_install_welcome_title' => 'SeedDMS의 설치를 환영합니다.',
 'settings_install_zendframework' => '전체 텍스트 검색 엔진을 사용하려는 경우 Zend Framework 설치',
+'settings_invalid_guestid' => '',
 'settings_language' => '기본 언어',
 'settings_language_desc' => '기본 언어(폴더 내에 있는 서브 폴더 이름은 "languages")',
 'settings_libraryFolder' => '라이브러리 폴더',
@@ -1708,6 +1721,7 @@ URL : [url]',
 'splash_delete_access' => '',
 'splash_document_added' => '문서를 추가',
 'splash_document_checkedout' => '문서 체크아웃',
+'splash_document_deleted' => '',
 'splash_document_edited' => '문서 저장',
 'splash_document_indexed' => '',
 'splash_document_locked' => '문서 잠김',
@@ -1731,6 +1745,7 @@ URL : [url]',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_extension_upload' => '',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => '저장 폴더 변경',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
@@ -1832,6 +1847,7 @@ URL : [url]',
 'tasks' => '작업',
 'task_core_expireddocs_days' => '',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => '',
 'task_disabled' => '',
diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc
index 969fe33f5..0cf039459 100644
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@@ -239,7 +239,9 @@ URL: [url]',
 'cannot_move_root' => 'ຂໍ້ຜິດພາດ: ບໍ່ສາມາດຍ້າຍໂຟລເດີຫຼັກ',
 'cannot_retrieve_approval_snapshot' => 'ບໍ່ສາມາດດືງຂໍ້ມູນສະຖານະການອະນຸມັດ ສຳລັບ snapshot ຂອງເອກະສານສະບັບນີ້ໄດ້',
 'cannot_retrieve_review_snapshot' => 'ບໍ່ສາມາດຮຽກຂໍ້ມູນການຕວດສອບສະຖານະສຳລັບເອກະສານສະບັບນີ້ໄດ້',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => 'ຂໍ້ຜິດພາດ: ບໍ່ສາມາດຍ້າຍໂຟລເດີຫຼັກ',
+'cannot_transfer_your_objects' => '',
 'categories' => 'ປະເພດ',
 'categories_loading' => 'ກະລຸນາລໍຖ້າ, ຈົນກວ່າປະເພດລາຍການຈະຖືກໂຫລດ …',
 'category' => 'ປະເພດ',
@@ -698,10 +700,15 @@ URL: [url]',
 'include_subdirectories' => 'ລວມໄດເລັກທໍລີຍ່ອຍ',
 'indexing_tasks_in_queue' => 'ຈັດທຳດັດສະນີວຽກໃນຄິວ',
 'index_converters' => 'ການແປງເອກະສານດັດສະນີ',
+'index_document_added' => '',
 'index_document_unchanged' => '',
+'index_document_updated' => '',
 'index_done' => 'ສຳເລັດ',
 'index_error' => 'ຂໍ້ຜິດພາດ',
 'index_folder' => 'ໂຟລເດີດັດສະນີ',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => 'ລໍຖ້າດຳເນີນການ',
 'index_waiting' => 'ຖ້າ',
@@ -752,8 +759,10 @@ URL: [url]',
 'js_no_approval_status' => 'ກະລຸນາເລືອກສະຖານະການອະນຸມັດ',
 'js_no_comment' => 'ບໍ່ມີຄວາມຄິດເຫັນ',
 'js_no_currentpwd' => 'ໂປດປ້ອນລະຫັດຜ່ານປັດຈຸບັນຂອງເຈົ້າ',
+'js_no_document' => '',
 'js_no_email' => 'ພິມອີເມວແອັດແດຣດຂອງທ່ານ',
 'js_no_file' => 'ກະລຸນາເລືອກຟາຍ',
+'js_no_folder' => '',
 'js_no_keywords' => 'ລະບຸຄຳຫຼັກບາງຄຳ',
 'js_no_login' => 'ກະລຸນາພິມຊື່ຜູ້ໃຊ້',
 'js_no_name' => 'ກະລຸນາພິມຊື່',
@@ -1346,6 +1355,7 @@ URL: [url]',
 'settings_checkOutDir_desc' => 'ນີ້ແມ່ນໄດເລັກທໍລີຄັດເລືອກເນື້ອຫາລ້າສຸດຂອງເອກະສານໄວ້ໃນກໍລະນີທີ່ມີການກວດສອບເອກະສານ ຖ້າເຈົ້າເຮັດໃຫ້ໄດ້ເລັກທໍລີ້ນີສາມາດເຂົ້າເຖິງໄດ້ສຳລັບຜູ້ໄຊ້ສາມາດແກ້ໄຂໄຟລແລະກວດສອບຍ້ອນຫຼັງໄດ້ເມື່ອສ້າງສຳເລັດ',
 'settings_cmdTimeout' => 'ໝົດເວລາສຳລັບຄຳສັ່ງພາຍນອກ',
 'settings_cmdTimeout_desc' => 'ຊ່ວງເວລານີ້ເປັນໜ່ວຍວິນາທີກຳນົດເມື່ອຄຳສັ່ງພາຍນອກ ເຊັ່ນສຳລັບສ້າງດັດສະນີຂໍ້ຄວາມທັງໝົດ ຈະຖືກຍົກເລີກ',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => 'ເນື້ອຫາໄດເລັກທໍລີ',
 'settings_contentDir_desc' => 'ໄຟລທີອັບໂຫລດຈະຖືກເກັບໄວ້ (ເລືອກໄດເລັກທໍລີບໍ່ສາມາດເຂົ້າເຖິງໄດ້ຈາກເວັບເຊີເວີຂອງເຈົ້າ)',
 'settings_contentOffsetDir' => 'ໄດ້ປິດເນື້ອໃນໄດເລັກທໍລີ',
@@ -1514,6 +1524,8 @@ URL: [url]',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'ລະຫັດຂອງແຂກຜູ້ທີມາຢ້ຽມເຢືອນ',
 'settings_guestID_desc' => 'ລະຫັດຂອງແຂກຜູ້ທີມານຳໄຊ້ເມື່ອລັອກອອນເຂົ້າສູ້ລະບົບໃນຖານະແຂກ (ສ່ວນຫຼາຍແມ່ນບໍ່ຈຳເປັນຕ້ອງປ່ຽນແປງຫຍັງ)',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'ຮາກຖານ Http',
 'settings_httpRoot_desc' => 'ເສັນທາງທີ່ກ່ຽວພັນໃນ URL',
 'settings_incItemsPerPage' => '',
@@ -1532,6 +1544,7 @@ URL: [url]',
 'settings_install_welcome_text' => '<p> ก่อนที่คุณจะเริ่มติดตั้ง SeedDMS ตรวจสอบให้แน่ใจว่าคุณได้สร้างแฟ้ม  "เปิดใช้งาน _ ติดตั้ง _ เครื่องมือ " ไว้ในไดเร็กทอรีการกำหนดค่าของคุณมิฉะนั้นการติดตั้งจะไม่ทำงาน ใน Unix-System คุณสามารถทำได้อย่างง่ายดายด้วย  "touch conf / เปิดใช้งาน _ ติดตั้ง _ เครื่องมือ  " หลังจากติดตั้งเสร็จแล้วให้ลบไฟล์ </ p> <p> SeedDMS มีข้อกำหนดที่น้อยมาก คุณจะต้องมีฐานข้อมูล mysql หรือ sqlite support และเว็บเซิร์ฟเวอร์ที่เปิดใช้งาน PHP ต้องติดตั้งชุดล็อกลูกแพร์ด้วย สำหรับการค้นหาข้อความแบบลูซินเต็มรูปแบบคุณจำเป็นต้องมีกรอบ Zend ที่ติดตั้งอยู่ในแผ่นดิสก์ซึ่งสามารถค้นหาได้จาก php สำหรับเซิร์ฟเวอร์ WebDAV คุณจะต้องมี HTTP_WebDAV_Server เส้นทางต่อไปจะสามารถตั้งค่าได้ในระหว่างการติดตั้ง </ p> <p> ถ้าคุณต้องการสร้างฐานข้อมูลก่อนที่จะเริ่มติดตั้งจากนั้นเพียงแค่สร้างมันด้วยตัวเองด้วยเครื่องมือที่คุณชื่นชอบและสร้างฐานข้อมูลผู้ใช้งานด้วยการเข้าถึงฐานข้อมูล และนำเข้าฐานข้อมูลทิ้งในไดเร็กทอรีการกำหนดค่า สคริปต์การติดตั้งสามารถทำได้สำหรับคุณเช่นกัน แต่จะต้องมีสิทธิ์เข้าถึงฐานข้อมูลในการสร้างฐานข้อมูลอย่างเพียงพอ </ p>',
 'settings_install_welcome_title' => 'ຍິນດີຕ້ອນຮັບສູ້ການຕິດຕັ້ງ SeedDMS',
 'settings_install_zendframework' => 'ติดตั้ง Zend Framework ถ้าคุณต้องการใช้เครื่องมือค้นหาข้อความเต็ม zend มิฉะนั้นให้ละเว้นข้อความนี้และดำเนินการติดตั้งต่อ.',
+'settings_invalid_guestid' => '',
 'settings_language' => 'ເລີ້ມຕົ້ນພາສາ',
 'settings_language_desc' => 'ເລີມຕົ້ນພາສາ (ຊື່ຂອງໂຟລເດີຍ່ອຍໃນໂຟລເດີຊອງ "ພາສາ")',
 'settings_libraryFolder' => 'ໂຟລເດີຫ້ອງສະໝຸດ',
@@ -1734,6 +1747,7 @@ URL: [url]',
 'splash_delete_access' => '',
 'splash_document_added' => 'ເພີ່ມເອກະສານແລ້ວ',
 'splash_document_checkedout' => 'ໄດ້ອອກຈາກເອກະສານແລ້ວ',
+'splash_document_deleted' => '',
 'splash_document_edited' => 'ບັນທຶກເອກະສານແລ້ວ',
 'splash_document_indexed' => 'ເອກະສານ  "[name] " ຈັດເຮັດດັດສະນີແລ້ວ',
 'splash_document_locked' => 'ເອກະສານຖືກລັອກ',
@@ -1757,6 +1771,7 @@ URL: [url]',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_extension_upload' => '',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => 'ບັນທິກການປ່ຽນແປງໂຟລເດີ',
 'splash_importfs' => 'ນຳເຂົ້າ [docs] ເອກະສານແລະໂຟລເດີ [folders]',
 'splash_inherit_access' => '',
@@ -1858,6 +1873,7 @@ URL: [url]',
 'tasks' => 'ງານ',
 'task_core_expireddocs_days' => '',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => '',
 'task_disabled' => '',
diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc
index 366602d57..6e43518e3 100644
--- a/languages/nb_NO/lang.inc
+++ b/languages/nb_NO/lang.inc
@@ -241,7 +241,9 @@ URL: [url]',
 'cannot_move_root' => 'Feil: Kan ikke flytte rotmappe.',
 'cannot_retrieve_approval_snapshot' => 'Kan ikke hente øyeblikksbilde av godkjenningsstatus for denne dokumentversjonen.',
 'cannot_retrieve_review_snapshot' => 'Kan ikke hente øyeblikksbilde av anmeldelsestatus for denne dokumentversjonen.',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => 'Feil: Kan ikke slette rotmappe.',
+'cannot_transfer_your_objects' => '',
 'categories' => 'Kategorier',
 'categories_loading' => 'Venligst vent på listning av kategorier...',
 'category' => 'Kategorier',
@@ -719,10 +721,15 @@ URL: [url]',
 'include_subdirectories' => 'Inkludere undermapper',
 'indexing_tasks_in_queue' => 'Indekserings oppgaver i kø',
 'index_converters' => 'Index konvertering',
+'index_document_added' => '',
 'index_document_unchanged' => '',
+'index_document_updated' => '',
 'index_done' => 'Ferdig',
 'index_error' => 'Feil',
 'index_folder' => 'Indekseringsmappe',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => 'Indekserte ikke innhold',
 'index_pending' => 'Avventer',
 'index_waiting' => 'Venter',
@@ -773,8 +780,10 @@ URL: [url]',
 'js_no_approval_status' => 'Velg godkjenningsstatus',
 'js_no_comment' => 'Det er ingen kommentarer',
 'js_no_currentpwd' => 'Vennligst tast inn ditt nåværende passord',
+'js_no_document' => '',
 'js_no_email' => 'Skriv inn din e-postadresse',
 'js_no_file' => 'Velg en fil',
+'js_no_folder' => '',
 'js_no_keywords' => 'Spesifiser noen søkeord',
 'js_no_login' => 'Skriv inn et brukernavn',
 'js_no_name' => 'Skriv inn et navn',
@@ -1359,6 +1368,7 @@ Bruker: [username]
 'settings_checkOutDir_desc' => 'Dette er katalogen der det siste innholdet i et dokument blir kopiert hvis dokumentet er sjekket ut. Hvis du gjør denne katalogen tilgjengelig for brukere, kan de redigere filen og sjekke den inn igjen når den er ferdig.',
 'settings_cmdTimeout' => 'Tidsgrense for eksterne kommandoer',
 'settings_cmdTimeout_desc' => 'Denne varigheten i sekunder avgjør når en ekstern kommando (f.eks. For å opprette fulltekstindeks) skal avsluttes.',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => 'Innholds mappe',
 'settings_contentDir_desc' => 'Mappen hvor de opplastede filene er lagret (best å velge en katalog som ikke er tilgjengelig via webserveren)',
 'settings_contentOffsetDir' => 'Innholds forskyvnings mappe',
@@ -1527,6 +1537,8 @@ Bruker: [username]
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'Gjestenavn',
 'settings_guestID_desc' => 'Navn til gjestebruker som ble brukt når han er logget inn som gjest (trenger stort sett ikke å endre)',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'Http Rot',
 'settings_httpRoot_desc' => 'Den relative banen i nettadressen, etter domenedelen. Ikke ta med prefikset http: // eller navnet på webverten. F.eks Hvis hele URL-adressen er http://www.example.com/seeddms/, angi \'/ seeddms / \'. Hvis URL-adressen er http://www.example.com/, angi \'/ \'',
 'settings_incItemsPerPage' => 'Antall oppføringer lastet på slutten av siden',
@@ -1545,6 +1557,7 @@ Bruker: [username]
 'settings_install_welcome_text' => '<p>Før du begynner å installere SeedDMS, må du forsikre deg om at du har opprettet en fil  ENABLE_INSTALL_TOOL  i konfigurasjonskatalogen, ellers vil ikke installasjonen fungere. Når du er ferdig med installasjonen, slett filen.</p><p>SeedDMS har veldig minimale krav. Du trenger en mysql-database eller sqlite-støtte og en php-aktivert webserver. Pearpakken Logg må også installeres. For lucene fulltekstsøket, trenger du også Zend-rammeverket installert på platen der den kan finnes av php. For WebDAV-serveren trenger du også HTTP_WebDAV_Server. Stien til den kan senere settes under installasjonen.</p><p>Hvis du ønsker å opprette databasen før du starter installasjonen, er det bare å opprette den manuelt med favorittverktøyet ditt, eventuelt opprette en databasebruker med tilgang til databasen og importer en av databasedumpene i konfigurasjonskatalogen. Installasjonsskriptet kan gjøre det også for deg, men det vil trenge databasetilgang med tilstrekkelige rettigheter for å lage databaser.</p>',
 'settings_install_welcome_title' => 'Velkommen til installasjonen av SeedDMS',
 'settings_install_zendframework' => 'Installer Zend Framework, hvis du har tenkt å bruke den zendbaserte søkemotoren i fulltekst. Ellers ignorerer du denne meldingen og fortsett installasjonen.',
+'settings_invalid_guestid' => '',
 'settings_language' => 'Standard språk',
 'settings_language_desc' => 'Standard språk (navnet på en undermappe i mappen "languages")',
 'settings_libraryFolder' => 'Bibliotekmappe',
@@ -1747,6 +1760,7 @@ Bruker: [username]
 'splash_delete_access' => 'Adgangs retten er slettet',
 'splash_document_added' => 'Dokument lagt til',
 'splash_document_checkedout' => 'Dokument sjekket ut',
+'splash_document_deleted' => '',
 'splash_document_edited' => 'Dokumentet lagret',
 'splash_document_indexed' => 'Dokumentet \'[name]\' er indeksert.',
 'splash_document_locked' => 'Dokumentet er låst',
@@ -1770,6 +1784,7 @@ Bruker: [username]
 'splash_extension_import' => 'Utvidelse installert',
 'splash_extension_refresh' => 'Oppdaterte liste over utvidelser',
 'splash_extension_upload' => 'Utvidelse installert',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => 'Lagre mappe endringer',
 'splash_importfs' => 'Importerte [docs] dokumenter og [folders] mapper',
 'splash_inherit_access' => 'Adgangsrett blir arvet',
@@ -1871,6 +1886,7 @@ Bruker: [username]
 'tasks' => 'Oppgaver',
 'task_core_expireddocs_days' => '',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => 'Beskrivelse',
 'task_disabled' => 'Deaktivert',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index af8ae22b0..8e0216428 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -234,7 +234,9 @@ URL: [url]',
 'cannot_move_root' => 'Foutmelding: U kunt de basismap niet verplaatsen.',
 'cannot_retrieve_approval_snapshot' => 'Het is niet mogelijk om [Goedgekeurde] status voor de huidige versie van dit document te verkrijgen.',
 'cannot_retrieve_review_snapshot' => 'niet mogelijk om Beoordelingsstatus voor de huidige versie van dit document te verkrijgen.',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => 'Foutmelding: U kunt de basismap niet verwijderen.',
+'cannot_transfer_your_objects' => '',
 'categories' => 'Categorieen',
 'categories_loading' => 'Categorieën worden geladen',
 'category' => 'Categorie',
@@ -712,10 +714,15 @@ URL: [url]',
 'include_subdirectories' => 'Inclusief submappen',
 'indexing_tasks_in_queue' => 'Percentage indexeringstaken in wachtrij',
 'index_converters' => 'Converters tbv de index',
+'index_document_added' => '',
 'index_document_unchanged' => 'Document is niet gewijzigd',
+'index_document_updated' => '',
 'index_done' => 'Indexering is gereed',
 'index_error' => 'Fout bij indexering',
 'index_folder' => 'Inhoud',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => 'Index heeft geen inhoud',
 'index_pending' => 'Indexering moet nog gebeuren',
 'index_waiting' => 'Indexering wacht',
@@ -766,8 +773,10 @@ URL: [url]',
 'js_no_approval_status' => 'Selecteer a.u.b. een goedkeuringsStatus',
 'js_no_comment' => 'Er zijn geen commentaren',
 'js_no_currentpwd' => 'Geen geldig wachtwoord',
+'js_no_document' => '',
 'js_no_email' => 'Voer uw e-mail adres in',
 'js_no_file' => 'Selecteer een bestand',
+'js_no_folder' => '',
 'js_no_keywords' => 'Specificeer een aantal sleutelwoorden',
 'js_no_login' => 'Voer een Gebruikersnaam in',
 'js_no_name' => 'Voer een naam in',
@@ -1358,6 +1367,7 @@ Name: [username]
 'settings_checkOutDir_desc' => 'Instellingen Checkoutmap',
 'settings_cmdTimeout' => 'Instellingen timeout',
 'settings_cmdTimeout_desc' => 'Instellingen timeout',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => 'Inhoud map',
 'settings_contentDir_desc' => 'Waar de verzonden bestande opgeslagen worden (Kan het beste een map zijn die niet benaderbaar is voor de webserver.)',
 'settings_contentOffsetDir' => 'Inhouds Basis Map',
@@ -1526,6 +1536,8 @@ Name: [username]
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'Gast ID',
 'settings_guestID_desc' => 'ID van gastgebruiker gebruikt indien ingelogd als gast (meestal geen wijziging nodig)',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'Http Basis',
 'settings_httpRoot_desc' => 'Het relatieve pad in de URL, na het domeindeel. Voeg geen http:// toe aan het begin of de websysteemnaam. Bijv: Als de volledige URL http://www.example.com/letodms/ is, voer \'/letodms/\' in. Als de URL http://www.example.com/ is, voer \'/\' in',
 'settings_incItemsPerPage' => 'Aantal items, geladen aan einde pagina',
@@ -1544,6 +1556,7 @@ Name: [username]
 'settings_install_welcome_text' => '<p>Wees er zeker van dat u een bestand, genaamd \'ENABLE_INSTALL_TOOL\', gemaakt heeft in de configuratiemap, voordat u de installatie van letDMS begint, anders zal de installatie nietwerken. Op een Unix-Syteem kan dit makkelijk gedaan worden met \'touch conf/ENABLE_INSTALL_TOOL\'. Verwijder het bestand nadat de installatie afgerond is.</p><p>letoDMS heeft weinig installatievoorwaarden. U heeft een mysql database en een php-geschikte web server nodig. Voor de lucene volledige tekst zoekfunctie, moet Zend framework geinstalleerd zijn op schijf en gevonden worden door php. Vanaf versie 3.2.0 van letoDMS zal ADOdb geen deel meer uitmaken van de uitgave. Een kopie kan van <a href="http://adodb.sourceforge.net/">http://adodb.sourceforge.net</a> gehaald en geinstalleerd worden. Het pad kan later opgegeven worden tijdens de installatie.</p><p>Als u de database voor de installatie wilt aanmaken, dan kunt u het handmatig met uw favoriete gereedschap aanmaken. optioneel kan een database met gebruikerstoegang gemaakt worden en importeer een van de database dumps in de configuratiemap. Met het installatiescript kan dit ook, maar hiervoor is database toegang nodig met voldoende rechten om een database aan te maken.</p>',
 'settings_install_welcome_title' => 'Welkom bij de installatie van letoDMS',
 'settings_install_zendframework' => 'Installeer Zend Framework, als u volledigetekst zoekmechanisme wilt gebruiken',
+'settings_invalid_guestid' => '',
 'settings_language' => 'Standaardtaal',
 'settings_language_desc' => 'Standaardtaal (naam van de submap in map "languages")',
 'settings_libraryFolder' => 'Bibliotheekmap',
@@ -1746,6 +1759,7 @@ Name: [username]
 'splash_delete_access' => 'Toegangsrechten verwijderd',
 'splash_document_added' => 'Nieuw document toegevoegd',
 'splash_document_checkedout' => 'Document in gebruik genomen',
+'splash_document_deleted' => '',
 'splash_document_edited' => 'Document opgeslagen',
 'splash_document_indexed' => 'Document geïndexeerd',
 'splash_document_locked' => 'Document vergrendeld',
@@ -1769,6 +1783,7 @@ Name: [username]
 'splash_extension_import' => 'Extensie geïnstalleerd',
 'splash_extension_refresh' => 'Extensie vernieuwd',
 'splash_extension_upload' => 'Extensie geüpload',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => 'Opslaan mapwijzigingen',
 'splash_importfs' => 'Geïmporteerd: [docs] documenten en [folders] mappen',
 'splash_inherit_access' => 'Toegangsrechten worden overgeërfd',
@@ -1870,6 +1885,7 @@ Name: [username]
 'tasks' => 'taken',
 'task_core_expireddocs_days' => 'Dagen',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => 'Omschrijving',
 'task_disabled' => 'Inactief',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 0c010d889..d2666462c 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -229,7 +229,9 @@ URL: [url]',
 'cannot_move_root' => 'Błąd: Nie można przenieść katalogu głównego.',
 'cannot_retrieve_approval_snapshot' => 'Nie można pobrać migawki stanu akceptacji dla tej wersji dokumentu.',
 'cannot_retrieve_review_snapshot' => 'Nie można pobrać migawki stanu recenzowania dla tej wersji dokumentu.',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => 'Błąd: Nie można usunąć katalogu głównego.',
+'cannot_transfer_your_objects' => '',
 'categories' => 'Kategorie',
 'categories_loading' => 'Poczekaj, aż lista kategorii zostanie załadowana…',
 'category' => 'Kategoria',
@@ -688,10 +690,15 @@ URL: [url]',
 'include_subdirectories' => 'Uwzględnij podkatalogi',
 'indexing_tasks_in_queue' => 'Zadanie indeksowania w kolejce',
 'index_converters' => 'Bez zmian',
+'index_document_added' => '',
 'index_document_unchanged' => '',
+'index_document_updated' => '',
 'index_done' => 'Gotowy',
 'index_error' => 'Błąd',
 'index_folder' => 'Indeksuj folder',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => 'Nie indeksuje zawartości',
 'index_pending' => 'Oczekujące',
 'index_waiting' => 'Oczekiwanie',
@@ -742,8 +749,10 @@ URL: [url]',
 'js_no_approval_status' => 'Proszę wybrać status akceptacji',
 'js_no_comment' => 'Proszę dodać komentarz',
 'js_no_currentpwd' => 'Proszę podać swoje aktualne hasło',
+'js_no_document' => '',
 'js_no_email' => 'Wprowadź swój adres email',
 'js_no_file' => 'Proszę wybrać plik',
+'js_no_folder' => '',
 'js_no_keywords' => 'Wybierz jakieś słowa kluczowe',
 'js_no_login' => 'Proszę wprowadzić nazwę użytkownika',
 'js_no_name' => 'Proszę wpisać imię',
@@ -1289,6 +1298,7 @@ Name: [username]
 'settings_checkOutDir_desc' => 'Jest to katalog, w którym najnowsza zawartość dokumentu jest kopiowana, jeśli dokument jest wyewidencjonowany. Jeśli ten katalog będzie dostępny dla użytkowników, mogą edytować plik i zaewidencjonować go ponownie po zakończeniu.',
 'settings_cmdTimeout' => 'Przekroczony czas wykonania zewnętrznego polecenia',
 'settings_cmdTimeout_desc' => 'Ten czas w sekundach określa kiedy zewnętrzne polecenie (np. do tworzenia indeksu) zostanie przerwany',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => 'Katalog treści',
 'settings_contentDir_desc' => 'Miejsce, gdzie będą przechowywane wczytane pliki (najlepien wybrać katalog, który nie jest dostępny dla serwera http)',
 'settings_contentOffsetDir' => 'Offset katalogu treści',
@@ -1457,6 +1467,8 @@ Name: [username]
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'ID gościa',
 'settings_guestID_desc' => 'ID gościa używane kiedy gość jest zalogowany (zazwyczaj nie wymaga zmiany)',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => 'Relatywna ścieżka w URL, część za domeną. Nie dołączaj przedrostka http:// ani nazwy hosta. Np. Jeśli cały URL to http://www.example.com/letodms/, wpisz \'/letodms/\'. Jeśli URL to http://www.example.com/, set \'/\'',
 'settings_incItemsPerPage' => 'Liczba wpisów załadowana na dole strony',
@@ -1475,6 +1487,7 @@ Name: [username]
 'settings_install_welcome_text' => '<p>Zanim uruchomisz instalację upewnij się, że masz utworzony plik \'ENABLE_INSTALL_TOOL\' w katalogu konfiguracyjnym, w przeciwnym wypadku instalacja nie zadziała. W systemach uniksowych może to był łatwo wykonane poprzez polecenie \'touch conf/ENABLE_INSTALL_TOOL\'. Po zakończeniu instalacji usuń ten plik.</p><p>LetoDMS ma bardzo niewielkie wymagania. Będziesz potrzebował bazy danych MySQL i włączonej obsługi PHP na swerze http. Do działania lucene - systemu przeszukiwania pełnoteksotowego - będzie także potrzebny Zend Framework, zainstalowany na dysku, na którym będzie widziany przez PHP. Począwszy od wersji 3.2.0 letoDMS, ADOdb nie będzie już częścią pakietu instalacyjnego. Pobierz kopię ADOdb z <a href="http://adodb.sourceforge.net/">http://adodb.sourceforge.net</a> i zainstaluj.  Ścieżka do ADOdb może być później ustawiona w trakcie instalacji.</p><p>Jeśli chcesz przygotować bazę danych przed uruchomieniem instalacji, możesz wykonać to ręcznie ulubionym narzędziem. Ewentualnie utwórz użytkownika bazy danych z prawem dostępu do bazy danych i zaimportuj ją ze zrzutu z katalogu konfiguracyjnego. Skrypt instalacyjny może to wszystko zrobić za Ciebie, lecz będzie do tego potrzebował dostępu do bazy danych z uprawnieniami zezwalającymi na tworzenie baz danych.</p>',
 'settings_install_welcome_title' => 'Witamy w procesie instalacyjnym LetoDMS',
 'settings_install_zendframework' => 'Zainstaluj Zend Framework, jeśli zamierzasz używać przeszukiwania pełnotekstowego',
+'settings_invalid_guestid' => '',
 'settings_language' => 'Domyślny język',
 'settings_language_desc' => 'Domyślny język (nazwa podkatalogu w katalogu "languages")',
 'settings_libraryFolder' => 'Folder Biblioteka',
@@ -1677,6 +1690,7 @@ Name: [username]
 'splash_delete_access' => 'Prawo dostępu zostało usunięte',
 'splash_document_added' => 'Dokument został dodany',
 'splash_document_checkedout' => 'Wyewidencjonowany dokument',
+'splash_document_deleted' => '',
 'splash_document_edited' => 'Dokument został zapisany',
 'splash_document_indexed' => 'Dokument \'[name]\' zindeksowany.',
 'splash_document_locked' => 'Dokument zablokowany',
@@ -1700,6 +1714,7 @@ Name: [username]
 'splash_extension_import' => 'Rozszerzenie zainstalowane',
 'splash_extension_refresh' => 'Odświeżona lista rozszerzeń',
 'splash_extension_upload' => 'Rozszerzenie zainstalowane',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => 'Zapisz zmiany folderu',
 'splash_importfs' => 'Zaimportowane dokumenty [docs] i foldery [folders]',
 'splash_inherit_access' => 'Prawa dostępu będą dziedziczone',
@@ -1801,6 +1816,7 @@ Name: [username]
 'tasks' => 'Zadania',
 'task_core_expireddocs_days' => 'Rdzeń zadania wygasa',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => 'Opis zadania',
 'task_disabled' => 'Zadanie wyłączone',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index e72b32189..af42be387 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -241,7 +241,9 @@ URL: [url]',
 'cannot_move_root' => 'Erro: Não pode remover a pasta raiz.',
 'cannot_retrieve_approval_snapshot' => 'Não é possível recuperar o instantâneo do estado de aprovação desta versão do documento.',
 'cannot_retrieve_review_snapshot' => 'Não é possível recuperar o instantâneo do estado de revisão para esta versão do documento.',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => 'Erro: Não é possível excluir a pasta raiz.',
+'cannot_transfer_your_objects' => '',
 'categories' => 'Categorias',
 'categories_loading' => 'Por favor, aguarde até que a lista de categorias seja carregada...',
 'category' => 'Categoria',
@@ -719,10 +721,15 @@ URL: [url]',
 'include_subdirectories' => 'Include subdirectories',
 'indexing_tasks_in_queue' => 'Tarefas de indexação em fila',
 'index_converters' => 'conversores de índice',
+'index_document_added' => '',
 'index_document_unchanged' => 'documento inalterado',
+'index_document_updated' => '',
 'index_done' => 'Finalizado',
 'index_error' => 'Erro',
 'index_folder' => 'Pasta Raiz',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => 'Não indexou o conteúdo',
 'index_pending' => 'Pendente',
 'index_waiting' => 'Aguarde...',
@@ -773,8 +780,10 @@ URL: [url]',
 'js_no_approval_status' => 'Por favor, selecione o estado de aprovação',
 'js_no_comment' => 'não há comentário',
 'js_no_currentpwd' => 'Por favor digite sua senha atual',
+'js_no_document' => '',
 'js_no_email' => 'Digite seu endereço de e-mail',
 'js_no_file' => 'Por favor selecione um arquivo',
+'js_no_folder' => '',
 'js_no_keywords' => 'Especifique algumas palavras-chave',
 'js_no_login' => 'Por favor digite um usuário',
 'js_no_name' => 'Por favor digite um nome',
@@ -1365,6 +1374,7 @@ Nome: [username]
 'settings_checkOutDir_desc' => 'Esse é o diretório em que o conteúdo mais recente de um documento é copiado se o documento estiver com estado de retirado. Se você tornar esse diretório acessível para os usuários, eles poderão editar o arquivo e registrá-lo novamente quando terminar.',
 'settings_cmdTimeout' => 'Tempo limite para comandos externos',
 'settings_cmdTimeout_desc' => 'This duration in seconds determines when an external command (e.g. for creating the full text index) will be terminated.',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => 'Diretório de conteúdo',
 'settings_contentDir_desc' => 'Onde arquivos enviados são armazenados (melhor escolher um diretório que não é acessível através de seu web-server)',
 'settings_contentOffsetDir' => 'Pasta de Compensação de Conteúdo',
@@ -1533,6 +1543,8 @@ Nome: [username]
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'ID convidado',
 'settings_guestID_desc' => 'ID do usuário-convidado  usada quando conectado como convidado (na maioria das vezes não há necessidade de mudar)',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'Raiz Http',
 'settings_httpRoot_desc' => 'O caminho relativo na URL, após a parte do domínio. Não inclua o prefixo http:// ou o nome do host. por exemplo Se a URL completa é http://www.example.com/Sistema GED/, definir \'/Sistema GED/\'. Se a URL é http://www.example.com/, definir \'/\'',
 'settings_incItemsPerPage' => 'Número de entradas carregadas no final da página',
@@ -1551,6 +1563,7 @@ Nome: [username]
 'settings_install_welcome_text' => '<p> Antes de começar a instalar Sistema GED certifique-se de ter criado um arquivo \' ENABLE_INSTALL_TOOL \' em seu diretório de configuração , caso contrário, a instalação não vai funcionar. No Unix -System isto pode ser feito facilmente com  \'touch conf/ENABLE_INSTALL_TOOL\' . Depois de ter terminado a instalação exclua o arquivo. </p><p>Sistema GED tem exigências muito mínimas. Você vai precisar do apoio de um banco de dados mysql ou sqlite e um servidor web php habilitado . O pacote de pear Log tem que tanbém ser instalado. Para a pesquisa de texto completo Lucene , você também vai precisar do Zend Framework instalado no disco onde ele pode ser encontrado pelo php . Para o servidor WebDAV , você também vai precisar do HTTP_WebDAV_Server . O caminho para ele pode ser mais tarde definido durante a instalação . </p><p> Se você quiser criar o banco de dados antes de iniciar a instalação , crie manualmente com sua ferramenta favorita , opcionalmente, crie um usuário de banco de dados com acesso ao banco de dados e importe um dos arquivos do banco de dados do diretório de configuração. O script de instalação pode também fazer Isso por você, mas ele vai precisar de acesso ao banco de dados com direitos suficientes para criar bancos de dados. </p>',
 'settings_install_welcome_title' => 'Bem-vindo à instalação do Sistema GED',
 'settings_install_zendframework' => 'Instalar Zend Framework, se você pretende usar o motor de pesquisa de texto completo',
+'settings_invalid_guestid' => '',
 'settings_language' => 'Idioma padrão',
 'settings_language_desc' => 'Idioma Padrão (nome de uma subpasta na pasta "languages")',
 'settings_libraryFolder' => 'Pasta da biblioteca',
@@ -1753,6 +1766,7 @@ Nome: [username]
 'splash_delete_access' => 'Direito de acesso removido',
 'splash_document_added' => 'Documento inserido',
 'splash_document_checkedout' => 'Documento retirado',
+'splash_document_deleted' => '',
 'splash_document_edited' => 'Documento salvo',
 'splash_document_indexed' => 'Documento \'[name]\' indexado.',
 'splash_document_locked' => 'Documento bloqueado',
@@ -1776,6 +1790,7 @@ Nome: [username]
 'splash_extension_import' => 'Extensão instalada',
 'splash_extension_refresh' => 'Lista atualizada de extensões',
 'splash_extension_upload' => 'Extensão instalada',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => 'Salvar modificação de pastas',
 'splash_importfs' => 'Documentos [docs] e pastas [folders] importados',
 'splash_inherit_access' => 'O direito de acesso será herdado',
@@ -1877,6 +1892,7 @@ Nome: [username]
 'tasks' => 'Tarefas',
 'task_core_expireddocs_days' => '',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => 'Descrição',
 'task_disabled' => 'Desativado',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index f18d6d2a6..84cef90f0 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -241,7 +241,9 @@ URL: [url]',
 'cannot_move_root' => 'Eroare: Nu se poate muta folderul rădăcină.',
 'cannot_retrieve_approval_snapshot' => 'Nu se poate regăsi statusul aprobarii instantanee pentru această versiune de document.',
 'cannot_retrieve_review_snapshot' => 'Nu se poate regăsi statusul revizuirii instantanee pentru această versiune de document.',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => 'Eroare: Nu se poate șterge directorul rădăcină.',
+'cannot_transfer_your_objects' => '',
 'categories' => 'Categorii',
 'categories_loading' => '',
 'category' => 'Categorie',
@@ -700,10 +702,15 @@ URL: [url]',
 'include_subdirectories' => 'Include subfoldere',
 'indexing_tasks_in_queue' => 'Actiuni de indexare in stiva',
 'index_converters' => '',
+'index_document_added' => '',
 'index_document_unchanged' => 'document neschimbat',
+'index_document_updated' => '',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Index folder',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
 'index_waiting' => 'Așteptare',
@@ -754,8 +761,10 @@ URL: [url]',
 'js_no_approval_status' => 'Vă rugăm să selectați statusul de aprobare',
 'js_no_comment' => 'Nu există comentarii',
 'js_no_currentpwd' => '',
+'js_no_document' => '',
 'js_no_email' => 'Introduceti adresa dumneavoastra de email',
 'js_no_file' => 'Vă rugăm să selectați un fișier',
+'js_no_folder' => '',
 'js_no_keywords' => 'Specificați câteva cuvinte cheie',
 'js_no_login' => 'Vă rugăm să introduceți un username',
 'js_no_name' => 'Vă rugăm să introduceți un nume',
@@ -1327,6 +1336,7 @@ URL: [url]',
 'settings_checkOutDir_desc' => 'Acesta este directorul unde se copie ultimul continut al unui document daca documentul este verificat. Daca faceti acest director accesibil pentru utilizatori, ei pot edita fisierul si ii pot face iar check in cand au terminat.',
 'settings_cmdTimeout' => 'Timpul de execuție a comenzii externe a expirat.',
 'settings_cmdTimeout_desc' => 'Această durată în secunde determină durata maximă de execuție a unei comenzi externe (de exemplu la indexarea textului)',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => 'Director conținut',
 'settings_contentDir_desc' => 'Unde sunt stocate  fișierele încărcate (este recomandat sa alegeti un director care nu este accesibil prin intermediul web-server-ului dumneavoastră)',
 'settings_contentOffsetDir' => 'Conținut Director Offset',
@@ -1495,6 +1505,8 @@ URL: [url]',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'ID oaspete',
 'settings_guestID_desc' => 'ID-ul utilizatorului oaspete folosit când la Logarea ca oaspete (de cele mai multe ori nu este nevoie să se schimbe)',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => 'Calea relativă în URL-ul, după partea domeniului. Nu includeți prefixul http:// sau numele host-ului. (ex: Dacă URL-ul complet este http://www.example.com/seeddms/, setați \'/seeddms/\'. Dacă URL-ul complet este http://www.example.com/, setați \'/\')',
 'settings_incItemsPerPage' => '',
@@ -1513,6 +1525,7 @@ URL: [url]',
 'settings_install_welcome_text' => '<p>Înainte de a începe să instalați SeedDMS asigurați-vă că ați creat un fișier \'ENABLE_INSTALL_TOOL\' în directorul de configurare, în caz contrar instalarea nu va funcționa. Pe sistemele Unix acest lucru poate fi foarte usor facut cu \'touch conf/ENABLE_INSTALL_TOOL\'. După ce ați terminat instalarea șterge fișierul.</p><p>SeedDMS are cerințe minime. Veți avea nevoie de o baza de date MySQL sau SQLite și un server de web cu php-ul activat. Pachetul pear Log trebuie să fie de asemenea instalat. Pentru cautarea Lucene in tot textul, va trebui, de asemenea instalat Zend Framework pe disc unde poate fi găsit de php. Pentru serverul WebDAV, va trebui de asemenea HTTP_WebDAV_Server. Calea spre acesta poate fi setat mai târziu în timpul instalării.</p><p>Dacă doriți să creați baza de date înainte de a începe instalarea, atunci creati manual baza de date cu instrumentul dumneavoastra preferat, opțional creati si un utilizator cu acces la baza de date și importati importati un fisier backup(database dump) în directorul de configurare. Scriptul de instalare poate face asta pentru dumneavoastra la fel de bine, dar ca va avea nevoie de acces la baza de date cu drepturi suficiente pentru a crea baza de date.</p>',
 'settings_install_welcome_title' => 'Bine ați venit la instalarea SeedDMS',
 'settings_install_zendframework' => 'Instalați Zend Framework, dacă intenționați să utilizați căutare completă pe tot de textul',
+'settings_invalid_guestid' => '',
 'settings_language' => 'Limba implicită',
 'settings_language_desc' => 'Limba implicită (numele subfolder-ului din folderul "language")',
 'settings_libraryFolder' => '',
@@ -1715,6 +1728,7 @@ URL: [url]',
 'splash_delete_access' => '',
 'splash_document_added' => 'Document adăugat',
 'splash_document_checkedout' => 'Document verificat',
+'splash_document_deleted' => '',
 'splash_document_edited' => 'Document salvat',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Document blocat',
@@ -1738,6 +1752,7 @@ URL: [url]',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_extension_upload' => '',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => 'Salvați modificările folderului',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
@@ -1839,6 +1854,7 @@ URL: [url]',
 'tasks' => '',
 'task_core_expireddocs_days' => '',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => '',
 'task_disabled' => '',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 62a70d943..642ef0170 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -241,7 +241,9 @@ URL: [url]',
 'cannot_move_root' => 'Нельзя переместить корневой каталог',
 'cannot_retrieve_approval_snapshot' => 'Невозможно получить утверждающий снимок для этой версии документа',
 'cannot_retrieve_review_snapshot' => 'Невозможно получить рецензирующий снимок для этой версии документа',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => 'Нельзя удалить корневой каталог',
+'cannot_transfer_your_objects' => '',
 'categories' => 'Категории',
 'categories_loading' => 'Пожалуйста, подождите, пока не будет загружен список категорий …',
 'category' => 'Категория',
@@ -700,10 +702,15 @@ URL: [url]',
 'include_subdirectories' => 'Включая подкаталоги',
 'indexing_tasks_in_queue' => 'Задача индексирования поставлена в очередь',
 'index_converters' => '',
+'index_document_added' => '',
 'index_document_unchanged' => '',
+'index_document_updated' => '',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Полнотекстовый индекс',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
 'index_waiting' => 'Ожидание',
@@ -754,8 +761,10 @@ URL: [url]',
 'js_no_approval_status' => 'Выберите статус утверждения',
 'js_no_comment' => 'Нет комментария',
 'js_no_currentpwd' => '',
+'js_no_document' => '',
 'js_no_email' => 'Введите свой e-mail',
 'js_no_file' => 'Выберите файл',
+'js_no_folder' => '',
 'js_no_keywords' => 'Укажите метки',
 'js_no_login' => 'Введите логин',
 'js_no_name' => 'Введите имя',
@@ -1334,6 +1343,7 @@ URL: [url]',
 'settings_checkOutDir_desc' => 'Это каталог, куда скопировано последнее содержание документа, если он на рассмотрении. Если вы сделаете это каталог доступным пользователям, они смогут редактировать файл и загружать его обратно по завершении работы.',
 'settings_cmdTimeout' => 'Тайм-аут для внешних команд',
 'settings_cmdTimeout_desc' => 'Указанная длительность в секундах определяет, когда будет завершена внешняя команда (например, для создания полнотекстового индекса).',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => 'Каталог содержимого',
 'settings_contentDir_desc' => 'Куда сохраняются загруженные файлы (лучше выбрать каталог недоступный веб-серверу).',
 'settings_contentOffsetDir' => 'Базовый начальный каталог',
@@ -1502,6 +1512,8 @@ URL: [url]',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'Идентификатор гостя',
 'settings_guestID_desc' => 'Идентификатор гостя (можно не изменять).',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'Корень http',
 'settings_httpRoot_desc' => 'Относительный путь в URL, после доменной части. Без http://. Например, если полный URL http://www.example.com/seeddms/, то нужно указать «/seeddms/». Если URL http://www.example.com/, то «/».',
 'settings_incItemsPerPage' => '',
@@ -1520,6 +1532,7 @@ URL: [url]',
 'settings_install_welcome_text' => '<p>Прежде чем начать установку SeedDMS убедитесь, что вы создали файл ENABLE_INSTALL_TOOL в каталоге конфигурации, иначе установка не будет работать. На UNIX-подобных системах это можно сделать командой \'touch conf/ENABLE_INSTALL_TOOL\'. После установки удалите этот файл.</p><p>SeedDMS имеет минимальные требования. Нужна база данных (БД) MySQL или SQLite и веб-сервер с PHP. Для работы полнотекстового поиска lucene, также необходима инфраструктура Zend, установленная там где её видит PHP. Для сервера WebDAV вам потребуется HTTP_WebDAV_Server. Пути могут быть указан позднее при установке.</p><p>Если вы хотите создать БД до начала установки, то создайте её вручную знакомым вам инструментом или создайте пользователя БД с правами доступа к БД и импортируйте один из дампов БД из каталога конфигурации. Установочный скрипт может сделать это сам, но понадобится доступ к БД с правами для создания БД.</p>',
 'settings_install_welcome_title' => 'Добро пожаловать в установку SeedDMS',
 'settings_install_zendframework' => 'Установите Zend Framework, если собираетесь использовать полнотекстовый поиск',
+'settings_invalid_guestid' => '',
 'settings_language' => 'Язык по умолчанию',
 'settings_language_desc' => 'Язык по умолчанию (каталог в «languages»).',
 'settings_libraryFolder' => 'Каталог библиотек',
@@ -1722,6 +1735,7 @@ URL: [url]',
 'splash_delete_access' => '',
 'splash_document_added' => 'Добавлен документ',
 'splash_document_checkedout' => 'Документ отправлен на обработку',
+'splash_document_deleted' => '',
 'splash_document_edited' => 'Документ сохранён',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Документ заблокирован',
@@ -1745,6 +1759,7 @@ URL: [url]',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_extension_upload' => '',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => 'Изменения каталога сохранены',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
@@ -1846,6 +1861,7 @@ URL: [url]',
 'tasks' => 'Задания',
 'task_core_expireddocs_days' => '',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => '',
 'task_disabled' => '',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index a62164ed1..748df9c3a 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1229), destinqo (26), pS2017 (508), ssebech (4)
+//    Translators: Admin (1230), destinqo (26), pS2017 (508), ssebech (4)
 
 $text = array(
 '2_factor_auth' => '2-faktorové overovanie',
@@ -241,7 +241,9 @@ URL: [url]',
 'cannot_move_root' => 'Chyba: Nie je možné presunúť koreňovú zložku.',
 'cannot_retrieve_approval_snapshot' => 'Nie je možné získať informáciu o stave schválenia tejto verzie dokumentu.',
 'cannot_retrieve_review_snapshot' => 'Nie je možné získať informáciu o stave recenzie tejto verzie dokumentu.',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => 'Chyba: Nie je možné zmazať koreňovú zložku.',
+'cannot_transfer_your_objects' => '',
 'categories' => 'Kategórie',
 'categories_loading' => 'Počkajte, kým nebude načítaný zoznam kategórií ...',
 'category' => 'Kategória',
@@ -711,7 +713,7 @@ URL: [url]',
 'import_extension' => 'Import extension',
 'import_fs' => 'Importovanie zo súborového systému',
 'import_fs_warning' => 'This will only work for folders in the drop folder. The operation recursively imports all folders and files. Files will be released immediately.',
-'import_users' => '',
+'import_users' => 'Importovať užívateľov',
 'import_users_addnew' => '',
 'import_users_update' => '',
 'include_content' => 'Zahrnúť obsah',
@@ -719,10 +721,15 @@ URL: [url]',
 'include_subdirectories' => 'Vrátane podzložiek',
 'indexing_tasks_in_queue' => 'Indexovacích úloh vo fronte',
 'index_converters' => '',
+'index_document_added' => '',
 'index_document_unchanged' => '',
+'index_document_updated' => '',
 'index_done' => 'Hotovo',
 'index_error' => 'Chyba',
 'index_folder' => 'Indexovať zložku',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => 'Did not index content',
 'index_pending' => 'Pending',
 'index_waiting' => 'Čakajte',
@@ -773,8 +780,10 @@ URL: [url]',
 'js_no_approval_status' => 'Prosím, vyberte stav schválenia',
 'js_no_comment' => 'Žiadny komentár',
 'js_no_currentpwd' => 'Zadajte svoje aktuálne heslo',
+'js_no_document' => '',
 'js_no_email' => 'Napíšte svoju emailovú adresu',
 'js_no_file' => 'Prosím, vyberte súbor',
+'js_no_folder' => '',
 'js_no_keywords' => 'Zadajte nejaké kľúčové slová',
 'js_no_login' => 'Prosím, napíšte meno používateľa',
 'js_no_name' => 'Prosím, napíšte meno',
@@ -1367,6 +1376,7 @@ Meno: [username]
 'settings_checkOutDir_desc' => 'This is the directory where the latest content of a document is copied if the document is checked out. If you make this directory accessible for users, they can edit the file and check it back in when finished.',
 'settings_cmdTimeout' => 'Timeout for external commands',
 'settings_cmdTimeout_desc' => 'This duration in seconds determines when an external command (e.g. for creating the full text index) will be terminated.',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => 'Zložka obsahu',
 'settings_contentDir_desc' => 'Where the uploaded files are stored (best to choose a directory that is not accessible through your web-server)',
 'settings_contentOffsetDir' => 'Content Offset Directory',
@@ -1535,6 +1545,8 @@ Meno: [username]
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'Hosť ID',
 'settings_guestID_desc' => 'ID of guest-user used when logged in as guest (mostly no need to change)',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => 'The relative path in the URL, after the domain part. Do not include the http:// prefix or the web host name. e.g. If the full URL is http://www.example.com/seeddms/, set \'/seeddms/\'. If the URL is http://www.example.com/, set \'/\'',
 'settings_incItemsPerPage' => 'Number of entries loaded at end of page',
@@ -1553,6 +1565,7 @@ Meno: [username]
 'settings_install_welcome_text' => '<p>Before you start to install SeedDMS make sure you have created a file \'ENABLE_INSTALL_TOOL\' in your configuration directory, otherwise the installation will not work. On Unix-System this can easily be done with \'touch conf/ENABLE_INSTALL_TOOL\'. After you have finished the installation delete the file.</p><p>SeedDMS has very minimal requirements. You will need a mysql database or sqlite support and a php enabled web server. The pear package Log has to be installed too. For the lucene full text search, you will also need the Zend framework installed on disc where it can be found by php. For the WebDAV server you will also need the HTTP_WebDAV_Server. The path to it can later be set during installation.</p><p>If you like to create the database before you start installation, then just create it manually with your favorite tool, optionally create a database user with access on the database and import one of the database dumps in the configuration directory. The installation script can do that for you as well, but it will need database access with sufficient rights to create databases.</p>',
 'settings_install_welcome_title' => 'Vitajte v inštalácii SeedDMS',
 'settings_install_zendframework' => 'Install Zend Framework, if you intend to use the zend based full text search engine. Otherwise, ignore this message and continue the installation.',
+'settings_invalid_guestid' => '',
 'settings_language' => 'Predvolený jazyk',
 'settings_language_desc' => 'Default language (name of a subfolder in folder "languages")',
 'settings_libraryFolder' => 'Library folder',
@@ -1755,6 +1768,7 @@ Meno: [username]
 'splash_delete_access' => 'Access right deleted',
 'splash_document_added' => 'Dokument bol pridaný',
 'splash_document_checkedout' => 'Document checked out',
+'splash_document_deleted' => '',
 'splash_document_edited' => 'Dokument bol uložený',
 'splash_document_indexed' => 'Dokument \'[name]\' bol indexovaný.',
 'splash_document_locked' => 'Dokument uzamknutý',
@@ -1778,6 +1792,7 @@ Meno: [username]
 'splash_extension_import' => 'Extensition installed',
 'splash_extension_refresh' => 'Refreshed list of extensions',
 'splash_extension_upload' => 'Extension installed',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => 'Uložiť zmeny zložky',
 'splash_importfs' => 'Importované dokumenty [docs] a zložky [folders]',
 'splash_inherit_access' => 'Access right will be inherited',
@@ -1879,6 +1894,7 @@ Meno: [username]
 'tasks' => 'Úlohy',
 'task_core_expireddocs_days' => '',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => 'Description',
 'task_disabled' => 'Disabled',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 872bdf5e6..efb91bfc1 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -242,7 +242,9 @@ URL: [url]',
 'cannot_move_root' => 'Fel: Det går inte att flytta root-katalogen.',
 'cannot_retrieve_approval_snapshot' => 'Det är inte möjligt att skapa en snapshot av godkännande-statusen för denna version av dokumentet.',
 'cannot_retrieve_review_snapshot' => 'Det är inte möjligt att skapa en snapshot för denna version av dokumentet.',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => 'Fel: Det går inte att ta bort root-katalogen.',
+'cannot_transfer_your_objects' => '',
 'categories' => 'Kategorier',
 'categories_loading' => 'Vänligen vänta på listning av kategorier...',
 'category' => 'Kategori',
@@ -706,10 +708,15 @@ URL: [url]',
 'include_subdirectories' => 'Inkludera underkataloger',
 'indexing_tasks_in_queue' => 'Indexeringsuppgifter i kö',
 'index_converters' => '',
+'index_document_added' => '',
 'index_document_unchanged' => '',
+'index_document_updated' => '',
 'index_done' => 'Klart',
 'index_error' => 'Fel',
 'index_folder' => 'Indexeringskatalog',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => 'Förestående',
 'index_waiting' => 'Väntar',
@@ -760,8 +767,10 @@ URL: [url]',
 'js_no_approval_status' => 'Välj status för godkännande',
 'js_no_comment' => 'Det finns inga kommentarer',
 'js_no_currentpwd' => 'Ange ditt lösenord',
+'js_no_document' => '',
 'js_no_email' => 'Ange din e-postadress',
 'js_no_file' => 'Välj en fil',
+'js_no_folder' => '',
 'js_no_keywords' => 'Skriv några nyckelord',
 'js_no_login' => 'Skriv ett användarnamn',
 'js_no_name' => 'Skriv ett namn',
@@ -1340,6 +1349,7 @@ Kommentar: [comment]',
 'settings_checkOutDir_desc' => 'Sökväg till den senaste versionen av ett utcheckat dokument. Om du ger användare åtkomst till denna katalog kan de ändra och checka in utcheckade filer.',
 'settings_cmdTimeout' => 'Tidsgräns för externa kommandon',
 'settings_cmdTimeout_desc' => 'Denna tid i sekunder bestämmer när ett externt kommando (t.ex. för att skapa den fullständiga texten till index) kommer att avslutas.',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => 'Mapp för innehållet',
 'settings_contentDir_desc' => 'Mappen där alla uppladdade filer kommer att sparas. (Det bästa är att välja en mapp som inte är tillgänglig från webbservern)',
 'settings_contentOffsetDir' => 'Innehåll offset-mapp',
@@ -1508,6 +1518,8 @@ Kommentar: [comment]',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'Gäst-ID',
 'settings_guestID_desc' => 'ID som används för inloggad gästanvändare (behöver oftast inte ändras)',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'Http-Root',
 'settings_httpRoot_desc' => 'Den relativa sökvägen i URL, efter domänen. Ta inte med http:// eller web host-namnet. t.ex. om hela URLen är http://www.example.com/letodms/, sätt \'/letodms/\'. Om URLen är http://www.example.com/, sätt \'/\'',
 'settings_incItemsPerPage' => 'Antal visade resultat per sida',
@@ -1526,6 +1538,7 @@ Kommentar: [comment]',
 'settings_install_welcome_text' => '<p>Innan du börjar installationen av letoDMS, se till att du har skapat en fil med namnet \'ENABLE_INSTALL_TOOL\' i konfigurationsmappen, annars kommer installationen inte att fungera. På Unix-system kan detta göras med \'touch conf/ENABLE_INSTALL_TOOL\'. När du har avslutat installationen måste filen tas bort.</p><p>letoDMS har bara minimala krav. Du behöver en mysql-databas och php måste finnas på din webbserver. För lucene fulltext-sökning måste du lägga Zend framework på servern, så att det kan hittas av php. Från och med version 3.2.0 av letoDMS, är ADOdb inte längre del av distributionen. En kopia kan laddas ner från <a href="http://adodb.sourceforge.net/">http://adodb.sourceforge.net</a>. Installera detta. Sökvägen kan sättas senare i samband med installationsprocessen.</p><p>Om du vill skapa en databas innan du börjar installationen, kan den skapas manuellt med ett valfritt verktyg. Alternativt, skapa en databas med en användare som har tillgång till databasen och importera en av databasdumparna som ligger i konfigurationsmappen. Installationsskriptet kan göra detta automatiskt, men det behöver tillgång till databasen och tillräckliga rättigheter för att skapa databasen.</p>',
 'settings_install_welcome_title' => 'Välkommen till installationen av SeedDMS!',
 'settings_install_zendframework' => 'Installera Zend Framework, om du tänker använda fulltext-sökningen',
+'settings_invalid_guestid' => '',
 'settings_language' => 'Standardspråk',
 'settings_language_desc' => 'Standardspråk (namn på sub-mappen i mappen "languages")',
 'settings_libraryFolder' => '',
@@ -1728,6 +1741,7 @@ Kommentar: [comment]',
 'splash_delete_access' => '',
 'splash_document_added' => 'Dokument tillagt',
 'splash_document_checkedout' => 'Dokument utcheckat',
+'splash_document_deleted' => '',
 'splash_document_edited' => 'Dokument sparat',
 'splash_document_indexed' => 'Dokument \'[name]\' indexerat.',
 'splash_document_locked' => 'Dokument låst',
@@ -1751,6 +1765,7 @@ Kommentar: [comment]',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_extension_upload' => '',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => 'Spara ändringar i katalog',
 'splash_importfs' => 'Importerade [docs] dokument och [folders] kataloger',
 'splash_inherit_access' => '',
@@ -1852,6 +1867,7 @@ Kommentar: [comment]',
 'tasks' => 'Uppgifter',
 'task_core_expireddocs_days' => '',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => '',
 'task_disabled' => '',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index df6349532..7d34a2ab5 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -235,7 +235,9 @@ URL: [url]',
 'cannot_move_root' => 'Hata: Kök klasörü taşıyamazsınız.',
 'cannot_retrieve_approval_snapshot' => 'Bu doküman sürümü için anlık onay durumu alınamadı.',
 'cannot_retrieve_review_snapshot' => 'Bu doküman için anlık kontrol edilme durumu alınamadı.',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => 'Hata: Kök klasör silinemez.',
+'cannot_transfer_your_objects' => '',
 'categories' => 'Kategori',
 'categories_loading' => '',
 'category' => 'Kategori',
@@ -694,10 +696,15 @@ URL: [url]',
 'include_subdirectories' => 'Alt klasörleri kapsa',
 'indexing_tasks_in_queue' => '',
 'index_converters' => '',
+'index_document_added' => '',
 'index_document_unchanged' => '',
+'index_document_updated' => '',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Klasörü indeksle',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
 'index_waiting' => 'Bekliyor',
@@ -748,8 +755,10 @@ URL: [url]',
 'js_no_approval_status' => 'Lütfen onay durumu seçiniz',
 'js_no_comment' => 'Açıklama yok',
 'js_no_currentpwd' => '',
+'js_no_document' => '',
 'js_no_email' => 'E-posta adresinizi yazınız',
 'js_no_file' => 'Lütfen dosya seçiniz',
+'js_no_folder' => '',
 'js_no_keywords' => 'Anahtar kelime belirleyiniz',
 'js_no_login' => 'Lütfen kullanıcı adı yazınız',
 'js_no_name' => 'Lütfen isim yazınız',
@@ -1306,6 +1315,7 @@ URL: [url]',
 'settings_checkOutDir_desc' => '',
 'settings_cmdTimeout' => 'Dış komutta zaman aşımı',
 'settings_cmdTimeout_desc' => '',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => 'İçerik dizini',
 'settings_contentDir_desc' => 'Yüklenecek dosyaların depolanacağı yer (web üzerinden erişilemeyen bir yer tercih etmeniz önerilir.)',
 'settings_contentOffsetDir' => 'İçerik Ofset Klasörü',
@@ -1474,6 +1484,8 @@ URL: [url]',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'Misafir ID',
 'settings_guestID_desc' => 'Misafir kullanıcı için ID (genelde değiştirmek gerekmez)',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'Http Kök dizini',
 'settings_httpRoot_desc' => 'Domainden sonraki yol. http:// ve domain yazmadan domainden sonraki bölüm yazılacak. Örneğin tam URL http://www.ornek.com/seeddms/ ise sadece \'seeddms\' olarak ayarlayın. Eğer URL http://www.ornek.com/ ise sadece \'/\' koymanız yeterli',
 'settings_incItemsPerPage' => '',
@@ -1492,6 +1504,7 @@ URL: [url]',
 'settings_install_welcome_text' => '<p>SeedDMS kurulumuna başlamadan önce konfigürasyon (conf) klasörünün içine \'ENABLE_INSTALL_TOOL\' isminde bir dosya oluşturmazsanız kurulum yapılamaz. Unix tabanlı sitemlerde konsoldan \'touch conf/ENABLE_INSTALL_TOOL\' yazarak bu dosyayı oluşturabilirsiniz. Kurulum tamamlandıktan sonra bu dosyayı silmeniz gerekiyor. </p><p>SeedDMS çok az gereksinime ihtiyaç duyar. Bir mysql veritabanı veya sqlite desteği olan ve php etkin bir web sunucuya ihtiyacınız var. Log pear paketi de ayrıca kurulması gerekir. Tam metin tarama yapılabilmesi için sisteminizde php tarafından okunabilen Zend framework kurulu olmalıdır. WebDAV sunucu için ayrıca HTTP_WebDAV_Server kurulu olmalıdır. Kurulumdan sonra bunun yolu tanımlanabilir. </p><p>Kuruluma başlamadan önce veritabanını oluşturmak isterseniz, bunu manuel olarak yapmalısınız. Bunu yaptıktan sonra konfigürasyon klasörü içerisindeki dump veritabanını import edebilirsiniz. Kurulum sihirbazı bunu sizin için yapabilir fakat bunun için yeterli veritabanı erişim haklarına sahip olmanız gerekir.</p>',
 'settings_install_welcome_title' => 'SeedDMS kurulumuna hoşgeldiniz',
 'settings_install_zendframework' => 'Tam metin arama motorundan faydalanmak isterseniz Zend Framework kurmalısınız.',
+'settings_invalid_guestid' => '',
 'settings_language' => 'Varsayılan dil',
 'settings_language_desc' => 'Varsayılan dil ("languages" klasörü içindeki dil klasörü)',
 'settings_libraryFolder' => '',
@@ -1694,6 +1707,7 @@ URL: [url]',
 'splash_delete_access' => '',
 'splash_document_added' => 'Doküman eklendi',
 'splash_document_checkedout' => '',
+'splash_document_deleted' => '',
 'splash_document_edited' => 'Doküman kaydedildi',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Doküman kilitlendi',
@@ -1717,6 +1731,7 @@ URL: [url]',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_extension_upload' => '',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => 'Klasör değişiklikleri kaydedildi',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
@@ -1818,6 +1833,7 @@ URL: [url]',
 'tasks' => '',
 'task_core_expireddocs_days' => '',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => '',
 'task_disabled' => '',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 431fc3288..40560eec0 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -241,7 +241,9 @@ URL: [url]',
 'cannot_move_root' => 'Не можна переміщати кореневий каталог',
 'cannot_retrieve_approval_snapshot' => 'Неможливо отримати знімок затвердження для цього документа',
 'cannot_retrieve_review_snapshot' => 'Неможливо отримати знімок рецензування для цього документа',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => 'Не можна видаляти кореневий каталог',
+'cannot_transfer_your_objects' => '',
 'categories' => 'Категорії',
 'categories_loading' => 'Будь ласка, зачекайте, поки завантажується список категорій …',
 'category' => 'Категорія',
@@ -700,10 +702,15 @@ URL: [url]',
 'include_subdirectories' => 'Включно з підкаталогами',
 'indexing_tasks_in_queue' => '',
 'index_converters' => '',
+'index_document_added' => '',
 'index_document_unchanged' => '',
+'index_document_updated' => '',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Каталог індексу',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
 'index_waiting' => '',
@@ -754,8 +761,10 @@ URL: [url]',
 'js_no_approval_status' => 'Оберіть статус затвердження',
 'js_no_comment' => 'Немає коментаря',
 'js_no_currentpwd' => '',
+'js_no_document' => '',
 'js_no_email' => 'Введіть свій e-mail',
 'js_no_file' => 'Оберіть файл',
+'js_no_folder' => '',
 'js_no_keywords' => 'Вкажіть ключові слова',
 'js_no_login' => 'Введіть логін',
 'js_no_name' => 'Введіть ім\'я',
@@ -1327,6 +1336,7 @@ URL: [url]',
 'settings_checkOutDir_desc' => 'Це каталог, куди скопійовано останній вміст документу, якщо він на опрацюванні. Якщо ви зробите цей каталог доступний користувачам, вони зможуть редагувати файл і завантажувати його назад по завершенні роботи.',
 'settings_cmdTimeout' => 'Тайм-аут для зовнішніх команд',
 'settings_cmdTimeout_desc' => 'Зазначена тривалість в секундах визначає, коли буде завершена зовнішня команда (наприклад, для створення повнотекстового індексу).',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => 'Каталог вмісту',
 'settings_contentDir_desc' => 'Куди зберігаються завантажені файли (краще вибрати каталог, недоступний веб-серверові).',
 'settings_contentOffsetDir' => 'Базовий початковий каталог',
@@ -1495,6 +1505,8 @@ URL: [url]',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'Ідентифікатор гостя',
 'settings_guestID_desc' => 'Ідентифікатор гостя (можна не змінювати).',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'Корінь http',
 'settings_httpRoot_desc' => 'Відносний шлях в URL, після доменної частини. Без http://. Наприклад, якщо повний URL http://www.example.com/seeddms/, треба вказати «/seeddms/». Якщо URL http://www.example.com/, то «/».',
 'settings_incItemsPerPage' => '',
@@ -1513,6 +1525,7 @@ URL: [url]',
 'settings_install_welcome_text' => '<p>Перед тим як почати встановлення SeedDMS переконайтеся, що ви створили файл ENABLE_INSTALL_TOOL в каталозі конфігурації, інакше інсталятор не працюватиме. На UNIX-подібних системах це можна зробити за допомогою команди \'touch conf/ENABLE_INSTALL_TOOL\'. Після установки видаліть цей файл.</p><p>SeedDMS має мінімальні вимоги. Потрібна база даних (БД) MySQL або SQLite и веб-сервер з PHP. Для роботи повнотекстового пошуку lucene, Також необхідна інфраструктура Zend, встановлена там, де до неї має доступ PHP. Для сервера WebDAV вам знадобиться HTTP_WebDAV_Server. Шлях може бути вказаний пізніше під час встановлення.</p><p>Якщо ви хочете створити БД до початку встановлення, то створіть її вручну відомим вам інструментом, а також користувача БД з правами доступу до БД і імпортуйте один з дампів БД з каталогу конфігурації. Інсталятор може зробити це сам, але потрібен доступ до БД з правами на створення БД.</p>',
 'settings_install_welcome_title' => 'Ласкаво просимо до інсталяції SeedDMS',
 'settings_install_zendframework' => 'Встановіть Zend Framework, якщо плануєте використовувати повнотекстовий пошук',
+'settings_invalid_guestid' => '',
 'settings_language' => 'Мова по замовчуванню',
 'settings_language_desc' => 'Мова по замовчуванню (каталог в «languages»).',
 'settings_libraryFolder' => 'Каталог бібліотек',
@@ -1715,6 +1728,7 @@ URL: [url]',
 'splash_delete_access' => '',
 'splash_document_added' => 'Додано документ',
 'splash_document_checkedout' => 'Документ відправлено на опрацювання',
+'splash_document_deleted' => '',
 'splash_document_edited' => 'Документ збережено',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Документ заблоковано',
@@ -1738,6 +1752,7 @@ URL: [url]',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_extension_upload' => '',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => 'Зміни каталогу збережено',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
@@ -1839,6 +1854,7 @@ URL: [url]',
 'tasks' => 'Завдання',
 'task_core_expireddocs_days' => '',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => '',
 'task_disabled' => '',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 95515d8b9..160f585ed 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 (783), archonwang (469), fengjohn (5), yang86 (1)
+//    Translators: Admin (784), archonwang (469), fengjohn (5), yang86 (1)
 
 $text = array(
 '2_factor_auth' => '双重认证',
@@ -233,7 +233,9 @@ URL: [url]',
 'cannot_move_root' => '错误：不能移动根目录',
 'cannot_retrieve_approval_snapshot' => '无法检索到该文件版本的审核快照.',
 'cannot_retrieve_review_snapshot' => '无法检索到该文件版本的校对快照.',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => '错误：不能删除根目录.',
+'cannot_transfer_your_objects' => '',
 'categories' => '分类',
 'categories_loading' => '请稍候，类别列表正在拼命加载中……',
 'category' => '分类',
@@ -243,7 +245,7 @@ URL: [url]',
 'category_in_use' => '已有文件使用此分类',
 'category_noname' => '类别名称不能为空。',
 'ca_ES' => '加泰罗尼亚语',
-'changelog_loading' => '',
+'changelog_loading' => '变更日志加载中,请稍候...',
 'change_assignments' => '分配变更',
 'change_password' => '修改密码',
 'change_password_message' => '您的密码已更新。',
@@ -690,10 +692,15 @@ URL: [url]',
 'include_subdirectories' => '包含子目录',
 'indexing_tasks_in_queue' => '队列中的检索任务',
 'index_converters' => '',
+'index_document_added' => '',
 'index_document_unchanged' => '',
+'index_document_updated' => '',
 'index_done' => '已完成',
 'index_error' => '系统错误',
 'index_folder' => '索引目录',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '待处理',
 'index_waiting' => '',
@@ -744,8 +751,10 @@ URL: [url]',
 'js_no_approval_status' => '请选择审核状态',
 'js_no_comment' => '没有添加说明',
 'js_no_currentpwd' => '请输入当前密码',
+'js_no_document' => '',
 'js_no_email' => '输入您的e-mail',
 'js_no_file' => '请选择一个文件',
+'js_no_folder' => '',
 'js_no_keywords' => '指定关键字',
 'js_no_login' => '输入用户名',
 'js_no_name' => '请输入名称',
@@ -1302,6 +1311,7 @@ URL: [url]',
 'settings_checkOutDir_desc' => '',
 'settings_cmdTimeout' => '',
 'settings_cmdTimeout_desc' => '',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => '',
 'settings_contentDir_desc' => '',
 'settings_contentOffsetDir' => '内容偏移目录',
@@ -1470,6 +1480,8 @@ URL: [url]',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => '访客名称',
 'settings_guestID_desc' => '',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => '',
 'settings_httpRoot_desc' => '',
 'settings_incItemsPerPage' => '',
@@ -1488,6 +1500,7 @@ URL: [url]',
 'settings_install_welcome_text' => '在开始安装 SeedDMS 之前，请确保您已经在配置目录中创建了文件“ENABLE_INSTALL_TOOL”，否则将不能安装。在 Unix 系统上，这可以很容易地通过命令 “touch conf / ENABLE_INSTALL_TOOL” 完成。完成安装后，请务必删除该文件。</ p> <p> SeedDMS 的要求非常低。您需要安装 mysql 数据库或 sqlite 支持，并启用支持 php 的 Web 服务器。Pear Package Log 也必须安装。对于 lucene 全文搜索，您还需要安装在光盘上的 Zend 框架，可以通过 php 找到它。对于 WebDAV 服务器，您还需要 HTTP_WebDAV_Server。您可以在安装过程中设置路径。</ p> <p>如果您希望在开始安装之前创建数据库，那么只需使用自己喜爱的工具手动创建数据库，可以选择创建具有数据库访问权限的数据库用户并在配置目录中导入数据库转储之一。安装脚本也可以为您做到这一点，但是它需要数据库访问权限才能创建数据库。</ p>',
 'settings_install_welcome_title' => '欢迎使用 SeedDMS 安装向导！',
 'settings_install_zendframework' => '',
+'settings_invalid_guestid' => '',
 'settings_language' => '语言设置',
 'settings_language_desc' => '默认语言（“语言”文件夹的一个子文件夹的名字',
 'settings_libraryFolder' => '库文件夹',
@@ -1690,6 +1703,7 @@ URL: [url]',
 'splash_delete_access' => '',
 'splash_document_added' => '文档已添加',
 'splash_document_checkedout' => '文档已签出',
+'splash_document_deleted' => '',
 'splash_document_edited' => '文档已保存',
 'splash_document_indexed' => '文档 \'[name]\' 已索引。',
 'splash_document_locked' => '文档已被锁定',
@@ -1713,6 +1727,7 @@ URL: [url]',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_extension_upload' => '',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => '更新文件夹',
 'splash_importfs' => '已导入文档 [docs] 和文件夹 [folders]',
 'splash_inherit_access' => '',
@@ -1814,6 +1829,7 @@ URL: [url]',
 'tasks' => '任务',
 'task_core_expireddocs_days' => '',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => '',
 'task_disabled' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index a42bf04ad..a39339c14 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -241,7 +241,9 @@ URL: [url]',
 'cannot_move_root' => '錯誤：不能移動根目錄',
 'cannot_retrieve_approval_snapshot' => '無法檢索到該檔版本的審核快照.',
 'cannot_retrieve_review_snapshot' => '無法檢索到該檔版本的校對快照.',
+'cannot_revapp_expired_docs' => '',
 'cannot_rm_root' => '錯誤：不能刪除根目錄.',
+'cannot_transfer_your_objects' => '',
 'categories' => '分類',
 'categories_loading' => '請等待，直到載入類別列表...',
 'category' => '分類',
@@ -719,10 +721,15 @@ URL: [url]',
 'include_subdirectories' => '包含子目錄',
 'indexing_tasks_in_queue' => '索引任務正在序列中',
 'index_converters' => '',
+'index_document_added' => '',
 'index_document_unchanged' => '文件未改變',
+'index_document_updated' => '',
 'index_done' => '完成',
 'index_error' => '錯誤',
 'index_folder' => '索引目錄',
+'index_folder_added' => '',
+'index_folder_unchanged' => '',
+'index_folder_updated' => '',
 'index_no_content' => '沒有索引內容',
 'index_pending' => '待定',
 'index_waiting' => '請稍後',
@@ -773,8 +780,10 @@ URL: [url]',
 'js_no_approval_status' => '請選擇審核狀態',
 'js_no_comment' => '沒有新增說明',
 'js_no_currentpwd' => '請輸入您的當前密碼',
+'js_no_document' => '',
 'js_no_email' => '輸入您的e-mail',
 'js_no_file' => '請選擇一個檔',
+'js_no_folder' => '',
 'js_no_keywords' => '指定關鍵字',
 'js_no_login' => '輸入使用者名',
 'js_no_name' => '請輸入名稱',
@@ -1365,6 +1374,7 @@ URL: [url]',
 'settings_checkOutDir_desc' => '如果檢出該文件，則在此目錄中復製文件的最新內容。如果您使用戶可以訪問此目錄，則他們可以編輯文件並在完成後將其重新簽入。',
 'settings_cmdTimeout' => '外部命令超時',
 'settings_cmdTimeout_desc' => '此持續時間（以秒為單位）確定何時終止外部命令（例如，用於創建全文本索引）。',
+'settings_conf_field_not_editable' => '',
 'settings_contentDir' => '內容目錄',
 'settings_contentDir_desc' => '上載文件的存儲位置（最好選擇無法通過Web服務器訪問的目錄）',
 'settings_contentOffsetDir' => '內容偏移目錄',
@@ -1533,6 +1543,8 @@ URL: [url]',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'Guest ID',
 'settings_guestID_desc' => '以訪客身份登錄時使用的訪客用戶ID（通常無需更改）',
+'settings_guestid_is_admin' => '',
+'settings_guestid_is_disabled' => '',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => 'URL中的相對路徑，在域部分之後。不要包含http：//前綴或Web主機名。例如如果完整的URL是http://www.example.com/seeddms/，則設置\'/ seeddms / \'。如果網址為http://www.example.com/，則設置\'/ \'',
 'settings_incItemsPerPage' => '頁面末加載的條目數',
@@ -1551,6 +1563,7 @@ URL: [url]',
 'settings_install_welcome_text' => '<p>開始安裝SeedDMS之前，請確保已在配置目錄中創建文件\'ENABLE_INSTALL_TOOL ，否則安裝將無法進行。在Unix系統上，可以使用\'touch conf / ENABLE_INSTALL_TOOL \'輕鬆完成。安裝完成後，刪除文件。</ p> <p> SeedDMS的要求非常低。您將需要mysql數據庫或sqlite支持以及啟用了php的Web服務器。梨包Log也必須安裝。對於lucene全文搜索，您還需要將Zend框架安裝在光盤上，而php可以找到它。對於WebDAV服務器，您還將需要HTTP_WebDAV_Server。以後可以在安裝過程中設置它的路徑。</ p> <p>如果您想在開始安裝之前創建數據庫，則只需使用自己喜歡的工具手動創建它，或者創建一個具有數據庫訪問權限的數據庫用戶並在配置目錄中導入數據庫轉儲之一。安裝腳本也可以為您執行此操作，但是需要具有足夠權限的數據庫訪問權限才能創建數據庫。</ p>',
 'settings_install_welcome_title' => '歡迎安裝SeedDMS',
 'settings_install_zendframework' => '如果您打算使用基於zend的全文本搜索引擎，請安裝Zend Framework。否則，請忽略此消息並繼續安裝。',
+'settings_invalid_guestid' => '',
 'settings_language' => '預設的語系',
 'settings_language_desc' => '默認語言（“語言”文件夾中子文件夾的名稱）',
 'settings_libraryFolder' => '函式庫目錄',
@@ -1753,6 +1766,7 @@ URL: [url]',
 'splash_delete_access' => '訪問權限已刪除',
 'splash_document_added' => '文件已新增',
 'splash_document_checkedout' => '文件簽出',
+'splash_document_deleted' => '',
 'splash_document_edited' => '文件儲存',
 'splash_document_indexed' => '已為文檔“ [name] ”建立索引。',
 'splash_document_locked' => '文件已被鎖定',
@@ -1776,6 +1790,7 @@ URL: [url]',
 'splash_extension_import' => '安裝擴展',
 'splash_extension_refresh' => '刷新的擴展名列表',
 'splash_extension_upload' => '安裝擴展',
+'splash_folder_deleted' => '',
 'splash_folder_edited' => '保存文件夾更改',
 'splash_importfs' => '導入的[docs]文檔和[folders]文件夾',
 'splash_inherit_access' => '訪問權限將被繼承',
@@ -1877,6 +1892,7 @@ URL: [url]',
 'tasks' => '任務',
 'task_core_expireddocs_days' => '天數',
 'task_core_expireddocs_email' => '',
+'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_description' => '描述',
 'task_disabled' => '不啟用',

From 4de124d9ae9b4c26039fce93b90718782e180e47 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 28 Jun 2021 09:19:20 +0200
Subject: [PATCH 139/143] take out logging of cachedir path

---
 inc/inc.Tasks.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 2551ac1d9..c8ef229bf 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -442,7 +442,6 @@ class SeedDMS_PreviewTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 
 		$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
 		$previewer->setConverters(isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
-		$logger->log('Cachedir is '.$settings->_cacheDir, PEAR_LOG_INFO);
 
 		$folderprocess = new SeedDMS_Task_Preview_Process_Folder($previewer, array('list'=>$settings->_previewWidthList, 'detail'=>$settings->_previewWidthDetail), $logger);
 		$tree = new SeedDMS_FolderTree($folder, array($folderprocess, 'process'));

From cb383eb70ba2bc3d7754966281175f72ea447d78 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 28 Jun 2021 09:25:58 +0200
Subject: [PATCH 140/143] do not strip .php from uri in add_log_line()

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

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index c89782f66..dee93837b 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -426,7 +426,7 @@ function _add_log_line($msg="") { /* {{{ */
 	else $logname=date("Ym", time());
 
 	if($h = fopen($settings->_contentDir.$logname.".log", "a")) {
-		fwrite($h,date("Y/m/d H:i", time())." ".$user->getLogin()." (".$_SERVER['REMOTE_ADDR'].") ".basename($_SERVER["REQUEST_URI"], ".php").$msg."\n");
+		fwrite($h,date("Y/m/d H:i", time())." ".$user->getLogin()." (".$_SERVER['REMOTE_ADDR'].") ".basename($_SERVER["REQUEST_URI"]).$msg."\n");
 		fclose($h);
 	}
 } /* }}} */

From 47aebfdb147eb23031df2bfb118e5256b5ee969a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 28 Jun 2021 09:27:40 +0200
Subject: [PATCH 141/143] do not strip .php from uri in add_log_line()

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

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index dee93837b..0520262db 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -413,7 +413,7 @@ function add_log_line($msg="", $priority=null) { /* {{{ */
 	if($user)
 		$logger->log($user->getLogin()." (".$ip.") ".basename($_SERVER["REQUEST_URI"], ".php").($msg ? $msg : ''), $priority);
 	else
-		$logger->log("-- (".$ip.") ".basename($_SERVER["REQUEST_URI"], ".php").($msg ? $msg : ''), $priority);
+		$logger->log("-- (".$ip.") ".basename($_SERVER["REQUEST_URI"]).($msg ? $msg : ''), $priority);
 } /* }}} */
 
 function _add_log_line($msg="") { /* {{{ */

From f02074c794c03a39f57af9f9b0473bbced630da6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 28 Jun 2021 11:15:36 +0200
Subject: [PATCH 142/143] better message when running in dry mode

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

diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index 8883ef78c..dcfff3974 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -92,7 +92,7 @@ foreach($tasks as $task) {
 							$task->setDisabled(1);
 						}
 					} elseif($mode == 'dryrun') {
-						echo "Running ".$task->getExtension()."::".$task->getTask()."\n";
+						echo "Running ".$task->getExtension()."::".$task->getTask()." in dry mode\n";
 					}
 				}
 			}

From 635d8253feec6a0400a0681345fca8c3bd88cc3a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 28 Jun 2021 11:15:56 +0200
Subject: [PATCH 143/143] add space after scriptname in add_log_line()

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

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 3299c41c7..9ba41f782 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -412,9 +412,9 @@ function add_log_line($msg="", $priority=null) { /* {{{ */
 	elseif(!empty($_SERVER['REMOTE_ADDR']))
 		$ip = $_SERVER['REMOTE_ADDR'];
 	if(!empty($_SERVER["REQUEST_URI"]))
-		$scriptname = basename($_SERVER["REQUEST_URI"], ".php");
+		$scriptname = basename($_SERVER["REQUEST_URI"], ".php").' ';
 	else
-		$scriptname = basename($_SERVER["SCRIPT_NAME"]);
+		$scriptname = basename($_SERVER["SCRIPT_NAME"]).' ';
 	if($user)
 		$logger->log($user->getLogin()." (".$ip.") ".$scriptname.($msg ? $msg : ''), $priority);
 	else