From 0066d29650da9deda1e862057bb759147f3d65a5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 1 Mar 2018 21:29:12 +0100
Subject: [PATCH 001/147] add listNeedsCorrection

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 18 ++++++++++++++++++
 SeedDMS_Core/package.xml           |  1 +
 2 files changed, 19 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index f1392fceb..25e538046 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1592,6 +1592,24 @@ class SeedDMS_Core_DMS {
 			else $queryStr .= "ORDER BY `name`";
 			$queryStr .= " ".$orderdir;
 			break; // }}}
+		case 'NeedsCorrectionOwner': // Documents that needs correction and I'm owning {{{
+			$queryStr .= "WHERE 1=1 ";
+
+			$user = $param1;
+			$orderby = $param3;
+			if($param4 == 'desc')
+				$orderdir = 'DESC';
+			else
+				$orderdir = 'ASC';
+			$queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ".
+				"AND `tblDocumentStatusLog`.`status` IN (".S_NEEDS_CORRECTION.") ";
+			//$queryStr .= "ORDER BY `statusDate` DESC";
+			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+			else $queryStr .= "ORDER BY `name`";
+			$queryStr .= " ".$orderdir;
+			break; // }}}
 		case 'DraftOwner': // Documents in draft status and I'm owning {{{
 			$queryStr .= "WHERE 1=1 ";
 
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 463c3196e..ebb8c5f93 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,6 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
+add list 'NeedsCorrectionOwner' to SeedDMS_Core_DMS::getDocumentList()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 7008b11f64d44ac608d16cea333a99de13bee789 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 1 Mar 2018 21:29:53 +0100
Subject: [PATCH 002/147] add list for documents that need correction

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

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 64d5dfb25..822f23534 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -586,6 +586,36 @@ $(document).ready( function() {
 
 	} /* }}} */
 
+	function listNeedsCorrectionOwner() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$orderby = $this->params['orderby'];
+		$orderdir = $this->params['orderdir'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
+
+		/* Get list of obsolete documents and owned by current user */
+		$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user, false, $orderby, $orderdir);
+		if (is_bool($resArr) && !$resArr) {
+			$this->contentHeading(getMLText("warning"));
+			$this->contentContainer(getMLText("internal_error_exit"));
+			$this->htmlEndPage();
+			exit;
+		}
+
+		$this->contentHeading(getMLText("documents_user_needs_correction"));
+		if ($resArr) {
+			$this->printList($resArr, $previewer, 'listNeedsCorrectionOwner');
+		}
+		else printMLText("no_docs_needs_correction");
+
+	} /* }}} */
+
 	function listDraftOwner() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -688,6 +718,8 @@ $(document).ready( function() {
 		echo '<li class=""><a data-href="#documents_user_expiration" data-action="listExpiredOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_expiration").'</a></li>';
 		$resArr = $dms->getDocumentList('ObsoleteOwner', $user);
 		echo '<li class=""><a data-href="#documents_user_obsolete" data-action="listObsoleteOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_obsolete").'</a></li>';
+		$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user);
+		echo '<li class=""><a data-href="#documents_user_needs_correction" data-action="listNeedsCorrectionOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_needs_correction").'</a></li>';
 		echo '</ul>';
 		$this->contentHeading(getMLText("tasks"));
 		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';

From d78b165322c93a8e29da6c162bcdd35058e7a654 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 1 Mar 2018 21:30:14 +0100
Subject: [PATCH 003/147] add item for 6.0.5

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

diff --git a/CHANGELOG b/CHANGELOG
index 043e697ce..eac0d3ffc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 6.0.5
 --------------------------------------------------------------------------------
 - sync form for updating document by upload and checkin
+- add list of documents which need correction on MyDocuments page
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.4

From 7fe44b6644319de34b7663015d2a2370a70f2fb4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 1 Mar 2018 21:30:30 +0100
Subject: [PATCH 004/147] add newline to last line

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

diff --git a/styles/bootstrap/noty/layouts/topRight.js b/styles/bootstrap/noty/layouts/topRight.js
index 8022c4024..9fb3c5c9b 100644
--- a/styles/bootstrap/noty/layouts/topRight.js
+++ b/styles/bootstrap/noty/layouts/topRight.js
@@ -40,4 +40,4 @@
 		addClass: ''
 	};
 
-})(jQuery);
\ No newline at end of file
+})(jQuery);

From c5104e29f884c7b992a38a686268f6688507724d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 2 Mar 2018 06:20:11 +0100
Subject: [PATCH 005/147] new phrases

---
 languages/ar_EG/lang.inc |   2 +
 languages/bg_BG/lang.inc |   2 +
 languages/ca_ES/lang.inc |   2 +
 languages/cs_CZ/lang.inc |   2 +
 languages/de_DE/lang.inc |   4 +-
 languages/el_GR/lang.inc |   2 +
 languages/en_GB/lang.inc |   4 +-
 languages/es_ES/lang.inc |   2 +
 languages/fr_FR/lang.inc | 273 ++++++++++++++++++++-------------------
 languages/hr_HR/lang.inc |   2 +
 languages/hu_HU/lang.inc |   2 +
 languages/it_IT/lang.inc |   2 +
 languages/ko_KR/lang.inc |   2 +
 languages/nl_NL/lang.inc |   2 +
 languages/pl_PL/lang.inc |   2 +
 languages/pt_BR/lang.inc |   2 +
 languages/ro_RO/lang.inc |   2 +
 languages/ru_RU/lang.inc |   2 +
 languages/sk_SK/lang.inc |   2 +
 languages/sv_SE/lang.inc |   2 +
 languages/tr_TR/lang.inc |   2 +
 languages/uk_UA/lang.inc |   2 +
 languages/zh_CN/lang.inc |   2 +
 languages/zh_TW/lang.inc |   2 +
 24 files changed, 189 insertions(+), 134 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 6843643f3..bf8f33c47 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -326,6 +326,7 @@ URL: [url]',
 'documents_to_revise' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
+'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
 'documents_user_reception' => '',
@@ -785,6 +786,7 @@ URL: [url]',
 'no_default_keywords' => 'لايوجد كلمات بحثية متاحة',
 'no_docs_checked_out' => '',
 'no_docs_locked' => 'لايوجد مستندات حاليا مقفلة/محمية من التعديل',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => '',
 'no_docs_to_approve' => 'لايوجد مستندات حالية في انتظار الموافقة',
 'no_docs_to_look_at' => 'لايوجد مستندات حاليا تستدعي انتباهك',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index f79769b64..d5dbbe8f1 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -311,6 +311,7 @@ $text = array(
 'documents_to_revise' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
+'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
 'documents_user_reception' => '',
@@ -692,6 +693,7 @@ $text = array(
 'no_default_keywords' => 'Няма ключови думи',
 'no_docs_checked_out' => '',
 'no_docs_locked' => 'Няма блокирани документи',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => '',
 'no_docs_to_approve' => 'Няма документи, нуждаещи се от утвърждаване',
 'no_docs_to_look_at' => 'Няма документи, нуждаещи се от внимание',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 9ec35abd9..5f6bc0bf1 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -316,6 +316,7 @@ URL: [url]',
 'documents_to_revise' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
+'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
 'documents_user_reception' => '',
@@ -697,6 +698,7 @@ URL: [url]',
 'no_default_keywords' => 'No hi ha mots clau disponibles',
 'no_docs_checked_out' => '',
 'no_docs_locked' => 'No hi ha documents bloquejats.',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => '',
 'no_docs_to_approve' => 'Actualmente no hi ha documents que necessitin aprovació.',
 'no_docs_to_look_at' => 'No hi ha documents que necessitin atenció.',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index fbdd0663c..cbc1e6318 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -333,6 +333,7 @@ URL: [url]',
 'documents_to_revise' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
+'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
 'documents_user_reception' => '',
@@ -792,6 +793,7 @@ URL: [url]',
 'no_default_keywords' => 'Nejsou dostupná žádná klíčová slova.',
 'no_docs_checked_out' => '',
 'no_docs_locked' => 'Žádné uzamčené dokumenty',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => '',
 'no_docs_to_approve' => 'Momentálně neexistují žádné dokumenty, které vyžadují schválení.',
 'no_docs_to_look_at' => 'Žádné dokumenty, které vyžadují pozornost.',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index e78a81bfd..4b594960c 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 (2551), dgrutsch (22)
+//    Translators: Admin (2553), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -338,6 +338,7 @@ URL: [url]',
 'documents_to_revise' => 'Erneute Prüfung erforderlich',
 'documents_user_draft' => 'Entwürfe',
 'documents_user_expiration' => 'Abgelaufende Dokumente',
+'documents_user_needs_correction' => 'Dokumente, die korrigiert werden müssen',
 'documents_user_no_reception' => 'Dokumente ohne Empfangsbestätigung',
 'documents_user_obsolete' => 'Veraltete Dokumente',
 'documents_user_reception' => 'Dokumente mit Empfangsbestätigung',
@@ -807,6 +808,7 @@ URL: [url]',
 'no_default_keywords' => 'Keine Vorlagen vorhanden',
 'no_docs_checked_out' => 'Keine Dokumente ausgecheckt',
 'no_docs_locked' => 'Keine Dokumente gesperrt.',
+'no_docs_needs_correction' => 'Keine Dokumente, die korrigiert werden müssen',
 'no_docs_rejected' => 'Keine Dokumente abgelehnt.',
 'no_docs_to_approve' => 'Es gibt zur Zeit keine Dokumente, die eine Freigabe erfordern.',
 'no_docs_to_look_at' => 'Keine Dokumente, nach denen geschaut werden müsste.',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index acae0ac97..26908ea1f 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -311,6 +311,7 @@ $text = array(
 'documents_to_revise' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
+'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
 'documents_user_reception' => '',
@@ -703,6 +704,7 @@ URL: [url]',
 'no_default_keywords' => '',
 'no_docs_checked_out' => '',
 'no_docs_locked' => '',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => '',
 'no_docs_to_approve' => '',
 'no_docs_to_look_at' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 1b6bb60bb..e7b5f2545 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 (1672), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1674), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -338,6 +338,7 @@ URL: [url]',
 'documents_to_revise' => 'Documents awaiting your revision',
 'documents_user_draft' => 'Drafts',
 'documents_user_expiration' => 'Expired documents',
+'documents_user_needs_correction' => 'Documents that need to be corrected',
 'documents_user_no_reception' => 'Documents without reception',
 'documents_user_obsolete' => 'Obsolete documents',
 'documents_user_reception' => 'Documents awaiting reception',
@@ -809,6 +810,7 @@ URL: [url]',
 'no_default_keywords' => 'No keywords available',
 'no_docs_checked_out' => 'No documents checked out',
 'no_docs_locked' => 'No documents locked.',
+'no_docs_needs_correction' => 'No documents, that need to be corrected',
 'no_docs_rejected' => 'No documents rejected.',
 'no_docs_to_approve' => 'There are currently no documents that require approval.',
 'no_docs_to_look_at' => 'No documents that need attention.',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index f1d4130e8..03f7b0ccb 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -333,6 +333,7 @@ URL: [url]',
 'documents_to_revise' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
+'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
 'documents_user_reception' => '',
@@ -792,6 +793,7 @@ URL: [url]',
 'no_default_keywords' => 'No hay palabras clave disponibles',
 'no_docs_checked_out' => '',
 'no_docs_locked' => 'No hay documentos bloqueados.',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => '',
 'no_docs_to_approve' => 'Actualmente no hay documentos que necesiten aprobación.',
 'no_docs_to_look_at' => 'No hay documentos que necesiten atención.',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index f5aec6327..37ff6d619 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1079), jeromerobert (50), lonnnew (9), Oudiceval (509)
+//    Translators: Admin (1079), jeromerobert (50), lonnnew (9), Oudiceval (650)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -57,7 +57,7 @@ URL: [url]',
 'add_attrdefgroup' => 'Ajouter un nouveau groupe d’attributs',
 'add_document' => 'Ajouter un document',
 'add_document_link' => 'Ajouter un lien',
-'add_document_notify' => 'Assigner une notification',
+'add_document_notify' => 'Affecter une notification',
 'add_doc_reviewer_approver_warning' => 'N.B. Les documents sont automatiquement marqués comme publiés s’il n’y a pas d’examinateur ou d’approbateur désigné.',
 'add_doc_workflow_warning' => 'N.B. Les documents sont automatiquement marqués comme publiés si aucun workflow est désigné.',
 'add_event' => 'Ajouter un événement',
@@ -70,9 +70,9 @@ URL: [url]',
 'add_revision' => 'Confirmer l’approbation',
 'add_role' => 'Ajouter un rôle',
 'add_subfolder' => 'Ajouter un sous-dossier',
-'add_to_clipboard' => 'Ajouter au presse-papiers',
-'add_to_transmittal' => '',
-'add_transmittal' => '',
+'add_to_clipboard' => 'Ajouter au presse-papier',
+'add_to_transmittal' => 'Ajouter à la transmission',
+'add_transmittal' => 'Ajouter une transmission',
 'add_user' => 'Ajouter un utilisateur',
 'add_user_to_group' => 'Ajouter un utilisateur au groupe',
 'add_workflow' => 'Ajouter un workflow',
@@ -129,16 +129,16 @@ URL : [url]',
 'approval_summary' => 'Vue d’ensemble approbation',
 'approval_update_failed' => 'Erreur de la mise à jour du statut d\'approbation. Echec de la mise à jour.',
 'approvers' => 'Approbateurs',
-'approver_already_assigned' => 'L’utilisateur est déjà assigné comme approbateur.',
+'approver_already_assigned' => 'L’utilisateur est déjà affecté comme approbateur.',
 'approver_already_removed' => 'L’approbateur a déjà été retiré du processus d’approbation ou a déjà soumis l’approbation.',
 'april' => 'Avril',
 'archive_creation' => 'Créer une archive',
 'archive_creation_warning' => 'Avec cette fonction, vous pouvez créer une archive contenant les fichiers de tous les dossiers DMS. Après la création, l\'archive sera sauvegardée dans le dossier de données de votre serveur.<br> AVERTISSEMENT: Une archive créée ainsi sera inutilisable en tant que sauvegarde du serveur.',
 'ar_EG' => 'Arabe – Égypte',
-'assign_approvers' => 'Approbateurs désignés',
-'assign_recipients' => '',
-'assign_reviewers' => 'Examinateurs désignés',
-'assign_user_property_to' => 'Assigner les propriétés de l\'utilisateur à',
+'assign_approvers' => 'Affectation d’approbateurs',
+'assign_recipients' => 'Affecter les destinataires',
+'assign_reviewers' => 'Affectation d’examinateurs',
+'assign_user_property_to' => 'Transférer les propriétés de l\'utilisateur à',
 'assumed_released' => 'Supposé publié',
 'attrdefgroup_management' => 'Gestion des groupes d’attributs',
 'attrdefgrp_show_detail' => 'Détails',
@@ -224,7 +224,7 @@ URL: [url]',
 'category_in_use' => 'Cette catégorie est en cours d\'utilisation par des documents.',
 'category_noname' => 'Aucun nom de catégorie fourni.',
 'ca_ES' => 'Catalan',
-'change_assignments' => 'Changer d\'affectations',
+'change_assignments' => 'Changer les affectations',
 'change_password' => 'Changer de mot de passe',
 'change_password_message' => 'Votre mot de passe a été changé.',
 'change_recipients' => 'Définir destinataires',
@@ -274,7 +274,7 @@ URL: [url]',
 'confirm_move_document' => 'Veuillez confirmer le déplacement du document.',
 'confirm_move_folder' => 'Veuillez confirmer le déplacement du dossier.',
 'confirm_pwd' => 'Confirmer le mot de passe',
-'confirm_rm_attr_value' => '',
+'confirm_rm_attr_value' => 'Voulez-vous vraiment supprimer la valeur d’attribut ?',
 'confirm_rm_backup' => 'Voulez-vous vraiment supprimer le fichier "[arkname]"?<br>Attention: Cette action ne peut pas être annulée.',
 'confirm_rm_document' => 'Voulez-vous réellement supprimer le document \'[documentname]\'?<br>Attention : cette action ne peut être annulée.',
 'confirm_rm_dump' => 'Voulez-vous vraiment supprimer le fichier "[dumpname]"?<br>Attention: Cette action ne peut pas être annulée.',
@@ -284,13 +284,13 @@ URL: [url]',
 'confirm_rm_folder_files' => 'Voulez-vous vraiment supprimer tous les fichiers du dossier "[foldername]" et ses sous-dossiers?<br>Attention: Cette action ne peut pas être annulée.',
 'confirm_rm_group' => 'Voulez-vous vraiment supprimer le groupe "[groupname]"?<br>Attention: Cette action ne peut pas être annulée.',
 'confirm_rm_log' => 'Voulez-vous vraiment supprimer le fichier log "[logname]"?<br>Attention: Cette action ne peut pas être annulée.',
-'confirm_rm_transmittal' => '',
-'confirm_rm_transmittalitem' => '',
+'confirm_rm_transmittal' => 'Veuillez confirmer la suppression de la transmission.',
+'confirm_rm_transmittalitem' => 'Confirmer la suppression',
 'confirm_rm_user' => 'Voulez-vous vraiment supprimer l\'utilisateur "[username]"?<br>Attention: Cette action ne peut pas être annulée.',
 'confirm_rm_user_from_processes' => 'Voulez-vous vraiment retirer l’utilisateur « [username] » de tous les processus ?<br>Attention : Cette action peut entrainer la publication des documents si l’utilisateur était le seul (ou dernier) approbateur.',
 'confirm_rm_version' => 'Voulez-vous réellement supprimer la version [version] du document « [documentname] » ?<br>Attention : Cette action est irréversible.',
 'confirm_transfer_objects' => 'Voulez-vous vraiment transférer les documents, dossiers, etc. de l’utilisateur « [username] » ?<br>Attention : Cette action est irréversible.',
-'confirm_update_transmittalitem' => '',
+'confirm_update_transmittalitem' => 'Confirmer la mise à jour',
 'content' => 'Contenu',
 'continue' => 'Continuer',
 'converter_new_cmd' => 'Commande',
@@ -320,7 +320,7 @@ URL: [url]',
 'de_DE' => 'Allemand',
 'disclaimer' => 'Cet espace est protégé. Son accès est strictement réservé aux utilisateurs autorisés.<br/>Tout accès non autorisé est punissable par les lois internationales.',
 'discspace' => 'Espace disque',
-'docs_in_reception_no_access' => '',
+'docs_in_reception_no_access' => 'Documents en attente de réception sans accès du destinataire',
 'docs_in_revision_no_access' => 'Documents en révision sans accès du réviseur',
 'document' => 'Document',
 'documentcontent' => 'Version de document',
@@ -335,11 +335,12 @@ URL: [url]',
 'documents_to_process' => 'Documents à traiter',
 'documents_to_receipt' => 'Documents en attente de confirmation de réception',
 'documents_to_review' => 'Documents en attente de vérification',
-'documents_to_revise' => '',
-'documents_user_draft' => '',
-'documents_user_expiration' => '',
-'documents_user_no_reception' => '',
-'documents_user_obsolete' => '',
+'documents_to_revise' => 'Documents en attente de votre révision',
+'documents_user_draft' => 'Ébauches',
+'documents_user_expiration' => 'Documents expirés',
+'documents_user_needs_correction' => '',
+'documents_user_no_reception' => 'Documents sans réception',
+'documents_user_obsolete' => 'Documents obsolètes',
 'documents_user_reception' => 'Documents en attente de réception',
 'documents_user_rejected' => 'Documents rejetés',
 'documents_user_requiring_attention' => 'Documents à surveiller',
@@ -432,7 +433,7 @@ Le lien est valide jusqu’au [valid].
 'draft' => 'Ébauche',
 'draft_pending_approval' => 'Ébauche - en attente d’approbation',
 'draft_pending_review' => 'Ébauche - en attente de vérification',
-'drag_icon_here' => 'Glisser/déposer le fichier ou document ici!',
+'drag_icon_here' => 'Glisser-déposer le dossier ou document ici !',
 'dropfolderdir_missing' => 'Votre dossier de dépôt personnel n\'existe pas sur le serveur ! Veuillez faire une demande à l\'administrateur.',
 'dropfolder_file' => 'Fichier du dossier de dépôt',
 'dropfolder_folder' => 'Répertoire du dossier de dépôt',
@@ -453,15 +454,15 @@ Le lien est valide jusqu’au [valid].
 'edit_document_props' => 'Modifier le document',
 'edit_event' => 'Modifier l\'événement',
 'edit_existing_access' => 'Modifier la liste des droits d\'accès',
-'edit_existing_attribute_groups' => '',
+'edit_existing_attribute_groups' => 'Modifier les groupes d’attributs',
 'edit_existing_notify' => 'Modifier les notifications',
 'edit_folder_access' => 'Modifier les droits d\'accès',
-'edit_folder_attrdefgrp' => '',
+'edit_folder_attrdefgrp' => 'Modifier les groupes d’attributs',
 'edit_folder_notify' => 'Liste de notification de dossiers',
 'edit_folder_props' => 'Modifier le dossier',
 'edit_group' => 'Modifier un groupe',
 'edit_online' => 'Modification en ligne',
-'edit_transmittal_props' => '',
+'edit_transmittal_props' => 'Modifier les propriétés de la transmission',
 'edit_user' => 'Modifier un utilisateur',
 'edit_user_details' => 'Modifier les détails d\'utilisateur',
 'edit_version' => 'Modifier le fichier',
@@ -471,7 +472,7 @@ Le lien est valide jusqu’au [valid].
 'email_footer' => 'Vous pouvez modifier vos notifications via « Mon compte ».',
 'email_header' => 'Ceci est un message automatique généré par le serveur DMS.',
 'email_not_given' => 'Veuillez entrer une adresse e-mail valide.',
-'empty_attribute_group_list' => '',
+'empty_attribute_group_list' => 'Aucun groupe d’attributs',
 'empty_folder_list' => 'Pas de documents ou de dossier',
 'empty_notify_list' => 'Aucune entrée',
 'en_GB' => 'Anglais (RU)',
@@ -489,7 +490,7 @@ Le lien est valide jusqu’au [valid].
 'error_remove_permission' => 'Erreur lors de la suppression de permission',
 'error_toogle_permission' => 'Erreur lors de la modification de permission',
 'error_transfer_document' => 'Erreur lors du transfert du document',
-'error_uploading_reviewer_only' => '',
+'error_uploading_reviewer_only' => 'Erreur lors de la création du document. Le document a un examinateur, mais pas d’approbateur.',
 'es_ES' => 'Espagnol',
 'event_details' => 'Détails de l\'événement',
 'exclude_items' => 'Exclure des élements',
@@ -573,13 +574,13 @@ 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',
-'global_attributedefinitiongroups' => '',
+'global_attributedefinitiongroups' => 'Groupes d’attributs',
 'global_attributedefinitions' => 'Définitions d\'attributs',
 'global_default_keywords' => 'Mots-clés globaux',
 'global_document_categories' => 'Catégories',
 'global_workflows' => 'Workflows',
-'global_workflow_actions' => 'Action de Workflow',
-'global_workflow_states' => 'Etat de Workflow',
+'global_workflow_actions' => 'Actions de Workflow',
+'global_workflow_states' => 'États de Workflow',
 'group' => 'Groupe',
 'groups' => 'Groupes',
 'group_approval_summary' => 'Vue d’ensemble groupe approbation',
@@ -606,7 +607,7 @@ URL: [url]',
 'importfs' => 'Importer depuis le système de fichiers',
 'import_fs' => 'Importer depuis le système de fichiers',
 'import_fs_warning' => 'L’importation peut se faire à partir du dossier de dépôt personnel uniquement. Tous les sous-dossiers et fichiers seront importés. Les fichiers seront immédiatement publiés.',
-'include_content' => '',
+'include_content' => 'Inclure le contenu',
 'include_documents' => 'Inclure les documents',
 'include_subdirectories' => 'Inclure les sous-dossiers',
 'indexing_tasks_in_queue' => 'Opérations d’indexation en attente',
@@ -617,9 +618,9 @@ URL: [url]',
 'index_waiting' => 'Chargement…',
 'individuals' => 'Individuels',
 'indivіduals_in_groups' => 'Membres d’un groupe',
-'info_recipients_tab_not_released' => '',
+'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é ».',
 'inherited' => 'hérité',
-'inherits_access_copy_msg' => 'Copier la liste des accès hérités',
+'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é.',
 'internal_error' => 'Erreur interne',
@@ -631,8 +632,8 @@ URL: [url]',
 'invalid_create_date_start' => 'Date de début invalide pour la plage de dates de création.',
 'invalid_doc_id' => 'Identifiant de document invalide',
 'invalid_dropfolder_folder' => 'Répertoire du dossier de dépôt invalide',
-'invalid_expiration_date_end' => '',
-'invalid_expiration_date_start' => '',
+'invalid_expiration_date_end' => 'Date de fin invalide pour la plage de dates d’expiration.',
+'invalid_expiration_date_start' => 'Date de début invalide pour la plage de dates d’expiration.',
 'invalid_file_id' => 'Identifiant de fichier invalide',
 'invalid_folder_id' => 'Identifiant de dossier invalide',
 'invalid_group_id' => 'Identifiant de groupe invalide',
@@ -685,7 +686,7 @@ URL: [url]',
 'lastaccess' => 'Dernière connexion',
 'last_update' => 'Dernière modification',
 'legend' => 'Légende',
-'librarydoc' => '',
+'librarydoc' => 'Document de la bibliothèque',
 'linked_documents' => 'Documents liés',
 'linked_files' => 'Fichiers attachés',
 'linked_to_current_version' => 'Lié à la version actuelle',
@@ -694,7 +695,7 @@ URL: [url]',
 'link_alt_updatedocument' => 'Pour déposer des fichiers de taille supérieure, utilisez la <a href="%s">page d\'ajout multiple</a>.',
 'link_to_version' => 'Version',
 'list_access_rights' => 'Liste des droits d’accès…',
-'list_contains_no_access_docs' => '',
+'list_contains_no_access_docs' => 'La liste contient des documents auxquels vous n’avez pas accès et qui ne sont donc pas affichés.',
 'list_hooks' => '',
 'local_file' => 'Fichier local',
 'locked_by' => 'Verrouillé par',
@@ -714,7 +715,7 @@ URL: [url]',
 'manager_of_group' => 'Vous êtes le gestionnaire de ce groupe',
 'mandatory_approvergroups' => 'Obligatoire : groupes de valideurs',
 'mandatory_approvergroup_no_access' => 'Groupe requis d\'approbateurs \'[group]\' ne dispose pas des droits suffisants',
-'mandatory_approvers' => 'Approbateurs désignés',
+'mandatory_approvers' => 'Affectation d’approbateurs',
 'mandatory_approver_no_access' => 'L\'approbateur désigné \'[user]\' ne dispose pas des droits d\'accès suffisants.',
 'mandatory_reviewergroups' => 'Groupe obligatoire d’examinateurs',
 'mandatory_reviewergroup_no_access' => 'Groupe d\'examinateurs \'[group]\' ne dispose pas des droits suffisants',
@@ -730,25 +731,25 @@ URL: [url]',
 'missing_checksum' => 'Checksum manquante',
 'missing_file' => 'Fichier manquant',
 'missing_filesize' => 'Taille de fichier manquante',
-'missing_reception' => '',
+'missing_reception' => 'Réception manquante',
 'missing_request_object' => '',
 'missing_transition_user_group' => 'Utilisateur/groupe manquant pour transition',
 'monday' => 'Lundi',
 'monday_abbr' => 'Lun.',
 'monthly' => 'Mensuel',
 'month_view' => 'Vue par mois',
-'more_objects_loading' => '',
+'more_objects_loading' => 'Chargement d’éléments supplémentaires…',
 'move' => 'Déplacer',
 'move_clipboard' => 'Déplacer le contenu du presse-papier',
 'move_document' => 'Déplacer le document',
 'move_folder' => 'Déplacer le dossier',
 'my_account' => 'Mon compte',
 'my_documents' => 'Mes documents',
-'my_transmittals' => '',
+'my_transmittals' => 'Mes transmissions',
 'name' => 'Nom',
-'needs_correction' => '',
+'needs_correction' => 'Nécessite une correction',
 'needs_workflow_action' => 'Ce document requiert votre attention. Consultez l\'onglet workflow.',
-'network_drive' => '',
+'network_drive' => 'Lecteur réseau',
 'never' => 'Jamais',
 'new' => 'Nouveau',
 'new_attrdef' => 'Ajouter une définition d\'attribut',
@@ -809,12 +810,13 @@ URL: [url]',
 'no_default_keywords' => 'Aucun mot-clé disponible',
 'no_docs_checked_out' => '',
 'no_docs_locked' => 'Aucun document verrouillé',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => 'Aucun document rejeté.',
 'no_docs_to_approve' => 'Aucun document ne nécessite actuellement une approbation',
 'no_docs_to_look_at' => 'Aucun document à surveiller',
 'no_docs_to_receipt' => 'Aucune confirmation de réception de document n’est requise',
 'no_docs_to_review' => 'Aucun document en attente de vérification',
-'no_docs_to_revise' => '',
+'no_docs_to_revise' => 'Il n’y a actuellement aucun document nécessitant d’être révisé.',
 'no_email_or_login' => 'L’identifiant et l’e-mail doivent être saisis.',
 'no_fulltextindex' => 'Aucun fichier d\'index disponibles',
 'no_groups' => 'Aucun groupe',
@@ -831,8 +833,8 @@ URL: [url]',
 'no_version_modification' => 'Pas de modification de version',
 'no_workflow_available' => 'Aucun workflow disponible',
 'objectcheck' => 'Vérification des dossiers et documents',
-'object_check_critical' => '',
-'object_check_warning' => '',
+'object_check_critical' => 'Erreurs critiques',
+'object_check_warning' => 'Avertissements',
 'obsolete' => 'Obsolète',
 'october' => 'Octobre',
 'old' => 'Ancien',
@@ -885,10 +887,10 @@ En cas de problème persistant, veuillez contacter votre administrateur.',
 'possible_substitutes' => 'Substituts',
 'preset_expires' => 'Expiration prédéfinie',
 'preview' => 'Aperçu',
-'preview_converters' => 'Aperçu de la conversion de document',
+'preview_converters' => 'Conversion des documents pour prévisualisation',
 'preview_images' => 'Miniatures',
 'preview_markdown' => 'Prévisualisation',
-'preview_pdf' => '',
+'preview_pdf' => 'Prévisualisation en PDF',
 'preview_plain' => 'Texte',
 'previous_state' => 'État précédent',
 'previous_versions' => 'Versions précédentes',
@@ -941,20 +943,27 @@ URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Attachement supprimé',
 'removed_recipient' => 'a été supprimé de la liste des destinataires.',
 'removed_reviewer' => 'a été retiré de la liste des examinateurs.',
-'removed_revisor' => '',
+'removed_revisor' => 'a été supprimé de la liste des réviseurs.',
 'removed_workflow_email_body' => 'Workflow du document supprimé: [name]
 Version: [version]
 Workflow: [workflow]
 Répertoire: [folder_path]
 Utilisateur: [username]
 URL: [url]',
-'removed_workflow_email_subject' => '',
+'removed_workflow_email_subject' => '[sitename] : [name] - Workflow retiré de la version du doument',
 'removeFolderFromDropFolder' => 'Suppression du dossier après importation',
 'remove_marked_files' => 'Supprimer les fichiers sélectionnés',
 'repaired' => 'réparé',
 'repairing_objects' => 'Réparation des documents et des dossiers.',
-'request_workflow_action_email_body' => '',
-'request_workflow_action_email_subject' => '',
+'request_workflow_action_email_body' => 'Le workflow a atteint un état nécessitant une action de votre part.
+Document : [name]
+Version : [version]
+Workflow : [workflow]
+État actuel : [current_state]
+Dossier parent : [folder_path]
+Utilisateur : [username]
+URL : [url]',
+'request_workflow_action_email_subject' => '[sitename] : [name] - Action de Workflow requise',
 'reset_checkout' => '',
 'restrict_access' => 'Pas d\'accès',
 'results_page' => 'Page de résultats',
@@ -980,7 +989,7 @@ URL : [url]',
 'review_deletion_email_subject' => '[sitename] : [name] - Demande de vérification supprimée',
 'review_file' => 'Fichier',
 'review_group' => 'Groupe de vérification',
-'review_log' => 'Journal des modifications',
+'review_log' => 'Journal des vérifications',
 'review_request_email' => 'Demande de vérification',
 'review_request_email_body' => 'Demande de vérification
 Document : [name]
@@ -1002,10 +1011,10 @@ URL : [url]',
 'review_submit_email_subject' => '[sitename] : [name] - Vérification faite',
 'review_summary' => 'Vue d’ensemble vérification',
 'review_update_failed' => 'Erreur lors de la mise à jour du statut de vérification. Échec de la mise à jour.',
-'revise_document' => '',
-'revise_document_on' => '',
+'revise_document' => 'Réviser le document',
+'revise_document_on' => 'Prochaine révision de la version du document le [date]',
 'revisions_accepted' => '[no_revisions] révisions déjà confirmées',
-'revisions_not_touched' => '',
+'revisions_not_touched' => '[no_revisions] révisions non amorcées',
 'revisions_pending' => '[no_revisions] révisions à venir en attente',
 'revisions_rejected' => '[no_revisions] révisions déjà rejetées',
 'revisions_without_group' => 'Révisions sans groupe',
@@ -1022,30 +1031,30 @@ URL : [url]',
 'revision_status' => 'État',
 'revision_submit_email_body' => '',
 'revision_submit_email_subject' => '',
-'revisors' => '',
-'revisor_already_assigned' => '',
-'revisor_already_removed' => '',
+'revisors' => 'Réviseurs',
+'revisor_already_assigned' => 'L’utilisateur est déjà attribué en tant que réviseur.',
+'revisor_already_removed' => 'Le réviseur a déjà été retiré du processus de révision ou a déjà révisé le document.',
 'rewind_workflow' => 'Remonter le workflow',
 'rewind_workflow_email_body' => '',
 'rewind_workflow_email_subject' => '[sitename]: [name] - Le workflow a été réinitialisé',
 'rewind_workflow_warning' => 'Si vous remonter à l\'état initial du workflow, le log de workflow de ce document sera supprimé et impossible à récupérer.',
-'rm_attrdef' => 'Retirer définition d\'attribut',
+'rm_attrdef' => 'Supprimer la définition d’attribut',
 'rm_attrdefgroup' => 'Supprimer ce groupe d’attributs',
-'rm_attr_value' => '',
+'rm_attr_value' => 'Supprimer la valeur',
 'rm_default_keyword_category' => 'Supprimer la catégorie',
 'rm_document' => 'Supprimer le document',
 'rm_document_category' => 'Supprimer la catégorie',
 'rm_event' => 'Supprimer l’événement',
 'rm_file' => 'Supprimer le fichier',
 'rm_folder' => 'Supprimer le dossier',
-'rm_from_clipboard' => 'Supprimer le dossier du presse-papiers',
+'rm_from_clipboard' => 'Supprimer du presse-papier',
 'rm_group' => 'Supprimer ce groupe',
-'rm_role' => '',
-'rm_transmittal' => '',
-'rm_transmittalitem' => '',
+'rm_role' => 'Supprimer ce rôle',
+'rm_transmittal' => 'Supprimer la transmission',
+'rm_transmittalitem' => 'Supprimer l’élément',
 'rm_user' => 'Supprimer cet utilisateur',
 'rm_user_from_processes' => 'Retirer l’utilisateur des processus',
-'rm_version' => 'Retirer la version',
+'rm_version' => 'Supprimer la version',
 'rm_workflow' => 'Supprimer le Workflow',
 'rm_workflow_action' => 'Supprimer l\'action du Workflow',
 'rm_workflow_state' => 'Supprimer l\'état du Workflow',
@@ -1053,7 +1062,7 @@ URL : [url]',
 'role' => 'Rôle',
 'role_admin' => 'Administrateur',
 'role_guest' => 'Invité',
-'role_info' => '',
+'role_info' => 'Information',
 'role_management' => 'Gestion des rôles',
 'role_name' => 'Nom',
 'role_type' => 'Type de rôle',
@@ -1078,23 +1087,23 @@ URL : [url]',
 'search_in' => 'Rechercher dans',
 'search_mode_and' => 'tous les mots',
 'search_mode_documents' => 'Seulement les documents',
-'search_mode_folders' => 'Seulement les répertoires',
+'search_mode_folders' => 'Seulement les dossiers',
 'search_mode_or' => 'au moins un mot',
 'search_no_results' => 'Aucun document ne correspond à la recherche',
 'search_query' => 'Rechercher',
 'search_report' => '[doccount] documents trouvé(s) et [foldercount] dossiers en [searchtime] sec.',
 'search_report_fulltext' => '[doccount] documents trouvé(s)',
 'search_resultmode' => 'Résultat de la recherche',
-'search_resultmode_both' => 'Documents et répertoires',
+'search_resultmode_both' => 'Documents et dossiers',
 'search_results' => 'Résultats de recherche',
 'search_results_access_filtered' => 'L\'accès à certains résultats de la recherche pourrait être refusé.',
 'search_time' => 'Temps écoulé: [time] sec.',
 'seconds' => 'secondes',
 'selection' => 'Sélection',
-'select_attrdefgrp_show' => '',
+'select_attrdefgrp_show' => 'Choisir quand afficher',
 'select_attribute_value' => 'Sélectionnez la valeur de l’attribut',
 'select_category' => 'Cliquer pour choisir une catégorie',
-'select_group' => '',
+'select_group' => 'Sélectionner un groupe',
 'select_groups' => 'Cliquer pour choisir un groupe',
 'select_grp_approvers' => 'Cliquer pour choisir un groupe d\'approbateur',
 'select_grp_ind_approvers' => 'Cliquer pour choisir un groupe',
@@ -1103,16 +1112,16 @@ URL : [url]',
 'select_grp_ind_reviewers' => 'Cliquer pour choisir un groupe d’examinateurs',
 'select_grp_ind_revisors' => 'Cliquer pour choisir un groupe',
 'select_grp_notification' => 'Cliquer pour sélectionner une notification de groupe',
-'select_grp_recipients' => '',
+'select_grp_recipients' => 'Cliquer pour choisir un groupe de destinataires',
 'select_grp_reviewers' => 'Cliquer pour choisir un groupe d’examinateurs',
-'select_grp_revisors' => '',
+'select_grp_revisors' => 'Cliquer pour choisir un groupe de réviseurs',
 'select_ind_approvers' => 'Cliquer pour choisir un approbateur individuel',
 'select_ind_notification' => 'Cliquer pour sélectionner une notification individuelle',
-'select_ind_recipients' => '',
+'select_ind_recipients' => 'Cliquer pour choisir un destinataire individuel',
 'select_ind_reviewers' => 'Cliquer pour choisir un examinateur individuel',
-'select_ind_revisors' => '',
+'select_ind_revisors' => 'Cliquer pour choisir un réviseur individuel',
 'select_one' => 'Selectionner',
-'select_user' => '',
+'select_user' => 'Sélectionner un utilisateur',
 'select_users' => 'Cliquer pour choisir un utilisateur',
 'select_value' => 'Sélectionner une valeur',
 'select_workflow' => 'Choisir un workflow',
@@ -1127,7 +1136,7 @@ Nom : [username]
 'send_login_data_subject' => '[sitename] : [login] - Vos informations de connexion',
 'send_test_mail' => 'Envoyer un e-mail test',
 'september' => 'Septembre',
-'sequence' => 'Position dans le répertoire',
+'sequence' => 'Position dans le dossier',
 'seq_after' => 'Après "[prevname]"',
 'seq_end' => 'À la fin',
 'seq_keep' => 'Conserver la position',
@@ -1139,10 +1148,10 @@ Nom : [username]
 'settings_adminIP' => 'Admin IP',
 'settings_adminIP_desc' => 'Si activé l\'administrateur ne peut se connecter que par l\'adresse IP spécifiées, laisser vide pour éviter le contrôle. NOTE: fonctionne uniquement avec autentication locale (sans LDAP)',
 'settings_Advanced' => 'Avancé',
-'settings_advancedAcl' => '',
-'settings_advancedAcl_desc' => '',
-'settings_allowReviewerOnly' => '',
-'settings_allowReviewerOnly_desc' => '',
+'settings_advancedAcl' => 'Contrôle d’accès avancé',
+'settings_advancedAcl_desc' => 'Le contrôle d’accès avancé permet d’activer/désactiver certains modules du logiciel. Il ne peut pas être utilisé pour les droits d’accès sur les documents et dossiers.',
+'settings_allowReviewerOnly' => 'Permettre d’affecter l’examinateur uniquement',
+'settings_allowReviewerOnly_desc' => 'Activer cette option pour permettre d’affecter un examinateur mais pas d’approbateur dans le mode de Workflow traditionnel.',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Paramètres d\'authentification',
 'settings_autoLoginUser' => 'Connexion automatique',
@@ -1151,7 +1160,7 @@ Nom : [username]
 'settings_available_languages_desc' => 'Seules les langues sélectionnées seront chargées et proposées dans le sélecteur de langue. La langue par défaut est systématiquement chargée.',
 'settings_backupDir' => 'Répertoire de sauvegarde',
 'settings_backupDir_desc' => 'Répertoire dans lequel l’outil de sauvegarde stocke les sauvegardes. Si aucune valeur n’est définie ou si le répertoire n’est pas accessible, les sauvegardes seront stockées dans le répertoire de contenu.',
-'settings_cacheDir' => 'Dossier Cache',
+'settings_cacheDir' => 'Répertoire Cache',
 'settings_cacheDir_desc' => 'Lieu de stockage des images de prévisualisation (choisir de préférence un dossier non accessible à travers le web-server)',
 'settings_Calendar' => 'Paramètres de l\'agenda',
 'settings_calendarDefaultView' => 'Vue par défaut de l\'agenda',
@@ -1214,26 +1223,26 @@ Nom : [username]
 'settings_enableAcknowledgeWorkflow_desc' => 'Activer cette option pour permettre de confirmer la réception de document dans le workflow.',
 'settings_enableAdminReceipt' => 'Réception de document autorisée par l’administrateur',
 'settings_enableAdminReceipt_desc' => 'Activer cette option pour permettre aux administrateurs d’être listés en tant que destinataires.',
-'settings_enableAdminRevApp' => 'Activer Admin Rev App',
+'settings_enableAdminRevApp' => 'Autoriser vérification/approbation par les administrateurs',
 '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' => 'Activer/Désactiver agenda',
+'settings_enableCalendar_desc' => 'Active/désactive l’agenda',
 'settings_enableClipboard' => 'Activer le presse-papier',
-'settings_enableClipboard_desc' => 'Activer/désactiver le presse-papier',
+'settings_enableClipboard_desc' => 'Active/désactive le presse-papier',
 'settings_enableConverting' => 'Activer conversion des fichiers',
-'settings_enableConverting_desc' => 'Activer/Désactiver la conversion des fichiers',
+'settings_enableConverting_desc' => 'Active/désactive la conversion des fichiers',
 'settings_enableDropFolderList' => 'Activer la liste des fichiers du dossier de dépôt',
 'settings_enableDropFolderList_desc' => 'Affiche un menu avec la liste des fichiers qui se trouvent dans le dossier de dépôt.',
 'settings_enableDropUpload' => 'Activer la publication rapide de documents',
-'settings_enableDropUpload_desc' => 'Activer/Désactiver la zone de glisser/    déposer sur la page d\'un dossier.',
+'settings_enableDropUpload_desc' => 'Active/désactive la zone de glisser-déposer sur la page d’un dossier afin d’y déposer des fichiers.',
 'settings_enableDuplicateDocNames' => 'Autoriser plusieurs documents de même nom',
 'settings_enableDuplicateDocNames_desc' => 'Autorise plusieurs documents de même nom dans un même dossier.',
 'settings_enableEmail' => 'E-mails',
-'settings_enableEmail_desc' => 'Activer/désactiver la notification automatique par E-mail',
+'settings_enableEmail_desc' => 'Active/désactive la notification automatique par e-mail',
 'settings_enableFilterReceipt' => '',
 'settings_enableFilterReceipt_desc' => '',
 'settings_enableFolderTree' => 'Activer l\'arborescence des dossiers',
-'settings_enableFolderTree_desc' => 'False pour ne pas montrer l\'arborescence des dossiers',
+'settings_enableFolderTree_desc' => 'Active/désactive l’arborescence des dossiers sur la page de consultation d’un dossier',
 'settings_enableFullSearch' => 'Activer la recherche plein texte',
 'settings_enableFullSearch_desc' => 'Activer la recherche plein texte (dans le contenu des fichiers).',
 'settings_enableGuestAutoLogin' => 'Activer la connexion automatique pour le compte invité',
@@ -1241,7 +1250,7 @@ Nom : [username]
 'settings_enableGuestLogin' => 'Activer la connexion Invité',
 'settings_enableGuestLogin_desc' => 'Si vous voulez vous connecter en tant qu\'invité, cochez cette option. Remarque: l\'utilisateur invité ne doit être utilisé que dans un environnement de confiance',
 'settings_enableHelp' => 'Activer l\'aide',
-'settings_enableHelp_desc' => 'Activer/Désactiver le lien vers les écrans d\'aide dans le menu',
+'settings_enableHelp_desc' => 'Active/désactive le lien vers les écrans d’aide dans le menu',
 'settings_enableLanguageSelector' => 'Activer la sélection de langue',
 'settings_enableLanguageSelector_desc' => 'Montrer le sélecteur de langue d\'interface après connexion de l\'utilisateur.',
 'settings_enableLargeFileUpload' => 'Activer téléchargement des gros fichiers',
@@ -1262,7 +1271,7 @@ Nom : [username]
 'settings_enableOwnerRevApp_desc' => 'Activer cette option pour ajouter le propriétaire du document à la liste des examinateurs/approbateurs et pour les transitions de workflow.',
 'settings_enablePasswordForgotten' => 'Activer Mot de passe oublié',
 'settings_enablePasswordForgotten_desc' => 'Si vous voulez permettre à l\'utilisateur de définir un nouveau mot de passe et l\'envoyer par mail, cochez cette option.',
-'settings_enableRecursiveCount' => 'Décompte de documents/répertoires recursif',
+'settings_enableRecursiveCount' => 'Décompte récursif des documents/dossiers',
 'settings_enableRecursiveCount_desc' => 'Si activé, le nombre de documents et répertoires dans un répertoire est calculé en comptant récursivement le contenu des sous-répertoires auxquels l\'utilisateur a accès.',
 'settings_enableRevisionWorkflow' => 'Activer la révision des documents',
 'settings_enableRevisionWorkflow_desc' => 'Activer afin de pouvoir lancer un flux de travail pour réviser un document après une période donnée.',
@@ -1273,19 +1282,19 @@ Nom : [username]
 'settings_enableSessionList' => 'Activer la liste des utilisateurs en ligne',
 'settings_enableSessionList_desc' => 'Affiche un menu avec la liste des utilisateurs connectés.',
 'settings_enableThemeSelector' => 'Sélection du thème',
-'settings_enableThemeSelector_desc' => 'Activer/désactiver le sélecteur de thème sur la page de connexion.',
+'settings_enableThemeSelector_desc' => 'Active/désactive le sélecteur de thème sur la page de connexion.',
 'settings_enableUpdateReceipt' => 'Réception de document modifiable',
 'settings_enableUpdateReceipt_desc' => 'Activer cette option pour permettre à l’utilisateur qui a accusé une réception de modifier sa décision.',
 'settings_enableUpdateRevApp' => 'Autoriser la modification des vérifications/approbations existantes',
 'settings_enableUpdateRevApp_desc' => 'A activer si l\'utilisateur qui a fait la révision/approbations peut changer sa position alors que l\'étape actuelle du processus n\'est pas terminée',
-'settings_enableUserImage' => 'Activer image utilisateurs',
-'settings_enableUserImage_desc' => 'Activer les images utilisateurs',
+'settings_enableUserImage' => 'Activer images utilisateurs',
+'settings_enableUserImage_desc' => 'Active/désactive les images des utilisateurs',
 'settings_enableUsersView' => 'Activer Vue des Utilisateurs',
-'settings_enableUsersView_desc' => 'Activer/désactiver la vue des groupes et des utilisateur pour tous les utilisateurs',
+'settings_enableUsersView_desc' => 'Active/désactive la liste des groupes et utilisateurs pour tous les utilisateurs',
 'settings_enableVersionDeletion' => 'Suppression des versions précédentes',
-'settings_enableVersionDeletion_desc' => 'Activer/désactiver la suppression de versions antérieures du documents par les utilisateurs normaux. L\'administrateur peut toujours supprimer les anciennes versions.',
+'settings_enableVersionDeletion_desc' => 'Active/désactive la suppression des versions antérieures de documents par les utilisateurs normaux. L’administrateur peut toujours supprimer les anciennes versions.',
 'settings_enableVersionModification' => 'Modification des versions',
-'settings_enableVersionModification_desc' => 'Activer/désactiver la modification d\'une des versions de documents par les utilisateurs normaux après qu\'une version ait été téléchargée. l\'administrateur peut toujours modifier la version après le téléchargement.',
+'settings_enableVersionModification_desc' => 'Active/désactive la modification de version d’un document par les utilisateurs normaux après le dépôt. L’administrateur peut toujours modifier la version après le dépôt.',
 'settings_encryptionKey' => 'Clé de cryptage',
 'settings_encryptionKey_desc' => 'Cette chaîne est utilisée pour créer un identifiant unique étant ajouté comme champ masqué à un formulaire afin de prévenir des attaques CSRF.',
 'settings_error' => 'Erreur',
@@ -1307,7 +1316,7 @@ 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_httpRoot' => 'Http Root',
+'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',
 'settings_incItemsPerPage_desc' => 'Si le nombre de dossiers et de documents est limité, le nombre d\'objets supplémentaires chargés sera défini lors du défilement vers le bas de la page du dossier d\'affichage. Mettre à 0, chargera le même nombre d\'objets qu\'a été initialement chargé.',
@@ -1325,10 +1334,10 @@ Nom : [username]
 'settings_install_zendframework' => 'Installez Zend Framework si vous avez l’intention d’utiliser le moteur de recherche plein texte basé sur Zend. Sinon, continuez l’installation en ignorant ce message.',
 'settings_language' => 'Langue par défaut',
 'settings_language_desc' => 'Langue par défaut (nom d\'un sous-dossier dans le dossier "languages")',
-'settings_libraryFolder' => '',
-'settings_libraryFolder_desc' => '',
+'settings_libraryFolder' => 'Dossier bibliothèque',
+'settings_libraryFolder_desc' => 'Dossier dans lequel les documents peuvent être copiés pour en créer de nouveaux.',
 'settings_logFileEnable' => 'Fichier journal activé',
-'settings_logFileEnable_desc' => 'Activer/désactiver le fichier journal',
+'settings_logFileEnable_desc' => 'Active/désactive le fichier journal',
 'settings_logFileRotation' => 'Rotation fichier journal',
 'settings_logFileRotation_desc' => 'Rotation fichier journal',
 'settings_loginFailure' => 'Max. échecs de connexion',
@@ -1352,7 +1361,7 @@ Nom : [username]
 'settings_more_settings' => 'Configurer d\'autres paramètres. Connexion par défaut: admin/admin',
 'settings_notfound' => 'Introuvable',
 'settings_Notification' => 'Notifications',
-'settings_notwritable' => 'La configuration ne peut pas être enregistré car le fichier de configuration n\'est pas accessible en écriture.',
+'settings_notwritable' => 'La configuration ne peut pas être enregistrée car le fichier de configuration n’est pas accessible en écriture.',
 'settings_no_content_dir' => 'Répertoire de contenu',
 '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.',
@@ -1400,7 +1409,7 @@ Nom : [username]
 'settings_SaveError' => 'Erreur de sauvegarde du fichier de configuration',
 'settings_Server' => 'Paramètres serveur',
 'settings_showFullPreview' => 'Visualisation complète du document',
-'settings_showFullPreview_desc' => 'Activer/désactiver l’aperçu du document sur la page de détails (si le navigateur le permet).',
+'settings_showFullPreview_desc' => 'Active/désactive la prévisualisation du document sur la page des détails (si le navigateur le permet).',
 'settings_showMissingTranslations' => 'Afficher les traductions manquantes',
 'settings_showMissingTranslations_desc' => 'Lister toutes les traductions manquantes de la page dans le bas de la page. L\'utilisateur connecté pourra proposer une traduction manquante qui sera sauvegardée dans un fichier CSV. Ne pas activer cette fonction en production.',
 'settings_showSingleSearchHit' => 'Aller au document en cas de résultat unique',
@@ -1461,7 +1470,7 @@ Nom : [username]
 'settings_workflowMode_valtraditional_only_approval' => 'traditionnel (sans revue)',
 'settings_zendframework' => 'Zend Framework',
 'set_expiry' => 'Modifier la date d\'expiration',
-'set_owner' => 'Sélection du propriétaire',
+'set_owner' => 'Définir le propriétaire',
 'set_owner_error' => 'Erreur lors de la définition du propriétaire',
 'set_password' => 'Définir mot de passe',
 'set_workflow' => 'Définir le Workflow',
@@ -1472,61 +1481,61 @@ Nom : [username]
 'sk_SK' => 'Slovaque',
 'space_used_on_data_folder' => 'Espace utilisé dans le répertoire de données',
 'splash_added_to_clipboard' => 'Ajouté au presse-papier',
-'splash_add_access' => '',
+'splash_add_access' => 'Droits d’accès ajoutés',
 'splash_add_attribute' => 'Attribut ajouté',
 'splash_add_group' => 'Nouveau groupe ajouté',
 'splash_add_group_member' => 'Nouveau membre ajouté au groupe',
 'splash_add_role' => 'Nouveau rôle ajouté',
-'splash_add_to_transmittal' => '',
-'splash_add_transmittal' => '',
+'splash_add_to_transmittal' => 'Ajouter à la transmission',
+'splash_add_transmittal' => 'Ajouté à la transmission',
 'splash_add_user' => 'Nouvel utilisateur ajouté',
 'splash_cleared_cache' => 'Cache vidé',
 'splash_cleared_clipboard' => 'Presse-papier vidé',
-'splash_delete_access' => '',
+'splash_delete_access' => 'Droits d’accès supprimés',
 'splash_document_added' => 'Document ajouté',
 'splash_document_checkedout' => 'Document bloqué',
 'splash_document_edited' => 'Document sauvegardé',
 'splash_document_indexed' => 'Document « [name] » indexé.',
-'splash_document_locked' => 'Document vérouillé',
+'splash_document_locked' => 'Document verrouillé',
 'splash_document_unlocked' => 'Document déverrouillé',
-'splash_edit_access' => '',
+'splash_edit_access' => 'Droits d’accès modifiés',
 'splash_edit_attribute' => 'Attribut modifié',
 'splash_edit_event' => 'Événement modifié',
 'splash_edit_group' => 'Groupe modifié',
 'splash_edit_role' => 'Rôle modifié',
 'splash_edit_user' => 'Utilisateur modifié',
-'splash_error_add_to_transmittal' => '',
+'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_send_download_link' => 'Erreur lors de l’envoi du lien de téléchargement',
 'splash_folder_edited' => 'Dossier modifié',
 'splash_importfs' => '[docs] documents et [folders] dossiers importés',
-'splash_inherit_access' => '',
+'splash_inherit_access' => 'Droits d’accès hérités',
 'splash_invalid_folder_id' => 'Identifiant de répertoire invalide',
 'splash_invalid_searchterm' => 'Recherche invalide',
-'splash_moved_clipboard' => 'Presse-papier déplacé dans le répertoire courant',
+'splash_moved_clipboard' => 'Contenu du presse-papier déplacé vers le dossier courant',
 'splash_move_document' => 'Document déplacé',
 'splash_move_folder' => 'Dossier déplacé',
-'splash_notinherit_access' => '',
+'splash_notinherit_access' => 'Les droits d’accès ne sont plus hérités',
 'splash_receipt_update_success' => 'Réception ajoutée avec succès',
-'splash_removed_from_clipboard' => 'Enlevé du presse-papiers',
+'splash_removed_from_clipboard' => 'Supprimé du presse-papier',
 'splash_rm_attribute' => 'Attribut supprimé',
-'splash_rm_attr_value' => '',
+'splash_rm_attr_value' => 'Valeur d’attribut retirée',
 'splash_rm_document' => 'Document supprimé',
 'splash_rm_download_link' => 'Lien de téléchargement supprimé',
 'splash_rm_folder' => 'Dossier supprimé',
 'splash_rm_group' => 'Groupe supprimé',
 'splash_rm_group_member' => 'Membre retiré du groupe',
 'splash_rm_role' => 'Rôle supprimé',
-'splash_rm_transmittal' => '',
+'splash_rm_transmittal' => 'Transmission supprimée',
 'splash_rm_user' => 'Utilisateur supprimé',
 'splash_rm_user_processes' => 'Utilisateur retiré de tous les processus',
 'splash_saved_file' => 'Version enregistrée',
 'splash_save_user_data' => 'Données utilisateur enregistrées',
 'splash_send_download_link' => 'Lien de téléchargement envoyé par e-mail',
 'splash_send_login_data' => 'Informations de connexion envoyées',
-'splash_setowner' => '',
+'splash_setowner' => 'Nouveau propriétaire défini',
 'splash_settings_saved' => 'Configuration sauvegardée',
-'splash_set_default_access' => '',
+'splash_set_default_access' => 'Droits d’accès par défaut définis',
 'splash_substituted_user' => 'Utilisateur de substitution',
 'splash_switched_back_user' => 'Revenu à l\'utilisateur initial',
 'splash_toogle_group_manager' => 'Responsable de groupe changé',
@@ -1538,21 +1547,21 @@ Nom : [username]
 'status_approval_rejected' => 'Ébauche rejetée',
 'status_approved' => 'Approuvé',
 'status_approver_removed' => 'Approbateur retiré du processus',
-'status_needs_correction' => '',
+'status_needs_correction' => 'Nécessite une correction',
 'status_not_approved' => 'Non approuvé',
 'status_not_receipted' => 'Pas encore réceptionné',
 'status_not_reviewed' => 'Non vérifié',
-'status_not_revised' => '',
+'status_not_revised' => 'Non révisé',
 'status_receipted' => 'Réceptionné',
 'status_receipt_rejected' => 'Rejeté',
 'status_recipient_removed' => 'Destinataire retiré de la liste',
 'status_reviewed' => 'Vérifié',
 'status_reviewer_rejected' => 'Ébauche rejetée',
 'status_reviewer_removed' => 'Examinateur retiré du processus',
-'status_revised' => '',
+'status_revised' => 'Révisé',
 'status_revision_rejected' => 'Rejeté',
 'status_revision_sleeping' => 'en attente',
-'status_revisor_removed' => '',
+'status_revisor_removed' => 'Réviseur retiré de la liste',
 'status_unknown' => 'Inconnu',
 'storage_size' => 'Taille occupée',
 'submit_2_fact_auth' => 'Enregistrer la clé secrète',
@@ -1592,7 +1601,7 @@ Nom : [username]
 'timeline_add_version' => 'Nouvelle version ([version])',
 'timeline_full_add_file' => '[document]<br />Nouveau fichier attaché',
 'timeline_full_add_version' => '[document]<br />Nouvelle version ([version])',
-'timeline_full_scheduled_revision' => '',
+'timeline_full_scheduled_revision' => '[document]<br />Révision de la version [version]',
 'timeline_full_status_change' => '[document]<br />Version [version] : [status]',
 'timeline_scheduled_revision' => '',
 'timeline_selected_item' => 'Document sélectionné',
@@ -1614,9 +1623,9 @@ Nom : [username]
 'transfer_document' => 'Transférer le document',
 'transfer_no_read_access' => 'L’utilisateur n’a pas le droit de lecture dans ce dossier',
 'transfer_no_write_access' => 'L’utilisateur n’a pas le droit d’écriture dans ce dossier',
-'transfer_objects' => 'Transférer des objets',
+'transfer_objects' => 'Transférer les objets',
 'transfer_objects_to_user' => 'Nouveau propriétaire',
-'transfer_to_user' => 'Transférer vers un utilisateur',
+'transfer_to_user' => 'Transférer à l’utilisateur',
 'transition_triggered_email' => 'Transition de workflow activé',
 'transition_triggered_email_body' => 'Transition de workflow déclenchée
 Document : [name]
@@ -1629,9 +1638,9 @@ Dossier parent : [folder_path]
 Utilisateur : [username]
 URL : [url]',
 'transition_triggered_email_subject' => '[sitename] : [name] - Transition de workflow déclenchée',
-'transmittal' => '',
-'transmittalitem_removed' => '',
-'transmittalitem_updated' => '',
+'transmittal' => 'Transmission',
+'transmittalitem_removed' => 'Élément de la transmission supprimé',
+'transmittalitem_updated' => 'Élément de la transmission mis à jour',
 'transmittal_comment' => 'Commentaire',
 'transmittal_name' => 'Nom',
 'transmittal_size' => 'Taille',
@@ -1668,7 +1677,7 @@ URL : [url]',
 'update_recipients' => 'Mettre à jour la liste des destinataires',
 'update_reviewers' => 'Mettre à jour la liste des examinateurs',
 'update_revisors' => '',
-'update_transmittalitem' => '',
+'update_transmittalitem' => 'Mettre à jour l’élément',
 'uploaded_by' => 'Déposé par',
 'uploading_failed' => 'Dépôt d\'un des documents échoué. Veuillez vérifier la taille d\'envoi maximale autorisée.',
 'uploading_maxsize' => 'La taille du fichier dépasse la limite maximale autorisée.',
@@ -1705,7 +1714,7 @@ Dossier parent: [folder_path]
 Utilisateur: [username]
 URL: [url]',
 'version_deleted_email_subject' => '[sitename]: [name] - Version supprimée',
-'version_info' => 'Informations de versions',
+'version_info' => 'Informations de version',
 'view' => 'Aperçu',
 'view_online' => 'Aperçu en ligne',
 'warning' => 'Avertissement',
@@ -1714,7 +1723,7 @@ URL: [url]',
 'weeks' => 'semaines',
 'week_view' => 'Vue par semaine',
 'workflow' => 'Workflow',
-'workflows_involded' => '',
+'workflows_involded' => 'Impliqué dans un Workflow',
 'workflow_actions_management' => 'Gestion des actions de workflow',
 'workflow_action_in_use' => 'Cette action est actuellement utilisée par des workflows.',
 'workflow_action_name' => 'Nom',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 79890e215..f589390ef 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -338,6 +338,7 @@ Internet poveznica: [url]',
 'documents_to_revise' => 'Dokumenti za reviziju',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
+'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
 'documents_user_reception' => '',
@@ -796,6 +797,7 @@ Internet poveznica: [url]',
 'no_default_keywords' => 'Nema dostupnih ključnih riječi',
 'no_docs_checked_out' => 'Niti jedan dokument nije odjavljen',
 'no_docs_locked' => 'Nema zaključanih dokumenata.',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => '',
 'no_docs_to_approve' => 'Trenutno nema dokumenata koji zahtjevaju odobrenje.',
 'no_docs_to_look_at' => 'Nema dokumenata na koje treba obratiti pozornost.',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index b9473d5d6..f36a4fc22 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -333,6 +333,7 @@ URL: [url]',
 'documents_to_revise' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
+'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
 'documents_user_reception' => '',
@@ -792,6 +793,7 @@ URL: [url]',
 'no_default_keywords' => 'Nincsenek elérhető kulcsszavak',
 'no_docs_checked_out' => '',
 'no_docs_locked' => 'Nincsenek zárolt dokumentumok.',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => '',
 'no_docs_to_approve' => 'Nincsenek jóváhagyandó dokumentumok.',
 'no_docs_to_look_at' => 'Nincs karbantartást igénylő dokumentum.',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 9069bf78b..ed8a2d1d0 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -339,6 +339,7 @@ URL: [url]',
 'documents_to_revise' => 'Documenti da revisionare.',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
+'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
 'documents_user_reception' => '',
@@ -798,6 +799,7 @@ URL: [url]',
 'no_default_keywords' => 'Nessuna parola-chiave disponibile',
 'no_docs_checked_out' => 'Nessun documento approvato',
 'no_docs_locked' => 'Nessun documento bloccato.',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => 'Nessun documento rifiutato',
 'no_docs_to_approve' => 'Non ci sono documenti che richiedano approvazione.',
 'no_docs_to_look_at' => 'Non ci sono documenti che richiedano attenzione.',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 1c05c75d8..1e61747fc 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -341,6 +341,7 @@ URL: [url]',
 'documents_to_revise' => '문서 정정',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
+'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
 'documents_user_reception' => '',
@@ -798,6 +799,7 @@ URL : [url]',
 'no_default_keywords' => '사용 가능한 키워드가 존재하지 않습니다.',
 'no_docs_checked_out' => '체크아웃 문서가 없습니다.',
 'no_docs_locked' => '잠긴 문서가 없습니다.',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => '',
 'no_docs_to_approve' => '승인이 필요한 문서가 현재 없습니다.',
 'no_docs_to_look_at' => '.주의가 필요한 문서가 현재 없습니다',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index e2d15872b..dd6ce0e76 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -331,6 +331,7 @@ URL: [url]',
 'documents_to_revise' => 'Te reviseren documenten',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
+'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
 'documents_user_reception' => 'Documenten wachten op bestemming',
@@ -796,6 +797,7 @@ URL: [url]',
 'no_default_keywords' => 'Geen Sleutelwoorden beschikbaar',
 'no_docs_checked_out' => 'Geen documenten in gebruik genomen',
 'no_docs_locked' => 'Geen documenten in gebruik.',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => 'Geen documenten geweigerd',
 'no_docs_to_approve' => 'Er zijn momenteel geen documenten die goedkeuring behoeven.',
 'no_docs_to_look_at' => 'Geen documenten die aandacht behoeven.',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index d2d2e5be0..36a73b3d6 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -326,6 +326,7 @@ URL: [url]',
 'documents_to_revise' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
+'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
 'documents_user_reception' => '',
@@ -785,6 +786,7 @@ URL: [url]',
 'no_default_keywords' => 'Nie ma słów kluczowych',
 'no_docs_checked_out' => '',
 'no_docs_locked' => 'Brak zablokowanych dokumentów.',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => '',
 'no_docs_to_approve' => 'Aktualnie nie ma dokumentów wymagających akceptacji.',
 'no_docs_to_look_at' => 'Brak dokumentów wymagających uwagi.',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index dfc432f4f..1387a841a 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -333,6 +333,7 @@ URL: [url]',
 'documents_to_revise' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
+'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
 'documents_user_reception' => '',
@@ -790,6 +791,7 @@ URL: [url]',
 'no_default_keywords' => 'não há palavras-chave disponíveis',
 'no_docs_checked_out' => '',
 'no_docs_locked' => 'Nenhum documento bloqueado.',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => '',
 'no_docs_to_approve' => 'There are currently no documents that require approval.',
 'no_docs_to_look_at' => 'Não há documentos que precisam de atenção.',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index eb841e464..d68fd006b 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -338,6 +338,7 @@ URL: [url]',
 'documents_to_revise' => 'Documente de revizut',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
+'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
 'documents_user_reception' => '',
@@ -797,6 +798,7 @@ URL: [url]',
 'no_default_keywords' => 'Nu există cuvinte cheie disponibile',
 'no_docs_checked_out' => 'Nu exista documente verificate',
 'no_docs_locked' => 'Nici un document blocat.',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => '',
 'no_docs_to_approve' => 'Momentan nu există documente care necesită aprobarea.',
 'no_docs_to_look_at' => 'Nici un document care necesită atenție.',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 76b8e5ecb..8e9bd3fd5 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -338,6 +338,7 @@ URL: [url]',
 'documents_to_revise' => 'Документы на ревизии',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
+'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
 'documents_user_reception' => '',
@@ -796,6 +797,7 @@ URL: [url]',
 'no_default_keywords' => 'Нет меток',
 'no_docs_checked_out' => 'Нет документов на рассмотрении',
 'no_docs_locked' => 'Нет заблокированных документов',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => 'Нет отклоненных докуметов',
 'no_docs_to_approve' => 'Нет документов, нуждающихся в утверждении',
 'no_docs_to_look_at' => 'Нет документов, нуждающихся во внимании',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 894d75dfc..5c8afcd31 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -315,6 +315,7 @@ URL: [url]',
 'documents_to_revise' => 'Dokumenty čakajúce na vašu revíziu',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
+'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
 'documents_user_reception' => 'Dokumenty čakajúce na prijatie',
@@ -696,6 +697,7 @@ URL: [url]',
 'no_default_keywords' => 'Nie sú dostupné žiadne kľúčové slová.',
 'no_docs_checked_out' => '',
 'no_docs_locked' => '',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => 'Žiadne dokumenty neboli zamietnuté.',
 'no_docs_to_approve' => 'Momentálne neexistujú žiadne dokumenty, ktoré vyžadujú schválenie.',
 'no_docs_to_look_at' => 'Žiadne dokumenty, ktoré potrebujú pozornosť.',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 42cc738ca..75fbe0033 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -339,6 +339,7 @@ URL: [url]',
 'documents_to_revise' => 'Dokument som väntar på din granskning',
 'documents_user_draft' => '',
 'documents_user_expiration' => 'Utgångna dokument',
+'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
 'documents_user_reception' => 'Dokument som väntar på mottagande',
@@ -810,6 +811,7 @@ URL: [url]',
 'no_default_keywords' => 'Inga nyckelord tillgängliga',
 'no_docs_checked_out' => 'Inga utcheckade dokument',
 'no_docs_locked' => 'Inga låsta dokument.',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => 'Det finns inga avvisade dokument.',
 'no_docs_to_approve' => 'Det finns inga dokument som behöver godkännas.',
 'no_docs_to_look_at' => 'Det finns inga dokument som behöver godkännas eller granskas.',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 263b0d26e..90f5428cf 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -332,6 +332,7 @@ URL: [url]',
 'documents_to_revise' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
+'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
 'documents_user_reception' => '',
@@ -791,6 +792,7 @@ URL: [url]',
 'no_default_keywords' => 'Anahtar kelime yok',
 'no_docs_checked_out' => '',
 'no_docs_locked' => 'Kilitli doküman yok.',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => '',
 'no_docs_to_approve' => 'Şu anda onay bekleyen doküman yok.',
 'no_docs_to_look_at' => 'Dikkat edilmesi gereken bir doküman yok.',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 8c39e0228..fb1e89480 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -338,6 +338,7 @@ URL: [url]',
 'documents_to_revise' => 'Документи для повторного розгляду',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
+'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
 'documents_user_reception' => '',
@@ -796,6 +797,7 @@ URL: [url]',
 'no_default_keywords' => 'Немає ключових слів',
 'no_docs_checked_out' => 'Немає документів на опрацюванні',
 'no_docs_locked' => 'Немає заблокованих документів',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => '',
 'no_docs_to_approve' => 'Немає документів, які потребують затвердження',
 'no_docs_to_look_at' => 'Немає документів, які потребують уваги',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 55c96ee17..7cd51bf58 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -334,6 +334,7 @@ URL: [url]',
 'documents_to_revise' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
+'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
 'documents_user_reception' => '',
@@ -795,6 +796,7 @@ URL: [url]',
 'no_default_keywords' => '无关键字',
 'no_docs_checked_out' => '文档未签出',
 'no_docs_locked' => '无锁定的文档',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => '',
 'no_docs_to_approve' => '当前没有需要审核的文档',
 'no_docs_to_look_at' => '没有需要关注的文档',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index c4946dad7..412434db5 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -315,6 +315,7 @@ URL: [url]',
 'documents_to_revise' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
+'documents_user_needs_correction' => '',
 'documents_user_no_reception' => '',
 'documents_user_obsolete' => '',
 'documents_user_reception' => '',
@@ -696,6 +697,7 @@ URL: [url]',
 'no_default_keywords' => '無關鍵字',
 'no_docs_checked_out' => '',
 'no_docs_locked' => '無鎖定的文檔',
+'no_docs_needs_correction' => '',
 'no_docs_rejected' => '',
 'no_docs_to_approve' => '當前沒有需要審核的文檔',
 'no_docs_to_look_at' => '沒有需要關注的文檔',

From 7e4514c450d75330a26802abe03fc47ae262afb6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Mar 2018 12:21:22 +0100
Subject: [PATCH 006/147] onPreRemoveDocument hook returns when return value is
 a boolean

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

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index cdd5ca03f..6d9108b5d 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2189,7 +2189,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		if(isset($this->_dms->callbacks['onPreRemoveDocument'])) {
 			foreach($this->_dms->callbacks['onPreRemoveDocument'] as $callback) {
 				$ret = call_user_func($callback[0], $callback[1], $this);
-				if($ret === false)
+				if(is_bool($ret))
 					return $ret;
 			}
 		}

From cfec7323d7229f379a3d3e98f9770bba74e22cb8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Mar 2018 12:22:35 +0100
Subject: [PATCH 007/147] add hooks on[Post|Pre]RemoveFromDatabaseFolder

on[Post|Pre]RemoveFolder is called before and after any removal
---
 SeedDMS_Core/Core/inc.ClassFolder.php | 34 +++++++++++++++++++++------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index b7b29500b..b6ff9e035 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -967,8 +967,8 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		$db = $this->_dms->getDB();
 
 		/* Check if 'onPreRemoveFolder' callback is set */
-		if(isset($this->_dms->callbacks['onPreRemoveFolder'])) {
-			foreach($this->_dms->callbacks['onPreRemoveFolder'] as $callback) {
+		if(isset($this->_dms->callbacks['onPreRemoveFromDatabaseFolder'])) {
+			foreach($this->_dms->callbacks['onPreRemoveFromDatabaseFolder'] as $callback) {
 				$ret = call_user_func($callback[0], $callback[1], $this);
 				if(is_bool($ret))
 					return $ret;
@@ -1008,10 +1008,10 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		$db->commitTransaction();
 
 		/* Check if 'onPostRemoveFolder' callback is set */
-		if(isset($this->_dms->callbacks['onPostRemoveFolder'])) {
-			foreach($this->_dms->callbacks['onPostRemoveFolder'] as $callback) {
-					/** @noinspection PhpStatementHasEmptyBodyInspection */
-					if(!call_user_func($callback[0], $callback[1], $this->_id)) {
+		if(isset($this->_dms->callbacks['onPostRemoveFromDatabaseFolder'])) {
+			foreach($this->_dms->callbacks['onPostRemoveFromDatabaseFolder'] as $callback) {
+				/** @noinspection PhpStatementHasEmptyBodyInspection */
+				if(!call_user_func($callback[0], $callback[1], $this->_id)) {
 				}
 			}
 		}
@@ -1035,6 +1035,15 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 			return false;
 		}
 
+		/* Check if 'onPreRemoveFolder' callback is set */
+		if(isset($this->_dms->callbacks['onPreRemoveFolder'])) {
+			foreach($this->_dms->callbacks['onPreRemoveFolder'] as $callback) {
+				$ret = call_user_func($callback[0], $callback[1], $this);
+				if(is_bool($ret))
+					return $ret;
+			}
+		}
+
 		//Entfernen der Unterordner und Dateien
 		$res = $this->getSubFolders();
 		if (is_bool($res) && !$res) return false;
@@ -1055,7 +1064,18 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 			}
 		}
 
-		return $this->removeFromDatabase();
+		$ret = $this->removeFromDatabase();
+		if(!$ret)
+			return $ret;
+
+		/* Check if 'onPostRemoveFolder' callback is set */
+		if(isset($this->_dms->callbacks['onPostRemoveFolder'])) {
+			foreach($this->_dms->callbacks['onPostRemoveFolder'] as $callback) {
+				call_user_func($callback[0], $callback[1], $this);
+			}
+		}
+
+		return $ret;
 	} /* }}} */
 
 	/**

From cf64a440da76fe02674150894fe657e07f86ebbd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Mar 2018 12:24:59 +0100
Subject: [PATCH 008/147] init $indexconf

---
 op/op.RemoveDocument.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/op/op.RemoveDocument.php b/op/op.RemoveDocument.php
index afdcceb8b..be3f53b5e 100644
--- a/op/op.RemoveDocument.php
+++ b/op/op.RemoveDocument.php
@@ -62,6 +62,7 @@ if($settings->_enableFullSearch) {
 	$indexconf['Indexer']::init($settings->_stopWordsFile);
 } else {
 	$index = null;
+	$indexconf = null;
 }
 
 $folder = $document->getFolder();

From 7f0a8d1094225c40c1412928be713dc759432983 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Mar 2018 12:25:16 +0100
Subject: [PATCH 009/147] no need to include Init.php twice

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

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index db700478a..7f9a6da89 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -22,7 +22,6 @@ include("../inc/inc.Utils.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
-include("../inc/inc.Init.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassNotificationService.php");
 include("../inc/inc.ClassEmailNotify.php");

From f5f28d9e30e445b5992959bf42e09e250115339c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Mar 2018 12:35:06 +0100
Subject: [PATCH 010/147] use controller and check for extensions

---
 utils/adddoc.php | 135 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 102 insertions(+), 33 deletions(-)

diff --git a/utils/adddoc.php b/utils/adddoc.php
index 80c92386a..2564f6764 100644
--- a/utils/adddoc.php
+++ b/utils/adddoc.php
@@ -1,5 +1,9 @@
 <?php
-include("../inc/inc.ClassSettings.php");
+if(isset($_SERVER['SEEDDMS_HOME'])) {
+	ini_set('include_path', $_SERVER['SEEDDMS_HOME'].'/utils'. PATH_SEPARATOR .ini_get('include_path'));
+} else {
+	ini_set('include_path', dirname($argv[0]). PATH_SEPARATOR .ini_get('include_path'));
+}
 
 function usage() { /* {{{ */
 	echo "Usage:\n";
@@ -51,15 +55,16 @@ if(isset($options['v']) || isset($options['verѕion'])) {
 
 /* Set alternative config file */
 if(isset($options['config'])) {
-	$settings = new Settings($options['config']);
+	define('SEEDDMS_CONFIG_FILE', $options['config']);
+//	$settings = new Settings($options['config']);
 } else {
-	$settings = new Settings();
+//	$settings = new Settings();
 }
 
-if(isset($settings->_extraPath))
-	ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path'));
+//if(isset($settings->_extraPath))
+//	ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path'));
 
-require_once("SeedDMS/Core.php");
+//require_once("SeedDMS/Core.php");
 
 if(isset($options['F'])) {
 	$folderid = (int) $options['F'];
@@ -119,18 +124,26 @@ if(isset($options['V'])) {
 if($reqversion<1)
 	$reqversion=1;
 
-$db = new SeedDMS_Core_DatabaseAccess($settings->_dbDriver, $settings->_dbHostname, $settings->_dbUser, $settings->_dbPass, $settings->_dbDatabase);
-$db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostname . "\"");
+include("../inc/inc.Settings.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassNotificationService.php");
+include("../inc/inc.ClassEmailNotify.php");
+include("../inc/inc.ClassController.php");
+
+//$db = new SeedDMS_Core_DatabaseAccess($settings->_dbDriver, $settings->_dbHostname, $settings->_dbUser, $settings->_dbPass, $settings->_dbDatabase);
+//$db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostname . "\"");
 //$db->_conn->debug = 1;
 
 
-$dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
-if(!$dms->checkVersion()) {
-	echo "Database update needed.";
-	exit;
-}
+//$dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
+//if(!$dms->checkVersion()) {
+//	echo "Database update needed.";
+//	exit;
+//}
 
-/* Parse categories */
+/* Parse categories {{{ */
 $categories = array();
 if(isset($options['K'])) {
 	$categorynames = explode(',', $options['K']);
@@ -142,9 +155,9 @@ if(isset($options['K'])) {
 			echo "Category '".$categoryname."' not found\n";
 		}
 	}
-}
+} /* }}} */
 
-/* Parse document attributes.  */
+/* Parse document attributes. {{{ */
 $document_attributes = array();
 if (isset($options['a'])) {
 	$docattr = array();
@@ -168,9 +181,9 @@ if (isset($options['a'])) {
 		}
 		$document_attributes[$attrdef->getID()] = $attrVal;
 	}
-}
+} /* }}} */
 
-/* Parse version attributes.  */
+/* Parse version attributes. {{{ */
 $version_attributes = array();
 if (isset($options['A'])) {
 	$verattr = array();
@@ -194,15 +207,9 @@ if (isset($options['A'])) {
 		}
 		$version_attributes[$attrdef->getID()] = $attrVal;
 	}
-}
+} /* }}} */
 
-
-$dms->setRootFolderID($settings->_rootFolderID);
-$dms->setMaxDirID($settings->_maxDirID);
-$dms->setEnableConverting($settings->_enableConverting);
-$dms->setViewOnlineFileTypes($settings->_viewOnlineFileTypes);
-
-/* Create a global user object */
+/* Create a global user object {{{ */
 if($username) {
 	if(!($user = $dms->getUserByLogin($username))) {
 		echo "No such user '".$username."'.";
@@ -211,6 +218,34 @@ if($username) {
 } else
 	$user = $dms->getUser(1);
 
+$dms->setUser($user);
+/* }}} */
+
+/* Create a global notifier object {{{ */
+$notifier = new SeedDMS_NotificationService();
+
+if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
+	foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
+		if(method_exists($notificationObj, 'preAddService')) {
+			$notificationObj->preAddService($dms, $notifier);
+		}
+	}
+}
+
+if($settings->_enableEmail) {
+	$notifier->addService(new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword));
+}
+
+if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
+	foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
+		if(method_exists($notificationObj, 'postAddService')) {
+			$notificationObj->postAddService($dms, $notifier);
+		}
+	}
+}
+/* }}} */
+
+/* Check if file is readable {{{ */
 if(is_readable($filename)) {
 	if(filesize($filename)) {
 		$finfo = new finfo(FILEINFO_MIME_TYPE);
@@ -226,6 +261,7 @@ if(is_readable($filename)) {
 	echo "File is not readable\n";
 	exit(1);
 }
+/* }}} */
 
 $folder = $dms->getFolder($folderid);
 
@@ -244,7 +280,6 @@ if (!is_numeric($sequence)) {
 	exit(1);
 }
 
-//$expires = ($_POST["expires"] == "true") ? mktime(0,0,0, sanitizeString($_POST["expmonth"]), sanitizeString($_POST["expday"]), sanitizeString($_POST["expyear"])) : false;
 $expires = false;
 
 if(!$name)
@@ -254,13 +289,47 @@ $filetmp = $filename;
 $reviewers = array();
 $approvers = array();
 
-$res = $folder->addDocument($name, $comment, $expires, $user, $keywords,
-                            $categories, $filetmp, basename($filename),
-                            $filetype, $mimetype, $sequence, $reviewers,
-                            $approvers, $reqversion, $version_comment,
-                            $document_attributes, $version_attributes);
+if($settings->_enableFullSearch) {
+	$index = $indexconf['Indexer']::open($settings->_luceneDir);
+	$indexconf['Indexer']::init($settings->_stopWordsFile);
+} else {
+	$index = null;
+	$indexconf = null;
+}
 
-if (is_bool($res) && !$res) {
+$controller = Controller::factory('AddDocument');
+$controller->setParam('documentsource', 'script');
+$controller->setParam('folder', $folder);
+$controller->setParam('index', $index);
+$controller->setParam('indexconf', $indexconf);
+$controller->setParam('name', $name);
+$controller->setParam('comment', $comment);
+$controller->setParam('expires', $expires);
+$controller->setParam('keywords', $keywords);
+$controller->setParam('categories', $categories);
+$controller->setParam('owner', $user);
+$controller->setParam('userfiletmp', $filetmp);
+$controller->setParam('userfilename', basename($filename));
+$controller->setParam('filetype', $filetype);
+$controller->setParam('userfiletype', $mimetype);
+$minmax = $folder->getDocumentsMinMax();
+if($settings->_defaultDocPosition == 'start')
+	$controller->setParam('sequence', $minmax['min'] - 1);
+else
+	$controller->setParam('sequence', $minmax['max'] + 1);
+$controller->setParam('reviewers', $reviewers);
+$controller->setParam('approvers', $approvers);
+$controller->setParam('reqversion', $reqversion);
+$controller->setParam('versioncomment', $version_comment);
+$controller->setParam('attributes', $document_attributes);
+$controller->setParam('attributesversion', $version_attributes);
+$controller->setParam('workflow', null);
+$controller->setParam('notificationgroups', array());
+$controller->setParam('notificationusers', array());
+$controller->setParam('maxsizeforfulltext', $settings->_maxSizeForFullText);
+$controller->setParam('defaultaccessdocs', $settings->_defaultAccessDocs);
+
+if(!$document = $controller->run()) {
 	echo "Could not add document to folder\n";
 	exit(1);
 }

From ed93657566cc45c8b26960cf16670ec874e06b39 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Mar 2018 12:36:24 +0100
Subject: [PATCH 011/147] use extensions and controller

---
 webdav/index.php  |  14 +++---
 webdav/webdav.php | 111 +++++++++++++++++++++++++++++++++-------------
 2 files changed, 86 insertions(+), 39 deletions(-)

diff --git a/webdav/index.php b/webdav/index.php
index 377e80789..52a80179d 100644
--- a/webdav/index.php
+++ b/webdav/index.php
@@ -1,13 +1,12 @@
 <?php
 include("../inc/inc.Settings.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassNotificationService.php");
+include("../inc/inc.ClassEmailNotify.php");
+include("../inc/inc.ClassController.php");
 include("Log.php");
-include("webdav.php");
-
-$db = new SeedDMS_Core_DatabaseAccess($settings->_dbDriver, $settings->_dbHostname, $settings->_dbUser, $settings->_dbPass, $settings->_dbDatabase);
-$db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostname . "\"");
-$db->getResult("set names 'utf8'");
-
-$dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
 
 if($settings->_logFileEnable) {
 	if ($settings->_logFileRotation=="h") $logname=date("YmdH", time());
@@ -19,6 +18,7 @@ if($settings->_logFileEnable) {
 	$log = null;
 }
 
+include("webdav.php");
 $server = new HTTP_WebDAV_Server_SeedDMS();
 $server->ServeRequest($dms, $log);
 //$files = array();
diff --git a/webdav/webdav.php b/webdav/webdav.php
index 716c6cfb7..805de36b6 100644
--- a/webdav/webdav.php
+++ b/webdav/webdav.php
@@ -1,10 +1,6 @@
 <?php
 
 require_once "HTTP/WebDAV/Server.php";
-if(!empty($settings->_coreDir))
-	require_once($settings->_coreDir.'/Core.php');
-else
-	require_once('SeedDMS/Core.php');
 
 /**
  * SeedDMS access using WebDAV
@@ -270,7 +266,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 		$files["files"][] = $this->fileinfo($obj);
 
 		// information for contained resources requested?
-		if (get_class($obj) == 'SeedDMS_Core_Folder' && !empty($options["depth"])) {
+		if (get_class($obj) == $this->dms->getClassname('folder') && !empty($options["depth"])) {
 
 			$subfolders = $obj->getSubFolders();
 			$subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $this->user, M_READ);
@@ -320,7 +316,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 		$info["props"] = array();
 
 		// type and size (caller already made sure that path exists)
-		if (get_class($obj) == 'SeedDMS_Core_Folder') {
+		if (get_class($obj) == $this->dms->getClassname('folder')) {
 			// modification time
 			/* folders do not have a modification time */
 			$info["props"][] = $this->mkprop("getlastmodified", time());
@@ -421,7 +417,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 		if (!$obj) return false;
 
 		// is this a collection?
-		if (get_class($obj) == 'SeedDMS_Core_Folder') {
+		if (get_class($obj) == $this->dms->getClassname('folder')) {
 			return $this->GetDir($obj, $options);
 		}
 
@@ -502,7 +498,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 		foreach ($objs as $obj) {
 			$filename = $obj->getName();
 			$fullpath = $_fullpath.$filename;
-			if(get_class($obj) == 'SeedDMS_Core_Folder') {
+			if(get_class($obj) == $this->dms->getClassname('folder')) {
 				$fullpath .= '/';
 				$filename .= '/';
 				$filesize = 0;
@@ -553,7 +549,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			$parent = '';
 		$folder = $this->reverseLookup($parent.'/');
 
-		if (!$folder || get_class($folder) != "SeedDMS_Core_Folder") {
+		if (!$folder || get_class($folder) != $this->dms->getClassname('folder')) {
 			return "409 Conflict";
 		}
 
@@ -658,7 +654,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 		}
 
 		/* Check if parent of new folder is a folder */
-		if (get_class($folder) != 'SeedDMS_Core_Folder') {
+		if (get_class($folder) != $this->dms->getClassname('folder')) {
 			return "403 Forbidden";
 		}
 
@@ -696,6 +692,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 	 */
 	function DELETE($options) /* {{{ */
 	{
+		global $settings, $indexconf;
+
 		$this->log_options('DELETE', $options);
 
 		// get folder or document from path
@@ -712,7 +710,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			return "403 Forbidden";				 
 		}
 
-		if (get_class($obj) == 'SeedDMS_Core_Folder') {
+		if (get_class($obj) == $this->dms->getClassname('folder')) {
 			if($obj->hasDocuments() || $obj->hasSubFolders()) {
 				return "409 Conflict";
 			}
@@ -720,15 +718,20 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 				return "409 Conflict";
 			}
 		} else {
-			// check if user is admin
-			// only admins may delete documents
-			/* There is not reason to allow only admins to remove a document
-			if(!$this->user->isAdmin()) {
-				return "403 Forbidden";				 
+			if($settings->_enableFullSearch) {
+				$index = $indexconf['Indexer']::open($settings->_luceneDir);
+				$indexconf['Indexer']::init($settings->_stopWordsFile);
+			} else {
+				$index = null;
+				$indexconf = null;
 			}
-			 */
 
-			if(!$obj->remove()) {
+			$controller = Controller::factory('RemoveDocument');
+			$controller->setParam('document', $obj);
+			$controller->setParam('index', $index);
+			$controller->setParam('indexconf', $indexconf);
+			if(!$controller->run()) {
+//			if(!$obj->remove()) {
 				return "409 Conflict";
 			}
 		}
@@ -782,12 +785,12 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			return "403 Forbidden";				 
 		}
 
-		if(get_class($objdest) == 'SeedDMS_Core_Document') {
+		if(get_class($objdest) == $this->dms->getClassname('document')) {
 			/* If destination object is a document it must be overwritten */
 			if (!$options["overwrite"]) {
 				return "412 precondition failed";
 			}
-			if(get_class($objsource) == 'SeedDMS_Core_Folder') {
+			if(get_class($objsource) == $this->dms->getClassname('folder')) {
 				return "400 Bad request";
 			}
 
@@ -808,11 +811,11 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			$objsource->remove();
 
 			return "204 No Content";
-		} elseif(get_class($objdest) == 'SeedDMS_Core_Folder') {
+		} elseif(get_class($objdest) == $this->dms->getClassname('folder')) {
 			/* Set the new Folder of the source object */
-			if(get_class($objsource) == 'SeedDMS_Core_Document')
+			if(get_class($objsource) == $this->dms->getClassname('document'))
 				$objsource->setFolder($objdest);
-			elseif(get_class($objsource) == 'SeedDMS_Core_Folder')
+			elseif(get_class($objsource) == $this->dms->getClassname('folder'))
 				$objsource->setParent($objdest);
 			else
 				return "500 Internal server error";
@@ -830,6 +833,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 	 */
 	function COPY($options, $del=false) /* {{{ */
 	{
+		global $settings, $indexconf;
+
 		if(!$del)
 			$this->log_options('COPY', $options);
 
@@ -852,7 +857,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 		if (!$objsource)
 			return "404 Not found";
 
-		if (get_class($objsource) == 'SeedDMS_Core_Folder' && ($options["depth"] != "infinity")) {
+		if (get_class($objsource) == $this->dms->getClassname('folder') && ($options["depth"] != "infinity")) {
 			// RFC 2518 Section 9.2, last paragraph
 			return "400 Bad request";
 		}
@@ -880,12 +885,12 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 		}
 
 		/* If destination object is a document it must be overwritten */
-		if(get_class($objdest) == 'SeedDMS_Core_Document') {
+		if(get_class($objdest) == $this->dms->getClassname('document')) {
 			if (!$options["overwrite"]) {
 				return "412 precondition failed";
 			}
 			/* Copying a folder into a document makes no sense */
-			if(get_class($objsource) == 'SeedDMS_Core_Folder') {
+			if(get_class($objsource) == $this->dms->getClassname('folder')) {
 				return "400 Bad request";
 			}
 
@@ -902,12 +907,12 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			$objdest->setName($objsource->getName());
 
 			return "204 No Content";
-		} elseif(get_class($objdest) == 'SeedDMS_Core_Folder') {
+		} elseif(get_class($objdest) == $this->dms->getClassname('folder')) {
 			if($this->logger)
 				$this->logger->log('COPY: copy \''.$objdest->getName().'\' to folder '.$objdest->getName().'', PEAR_LOG_INFO);
 
 			/* Currently no support for copying folders */
-			if(get_class($objsource) == 'SeedDMS_Core_Folder') {
+			if(get_class($objsource) == $this->dms->getClassname('folder')) {
 				if($this->logger)
 					$this->logger->log('COPY: source is a folder '.$objsource->getName().'', PEAR_LOG_INFO);
 
@@ -921,7 +926,49 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			$content = $objsource->getLatestContent();
 			$fspath = $this->dms->contentDir.'/'.$content->getPath();
 
-			if(!$newdoc = $objdest->addDocument($newdocname, '', 0, $this->user, '', array(), $fspath, $content->getOriginalFileName(), $content->getFileType(), $content->getMimeType(), 0, array(), array(), 0, "")) {
+			if($settings->_enableFullSearch) {
+				$index = $indexconf['Indexer']::open($settings->_luceneDir);
+				$indexconf['Indexer']::init($settings->_stopWordsFile);
+			} else {
+				$index = null;
+				$indexconf = null;
+			}
+
+			$controller = Controller::factory('AddDocument');
+			$controller->setParam('documentsource', 'webdav');
+			$controller->setParam('folder', $objdest);
+			$controller->setParam('index', $index);
+			$controller->setParam('indexconf', $indexconf);
+			$controller->setParam('name', $newdocname);
+			$controller->setParam('comment', '');
+			$controller->setParam('expires', 0);
+			$controller->setParam('keywords', '');
+			$controller->setParam('categories', array());
+			$controller->setParam('owner', $this->user);
+			$controller->setParam('userfiletmp', $fspath);
+			$controller->setParam('userfilename', $content->getOriginalFileName());
+			$controller->setParam('filetype', $content->getFileType());
+			$controller->setParam('userfiletype', $content->getMimeType());
+			$minmax = $objdest->getDocumentsMinMax();
+			if($settings->_defaultDocPosition == 'start')
+				$controller->setParam('sequence', $minmax['min'] - 1);
+			else
+				$controller->setParam('sequence', $minmax['max'] + 1);
+			$controller->setParam('reviewers', array());
+			$controller->setParam('approvers', array());
+			$controller->setParam('reqversion', 0);
+			$controller->setParam('versioncomment', '');
+			$controller->setParam('attributes', array());
+			$controller->setParam('attributesversion', array());
+			$controller->setParam('workflow', null);
+			$controller->setParam('notificationgroups', array());
+			$controller->setParam('notificationusers', array());
+			$controller->setParam('maxsizeforfulltext', $settings->_maxSizeForFullText);
+			$controller->setParam('defaultaccessdocs', $settings->_defaultAccessDocs);
+
+			if(!$document = $controller->run()) {
+
+//			if(!$newdoc = $objdest->addDocument($newdocname, '', 0, $this->user, '', array(), $fspath, $content->getOriginalFileName(), $content->getFileType(), $content->getMimeType(), 0, array(), array(), 0, "")) {
 				if($this->logger)
 					$this->logger->log('COPY: error copying object', PEAR_LOG_INFO);
 				return "409 Conflict";
@@ -1016,7 +1063,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			return "200 OK";
 
 		// TODO recursive locks on directories not supported yet
-		if (get_class($obj) == 'SeedDMS_Core_Folder' && !empty($options["depth"])) {
+		if (get_class($obj) == $this->dms->getClassname('folder') && !empty($options["depth"])) {
 			return "409 Conflict";
 		}
 
@@ -1054,7 +1101,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			return "204 No Content";
 
 		// TODO recursive locks on directories not supported yet
-		if (get_class($obj) == 'SeedDMS_Core_Folder' && !empty($options["depth"])) {
+		if (get_class($obj) == $this->dms->getClassname('folder') && !empty($options["depth"])) {
 			return "409 Conflict";
 		}
 
@@ -1091,7 +1138,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 		}
 
 		// Folders cannot be locked
-		if(get_class($obj) == 'SeedDMS_Core_Folder') {
+		if(get_class($obj) == $this->dms->getClassname('folder')) {
 			if($this->logger)
 				$this->logger->log('checkLock: object is a folder', PEAR_LOG_INFO);
 			return false;

From 00429e6e3a84439fc96fdc02254968145d3ff77a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Mar 2018 15:10:19 +0100
Subject: [PATCH 012/147] remove old code, add some more comments

---
 utils/adddoc.php | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/utils/adddoc.php b/utils/adddoc.php
index 2564f6764..d26b891bb 100644
--- a/utils/adddoc.php
+++ b/utils/adddoc.php
@@ -56,16 +56,9 @@ if(isset($options['v']) || isset($options['verѕion'])) {
 /* Set alternative config file */
 if(isset($options['config'])) {
 	define('SEEDDMS_CONFIG_FILE', $options['config']);
-//	$settings = new Settings($options['config']);
-} else {
-//	$settings = new Settings();
 }
 
-//if(isset($settings->_extraPath))
-//	ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path'));
-
-//require_once("SeedDMS/Core.php");
-
+/* Set parent folder */
 if(isset($options['F'])) {
 	$folderid = (int) $options['F'];
 } else {
@@ -74,16 +67,19 @@ if(isset($options['F'])) {
 	exit(1);
 }
 
+/* Set comment of document */
 $comment = '';
 if(isset($options['c'])) {
 	$comment = $options['c'];
 }
 
+/* Set comment of version */
 $version_comment = '';
 if(isset($options['C'])) {
 	$version_comment = $options['C'];
 }
 
+/* Set keywords */
 $keywords = '';
 if(isset($options['k'])) {
 	$keywords = $options['k'];
@@ -132,17 +128,6 @@ include("../inc/inc.ClassNotificationService.php");
 include("../inc/inc.ClassEmailNotify.php");
 include("../inc/inc.ClassController.php");
 
-//$db = new SeedDMS_Core_DatabaseAccess($settings->_dbDriver, $settings->_dbHostname, $settings->_dbUser, $settings->_dbPass, $settings->_dbDatabase);
-//$db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostname . "\"");
-//$db->_conn->debug = 1;
-
-
-//$dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
-//if(!$dms->checkVersion()) {
-//	echo "Database update needed.";
-//	exit;
-//}
-
 /* Parse categories {{{ */
 $categories = array();
 if(isset($options['K'])) {

From 841cd2cfaf80c75336cc6d279a89db496320afca Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Mar 2018 17:16:02 +0100
Subject: [PATCH 013/147] fix setting attributes

used the wrong field name
---
 views/bootstrap/class.CheckInDocument.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index 751703c34..c6310934e 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -212,7 +212,7 @@ $(document).ready(function() {
 ?>
     <tr>
 	    <td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-	    <td><?php $this->printAttributeEditField($attrdef, '', 'attributes_version') ?>
+	    <td><?php $this->printAttributeEditField($attrdef, '', 'attributes') ?>
 <?php
 			if($latestContent->getAttributeValue($attrdef)) {
 				switch($attrdef->getType()) {
@@ -220,10 +220,10 @@ $(document).ready(function() {
 				case SeedDMS_Core_AttributeDefinition::type_date:
 				case SeedDMS_Core_AttributeDefinition::type_int:
 				case SeedDMS_Core_AttributeDefinition::type_float:
-					$this->printInputPresetButtonHtml('attributes_version_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef), $attrdef->getValueSetSeparator());
+					$this->printInputPresetButtonHtml('attributes_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef), $attrdef->getValueSetSeparator());
 					break;
 				case SeedDMS_Core_AttributeDefinition::type_boolean:
-					$this->printCheckboxPresetButtonHtml('attributes_version_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef));
+					$this->printCheckboxPresetButtonHtml('attributes_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef));
 					break;
 				}
 //				print_r($latestContent->getAttributeValue($attrdef));

From dda5ec7d13476fb3c8b2ba407208f57abf439f8d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Mar 2018 17:26:11 +0100
Subject: [PATCH 014/147] fix comment

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

diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index e0c63f32b..f8b1b2880 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -196,7 +196,7 @@ else
 			if($group = $dms->getGroup($grp)) {
 				$members = $group->getUsers();
 				foreach($members as $member) {
-					/* Do not add the uploader itself and approvers */
+					/* Do not add the uploader itself and reviewers */
 					if(!$settings->_enableFilterReceipt || ($member->getID() != $user->getID() && !in_array($member->getID(), $reviewers['i'])))
 						$recipients["i"][] = $member->getID();
 				}

From 9605989054397af72219cf4e586a45006e2d14bb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Mar 2018 20:08:04 +0100
Subject: [PATCH 015/147] start version 6.0.6

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

diff --git a/CHANGELOG b/CHANGELOG
index eac0d3ffc..d8c09fad9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+                     Changes in version 6.0.6
+--------------------------------------------------------------------------------
+- fix setting attributes when checking in a new document version
+
 --------------------------------------------------------------------------------
                      Changes in version 6.0.5
 --------------------------------------------------------------------------------

From 7f2dd8513fac02e92679585f311cf0764f168545 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Mar 2018 15:13:17 +0100
Subject: [PATCH 016/147] fix creation of preview if
 SeedDMS_Core_DocumentContent has been derived

---
 SeedDMS_Preview/Preview/Previewer.php |  3 ++-
 SeedDMS_Preview/package.xml           | 26 +++++++++++++++++++++-----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index b9ed617ac..23c5a97de 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -57,9 +57,10 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
 			return false;
 
 		$document = $object->getDocument();
+		$dms = $document->_dms;
 		$dir = $this->previewDir.'/'.$document->getDir();
 		switch(get_class($object)) {
-			case "SeedDMS_Core_DocumentContent":
+			case $dms->getClassname('documentcontent'):
 				$target = $dir.'p'.$object->getVersion().'-'.$width;
 				break;
 			case "SeedDMS_Core_DocumentFile":
diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index e446eaf34..2afd6da7b 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -11,10 +11,10 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2018-01-18</date>
+ <date>2018-03-08</date>
  <time>10:59:39</time>
  <version>
-  <release>1.2.7</release>
+  <release>1.2.8</release>
   <api>1.2.0</api>
  </version>
  <stability>
@@ -23,9 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-add SeedDMS_Preview_Base::sendFile() as a replacement for readfile() which uses
-mod_xsendfile if available
-execWithTimeout() reads data from stderr and returns it together with stdout in array
+preview is also created if SeedDMS_Core_DocumentContent has a child class
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -354,5 +352,23 @@ SeedDMS_Preview_Base::setConverters() overrides existing converters.
 New method SeedDMS_Preview_Base::addConverters() merges new converters with old ones.
    </notes>
   </release>
+  <release>
+   <date>2018-01-18</date>
+   <time>10:59:39</time>
+   <version>
+    <release>1.2.7</release>
+    <api>1.2.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+add SeedDMS_Preview_Base::sendFile() as a replacement for readfile() which uses
+mod_xsendfile if available
+execWithTimeout() reads data from stderr and returns it together with stdout in array
+   </notes>
+  </release>
  </changelog>
 </package>

From aa29cbf073e705673c0323f1176124c4753cd2ce Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Mar 2018 17:20:15 +0100
Subject: [PATCH 017/147] various new translations

---
 languages/ar_EG/lang.inc |  6 +++---
 languages/cs_CZ/lang.inc |  4 ++--
 languages/el_GR/lang.inc | 42 ++++++++++++++++++++--------------------
 languages/fr_FR/lang.inc | 12 ++++++------
 languages/nl_NL/lang.inc |  4 ++--
 languages/pt_BR/lang.inc |  4 ++--
 languages/tr_TR/lang.inc | 12 ++++++------
 7 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index bf8f33c47..d844604b7 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1284)
+//    Translators: Admin (1286)
 
 $text = array(
 '2_factor_auth' => '',
@@ -282,7 +282,7 @@ URL: [url]',
 'content' => 'المحتوى',
 'continue' => 'استمرار',
 'converter_new_cmd' => '',
-'converter_new_mimetype' => '',
+'converter_new_mimetype' => 'ﻥﻮﻋ ﺝﺪﻳﺩ ﻢﻧ ﺎﻟﻮﺛﺎﺌﻗ',
 'copied_to_checkout_as' => '',
 'create_download_link' => '',
 'create_fulltext_index' => 'انشاء فهرس للنص الكامل',
@@ -314,7 +314,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'المستندات',
 'documents_checked_out_by_you' => '',
-'documents_expired' => '',
+'documents_expired' => 'ﻮﺛﺎﺌﻗ ﻢﻨﺘﻬﻳﺓ',
 'documents_in_process' => 'مستندات رهن المعالجة',
 'documents_locked' => '',
 'documents_locked_by_you' => 'المستندات محمية من التعديل بواسطتك',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index cbc1e6318..9fbdb846c 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (738), kreml (455)
+//    Translators: Admin (739), kreml (455)
 
 $text = array(
 '2_factor_auth' => '',
@@ -1575,7 +1575,7 @@ URL: [url]',
 'toggle_manager' => 'Přepnout správce',
 'toggle_qrcode' => '',
 'to_before_from' => 'Datum ukončení nesmí být před datem zahájení',
-'transfer_document' => '',
+'transfer_document' => 'Přenést dokument',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',
 'transfer_objects' => '',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 26908ea1f..67152e207 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (231)
+//    Translators: Admin (251)
 
 $text = array(
 '2_factor_auth' => '',
@@ -30,10 +30,10 @@ $text = array(
 'access_control_is_off' => '',
 'access_denied' => '',
 'access_inheritance' => '',
-'access_mode' => '',
-'access_mode_all' => '',
+'access_mode' => 'Είδος πρόσβασης',
+'access_mode_all' => 'Πλήρης πρόσβαση',
 'access_mode_none' => '',
-'access_mode_read' => '',
+'access_mode_read' => 'Δικαιώματα ανάγνωσης',
 'access_mode_readwrite' => '',
 'access_permission_changed_email' => '',
 'access_permission_changed_email_body' => '',
@@ -66,7 +66,7 @@ $text = array(
 'add_revision' => '',
 'add_role' => '',
 'add_subfolder' => 'Νέος υποφάκελος',
-'add_to_clipboard' => '',
+'add_to_clipboard' => 'Προσθήκη στο πρόχειρο',
 'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => 'Νέος χρήστης',
@@ -273,7 +273,7 @@ $text = array(
 'create_fulltext_index' => '',
 'create_fulltext_index_warning' => '',
 'creation_date' => 'Δημιουργήθηκε',
-'cs_CZ' => '',
+'cs_CZ' => 'Τσέχικα',
 'current_password' => '',
 'current_quota' => '',
 'current_state' => '',
@@ -291,7 +291,7 @@ $text = array(
 'details' => 'Λεπτομέρειες',
 'details_version' => 'Λεπτομέρειες για την έκδοση: [version]',
 'de_DE' => 'German/Γερμανικά',
-'disclaimer' => '',
+'disclaimer' => 'Διαβαθμισμένη περιοχή. Η πρόσβαση επιτρέπεται μόνο σε εξουσιοδοτημένο προσωπικό. Κάθε παράβαση διώκεται σύμφωνα με τους εθνικούς και διεθνής νόμους.',
 'discspace' => '',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
@@ -382,7 +382,7 @@ $text = array(
 'edit_default_keywords' => '',
 'edit_document_access' => '',
 'edit_document_notify' => '',
-'edit_document_props' => '',
+'edit_document_props' => 'Επεξεργασία εγγράφου',
 'edit_event' => '',
 'edit_existing_access' => '',
 'edit_existing_attribute_groups' => '',
@@ -507,8 +507,8 @@ $text = array(
 'hours' => 'ώρες',
 'hr_HR' => '',
 'human_readable' => '',
-'hu_HU' => '',
-'id' => '',
+'hu_HU' => 'Ουγγρικά',
+'id' => 'ID',
 'identical_version' => '',
 'import' => '',
 'importfs' => '',
@@ -558,7 +558,7 @@ $text = array(
 'in_workflow' => '',
 'is_disabled' => '',
 'is_hidden' => '',
-'it_IT' => '',
+'it_IT' => 'Ιταλικά',
 'january' => 'Ιανουάριος',
 'js_form_error' => '',
 'js_form_errors' => '',
@@ -588,7 +588,7 @@ $text = array(
 'keywords' => 'Κλειδιά',
 'keywords_loading' => 'Παρακαλούμε αναμείνατε. Φόρτωση λίστας λέξεων κλειδιών',
 'keyword_exists' => 'Το κλειδί υπάρχει',
-'ko_KR' => '',
+'ko_KR' => 'Κορεάτικα',
 'language' => 'Γλώσσα',
 'lastaccess' => '',
 'last_update' => 'Τελευταία Αναναίωση',
@@ -606,7 +606,7 @@ $text = array(
 'list_hooks' => '',
 'local_file' => '',
 'locked_by' => '',
-'lock_document' => '',
+'lock_document' => 'Κλείδωμα',
 'lock_message' => '',
 'lock_status' => 'Κατάσταση',
 'login' => 'Είσοδος',
@@ -687,7 +687,7 @@ URL: [url]',
 'new_subfolder_email_subject' => '',
 'new_user_image' => '',
 'next_state' => '',
-'nl_NL' => '',
+'nl_NL' => 'Δανέζικα',
 'no' => 'Όχι',
 'notify_added_email' => '',
 'notify_added_email_body' => '',
@@ -901,7 +901,7 @@ URL: [url]',
 'role_name' => '',
 'role_type' => '',
 'role_user' => 'Χρήστης',
-'ro_RO' => '',
+'ro_RO' => 'Ρουμάνικα',
 'run_subworkflow' => '',
 'run_subworkflow_email_body' => '',
 'run_subworkflow_email_subject' => '',
@@ -1300,7 +1300,7 @@ URL: [url]',
 'sign_in' => 'Σύνδεση',
 'sign_out' => 'Αποσύνδεση',
 'sign_out_user' => 'Αποσύνδεση χρήστη',
-'sk_SK' => '',
+'sk_SK' => 'Σλοβάκικα',
 'space_used_on_data_folder' => '',
 'splash_added_to_clipboard' => '',
 'splash_add_access' => '',
@@ -1318,7 +1318,7 @@ URL: [url]',
 'splash_document_checkedout' => '',
 'splash_document_edited' => '',
 'splash_document_indexed' => '',
-'splash_document_locked' => '',
+'splash_document_locked' => 'Κλειδωμένο έγγραφο',
 'splash_document_unlocked' => '',
 'splash_edit_access' => '',
 'splash_edit_attribute' => '',
@@ -1459,12 +1459,12 @@ URL: [url]',
 'transmittal_size' => '',
 'tree_loading' => '',
 'trigger_workflow' => '',
-'tr_TR' => '',
+'tr_TR' => 'Τούρκικα',
 'tuesday' => 'Τρίτη',
 'tuesday_abbr' => '',
 'type_of_hook' => '',
 'type_to_search' => '',
-'uk_UA' => '',
+'uk_UA' => 'Ουκρανικά',
 'under_folder' => '',
 'unknown_attrdef' => '',
 'unknown_command' => '',
@@ -1559,7 +1559,7 @@ URL: [url]',
 'x_more_objects' => '',
 'year_view' => '',
 'yes' => 'Ναι',
-'zh_CN' => '',
-'zh_TW' => '',
+'zh_CN' => 'Κινέζικα (CN)',
+'zh_TW' => 'Κινέζικα (TW)',
 );
 ?>
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 37ff6d619..dcc7701f2 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1079), jeromerobert (50), lonnnew (9), Oudiceval (650)
+//    Translators: Admin (1079), jeromerobert (50), lonnnew (9), Oudiceval (657)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -338,7 +338,7 @@ URL: [url]',
 'documents_to_revise' => 'Documents en attente de votre révision',
 'documents_user_draft' => 'Ébauches',
 'documents_user_expiration' => 'Documents expirés',
-'documents_user_needs_correction' => '',
+'documents_user_needs_correction' => 'Documents nécessitant une correction',
 'documents_user_no_reception' => 'Documents sans réception',
 'documents_user_obsolete' => 'Documents obsolètes',
 'documents_user_reception' => 'Documents en attente de réception',
@@ -450,7 +450,7 @@ Le lien est valide jusqu’au [valid].
 'edit_comment' => 'Modifier le commentaire',
 'edit_default_keywords' => 'Modifier les mots-clés',
 'edit_document_access' => 'Modifier les droits d\'accès',
-'edit_document_notify' => 'Notifications de documents',
+'edit_document_notify' => 'Notification de document',
 'edit_document_props' => 'Modifier le document',
 'edit_event' => 'Modifier l\'événement',
 'edit_existing_access' => 'Modifier la liste des droits d\'accès',
@@ -458,7 +458,7 @@ Le lien est valide jusqu’au [valid].
 'edit_existing_notify' => 'Modifier les notifications',
 'edit_folder_access' => 'Modifier les droits d\'accès',
 'edit_folder_attrdefgrp' => 'Modifier les groupes d’attributs',
-'edit_folder_notify' => 'Liste de notification de dossiers',
+'edit_folder_notify' => 'Notification de dossier',
 'edit_folder_props' => 'Modifier le dossier',
 'edit_group' => 'Modifier un groupe',
 'edit_online' => 'Modification en ligne',
@@ -587,7 +587,7 @@ URL: [url]',
 'group_exists' => 'Ce groupe existe déjà.',
 'group_info' => 'Informations du groupe',
 'group_management' => 'Gestion des groupes',
-'group_members' => 'Membres de groupes',
+'group_members' => 'Membres du groupe',
 'group_receipt_summary' => 'Vue d’ensemble groupe réception',
 'group_review_summary' => 'Vue d’ensemble groupe vérification',
 'guest_login' => 'Se connecter comme invité',
@@ -810,7 +810,7 @@ URL: [url]',
 'no_default_keywords' => 'Aucun mot-clé disponible',
 'no_docs_checked_out' => '',
 'no_docs_locked' => 'Aucun document verrouillé',
-'no_docs_needs_correction' => '',
+'no_docs_needs_correction' => 'Aucun document ne nécessite de correction',
 'no_docs_rejected' => 'Aucun document rejeté.',
 'no_docs_to_approve' => 'Aucun document ne nécessite actuellement une approbation',
 'no_docs_to_look_at' => 'Aucun document à surveiller',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index dd6ce0e76..756b117f5 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (745), gijsbertush (610), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (746), gijsbertush (610), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 '2_factor_auth' => '2-factor-authenticatie',
@@ -1125,7 +1125,7 @@ URL: [url]',
 'select_one' => 'Selecteer een',
 'select_user' => '',
 'select_users' => 'Klik om gebruikers te selecteren',
-'select_value' => '',
+'select_value' => 'selecteer waarde',
 'select_workflow' => 'Selecteer workflow',
 'send_email' => 'Verstuur email',
 'send_login_data' => 'Verstuur Login-data',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 1387a841a..2aeb42b51 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (972), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (973), flaviove (627), lfcristofoli (352)
 
 $text = array(
 '2_factor_auth' => '',
@@ -1706,7 +1706,7 @@ URL: [url]',
 'workflow_summary' => 'Sumário de fluxo de trabalho',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Sumário de usuário',
-'x_more_objects' => '',
+'x_more_objects' => 'mais itens',
 'year_view' => 'Visualização Anual',
 'yes' => 'Sim',
 'zh_CN' => 'Chinês (CN)',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 90f5428cf..9779e58a8 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1059), aydin (83)
+//    Translators: Admin (1064), aydin (83)
 
 $text = array(
 '2_factor_auth' => '',
@@ -597,7 +597,7 @@ URL: [url]',
 'index_error' => '',
 'index_folder' => 'Klasörü indeksle',
 'index_pending' => '',
-'index_waiting' => '',
+'index_waiting' => 'Bekliyor',
 'individuals' => 'Bireysel',
 'indivіduals_in_groups' => '',
 'info_recipients_tab_not_released' => '',
@@ -1090,7 +1090,7 @@ URL: [url]',
 'select_one' => 'Birini seçiniz',
 'select_user' => '',
 'select_users' => 'Kullanıcı seçmek için tıklayın',
-'select_value' => '',
+'select_value' => 'Değeri seç',
 'select_workflow' => 'İş akışı seç',
 'send_email' => '',
 'send_login_data' => '',
@@ -1582,9 +1582,9 @@ URL: [url]',
 'toggle_manager' => 'Değişim yönetimi',
 'toggle_qrcode' => '',
 'to_before_from' => 'Bitiş tarihi başlama tarihinden önce olamaz',
-'transfer_document' => '',
+'transfer_document' => 'Dokumanı gönder',
 'transfer_no_read_access' => '',
-'transfer_no_write_access' => '',
+'transfer_no_write_access' => 'Kullanıcının klasör üzerinde yazma hakkı yok',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
 'transfer_to_user' => '',
@@ -1710,7 +1710,7 @@ URL: [url]',
 'workflow_summary' => 'İş akış özeti',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Kullanıcı özeti',
-'x_more_objects' => '',
+'x_more_objects' => '[number] více objektů',
 'year_view' => 'Yıllık Görünüm',
 'yes' => 'Evet',
 'zh_CN' => 'Çince',

From b85030803b3a6a41cfffd8482ccf2e2107f078ae Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 9 Mar 2018 08:12:01 +0100
Subject: [PATCH 018/147] add entry for 5.1.6

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

diff --git a/CHANGELOG b/CHANGELOG
index f189e1120..6b2e222cd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,8 @@
 - attribute values can be deleted from all folders, documents
 - new settings to disallow upload of documents with just a reviewer in traditional
   workflow mode
+- webdav and various script use the controller framework instead of calling
+  SeedDMS_Core methods
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.5

From afcea34cf887ed78813dfedb47d364a9a86902d8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 9 Mar 2018 10:23:21 +0100
Subject: [PATCH 019/147] add info about email configuration

---
 doc/README.Notification | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/doc/README.Notification b/doc/README.Notification
index c00664cee..d6fef8db3 100644
--- a/doc/README.Notification
+++ b/doc/README.Notification
@@ -3,7 +3,17 @@ Notifications
 
 Most changes made to documents or folders in SeedDMS can be monitored
 by the users. Notifications are send by email if a user or group
-has subscribed it.
+has subscribed to it. Setting up email is often troublesome, if you
+are not running SeedDMS on a Linux server with a running mail server.
+In that case you do not have to fill out any of the email settings
+except for the From address ('Send from' on the 'System' tab of the
+configuration). Mail is send by PHP's mail() function. If the SMTP
+host in the configuration is filled out, SeedDMS will use the PEAR
+Mail package for delivering mail to the configured server. If you
+also fill out the SMTP user, authentication with the SMTP server
+will also be done. Some servers like smtp.gmail.com may still complain
+about an invalid authentification. You should then check in your
+google account if less secure apps are allowed.
 
 The following notifications are send to all users and groups having
 registered a notification for the event:

From 261c65033d6d7042a3d494f142cd1eb7c56d08b2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 9 Mar 2018 10:23:44 +0100
Subject: [PATCH 020/147] set socket_options, do not check ssl peer name and
 certificate

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

diff --git a/inc/inc.ClassEmailNotify.php b/inc/inc.ClassEmailNotify.php
index e94ac0e53..ae5cfbb04 100644
--- a/inc/inc.ClassEmailNotify.php
+++ b/inc/inc.ClassEmailNotify.php
@@ -118,9 +118,13 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 			}
 			if($this->smtp_user) {
 				$mail_params['auth'] = true;
+				// $mail_params['debug'] = true;
 				$mail_params['username'] = $this->smtp_user;
 				$mail_params['password'] = $this->smtp_password;
 			}
+			/* See ticket #384 */
+			$mail_params['socket_options'] = array('ssl' => array('verify_peer' => false, 'verify_peer_name' => false));
+
 			$mail = Mail::factory('smtp', $mail_params);
 		} else {
 			$mail = Mail::factory('mail', $mail_params);

From e2944660210e6ba37f0b7b452932978afc54c215 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 9 Mar 2018 10:24:54 +0100
Subject: [PATCH 021/147] add entry for 5.1.6

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

diff --git a/CHANGELOG b/CHANGELOG
index 6b2e222cd..111701e52 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,7 +5,7 @@
 - mayApprove() and mayReview() require the status of the document to be
   S_DRAFT_APP resp. S_DRAFT_REV
 - add preview for webm videos (Closes #374)
-- add support for apache mod_xsendfile, minor optimization of file download
+- add support for apache mod_xsendfile, minor optimization of file download (see #382)
 - animate button to download more objects in folder list when loading is active
 - use converters for creating preview images as configured in settings (Closes #389)
 - propperly check if user is already in database when doing ldap auth (Closes #388)
@@ -18,6 +18,7 @@
   workflow mode
 - webdav and various script use the controller framework instead of calling
   SeedDMS_Core methods
+- do not verify peer name and certificate when connecting to smtp server
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.5

From 31d3d491b51bafabfbc26368af3714642135cdea Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 9 Mar 2018 13:39:08 +0100
Subject: [PATCH 022/147] add changelog entry for 6.0.6

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

diff --git a/CHANGELOG b/CHANGELOG
index 9e27ac956..d5552bb0a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 6.0.6
 --------------------------------------------------------------------------------
 - fix setting attributes when checking in a new document version
+- merge changes up to 5.1.6
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.5

From bcdcfe2b43d001a3b7fc7f3e1a0394637ecefc8d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 9 Mar 2018 18:23:14 +0100
Subject: [PATCH 023/147] call controller for adding and removing a folder

---
 webdav/webdav.php | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/webdav/webdav.php b/webdav/webdav.php
index 805de36b6..bf331f3d6 100644
--- a/webdav/webdav.php
+++ b/webdav/webdav.php
@@ -676,7 +676,18 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			return "403 Forbidden";				 
 		}
 
-		if (!$folder->addSubFolder($name, '', $this->user, 0)) {
+		$controller = Controller::factory('AddSubFolder');
+		$controller->setParam('dms', $this->dms);
+		$controller->setParam('user', $this->user);
+		$controller->setParam('folder', $folder);
+		$controller->setParam('name', $name);
+		$controller->setParam('comment', '');
+		$controller->setParam('sequence', 0);
+		$controller->setParam('attributes', array());
+		$controller->setParam('notificationgroups', array());
+		$controller->setParam('notificationusers', array());
+		if(!$subFolder = $controller->run()) {
+//		if (!$folder->addSubFolder($name, '', $this->user, 0)) {
 			return "403 Forbidden";				 
 		}
 
@@ -710,23 +721,32 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			return "403 Forbidden";				 
 		}
 
+		if($settings->_enableFullSearch) {
+			$index = $indexconf['Indexer']::open($settings->_luceneDir);
+			$indexconf['Indexer']::init($settings->_stopWordsFile);
+		} else {
+			$index = null;
+			$indexconf = null;
+		}
+
 		if (get_class($obj) == $this->dms->getClassname('folder')) {
 			if($obj->hasDocuments() || $obj->hasSubFolders()) {
 				return "409 Conflict";
 			}
-			if(!$obj->remove()) {
+			$controller = Controller::factory('RemoveFolder');
+			$controller->setParam('dms', $this->dms);
+			$controller->setParam('user', $this->user);
+			$controller->setParam('folder', $obj);
+			$controller->setParam('index', $index);
+			$controller->setParam('indexconf', $indexconf);
+			if(!$controller->run()) {
+//			if(!$obj->remove()) {
 				return "409 Conflict";
 			}
 		} else {
-			if($settings->_enableFullSearch) {
-				$index = $indexconf['Indexer']::open($settings->_luceneDir);
-				$indexconf['Indexer']::init($settings->_stopWordsFile);
-			} else {
-				$index = null;
-				$indexconf = null;
-			}
-
 			$controller = Controller::factory('RemoveDocument');
+			$controller->setParam('dms', $this->dms);
+			$controller->setParam('user', $this->user);
 			$controller->setParam('document', $obj);
 			$controller->setParam('index', $index);
 			$controller->setParam('indexconf', $indexconf);

From 36e711f905ef5fa546e5be55668b4f022e44b9eb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 12 Mar 2018 18:32:12 +0100
Subject: [PATCH 024/147] move code into switch statement

---
 controllers/class.Download.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/controllers/class.Download.php b/controllers/class.Download.php
index ba9288167..c8e381014 100644
--- a/controllers/class.Download.php
+++ b/controllers/class.Download.php
@@ -25,11 +25,10 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 	public function run() {
 		$dms = $this->params['dms'];
 		$type = $this->params['type'];
-		$content = $this->params['content'];
 
 		switch($type) {
 			case "version":
-
+				$content = $this->params['content'];
 				if(null === $this->callHook('version')) {
 					if(file_exists($dms->contentDir . $content->getPath())) {
 						header("Content-Transfer-Encoding: binary");

From 5cfc52f1fca835abdef8b2f15a4c293a5f6c1050 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 12 Mar 2018 18:33:30 +0100
Subject: [PATCH 025/147] add download/upload of extensions to extension mgr

---
 inc/inc.ClassExtensionMgr.php          | 63 +++++++++++++++++++++
 op/op.ExtensionMgr.php                 | 57 +++++++++++++++++--
 views/bootstrap/class.ExtensionMgr.php | 77 ++++++++++++++++++++++++--
 3 files changed, 185 insertions(+), 12 deletions(-)

diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index 163893206..2ab452e6e 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -90,4 +90,67 @@ class SeedDMS_Extension_Mgr {
 		}
 		return $extensions;
 	} /* }}} */
+
+	public function createArchive($extname, $version) { /* {{{ */
+		if(!is_dir($this->extdir ."/". $extname))
+			return false;
+
+		$tmpfile = $this->cachedir."/".$extname."-".$version.".zip";
+
+		$cmd = "cd ".$this->extdir."/".$extname."; zip -r ".$tmpfile." .";
+		exec($cmd);
+
+		return $tmpfile;
+	} /* }}} */
+
+	static protected function rrmdir($dir) { /* {{{ */
+		if (is_dir($dir)) { 
+			$objects = scandir($dir); 
+			foreach ($objects as $object) { 
+				if ($object != "." && $object != "..") { 
+					if (filetype($dir."/".$object) == "dir") self::rrmdir($dir."/".$object); else unlink($dir."/".$object); 
+				} 
+			} 
+			reset($objects); 
+			rmdir($dir); 
+		} 
+	} /* }}} */
+
+	public function updateExtension($file) { /* {{{ */
+		$newdir = $this->cachedir ."/ext.new";
+		if(!mkdir($newdir, 0755)) {
+			return false;
+		}
+		$cmd = "cd ".$newdir."; unzip ".$file;
+		exec($cmd);
+
+		if(!file_exists($newdir."/conf.php")) {
+			self::rrmdir($newdir);
+			return false;
+		}
+
+		include($newdir."/conf.php");
+		if(!isset($EXT_CONF)) {
+			self::rrmdir($newdir);
+			return false;
+		}
+		$extname = key($EXT_CONF);
+		if(!$extname || !preg_match('/[a-zA-Z_]*/', $extname)) {
+			self::rrmdir($newdir);
+			return false;
+		}
+
+		if(!is_dir($this->extdir)) {
+			if(!mkdir($this->extdir, 0755)) {
+				self::rrmdir($newdir);
+				return false;
+			}
+		} elseif(is_dir($this->extdir ."/". $extname)) {
+			$this->rrmdir($this->extdir ."/". $extname);
+		}
+		rename($newdir, $this->extdir ."/". $extname);
+
+		return true;
+	} /* }}} */
+
 }
diff --git a/op/op.ExtensionMgr.php b/op/op.ExtensionMgr.php
index 24266d17d..f65388f2a 100644
--- a/op/op.ExtensionMgr.php
+++ b/op/op.ExtensionMgr.php
@@ -21,10 +21,13 @@ include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.LogInit.php");
 include("../inc/inc.DBInit.php");
+include("../inc/inc.Extension.php");
 include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
-require "../inc/inc.ClassExtensionMgr.php";
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
@@ -34,10 +37,52 @@ if(!checkFormKey('extensionmgr')) {
 	UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
 }
 
-$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
-$extconffile = $extMgr->getExtensionsConfFile();
-$extMgr->createExtensionConf();
+if (isset($_POST["action"])) $action=$_POST["action"];
+else $action=NULL;
+
+// add new attribute definition ---------------------------------------------
+if ($action == "download") {
+	if (!isset($_POST["extname"])) {
+		UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
+	}
+	$extname = trim($_POST["extname"]);
+	if (!file_exists($settings->_rootDir.'/ext/'.$extname) ) {
+		UI::exitError(getMLText("admin_tools"),getMLText("missing_extension"));
+	}
+	$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
+	$controller->setParam('extmgr', $extMgr);
+	$controller->setParam('extname', $extname);
+	if (!$controller($_POST)) {
+		echo json_encode(array('success'=>false, 'error'=>'Could not download extension'));
+	}
+	add_log_line();
+} /* }}} */
+elseif ($action == "refresh") {
+	$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
+	$extMgr->createExtensionConf();
+	$controller->setParam('extmgr', $extMgr);
+	if (!$controller($_POST)) {
+		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
+	}
+	add_log_line();
+	header("Location:../out/out.ExtensionMgr.php");
+}
+elseif ($action == "upload") {
+	if($_FILES['userfile']['error']) {
+		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
+	}
+	if($_FILES['userfile']['type'] != 'application/zip') {
+		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
+	}
+	$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
+	$controller->setParam('extmgr', $extMgr);
+	$controller->setParam('file', $_FILES['userfile']['tmp_name']);
+	if (!$controller($_POST)) {
+		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
+	}
+	add_log_line();
+	header("Location:../out/out.ExtensionMgr.php");
+}
+
 
-add_log_line();
-header("Location:../out/out.ExtensionMgr.php");
 ?>
diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index 489660c73..6881fffd3 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -27,6 +27,40 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 
+	function js() { /* {{{ */
+		$partitionsize = $this->params['partitionsize'];
+		$maxuploadsize = $this->params['maxuploadsize'];
+
+		header('Content-Type: application/javascript');
+?>
+		$(document).ready( function() {
+			$('a.download').click(function(ev){
+				var element = $(this);
+				$('#'+element.data('extname')+'-download').submit();
+/*
+				var element = $(this);
+				ev.preventDefault();
+				$.ajax({url: '../op/op.ExtensionMgr.php',
+					type: 'POST',
+					dataType: "json",
+					data: {action: 'download', 'formtoken': '<?= createFormKey('extensionmgr') ?>', 'extname': element.data('extname')},
+					success: function(data) {
+						noty({
+							text: data.msg,
+							type: (data.error) ? 'error' : 'success',
+							dismissQueue: true,
+							layout: 'topRight',
+							theme: 'defaultTheme',
+							timeout: 1500,
+						});
+					}
+				});
+*/
+			});
+		});
+<?php
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -37,8 +71,31 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 		$this->globalNavigation();
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-		$this->contentContainerStart();
-		echo "<table class=\"table table-condensed\">\n";
+		$this->contentHeading(getMLText("extension_manager"));
+?>
+<div class="row-fluid">
+	<div class="span4">
+		<form class="form-horizontal" method="post" enctype="multipart/form-data" action="../op/op.ExtensionMgr.php">
+			<?= createHiddenFieldWithKey('extensionmgr') ?>
+			<input type="hidden" name="action" value="upload" />
+			<div class="control-group">
+				<label class="control-label" for="upload"><?= getMLText('extension_archive'); ?></label>
+				<div class="controls">
+					<?php $this->printFileChooser('userfile', false); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<label class="control-label" for="enddate"></label>
+				<div class="controls">
+					<button id="upload" type="_submit" class="btn"><i class="icon-upload"></i> <?= getMLText("upload_extension"); ?></button>
+				</div>
+			</div>
+		</form>
+	</div>
+	<div class="span8">
+<?php
+//		$this->contentContainerStart();
+		echo "<table class=\"table _table-condensed\">\n";
 		print "<thead>\n<tr>\n";
 		print "<th></th>\n";	
 		print "<th>".getMLText('name')."</th>\n";	
@@ -95,21 +152,29 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			if($errmsgs)
 				echo "<div><img src=\"".$this->getImgPath("attention.gif")."\"> ".implode('<br /><img src="'.$this->getImgPath("attention.gif").'"> ', $errmsgs)."</div>";
 			echo "</td>";
-			echo "<td>".$extconf['version']."<br /><small>".$extconf['releasedate']."</small>";
+			echo "<td nowrap>".$extconf['version']."<br /><small>".$extconf['releasedate']."</small>";
+			echo "<div class=\"list-action\">";
 			if($extconf['config'])
-				echo "<div class=\"list-action\"><a href=\"../out/out.Settings.php?currenttab=extensions#".$extname."\"><i class=\"icon-cogs\"></i></a></div>";
+				echo "<a href=\"../out/out.Settings.php?currenttab=extensions#".$extname."\" title=\"".getMLText('configure_extension')."\"><i class=\"icon-cogs\"></i></a>";
+			echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$extname."-download\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"download\" /><input type=\"hidden\" name=\"extname\" value=\"".$extname."\" /><a class=\"download\" data-extname=\"".$extname."\" title=\"".getMLText('download_extension')."\"><i class=\"icon-download\"></i></a></form>";
+			echo "</div>";
 			echo "</td>";
-			echo "<td><a href=\"mailto:".$extconf['author']['email']."\">".$extconf['author']['name']."</a><br /><small>".$extconf['author']['company']."</small></td>";
+			echo "<td nowrap><a href=\"mailto:".$extconf['author']['email']."\">".$extconf['author']['name']."</a><br /><small>".$extconf['author']['company']."</small></td>";
 			echo "</tr>\n";
 		}
 		echo "</table>\n";
 ?>
 <form action="../op/op.ExtensionMgr.php" name="form1" method="post">
   <?php echo createHiddenFieldWithKey('extensionmgr'); ?>
+	<input type="hidden" name="action" value="refresh" />
 	<p><button type="submit" class="btn"><i class="icon-refresh"></i> <?php printMLText("refresh");?></button></p>
 </form>
 <?php
-		$this->contentContainerEnd();
+//		$this->contentContainerEnd();
+?>
+  </div>
+ </div>
+<?php
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From b223344af97d8912e1e6a2c0c344e5ce22d73d92 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 12 Mar 2018 18:34:17 +0100
Subject: [PATCH 026/147] set dms and user in controller

was previously taken from global variables
---
 inc/inc.ClassController.php |  4 +---
 op/op.AddDocument.php       |  2 +-
 op/op.AddSubFolder.php      |  2 +-
 op/op.Ajax.php              |  2 +-
 op/op.AttributeMgr.php      |  2 +-
 op/op.DocumentAccess.php    |  2 +-
 op/op.Download.php          | 19 ++++++++++++-------
 op/op.EditDocument.php      |  2 +-
 op/op.EditDocumentFile.php  |  2 +-
 op/op.EditFolder.php        |  2 +-
 op/op.Login.php             |  2 +-
 op/op.Logout.php            |  2 +-
 op/op.RemoveDocument.php    |  2 +-
 op/op.RemoveFolder.php      |  2 +-
 op/op.TransferDocument.php  |  2 +-
 op/op.UpdateDocument.php    |  2 +-
 op/op.ViewOnline.php        |  2 +-
 out/out.ExtensionMgr.php    |  2 ++
 utils/adddoc.php            |  2 +-
 webdav/webdav.php           |  2 ++
 20 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/inc/inc.ClassController.php b/inc/inc.ClassController.php
index a149e91c0..608e91fba 100644
--- a/inc/inc.ClassController.php
+++ b/inc/inc.ClassController.php
@@ -30,7 +30,7 @@ class Controller {
 	 * @return object an object of a class implementing the view
 	 */
 	static function factory($class, $params=array()) { /* {{{ */
-		global $settings, $session, $dms, $user, $EXT_CONF;
+		global $settings, $session, $EXT_CONF;
 		if(!$class) {
 			return null;
 		}
@@ -52,8 +52,6 @@ class Controller {
 			require($filename);
 			$controller = new $classname($params);
 			/* Set some configuration parameters */
-			$controller->setParam('dms', $dms);
-			$controller->setParam('user', $user);
 			$controller->setParam('postVars', $_POST);
 			$controller->setParam('getVars', $_GET);
 			$controller->setParam('requestVars', $_REQUEST);
diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index c0b6a4f0d..630958934 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -31,7 +31,7 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassController.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('adddocument')) {
diff --git a/op/op.AddSubFolder.php b/op/op.AddSubFolder.php
index 83a83de6f..d9576d97f 100644
--- a/op/op.AddSubFolder.php
+++ b/op/op.AddSubFolder.php
@@ -31,7 +31,7 @@ include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('addsubfolder')) {
diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 7f9a6da89..0fa50486a 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -638,7 +638,7 @@ switch($command) {
 					$indexconf = null;
 				}
 
-				$controller = Controller::factory('AddDocument');
+				$controller = Controller::factory('AddDocument', array('dms'=>$dms, 'user'=>$user));
 				$controller->setParam('documentsource', 'upload');
 				$controller->setParam('folder', $folder);
 				$controller->setParam('index', $index);
diff --git a/op/op.AttributeMgr.php b/op/op.AttributeMgr.php
index d800722a5..9b15139f1 100644
--- a/op/op.AttributeMgr.php
+++ b/op/op.AttributeMgr.php
@@ -28,7 +28,7 @@ include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
diff --git a/op/op.DocumentAccess.php b/op/op.DocumentAccess.php
index fbc37f1e1..eddf47ef1 100644
--- a/op/op.DocumentAccess.php
+++ b/op/op.DocumentAccess.php
@@ -30,7 +30,7 @@ include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
 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.Download.php b/op/op.Download.php
index 0c1bf4db1..7b5b09a0f 100644
--- a/op/op.Download.php
+++ b/op/op.Download.php
@@ -31,7 +31,7 @@ include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
 if (isset($_GET["version"])) { /* {{{ */
 
@@ -114,7 +114,8 @@ elseif (isset($_GET["file"])) { /* {{{ */
 
 	sendFile($dms->contentDir . $file->getPath());
 
-} elseif (isset($_GET["arkname"])) {
+} /* }}} */
+elseif (isset($_GET["arkname"])) { /* {{{ */
 	$filename = basename($_GET["arkname"]);
 
 	// backup download
@@ -141,7 +142,8 @@ elseif (isset($_GET["file"])) { /* {{{ */
 	
 	sendFile($settings->_contentDir .$filename );
 	
-} elseif (isset($_GET["logname"])) {
+} /* }}} */
+elseif (isset($_GET["logname"])) { /* {{{ */
 	$filename = basename($_GET["logname"]);
 
 	// log download
@@ -167,7 +169,8 @@ elseif (isset($_GET["file"])) { /* {{{ */
 
 	sendFile($settings->_contentDir .$filename );
 	
-} elseif (isset($_GET["vfile"])) {
+} /* }}} */
+elseif (isset($_GET["vfile"])) { /* {{{ */
 
 	// versioning info download
 	
@@ -191,7 +194,8 @@ elseif (isset($_GET["file"])) { /* {{{ */
 	
 	sendFile($dms->contentDir . $document->getDir() .$settings->_versioningFileName);
 	
-} elseif (isset($_GET["dumpname"])) {
+} /* }}} */
+elseif (isset($_GET["dumpname"])) { /* {{{ */
 	$filename = basename($_GET["dumpname"]);
 
 	// dump file download
@@ -251,7 +255,8 @@ elseif (isset($_GET["file"])) { /* {{{ */
 
 	sendFile($filename);
 
-} elseif (isset($_GET["approvelogid"])) {
+} /* }}} */
+elseif (isset($_GET["approvelogid"])) { /* {{{ */
 	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"));
 	}
@@ -285,7 +290,7 @@ elseif (isset($_GET["file"])) { /* {{{ */
 	header("Cache-Control: must-revalidate");
 
 	sendFile($filename);
-}
+} /* }}} */
 
 add_log_line();
 exit();
diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php
index 505827e61..afc4471b7 100644
--- a/op/op.EditDocument.php
+++ b/op/op.EditDocument.php
@@ -30,7 +30,7 @@ include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
 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.EditDocumentFile.php b/op/op.EditDocumentFile.php
index 2f93436f6..780e51f76 100644
--- a/op/op.EditDocumentFile.php
+++ b/op/op.EditDocumentFile.php
@@ -31,7 +31,7 @@ include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('editdocumentfile')) {
diff --git a/op/op.EditFolder.php b/op/op.EditFolder.php
index c6ac9dee0..77242635c 100644
--- a/op/op.EditFolder.php
+++ b/op/op.EditFolder.php
@@ -30,7 +30,7 @@ include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
 if (!isset($_POST["folderid"]) || !is_numeric($_POST["folderid"]) || intval($_POST["folderid"])<1) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
diff --git a/op/op.Login.php b/op/op.Login.php
index 3b1967afe..b558e8af9 100644
--- a/op/op.Login.php
+++ b/op/op.Login.php
@@ -39,7 +39,7 @@ function _printMessage($heading, $message) { /* {{{ */
 } /* }}} */
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
 if (isset($_REQUEST["sesstheme"]) && strlen($_REQUEST["sesstheme"])>0 && is_numeric(array_search($_REQUEST["sesstheme"],UI::getStyles())) ) {
 	$theme = $_REQUEST["sesstheme"];
diff --git a/op/op.Logout.php b/op/op.Logout.php
index ce63730d7..e4075cf62 100644
--- a/op/op.Logout.php
+++ b/op/op.Logout.php
@@ -28,7 +28,7 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
 // Delete session from database
 if(isset($_COOKIE['mydms_session'])) {
diff --git a/op/op.RemoveDocument.php b/op/op.RemoveDocument.php
index be3f53b5e..df5359a73 100644
--- a/op/op.RemoveDocument.php
+++ b/op/op.RemoveDocument.php
@@ -29,7 +29,7 @@ include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('removedocument')) {
diff --git a/op/op.RemoveFolder.php b/op/op.RemoveFolder.php
index 34758e135..0ba444b8d 100644
--- a/op/op.RemoveFolder.php
+++ b/op/op.RemoveFolder.php
@@ -29,7 +29,7 @@ include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('removefolder')) {
diff --git a/op/op.TransferDocument.php b/op/op.TransferDocument.php
index 1491a45a5..0bc50493e 100644
--- a/op/op.TransferDocument.php
+++ b/op/op.TransferDocument.php
@@ -29,7 +29,7 @@ include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
 if (!$user->isAdmin()) {
 	UI::exitError(getMLText("document"),getMLText("access_denied"));
diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index 8c6fb4c39..eeba7227d 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -29,7 +29,7 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassController.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('updatedocument')) {
diff --git a/op/op.ViewOnline.php b/op/op.ViewOnline.php
index 13b0c2c90..34ba3e108 100644
--- a/op/op.ViewOnline.php
+++ b/op/op.ViewOnline.php
@@ -29,7 +29,7 @@ include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
 $documentid = $_GET["documentid"];
 if (!isset($documentid) || !is_numeric($documentid) || intval($documentid)<1) {
diff --git a/out/out.ExtensionMgr.php b/out/out.ExtensionMgr.php
index da2e5c728..0f8ddb823 100644
--- a/out/out.ExtensionMgr.php
+++ b/out/out.ExtensionMgr.php
@@ -37,6 +37,8 @@ $v = new SeedDMS_Version;
 if($view) {
 	$view->setParam('httproot', $settings->_httpRoot);
 	$view->setParam('version', $v);
+	$view->setParam('partitionsize', 200000);
+	$view->setParam('maxuploadsize', 2000000);
 	$view($_GET);
 	exit;
 }
diff --git a/utils/adddoc.php b/utils/adddoc.php
index d26b891bb..3357fb3e1 100644
--- a/utils/adddoc.php
+++ b/utils/adddoc.php
@@ -282,7 +282,7 @@ if($settings->_enableFullSearch) {
 	$indexconf = null;
 }
 
-$controller = Controller::factory('AddDocument');
+$controller = Controller::factory('AddDocument', array('dms'=>$dms, 'user'=>$user));
 $controller->setParam('documentsource', 'script');
 $controller->setParam('folder', $folder);
 $controller->setParam('index', $index);
diff --git a/webdav/webdav.php b/webdav/webdav.php
index bf331f3d6..916bf9291 100644
--- a/webdav/webdav.php
+++ b/webdav/webdav.php
@@ -955,6 +955,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			}
 
 			$controller = Controller::factory('AddDocument');
+			$controller->setParam('dms', $this->dms);
+			$controller->setParam('user', $this->user);
 			$controller->setParam('documentsource', 'webdav');
 			$controller->setParam('folder', $objdest);
 			$controller->setParam('index', $index);

From 2c64a249856f8f83749591ffdaf7d596721cc3e0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 12 Mar 2018 18:35:18 +0100
Subject: [PATCH 027/147] add entry for 5.1.7

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

diff --git a/CHANGELOG b/CHANGELOG
index 111701e52..09186dad3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.7
+--------------------------------------------------------------------------------
+- support for upload/download of extensions
+
 --------------------------------------------------------------------------------
                      Changes in version 5.1.6
 --------------------------------------------------------------------------------

From 0554dab3aee05abd33048f5da6e620184238860d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 13 Mar 2018 14:37:55 +0100
Subject: [PATCH 028/147] various new methonds

move cmpVersion() from inc.Utils.php nach inc.ClassExtensionMgr.php
---
 inc/inc.ClassExtensionMgr.php | 220 +++++++++++++++++++++++++++++++---
 inc/inc.Utils.php             |  33 -----
 2 files changed, 206 insertions(+), 47 deletions(-)

diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index 2ab452e6e..99310e549 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -32,6 +32,12 @@ class SeedDMS_Extension_Mgr {
 	 */
 	protected $extdir;
 
+	/**
+	 * @var array[] $extconf configuration of all extensions
+	 * @access protected
+	 */
+	protected $extconf;
+
 	/**
 	 * @var string $cachedir directory where cached extension configuration
 	 *      is stored
@@ -39,25 +45,89 @@ class SeedDMS_Extension_Mgr {
 	 */
 	protected $cachedir;
 
+	/**
+	 * @var string[] $errmsg list of error message from last operation
+	 * @access protected
+	 */
+	protected $errmsgs;
 
-	function __construct($extdir = '', $cachedir = '') {
+	/**
+	 * Compare two version
+	 *
+	 * This functions compares two version in the format x.x.x
+	 *
+	 * @param string $ver1
+	 * @param string $ver2
+	 * @return int -1 if $ver1 < $ver2, 0 if $ver1 == $ver2, 1 if $ver1 > $ver2
+	 */
+	static public function cmpVersion($ver1, $ver2) { /* {{{ */
+		$tmp1 = explode('.', $ver1);
+		$tmp2 = explode('.', $ver2);
+		if(intval($tmp1[0]) < intval($tmp2[0])) {
+			return -1;
+		} elseif(intval($tmp1[0]) > intval($tmp2[0])) {
+			return 1;
+		} else {
+			if(intval($tmp1[1]) < intval($tmp2[1])) {
+				return -1;
+			} elseif(intval($tmp1[1]) > intval($tmp2[1])) {
+				return 1;
+			} else {
+				if(intval($tmp1[2]) < intval($tmp2[2])) {
+					return -1;
+				} elseif(intval($tmp1[2]) > intval($tmp2[2])) {
+					return 1;
+				} else {
+					return 0;
+				}
+			}
+		}
+	} /* }}} */
+
+	/**
+	 * Constructor of extension manager
+	 *
+	 * Reads the configuration of all extensions and creates the
+	 * configuration file if it does not exist and the extension dir
+	 * is given
+	 */
+	public function __construct($extdir = '', $cachedir = '') {
 		$this->cachedir = $cachedir;
 		$this->extdir = $extdir;
+		$this->extconf = array();
+		if($extdir) {
+			if(!file_exists($this->getExtensionsConfFile())) {
+				$this->createExtensionConf();
+			}
+			include($this->getExtensionsConfFile());
+			if($EXT_CONF) {
+				$this->extconf = $EXT_CONF;
+			}
+		}
 	}
 
-	function getExtensionsConfFile() { /* {{{ */
+	protected function getExtensionsConfFile() { /* {{{ */
 		return $this->cachedir."/extensions.php";
 	} /* }}} */
 
+	/**
+	 * Get the configuration of extensions
+	 *
+	 * @return array[]
+	 */
+	public function getExtensionConfiguration() { /* {{{ */
+		return $this->extconf;
+	} /* }}} */
+
 	/**
 	 * Create the cached file containing extension information
 	 *
 	 * This function will always create a file, even if no extensions
 	 * are installed.
 	 */
-	function createExtensionConf() { /* {{{ */
+	public function createExtensionConf() { /* {{{ */
 		$extensions = self::getExtensions();
-		$fp = fopen(self::getExtensionsConfFile(), "w");
+		$fp = @fopen(self::getExtensionsConfFile(), "w");
 		if($fp) {
 			if($extensions) {
 				foreach($extensions as $_ext) {
@@ -74,7 +144,7 @@ class SeedDMS_Extension_Mgr {
 		}
 	} /* }}} */
 
-	function getExtensions() { /* {{{ */
+	protected function getExtensions() { /* {{{ */
 		$extensions = array();
 		if(file_exists($this->extdir)) {
 			$handle = opendir($this->extdir);
@@ -103,6 +173,92 @@ class SeedDMS_Extension_Mgr {
 		return $tmpfile;
 	} /* }}} */
 
+	/**
+	 * Check content of extension directory
+	 *
+	 * @param string $dir full path to extension directory or extension name
+	 * @param boolean $noconstraints set to true if constraints to local seeddms
+	 * installation shall not be checked.
+	 */
+	public function checkExtension($dir, $noconstraints=false) { /* {{{ */
+		$this->errmsgs = array();
+
+		if(!file_exists($dir)) {
+			if(!file_exists($this->extdir.'/'.$dir))
+				return false;
+			else
+				$dir = $this->extdir.'/'.$dir;
+		}
+		if(!file_exists($dir."/conf.php")) {
+			$this->errmsgs[] = "Missing extension configuration";
+			return false;
+		}
+		include($dir."/conf.php");
+		if(!isset($EXT_CONF)) {
+			$this->errmsgs[] = "Missing \$EXT_CONF in configuration";
+			return false;
+		}
+		$extname = key($EXT_CONF);
+		if(!$extname || !preg_match('/[a-zA-Z_]*/', $extname)) {
+			return false;
+		}
+
+		$extconf = $EXT_CONF[$extname];
+		if(!isset($extconf['constraints']['depends']['seeddms'])) {
+			$this->errmsgs[] = "Missing dependency on SeedDMS";
+		}
+		if(!isset($extconf['constraints']['depends']['php'])) {
+			$this->errmsgs[] = "Missing dependency on PHP";
+		}
+		if(!isset($extconf['version'])) {
+			$this->errmsgs[] = "Missing version information";
+		}
+		if(!isset($extconf['title'])) {
+			$this->errmsgs[] = "Missing title";
+		}
+		if(!isset($extconf['author'])) {
+			$this->errmsgs[] = "Missing author";
+		}
+		if(!empty($extconf['language']['file']) && !file_exists($dir."/".$extconf['language']['file'])) {
+			$this->errmsgs[] = "Missing language file";
+		}
+		if(!empty($extconf['class']['file']) && !file_exists($dir."/".$extconf['class']['file'])) {
+			$this->errmsgs[] = "Missing class file";
+		}
+
+		if(!$noconstraints && isset($extconf['constraints']['depends'])) {
+			foreach($extconf['constraints']['depends'] as $dkey=>$dval) {
+				switch($dkey) {
+				case 'seeddms':
+					$version = new SeedDMS_Version;
+					$tmp = explode('-', $dval, 2);
+					if(self::cmpVersion($tmp[0], $version->version()) > 0 || ($tmp[1] && self::cmpVersion($tmp[1], $version->version()) < 0))
+						$this->errmsgs[] = sprintf("Incorrect SeedDMS version (needs version %s)", $extconf['constraints']['depends']['seeddms']);
+					break;
+				case 'php':
+					$tmp = explode('-', $dval, 2);
+					if(self::cmpVersion($tmp[0], phpversion()) > 0 || ($tmp[1] && self::cmpVersion($tmp[1], phpversion()) < 0))
+						$this->errmsgs[] = sprintf("Incorrect PHP version (needs version %s)", $extconf['constraints']['depends']['php']);
+					break;
+				default:
+					$tmp = explode('-', $dval, 2);
+					if(isset($GLOBALS['EXT_CONF'][$dkey]['version'])) {
+						if(self::cmpVersion($tmp[0], $GLOBALS['EXT_CONF'][$dkey]['version']) > 0 || ($tmp[1] && self::cmpVersion($tmp[1], $GLOBALS['EXT_CONF'][$dkey]['version']) < 0))
+							$this->errmsgs[] = sprintf("Incorrect version of extension '%s' (needs version '%s' but provides '%s')", $dkey, $dval, $GLOBALS['EXT_CONF'][$dkey]['version']);
+					} else {
+						$this->errmsgs[] = sprintf("Missing extension or version for '%s'", $dkey);
+					}
+					break;
+				}
+			}
+		}
+
+		if($this->errmsgs)
+			return false;
+
+		return true;
+	} /* }}} */
+
 	static protected function rrmdir($dir) { /* {{{ */
 		if (is_dir($dir)) { 
 			$objects = scandir($dir); 
@@ -116,41 +272,77 @@ class SeedDMS_Extension_Mgr {
 		} 
 	} /* }}} */
 
+	/**
+	 * Update an extension
+	 *
+	 * This function will replace an existing extension or add a new extension
+	 * The passed file has to be zipped content of the extension directory not
+	 * including the directory itself.
+	 *
+	 * @param string $file name of extension archive
+	 * @return boolean true on success, othewise false
+	 */
 	public function updateExtension($file) { /* {{{ */
 		$newdir = $this->cachedir ."/ext.new";
 		if(!mkdir($newdir, 0755)) {
+			$this->errmsgs[] = "Cannot create temp. extension directory";
 			return false;
 		}
 		$cmd = "cd ".$newdir."; unzip ".$file;
 		exec($cmd);
 
-		if(!file_exists($newdir."/conf.php")) {
+		if(!self::checkExtension($newdir)) {
 			self::rrmdir($newdir);
 			return false;
 		}
 
 		include($newdir."/conf.php");
-		if(!isset($EXT_CONF)) {
-			self::rrmdir($newdir);
-			return false;
-		}
 		$extname = key($EXT_CONF);
-		if(!$extname || !preg_match('/[a-zA-Z_]*/', $extname)) {
-			self::rrmdir($newdir);
-			return false;
-		}
 
+		/* Create the target directory */
 		if(!is_dir($this->extdir)) {
 			if(!mkdir($this->extdir, 0755)) {
+				$this->errmsgs[] = "Cannot create extension directory";
 				self::rrmdir($newdir);
 				return false;
 			}
 		} elseif(is_dir($this->extdir ."/". $extname)) {
 			$this->rrmdir($this->extdir ."/". $extname);
 		}
+		/* Move the temp. created ext directory to the final location */
 		rename($newdir, $this->extdir ."/". $extname);
 
 		return true;
 	} /* }}} */
 
+	/**
+	 * Import list of extension from repository
+	 *
+	 */
+	public function importExtensionList($url) { /* {{{ */
+		$file = file_get_contents($url."/repository.json");
+		file_put_contents($this->cachedir."/repository.json", $file);
+		return file($this->cachedir."/repository.json");
+	} /* }}} */
+
+	/**
+	 * Return last error message
+	 *
+	 * @return string
+	 */
+	public function getErrorMsg() { /* {{{ */
+		if($this->errmsgs)
+			return $this->errmsgs[0];
+		else
+			return '';
+	} /* }}} */
+
+	/**
+	 * Return all error messages
+	 *
+	 * @return string[]
+	 */
+	public function getErrorMsgs() { /* {{{ */
+		return $this->errmsgs;
+	} /* }}} */
 }
diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 1532ea793..c2c7829ad 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -79,39 +79,6 @@ function getReadableDurationArray($secs) { /* {{{ */
 	return $units;
 } /* }}} */
 
-/**
- * Compare two version
- *
- * This functions compares two version in the format x.x.x
- *
- * @param string $ver1
- * @param string $ver2
- * @return int -1 if $ver1 < $ver2, 0 if $ver1 == $ver2, 1 if $ver1 > $ver2
- */
-function cmpVersion($ver1, $ver2) {
-	$tmp1 = explode('.', $ver1);
-	$tmp2 = explode('.', $ver2);
-	if(intval($tmp1[0]) < intval($tmp2[0])) {
-		return -1;
-	} elseif(intval($tmp1[0]) > intval($tmp2[0])) {
-		return 1;
-	} else {
-		if(intval($tmp1[1]) < intval($tmp2[1])) {
-			return -1;
-		} elseif(intval($tmp1[1]) > intval($tmp2[1])) {
-			return 1;
-		} else {
-			if(intval($tmp1[2]) < intval($tmp2[2])) {
-				return -1;
-			} elseif(intval($tmp1[2]) > intval($tmp2[2])) {
-				return 1;
-			} else {
-				return 0;
-			}
-		}
-	}
-}
-
 //
 // The original string sanitizer, kept for reference.
 //function sanitizeString($string) {

From 52fc4cbe69c318c76178c92c555c640bfb2d4891 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 13 Mar 2018 14:38:49 +0100
Subject: [PATCH 029/147] add import from repository

---
 inc/inc.Extension.php                  |  11 +--
 op/op.ExtensionMgr.php                 |  32 +++++++-
 out/out.ExtensionMgr.php               |   6 +-
 views/bootstrap/class.ExtensionMgr.php | 107 ++++++++++++++++---------
 4 files changed, 102 insertions(+), 54 deletions(-)

diff --git a/inc/inc.Extension.php b/inc/inc.Extension.php
index b8f5f4def..c72458b28 100644
--- a/inc/inc.Extension.php
+++ b/inc/inc.Extension.php
@@ -17,12 +17,7 @@ require_once "inc.Version.php";
 require_once "inc.Utils.php";
 
 $extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
-$extconffile = $extMgr->getExtensionsConfFile();
-if(!file_exists($extconffile)) {
-	$extMgr->createExtensionConf();
-}
-$EXT_CONF = array();
-include($extconffile);
+$EXT_CONF = $extMgr->getExtensionConfiguration();
 
 $version = new SeedDMS_Version;
 
@@ -31,7 +26,7 @@ foreach($EXT_CONF as $extname=>$extconf) {
 		/* check for requirements */
 		if(!empty($extconf['constraints']['depends']['seeddms'])) {
 			$t = explode('-', $extconf['constraints']['depends']['seeddms'], 2);
-			if(cmpVersion($t[0], $version->version()) > 0 || ($t[1] && cmpVersion($t[1], $version->version()) < 0))
+			if(SeedDMS_Extension_Mgr::cmpVersion($t[0], $version->version()) > 0 || ($t[1] && SeedDMS_Extension_Mgr::cmpVersion($t[1], $version->version()) < 0))
 				$extconf['disable'] = true;
 		}
 	}
@@ -48,7 +43,7 @@ foreach($EXT_CONF as $extname=>$extconf) {
 			if(file_exists($langfile)) {
 				unset($__lang);
 				include($langfile);
-				if($__lang) {
+				if(isset($__lang) && $__lang) {
 					foreach($__lang as $lang=>&$data) {
 						if(isset($GLOBALS['LANG'][$lang]))
 							$GLOBALS['LANG'][$lang] = array_merge($GLOBALS['LANG'][$lang], $data);
diff --git a/op/op.ExtensionMgr.php b/op/op.ExtensionMgr.php
index f65388f2a..e7ac9640f 100644
--- a/op/op.ExtensionMgr.php
+++ b/op/op.ExtensionMgr.php
@@ -57,17 +57,18 @@ if ($action == "download") {
 	}
 	add_log_line();
 } /* }}} */
-elseif ($action == "refresh") {
+elseif ($action == "refresh") { /* {{{ */
 	$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
 	$extMgr->createExtensionConf();
 	$controller->setParam('extmgr', $extMgr);
 	if (!$controller($_POST)) {
 		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
 	}
+	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_extension_refresh')));
 	add_log_line();
 	header("Location:../out/out.ExtensionMgr.php");
-}
-elseif ($action == "upload") {
+} /* }}} */
+elseif ($action == "upload") { /* {{{ */
 	if($_FILES['userfile']['error']) {
 		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
 	}
@@ -80,9 +81,32 @@ elseif ($action == "upload") {
 	if (!$controller($_POST)) {
 		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
 	}
+	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_extension_import')));
 	add_log_line();
 	header("Location:../out/out.ExtensionMgr.php");
-}
+} /* }}} */
+elseif ($action == "import") { /* {{{ */
+	if(!$_POST['url']) {
+		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
+	}
+	$reposurl = 'http://seeddms.steinmann.cx/repository';
+	$content = file_get_contents($reposurl."/".$_POST['url']);
+	$file = tempnam(sys_get_temp_dir(), '');
+	file_put_contents($file, $content);
+
+	$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
+	$controller->setParam('extmgr', $extMgr);
+	$controller->setParam('file', $file);
+	$_POST['action'] = 'upload';
+	if (!$controller($_POST)) {
+		unlink($file);
+		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
+	}
+	unlink($file);
+	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_extension_upload')));
+	add_log_line();
+	header("Location:../out/out.ExtensionMgr.php");
+} /* }}} */
 
 
 ?>
diff --git a/out/out.ExtensionMgr.php b/out/out.ExtensionMgr.php
index 0f8ddb823..a55155f33 100644
--- a/out/out.ExtensionMgr.php
+++ b/out/out.ExtensionMgr.php
@@ -33,12 +33,14 @@ if (!$user->isAdmin()) {
 }
 
 $v = new SeedDMS_Version;
+$extmgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
+$currenttab = 'installed';
 
 if($view) {
 	$view->setParam('httproot', $settings->_httpRoot);
 	$view->setParam('version', $v);
-	$view->setParam('partitionsize', 200000);
-	$view->setParam('maxuploadsize', 2000000);
+	$view->setParam('extmgr', $extmgr);
+	$view->setParam('currenttab', $currenttab);
 	$view($_GET);
 	exit;
 }
diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index 6881fffd3..5de24cbec 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -28,9 +28,6 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
-		$partitionsize = $this->params['partitionsize'];
-		$maxuploadsize = $this->params['maxuploadsize'];
-
 		header('Content-Type: application/javascript');
 ?>
 		$(document).ready( function() {
@@ -57,6 +54,11 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 				});
 */
 			});
+
+			$('a.import').click(function(ev){
+				var element = $(this);
+				$('#'+element.data('extname')+'-import').submit();
+			});
 		});
 <?php
 	} /* }}} */
@@ -66,6 +68,10 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$httproot = $this->params['httproot'];
 		$version = $this->params['version'];
+		$extmgr = $this->params['extmgr'];
+		$currenttab = $this->params['currenttab'];
+
+		$reposurl = 'http://seeddms.steinmann.cx/repository';
 
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
@@ -87,12 +93,18 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			<div class="control-group">
 				<label class="control-label" for="enddate"></label>
 				<div class="controls">
-					<button id="upload" type="_submit" class="btn"><i class="icon-upload"></i> <?= getMLText("upload_extension"); ?></button>
+					<button id="upload" type="_submit" class="btn"><i class="icon-upload"></i> <?= getMLText("impor_extension"); ?></button>
 				</div>
 			</div>
 		</form>
 	</div>
 	<div class="span8">
+		<ul class="nav nav-tabs" id="extensionstab">
+			<li class="<?php if(!$currenttab || $currenttab == 'installed') echo 'active'; ?>"><a data-target="#installed" data-toggle="tab"><?php printMLText('extensions_installed'); ?></a></li>
+			<li class="<?php if($currenttab == 'repository') echo 'active'; ?>"><a data-target="#repository" data-toggle="tab"><?php printMLText('extensions_repository'); ?></a></li>
+		</ul>
+		<div class="tab-content">
+			<div class="tab-pane <?php if(!$currenttab || $currenttab == 'installed') echo 'active'; ?>" id="installed">
 <?php
 //		$this->contentContainerStart();
 		echo "<table class=\"table _table-condensed\">\n";
@@ -101,43 +113,14 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 		print "<th>".getMLText('name')."</th>\n";	
 		print "<th>".getMLText('version')."</th>\n";	
 		print "<th>".getMLText('author')."</th>\n";	
-		print "</tr></thead>\n";
+		print "<th></th>\n";	
+		print "</tr></thead><tbody>\n";
 		$errmsgs = array();
 		foreach($GLOBALS['EXT_CONF'] as $extname=>$extconf) {
 			$errmsgs = array();
 			if(!isset($extconf['disable']) || $extconf['disable'] == false) {
-				/* check dependency on specific seeddms version */
-				if(!isset($extconf['constraints']['depends']['seeddms']))
-					$errmsgs[] = "Missing dependency on SeedDMS";
-				if(!isset($extconf['constraints']['depends']['php']))
-					$errmsgs[] = "Missing dependency on PHP";
-
-				if(isset($extconf['constraints']['depends'])) {
-					foreach($extconf['constraints']['depends'] as $dkey=>$dval) {
-						switch($dkey) {
-						case 'seeddms':
-							$tmp = explode('-', $dval, 2);
-							if(cmpVersion($tmp[0], $version->version()) > 0 || ($tmp[1] && cmpVersion($tmp[1], $version->version()) < 0))
-								$errmsgs[] = sprintf("Incorrect SeedDMS version (needs version %s)", $extconf['constraints']['depends']['seeddms']);
-							break;
-						case 'php':
-							$tmp = explode('-', $dval, 2);
-							if(cmpVersion($tmp[0], phpversion()) > 0 || ($tmp[1] && cmpVersion($tmp[1], phpversion()) < 0))
-								$errmsgs[] = sprintf("Incorrect PHP version (needs version %s)", $extconf['constraints']['depends']['php']);
-							break;
-						default:
-							$tmp = explode('-', $dval, 2);
-							if(isset($GLOBALS['EXT_CONF'][$dkey]['version'])) {
-								if(cmpVersion($tmp[0], $GLOBALS['EXT_CONF'][$dkey]['version']) > 0 || ($tmp[1] && cmpVersion($tmp[1], $GLOBALS['EXT_CONF'][$dkey]['version']) < 0))
-									$errmsgs[] = sprintf("Incorrect version of extension '%s' (needs version '%s' but provides '%s')", $dkey, $dval, $GLOBALS['EXT_CONF'][$dkey]['version']);
-							} else {
-								$errmsgs[] = sprintf("Missing extension or version for '%s'", $dkey);
-							}
-							break;
-						}
-					}
-				}
-
+				$extmgr->checkExtension($extname);
+				$errmsgs = $extmgr->getErrorMsgs();
 				if($errmsgs)
 					echo "<tr class=\"error\">";
 				else
@@ -146,23 +129,25 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 				echo "<tr class=\"warning\">";
 			echo "<td>";
 			if($extconf['icon'])
-				echo "<img src=\"".$httproot."ext/".$extname."/".$extconf['icon']."\">";
+				echo "<img src=\"".$httproot."ext/".$extname."/".$extconf['icon']."\" alt=\"".$extname."\" title=\"".$extname."\">";
 			echo "</td>";
 			echo "<td>".$extconf['title']."<br /><small>".$extconf['description']."</small>";
 			if($errmsgs)
 				echo "<div><img src=\"".$this->getImgPath("attention.gif")."\"> ".implode('<br /><img src="'.$this->getImgPath("attention.gif").'"> ', $errmsgs)."</div>";
 			echo "</td>";
 			echo "<td nowrap>".$extconf['version']."<br /><small>".$extconf['releasedate']."</small>";
+			echo "</td>";
+			echo "<td nowrap><a href=\"mailto:".$extconf['author']['email']."\">".$extconf['author']['name']."</a><br /><small>".$extconf['author']['company']."</small></td>";
+			echo "<td nowrap>";
 			echo "<div class=\"list-action\">";
 			if($extconf['config'])
 				echo "<a href=\"../out/out.Settings.php?currenttab=extensions#".$extname."\" title=\"".getMLText('configure_extension')."\"><i class=\"icon-cogs\"></i></a>";
 			echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$extname."-download\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"download\" /><input type=\"hidden\" name=\"extname\" value=\"".$extname."\" /><a class=\"download\" data-extname=\"".$extname."\" title=\"".getMLText('download_extension')."\"><i class=\"icon-download\"></i></a></form>";
 			echo "</div>";
 			echo "</td>";
-			echo "<td nowrap><a href=\"mailto:".$extconf['author']['email']."\">".$extconf['author']['name']."</a><br /><small>".$extconf['author']['company']."</small></td>";
 			echo "</tr>\n";
 		}
-		echo "</table>\n";
+		echo "</tbody></table>\n";
 ?>
 <form action="../op/op.ExtensionMgr.php" name="form1" method="post">
   <?php echo createHiddenFieldWithKey('extensionmgr'); ?>
@@ -172,6 +157,48 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 <?php
 //		$this->contentContainerEnd();
 ?>
+			</div>
+
+			<div class="tab-pane <?php if($currenttab == 'repository') echo 'active'; ?>" id="repository">
+<?php
+		echo "<table class=\"table _table-condensed\">\n";
+		print "<thead>\n<tr>\n";
+		print "<th></th>\n";	
+		print "<th>".getMLText('name')."</th>\n";	
+		print "<th>".getMLText('version')."</th>\n";	
+		print "<th>".getMLText('author')."</th>\n";	
+		print "<th></th>\n";	
+		print "</tr></thead><tbody>\n";
+		$list = $extmgr->importExtensionList($reposurl);
+		foreach($list as $e) {
+			if($e[0] != '#') {
+				$re = json_decode($e);
+				$needsupdate = !isset($GLOBALS['EXT_CONF'][$re->name]) || SeedDMS_Extension_Mgr::cmpVersion($re->version, $GLOBALS['EXT_CONF'][$re->name]['version']) > 0;
+				echo "<tr";
+				if(isset($GLOBALS['EXT_CONF'][$re->name])) {
+					if($needsupdate)
+						echo " class=\"warning\"";
+					else
+						echo " class=\"success\"";
+				}
+				echo ">";
+				echo "<td></td>";
+				echo "<td>".$re->title."<br /><small>".$re->description."</small></td>";
+				echo "<td nowrap>".$re->version."<br /><small>".$re->releasedate."</small></td>";
+				echo "<td nowrap>".$re->author->name."<br /><small>".$re->author->company."</small></td>";
+				echo "<td nowrap>";
+				echo "<div class=\"list-action\">";
+				if($needsupdate)
+					echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$extname."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"url\" value=\"".$re->filename."\" /><a class=\"import\" data-extname=\"".$extname."\" title=\"".getMLText('import_extension')."\"><i class=\"icon-download\"></i></a></form>";
+				echo "</div>";
+				echo "</td>";
+				echo "</tr>";
+			}
+		}	
+		echo "</tbody></table>\n";
+?>
+			</div>
+		</div>
   </div>
  </div>
 <?php

From ca3fc81776c050b092bad5b373783116b926fadf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 13 Mar 2018 14:39:58 +0100
Subject: [PATCH 030/147] some new phrases for extension mgr

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

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index d844604b7..3a01d45ff 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -257,6 +257,7 @@ URL: [url]',
 'comment' => 'تعليق',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'تعليق على الاصدار',
+'configure_extension' => '',
 'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'نعم: اود اعادة انشاء فهرس للنص الكامل !',
 'confirm_move_document' => '',
@@ -399,6 +400,7 @@ URL: [url]',
 'does_not_expire' => 'لا ينتهى صلاحيته',
 'does_not_inherit_access_msg' => 'صلاحيات موروثة',
 'download' => 'تنزيل',
+'download_extension' => '',
 'download_links' => '',
 'download_link_email_body' => '',
 'download_link_email_subject' => '',
@@ -492,6 +494,7 @@ Parent folder: [folder_path]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - تم تغيير تاريخ الصلاحية',
 'export' => '',
+'extension_archive' => '',
 'extension_manager' => 'ﺇﺩﺍﺭﺓ ﺍﻼﻣﺩﺍﺩﺎﺗ',
 'february' => 'فبراير',
 'file' => 'ملف',
@@ -581,6 +584,7 @@ URL: [url]',
 'identical_version' => 'الاصدار الجديد مماثل للاصدار الحالي.',
 'import' => 'ﺎﺴﺘﺧﺭﺎﺟ',
 'importfs' => '',
+'import_extension' => '',
 'import_fs' => 'ﻦﺴﺧ ﻢﻧ ﻢﻠﻓ ﺎﻠﻨﻇﺎﻣ',
 'import_fs_warning' => '',
 'include_content' => '',
@@ -1453,6 +1457,8 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => '',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index d5dbbe8f1..0e81c4e00 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -242,6 +242,7 @@ $text = array(
 'comment' => 'Коментар',
 'comment_changed_email' => 'Коментарите са изменени',
 'comment_for_current_version' => 'Коментар за версията',
+'configure_extension' => '',
 'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Да, пресъздай пълнотекстов индекс!',
 'confirm_move_document' => '',
@@ -354,6 +355,7 @@ $text = array(
 'does_not_expire' => 'Безсрочен',
 'does_not_inherit_access_msg' => 'Наследване нивото на достъп',
 'download' => 'Изтегли',
+'download_extension' => '',
 'download_links' => '',
 'download_link_email_body' => '',
 'download_link_email_subject' => '',
@@ -443,6 +445,7 @@ $text = array(
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
 'export' => '',
+'extension_archive' => '',
 'extension_manager' => 'управление на добавките',
 'february' => 'Февруари',
 'file' => 'Файл',
@@ -512,6 +515,7 @@ $text = array(
 'identical_version' => 'Новата версия е идентична с текущата.',
 'import' => '',
 'importfs' => '',
+'import_extension' => '',
 'import_fs' => 'добави от файловата система',
 'import_fs_warning' => '',
 'include_content' => '',
@@ -1318,6 +1322,8 @@ $text = array(
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => '',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 5f6bc0bf1..629765ed2 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 (738)
+//    Translators: Admin (741)
 
 $text = array(
 '2_factor_auth' => '',
@@ -172,7 +172,7 @@ URL: [url]',
 'at_least_n_users_of_group' => '',
 'august' => 'Agost',
 'authentication' => '',
-'author' => '',
+'author' => 'Autor',
 'automatic_status_update' => 'Canvi automátic d\'estat',
 'back' => 'Endarrere',
 'backup_list' => 'Llista de còpies de seguretat existents',
@@ -247,6 +247,7 @@ URL: [url]',
 'comment' => 'Comentaris',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Comentari de la versió actual',
+'configure_extension' => '',
 'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '',
 'confirm_move_document' => '',
@@ -359,6 +360,7 @@ URL: [url]',
 'does_not_expire' => 'No caduca',
 'does_not_inherit_access_msg' => 'heretar l\'accés',
 'download' => 'Descarregar',
+'download_extension' => '',
 'download_links' => '',
 'download_link_email_body' => '',
 'download_link_email_subject' => '',
@@ -448,6 +450,7 @@ URL: [url]',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
 'export' => '',
+'extension_archive' => '',
 'extension_manager' => 'Gestiona les Extensions',
 'february' => 'Febrer',
 'file' => 'Fitxer',
@@ -517,6 +520,7 @@ URL: [url]',
 'identical_version' => '',
 'import' => 'importar',
 'importfs' => '',
+'import_extension' => '',
 'import_fs' => 'Importa del sistema d\'arxius',
 'import_fs_warning' => 'Només funciona arrastrant carpetes.La operació importarà recursivament totes les carpetes i arxius.',
 'include_content' => '',
@@ -597,7 +601,7 @@ URL: [url]',
 'language' => 'Llenguatge',
 'lastaccess' => '',
 'last_update' => 'Última modificació',
-'legend' => '',
+'legend' => 'Llegenda',
 'librarydoc' => '',
 'linked_documents' => 'Documents relacionats',
 'linked_files' => 'Adjunts',
@@ -1323,6 +1327,8 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => '',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
@@ -1358,7 +1364,7 @@ URL: [url]',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'state_and_next_state' => '',
-'statistic' => '',
+'statistic' => 'Estadístiques',
 'status' => 'Estat',
 'status_approval_rejected' => 'Esborrany rebutjat',
 'status_approved' => 'Aprovat',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 9fbdb846c..43979af55 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -264,6 +264,7 @@ URL: [url]',
 'comment' => 'Komentář',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Komentář k aktuální verzi',
+'configure_extension' => '',
 'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Ano, chci znovu vytvořit fulltext indes!',
 'confirm_move_document' => '',
@@ -406,6 +407,7 @@ URL: [url]',
 'does_not_expire' => 'Platnost nikdy nevyprší',
 'does_not_inherit_access_msg' => 'Zdědit přístup',
 'download' => 'Stáhnout',
+'download_extension' => '',
 'download_links' => '',
 'download_link_email_body' => '',
 'download_link_email_subject' => '',
@@ -499,6 +501,7 @@ Uživatel: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Datum ukončení platnosti změněn',
 'export' => '',
+'extension_archive' => '',
 'extension_manager' => 'Správa rozšíření',
 'february' => 'Únor',
 'file' => 'Soubor',
@@ -588,6 +591,7 @@ URL: [url]',
 'identical_version' => 'Nová verze je identická s verzí současnou',
 'import' => '',
 'importfs' => '',
+'import_extension' => '',
 'import_fs' => 'Nahrát ze souboru',
 'import_fs_warning' => '',
 'include_content' => '',
@@ -1462,6 +1466,8 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Změny složky uloženy',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 4b594960c..3c8883b85 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 (2553), dgrutsch (22)
+//    Translators: Admin (2560), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -269,6 +269,7 @@ URL: [url]',
 'comment' => 'Kommentar',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Kommentar zur aktuellen Version',
+'configure_extension' => 'Erweiterung konfigurieren',
 'confirm_clear_cache' => 'Wollen Sie wirklich den Cache löschen? Dies entfernt alle vorberechneten Vorschaubilder.',
 'confirm_create_fulltext_index' => 'Ja, Ich möchte den Volltextindex neu erzeugen!.',
 'confirm_move_document' => 'Dokument wirklich verschieben?',
@@ -416,6 +417,7 @@ URL: [url]',
 'does_not_expire' => 'Kein Ablaufdatum',
 'does_not_inherit_access_msg' => 'Berechtigungen wieder erben',
 'download' => 'Download',
+'download_extension' => 'Erweiterung als zip-Datei herunterladen',
 'download_links' => 'Download Links',
 'download_link_email_body' => 'Klicken Sie bitte auf den untenstehenden Link, um Version [version] des Dokuments \'[docname]\' herunter zu laden.
 
@@ -515,6 +517,7 @@ Benutzer: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Ablaufdatum geändert',
 'export' => 'Export',
+'extension_archive' => 'Erweiterung',
 'extension_manager' => 'Erweiterungen verwalten',
 'february' => 'Februar',
 'file' => 'Datei',
@@ -604,6 +607,7 @@ URL: [url]',
 'identical_version' => 'Neue Version ist identisch zu aktueller Version.',
 'import' => 'Importiere',
 'importfs' => 'Importiere aus Dateisystem',
+'import_extension' => 'Erweiterung importieren',
 'import_fs' => 'Aus Dateisystem importieren',
 'import_fs_warning' => 'Der Import kann nur für Ordner im Ablageordner erfolgen. Alle Ordner und Dateien werden rekursiv importiert. Dateien werden sofort freigegeben.',
 'include_content' => 'Inhalte mit exportieren',
@@ -1528,6 +1532,8 @@ Name: [username]
 'splash_error_add_to_transmittal' => 'Fehler beim Hinzufügen zur Dokumentenliste',
 'splash_error_rm_download_link' => 'Fehler beim Löschen des Download-Links',
 'splash_error_send_download_link' => 'Fehler beim Verschicken des Download-Links',
+'splash_extension_import' => 'Erweiterung installiert',
+'splash_extension_refresh' => 'Liste der Erweiterungen neu geladen',
 'splash_folder_edited' => 'Änderungen am Ordner gespeichert',
 'splash_importfs' => '[docs] Dokumente und [folders] Ordner importiert',
 'splash_inherit_access' => 'Zugriffsrechte werden geerbt',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 67152e207..58c63dc08 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -242,6 +242,7 @@ $text = array(
 'comment' => 'Σχόλιο',
 'comment_changed_email' => '',
 'comment_for_current_version' => '',
+'configure_extension' => '',
 'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '',
 'confirm_move_document' => '',
@@ -354,6 +355,7 @@ $text = array(
 'does_not_expire' => '',
 'does_not_inherit_access_msg' => '',
 'download' => '',
+'download_extension' => '',
 'download_links' => '',
 'download_link_email_body' => '',
 'download_link_email_subject' => '',
@@ -443,6 +445,7 @@ $text = array(
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
 'export' => '',
+'extension_archive' => '',
 'extension_manager' => '',
 'february' => 'Φεβρουάριος',
 'file' => 'Αρχείο',
@@ -512,6 +515,7 @@ $text = array(
 'identical_version' => '',
 'import' => '',
 'importfs' => '',
+'import_extension' => '',
 'import_fs' => '',
 'import_fs_warning' => '',
 'include_content' => '',
@@ -1329,6 +1333,8 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => '',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index e7b5f2545..6db3c24dd 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 (1674), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1681), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -269,6 +269,7 @@ URL: [url]',
 'comment' => 'Comment',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Version comment',
+'configure_extension' => 'Configure extension',
 'confirm_clear_cache' => 'Would you really like to clear the cache? This will remove all precalculated preview images.',
 'confirm_create_fulltext_index' => 'Yes, I would like to recreate the fulltext index!',
 'confirm_move_document' => 'Please confirm moving the document.',
@@ -416,6 +417,7 @@ URL: [url]',
 'does_not_expire' => 'Does not expire',
 'does_not_inherit_access_msg' => 'Inherit access',
 'download' => 'Download',
+'download_extension' => 'Download extension as zip file',
 'download_links' => 'Download links',
 'download_link_email_body' => 'Click on the link below to download the version [version] of document
 \'[docname]\'.
@@ -516,6 +518,7 @@ User: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Expiry date changed',
 'export' => 'Export',
+'extension_archive' => 'Extension',
 'extension_manager' => 'Manage extensions',
 'february' => 'February',
 'file' => 'File',
@@ -605,6 +608,7 @@ URL: [url]',
 'identical_version' => 'New version is identical to current version.',
 'import' => 'Import',
 'importfs' => 'Import from Filesystem',
+'import_extension' => 'Import extension',
 'import_fs' => 'Import from filesystem',
 'import_fs_warning' => 'This will only work for folders in the drop folder. The operation recursively imports all folders and files. Files will be released immediately.',
 'include_content' => 'Include content',
@@ -1523,6 +1527,8 @@ Name: [username]
 'splash_error_add_to_transmittal' => 'Error while adding document to transmittal',
 'splash_error_rm_download_link' => 'Error when removing download link',
 'splash_error_send_download_link' => 'Error while sending download link',
+'splash_extension_import' => 'Extensition installed',
+'splash_extension_refresh' => 'Refreshed list of extensions',
 'splash_folder_edited' => 'Save folder changes',
 'splash_importfs' => 'Imported [docs] documents and [folders] folders',
 'splash_inherit_access' => 'Access right will be inherited',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 03f7b0ccb..d4f53f648 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 (1056), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1057), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -264,6 +264,7 @@ URL: [url]',
 'comment' => 'Comentarios',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Comentario de la versión actual',
+'configure_extension' => '',
 'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '¡Sí, quiero regenerar el índice te texto completo¡',
 'confirm_move_document' => '',
@@ -406,6 +407,7 @@ URL: [url]',
 'does_not_expire' => 'No caduca',
 'does_not_inherit_access_msg' => 'heredar el acceso',
 'download' => 'Descargar',
+'download_extension' => '',
 'download_links' => '',
 'download_link_email_body' => '',
 'download_link_email_subject' => '',
@@ -499,6 +501,7 @@ Usuario: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Fecha de caducidad modificada',
 'export' => '',
+'extension_archive' => '',
 'extension_manager' => 'Administrar extensiones',
 'february' => 'Febrero',
 'file' => 'Fichero',
@@ -588,6 +591,7 @@ URL: [url]',
 'identical_version' => 'La nueva versión es idéntica a la actual.',
 'import' => 'Importar',
 'importfs' => '',
+'import_extension' => '',
 'import_fs' => 'Importar desde sistema de archivos',
 'import_fs_warning' => '',
 'include_content' => '',
@@ -871,7 +875,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado
 'pl_PL' => 'Polaco',
 'possible_substitutes' => '',
 'preset_expires' => 'Establece caducidad',
-'preview' => '',
+'preview' => 'anterior',
 'preview_converters' => 'Vista previa del documento convertido',
 'preview_images' => '',
 'preview_markdown' => '',
@@ -1468,6 +1472,8 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Cambios a la carpeta guardados',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index dcc7701f2..d1aa3fba4 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -269,6 +269,7 @@ URL: [url]',
 'comment' => 'Commentaire',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Commentaires pour la version actuelle',
+'configure_extension' => '',
 'confirm_clear_cache' => 'Confirmer l\'effacement du cache',
 'confirm_create_fulltext_index' => 'Oui, je souhaite recréer l\'index de recherche plein texte !',
 'confirm_move_document' => 'Veuillez confirmer le déplacement du document.',
@@ -416,6 +417,7 @@ URL: [url]',
 'does_not_expire' => 'N\'expire jamais',
 'does_not_inherit_access_msg' => 'Accès hérité',
 'download' => 'Téléchargement',
+'download_extension' => '',
 'download_links' => 'Liens de téléchargement',
 'download_link_email_body' => 'Cliquez sur le lien suivant pour télécharger la version [version] du document
 « [docname] ».
@@ -516,6 +518,7 @@ Utilisateur : [username]
 URL : [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Date d\'expiration modifiée',
 'export' => '',
+'extension_archive' => '',
 'extension_manager' => 'Gestionnaire d\'extensions',
 'february' => 'Février',
 'file' => 'Fichier',
@@ -605,6 +608,7 @@ URL: [url]',
 'identical_version' => 'Nouvelle version identique à l\'actuelle.',
 'import' => 'Importer',
 'importfs' => 'Importer depuis le système de fichiers',
+'import_extension' => '',
 'import_fs' => 'Importer depuis le système de fichiers',
 'import_fs_warning' => 'L’importation peut se faire à partir du dossier de dépôt personnel uniquement. Tous les sous-dossiers et fichiers seront importés. Les fichiers seront immédiatement publiés.',
 'include_content' => 'Inclure le contenu',
@@ -1507,6 +1511,8 @@ Nom : [username]
 '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_send_download_link' => 'Erreur lors de l’envoi du lien de téléchargement',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Dossier modifié',
 'splash_importfs' => '[docs] documents et [folders] dossiers importés',
 'splash_inherit_access' => 'Droits d’accès hérités',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index f589390ef..97d790bdd 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -269,6 +269,7 @@ Internet poveznica: [url]',
 'comment' => 'Komentar',
 'comment_changed_email' => 'Promjena komentara',
 'comment_for_current_version' => 'Verzija komentara',
+'configure_extension' => '',
 'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Da, želim ponovo indeksirati cijeli tekst!',
 'confirm_move_document' => '',
@@ -411,6 +412,7 @@ Internet poveznica: [url]',
 'does_not_expire' => 'Ne istječe',
 'does_not_inherit_access_msg' => 'Naslijedi nivo pristupa',
 'download' => 'Preuzimanje',
+'download_extension' => '',
 'download_links' => '',
 'download_link_email_body' => '',
 'download_link_email_subject' => '',
@@ -504,6 +506,7 @@ Korisnik: [username]
 Internet poveznica: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Promijenjen datum isteka',
 'export' => 'Izvoz',
+'extension_archive' => '',
 'extension_manager' => 'Upravljanje ekstenzijama',
 'february' => 'Veljača',
 'file' => 'Datoteka',
@@ -593,6 +596,7 @@ Internet poveznica: [url]',
 'identical_version' => 'Nova verzija je identična trenutnoj verziji.',
 'import' => '',
 'importfs' => '',
+'import_extension' => '',
 'import_fs' => 'Importaj iz FS-a',
 'import_fs_warning' => '',
 'include_content' => 'Uključi sadržaj',
@@ -1489,6 +1493,8 @@ Internet poveznica: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Pohrani izmjene mape',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index f36a4fc22..5ec93e759 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -264,6 +264,7 @@ URL: [url]',
 'comment' => 'Megjegyzés',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Megjegyzés az aktuális verzióhoz',
+'configure_extension' => '',
 'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Igen, szeretném újra létrehozni a teljes szöveg indexet!',
 'confirm_move_document' => '',
@@ -406,6 +407,7 @@ URL: [url]',
 'does_not_expire' => 'Soha nem jár le',
 'does_not_inherit_access_msg' => 'Hozzáférés öröklése',
 'download' => 'Letöltés',
+'download_extension' => '',
 'download_links' => '',
 'download_link_email_body' => '',
 'download_link_email_subject' => '',
@@ -499,6 +501,7 @@ Felhasználó: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Lejárati dátum módosítva',
 'export' => '',
+'extension_archive' => '',
 'extension_manager' => 'Bővítmények kezelése',
 'february' => 'Február',
 'file' => 'Állomány',
@@ -588,6 +591,7 @@ URL: [url]',
 'identical_version' => 'Az új verzió megegyezik az eredetivel.',
 'import' => 'Import',
 'importfs' => '',
+'import_extension' => '',
 'import_fs' => 'Importálás fájlrendszerből',
 'import_fs_warning' => '',
 'include_content' => '',
@@ -1467,6 +1471,8 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Mappa változásainak mentése',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index ed8a2d1d0..51887248d 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -270,6 +270,7 @@ URL: [url]',
 'comment' => 'Commento',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Commento per la versione',
+'configure_extension' => '',
 'confirm_clear_cache' => 'Vuoi davvero cancellare la cache? Questo eliminerà tutte le immagini di anteprima precalcolate.',
 'confirm_create_fulltext_index' => 'Sì, desidero ricreare l\'indice fulltext!',
 'confirm_move_document' => 'Conferma lo spostamento del documento.',
@@ -412,6 +413,7 @@ URL: [url]',
 'does_not_expire' => 'Nessuna scadenza',
 'does_not_inherit_access_msg' => 'Imposta permessi ereditari',
 'download' => 'Scarica',
+'download_extension' => '',
 'download_links' => '',
 'download_link_email_body' => '',
 'download_link_email_subject' => '',
@@ -505,6 +507,7 @@ Utente: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Scadenza cambiata',
 'export' => 'Esporta',
+'extension_archive' => '',
 'extension_manager' => 'Gestisci le estensioni dei files',
 'february' => 'Febbraio',
 'file' => 'File',
@@ -594,6 +597,7 @@ URL: [url]',
 'identical_version' => 'La nuova versione è identica a quella attuale.',
 'import' => 'Importa',
 'importfs' => 'Importa da File System / disco',
+'import_extension' => '',
 'import_fs' => 'Importa dalla cartella di sistema',
 'import_fs_warning' => 'Questo funziona solo per le cartelle nella cartella per lasciare. L\'operazione importa in modo ricorsivo tutte le cartelle e file. I file saranno rilasciati immediatamente.',
 'include_content' => 'Includi contenuto',
@@ -1501,6 +1505,8 @@ URL: [url]',
 'splash_error_add_to_transmittal' => 'Errore durante l\'aggiunta di documento per la trasmissione',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Cartella modificata',
 'splash_importfs' => 'Importati [Documenti] documenti e cartelle [cartelle]',
 'splash_inherit_access' => '',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 1e61747fc..2682893b7 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -271,6 +271,7 @@ URL: [url]',
 'comment' => '주석',
 'comment_changed_email' => '',
 'comment_for_current_version' => '버전 주석',
+'configure_extension' => '',
 'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '예, 전체 텍스트 인덱스를 다시 만들고 싶습니다!',
 'confirm_move_document' => '',
@@ -412,6 +413,7 @@ URL: [url]',
 'does_not_expire' => '만료 안됨',
 'does_not_inherit_access_msg' => '액세스 상속',
 'download' => '내려받기',
+'download_extension' => '',
 'download_links' => '',
 'download_link_email_body' => '',
 'download_link_email_subject' => '',
@@ -505,6 +507,7 @@ URL: [url]',
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename] : [name] - 유효 기간 변경',
 'export' => '내보내기',
+'extension_archive' => '',
 'extension_manager' => '확장자 관리',
 'february' => '2월',
 'file' => '파일',
@@ -594,6 +597,7 @@ URL: [url]',
 'identical_version' => '새 버전은 최신 버전으로 동일하다.',
 'import' => '가져오기',
 'importfs' => '파일시스템으로부터 가져오기',
+'import_extension' => '',
 'import_fs' => '파일시스템으로부터 가져오기',
 'import_fs_warning' => '',
 'include_content' => '내용을 포함',
@@ -1483,6 +1487,8 @@ URL : [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => '저장 폴더 변경',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 756b117f5..3c4660ae8 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -262,6 +262,7 @@ URL: [url]',
 'comment' => 'Commentaar',
 'comment_changed_email' => 'Gewijzigde email',
 'comment_for_current_version' => 'Versie van het commentaar',
+'configure_extension' => '',
 'confirm_clear_cache' => 'Ja, ik wil de cache opschonen!',
 'confirm_create_fulltext_index' => 'Ja, Ik wil de volledigetekst index opnieuw maken!',
 'confirm_move_document' => 'Bevestig verplaatsing van document',
@@ -404,6 +405,7 @@ URL: [url]',
 'does_not_expire' => 'Verloopt niet',
 'does_not_inherit_access_msg' => 'Erft toegang',
 'download' => 'Download',
+'download_extension' => '',
 'download_links' => 'Download-links',
 'download_link_email_body' => 'Klik op de link hieronder, dan begint de download vanvversie [version] van het document
 \'[docname]\'.
@@ -504,6 +506,7 @@ Gebruiker: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Vervaldatum gewijzigd',
 'export' => 'export',
+'extension_archive' => '',
 'extension_manager' => 'Beheer uitbreidingen',
 'february' => 'februari',
 'file' => 'Bestand',
@@ -593,6 +596,7 @@ URL: [url]',
 'identical_version' => 'Nieuwe versie is identiek aan de huidige versie',
 'import' => 'Importeer',
 'importfs' => 'Importeer van bestandssysteem',
+'import_extension' => '',
 'import_fs' => 'Importeer van bestandssysteem',
 'import_fs_warning' => 'Dit werkt alleen in de dropfolder. Mappen en bestanden worden recursief geïmporteerd. Bestanden worden direct ter beschikking gesteld.',
 'include_content' => 'inclusief inhoud',
@@ -1513,6 +1517,8 @@ Name: [username]
 'splash_error_add_to_transmittal' => 'Fout: toevoeging aan verzending',
 'splash_error_rm_download_link' => 'Fout bij verwijderen download-link',
 'splash_error_send_download_link' => 'Fout bij verzenden download-link',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Opslaan mapwijzigingen',
 'splash_importfs' => 'Geïmporteerd: [docs] documenten en [folders] mappen',
 'splash_inherit_access' => '',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 36a73b3d6..3473bb321 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (787), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (790), netixw (84), romi (93), uGn (112)
 
 $text = array(
 '2_factor_auth' => '',
@@ -257,6 +257,7 @@ URL: [url]',
 'comment' => 'Opis',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Komentarz do wersji',
+'configure_extension' => '',
 'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Tak, chcę ponownie utworzyć indeks pełnotekstowy!',
 'confirm_move_document' => '',
@@ -281,8 +282,8 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Zawartość',
 'continue' => 'Kontynuuj',
-'converter_new_cmd' => '',
-'converter_new_mimetype' => '',
+'converter_new_cmd' => 'Komenda',
+'converter_new_mimetype' => 'Nowy typ MIME',
 'copied_to_checkout_as' => '',
 'create_download_link' => '',
 'create_fulltext_index' => 'Utwórz indeks pełnotekstowy',
@@ -399,6 +400,7 @@ URL: [url]',
 'does_not_expire' => 'Nigdy nie wygasa',
 'does_not_inherit_access_msg' => 'Dziedzicz dostęp',
 'download' => 'Pobierz',
+'download_extension' => '',
 'download_links' => '',
 'download_link_email_body' => '',
 'download_link_email_subject' => '',
@@ -492,6 +494,7 @@ Użytkownik: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Zmiana daty wygaśnięcia',
 'export' => '',
+'extension_archive' => '',
 'extension_manager' => 'Zarządzanie rozszerzeniami',
 'february' => 'Luty',
 'file' => 'Plik',
@@ -581,6 +584,7 @@ URL: [url]',
 'identical_version' => 'Nowa wersja jest identyczna z obecną',
 'import' => '',
 'importfs' => '',
+'import_extension' => '',
 'import_fs' => 'Import z systemu plików',
 'import_fs_warning' => '',
 'include_content' => '',
@@ -864,7 +868,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem
 'pl_PL' => 'Polski',
 'possible_substitutes' => '',
 'preset_expires' => 'Wygasa',
-'preview' => '',
+'preview' => 'Podgląd',
 'preview_converters' => '',
 'preview_images' => '',
 'preview_markdown' => '',
@@ -1447,6 +1451,8 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Zapisz zmiany folderu',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 2aeb42b51..9e70b2a44 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -264,6 +264,7 @@ URL: [url]',
 'comment' => 'Comentário',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Comentário para versão atual',
+'configure_extension' => '',
 'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Sim, eu gostaria de recriar o índice de texto completo!',
 'confirm_move_document' => '',
@@ -405,6 +406,7 @@ URL: [url]',
 'does_not_expire' => 'não Expira',
 'does_not_inherit_access_msg' => 'Inherit access',
 'download' => 'Download',
+'download_extension' => '',
 'download_links' => '',
 'download_link_email_body' => '',
 'download_link_email_subject' => '',
@@ -498,6 +500,7 @@ Usuário: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Data de validade mudou',
 'export' => '',
+'extension_archive' => '',
 'extension_manager' => 'Gerenciar extensões',
 'february' => 'February',
 'file' => 'Arquivo',
@@ -587,6 +590,7 @@ URL: [url]',
 'identical_version' => 'Nova versão é idêntica à versão atual.',
 'import' => 'Importar',
 'importfs' => '',
+'import_extension' => '',
 'import_fs' => 'Importar do sistema de arquivos',
 'import_fs_warning' => '',
 'include_content' => '',
@@ -1465,6 +1469,8 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Salvar modificação de pastas',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index d68fd006b..69761669e 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -269,6 +269,7 @@ URL: [url]',
 'comment' => 'Comentariu',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Comentariu versiune',
+'configure_extension' => '',
 'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Da, aș dori să recreeze indexul pentru tot textul!',
 'confirm_move_document' => '',
@@ -411,6 +412,7 @@ URL: [url]',
 'does_not_expire' => 'Nu expiră',
 'does_not_inherit_access_msg' => 'Acces moștenit',
 'download' => 'Descarca',
+'download_extension' => '',
 'download_links' => '',
 'download_link_email_body' => '',
 'download_link_email_subject' => '',
@@ -504,6 +506,7 @@ Utilizator: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Data de expirare schimbată',
 'export' => '',
+'extension_archive' => '',
 'extension_manager' => 'Gestionați extensiile',
 'february' => 'Februarie',
 'file' => 'Fișier',
@@ -593,6 +596,7 @@ URL: [url]',
 'identical_version' => 'Noua versiune este identică cu versiunea curentă.',
 'import' => '',
 'importfs' => '',
+'import_extension' => '',
 'import_fs' => 'Import din filesystem',
 'import_fs_warning' => '',
 'include_content' => '',
@@ -1490,6 +1494,8 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Salvați modificările folderului',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 8e9bd3fd5..582e72576 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -269,6 +269,7 @@ URL: [url]',
 'comment' => 'Комментарий',
 'comment_changed_email' => 'Сообщение об изменении комментария',
 'comment_for_current_version' => 'Комментарий версии',
+'configure_extension' => '',
 'confirm_clear_cache' => 'Подтвердить очистку кеша',
 'confirm_create_fulltext_index' => 'Да, пересоздать полнотекстовый индекс!',
 'confirm_move_document' => 'Подтвердить перемещение документа',
@@ -411,6 +412,7 @@ URL: [url]',
 'does_not_expire' => 'безсрочный',
 'does_not_inherit_access_msg' => 'Наследовать уровень доступа',
 'download' => 'Загрузить',
+'download_extension' => '',
 'download_links' => '',
 'download_link_email_body' => '',
 'download_link_email_subject' => '',
@@ -504,6 +506,7 @@ URL: [url]',
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: изменен срок действия для «[name]»',
 'export' => 'Экспорт',
+'extension_archive' => '',
 'extension_manager' => 'Управление расширениями',
 'february' => 'Февраль',
 'file' => 'Файл',
@@ -593,6 +596,7 @@ URL: [url]',
 'identical_version' => 'Новая версия идентична текущей.',
 'import' => 'Импорт',
 'importfs' => 'Импорт из файлов',
+'import_extension' => '',
 'import_fs' => 'Импорт из файловой системы',
 'import_fs_warning' => 'Предупреждение импорта из ФС',
 'include_content' => 'Включая содержимое',
@@ -1497,6 +1501,8 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Изменения каталога сохранены',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 5c8afcd31..02543b4ed 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -246,6 +246,7 @@ URL: [url]',
 'comment' => 'Komentár',
 'comment_changed_email' => 'Nepreložené',
 'comment_for_current_version' => 'Version comment',
+'configure_extension' => '',
 'confirm_clear_cache' => 'Chcete naozaj vyčistiť vyrovnávaciu pamäť? Tým sa odstránia všetky predbežne náhľady obrázkov.',
 'confirm_create_fulltext_index' => 'Áno, chcel by som obnoviť fullttext index!',
 'confirm_move_document' => 'Potvrďte presunutie dokumentu.',
@@ -358,6 +359,7 @@ URL: [url]',
 'does_not_expire' => 'Platnosť nikdy nevyprší',
 'does_not_inherit_access_msg' => 'Zdediť prístup',
 'download' => 'Stiahnuť',
+'download_extension' => '',
 'download_links' => 'Odkazy na stiahnutie',
 'download_link_email_body' => '',
 'download_link_email_subject' => 'Odkaz na stiahnutie',
@@ -447,6 +449,7 @@ URL: [url]',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '[sitename]: [name] - Dátum vypršania platnosti bol zmenený',
 'export' => 'Exportovať',
+'extension_archive' => '',
 'extension_manager' => 'Správa rozšírení',
 'february' => 'Február',
 'file' => 'Súbor',
@@ -516,6 +519,7 @@ URL: [url]',
 'identical_version' => '',
 'import' => 'Importovať',
 'importfs' => 'Importovať zo súborového systému',
+'import_extension' => '',
 'import_fs' => 'Importovanie zo súborového systému',
 'import_fs_warning' => '',
 'include_content' => 'Zahrnúť obsah',
@@ -1322,6 +1326,8 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Uložiť zmeny zložky',
 'splash_importfs' => 'Importované dokumenty [docs] a zložky [folders]',
 'splash_inherit_access' => '',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 75fbe0033..fa7ec53bc 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -270,6 +270,7 @@ URL: [url]',
 'comment' => 'Kommentar',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Kommentar till versionen',
+'configure_extension' => '',
 'confirm_clear_cache' => 'Vill du verkligen rensa cachen? Detta kommer att ta bort alla förlagrade bilder för förhandsvisning.',
 'confirm_create_fulltext_index' => 'Ja, jag vill återskapa fulltext-sökindex!',
 'confirm_move_document' => 'Vänligen bekräfta flytt av dokumentet.',
@@ -417,6 +418,7 @@ URL: [url]',
 'does_not_expire' => 'Löper aldrig ut',
 'does_not_inherit_access_msg' => 'Ärv behörighet',
 'download' => 'Ladda ner',
+'download_extension' => '',
 'download_links' => 'Nedladdningslänkar',
 'download_link_email_body' => 'Klicka på länken nedan för nedladdning av version [version] av dokumentet
 \'[docname]\'.
@@ -517,6 +519,7 @@ Användare: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Utgångsdatum ändrat',
 'export' => 'Exportera',
+'extension_archive' => '',
 'extension_manager' => 'Hantera tillägg',
 'february' => 'februari',
 'file' => 'Fil',
@@ -606,6 +609,7 @@ URL: [url]',
 'identical_version' => 'Ny version är identisk med nuvarande version.',
 'import' => 'Importera',
 'importfs' => 'Import från filsystem',
+'import_extension' => '',
 'import_fs' => 'Import från filsystem',
 'import_fs_warning' => 'Detta fungerar endast för kataloger i mellanlagringsmappen. Filer och mappar får godkänd status direkt efter importen.',
 'include_content' => 'Inkudera innehåll',
@@ -1510,6 +1514,8 @@ Kommentar: [comment]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => 'Fel vid borttagande av nedladdningslänk',
 'splash_error_send_download_link' => 'Fel vid sändning av nedladdningslänk',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Spara ändringar i katalog',
 'splash_importfs' => 'Importerade [docs] dokument och [folders] kataloger',
 'splash_inherit_access' => '',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 9779e58a8..1ed6d8092 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -263,6 +263,7 @@ URL: [url]',
 'comment' => 'Açıklama',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Versiyon açıklaması',
+'configure_extension' => '',
 'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Evet, tam metin indeksini yeniden oluşturmak istiyorum!',
 'confirm_move_document' => '',
@@ -405,6 +406,7 @@ URL: [url]',
 'does_not_expire' => 'Süresiz',
 'does_not_inherit_access_msg' => 'Erişim haklarını devir al',
 'download' => 'İndir',
+'download_extension' => '',
 'download_links' => '',
 'download_link_email_body' => '',
 'download_link_email_subject' => '',
@@ -498,6 +500,7 @@ Kullanıcı: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Bitiş tarihi değişti',
 'export' => '',
+'extension_archive' => '',
 'extension_manager' => 'Uzantıları düzenle',
 'february' => 'Şubat',
 'file' => 'Dosya',
@@ -587,6 +590,7 @@ URL: [url]',
 'identical_version' => 'Yeni versiyon güncel versiyonla aynı.',
 'import' => '',
 'importfs' => '',
+'import_extension' => '',
 'import_fs' => 'dosya sisteminden getir',
 'import_fs_warning' => '',
 'include_content' => '',
@@ -1469,6 +1473,8 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Klasör değişiklikleri kaydedildi',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index fb1e89480..5a3915237 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -269,6 +269,7 @@ URL: [url]',
 'comment' => 'Коментар',
 'comment_changed_email' => 'Повідомлення про зміну коментаря',
 'comment_for_current_version' => 'Коментар версії',
+'configure_extension' => '',
 'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Так, перестворити повнотекстовий індекс!',
 'confirm_move_document' => '',
@@ -411,6 +412,7 @@ URL: [url]',
 'does_not_expire' => 'Без терміну виконання',
 'does_not_inherit_access_msg' => 'Наслідувати рівень доступу',
 'download' => 'Завантажити',
+'download_extension' => '',
 'download_links' => '',
 'download_link_email_body' => '',
 'download_link_email_subject' => '',
@@ -504,6 +506,7 @@ URL: [url]',
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: зміна дати терміну виконання для «[name]»',
 'export' => 'Експорт',
+'extension_archive' => '',
 'extension_manager' => 'Керування розширеннями',
 'february' => 'Лютий',
 'file' => 'Файл',
@@ -593,6 +596,7 @@ URL: [url]',
 'identical_version' => 'Нова версія ідентична поточній.',
 'import' => '',
 'importfs' => '',
+'import_extension' => '',
 'import_fs' => 'Імпортувати з файлової системи',
 'import_fs_warning' => '',
 'include_content' => 'Включно з вмістом',
@@ -1490,6 +1494,8 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Зміни каталогу збережено',
 'splash_importfs' => '',
 'splash_inherit_access' => '',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 7cd51bf58..5c2b35e06 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 (737), archonwang (469), fengjohn (5)
+//    Translators: Admin (738), archonwang (469), fengjohn (5)
 
 $text = array(
 '2_factor_auth' => '双重认证',
@@ -263,6 +263,7 @@ URL: [url]',
 'comment' => '说明',
 'comment_changed_email' => '',
 'comment_for_current_version' => '版本说明',
+'configure_extension' => '',
 'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '确认重新创建全文索引',
 'confirm_move_document' => '',
@@ -407,6 +408,7 @@ URL: [url]',
 'does_not_expire' => '永不过期',
 'does_not_inherit_access_msg' => '继承访问权限',
 'download' => '下载',
+'download_extension' => '',
 'download_links' => '下载链接',
 'download_link_email_body' => '点击以下链接下载文档 \'[docname]\' 的 [version] 版本。
 
@@ -486,7 +488,7 @@ URL: [url]',
 'exclude_items' => '排除项目',
 'expired' => '过期',
 'expired_at_date' => '',
-'expired_documents' => '',
+'expired_documents' => '过期文档',
 'expires' => '有效限期',
 'expire_by_date' => '指定过期时间',
 'expire_in_1d' => '一天后截止',
@@ -502,6 +504,7 @@ URL: [url]',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
 'export' => '导出',
+'extension_archive' => '',
 'extension_manager' => '扩展管理器',
 'february' => '二 月',
 'file' => '文件',
@@ -591,6 +594,7 @@ URL: [url]',
 'identical_version' => '',
 'import' => '导入',
 'importfs' => '从文件系统中导入',
+'import_extension' => '',
 'import_fs' => '从文件系统导入',
 'import_fs_warning' => '这将只适用于拖动文件夹。该操作将递归导入所有文件夹和文件。文件将立即释放。',
 'include_content' => '',
@@ -1473,6 +1477,8 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '移除下载链接时报错',
 'splash_error_send_download_link' => '发送下载链接时报错',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => '更新文件夹',
 'splash_importfs' => '已导入文档 [docs] 和文件夹 [folders]',
 'splash_inherit_access' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 412434db5..3f945aa5a 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -246,6 +246,7 @@ URL: [url]',
 'comment' => '說明',
 'comment_changed_email' => '',
 'comment_for_current_version' => '版本說明',
+'configure_extension' => '',
 'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '確認已新增之全文索引',
 'confirm_move_document' => '',
@@ -358,6 +359,7 @@ URL: [url]',
 'does_not_expire' => '永不過期',
 'does_not_inherit_access_msg' => '繼承存取權限',
 'download' => '下載',
+'download_extension' => '',
 'download_links' => '',
 'download_link_email_body' => '',
 'download_link_email_subject' => '',
@@ -447,6 +449,7 @@ URL: [url]',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
 'export' => '',
+'extension_archive' => '',
 'extension_manager' => '整體索引進度',
 'february' => '二 月',
 'file' => '文件',
@@ -516,6 +519,7 @@ URL: [url]',
 'identical_version' => '新版本的內容與舊版本完全相同',
 'import' => '匯入',
 'importfs' => '',
+'import_extension' => '',
 'import_fs' => '由檔案系統匯入',
 'import_fs_warning' => '',
 'include_content' => '',
@@ -1322,6 +1326,8 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_import' => '',
+'splash_extension_refresh' => '',
 'splash_folder_edited' => '',
 'splash_importfs' => '',
 'splash_inherit_access' => '',

From 6d802ec7c6633f12b407c76c7ab8d411b64b5cb7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 13 Mar 2018 15:33:13 +0100
Subject: [PATCH 031/147] fix output of translated text

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

diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index 5de24cbec..303727453 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -93,15 +93,15 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			<div class="control-group">
 				<label class="control-label" for="enddate"></label>
 				<div class="controls">
-					<button id="upload" type="_submit" class="btn"><i class="icon-upload"></i> <?= getMLText("impor_extension"); ?></button>
+					<button id="upload" type="_submit" class="btn"><i class="icon-upload"></i> <?= getMLText("import_extension"); ?></button>
 				</div>
 			</div>
 		</form>
 	</div>
 	<div class="span8">
 		<ul class="nav nav-tabs" id="extensionstab">
-			<li class="<?php if(!$currenttab || $currenttab == 'installed') echo 'active'; ?>"><a data-target="#installed" data-toggle="tab"><?php printMLText('extensions_installed'); ?></a></li>
-			<li class="<?php if($currenttab == 'repository') echo 'active'; ?>"><a data-target="#repository" data-toggle="tab"><?php printMLText('extensions_repository'); ?></a></li>
+			<li class="<?php if(!$currenttab || $currenttab == 'installed') echo 'active'; ?>"><a data-target="#installed" data-toggle="tab"><?= getMLText('extensions_installed'); ?></a></li>
+			<li class="<?php if($currenttab == 'repository') echo 'active'; ?>"><a data-target="#repository" data-toggle="tab"><?= getMLText('extensions_repository'); ?></a></li>
 		</ul>
 		<div class="tab-content">
 			<div class="tab-pane <?php if(!$currenttab || $currenttab == 'installed') echo 'active'; ?>" id="installed">

From 9b2eecca0ed1f0b937d34d84ea4bbedf80b860a7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 13 Mar 2018 17:51:44 +0100
Subject: [PATCH 032/147] rejecting a revision will neccesarily put document in
 need correction status

---
 controllers/class.ReviseDocument.php | 33 +++++++++++++++++++++++-----
 inc/inc.ClassSettings.php            |  4 ++++
 op/op.ReviseDocument.php             |  1 +
 op/op.Settings.php                   |  1 +
 views/bootstrap/class.Settings.php   |  4 ++++
 5 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/controllers/class.ReviseDocument.php b/controllers/class.ReviseDocument.php
index 35106984d..ccee171e5 100644
--- a/controllers/class.ReviseDocument.php
+++ b/controllers/class.ReviseDocument.php
@@ -33,6 +33,13 @@ class SeedDMS_Controller_ReviseDocument extends SeedDMS_Controller_Common {
 		$group = $this->params['group'];
 		$comment = $this->params['comment'];
 
+		/* if set to true, a single reject will reject the doc. If set to false
+		 * all revisions will be collected first and afterwards the doc is rejected
+		 * if one has rejected it. So in the very end the doc is rejected, but
+		 * doc remainѕ in S_IN_REVISION until all have revised the doc
+		 */
+		$onevotereject = $this->param['onevotereject'];
+
 		/* Get the document id and name before removing the document */
 		$docname = $document->getName();
 		$documentid = $document->getID();
@@ -63,7 +70,7 @@ class SeedDMS_Controller_ReviseDocument extends SeedDMS_Controller_Common {
 		 */
 		$result = $this->callHook('reviseUpdateDocumentStatus', $content);
 		if($result === null) {
-			if ($revisionstatus == -1){
+			if ($onevotereject && $revisionstatus == -1){
 				if(!$content->setStatus(S_NEEDS_CORRECTION,$comment,$user)) {
 					$this->error = 1;
 					$this->errormsg = "revision_update_failed";
@@ -76,24 +83,38 @@ class SeedDMS_Controller_ReviseDocument extends SeedDMS_Controller_Common {
 					$this->errormsg = "cannot_retrieve_revision_snapshot";
 					return false;
 				}
-				$revisionCT = 0;
+				$revisionok = 0;
+				$revisionnotok = 0;
 				$revisionTotal = 0;
 				foreach ($docRevisionStatus as $drstat) {
 					if ($drstat["status"] == 1) {
-						$revisionCT++;
+						$revisionok++;
+					}
+					if ($drstat["status"] == -1) {
+						$revisionnotok++;
 					}
 					if ($drstat["status"] != -2) {
 						$revisionTotal++;
 					}
 				}
-				// If all revisions have been received and there are no rejections,
-				// then release the document otherwise put it back into revision workflow
-				if ($revisionCT == $revisionTotal) {
+				// If all revisions have been done and there are no rejections,
+				// then release the document. If all revisions have been done but some
+				// of them were rejections then documents needs correction.
+				// Otherwise put it back into revision workflow
+				if ($revisionok == $revisionTotal) {
 					$newStatus=S_RELEASED;
 					if ($content->finishRevision($user, $newStatus, 'Finished revision workflow', getMLText("automatic_status_update"))) {
 						if(!$this->callHook('finishReviseDocument', $content)) {
 						}
 					}
+				} elseif (($revisionok + $revisionnotok) == $revisionTotal) {
+					$newStatus=S_NEEDS_CORRECTION;
+//					if ($content->finishRevision($user, $newStatus, 'Finished revision workflow', getMLText("automatic_status_update"))) {
+					if(!$content->setStatus($newStatus,$comment,$user)) {
+						$this->error = 1;
+						$this->errormsg = "revision_update_failed";
+						return false;
+					}
 				} else {
 					$newStatus=S_IN_REVISION;
 					if(!$content->setStatus($newStatus,$comment,$user)) {
diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 0a4d25dfa..2e7bd7253 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -186,6 +186,8 @@ class Settings { /* {{{ */
 	var $_enableAcknowledgeWorkflow = true;
 	// enable/disable revision workflow
 	var $_enableRevisionWorkflow = true;
+	// enable/disable revision on vote reject
+	var $_enableRevisionOnVoteReject = true;
 	// Allow to set just a reviewer in tradional workflow
 	var $_allowReviewerOnly = true;
 	// enable/disable log system
@@ -649,6 +651,7 @@ class Settings { /* {{{ */
 		$this->_workflowMode = strval($tab["workflowMode"]);
 		$this->_enableAcknowledgeWorkflow = strval($tab["enableAcknowledgeWorkflow"]);
 		$this->_enableRevisionWorkflow = strval($tab["enableRevisionWorkflow"]);
+		$this->_enableRevisionOnVoteReject = strval($tab["enableRevisionOnVoteReject"]);
 		$this->_allowReviewerOnly = Settings::boolval($tab["allowReviewerOnly"]);
 		$this->_enableVersionDeletion = Settings::boolval($tab["enableVersionDeletion"]);
 		$this->_enableVersionModification = Settings::boolval($tab["enableVersionModification"]);
@@ -965,6 +968,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "workflowMode", $this->_workflowMode);
     $this->setXMLAttributValue($node, "enableAcknowledgeWorkflow", $this->_enableAcknowledgeWorkflow);
     $this->setXMLAttributValue($node, "enableRevisionWorkflow", $this->_enableRevisionWorkflow);
+    $this->setXMLAttributValue($node, "enableRevisionOnVoteReject", $this->_enableRevisionOnVoteReject);
     $this->setXMLAttributValue($node, "allowReviewerOnly", $this->_allowReviewerOnly);
     $this->setXMLAttributValue($node, "enableVersionDeletion", $this->_enableVersionDeletion);
     $this->setXMLAttributValue($node, "enableVersionModification", $this->_enableVersionModification);
diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php
index 307550976..a96f2b86d 100644
--- a/op/op.ReviseDocument.php
+++ b/op/op.ReviseDocument.php
@@ -92,6 +92,7 @@ if ($_POST["revisionType"] == "grp") {
 }
 $controller->setParam('group', $group);
 $controller->setParam('comment', $_POST["comment"]);
+$controller->setParam('onevotereject', $settins->_enableRevisionOnVoteReject);
 if(!$controller->run()) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));
 }
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 68aa131e0..c665200d8 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -180,6 +180,7 @@ if ($action == "saveSettings")
   $settings->_workflowMode = $_POST["workflowMode"];
   $settings->_enableAcknowledgeWorkflow = getBoolValue("enableAcknowledgeWorkflow");
   $settings->_enableRevisionWorkflow = getBoolValue("enableRevisionWorkflow");
+  $settings->_enableRevisionOnVoteReject = getBoolValue("enableRevisionOnVoteReject");
   $settings->_allowReviewerOnly = getBoolValue("allowReviewerOnly");
   $settings->_enableAdminRevApp = getBoolValue("enableAdminRevApp");
   $settings->_enableOwnerRevApp = getBoolValue("enableOwnerRevApp");
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 74cb9afc0..65540b35a 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -678,6 +678,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_enableRevisionWorkflow");?>:</td>
         <td><input name="enableRevisionWorkflow" type="checkbox" <?php if ($settings->_enableRevisionWorkflow) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_enableRevisionOnVoteReject_desc");?>">
+        <td><?php printMLText("settings_enableRevisionOnVoteReject");?>:</td>
+        <td><input name="enableRevisionOnVoteReject" type="checkbox" <?php if ($settings->_enableRevisionOnVoteReject) echo "checked" ?> /></td>
+      </tr>
       <tr title="<?php printMLText("settings_versioningFileName_desc");?>">
         <td><?php printMLText("settings_versioningFileName");?>:</td>
         <td><?php $this->showTextField("versioningFileName", $settings->_versioningFileName); ?></td>

From edffd85f9445455ccffdc6784f95a3780c57caf5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 13 Mar 2018 17:54:13 +0100
Subject: [PATCH 033/147] add entry for 6.0.6

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

diff --git a/CHANGELOG b/CHANGELOG
index d5552bb0a..03e70fe26 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
                      Changes in version 6.0.6
 --------------------------------------------------------------------------------
 - fix setting attributes when checking in a new document version
+- setting a document revision to 'needs correction' will no longer set the
+  documents status to 'needѕ correction' if this was turned off in the settings
 - merge changes up to 5.1.6
 
 --------------------------------------------------------------------------------

From ba53d0109634cabf032aa345497a9ec986b397c4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 13 Mar 2018 18:38:30 +0100
Subject: [PATCH 034/147] no need to instanciate Extension Mgr, as it is done
 inc.Extension.php

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

diff --git a/op/op.ExtensionMgr.php b/op/op.ExtensionMgr.php
index e7ac9640f..fac1a7636 100644
--- a/op/op.ExtensionMgr.php
+++ b/op/op.ExtensionMgr.php
@@ -49,7 +49,7 @@ if ($action == "download") {
 	if (!file_exists($settings->_rootDir.'/ext/'.$extname) ) {
 		UI::exitError(getMLText("admin_tools"),getMLText("missing_extension"));
 	}
-	$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
+//	$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
 	$controller->setParam('extmgr', $extMgr);
 	$controller->setParam('extname', $extname);
 	if (!$controller($_POST)) {
@@ -58,7 +58,7 @@ if ($action == "download") {
 	add_log_line();
 } /* }}} */
 elseif ($action == "refresh") { /* {{{ */
-	$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
+//	$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
 	$extMgr->createExtensionConf();
 	$controller->setParam('extmgr', $extMgr);
 	if (!$controller($_POST)) {
@@ -75,7 +75,7 @@ elseif ($action == "upload") { /* {{{ */
 	if($_FILES['userfile']['type'] != 'application/zip') {
 		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
 	}
-	$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
+//	$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
 	$controller->setParam('extmgr', $extMgr);
 	$controller->setParam('file', $_FILES['userfile']['tmp_name']);
 	if (!$controller($_POST)) {
@@ -94,7 +94,7 @@ elseif ($action == "import") { /* {{{ */
 	$file = tempnam(sys_get_temp_dir(), '');
 	file_put_contents($file, $content);
 
-	$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
+//	$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
 	$controller->setParam('extmgr', $extMgr);
 	$controller->setParam('file', $file);
 	$_POST['action'] = 'upload';

From b17c79127ae9b4cd80be7db5b840ca99e843780d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Mar 2018 07:59:10 +0100
Subject: [PATCH 035/147] store log file in contentDir/log/

---
 inc/inc.LogInit.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/inc/inc.LogInit.php b/inc/inc.LogInit.php
index f3a50d1a3..6bf238773 100644
--- a/inc/inc.LogInit.php
+++ b/inc/inc.LogInit.php
@@ -25,7 +25,12 @@ if ($settings->_logFileEnable) {
 	else if ($settings->_logFileRotation=="d") $logname=date("Ymd", time());
 	else $logname=date("Ym", time());
 
-	$logger = Log::factory('file', $settings->_contentDir.$logname.'.log');
+	if(!file_exists($settings->_contentDir.'log'))
+		@mkdir($settings->_contentDir.'log');
+	if(file_exists($settings->_contentDir.'log') && is_dir($settings->_contentDir.'log'))
+		$logger = Log::factory('file', $settings->_contentDir.'log/'.$logname.'.log');
+	else
+		$logger = null;
 } else {
 	$logger = null;
 }

From a4b5f5c0998eabb308246f1a2de936b1a981e63b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Mar 2018 10:13:10 +0100
Subject: [PATCH 036/147] add readme describing new proposed dist layout

---
 doc/README.Dist-Layout | 90 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 doc/README.Dist-Layout

diff --git a/doc/README.Dist-Layout b/doc/README.Dist-Layout
new file mode 100644
index 000000000..f9e1fc257
--- /dev/null
+++ b/doc/README.Dist-Layout
@@ -0,0 +1,90 @@
+Layout of installation
+=======================
+
+SeedDMS allows various kinds of installations with very individual layouts
+on disk. The proposed layout till version 5.1.6 was as the following:
+
+seeddms51x ---+--- data
+              |
+              +--- pear
+              |
+              +--- seeddms-5.1.x
+              |
+              +--- www -> seeddms-5.1.x
+
+'data' contains all document files, the sqlite database (if used), the full text
+data, the log files, and the cached preview images.
+
+'pear' contains all PEAR packages including the four SeedDMS packages SeedDMS_Core,
+SeedDMS_Lucene, SeedDMS_Preview, SeedDMS_SQLiteFTS.
+
+'seeddms-5.1.x' are the sources of seeddms and 'www' being a link on it.
+
+This layout has disadvantages when updating the source of seeddms, because
+the directories 'conf' and 'ext' has to be moved from 'seeddms-5.1.x' to
+'seeddms-5.1.(x+1)'.
+
+The new layout mostly retains that structure but uses more soft links to place
+the local data outside of 'seeddms-5.1.x' which makes updating a lot easier.
+As MS Windows does not support soft links, this change will only apply to Linux/Unix
+systems. The new layout is the following:
+
+seeddms51x ---+--- data --+-- log
+              |           |
+              |           +-- ext
+              |           |
+              |           +-- ...
+              |
+              +--- pear
+              |
+              +--- conf
+              |
+              +--- seeddms-5.1.x
+              |
+              +--- seeddms -> seeddms-5.1.x
+              |
+              +--- www --+-- inc -> ../seeddms/inc
+                         |
+                         +-- op -> ../seeddms/op
+                         |
+                         +-- out -> ../seeddms/out
+                         |
+                         +-- views -> ../seeddms/views
+                         |
+                         +-- controllers -> ../seeddms/controllers
+                         |
+                         +-- styles -> ../seeddms/styles
+                         |
+                         +-- languages -> ../seeddms/languages
+                         |
+                         +-- webdav -> ../seeddms/webdav
+                         |
+                         +-- restapi -> ../seeddms/restapi
+                         |
+                         +-- pdfviewer -> ../seeddms/pdfviewer
+                         |
+                         +-- index.php -> ../seeddms/index.php
+                         |
+                         +-- ext -> ../data/ext
+
+In order to convert to this layout you need to do the following in the seeddms51x
+directory:
+
+ln -s seeddms-5.1.x seeddms
+mv www/conf .
+mv www/ext data
+rm www
+mdkir www
+cd www
+ln -s ../seeddms/inc
+ln -s ../seeddms/op
+ln -s ../seeddms/out
+ln -s ../seeddms/views
+ln -s ../seeddms/controllers
+ln -s ../seeddms/styles
+ln -s ../seeddms/languages
+ln -s ../seeddms/webdav
+ln -s ../seeddms/restapi
+ln -s ../seeddms/pdfviewer
+ln -s ../seeddms/index.php
+ln -s ../data/ext

From 3026d98d65a5c12ec685547fef0de355a693c8dd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Mar 2018 10:14:18 +0100
Subject: [PATCH 037/147] rename conf to conf.tempate in distribution

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

diff --git a/Makefile b/Makefile
index 5287b1aa9..696af4d6c 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ PHPDOC=~/Downloads/phpDocumentor-2.8.1/bin/phpdoc
 dist:
 	mkdir -p tmp/seeddms-$(VERSION)
 	cp -a $(SRC) tmp/seeddms-$(VERSION)
-	(cd tmp/seeddms-$(VERSION); rm -rf $(NODISTFILES))
+	(cd tmp/seeddms-$(VERSION); rm -rf $(NODISTFILES); mv conf conf.template)
 	(cd tmp;  tar --exclude=.svn --exclude=.gitignore --exclude=views/blue --exclude=views/hc --exclude=views/clean --exclude=styles/blue --exclude=styles/hc --exclude=styles/clean -czvf ../seeddms-$(VERSION).tar.gz seeddms-$(VERSION))
 	rm -rf tmp
 

From 8cfeb0f61781067a13be76ef2eb973b814c11248 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Mar 2018 10:14:48 +0100
Subject: [PATCH 038/147] add config for backupDir

---
 conf/settings.xml.template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/settings.xml.template b/conf/settings.xml.template
index ad8f8481d..ea35e3c2f 100644
--- a/conf/settings.xml.template
+++ b/conf/settings.xml.template
@@ -89,6 +89,7 @@
        - partitionSize: size of chunk uploaded by jumploader
        - dropFolderDir: where files for document upload are located
        - cacheDir: where the preview images are saved
+       - backupDir: where the backups are saved
     -->
     <server
       rootDir = ""
@@ -102,6 +103,7 @@
       partitionSize = "2000000"
       dropFolderDir = ""
       cacheDir = ""
+      backupDir = ""
     />
     <!--
        - enableGuestLogin: If you want anybody to login as guest, set the following line to true

From 4b9b7a9bcf265d4bcd5490a4a6cea74aa86098c0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Mar 2018 10:15:11 +0100
Subject: [PATCH 039/147] remove old code for upgrading from ancient config
 file

---
 inc/inc.Settings.php | 43 -------------------------------------------
 1 file changed, 43 deletions(-)

diff --git a/inc/inc.Settings.php b/inc/inc.Settings.php
index ed3ae548e..50616d8c2 100644
--- a/inc/inc.Settings.php
+++ b/inc/inc.Settings.php
@@ -18,34 +18,6 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-$_tmp = dirname($_SERVER['SCRIPT_FILENAME']);
-if(is_link($_tmp)) {
-	$_arr = preg_split('/\//', $_tmp);
-	array_pop($_arr);
-
-	$_configDir = implode('/', $_arr).'/conf';
-//	include(implode('/', $_arr)."/conf/conf.Settings.php");
-} else {
-//	include("../conf/conf.Settings.php");
-}
-
-// ----------------------------
-// Update previous version <3.0
-// ----------------------------
-if (file_exists("../inc/inc.Settings.old.php")) {
-	// Change class name
-	$str = file_get_contents("../inc/inc.Settings.old.php");
-	$str = str_replace("class Settings" , "class OLDSettingsOLD", $str);
-	$str = str_replace("Settings()" , "OLDSettingsOLD()", $str);
-	file_put_contents("../inc/inc.Settings.old.php", $str);
-
-	include "inc.Settings.old.php";
-
-	$settingsOLD = $settings;
-} else {
-	$settingsOLD = null;
-}
-
 require_once('inc.ClassSettings.php');
 if(defined("SEEDDMS_CONFIG_FILE"))
 	$settings = new Settings(SEEDDMS_CONFIG_FILE);
@@ -55,21 +27,6 @@ if(!defined("SEEDDMS_INSTALL") && file_exists(dirname($settings->_configFilePath
 	die("SeedDMS won't run unless your remove the file ENABLE_INSTALL_TOOL from your configuration directory.");
 }
 
-// ----------------------------
-// Update previous version <3.0
-// ----------------------------
-if (isset($settingsOLD)) {
-	$class_vars = get_class_vars(get_class($settingsOLD));
-	foreach ($class_vars as $name => $value) {
-		if (property_exists ("Settings", $name))
-			$settings->$name = $value;
-	}
-
-	$settings->save();
-	echo "Update finish, you must delete " . realpath("../inc/inc.Settings.old.php") . " file";
-	exit;
-}
-
 if(isset($settings->_extraPath))
 	ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path'));
 

From 46661123891d5b9f992877300bc3b90e7a106472 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Mar 2018 10:15:48 +0100
Subject: [PATCH 040/147] set _backupDir to _contentDir/backup

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

diff --git a/install/install.php b/install/install.php
index 643b8f190..6fbb6dc3c 100644
--- a/install/install.php
+++ b/install/install.php
@@ -175,6 +175,7 @@ if(!$settings->_contentDir) {
 	$settings->_luceneDir = $settings->_contentDir . 'lucene/';
 	$settings->_stagingDir = $settings->_contentDir . 'staging/';
 	$settings->_cacheDir = $settings->_contentDir . 'cache/';
+	$settings->_backupDir = $settings->_contentDir . 'backup/';
 } else {
 	if(!$settings->_cacheDir) {
 		$settings->_cacheDir = $settings->_contentDir . 'cache/';

From 0d3b07b44dbf976470fb025f34fb484b76dad65e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Mar 2018 10:16:10 +0100
Subject: [PATCH 041/147] place log files in contentDir/log

---
 webdav/index.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/webdav/index.php b/webdav/index.php
index 52a80179d..885e9c4a4 100644
--- a/webdav/index.php
+++ b/webdav/index.php
@@ -12,8 +12,13 @@ if($settings->_logFileEnable) {
 	if ($settings->_logFileRotation=="h") $logname=date("YmdH", time());
 	else if ($settings->_logFileRotation=="d") $logname=date("Ymd", time());
 	else $logname=date("Ym", time());
-	$logname = $settings->_contentDir."webdav-".$logname.".log";
-	$log = Log::factory('file', $logname);
+	$logname = $settings->_contentDir."log/webdav-".$logname.".log";
+	if(!file_exists($settings->_contentDir.'log'))
+		@mkdir($settings->_contentDir.'log');
+	if(file_exists($settings->_contentDir.'log') && is_dir($settings->_contentDir.'log'))
+		$log = Log::factory('file', $logname);
+	else
+		$log = null;
 } else {
 	$log = null;
 }

From f386e83f2e838ea1c79ab903c914a15cdcd8a944 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Mar 2018 10:26:04 +0100
Subject: [PATCH 042/147] =?UTF-8?q?some=20fixe=D1=95=20and=20more=20info?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/README.Dist-Layout | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/README.Dist-Layout b/doc/README.Dist-Layout
index f9e1fc257..5dd8a2d57 100644
--- a/doc/README.Dist-Layout
+++ b/doc/README.Dist-Layout
@@ -2,7 +2,7 @@ Layout of installation
 =======================
 
 SeedDMS allows various kinds of installations with very individual layouts
-on disk. The proposed layout till version 5.1.6 was as the following:
+on disc. The proposed layout till version 5.1.6 was as the following:
 
 seeddms51x ---+--- data
               |
@@ -22,10 +22,14 @@ SeedDMS_Lucene, SeedDMS_Preview, SeedDMS_SQLiteFTS.
 
 This layout has disadvantages when updating the source of seeddms, because
 the directories 'conf' and 'ext' has to be moved from 'seeddms-5.1.x' to
-'seeddms-5.1.(x+1)'.
+'seeddms-5.1.(x+1)'. 'conf' was also visible over the web unless it was
+protected by an .htaccess file. The .htaccess file has been shipped, but it
+is far better to keep senѕitive data out of the document root in the first
+place.
 
 The new layout mostly retains that structure but uses more soft links to place
-the local data outside of 'seeddms-5.1.x' which makes updating a lot easier.
+the local data outside of 'seeddms-5.1.x' which makes updating a lot easier
+and moves the configuration out of the document root.
 As MS Windows does not support soft links, this change will only apply to Linux/Unix
 systems. The new layout is the following:
 

From 0a3d3ea382f5c19e29d9077c3d7cc797fa432584 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Mar 2018 11:20:55 +0100
Subject: [PATCH 043/147] checkExtension() can also check with the
 configuration array

---
 inc/inc.ClassExtensionMgr.php | 110 +++++++++++++++++++---------------
 1 file changed, 62 insertions(+), 48 deletions(-)

diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index 99310e549..ddf4678e1 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -174,36 +174,46 @@ class SeedDMS_Extension_Mgr {
 	} /* }}} */
 
 	/**
-	 * Check content of extension directory
+	 * Check content of extension directory or configuration of extension
 	 *
-	 * @param string $dir full path to extension directory or extension name
+	 * @param string|array $dir full path to extension directory or extension name
+	 * or an array containing the configuration.
 	 * @param boolean $noconstraints set to true if constraints to local seeddms
 	 * installation shall not be checked.
 	 */
-	public function checkExtension($dir, $noconstraints=false) { /* {{{ */
+	public function checkExtension($dir, $options=array()) { /* {{{ */
 		$this->errmsgs = array();
 
-		if(!file_exists($dir)) {
-			if(!file_exists($this->extdir.'/'.$dir))
+		if(is_string($dir)) {
+			if(!file_exists($dir)) {
+				if(!file_exists($this->extdir.'/'.$dir))
+					return false;
+				else
+					$dir = $this->extdir.'/'.$dir;
+			}
+			if(!file_exists($dir."/conf.php")) {
+				$this->errmsgs[] = "Missing extension configuration";
 				return false;
-			else
-				$dir = $this->extdir.'/'.$dir;
-		}
-		if(!file_exists($dir."/conf.php")) {
-			$this->errmsgs[] = "Missing extension configuration";
-			return false;
-		}
-		include($dir."/conf.php");
-		if(!isset($EXT_CONF)) {
-			$this->errmsgs[] = "Missing \$EXT_CONF in configuration";
-			return false;
-		}
-		$extname = key($EXT_CONF);
-		if(!$extname || !preg_match('/[a-zA-Z_]*/', $extname)) {
-			return false;
+			}
+			include($dir."/conf.php");
+			if(!isset($EXT_CONF)) {
+				$this->errmsgs[] = "Missing \$EXT_CONF in configuration";
+				return false;
+			}
+			$extname = key($EXT_CONF);
+			if(!$extname || !preg_match('/[a-zA-Z_]*/', $extname)) {
+				return false;
+			}
+
+			$extconf = $EXT_CONF[$extname];
+		} elseif(is_array($dir)) {
+			$extconf = $dir;
+			/* If just the configuration is passed, then there is no way to check
+			 * for existence of files.
+			 */
+			$options['nofiles'] = true;
 		}
 
-		$extconf = $EXT_CONF[$extname];
 		if(!isset($extconf['constraints']['depends']['seeddms'])) {
 			$this->errmsgs[] = "Missing dependency on SeedDMS";
 		}
@@ -219,36 +229,40 @@ class SeedDMS_Extension_Mgr {
 		if(!isset($extconf['author'])) {
 			$this->errmsgs[] = "Missing author";
 		}
-		if(!empty($extconf['language']['file']) && !file_exists($dir."/".$extconf['language']['file'])) {
-			$this->errmsgs[] = "Missing language file";
-		}
-		if(!empty($extconf['class']['file']) && !file_exists($dir."/".$extconf['class']['file'])) {
-			$this->errmsgs[] = "Missing class file";
+		if(!isset($options['nofiles']) || $options['nofiles'] == false) {
+			if(!empty($extconf['language']['file']) && !file_exists($dir."/".$extconf['language']['file'])) {
+				$this->errmsgs[] = "Missing language file";
+			}
+			if(!empty($extconf['class']['file']) && !file_exists($dir."/".$extconf['class']['file'])) {
+				$this->errmsgs[] = "Missing class file";
+			}
 		}
 
-		if(!$noconstraints && isset($extconf['constraints']['depends'])) {
-			foreach($extconf['constraints']['depends'] as $dkey=>$dval) {
-				switch($dkey) {
-				case 'seeddms':
-					$version = new SeedDMS_Version;
-					$tmp = explode('-', $dval, 2);
-					if(self::cmpVersion($tmp[0], $version->version()) > 0 || ($tmp[1] && self::cmpVersion($tmp[1], $version->version()) < 0))
-						$this->errmsgs[] = sprintf("Incorrect SeedDMS version (needs version %s)", $extconf['constraints']['depends']['seeddms']);
-					break;
-				case 'php':
-					$tmp = explode('-', $dval, 2);
-					if(self::cmpVersion($tmp[0], phpversion()) > 0 || ($tmp[1] && self::cmpVersion($tmp[1], phpversion()) < 0))
-						$this->errmsgs[] = sprintf("Incorrect PHP version (needs version %s)", $extconf['constraints']['depends']['php']);
-					break;
-				default:
-					$tmp = explode('-', $dval, 2);
-					if(isset($GLOBALS['EXT_CONF'][$dkey]['version'])) {
-						if(self::cmpVersion($tmp[0], $GLOBALS['EXT_CONF'][$dkey]['version']) > 0 || ($tmp[1] && self::cmpVersion($tmp[1], $GLOBALS['EXT_CONF'][$dkey]['version']) < 0))
-							$this->errmsgs[] = sprintf("Incorrect version of extension '%s' (needs version '%s' but provides '%s')", $dkey, $dval, $GLOBALS['EXT_CONF'][$dkey]['version']);
-					} else {
-						$this->errmsgs[] = sprintf("Missing extension or version for '%s'", $dkey);
+		if(!isset($options['noconstraints']) || $options['noconstraints'] == false) {
+			if(isset($extconf['constraints']['depends'])) {
+				foreach($extconf['constraints']['depends'] as $dkey=>$dval) {
+					switch($dkey) {
+					case 'seeddms':
+						$version = new SeedDMS_Version;
+						$tmp = explode('-', $dval, 2);
+						if(self::cmpVersion($tmp[0], $version->version()) > 0 || ($tmp[1] && self::cmpVersion($tmp[1], $version->version()) < 0))
+							$this->errmsgs[] = sprintf("Incorrect SeedDMS version (needs version %s)", $extconf['constraints']['depends']['seeddms']);
+						break;
+					case 'php':
+						$tmp = explode('-', $dval, 2);
+						if(self::cmpVersion($tmp[0], phpversion()) > 0 || ($tmp[1] && self::cmpVersion($tmp[1], phpversion()) < 0))
+							$this->errmsgs[] = sprintf("Incorrect PHP version (needs version %s)", $extconf['constraints']['depends']['php']);
+						break;
+					default:
+						$tmp = explode('-', $dval, 2);
+						if(isset($GLOBALS['EXT_CONF'][$dkey]['version'])) {
+							if(self::cmpVersion($tmp[0], $GLOBALS['EXT_CONF'][$dkey]['version']) > 0 || ($tmp[1] && self::cmpVersion($tmp[1], $GLOBALS['EXT_CONF'][$dkey]['version']) < 0))
+								$this->errmsgs[] = sprintf("Incorrect version of extension '%s' (needs version '%s' but provides '%s')", $dkey, $dval, $GLOBALS['EXT_CONF'][$dkey]['version']);
+						} else {
+							$this->errmsgs[] = sprintf("Missing extension or version for '%s'", $dkey);
+						}
+						break;
 					}
-					break;
 				}
 			}
 		}

From de0213d30e5dca508c4ee70d491b1f366a5451c9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Mar 2018 11:21:21 +0100
Subject: [PATCH 044/147] check if extension from repository is suitable for
 current installation

---
 views/bootstrap/class.ExtensionMgr.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index 303727453..9c789ab7d 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -172,10 +172,12 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 		$list = $extmgr->importExtensionList($reposurl);
 		foreach($list as $e) {
 			if($e[0] != '#') {
-				$re = json_decode($e);
-				$needsupdate = !isset($GLOBALS['EXT_CONF'][$re->name]) || SeedDMS_Extension_Mgr::cmpVersion($re->version, $GLOBALS['EXT_CONF'][$re->name]['version']) > 0;
+				$re = json_decode($e, true);
+				$extmgr->checkExtension($re);
+				$checkmsgs = $extmgr->getErrorMsgs();
+				$needsupdate = !isset($GLOBALS['EXT_CONF'][$re['name']]) || SeedDMS_Extension_Mgr::cmpVersion($re['version'], $GLOBALS['EXT_CONF'][$re['name']]['version']) > 0;
 				echo "<tr";
-				if(isset($GLOBALS['EXT_CONF'][$re->name])) {
+				if(isset($GLOBALS['EXT_CONF'][$re['name']])) {
 					if($needsupdate)
 						echo " class=\"warning\"";
 					else
@@ -183,13 +185,16 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 				}
 				echo ">";
 				echo "<td></td>";
-				echo "<td>".$re->title."<br /><small>".$re->description."</small></td>";
-				echo "<td nowrap>".$re->version."<br /><small>".$re->releasedate."</small></td>";
-				echo "<td nowrap>".$re->author->name."<br /><small>".$re->author->company."</small></td>";
+				echo "<td>".$re['title']."<br /><small>".$re['description']."</small>";
+				if($checkmsgs)
+					echo "<div><img src=\"".$this->getImgPath("attention.gif")."\"> ".implode('<br /><img src="'.$this->getImgPath("attention.gif").'"> ', $checkmsgs)."</div>";
+				echo "</td>";
+				echo "<td nowrap>".$re['version']."<br /><small>".$re['releasedate']."</small></td>";
+				echo "<td nowrap>".$re['author']['name']."<br /><small>".$re['author']['company']."</small></td>";
 				echo "<td nowrap>";
 				echo "<div class=\"list-action\">";
-				if($needsupdate)
-					echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$extname."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"url\" value=\"".$re->filename."\" /><a class=\"import\" data-extname=\"".$extname."\" title=\"".getMLText('import_extension')."\"><i class=\"icon-download\"></i></a></form>";
+				if($needsupdate && !$checkmsgs)
+					echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$extname."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$extname."\" title=\"".getMLText('import_extension')."\"><i class=\"icon-download\"></i></a></form>";
 				echo "</div>";
 				echo "</td>";
 				echo "</tr>";

From cbd04698ead0814d13463586c18c7fc5783fa4dd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Mar 2018 11:21:55 +0100
Subject: [PATCH 045/147] add changes for 5.1.7

---
 CHANGELOG | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 09186dad3..7b6201c6f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,11 @@
 --------------------------------------------------------------------------------
                      Changes in version 5.1.7
 --------------------------------------------------------------------------------
-- support for upload/download of extensions
+- PLEASE READ doc/README.Dist-Layout WHEN UPGRADING!!!!
+- support for upload/import/download of extensions
+- remove ancient code to upgrade from old config file
+- place all log files in contentDir/log
+- add readme for new dist layout
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.6

From b1a9ade799ea3366487f1f1d89d207912c871a56 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Mar 2018 11:47:06 +0100
Subject: [PATCH 046/147] check if extension directory is writable

---
 inc/inc.ClassExtensionMgr.php          | 22 +++++++++++++++++-----
 op/op.ExtensionMgr.php                 |  3 +++
 views/bootstrap/class.ExtensionMgr.php | 14 +++++++++++---
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index ddf4678e1..c8dd62b59 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -91,7 +91,7 @@ class SeedDMS_Extension_Mgr {
 	 * configuration file if it does not exist and the extension dir
 	 * is given
 	 */
-	public function __construct($extdir = '', $cachedir = '') {
+	public function __construct($extdir = '', $cachedir = '') { /* {{{ */
 		$this->cachedir = $cachedir;
 		$this->extdir = $extdir;
 		$this->extconf = array();
@@ -104,7 +104,7 @@ class SeedDMS_Extension_Mgr {
 				$this->extconf = $EXT_CONF;
 			}
 		}
-	}
+	} /* }}} */
 
 	protected function getExtensionsConfFile() { /* {{{ */
 		return $this->cachedir."/extensions.php";
@@ -119,6 +119,15 @@ class SeedDMS_Extension_Mgr {
 		return $this->extconf;
 	} /* }}} */
 
+	/**
+	 * Check if extension directory is writable
+	 *
+	 * @return boolean
+	 */
+	public function isWritableExitDir() { /* {{{ */
+		return is_writable($this->extdir);
+	} /* }}} */
+
 	/**
 	 * Create the cached file containing extension information
 	 *
@@ -332,10 +341,13 @@ class SeedDMS_Extension_Mgr {
 	/**
 	 * Import list of extension from repository
 	 *
+	 * @param boolean $force force download even if file already exists
 	 */
-	public function importExtensionList($url) { /* {{{ */
-		$file = file_get_contents($url."/repository.json");
-		file_put_contents($this->cachedir."/repository.json", $file);
+	public function importExtensionList($url, $force=false) { /* {{{ */
+		if(!file_exists($this->cachedir."/repository.json") || $force) {
+			$file = file_get_contents($url."/repository.json");
+			file_put_contents($this->cachedir."/repository.json", $file);
+		}
 		return file($this->cachedir."/repository.json");
 	} /* }}} */
 
diff --git a/op/op.ExtensionMgr.php b/op/op.ExtensionMgr.php
index fac1a7636..98c81682f 100644
--- a/op/op.ExtensionMgr.php
+++ b/op/op.ExtensionMgr.php
@@ -69,6 +69,9 @@ elseif ($action == "refresh") { /* {{{ */
 	header("Location:../out/out.ExtensionMgr.php");
 } /* }}} */
 elseif ($action == "upload") { /* {{{ */
+	if(!$extmgr->isWritableExitDir()) {
+		UI::exitError(getMLText("admin_tools"),getMLText("extension_mgr_no_upload"));
+	}
 	if($_FILES['userfile']['error']) {
 		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
 	}
diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index 9c789ab7d..d04e1307f 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -81,6 +81,9 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 ?>
 <div class="row-fluid">
 	<div class="span4">
+<?php
+		if($extmgr->isWritableExitDir()) {
+?>
 		<form class="form-horizontal" method="post" enctype="multipart/form-data" action="../op/op.ExtensionMgr.php">
 			<?= createHiddenFieldWithKey('extensionmgr') ?>
 			<input type="hidden" name="action" value="upload" />
@@ -97,11 +100,16 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 				</div>
 			</div>
 		</form>
+<?php
+		} else {
+			echo "<div class=\"alert alert-warning\">".getMLText('extension_mgr_no_upload')."</div>";
+		}
+?>
 	</div>
 	<div class="span8">
 		<ul class="nav nav-tabs" id="extensionstab">
-			<li class="<?php if(!$currenttab || $currenttab == 'installed') echo 'active'; ?>"><a data-target="#installed" data-toggle="tab"><?= getMLText('extensions_installed'); ?></a></li>
-			<li class="<?php if($currenttab == 'repository') echo 'active'; ?>"><a data-target="#repository" data-toggle="tab"><?= getMLText('extensions_repository'); ?></a></li>
+			<li class="<?php if(!$currenttab || $currenttab == 'installed') echo 'active'; ?>"><a data-target="#installed" data-toggle="tab"><?= getMLText('extension_mgr_installed'); ?></a></li>
+			<li class="<?php if($currenttab == 'repository') echo 'active'; ?>"><a data-target="#repository" data-toggle="tab"><?= getMLText('extension_mgr_repository'); ?></a></li>
 		</ul>
 		<div class="tab-content">
 			<div class="tab-pane <?php if(!$currenttab || $currenttab == 'installed') echo 'active'; ?>" id="installed">
@@ -193,7 +201,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 				echo "<td nowrap>".$re['author']['name']."<br /><small>".$re['author']['company']."</small></td>";
 				echo "<td nowrap>";
 				echo "<div class=\"list-action\">";
-				if($needsupdate && !$checkmsgs)
+				if($needsupdate && !$checkmsgs && $extmgr->isWritableExitDir())
 					echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$extname."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$extname."\" title=\"".getMLText('import_extension')."\"><i class=\"icon-download\"></i></a></form>";
 				echo "</div>";
 				echo "</td>";

From 4ac7fe0c07dee48f5a985369f11fe69b12c117a3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Mar 2018 13:11:35 +0100
Subject: [PATCH 047/147] set repository url in ext manager, force download of
 repos content

---
 inc/inc.ClassExtensionMgr.php          | 45 ++++++++++++++++++++++----
 out/out.ExtensionMgr.php               | 15 +++++++--
 views/bootstrap/class.ExtensionMgr.php |  8 ++---
 3 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index c8dd62b59..f97fb8241 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -32,6 +32,12 @@ class SeedDMS_Extension_Mgr {
 	 */
 	protected $extdir;
 
+	/**
+	 * @var string $reposurl url for fetching list of extensions in repository
+	 * @access protected
+	 */
+	protected $reposurl;
+
 	/**
 	 * @var array[] $extconf configuration of all extensions
 	 * @access protected
@@ -91,9 +97,10 @@ class SeedDMS_Extension_Mgr {
 	 * configuration file if it does not exist and the extension dir
 	 * is given
 	 */
-	public function __construct($extdir = '', $cachedir = '') { /* {{{ */
+	public function __construct($extdir = '', $cachedir = '', $reposurl = '') { /* {{{ */
 		$this->cachedir = $cachedir;
 		$this->extdir = $extdir;
+		$this->reposurl = $reposurl;
 		$this->extconf = array();
 		if($extdir) {
 			if(!file_exists($this->getExtensionsConfFile())) {
@@ -262,6 +269,15 @@ class SeedDMS_Extension_Mgr {
 						if(self::cmpVersion($tmp[0], phpversion()) > 0 || ($tmp[1] && self::cmpVersion($tmp[1], phpversion()) < 0))
 							$this->errmsgs[] = sprintf("Incorrect PHP version (needs version %s)", $extconf['constraints']['depends']['php']);
 						break;
+					case 'phpext':
+						if(is_array($dval) && $dval) {
+							$extlist = get_loaded_extensions();
+							foreach($dval as $d) {
+								if(!in_array($d, $extlist))
+									$this->errmsgs[] = sprintf("Missing php extension '%s'", $d);
+							}
+						}
+						break;
 					default:
 						$tmp = explode('-', $dval, 2);
 						if(isset($GLOBALS['EXT_CONF'][$dkey]['version'])) {
@@ -343,12 +359,29 @@ class SeedDMS_Extension_Mgr {
 	 *
 	 * @param boolean $force force download even if file already exists
 	 */
-	public function importExtensionList($url, $force=false) { /* {{{ */
-		if(!file_exists($this->cachedir."/repository.json") || $force) {
-			$file = file_get_contents($url."/repository.json");
-			file_put_contents($this->cachedir."/repository.json", $file);
+	public function getExtensionList() { /* {{{ */
+		if(file_exists($this->cachedir."/repository.json")) {
+			return file($this->cachedir."/repository.json");
+		} else {
+			return array();
+		}
+	} /* }}} */
+
+	/**
+	 * Import list of extension from repository
+	 *
+	 * @param boolean $force force download even if file already exists
+	 */
+	public function updateExtensionList($force=false) { /* {{{ */
+		if($this->reposurl) {
+			if(!file_exists($this->cachedir."/repository.json") || $force) {
+				$file = file_get_contents($this->reposurl."/repository.json");
+				file_put_contents($this->cachedir."/repository.json", $file);
+			}
+			return true;
+		} else {
+			return false;
 		}
-		return file($this->cachedir."/repository.json");
 	} /* }}} */
 
 	/**
diff --git a/out/out.ExtensionMgr.php b/out/out.ExtensionMgr.php
index a55155f33..565bb672a 100644
--- a/out/out.ExtensionMgr.php
+++ b/out/out.ExtensionMgr.php
@@ -32,15 +32,26 @@ if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
+$reposurl = 'http://seeddms.steinmann.cx/repository';
+
 $v = new SeedDMS_Version;
-$extmgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
-$currenttab = 'installed';
+$extmgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir, $reposurl);
+if(isset($_GET['currenttab']))
+	$currenttab = $_GET['currenttab'];
+else
+	$currenttab = 'installed';
+
+if(isset($_GET['forceupdate']) && $_GET['forceupdate']==1)
+	$extmgr->updateExtensionList(true);
+else
+	$extmgr->updateExtensionList();
 
 if($view) {
 	$view->setParam('httproot', $settings->_httpRoot);
 	$view->setParam('version', $v);
 	$view->setParam('extmgr', $extmgr);
 	$view->setParam('currenttab', $currenttab);
+	$view->setParam('reposurl', $reposurl);
 	$view($_GET);
 	exit;
 }
diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index d04e1307f..682620875 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -70,9 +70,8 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 		$version = $this->params['version'];
 		$extmgr = $this->params['extmgr'];
 		$currenttab = $this->params['currenttab'];
-
-		$reposurl = 'http://seeddms.steinmann.cx/repository';
-
+		$reposurl = $this->params['reposurl'];
+	
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
 		$this->contentStart();
@@ -177,7 +176,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 		print "<th>".getMLText('author')."</th>\n";	
 		print "<th></th>\n";	
 		print "</tr></thead><tbody>\n";
-		$list = $extmgr->importExtensionList($reposurl);
+		$list = $extmgr->getExtensionList();
 		foreach($list as $e) {
 			if($e[0] != '#') {
 				$re = json_decode($e, true);
@@ -210,6 +209,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 		}	
 		echo "</tbody></table>\n";
 ?>
+				<div><a href="?forceupdate=1&currenttab=repository" class="btn btn-delete"><?= getMLText('force_update')?></a></div>
 			</div>
 		</div>
   </div>

From 0c0669fbbda02835c9052b516644c8d39f3dd6da Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Mar 2018 17:05:27 +0100
Subject: [PATCH 048/147] do not release a document in verifyStatus() if in
 draft status

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

diff --git a/CHANGELOG b/CHANGELOG
index 4eb3f0ea1..c5f49d778 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,8 @@
 - fix setting attributes when checking in a new document version
 - setting a document revision to 'needs correction' will no longer set the
   documents status to 'needѕ correction' if this was turned off in the settings
+- a document will not leave draft status when setting the approver/reviewer
+  without setting a reviewer/approver
 - merge changes up to 5.1.6
 
 --------------------------------------------------------------------------------
diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index f2344ca74..fbe7647a5 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3094,7 +3094,8 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		elseif ($pendingReview) $this->setStatus(S_DRAFT_REV,$msg,$user);
 		elseif ($pendingApproval) $this->setStatus(S_DRAFT_APP,$msg,$user);
 		elseif ($pendingRevision) $this->setStatus(S_IN_REVISION,$msg,$user);
-		else $this->setStatus(S_RELEASED,$msg,$user);
+		/* A document in status S_DRAFT will never go into S_RELEASED */
+		elseif ($st["status"]!=S_DRAFT) $this->setStatus(S_RELEASED,$msg,$user);
 	} /* }}} */
 
 	function __construct($id, $document, $version, $comment, $date, $userID, $dir, $orgFileName, $fileType, $mimeType, $fileSize=0, $checksum='', $revisionDate=null) { /* {{{ */
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index ebb8c5f93..cd247a9ac 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2018-02-27</date>
+ <date>2018-03-14</date>
  <time>09:19:24</time>
  <version>
-  <release>6.0.5</release>
-  <api>6.0.5</api>
+  <release>6.0.6</release>
+  <api>6.0.6</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,7 +24,9 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-add list 'NeedsCorrectionOwner' to SeedDMS_Core_DMS::getDocumentList()
+SeedDMS_Core_DocumentContent::verifyStatus() will not set status to S_RELEASED
+if currently in S_DRAFT status und no workflow, review, approval, or revision
+is pending.
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1694,5 +1696,21 @@ slower.
 add SeedDMS_Core_DocumentContent::getInstance()
    </notes>
   </release>
+  <release>
+   <date>2018-02-27</date>
+   <time>09:19:24</time>
+   <version>
+    <release>6.0.5</release>
+    <api>6.0.5</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+add list 'NeedsCorrectionOwner' to SeedDMS_Core_DMS::getDocumentList()
+   </notes>
+  </release>
  </changelog>
 </package>

From db3990b8b7eedbd889254f85808bded1cff12a4a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Mar 2018 18:43:01 +0100
Subject: [PATCH 049/147] make repository for extensions configurable

---
 inc/inc.ClassExtensionMgr.php          | 2 +-
 inc/inc.ClassSettings.php              | 4 ++++
 op/op.Settings.php                     | 1 +
 out/out.ExtensionMgr.php               | 2 +-
 views/bootstrap/class.ExtensionMgr.php | 2 +-
 views/bootstrap/class.Settings.php     | 4 ++++
 6 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index f97fb8241..018847491 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -375,7 +375,7 @@ class SeedDMS_Extension_Mgr {
 	public function updateExtensionList($force=false) { /* {{{ */
 		if($this->reposurl) {
 			if(!file_exists($this->cachedir."/repository.json") || $force) {
-				$file = file_get_contents($this->reposurl."/repository.json");
+				$file = file_get_contents($this->reposurl);
 				file_put_contents($this->cachedir."/repository.json", $file);
 			}
 			return true;
diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index eacea6cf3..4ed021451 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -91,6 +91,8 @@ class Settings { /* {{{ */
 	var $_dropFolderDir = null;
 	// Where the backup directory is located
 	var $_backupDir = null;
+	// Where the repository for extensions is located
+	var $_repositoryUrl = null;
 	// enable removal of file from dropfolder after success import
 	var $_removeFromDropFolder = false;
 	// Where the stop word file is located
@@ -483,6 +485,7 @@ class Settings { /* {{{ */
 		$this->_luceneDir = strval($tab["luceneDir"]);
 		$this->_dropFolderDir = strval($tab["dropFolderDir"]);
 		$this->_backupDir = strval($tab["backupDir"]);
+		$this->_repositoryUrl = strval($tab["repositoryUrl"]);
 		$this->_logFileEnable = Settings::boolVal($tab["logFileEnable"]);
 		$this->_logFileRotation = strval($tab["logFileRotation"]);
 		$this->_enableLargeFileUpload = Settings::boolVal($tab["enableLargeFileUpload"]);
@@ -800,6 +803,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "luceneDir", $this->_luceneDir);
     $this->setXMLAttributValue($node, "dropFolderDir", $this->_dropFolderDir);
     $this->setXMLAttributValue($node, "backupDir", $this->_backupDir);
+    $this->setXMLAttributValue($node, "repositoryUrl", $this->_repositoryUrl);
     $this->setXMLAttributValue($node, "logFileEnable", $this->_logFileEnable);
     $this->setXMLAttributValue($node, "logFileRotation", $this->_logFileRotation);
     $this->setXMLAttributValue($node, "enableLargeFileUpload", $this->_enableLargeFileUpload);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 9ee82fba5..2ddce04ed 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -118,6 +118,7 @@ if ($action == "saveSettings")
   $settings->_extraPath = addDirSep($_POST["extraPath"]);
   $settings->_dropFolderDir = addDirSep($_POST["dropFolderDir"]);
   $settings->_backupDir = addDirSep($_POST["backupDir"]);
+  $settings->_repositoryUrl = addDirSep($_POST["repositoryUrl"]);
   $settings->_logFileEnable = getBoolValue("logFileEnable");
   $settings->_logFileRotation = $_POST["logFileRotation"];
   $settings->_enableLargeFileUpload = getBoolValue("enableLargeFileUpload");
diff --git a/out/out.ExtensionMgr.php b/out/out.ExtensionMgr.php
index 565bb672a..c87a2fc43 100644
--- a/out/out.ExtensionMgr.php
+++ b/out/out.ExtensionMgr.php
@@ -32,7 +32,7 @@ if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
-$reposurl = 'http://seeddms.steinmann.cx/repository';
+$reposurl = $settings->_repositoryUrl;
 
 $v = new SeedDMS_Version;
 $extmgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir, $reposurl);
diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index 682620875..f63a209f2 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -200,7 +200,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 				echo "<td nowrap>".$re['author']['name']."<br /><small>".$re['author']['company']."</small></td>";
 				echo "<td nowrap>";
 				echo "<div class=\"list-action\">";
-				if($needsupdate && !$checkmsgs && $extmgr->isWritableExitDir())
+				if(!$checkmsgs && $extmgr->isWritableExitDir())
 					echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$extname."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$extname."\" title=\"".getMLText('import_extension')."\"><i class=\"icon-download\"></i></a></form>";
 				echo "</div>";
 				echo "</td>";
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 9c45a45c1..c36501cf8 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -434,6 +434,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_dropFolderDir");?>:</td>
         <td><?php $this->showTextField("dropFolderDir", $settings->_dropFolderDir); ?></td>
       </tr>
+      <tr title="<?php printMLText("settings_repositoryUrl_desc");?>">
+        <td><?php printMLText("settings_repositoryUrl");?>:</td>
+        <td><?php $this->showTextField("repositoryUrl", $settings->_repositoryUrl); ?></td>
+      </tr>
       <tr title="<?php printMLText("settings_logFileEnable_desc");?>">
         <td><?php printMLText("settings_logFileEnable");?>:</td>
         <td><input name="logFileEnable" type="checkbox" <?php if ($settings->_logFileEnable) echo "checked" ?> /></td>

From 93ea99061be400835b0151def38bae0552558bb9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Mar 2018 18:43:45 +0100
Subject: [PATCH 050/147] some new phrases

---
 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 | 20 ++++++++++++++------
 languages/el_GR/lang.inc |  8 ++++++++
 languages/en_GB/lang.inc | 10 +++++++++-
 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/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 ++++++++
 24 files changed, 199 insertions(+), 7 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 3a01d45ff..e95a57d25 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -496,6 +496,9 @@ URL: [url]',
 'export' => '',
 'extension_archive' => '',
 'extension_manager' => 'ﺇﺩﺍﺭﺓ ﺍﻼﻣﺩﺍﺩﺎﺗ',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => 'فبراير',
 'file' => 'ملف',
 'files' => 'ملفات',
@@ -544,6 +547,7 @@ Parent folder: [folder_path]
 URL: [url]',
 'folder_renamed_email_subject' => '[sitename]: [name] - تم اعادة تسمية المجلد',
 'folder_title' => 'مجلد \'[foldername]\'',
+'force_update' => '',
 'friday' => 'الجمعة',
 'friday_abbr' => 'ج',
 'from' => 'من',
@@ -1223,6 +1227,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => '',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => '',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfReceipt' => '',
@@ -1350,6 +1356,8 @@ URL: [url]',
 'settings_quota_desc' => '',
 'settings_removeFromDropFolder' => '',
 'settings_removeFromDropFolder_desc' => '',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => '',
 'settings_restricted_desc' => '',
 'settings_rootDir' => '',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 0e81c4e00..16732a50e 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -447,6 +447,9 @@ $text = array(
 'export' => '',
 'extension_archive' => '',
 'extension_manager' => 'управление на добавките',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => 'Февруари',
 'file' => 'Файл',
 'files' => 'Файлове',
@@ -475,6 +478,7 @@ $text = array(
 'folder_renamed_email_body' => '',
 'folder_renamed_email_subject' => '',
 'folder_title' => 'Папка \'[foldername]\'',
+'force_update' => '',
 'friday' => 'петък',
 'friday_abbr' => '',
 'from' => 'От',
@@ -1088,6 +1092,8 @@ $text = array(
 'settings_enablePasswordForgotten_desc' => 'Ако е включено, разрешава на потребителите да си възстанавяват паролата на email.',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => '',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfReceipt' => '',
@@ -1215,6 +1221,8 @@ $text = array(
 'settings_quota_desc' => 'Максималният брой байтове, които всеки потребител може да заема на диска. 0 за неограничено използване на диска. Тази стойност може да бъде презаписана за всяко използване на профила.',
 'settings_removeFromDropFolder' => '',
 'settings_removeFromDropFolder_desc' => '',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => 'Ограничен достъп',
 'settings_restricted_desc' => 'Разреши вход за потребители, само ако имат съотв. запис в БД (независимо от успешния вход чрез LDAP)',
 'settings_rootDir' => 'Корнева папка',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 629765ed2..e4de4512b 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -452,6 +452,9 @@ URL: [url]',
 'export' => '',
 'extension_archive' => '',
 'extension_manager' => 'Gestiona les Extensions',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => 'Febrer',
 'file' => 'Fitxer',
 'files' => 'Fitxers',
@@ -480,6 +483,7 @@ URL: [url]',
 'folder_renamed_email_body' => '',
 'folder_renamed_email_subject' => '',
 'folder_title' => 'Carpeta \'[foldername]\'',
+'force_update' => '',
 'friday' => 'Divendres',
 'friday_abbr' => '',
 'from' => 'Des de',
@@ -1093,6 +1097,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => '',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => '',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfReceipt' => '',
@@ -1220,6 +1226,8 @@ URL: [url]',
 'settings_quota_desc' => '',
 'settings_removeFromDropFolder' => '',
 'settings_removeFromDropFolder_desc' => '',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => '',
 'settings_restricted_desc' => '',
 'settings_rootDir' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 43979af55..967faefcf 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -503,6 +503,9 @@ URL: [url]',
 'export' => '',
 'extension_archive' => '',
 'extension_manager' => 'Správa rozšíření',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => 'Únor',
 'file' => 'Soubor',
 'files' => 'Soubory',
@@ -551,6 +554,7 @@ Uživatel: [username]
 URL: [url]',
 'folder_renamed_email_subject' => '[sitename]: [name] - Složka přejmenována',
 'folder_title' => 'Adresář \'[foldername]\'',
+'force_update' => '',
 'friday' => 'Pátek',
 'friday_abbr' => 'Pá',
 'from' => 'Od',
@@ -1232,6 +1236,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => '',
 'settings_enableRecursiveCount' => 'Povolit rekurzivní počítání dokumentů/složek',
 'settings_enableRecursiveCount_desc' => 'Při zapnutí je počet dokumentů a složek v zobrazení složek určen počítáním všech objektů při rekurzivním zpracování složek a počítáním těch dokumentů a složek, ke kterým má uživatel přístup.',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => '',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfReceipt' => '',
@@ -1359,6 +1365,8 @@ URL: [url]',
 'settings_quota_desc' => 'Maximální počet bytů na disku, který může uživatel použít. Nula znamená neomezený prostor. Tato hodnota může být přepsána pro každé použití jeho profilu.',
 'settings_removeFromDropFolder' => '',
 'settings_removeFromDropFolder_desc' => '',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => 'Restricted access',
 'settings_restricted_desc' => '',
 'settings_rootDir' => 'Root directory',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 3c8883b85..0b89271c4 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 (2560), dgrutsch (22)
+//    Translators: Admin (2573), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -66,7 +66,7 @@ URL: [url]',
 'add_multiple_documents' => 'Mehrere Dokumente anlegen',
 'add_multiple_files' => 'Mehrere Dateien hochladen (Dateiname wird als Dokumentenname verwendet)',
 'add_receipt' => 'Empfang bestätigen',
-'add_review' => 'Überprüfung hinzufügen',
+'add_review' => 'Wiederholungsprüfung hinzufügen',
 'add_revision' => 'Wiederholungsprüfung hinzufügen',
 'add_role' => 'Neue Rolle anlegen',
 'add_subfolder' => 'Unterordner anlegen',
@@ -519,6 +519,9 @@ URL: [url]',
 'export' => 'Export',
 'extension_archive' => 'Erweiterung',
 'extension_manager' => 'Erweiterungen verwalten',
+'extension_mgr_installed' => 'Installiert',
+'extension_mgr_no_upload' => 'Der Upload neuer Erweiterungen ist nicht möglich, weil das Verzeichnis für Erweiterungen nicht beschreibbar ist.',
+'extension_mgr_repository' => 'Verfügbar',
 'february' => 'Februar',
 'file' => 'Datei',
 'files' => 'Dateien',
@@ -567,6 +570,7 @@ Benutzer: [username]
 URL: [url]',
 'folder_renamed_email_subject' => '[sitename]: [name] - Ordner umbenannt',
 'folder_title' => 'SeedDMS - Ordner: [foldername]',
+'force_update' => 'Aktualisieren',
 'friday' => 'Freitag',
 'friday_abbr' => 'Fr',
 'from' => 'von',
@@ -1024,7 +1028,7 @@ URL: [url]',
 'review_summary' => 'Übersicht Prüfungen',
 'review_update_failed' => 'Störung bei Aktualisierung des Prüfstatus. Aktualisierung gescheitert.',
 'revise_document' => 'Wiederholungsprüfung',
-'revise_document_on' => 'Nächste Überprüfung des Dokuments am [date]',
+'revise_document_on' => 'Nächste Wiederholungsprüfung des Dokuments am [date]',
 'revisions_accepted' => '[no_revisions] Wiederholungsprüfungen',
 'revisions_not_touched' => '[no_revisions] offene Wiederholungspüfungen',
 'revisions_pending' => '[no_revisions] zukünftige Wiederholungsprüfungen',
@@ -1050,7 +1054,7 @@ Kommentar: [comment]
 Benutzer: [username]
 URL: [url]',
 'revision_submit_email_subject' => '[sitename]: [name] - Erneute Freigabe erteilen',
-'revisors' => 'Überprüfer',
+'revisors' => 'Wiederholungsprüfer',
 'revisor_already_assigned' => 'Benutzer bereits als Wiederholungsprüfer eingetragen.',
 'revisor_already_removed' => 'Wiederholungsprüfer wurde bereits vom Prozess ausgeschlossen oder hat das Dokument bereits geprüft.',
 'rewind_workflow' => 'Zurück zum Anfangszustand',
@@ -1298,6 +1302,8 @@ Name: [username]
 'settings_enablePasswordForgotten_desc' => 'Setzen Sie diese Option, wenn Benutzer ein neues Password per E-Mail anfordern dürfen.',
 'settings_enableRecursiveCount' => 'Rekursive Dokumenten-/Ordner-Zählung',
 'settings_enableRecursiveCount_desc' => 'Wenn diese Option eingeschaltet ist, wird die Anzahl der Dokumente und Ordner in der Ordner-Ansicht rekursiv, unter Berücksichtigung der Zugriffsrechte ermittelt.',
+'settings_enableRevisionOnVoteReject' => 'Ablehnung durch einen Wiederholungsprüfer',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => 'Ermögliche Wiederholungsprüfung von Dokumenten',
 'settings_enableRevisionWorkflow_desc' => 'Anwählen, um den Workflow der Wiederholungsprüfung von Dokumenten nach einer einstellbaren Zeit zu ermöglichen.',
 'settings_enableSelfReceipt' => 'Erlaube Empfangsbestätigung durch angemeldeten Benutzer',
@@ -1425,6 +1431,8 @@ Name: [username]
 'settings_quota_desc' => 'Die maximale Anzahl Bytes, die ein Benutzer belegen darf. Setzen Sie diesen Wert auf 0 für unbeschränkten Plattenplatz. Dieser Wert kann individuell in den Benutzereinstellungen überschrieben werden.',
 'settings_removeFromDropFolder' => 'Datei aus Ablageordner nach erfolgreichem Hochladen löschen',
 'settings_removeFromDropFolder_desc' => 'Schalten Sie dies ein, wenn eine Datei aus dem Ablageordner nach erfolgreichem Hochladen gelöscht werden soll.',
+'settings_repositoryUrl' => 'URL des Repositoriums',
+'settings_repositoryUrl_desc' => 'URL des Repositoriums für Erweiterungen',
 'settings_restricted' => 'Beschränkter Zugriff',
 'settings_restricted_desc' => 'Nur Benutzer, die einen Eintrag in der Benutzerdatenbank haben dürfen sich anmelden (unabhängig von einer erfolgreichen Authentifizierung über LDAP)',
 'settings_rootDir' => 'Wurzelverzeichnis',
@@ -1588,7 +1596,7 @@ Name: [username]
 'status_revised' => 'überprüft',
 'status_revision_rejected' => 'Abgelehnt',
 'status_revision_sleeping' => 'wartend',
-'status_revisor_removed' => 'Überprüfer von Liste entfernt',
+'status_revisor_removed' => 'Wiederholungsprüfer von Liste entfernt',
 'status_unknown' => 'unbekannt',
 'storage_size' => 'Speicherverbrauch',
 'submit_2_fact_auth' => 'Schlüssel speichern',
@@ -1597,7 +1605,7 @@ Name: [username]
 'submit_password' => 'Setze neues Passwort',
 'submit_password_forgotten' => 'Neues Passwort setzen und per E-Mail schicken',
 'submit_receipt' => 'Empfang bestätigen',
-'submit_review' => 'Überprüfung hinzufügen',
+'submit_review' => 'Wiederholungsprüfung hinzufügen',
 'submit_revision' => 'Wiederholungsprüfung hinzufügen',
 'submit_userinfo' => 'Daten setzen',
 'subsribe_timelinefeed' => 'Verauf als RSS-Feed abonnieren',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 58c63dc08..9ee32fd3d 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -447,6 +447,9 @@ $text = array(
 'export' => '',
 'extension_archive' => '',
 'extension_manager' => '',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => 'Φεβρουάριος',
 'file' => 'Αρχείο',
 'files' => 'Αρχεία',
@@ -475,6 +478,7 @@ $text = array(
 'folder_renamed_email_body' => '',
 'folder_renamed_email_subject' => '',
 'folder_title' => 'Όνομα Φακέλου',
+'force_update' => '',
 'friday' => 'Παρασκευή',
 'friday_abbr' => 'Πα',
 'from' => 'Από',
@@ -1099,6 +1103,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => '',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => '',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfReceipt' => '',
@@ -1226,6 +1232,8 @@ URL: [url]',
 'settings_quota_desc' => '',
 'settings_removeFromDropFolder' => '',
 'settings_removeFromDropFolder_desc' => '',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => '',
 'settings_restricted_desc' => '',
 'settings_rootDir' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 6db3c24dd..56d911a0b 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 (1681), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1689), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -520,6 +520,9 @@ URL: [url]',
 'export' => 'Export',
 'extension_archive' => 'Extension',
 'extension_manager' => 'Manage extensions',
+'extension_mgr_installed' => 'Installed',
+'extension_mgr_no_upload' => 'Uploading new extensions is not possible because the extentension directory is not writable.',
+'extension_mgr_repository' => 'Available',
 'february' => 'February',
 'file' => 'File',
 'files' => 'Files',
@@ -568,6 +571,7 @@ User: [username]
 URL: [url]',
 'folder_renamed_email_subject' => '[sitename]: [name] - Folder renamed',
 'folder_title' => 'Folder \'[foldername]\'',
+'force_update' => 'Update',
 'friday' => 'Friday',
 'friday_abbr' => 'Fr',
 'from' => 'From',
@@ -1293,6 +1297,8 @@ Name: [username]
 'settings_enablePasswordForgotten_desc' => 'If you want to allow user to set a new password and send it by mail, check this option.',
 'settings_enableRecursiveCount' => 'Enable recursive document/folder count',
 'settings_enableRecursiveCount_desc' => 'If turned on, the number of documents and folders in the folder view will be determined by counting all objects by recursively processing the folders and counting those documents and folders the user is allowed to access.',
+'settings_enableRevisionOnVoteReject' => 'Reject by one revisor',
+'settings_enableRevisionOnVoteReject_desc' => 'If set the document will be reject if one revisor rejects the document.',
 'settings_enableRevisionWorkflow' => 'Enable revision of documents',
 'settings_enableRevisionWorkflow_desc' => 'Enable, to be able to run the workflow for revising a document after a given period of time.',
 'settings_enableSelfReceipt' => 'Allow reception for logged in user',
@@ -1420,6 +1426,8 @@ Name: [username]
 'settings_quota_desc' => 'The maximum number of bytes a user may use on disk. Set this to 0 for unlimited disk space. This value can be overridden for each user in his profile.',
 'settings_removeFromDropFolder' => 'Remove file from drop folder after successful upload',
 'settings_removeFromDropFolder_desc' => 'Enable this, if a file taken from the drop folder shall be deleted after successful upload.',
+'settings_repositoryUrl' => 'URL of repository',
+'settings_repositoryUrl_desc' => 'URL of repository for extensions',
 'settings_restricted' => 'Restricted access',
 'settings_restricted_desc' => 'Only allow users to log in if they have an entry in the local database (irrespective of successful authentication with LDAP)',
 'settings_rootDir' => 'Root directory',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index d4f53f648..85165afcb 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -503,6 +503,9 @@ URL: [url]',
 'export' => '',
 'extension_archive' => '',
 'extension_manager' => 'Administrar extensiones',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => 'Febrero',
 'file' => 'Fichero',
 'files' => 'Ficheros',
@@ -551,6 +554,7 @@ Usuario: [username]
 URL: [url]',
 'folder_renamed_email_subject' => '[sitename]: [name] - Carpeta renombrada',
 'folder_title' => 'Carpeta \'[foldername]\'',
+'force_update' => '',
 'friday' => 'Viernes',
 'friday_abbr' => 'V',
 'from' => 'Desde',
@@ -1238,6 +1242,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Si quiere permitir a los usuarios fijar una nueva contraseña recibiendo un correo electrónico, active esta opción.',
 'settings_enableRecursiveCount' => 'Habilitar cuenta de documento/carpeta recursivo',
 'settings_enableRecursiveCount_desc' => 'Si cambia a activado, el número de documentos y carpetas en la carpeta será determinado por la cuenta de todos los objetos recursivos procesados de la carpeta y una vez contados el usuarios tendrá permiso para acceder.',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => '',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfReceipt' => '',
@@ -1365,6 +1371,8 @@ URL: [url]',
 'settings_quota_desc' => 'El número máximo de bytes que el usuario puede ocupar en disco. Asignar 0 para no limitar el espacio de disco. Este valor puede ser sobreescrito por cada uso en su perfil.',
 'settings_removeFromDropFolder' => 'Elimina el archivo de la carpeta de subida despues de una subida exitosa',
 'settings_removeFromDropFolder_desc' => '',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => 'Acceso restringido',
 'settings_restricted_desc' => 'Solo permitir conectar a usuarios si tienen alguna entrada en la base de datos local (independientemente de la autenticación correcta con LDAP)',
 'settings_rootDir' => 'Carpeta raíz',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index d1aa3fba4..eade3cbc3 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -520,6 +520,9 @@ URL : [url]',
 'export' => '',
 'extension_archive' => '',
 'extension_manager' => 'Gestionnaire d\'extensions',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => 'Février',
 'file' => 'Fichier',
 'files' => 'Fichiers',
@@ -568,6 +571,7 @@ Utilisateur: [username]
 URL: [url]',
 'folder_renamed_email_subject' => '[sitename]: [name] - Dossier renommé',
 'folder_title' => 'Dossier \'[foldername]\'',
+'force_update' => '',
 'friday' => 'Vendredi',
 'friday_abbr' => 'Ven.',
 'from' => 'Du',
@@ -1277,6 +1281,8 @@ Nom : [username]
 'settings_enablePasswordForgotten_desc' => 'Si vous voulez permettre à l\'utilisateur de définir un nouveau mot de passe et l\'envoyer par mail, cochez cette option.',
 'settings_enableRecursiveCount' => 'Décompte récursif des documents/dossiers',
 'settings_enableRecursiveCount_desc' => 'Si activé, le nombre de documents et répertoires dans un répertoire est calculé en comptant récursivement le contenu des sous-répertoires auxquels l\'utilisateur a accès.',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => 'Activer la révision des documents',
 'settings_enableRevisionWorkflow_desc' => 'Activer afin de pouvoir lancer un flux de travail pour réviser un document après une période donnée.',
 'settings_enableSelfReceipt' => '',
@@ -1404,6 +1410,8 @@ Nom : [username]
 'settings_quota_desc' => 'Espace maximum (en octets) qu’un utilisateur peut occuper sur le disque. Définir à 0 pour un espace illimité. Une valeur spécifique peut être définie par utilisateur depuis son profil.',
 'settings_removeFromDropFolder' => 'Supprimer le fichier du dossier de dépôt après un chargement réussi',
 'settings_removeFromDropFolder_desc' => 'Activez ceci si un fichier pris du dossier de dépôt doit être supprimé après un upload réussi.',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => 'Accès restreint',
 'settings_restricted_desc' => 'Autoriser les utilisateurs à se connecter seulement s\'ils ont une entrée dans la BD locale (independamment d\'une authentification réussie avec LDAP)',
 'settings_rootDir' => 'Répertoire racine',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 97d790bdd..180b840ca 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -508,6 +508,9 @@ Internet poveznica: [url]',
 'export' => 'Izvoz',
 'extension_archive' => '',
 'extension_manager' => 'Upravljanje ekstenzijama',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => 'Veljača',
 'file' => 'Datoteka',
 'files' => 'Datoteke',
@@ -556,6 +559,7 @@ Korisnik: [username]
 Internet poveznica: [url]',
 'folder_renamed_email_subject' => '[sitename]: [name] - Preimenovana mapa',
 'folder_title' => 'Mapa \'[foldername]\'',
+'force_update' => '',
 'friday' => 'Petak',
 'friday_abbr' => 'Pe',
 'from' => 'Od',
@@ -1259,6 +1263,8 @@ Internet poveznica: [url]',
 'settings_enablePasswordForgotten_desc' => 'Ako želite omogućiti korisniku da postavi novu lozinku i pošalje ju e-mailom, označite ovu opciju.',
 'settings_enableRecursiveCount' => 'Omogući rekurzivno brojanje dokumenta/mape',
 'settings_enableRecursiveCount_desc' => 'Ako je uključeno, broj dokumenata i mapa u pregledu mape će biti određen brojanjem svih objekata rekurzivnom obradom mapa i brojanjem tih dokumenata i mapa kojima je korisniku omogućen pristup.',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => 'Omogućavanje revizije dokumenata',
 'settings_enableRevisionWorkflow_desc' => 'Omogućite kako bi se mogao pokrenuti tok rada za revidiranje dokumenta nakon zadanog vremenskog perioda.',
 'settings_enableSelfReceipt' => '',
@@ -1386,6 +1392,8 @@ Internet poveznica: [url]',
 'settings_quota_desc' => 'Maksimalni broj bajtova na disku koji korisnik može koristiti. Postavite na 0 za neograničeni prostor na disku. Ova vrijednost može biti postavljena svakom korisniku u njegovom profilu.',
 'settings_removeFromDropFolder' => '',
 'settings_removeFromDropFolder_desc' => '',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => 'Ograničeni pristup',
 'settings_restricted_desc' => 'Omogući prijavu korisnicima samo ako imaju pristup u lokalnu bazu podataka (bez obzira na uspješnu autentifikaciju s LDAP-om)',
 'settings_rootDir' => 'Root mapa',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 5ec93e759..b5d5f7e29 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -503,6 +503,9 @@ URL: [url]',
 'export' => '',
 'extension_archive' => '',
 'extension_manager' => 'Bővítmények kezelése',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => 'Február',
 'file' => 'Állomány',
 'files' => 'Állományok',
@@ -551,6 +554,7 @@ Felhasználó: [username]
 URL: [url]',
 'folder_renamed_email_subject' => '[sitename]: [name] - Mappa átnevezve',
 'folder_title' => 'Mappa \'[foldername]\'',
+'force_update' => '',
 'friday' => 'Péntek',
 'friday_abbr' => 'Pé',
 'from' => 'Tól',
@@ -1237,6 +1241,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Ha azt szeretné, hogy a felhasználó megadhasson új jelszót és elküldhesse azt emailben, engedélyezze ezt a lehetőséget.',
 'settings_enableRecursiveCount' => 'Engedélyezi a rekurzív dokumentum/mappa számot',
 'settings_enableRecursiveCount_desc' => 'Ha be van kapcsolva a mappa nézetben a dokumentumok és mappák száma minden objektum rekurzív feldolgozásával kerül meghatározásra és a dokumentumok és mappák száma a felhasználó számára engedélyezett.',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => '',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfReceipt' => '',
@@ -1364,6 +1370,8 @@ URL: [url]',
 'settings_quota_desc' => 'A felhasználó által a lemezen használható bájtok legnagyobb száma. Állítsa 0-ra a korlátlan lemezterülethez. Ez az érték felülírható valamennyi felhasználó saját profiljában.',
 'settings_removeFromDropFolder' => '',
 'settings_removeFromDropFolder_desc' => '',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => 'Korlátozott hozzáférés',
 'settings_restricted_desc' => 'Kizárólag azok a felhasználók jelentkezhetnek be, akik a helyi adatbázisban vannak (függetlenül a sikeres LDAP azonosítástól)',
 'settings_rootDir' => 'Gyökérkönyvtár',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 51887248d..c882b5f91 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -509,6 +509,9 @@ URL: [url]',
 'export' => 'Esporta',
 'extension_archive' => '',
 'extension_manager' => 'Gestisci le estensioni dei files',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => 'Febbraio',
 'file' => 'File',
 'files' => 'Files',
@@ -557,6 +560,7 @@ Utente: [username]
 URL: [url]',
 'folder_renamed_email_subject' => '[sitename]: [name] - Cartella rinominata',
 'folder_title' => 'Cartella \'[foldername]\'',
+'force_update' => '',
 'friday' => 'Venerdì',
 'friday_abbr' => 'Ven',
 'from' => 'da',
@@ -1271,6 +1275,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Spuntare nel caso si desideri permettere all\'utente di re-impostare la password inviata per email.',
 'settings_enableRecursiveCount' => 'Abilita il conteggio ricursivo di documenti/cartelle',
 'settings_enableRecursiveCount_desc' => 'Se selezionato il numero di documenti e sottocartelle accessibili all\'utente sarà calcolato con un conteggio ricursivo di tutti gli oggetti contenuti nella cartella.',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => 'Abilita revisione documenti',
 'settings_enableRevisionWorkflow_desc' => 'Abilita per attivare workflow su revisione documenti dopo scadenza.',
 'settings_enableSelfReceipt' => '',
@@ -1398,6 +1404,8 @@ URL: [url]',
 'settings_quota_desc' => 'La quantità Max di spazio su disco che può essere occupata da ciascun utente. Impostare il valore 0 offre spazio illimitato.',
 'settings_removeFromDropFolder' => 'Rimuovere file dalla cartella di ricezione dopo il successo di posto',
 'settings_removeFromDropFolder_desc' => 'Attivare questa, se un file è preso dalla cartella di ricezione, si è cancellata dopo il caricamento di successo.',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => 'Accesso limitato',
 'settings_restricted_desc' => 'Permette agli utenti di entrare nel sistema soltanto se hanno un record nel database locale (ignora l\'autenticazione positiva attraverso LDAP)',
 'settings_rootDir' => 'Cartella principale',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 2682893b7..83d47c987 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -509,6 +509,9 @@ URL: [url]',
 'export' => '내보내기',
 'extension_archive' => '',
 'extension_manager' => '확장자 관리',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => '2월',
 'file' => '파일',
 'files' => '파일',
@@ -557,6 +560,7 @@ URL : [url]',
 URL: [url]',
 'folder_renamed_email_subject' => '[sitename] : [name] - 폴더 이름',
 'folder_title' => '폴더 \'[foldername]\'',
+'force_update' => '',
 'friday' => '금요일',
 'friday_abbr' => '금',
 'from' => '시작일',
@@ -1253,6 +1257,8 @@ URL : [url]',
 'settings_enablePasswordForgotten_desc' => '옵션을 사용자가 새 비밀번호를 설정하도록 메일로 보내 확인 할 수 있습니다.',
 'settings_enableRecursiveCount' => '재귀적 문서 / 폴더 수 사용',
 'settings_enableRecursiveCount_desc' => 'If turned on, the number of documents and folders in the folder view will be determined by counting all objects by recursively processing the folders and counting those documents and folders the user is allowed to access.',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => '문서의 개정 허용',
 'settings_enableRevisionWorkflow_desc' => '일정 기간후에 문서를 개정 하기위해 워크플로우를 수행 할 수 있도록 설정 합니다.',
 'settings_enableSelfReceipt' => '',
@@ -1380,6 +1386,8 @@ URL : [url]',
 'settings_quota_desc' => '사용자가 디스크를 사용할 수 있습니다 최대 바이트 수. 무제한 디스크 공간 사용시 0으로 설정합니다. 각각 자신의 프로필에 사용을 위해이 값은 변경 할 수 있습니다.',
 'settings_removeFromDropFolder' => '',
 'settings_removeFromDropFolder_desc' => '',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => '제한된 액세스',
 'settings_restricted_desc' => '로컬 데이터베이스에 항목이있는 경우만 사용자가 로그인 할 수 있습니다. (LDAP 인증에 관계없이 )',
 'settings_rootDir' => '루트 디렉토리',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 3c4660ae8..0c146f8ac 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -508,6 +508,9 @@ URL: [url]',
 'export' => 'export',
 'extension_archive' => '',
 'extension_manager' => 'Beheer uitbreidingen',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => 'februari',
 'file' => 'Bestand',
 'files' => 'Bestanden',
@@ -556,6 +559,7 @@ Gebruiker: [username]
 URL: [url]',
 'folder_renamed_email_subject' => '[sitename]: [name] - Folder hernoemd',
 'folder_title' => 'Map naam \'[foldername]\'',
+'force_update' => '',
 'friday' => 'Vrijdag',
 'friday_abbr' => 'FR',
 'from' => 'Van',
@@ -1283,6 +1287,8 @@ Name: [username]
 'settings_enablePasswordForgotten_desc' => 'Inschakelen om een wachtwoord via mail te versturen als de gebruiker een nieuw wachtwoord heeft ingesteld.',
 'settings_enableRecursiveCount' => 'Document/ map teller herhalen toestaan',
 'settings_enableRecursiveCount_desc' => 'If turned on, the number of documents and folders in the folder view will be determined by counting all objects by recursively processing the folders and counting those documents and folders the user is allowed to access.',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => 'Herzieningsworkflow aanzetten',
 'settings_enableRevisionWorkflow_desc' => 'Herzieningsworkflow aanzetten',
 'settings_enableSelfReceipt' => '',
@@ -1410,6 +1416,8 @@ Name: [username]
 'settings_quota_desc' => 'Het maximum aantal bytes een gebruiker op de schijf mag schrijven. Stel deze in op 0 voor een onbeperkte schijfruimte. Deze waarde kan worden overschreven voor elk gebruik in zijn profiel.',
 'settings_removeFromDropFolder' => 'Verwijder het bestand uit de dropfolder na een succesvolle upload',
 'settings_removeFromDropFolder_desc' => 'Verwijder het bestand uit de dropfolder na een succesvolle upload',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => 'Beperkte toegang',
 'settings_restricted_desc' => 'Sta alleen gebruiker toe om in te loggen die in de database zijn opgenomen (ongeacht succesvolle authenticatie met LDAP)',
 'settings_rootDir' => 'Basismap',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 3473bb321..02152877a 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -496,6 +496,9 @@ URL: [url]',
 'export' => '',
 'extension_archive' => '',
 'extension_manager' => 'Zarządzanie rozszerzeniami',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => 'Luty',
 'file' => 'Plik',
 'files' => 'Pliki',
@@ -544,6 +547,7 @@ Użytkownik: [username]
 URL: [url]',
 'folder_renamed_email_subject' => '[sitename]: [name] - Zmiana nazwy folderu',
 'folder_title' => 'Folder \'[foldername]\'',
+'force_update' => '',
 'friday' => 'Piątek',
 'friday_abbr' => 'Fr',
 'from' => 'Od',
@@ -1217,6 +1221,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Jeśli chcesz zezwolić użytkownikom na zmianę własnego hasła i wysyłanie go emailem, zaznacz tę opcję.',
 'settings_enableRecursiveCount' => 'Włącz licznik rekurencji dokumentu/folderu',
 'settings_enableRecursiveCount_desc' => 'Jeżeli jest włączone, to liczba dokumentów i folderów w widoku będzie ustalona poprzez zliczenie wszystkich obiektów przez rekurencyjnie przetwarzane foldery i policzenia tych dokumentów i folderów do których użytkownik ma dostęp',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => '',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfReceipt' => '',
@@ -1344,6 +1350,8 @@ URL: [url]',
 'settings_quota_desc' => 'Maksymalna liczba bajtów jaką użytkownik może wykorzystać na dysku. Ustaw na 0 dla nieograniczonej przestrzeni dyskowej. Wartość ta może być zastąpiona dla każdego zastosowania w swoim profilu.',
 'settings_removeFromDropFolder' => '',
 'settings_removeFromDropFolder_desc' => '',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => 'Ograniczony dostęp',
 'settings_restricted_desc' => 'Mogą zalogować się tylko ci użytkownicy, którzy mają swoje wpisy w lokalnej bazie danych (niezależnie od pomyślnego uwierzytelnienia w LDAP)',
 'settings_rootDir' => 'Katalog główny',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 9e70b2a44..a294e7718 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -502,6 +502,9 @@ URL: [url]',
 'export' => '',
 'extension_archive' => '',
 'extension_manager' => 'Gerenciar extensões',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => 'February',
 'file' => 'Arquivo',
 'files' => 'Arquivos',
@@ -550,6 +553,7 @@ Usuário: [username]
 URL: [url]',
 'folder_renamed_email_subject' => '[sitename]: [name] - Pasta renomeada',
 'folder_title' => 'Pasta [foldername]',
+'force_update' => '',
 'friday' => 'Friday',
 'friday_abbr' => 'Fr',
 'from' => 'From',
@@ -1235,6 +1239,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Se você quiser permitir o usuário definir uma nova senha e enviá-la por e-mail, marque esta opção.',
 'settings_enableRecursiveCount' => 'Ativar contagem de documentos/pasta recursiva',
 'settings_enableRecursiveCount_desc' => 'Se estiver ativado, o número de documentos e pastas na exibição de pasta será determinada pela contagem de todos os objetos de forma recursiva proceáando as pastas e contando eáes documentos e pastas que o usuário tem permissão de acesso.',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => '',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfReceipt' => '',
@@ -1362,6 +1368,8 @@ URL: [url]',
 'settings_quota_desc' => 'O número máximo de bytes que um utilizador pode usar no disco. Defina para 0 para o espaço em disco ilimitado. Este valor pode ser substituído para cada uso em seu perfil.',
 'settings_removeFromDropFolder' => '',
 'settings_removeFromDropFolder_desc' => '',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => 'acesso restrito',
 'settings_restricted_desc' => 'Só permitir que os usuários façam login se eles têm uma entrada no banco de dados local (independentemente de autenticação bem-sucedida com LDAP)',
 'settings_rootDir' => 'Diretório raiz',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 69761669e..ba002d521 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -508,6 +508,9 @@ URL: [url]',
 'export' => '',
 'extension_archive' => '',
 'extension_manager' => 'Gestionați extensiile',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => 'Februarie',
 'file' => 'Fișier',
 'files' => 'Fișiere',
@@ -556,6 +559,7 @@ Utilizator: [username]
 URL: [url]',
 'folder_renamed_email_subject' => '[sitename]: [name] - Folder redenumit',
 'folder_title' => 'Folder \'[foldername]\'',
+'force_update' => '',
 'friday' => 'Vineri',
 'friday_abbr' => 'Vi',
 'from' => 'De la',
@@ -1260,6 +1264,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Dacă doriți să permiteti utilizatorilor să stabilească o nouă parolă și să le fie trimisă prin e-mail, bifați această opțiune.',
 'settings_enableRecursiveCount' => 'Activați numararea recursiva pentru documente/foldere',
 'settings_enableRecursiveCount_desc' => 'Dacă este activată, numărul de documente și foldere din vizualizarea unui director va fi determinat prin numărarea tuturor obiectelor recursiv din folderele unde accesul utilizatorului este permis.',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => '',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfReceipt' => '',
@@ -1387,6 +1393,8 @@ URL: [url]',
 'settings_quota_desc' => 'Numărul maxim de bytes pe care un utilizator  îi poate folosi pe disc. Setați această opțiune pe 0 pentru spatiu pe disc nelimitat. Această valoare poate fi suprascrisă în profilul fiecărui utilizăr.',
 'settings_removeFromDropFolder' => '',
 'settings_removeFromDropFolder_desc' => '',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => 'Acces restricționat',
 'settings_restricted_desc' => 'Permite utilizatorilor să se autentifice doar dacă au o intrare în baza de date locală (indiferent de autentificarea cu succes folosind LDAP)',
 'settings_rootDir' => 'Director rădăcină',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 582e72576..1471f61c9 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -508,6 +508,9 @@ URL: [url]',
 'export' => 'Экспорт',
 'extension_archive' => '',
 'extension_manager' => 'Управление расширениями',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => 'Февраль',
 'file' => 'Файл',
 'files' => 'Файлы',
@@ -556,6 +559,7 @@ URL: [url]',
 URL: [url]',
 'folder_renamed_email_subject' => '[sitename]: переименован каталог «[name]»',
 'folder_title' => 'Каталог [foldername]',
+'force_update' => '',
 'friday' => 'Пятница',
 'friday_abbr' => 'Пт',
 'from' => 'От',
@@ -1267,6 +1271,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Если включено, разрешает пользователям восстанавливать пароль через e-mail.',
 'settings_enableRecursiveCount' => 'Рекурсивно подсчитывать<br/>документы и каталоги',
 'settings_enableRecursiveCount_desc' => 'Если включено, количество документов и каталогов в виде каталога будет определятся рекурсивным подсчётом всех документов и каталогов разрешённых для доступа пользователя.',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => 'Включить процесс ревизии',
 'settings_enableRevisionWorkflow_desc' => 'Включить для активации функции ревизии документа по истечении определенного периода времени.',
 'settings_enableSelfReceipt' => '',
@@ -1394,6 +1400,8 @@ URL: [url]',
 'settings_quota_desc' => 'Максимально количество байт, которые пользователь может использовать на дисковом пространстве. Значение 0 снимает ограничение на используемое дисковое пространство. Это значение может быть указано отдельно для каждого пользователя в его профиле.',
 'settings_removeFromDropFolder' => 'Удалить из проходного каталога',
 'settings_removeFromDropFolder_desc' => 'Включите, для удаления файла из проходного каталога после успешной загрузки.',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => 'Ограниченный доступ',
 'settings_restricted_desc' => 'Разрешать вход пользователям, только если у них есть соответствующая учётная запись в БД (независимо от успешного входа через LDAP).',
 'settings_rootDir' => 'Корневой каталог',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 02543b4ed..8d50f1ac3 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -451,6 +451,9 @@ URL: [url]',
 'export' => 'Exportovať',
 'extension_archive' => '',
 'extension_manager' => 'Správa rozšírení',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => 'Február',
 'file' => 'Súbor',
 'files' => 'Súbory',
@@ -479,6 +482,7 @@ URL: [url]',
 'folder_renamed_email_body' => 'Zložka bola premenovaná Zložka: [name] Nadradená zložka: [folder_path] Starý názov: [old_name] Používateľ: [username] URL: [url]',
 'folder_renamed_email_subject' => '[sitename]: [name] - Zložka bola premenovaná',
 'folder_title' => 'Zložka \'[foldername]\'',
+'force_update' => '',
 'friday' => 'Piatok',
 'friday_abbr' => 'Pia',
 'from' => 'Od',
@@ -1092,6 +1096,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => '',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => 'Povoliť revíziu dokumentov',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfReceipt' => '',
@@ -1219,6 +1225,8 @@ URL: [url]',
 'settings_quota_desc' => '',
 'settings_removeFromDropFolder' => '',
 'settings_removeFromDropFolder_desc' => '',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => '',
 'settings_restricted_desc' => '',
 'settings_rootDir' => 'Koreňový adresár',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index fa7ec53bc..eb43ff55d 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -521,6 +521,9 @@ URL: [url]',
 'export' => 'Exportera',
 'extension_archive' => '',
 'extension_manager' => 'Hantera tillägg',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => 'februari',
 'file' => 'Fil',
 'files' => 'Filer',
@@ -569,6 +572,7 @@ User: [username]
 URL: [url]',
 'folder_renamed_email_subject' => '[sitename]: [name] - Katalog har bytt namn',
 'folder_title' => 'Katalog \'[foldername]\'',
+'force_update' => '',
 'friday' => 'Fredag',
 'friday_abbr' => 'Fr',
 'from' => 'från',
@@ -1280,6 +1284,8 @@ Kommentar: [comment]',
 'settings_enablePasswordForgotten_desc' => 'Om du vill tillåta att användare kan få nytt lösenord genom att skicka e-post, aktivera denna option.',
 'settings_enableRecursiveCount' => 'Aktivera rekursiv räkning av dokument/katalog',
 'settings_enableRecursiveCount_desc' => 'Om detta sätts på, kommer antal dokument och kataloger i katalogvyn fastställas genom att räkna alla objekter via rekursiv hantering av alla kataloger och räkna dessa dokument och kataloger som användaren har rättigheter till.',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => 'Aktivera revidering av dokument',
 'settings_enableRevisionWorkflow_desc' => 'Aktivera för att kunna köra arbetsflöde för revidering av dokument efter en specifik tidsperiod.',
 'settings_enableSelfReceipt' => '',
@@ -1407,6 +1413,8 @@ Kommentar: [comment]',
 'settings_quota_desc' => 'Maximala storlek av lagringsutrymme i bytes som en användare har tillgång till. Storlek 0 bytes betyder obegränsad lagring. Detta värde kan sättas individuellt för varje användare i dess profil. 1 GB = ca 1 000 000 000 bytes.',
 'settings_removeFromDropFolder' => 'Ta bort filen från snabbuppladdningslistan efter slutförd uppladdning',
 'settings_removeFromDropFolder_desc' => 'Aktivera denna om du automatiskt vill ta bort filer från snabbuppladdningskatalogen efter slutförd uppladdning.',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => 'Begränsad behörighet',
 'settings_restricted_desc' => 'Tillåt användare att logga in bara om det finns en inloggning för användaren i den lokala databasen (irrespective of successful authentication with LDAP)',
 'settings_rootDir' => 'Root-mapp',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 1ed6d8092..341c0e92b 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -502,6 +502,9 @@ URL: [url]',
 'export' => '',
 'extension_archive' => '',
 'extension_manager' => 'Uzantıları düzenle',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => 'Şubat',
 'file' => 'Dosya',
 'files' => 'Dosyalar',
@@ -550,6 +553,7 @@ Kullanıcı: [username]
 URL: [url]',
 'folder_renamed_email_subject' => '[sitename]: [name] - Klasörün adı değişti',
 'folder_title' => 'Klasör \'[foldername]\'',
+'force_update' => '',
 'friday' => 'Cuma',
 'friday_abbr' => 'Cu',
 'from' => 'Kimden',
@@ -1239,6 +1243,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Kullanıcının unuttuğu parolayı kendisine gönderilecek e-posta ile sıfırlamasına izin vermek için bu seçeneği etkinleştirebilirsiniz.',
 'settings_enableRecursiveCount' => 'Özyinelenen doküman/klasör sayımını etkinleştir',
 'settings_enableRecursiveCount_desc' => 'Aktif hale getirildiğinde, klasör içindeki dokümanlar ve diğer klasörlerin sayısı kullanıcının erişim hakkı olan tüm nesnelerin özyinelemeli olarak sayılması yolu ile bulunur.',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => '',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfReceipt' => '',
@@ -1366,6 +1372,8 @@ URL: [url]',
 'settings_quota_desc' => 'Kullanıcının yükleyebileceği maksimum dosya boyutu (byte cinsinden). Sınırsız kota için 0 girilir.',
 'settings_removeFromDropFolder' => '',
 'settings_removeFromDropFolder_desc' => '',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => 'Kısıtlı erişim',
 'settings_restricted_desc' => '(LDAP kullanıcısı olarak giriş yapılmış olunsa da) Sadece yerel veritabanında kullanıcı hesabı olanların girişine izin verilir.',
 'settings_rootDir' => 'Kök dizin',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 5a3915237..f69a46e83 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -508,6 +508,9 @@ URL: [url]',
 'export' => 'Експорт',
 'extension_archive' => '',
 'extension_manager' => 'Керування розширеннями',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => 'Лютий',
 'file' => 'Файл',
 'files' => 'Файли',
@@ -556,6 +559,7 @@ URL: [url]',
 URL: [url]',
 'folder_renamed_email_subject' => '[sitename]: перейменовано каталог «[name]»',
 'folder_title' => 'Каталог [foldername]',
+'force_update' => '',
 'friday' => 'П\'ятниця',
 'friday_abbr' => 'Пт',
 'from' => 'Від',
@@ -1260,6 +1264,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Якщо увімкнено, дозволяє користувачам відновлювати пароль через e-mail.',
 'settings_enableRecursiveCount' => 'Рекурсивно підраховувати<br/>документи і каталоги',
 'settings_enableRecursiveCount_desc' => 'Якщо увімкнено, кількість документів і каталогів при перегляді каталогу буде підраховано рекурсивно для всіх документів до яких користувач має доступ.',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => 'Увімкнути процес ревізії',
 'settings_enableRevisionWorkflow_desc' => 'Увімкніть для актвації функції ревізії документа через певний час',
 'settings_enableSelfReceipt' => '',
@@ -1387,6 +1393,8 @@ URL: [url]',
 'settings_quota_desc' => 'Максимальна кількість байт, Які користувач може використовувати на дисковому просторі. Значення 0 знімає обмеження на дисковий простір. Це значення може бути вказано окремо для кожного користувача в його профілі.',
 'settings_removeFromDropFolder' => '',
 'settings_removeFromDropFolder_desc' => '',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => 'Обмежений доступ',
 'settings_restricted_desc' => 'Дозволити вхід користувачам, тільки якщо в них є відповідний обліковий запис в БД (незалежно від успішного входу через LDAP).',
 'settings_rootDir' => 'Кореневий каталог',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 5c2b35e06..4fb4b861e 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -506,6 +506,9 @@ URL: [url]',
 'export' => '导出',
 'extension_archive' => '',
 'extension_manager' => '扩展管理器',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => '二 月',
 'file' => '文件',
 'files' => '文件',
@@ -554,6 +557,7 @@ URL: [url]',
 URL: [url]',
 'folder_renamed_email_subject' => '[sitename]: [name] - 文件夹已重命名',
 'folder_title' => '文件夹 \'[foldername]\'',
+'force_update' => '',
 'friday' => 'Friday',
 'friday_abbr' => '',
 'from' => '从',
@@ -1243,6 +1247,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => '如您想让用户可以通过邮件方式自主设置新密码，请勾选此选项',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => '启用文档修订记录',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfReceipt' => '',
@@ -1370,6 +1376,8 @@ URL: [url]',
 'settings_quota_desc' => '',
 'settings_removeFromDropFolder' => '',
 'settings_removeFromDropFolder_desc' => '',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => '禁止访问',
 'settings_restricted_desc' => '',
 'settings_rootDir' => '根目录',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 3f945aa5a..ec425ef66 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -451,6 +451,9 @@ URL: [url]',
 'export' => '',
 'extension_archive' => '',
 'extension_manager' => '整體索引進度',
+'extension_mgr_installed' => '',
+'extension_mgr_no_upload' => '',
+'extension_mgr_repository' => '',
 'february' => '二 月',
 'file' => '文件',
 'files' => '文件',
@@ -479,6 +482,7 @@ URL: [url]',
 'folder_renamed_email_body' => '',
 'folder_renamed_email_subject' => '',
 'folder_title' => '資料夾 \'[foldername]\'',
+'force_update' => '',
 'friday' => 'Friday',
 'friday_abbr' => '',
 'from' => '從',
@@ -1092,6 +1096,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => '',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
+'settings_enableRevisionOnVoteReject' => '',
+'settings_enableRevisionOnVoteReject_desc' => '',
 'settings_enableRevisionWorkflow' => '',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfReceipt' => '',
@@ -1219,6 +1225,8 @@ URL: [url]',
 'settings_quota_desc' => '',
 'settings_removeFromDropFolder' => '',
 'settings_removeFromDropFolder_desc' => '',
+'settings_repositoryUrl' => '',
+'settings_repositoryUrl_desc' => '',
 'settings_restricted' => '',
 'settings_restricted_desc' => '',
 'settings_rootDir' => '',

From a685d4498bc8ec3a3c6985b98c0267491a7973a6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Mar 2018 18:56:28 +0100
Subject: [PATCH 051/147] show same tab after installing an extension from a
 repository

---
 op/op.ExtensionMgr.php                 | 9 ++++++---
 views/bootstrap/class.ExtensionMgr.php | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/op/op.ExtensionMgr.php b/op/op.ExtensionMgr.php
index 98c81682f..7fcbe569c 100644
--- a/op/op.ExtensionMgr.php
+++ b/op/op.ExtensionMgr.php
@@ -40,6 +40,9 @@ if(!checkFormKey('extensionmgr')) {
 if (isset($_POST["action"])) $action=$_POST["action"];
 else $action=NULL;
 
+if (isset($_POST["currenttab"])) $currenttab=$_POST["currenttab"];
+else $currenttab=NULL;
+
 // add new attribute definition ---------------------------------------------
 if ($action == "download") {
 	if (!isset($_POST["extname"])) {
@@ -66,7 +69,7 @@ elseif ($action == "refresh") { /* {{{ */
 	}
 	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_extension_refresh')));
 	add_log_line();
-	header("Location:../out/out.ExtensionMgr.php");
+	header("Location:../out/out.ExtensionMgr.php?currenttab=".$currenttab);
 } /* }}} */
 elseif ($action == "upload") { /* {{{ */
 	if(!$extmgr->isWritableExitDir()) {
@@ -86,7 +89,7 @@ elseif ($action == "upload") { /* {{{ */
 	}
 	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_extension_import')));
 	add_log_line();
-	header("Location:../out/out.ExtensionMgr.php");
+	header("Location:../out/out.ExtensionMgr.php?currenttab=".$currenttab);
 } /* }}} */
 elseif ($action == "import") { /* {{{ */
 	if(!$_POST['url']) {
@@ -108,7 +111,7 @@ elseif ($action == "import") { /* {{{ */
 	unlink($file);
 	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_extension_upload')));
 	add_log_line();
-	header("Location:../out/out.ExtensionMgr.php");
+	header("Location:../out/out.ExtensionMgr.php?currenttab=".$currenttab);
 } /* }}} */
 
 
diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index f63a209f2..c29b8bc76 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -201,7 +201,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 				echo "<td nowrap>";
 				echo "<div class=\"list-action\">";
 				if(!$checkmsgs && $extmgr->isWritableExitDir())
-					echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$extname."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$extname."\" title=\"".getMLText('import_extension')."\"><i class=\"icon-download\"></i></a></form>";
+					echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$re['name']."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"currenttab\" value=\"repository\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$re['name']."\" title=\"".getMLText('import_extension')."\"><i class=\"icon-download\"></i></a></form>";
 				echo "</div>";
 				echo "</td>";
 				echo "</tr>";

From ce2a4596b47be48dfd6b1ce26d2ee91e60db0b96 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 15 Mar 2018 16:22:33 +0100
Subject: [PATCH 052/147] hook extraVersionActions may return an array

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

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index b1eb31197..3df187b6e 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -659,7 +659,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$items = $this->callHook('extraVersionActions', $latestContent);
 		if($items) {
 			foreach($items as $item) {
-				echo "<li>".$item."</li>";
+				if(is_string($item))
+					echo "<li>".$item."</li>";
+				elseif(is_array($item))
+					echo "<li><a href=\"".$item['link']."\">".(!empty($item['icon']) ? "<i class=\"icon-".$item['icon']."\"></i>" : "").getMLText($item['label'])."</a></li>";
 			}
 		}
 
@@ -1228,7 +1231,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				$items = $this->callHook('extraVersionActions', $version);
 				if($items) {
 					foreach($items as $item) {
-						echo "<li>".$item."</li>";
+						if(is_string($item))
+							echo "<li>".$item."</li>";
+						elseif(is_array($item))
+							echo "<li><a href=\"".$item['link']."\">".(!empty($item['icon']) ? "<i class=\"icon-".$item['icon']."\"></i>" : "").getMLText($item['label'])."</a></li>";
 					}
 				}
 				print "</ul>";

From 6c16c524269e7c4625a37068082650bedc0c4229 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 16 Mar 2018 10:49:57 +0100
Subject: [PATCH 053/147] add changelog file

---
 ext/example/changelog.md | 2 ++
 ext/example/conf.php     | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 ext/example/changelog.md

diff --git a/ext/example/changelog.md b/ext/example/changelog.md
new file mode 100644
index 000000000..aa8f298be
--- /dev/null
+++ b/ext/example/changelog.md
@@ -0,0 +1,2 @@
+Changes in version 1.0.0
+==========================
diff --git a/ext/example/conf.php b/ext/example/conf.php
index e84670dc5..2c39d9680 100644
--- a/ext/example/conf.php
+++ b/ext/example/conf.php
@@ -52,6 +52,7 @@ $EXT_CONF['example'] = array(
 		'depends' => array('php' => '5.4.4-', 'seeddms' => '4.3.0-'),
 	),
 	'icon' => 'icon.png',
+	'changelog' => 'changelog.md',
 	'class' => array(
 		'file' => 'class.example.php',
 		'name' => 'SeedDMS_ExtExample'

From dce83545b8dfd4d8c00a247a7d5dea45be00d39c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 16 Mar 2018 11:19:12 +0100
Subject: [PATCH 054/147] show changelog file of extensions

---
 CHANGELOG                              |  1 +
 out/out.ExtensionMgr.php               |  1 +
 views/bootstrap/class.ExtensionMgr.php | 10 ++++++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7b6201c6f..7b46c9889 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 --------------------------------------------------------------------------------
 - PLEASE READ doc/README.Dist-Layout WHEN UPGRADING!!!!
 - support for upload/import/download of extensions
+- extension can have a changelog file
 - remove ancient code to upgrade from old config file
 - place all log files in contentDir/log
 - add readme for new dist layout
diff --git a/out/out.ExtensionMgr.php b/out/out.ExtensionMgr.php
index c87a2fc43..6e056ad22 100644
--- a/out/out.ExtensionMgr.php
+++ b/out/out.ExtensionMgr.php
@@ -48,6 +48,7 @@ else
 
 if($view) {
 	$view->setParam('httproot', $settings->_httpRoot);
+	$view->setParam('extdir', $settings->_rootDir."/ext");
 	$view->setParam('version', $v);
 	$view->setParam('extmgr', $extmgr);
 	$view->setParam('currenttab', $currenttab);
diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index c29b8bc76..2f60bd842 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -67,6 +67,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$httproot = $this->params['httproot'];
+		$extdir = $this->params['extdir'];
 		$version = $this->params['version'];
 		$extmgr = $this->params['extmgr'];
 		$currenttab = $this->params['currenttab'];
@@ -138,11 +139,16 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			if($extconf['icon'])
 				echo "<img src=\"".$httproot."ext/".$extname."/".$extconf['icon']."\" alt=\"".$extname."\" title=\"".$extname."\">";
 			echo "</td>";
-			echo "<td>".$extconf['title']."<br /><small>".$extconf['description']."</small>";
+			echo "<td>".$extconf['title'];
+			if($extconf['changelog'] && file_exists($extdir."/".$extname."/".$extconf['changelog'])) {
+				echo $this->printPopupBox("<i class=\"icon-reorder\"></i>", '<div style="white-space: pre-wrap; font-family: monospace; padding: 0px;">'.file_get_contents($extdir."/".$extname."/".$extconf['changelog'])."</div>", true);
+			}
+			echo "<br /><small>".$extconf['description']."</small>";
 			if($errmsgs)
 				echo "<div><img src=\"".$this->getImgPath("attention.gif")."\"> ".implode('<br /><img src="'.$this->getImgPath("attention.gif").'"> ', $errmsgs)."</div>";
 			echo "</td>";
-			echo "<td nowrap>".$extconf['version']."<br /><small>".$extconf['releasedate']."</small>";
+			echo "<td nowrap>".$extconf['version'];
+			echo "<br /><small>".$extconf['releasedate']."</small>";
 			echo "</td>";
 			echo "<td nowrap><a href=\"mailto:".$extconf['author']['email']."\">".$extconf['author']['name']."</a><br /><small>".$extconf['author']['company']."</small></td>";
 			echo "<td nowrap>";

From 15d1e7ef2ac99d5d6929f0006c42c22bd04102cd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 19 Mar 2018 08:31:05 +0100
Subject: [PATCH 055/147] send email if attributes have changed

---
 op/op.EditDocument.php | 57 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php
index afc4471b7..575fb33aa 100644
--- a/op/op.EditDocument.php
+++ b/op/op.EditDocument.php
@@ -212,6 +212,63 @@ if ($expires != $oldexpires) {
 if ($oldkeywords != $keywords) {
 }
 
+/* First check for changed attributes or old attributes that have been deleted */
+if($oldattributes) {
+	foreach($oldattributes as $attrdefid=>$attribute) {
+		if(!isset($attributes[$attrdefid]) || $attributes[$attrdefid] != $oldattributes[$attrdefid]->getValue()) {
+			if($notifier) {
+				$notifyList = $document->getNotifyList();
+				$subject = "attribute_changed_email_subject";
+				$message = "attribute_changed_email_body";
+				$params = array();
+				$params['name'] = $document->getName();
+				$params['version'] = '';
+				$params['attribute_name'] = $attribute->getAttributeDefinition()->getName();
+				$params['attribute_old_value'] = $attribute->get->getValueAsString();
+				$params['attribute_new_value'] = $attributes[$attrdefid];
+				$params['folder_path'] = $folder->getFolderPathPlain();
+				$params['username'] = $user->getFullName();
+				$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+				$params['sitename'] = $settings->_siteName;
+				$params['http_root'] = $settings->_httpRoot;
+
+				$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+				foreach ($notifyList["groups"] as $grp) {
+					$notifier->toGroup($user, $grp, $subject, $message, $params);
+				}
+			}
+		}
+	}
+}
+/* Check for new attributes which didn't have a value before */
+if($attributes) {
+	foreach($attributes as $attrdefid=>$attribute) {
+		if(!$oldattributes[$attrdefid]) {
+			if($notifier) {
+				$notifyList = $document->getNotifyList();
+				$subject = "attribute_changed_email_subject";
+				$message = "attribute_changed_email_body";
+				$params = array();
+				$params['name'] = $document->getName();
+				$params['version'] = '';
+				$params['attribute_name'] = $dms->getAttributeDefinition($attrdefid)->getName();
+				$params['attribute_old_value'] = '';
+				$params['attribute_new_value'] = $attribute;
+				$params['folder_path'] = $folder->getFolderPathPlain();
+				$params['username'] = $user->getFullName();
+				$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+				$params['sitename'] = $settings->_siteName;
+				$params['http_root'] = $settings->_httpRoot;
+
+				$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+				foreach ($notifyList["groups"] as $grp) {
+					$notifier->toGroup($user, $grp, $subject, $message, $params);
+				}
+			}
+		}
+	}
+}
+
 $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_document_edited')));
 
 add_log_line("?documentid=".$documentid);

From a8576bef66cb6ad4828d2ca621d1d3b21d73223e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 19 Mar 2018 08:31:39 +0100
Subject: [PATCH 056/147] set old and new attribute value in notification

---
 op/op.EditAttributes.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/op/op.EditAttributes.php b/op/op.EditAttributes.php
index 22051bf74..c85de15d9 100644
--- a/op/op.EditAttributes.php
+++ b/op/op.EditAttributes.php
@@ -81,7 +81,9 @@ if($attributes) {
 						$params = array();
 						$params['name'] = $document->getName();
 						$params['version'] = $version->getVersion();
-						$params['attribute'] = $attribute;
+						$params['attribute_name'] = $dms->getAttributeDefinition($attrdefid)->getName();
+						$params['attribute_old_value'] = $oldattributes[$attrdefid]->getValue();
+						$params['attribute_new_value'] = $attribute;
 						$params['folder_path'] = $folder->getFolderPathPlain();
 						$params['username'] = $user->getFullName();
 						$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$version->getVersion();

From c20abc9be86e3f4da19f54f6a51fb7df77b039ab Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 19 Mar 2018 08:32:43 +0100
Subject: [PATCH 057/147] placeholder for name of attribute-changed
 notification is now attribute_name

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

diff --git a/op/op.EditAttributes.php b/op/op.EditAttributes.php
index 5983879b0..2264dbf0c 100644
--- a/op/op.EditAttributes.php
+++ b/op/op.EditAttributes.php
@@ -88,7 +88,7 @@ if($attributes) {
 						$params = array();
 						$params['name'] = $document->getName();
 						$params['version'] = $version->getVersion();
-						$params['attribute'] = $attribute;
+						$params['attribute_name'] = $attribute;
 						$params['folder_path'] = $folder->getFolderPathPlain();
 						$params['username'] = $user->getFullName();
 						$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$version->getVersion();

From 681509b522cb11e6e7ae1f0427a8398688c2ba33 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 19 Mar 2018 08:34:49 +0100
Subject: [PATCH 058/147] minor updates of translation

---
 languages/ar_EG/lang.inc | 16 +++++++++-------
 languages/ca_ES/lang.inc | 10 +++++-----
 languages/cs_CZ/lang.inc | 16 +++++++++-------
 languages/de_DE/lang.inc |  6 ++++--
 languages/en_GB/lang.inc |  6 ++++--
 languages/es_ES/lang.inc | 16 +++++++++-------
 languages/fr_FR/lang.inc | 22 ++++++++++++----------
 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/nl_NL/lang.inc | 16 +++++++++-------
 languages/pl_PL/lang.inc |  6 ++++--
 languages/pt_BR/lang.inc | 16 +++++++++-------
 languages/ro_RO/lang.inc | 18 ++++++++++--------
 languages/ru_RU/lang.inc | 16 +++++++++-------
 languages/sk_SK/lang.inc | 12 ++++++++++--
 languages/sv_SE/lang.inc | 16 +++++++++-------
 languages/tr_TR/lang.inc | 16 +++++++++-------
 languages/uk_UA/lang.inc | 16 +++++++++-------
 20 files changed, 166 insertions(+), 122 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index e95a57d25..a4faf7d94 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1286)
+//    Translators: Admin (1287)
 
 $text = array(
 '2_factor_auth' => '',
@@ -157,12 +157,14 @@ URL: [url]',
 'attrdef_type_url' => '',
 'attrdef_valueset' => 'مجموعة القيم',
 'attributes' => 'السمات',
-'attribute_changed_email_body' => 'تم تغيير سمة
-Document: [name]
-Version: [version]
-Attribute: [attribute]
-Parent folder: [folder_path]
-User: [username]
+'attribute_changed_email_body' => 'تم تغيير سمة
+Document: [name]
+Version: [version]
+Attribute: [attribute_name]
+Old value: [attribute_old_value]
+New value: [attribute_new_value]
+Parent folder: [folder_path]
+User: [username]
 URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: [name] - تم تغيير سمة',
 'attribute_count' => 'ﻉﺩﺩ ﻡﺭﺎﺗ ﺍﻸﺴﺘﺧﺩﺎﻣ',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index e4de4512b..4b3126e5c 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 (741)
+//    Translators: Admin (745)
 
 $text = array(
 '2_factor_auth' => '',
@@ -53,7 +53,7 @@ $text = array(
 'add_attrdefgroup' => '',
 'add_document' => 'Afegir document',
 'add_document_link' => 'Afegir vincle',
-'add_document_notify' => '',
+'add_document_notify' => 'Assigna la notificació',
 'add_doc_reviewer_approver_warning' => 'Els documents N.B. es marquen automàticament com a publicats si no hi ha revisors o aprovadors assignats',
 'add_doc_workflow_warning' => '',
 'add_event' => 'Afegir esdeveniment',
@@ -181,7 +181,7 @@ URL: [url]',
 'backup_tools' => 'Eines de còpia de seguretat',
 'between' => 'entre',
 'bg_BG' => 'Búlgar',
-'browse' => '',
+'browse' => 'Navega',
 'calendar' => 'Calendari',
 'calendar_week' => '',
 'cancel' => 'Cancel.lar',
@@ -231,7 +231,7 @@ URL: [url]',
 'choose_role' => '',
 'choose_target_category' => '',
 'choose_target_document' => 'Escollir document',
-'choose_target_file' => '',
+'choose_target_file' => 'Selecciona el fitxer',
 'choose_target_folder' => 'Escollir directori de destinació',
 'choose_user' => 'Seleccionar usuari',
 'choose_workflow' => '',
@@ -952,7 +952,7 @@ URL: [url]',
 'select_one' => 'Seleccionar un',
 'select_user' => '',
 'select_users' => 'Prem per seleccionar els usuaris',
-'select_value' => '',
+'select_value' => 'Selecciona un valor',
 'select_workflow' => '',
 'send_email' => '',
 'send_login_data' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 967faefcf..92487827f 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (739), kreml (455)
+//    Translators: Admin (740), kreml (455)
 
 $text = array(
 '2_factor_auth' => '',
@@ -164,12 +164,14 @@ URL: [url]',
 'attrdef_type_url' => '',
 'attrdef_valueset' => 'Soubor hodnot',
 'attributes' => 'Atributy',
-'attribute_changed_email_body' => 'Atributy změněny
-Dokument: [name]
-Verze: [version]
-Atribut: [attribute]
-Nadřazená složka: [folder_path]
-Uživatel: [username]
+'attribute_changed_email_body' => 'Atributy změněny
+Dokument: [name]
+Verze: [version]
+Atribut: [attribute_name]
+Old value: [attribute_old_value]
+New value: [attribute_new_value]
+Nadřazená složka: [folder_path]
+Uživatel: [username]
 URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: [name] - Atributy změněny',
 'attribute_count' => 'Počet použití',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 0b89271c4..edd3e8945 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 (2573), dgrutsch (22)
+//    Translators: Admin (2574), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -172,7 +172,9 @@ URL: [url]',
 'attribute_changed_email_body' => 'Attribut geändert
 Dokument: [name]
 Version: [version]
-Attribut: [attribute]
+Attribut: [attribute_name]
+Alter Wert: [attribute_old_value]
+Neuer Wert: [attribute_new_value]
 Elternordner: [folder_path]
 Benutzer: [username]
 URL: [url]',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 56d911a0b..b37d658e6 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 (1689), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1690), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -172,7 +172,9 @@ URL: [url]',
 'attribute_changed_email_body' => 'Attribute changed
 Document: [name]
 Version: [version]
-Attribute: [attribute]
+Attribute: [attribute_name]
+Old value: [attribute_old_value]
+New value: [attribute_new_value]
 Parent folder: [folder_path]
 User: [username]
 URL: [url]',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 85165afcb..216c68865 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 (1057), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1058), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -164,12 +164,14 @@ URL: [url]',
 'attrdef_type_url' => 'URL',
 'attrdef_valueset' => 'Conjunto de valores',
 'attributes' => 'Atributos',
-'attribute_changed_email_body' => 'Atributo modificado
-Documento: [name]
-Versión: [version]
-Atributo: [attribute]
-Carpeta principal: [folder_path]
-Usario: [username]
+'attribute_changed_email_body' => 'Atributo modificado
+Documento: [name]
+Versión: [version]
+Atributo: [attribute_name]
+Old value: [attribute_old_value]
+New value: [attribute_new_value]
+Carpeta principal: [folder_path]
+Usario: [username]
 URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: [name] - Atributo modificado',
 'attribute_count' => 'Cantidad de usos',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index eade3cbc3..f347d87f8 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1079), jeromerobert (50), lonnnew (9), Oudiceval (657)
+//    Translators: Admin (1080), jeromerobert (50), lonnnew (9), Oudiceval (660)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -169,12 +169,14 @@ URL : [url]',
 'attrdef_type_url' => 'URL',
 'attrdef_valueset' => 'Ensemble de valeurs',
 'attributes' => 'Attributs',
-'attribute_changed_email_body' => 'Attribut changé
-Document: [name]
-Version: [version]
-Attribut: [attribute]
-Répertoire parent: [folder_path]
-Utilisateur: [username]
+'attribute_changed_email_body' => 'Attribut changé
+Document: [name]
+Version: [version]
+Attribut: [attribute_name]
+Old value: [attribute_old_value]
+New value: [attribute_new_value]
+Répertoire parent: [folder_path]
+Utilisateur: [username]
 URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: [name] - Attribut changé',
 'attribute_count' => 'Nombre d\'utilisations',
@@ -571,7 +573,7 @@ Utilisateur: [username]
 URL: [url]',
 'folder_renamed_email_subject' => '[sitename]: [name] - Dossier renommé',
 'folder_title' => 'Dossier \'[foldername]\'',
-'force_update' => '',
+'force_update' => 'Mettre à jour',
 'friday' => 'Vendredi',
 'friday_abbr' => 'Ven.',
 'from' => 'Du',
@@ -1281,8 +1283,8 @@ Nom : [username]
 'settings_enablePasswordForgotten_desc' => 'Si vous voulez permettre à l\'utilisateur de définir un nouveau mot de passe et l\'envoyer par mail, cochez cette option.',
 'settings_enableRecursiveCount' => 'Décompte récursif des documents/dossiers',
 'settings_enableRecursiveCount_desc' => 'Si activé, le nombre de documents et répertoires dans un répertoire est calculé en comptant récursivement le contenu des sous-répertoires auxquels l\'utilisateur a accès.',
-'settings_enableRevisionOnVoteReject' => '',
-'settings_enableRevisionOnVoteReject_desc' => '',
+'settings_enableRevisionOnVoteReject' => 'Rejet par un réviseur',
+'settings_enableRevisionOnVoteReject_desc' => 'Si activé, le document sera rejeté si un réviseur rejette le document.',
 'settings_enableRevisionWorkflow' => 'Activer la révision des documents',
 'settings_enableRevisionWorkflow_desc' => 'Activer afin de pouvoir lancer un flux de travail pour réviser un document après une période donnée.',
 'settings_enableSelfReceipt' => '',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 180b840ca..a53b460f4 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1197), marbanas (16)
+//    Translators: Admin (1198), marbanas (16)
 
 $text = array(
 '2_factor_auth' => '',
@@ -169,12 +169,14 @@ Internet poveznica: [url]',
 'attrdef_type_url' => 'URL',
 'attrdef_valueset' => 'Skup vrijednosti',
 'attributes' => 'Atributi',
-'attribute_changed_email_body' => 'Promijenjen atribut
-Dokument: [name]
-Verzija: [version]
-Atribut: [attribute]
-Glavna mapa: [folder_path]
-Korisnik: [username]
+'attribute_changed_email_body' => 'Promijenjen atribut
+Dokument: [name]
+Verzija: [version]
+Atribut: [attribute_name]
+Old value: [attribute_old_value]
+New value: [attribute_new_value]
+Glavna mapa: [folder_path]
+Korisnik: [username]
 Internet poveznica: [url]',
 'attribute_changed_email_subject' => '[sitename]: [name] - Promijenjen atribut',
 'attribute_count' => 'Broj uporaba',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index b5d5f7e29..fcafc0012 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (621), ribaz (1023)
+//    Translators: Admin (622), ribaz (1023)
 
 $text = array(
 '2_factor_auth' => '',
@@ -164,12 +164,14 @@ URL: [url]',
 'attrdef_type_url' => '',
 'attrdef_valueset' => 'Értékek beállítása',
 'attributes' => 'Jellemzők',
-'attribute_changed_email_body' => 'Jellemző módosult
-Dokumentum: [name]
-Verzió: [version]
-Jellemző: [attribute]
-Szülő mappa: [folder_path]
-Felhasználó: [username]
+'attribute_changed_email_body' => 'Jellemző módosult
+Dokumentum: [name]
+Verzió: [version]
+Jellemző: [attribute_name]
+Old value: [attribute_old_value]
+New value: [attribute_new_value]
+Szülő mappa: [folder_path]
+Felhasználó: [username]
 URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: [name] - Jellemző módosult',
 'attribute_count' => 'Felhasználók száma',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index c882b5f91..8b1d1a7da 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1592), rickr (144), s.pnt (26)
+//    Translators: Admin (1593), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -169,12 +169,14 @@ URL: [url]',
 'attrdef_type_url' => 'URL',
 'attrdef_valueset' => 'Set di valori',
 'attributes' => 'Attributi',
-'attribute_changed_email_body' => 'Attributo modificato
-Documento: [name]
-Versione: [version]
-Attributo: [attribute]
-Cartella: [folder_path]
-Utente: [username]
+'attribute_changed_email_body' => 'Attributo modificato
+Documento: [name]
+Versione: [version]
+Attributo: [attribute_name]
+Old value: [attribute_old_value]
+New value: [attribute_new_value]
+Cartella: [folder_path]
+Utente: [username]
 URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: [name] - Attributo modificato',
 'attribute_count' => 'Numero di utilizzi',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 83d47c987..398a917c3 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/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 (944), daivoc (421), fofwisdom (166)
+//    Translators: Admin (945), daivoc (421), fofwisdom (166)
 
 $text = array(
 '2_factor_auth' => '이중 인증',
@@ -169,12 +169,14 @@ URL: [url]',
 'attrdef_type_url' => 'URL',
 'attrdef_valueset' => '값 설정',
 'attributes' => '속성',
-'attribute_changed_email_body' => '속성 변경
-문서: [name]
-버전: [version]
-속성: [attribute]
-상위폴더: [folder_path]
-사용자: [username]
+'attribute_changed_email_body' => '속성 변경
+문서: [name]
+버전: [version]
+속성: [attribute_name]
+Old value: [attribute_old_value]
+New value: [attribute_new_value]
+상위폴더: [folder_path]
+사용자: [username]
 URL: [url]',
 'attribute_changed_email_subject' => '[sitename] : [name] - 속성이 변경',
 'attribute_count' => '사용자수',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 0c146f8ac..141a9cc47 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (746), gijsbertush (610), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (747), gijsbertush (610), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 '2_factor_auth' => '2-factor-authenticatie',
@@ -162,12 +162,14 @@ URL: [url]',
 'attrdef_type_url' => 'attribuut: url',
 'attrdef_valueset' => 'Verzameling waarden',
 'attributes' => 'Attributen',
-'attribute_changed_email_body' => 'Attribuut gewijzigd
-Document: [name]
-Versie: [version]
-Attribuut: [attribute]
-Bovenliggende map: [folder_path]
-Gebruiker: [username]
+'attribute_changed_email_body' => 'Attribuut gewijzigd
+Document: [name]
+Versie: [version]
+Attribuut: [attribute_name]
+Old value: [attribute_old_value]
+New value: [attribute_new_value]
+Bovenliggende map: [folder_path]
+Gebruiker: [username]
 URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: [name] - Attribuut gewijzigd',
 'attribute_count' => 'Aantal maal gebruikt',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 02152877a..a8f0a2155 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (790), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (791), netixw (84), romi (93), uGn (112)
 
 $text = array(
 '2_factor_auth' => '',
@@ -160,7 +160,9 @@ URL: [url]',
 'attribute_changed_email_body' => 'Zmiana atrybutu
 Dokument: [name] 
 Wersja: [version] 
-Atrybut: [attribute]
+Atrybut: [attribute_name]
+Old value: [attribute_old_value]
+New value: [attribute_new_value]
 Folder nadrzędny: [folder_path] 
 Użytkownik: [username]
 URL: [url]',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index a294e7718..ed69361b2 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (973), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (974), flaviove (627), lfcristofoli (352)
 
 $text = array(
 '2_factor_auth' => '',
@@ -164,12 +164,14 @@ URL: [url]',
 'attrdef_type_url' => '',
 'attrdef_valueset' => 'Conjunto de valores',
 'attributes' => 'Atributos',
-'attribute_changed_email_body' => 'Atributo alterado
-Documento: [name]
-Versão: [version]
-Atributo: [attribute]
-Pasta mãe: [folder_path]
-Usuário: [username]
+'attribute_changed_email_body' => 'Atributo alterado
+Documento: [name]
+Versão: [version]
+Atributo: [attribute_name]
+Old value: [attribute_old_value]
+New value: [attribute_new_value]
+Pasta mãe: [folder_path]
+Usuário: [username]
 URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: [name] - Atributo modificado',
 'attribute_count' => 'Número de utilizações',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index ba002d521..7bd005aac 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1068), balan (87)
+//    Translators: Admin (1070), balan (87)
 
 $text = array(
 '2_factor_auth' => '',
@@ -169,12 +169,14 @@ URL: [url]',
 'attrdef_type_url' => 'URL',
 'attrdef_valueset' => 'Set de valori',
 'attributes' => 'Atribute',
-'attribute_changed_email_body' => 'Atribut schimbat
-Document: [name]
-Versiune: [version]
-Atribut: [attribute]
-Folder parinte: [folder_path]
-Utilizator: [username]
+'attribute_changed_email_body' => 'Atribut schimbat
+Document: [name]
+Versiune: [version]
+Atribut: [attribute_name]
+Old value: [attribute_old_value]
+New value: [attribute_new_value]
+Folder parinte: [folder_path]
+Utilizator: [username]
 URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: [name] - Atribut schimbat',
 'attribute_count' => 'Numărul de utilizări',
@@ -1617,7 +1619,7 @@ URL: [url]',
 'toggle_manager' => 'Comută Manager',
 'toggle_qrcode' => '',
 'to_before_from' => 'Data de încheiere nu poate fi înainte de data de începere',
-'transfer_document' => '',
+'transfer_document' => 'Transfer document',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',
 'transfer_objects' => '',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 1471f61c9..ef0bfc551 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1661)
+//    Translators: Admin (1662)
 
 $text = array(
 '2_factor_auth' => 'Двухфакторная аутентификация',
@@ -169,12 +169,14 @@ URL: [url]',
 'attrdef_type_url' => 'URL',
 'attrdef_valueset' => 'Набор значений',
 'attributes' => 'Атрибуты',
-'attribute_changed_email_body' => 'Изменён атрибут
-Документ: [name]
-Версия: [version]
-Атрибут: [attribute]
-Родительский каталог: [folder_path]
-Пользователь: [username]
+'attribute_changed_email_body' => 'Изменён атрибут
+Документ: [name]
+Версия: [version]
+Атрибут: [attribute_name]
+Old value: [attribute_old_value]
+New value: [attribute_new_value]
+Родительский каталог: [folder_path]
+Пользователь: [username]
 URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: изменён атрибут «[name]»',
 'attribute_count' => 'Использован раз',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 8d50f1ac3..f9d29db09 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 (565), destinqo (19), pS2017 (508)
+//    Translators: Admin (566), destinqo (19), pS2017 (508)
 
 $text = array(
 '2_factor_auth' => '2-faktorové overovanie',
@@ -152,7 +152,15 @@ URL: [url]',
 'attrdef_type_url' => 'URL',
 'attrdef_valueset' => 'Nastaviť hodnoty',
 'attributes' => 'Atribúty',
-'attribute_changed_email_body' => 'Zmenené atribúty Dokumentu: [name] Vezia: [version] Atribút: [attribute] Nadradená zložka: [folder_path] Používateľ: [username] URL: [url]',
+'attribute_changed_email_body' => 'Zmenené atribúty
+Dokumentu: [name]
+Vezia: [version]
+Atribút: [attribute_name]
+Old value: [attribute_old_value]
+New value: [attribute_new_value]
+Nadradená zložka: [folder_path]
+Používateľ: [username]
+URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: [name] - Atribút sa zmenil',
 'attribute_count' => 'Počet použití',
 'attribute_value' => 'Hodnota atribútu',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index eb43ff55d..19c2d2e3e 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1154), MagnusI (649), tmichelfelder (106)
+//    Translators: Admin (1155), MagnusI (649), tmichelfelder (106)
 
 $text = array(
 '2_factor_auth' => '2-faktors autentisering',
@@ -170,12 +170,14 @@ URL: [url]',
 'attrdef_type_url' => 'URL',
 'attrdef_valueset' => 'Värden',
 'attributes' => 'Attribut',
-'attribute_changed_email_body' => 'Ändrat attribut
-Dokument: [name]
-Version: [version]
-Attribut: [attribute]
-Överordnad katalog: [folder_path]
-Användare: [username]
+'attribute_changed_email_body' => 'Ändrat attribut
+Dokument: [name]
+Version: [version]
+Attribut: [attribute_name]
+Old value: [attribute_old_value]
+New value: [attribute_new_value]
+Överordnad katalog: [folder_path]
+Användare: [username]
 URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: [name] - Ändrat attribut',
 'attribute_count' => 'Antal användningar',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 341c0e92b..58cf477c9 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1064), aydin (83)
+//    Translators: Admin (1065), aydin (83)
 
 $text = array(
 '2_factor_auth' => '',
@@ -163,12 +163,14 @@ URL: [url]',
 'attrdef_type_url' => '',
 'attrdef_valueset' => 'Değer',
 'attributes' => 'Nitelik',
-'attribute_changed_email_body' => 'Değer değişti
-Doküman: [name]
-Versiyon: [version]
-Nitelik: [attribute]
-Üst klasör: [folder_path]
-Kullanıcı: [username]
+'attribute_changed_email_body' => 'Değer değişti
+Doküman: [name]
+Versiyon: [version]
+Nitelik: [attribute_name]
+Old value: [attribute_old_value]
+New value: [attribute_new_value]
+Üst klasör: [folder_path]
+Kullanıcı: [username]
 URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: [name] - Nitelik değişti',
 'attribute_count' => 'Kullanım sayısı',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index f69a46e83..f72acb138 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1329)
+//    Translators: Admin (1330)
 
 $text = array(
 '2_factor_auth' => '',
@@ -169,12 +169,14 @@ URL: [url]',
 'attrdef_type_url' => 'Посилання',
 'attrdef_valueset' => 'Набір значень',
 'attributes' => 'Атрибути',
-'attribute_changed_email_body' => 'Змінено атрибут
-Документ: [name]
-Версія: [version]
-Атрибут: [attribute]
-Батьківський каталог: [folder_path]
-Користувач: [username]
+'attribute_changed_email_body' => 'Змінено атрибут
+Документ: [name]
+Версія: [version]
+Атрибут: [attribute_name]
+Old value: [attribute_old_value]
+New value: [attribute_new_value]
+Батьківський каталог: [folder_path]
+Користувач: [username]
 URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: змінено атрибут «[name]»',
 'attribute_count' => 'Використано разів',

From 9b525b10a2af7a930efe0378bae25be0c7856472 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 19 Mar 2018 11:30:21 +0100
Subject: [PATCH 059/147] check diff of attributes after all changes have been
 saved

---
 op/op.EditAttributes.php | 92 ++++++++++++++++++++++++++++------------
 1 file changed, 64 insertions(+), 28 deletions(-)

diff --git a/op/op.EditAttributes.php b/op/op.EditAttributes.php
index c85de15d9..46b013974 100644
--- a/op/op.EditAttributes.php
+++ b/op/op.EditAttributes.php
@@ -59,10 +59,15 @@ if (!is_object($version)) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 }
 
-$attributes = $_POST["attributes"];
+/* Make a real copy of each attribute because setting a new attribute value
+ * will just update the old attribute object in array attributes[] and hence
+ * also update the old value
+ */
+foreach($version->getAttributes() as $ai=>$aa)
+	$oldattributes[$ai] = clone $aa;
 
+$attributes = $_POST["attributes"];
 if($attributes) {
-	$oldattributes = $version->getAttributes();
 	foreach($attributes as $attrdefid=>$attribute) {
 		$attrdef = $dms->getAttributeDefinition($attrdefid);
 		if($attribute) {
@@ -73,32 +78,6 @@ if($attributes) {
 			if(!isset($oldattributes[$attrdefid]) || $attribute != $oldattributes[$attrdefid]->getValue()) {
 				if(!$version->setAttributeValue($dms->getAttributeDefinition($attrdefid), $attribute)) {
 					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
-				} else {
-					if($notifier) {
-						$notifyList = $document->getNotifyList();
-						$subject = "attribute_changed_email_subject";
-						$message = "attribute_changed_email_body";
-						$params = array();
-						$params['name'] = $document->getName();
-						$params['version'] = $version->getVersion();
-						$params['attribute_name'] = $dms->getAttributeDefinition($attrdefid)->getName();
-						$params['attribute_old_value'] = $oldattributes[$attrdefid]->getValue();
-						$params['attribute_new_value'] = $attribute;
-						$params['folder_path'] = $folder->getFolderPathPlain();
-						$params['username'] = $user->getFullName();
-						$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$version->getVersion();
-						$params['sitename'] = $settings->_siteName;
-						$params['http_root'] = $settings->_httpRoot;
-
-						$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
-						foreach ($notifyList["groups"] as $grp) {
-							$notifier->toGroup($user, $grp, $subject, $message, $params);
-						}
-						// if user is not owner send notification to owner
-//						if ($user->getID() != $document->getOwner()->getID()) 
-//							$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
-
-					}
 				}
 			}
 		} elseif($attrdef->getMinValues() > 0) {
@@ -110,6 +89,63 @@ if($attributes) {
 	}
 }
 
+$newattributes = $version->getAttributes();
+if($oldattributes) {
+	foreach($oldattributes as $attrdefid=>$attribute) {
+		if(!isset($newattributes[$attrdefid]) || $newattributes[$attrdefid]->getValueAsArray() !== $oldattributes[$attrdefid]->getValueAsArray()) {
+			if($notifier) {
+				$notifyList = $document->getNotifyList();
+				$subject = "attribute_changed_email_subject";
+				$message = "attribute_changed_email_body";
+				$params = array();
+				$params['name'] = $document->getName();
+				$params['version'] = $version->getVersion();
+				$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'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+				$params['sitename'] = $settings->_siteName;
+				$params['http_root'] = $settings->_httpRoot;
+
+				$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+				foreach ($notifyList["groups"] as $grp) {
+					$notifier->toGroup($user, $grp, $subject, $message, $params);
+				}
+			}
+		}
+	}
+}
+/* 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 = "attribute_changed_email_subject";
+				$message = "attribute_changed_email_body";
+				$params = array();
+				$params['name'] = $document->getName();
+				$params['version'] = '';
+				$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'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+				$params['sitename'] = $settings->_siteName;
+				$params['http_root'] = $settings->_httpRoot;
+
+				$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+				foreach ($notifyList["groups"] as $grp) {
+					$notifier->toGroup($user, $grp, $subject, $message, $params);
+				}
+			}
+		}
+	}
+}
+
 add_log_line("?documentid=".$documentid);
 
 header("Location:../out/out.DocumentVersionDetail.php?documentid=".$documentid."&version=".$versionid);

From e9c9b4814085ce11c12ad04de6ed4e68866d035a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 19 Mar 2018 11:31:09 +0100
Subject: [PATCH 060/147] fix sending notification when attributes have been
 changed

---
 op/op.EditDocument.php | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php
index 575fb33aa..1f8349099 100644
--- a/op/op.EditDocument.php
+++ b/op/op.EditDocument.php
@@ -109,7 +109,13 @@ $oldcomment = $document->getComment();
 $oldcategories = $document->getCategories();
 $oldkeywords = $document->getKeywords();
 $oldexpires = $document->getExpires();
-$oldattributes = $document->getAttributes();
+/* Make a real copy of each attribute because setting a new attribute value
+ * will just update the old attribute object in array attributes[] and hence
+ * also update the old value
+ */
+foreach($document->getAttributes() as $ai=>$aa)
+	$oldattributes[$ai] = clone $aa;
+//$oldattributes = $document->getAttributes();
 
 $controller->setParam('document', $document);
 $controller->setParam('name', $name);
@@ -212,10 +218,10 @@ if ($expires != $oldexpires) {
 if ($oldkeywords != $keywords) {
 }
 
-/* First check for changed attributes or old attributes that have been deleted */
+$newattributes = $document->getAttributes();
 if($oldattributes) {
 	foreach($oldattributes as $attrdefid=>$attribute) {
-		if(!isset($attributes[$attrdefid]) || $attributes[$attrdefid] != $oldattributes[$attrdefid]->getValue()) {
+		if(!isset($newattributes[$attrdefid]) || $newattributes[$attrdefid]->getValueAsArray() !== $oldattributes[$attrdefid]->getValueAsArray()) {
 			if($notifier) {
 				$notifyList = $document->getNotifyList();
 				$subject = "attribute_changed_email_subject";
@@ -224,8 +230,8 @@ if($oldattributes) {
 				$params['name'] = $document->getName();
 				$params['version'] = '';
 				$params['attribute_name'] = $attribute->getAttributeDefinition()->getName();
-				$params['attribute_old_value'] = $attribute->get->getValueAsString();
-				$params['attribute_new_value'] = $attributes[$attrdefid];
+				$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'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
@@ -241,9 +247,9 @@ if($oldattributes) {
 	}
 }
 /* Check for new attributes which didn't have a value before */
-if($attributes) {
-	foreach($attributes as $attrdefid=>$attribute) {
-		if(!$oldattributes[$attrdefid]) {
+if($newattributes) {
+	foreach($newattributes as $attrdefid=>$attribute) {
+		if(!isset($oldattributes[$attrdefid]) && $attribute) {
 			if($notifier) {
 				$notifyList = $document->getNotifyList();
 				$subject = "attribute_changed_email_subject";
@@ -253,7 +259,7 @@ if($attributes) {
 				$params['version'] = '';
 				$params['attribute_name'] = $dms->getAttributeDefinition($attrdefid)->getName();
 				$params['attribute_old_value'] = '';
-				$params['attribute_new_value'] = $attribute;
+				$params['attribute_new_value'] = $attribute->getValue();
 				$params['folder_path'] = $folder->getFolderPathPlain();
 				$params['username'] = $user->getFullName();
 				$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();

From 44b9525615042da2dc8e68516287027e4ae9955a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 19 Mar 2018 11:31:50 +0100
Subject: [PATCH 061/147] set fall back value for attributes of type checkbox
 to ''

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

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 814bbc988..6f8382f26 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1205,7 +1205,7 @@ $(document).ready(function() {
 	function printAttributeEditField($attrdef, $attribute, $fieldname='attributes', $norequire=false) { /* {{{ */
 		switch($attrdef->getType()) {
 		case SeedDMS_Core_AttributeDefinition::type_boolean:
-			echo "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"0\" />";
+			echo "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"\" />";
 			echo "<input type=\"checkbox\" id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"1\" ".(($attribute && $attribute->getValue()) ? 'checked' : '')." />";
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_date:

From 22f8b7e7be00c51c389812e424ad5375de694ee9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 19 Mar 2018 11:32:24 +0100
Subject: [PATCH 062/147] do not list empty groups as reviewers/approvers

---
 views/bootstrap/class.AddDocument.php           | 4 ++--
 views/bootstrap/class.SetReviewersApprovers.php | 4 ++--
 views/bootstrap/class.UpdateDocument.php        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 20a41cef4..460ba317c 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -494,7 +494,7 @@ $(document).ready(function() {
 				$mandatory=false;
 				foreach ($res as $r) if ($r['reviewerGroupID']==$grp->getID()) $mandatory=true;	
 
-				if ($mandatory) print "<option value=\"".$grp->getID()."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
+				if ($mandatory || !$grp->getUsers()) print "<option value=\"".$grp->getID()."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
 				else print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
 			}
 ?>
@@ -604,7 +604,7 @@ $(document).ready(function() {
 				$mandatory=false;
 				foreach ($res as $r) if ($r['approverGroupID']==$grp->getID()) $mandatory=true;	
 
-				if ($mandatory) print "<option value=\"". $grp->getID() ."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
+				if ($mandatory || !$grp->getUsers()) print "<option value=\"". $grp->getID() ."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
 				else print "<option value=\"". $grp->getID() ."\">".htmlspecialchars($grp->getName())."</option>";
 
 			}
diff --git a/views/bootstrap/class.SetReviewersApprovers.php b/views/bootstrap/class.SetReviewersApprovers.php
index ffd4f2780..a11549970 100644
--- a/views/bootstrap/class.SetReviewersApprovers.php
+++ b/views/bootstrap/class.SetReviewersApprovers.php
@@ -153,7 +153,7 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
 			$mandatory=false;
 			foreach ($res as $r) if ($r['reviewerGroupID']==$group->getID()) $mandatory=true;
 			
-			if ($mandatory){
+			if ($mandatory || !$group->getUsers()){
 
 				print "<option value=\"".$group->getID()."\" disabled='disabled'>".htmlspecialchars($group->getName())."</option>";
 //				print "<input id='revGrp".$group->getID()."' type='hidden' name='grpReviewers[]' value='". $group->getID() ."' />";
@@ -264,7 +264,7 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
 			$mandatory=false;
 			foreach ($res as $r) if ($r['approverGroupID']==$group->getID()) $mandatory=true;
 
-			if ($mandatory){
+			if ($mandatory || !$group->getUsers()){
 
 				print "<option type='checkbox' checked='checked' disabled='disabled'>".htmlspecialchars($group->getName())."</option>";
 //				print "<input id='appGrp".$group->getID()."' type='hidden' name='grpApprovers[]' value='". $group->getID() ."'>";
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 4133de761..24c7dc094 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -415,7 +415,7 @@ console.log(element);
 					$mandatory=false;
 					foreach ($res as $r) if ($r['reviewerGroupID']==$grp->getID()) $mandatory=true;	
 
-					if ($mandatory) print "<option value=\"".$grp->getID()."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
+					if ($mandatory || !$grp->getUsers()) print "<option value=\"".$grp->getID()."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
 					else print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
 				}
 ?>
@@ -562,7 +562,7 @@ console.log(element);
 					$mandatory=false;
 					foreach ($res as $r) if ($r['approverGroupID']==$grp->getID()) $mandatory=true;	
 
-					if ($mandatory) print "<option value=\"". $grp->getID() ."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
+					if ($mandatory || !$grp->getUsers()) print "<option value=\"". $grp->getID() ."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
 					else print "<option value=\"". $grp->getID() ."\">".htmlspecialchars($grp->getName())."</option>";
 
 				}

From 0563636b7d5bcae1eccd29b9db5b1bb523e017ea Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 19 Mar 2018 12:12:46 +0100
Subject: [PATCH 063/147] attribute_changed_email is now
 document_attribute_changed_email

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

diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php
index 1f8349099..1921eec0a 100644
--- a/op/op.EditDocument.php
+++ b/op/op.EditDocument.php
@@ -224,11 +224,10 @@ if($oldattributes) {
 		if(!isset($newattributes[$attrdefid]) || $newattributes[$attrdefid]->getValueAsArray() !== $oldattributes[$attrdefid]->getValueAsArray()) {
 			if($notifier) {
 				$notifyList = $document->getNotifyList();
-				$subject = "attribute_changed_email_subject";
-				$message = "attribute_changed_email_body";
+				$subject = "document_attribute_changed_email_subject";
+				$message = "document_attribute_changed_email_body";
 				$params = array();
 				$params['name'] = $document->getName();
-				$params['version'] = '';
 				$params['attribute_name'] = $attribute->getAttributeDefinition()->getName();
 				$params['attribute_old_value'] = $oldattributes[$attrdefid]->getValue();
 				$params['attribute_new_value'] = isset($newattributes[$attrdefid]) ? $newattributes[$attrdefid]->getValue() : '';
@@ -252,11 +251,10 @@ if($newattributes) {
 		if(!isset($oldattributes[$attrdefid]) && $attribute) {
 			if($notifier) {
 				$notifyList = $document->getNotifyList();
-				$subject = "attribute_changed_email_subject";
-				$message = "attribute_changed_email_body";
+				$subject = "document_attribute_changed_email_subject";
+				$message = "document_attribute_changed_email_body";
 				$params = array();
 				$params['name'] = $document->getName();
-				$params['version'] = '';
 				$params['attribute_name'] = $dms->getAttributeDefinition($attrdefid)->getName();
 				$params['attribute_old_value'] = '';
 				$params['attribute_new_value'] = $attribute->getValue();

From 150b9975d34861e94534614bd2fab68c6bab8661 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 19 Mar 2018 12:13:18 +0100
Subject: [PATCH 064/147] send mail if attributes are changed, fix setting
 comment in email

---
 op/op.EditFolder.php | 64 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 62 insertions(+), 2 deletions(-)

diff --git a/op/op.EditFolder.php b/op/op.EditFolder.php
index 77242635c..616046764 100644
--- a/op/op.EditFolder.php
+++ b/op/op.EditFolder.php
@@ -66,7 +66,12 @@ else
 
 $oldname = $folder->getName();
 $oldcomment = $folder->getComment();
-$oldattributes = $folder->getAttributes();
+/* Make a real copy of each attribute because setting a new attribute value
+ * will just update the old attribute object in array attributes[] and hence
+ * also update the old value
+ */
+foreach($folder->getAttributes() as $ai=>$aa)
+	$oldattributes[$ai] = clone $aa;
 
 $controller->setParam('folder', $folder);
 $controller->setParam('name', $name);
@@ -115,7 +120,7 @@ if($oldcomment != $comment) {
 		$params['name'] = $folder->getName();
 		$params['folder_path'] = $folder->getFolderPathPlain();
 		$params['old_comment'] = $oldcomment;
-		$params['comment'] = $comment;
+		$params['new_comment'] = $comment;
 		$params['username'] = $user->getFullName();
 		$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
 		$params['sitename'] = $settings->_siteName;
@@ -131,6 +136,61 @@ if($oldcomment != $comment) {
 	}
 }
 
+$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'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$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);
+				foreach ($notifyList["groups"] as $grp) {
+					$notifier->toGroup($user, $grp, $subject, $message, $params);
+				}
+			}
+		}
+	}
+}
+/* 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'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$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);
+				foreach ($notifyList["groups"] as $grp) {
+					$notifier->toGroup($user, $grp, $subject, $message, $params);
+				}
+			}
+		}
+	}
+}
+
 $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_folder_edited')));
 
 add_log_line("?folderid=".$folderid);

From 2faef34ef9b0bb6364482adfa99b356d24e1078f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 19 Mar 2018 12:14:23 +0100
Subject: [PATCH 065/147] add changes for 5.1.7

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

diff --git a/CHANGELOG b/CHANGELOG
index 7b46c9889..c66ab6aad 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,9 @@
 - remove ancient code to upgrade from old config file
 - place all log files in contentDir/log
 - add readme for new dist layout
+- do not list empty groups as reviewer/approver
+- fix sending notification when document attributes change
+- sending notification when folder attributes change
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.6

From 0a1d57d863a9441e27a3869149969bb0ffaad44d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 19 Mar 2018 12:16:05 +0100
Subject: [PATCH 066/147] fix some notification mails

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

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index a4faf7d94..1763361f2 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -338,6 +338,8 @@ URL: [url]',
 'documents_with_notification' => '',
 'document_already_checkedout' => '',
 'document_already_locked' => 'هذا المستند محمي ضد التعديل',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => 'تم تعديل التعليق',
 'document_comment_changed_email_body' => 'تم تعديل التعليق
 المستند: [name]
@@ -514,6 +516,8 @@ URL: [url]',
 'folders' => 'مجلدات',
 'folders_and_documents_statistic' => 'رؤية عامة للمحتوى',
 'folders_with_notification' => '',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => 'تم تعديل التعليق',
 'folder_comment_changed_email_body' => 'تم تعديل التعليق
 الملجلد: [name]
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 16732a50e..16f3f6e4b 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -321,6 +321,8 @@ $text = array(
 'documents_with_notification' => '',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Документът е вече блокиран',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => '',
 'document_comment_changed_email_body' => '',
 'document_comment_changed_email_subject' => '',
@@ -463,6 +465,8 @@ $text = array(
 'folders' => 'Папки',
 'folders_and_documents_statistic' => 'Обзор на съдържанието',
 'folders_with_notification' => '',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => '',
 'folder_comment_changed_email_body' => '',
 'folder_comment_changed_email_subject' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 4b3126e5c..d2cdba1ca 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -326,6 +326,8 @@ URL: [url]',
 'documents_with_notification' => '',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Aquest document ja està bloquejat',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => '',
 'document_comment_changed_email_body' => '',
 'document_comment_changed_email_subject' => '',
@@ -468,6 +470,8 @@ URL: [url]',
 'folders' => 'Carpetes',
 'folders_and_documents_statistic' => 'Vista general de continguts',
 'folders_with_notification' => '',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => '',
 'folder_comment_changed_email_body' => '',
 'folder_comment_changed_email_subject' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 92487827f..6dc205388 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -345,6 +345,8 @@ URL: [url]',
 'documents_with_notification' => '',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Tento dokument je už zamčený',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => 'Změna komentáře',
 'document_comment_changed_email_body' => 'Změna komentáře
 Dokument: [name]
@@ -521,6 +523,8 @@ URL: [url]',
 'folders' => 'Složky',
 'folders_and_documents_statistic' => 'Přehled složek a dokumentů',
 'folders_with_notification' => '',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => 'Změna komentáře',
 'folder_comment_changed_email_body' => 'Změna komentáře
 Složka: [name]
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index edd3e8945..126897b0c 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 (2574), dgrutsch (22)
+//    Translators: Admin (2582), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -350,11 +350,20 @@ URL: [url]',
 'documents_with_notification' => 'Dokumente unter Beobachtung',
 'document_already_checkedout' => 'Dieses Dokument ist bereits ausgecheckt',
 'document_already_locked' => 'Dieses Dokument ist bereits gesperrt',
+'document_attribute_changed_email_body' => 'Attribut geändert
+Dokument: [name]
+Attribut: [attribute_name]
+Alter Wert: [attribute_old_value]
+Neuer Wert: [attribute_new_value]
+Elternordner: [folder_path]
+Benutzer: [username]
+URL: [url]',
+'document_attribute_changed_email_subject' => '[sitename]: [name] - Attribut geändert',
 'document_comment_changed_email' => 'Kommentar geändert',
 'document_comment_changed_email_body' => 'Kommentar geändert
 Dokument: [name]
 Alter Kommentar: [old_comment]
-Kommentar: [new_comment]
+Neuer Kommentar: [new_comment]
 Elternordner: [folder_path]
 Benutzer: [username]
 URL: [url]',
@@ -537,11 +546,20 @@ URL: [url]',
 'folders' => 'Verzeichnisse',
 'folders_and_documents_statistic' => 'Ordner- und Dokumentenübersicht',
 'folders_with_notification' => 'Ordner unter Beobachtung',
+'folder_attribute_changed_email_body' => 'Attribut geändert
+Ordner: [name]
+Attribut: [attribute_name]
+Alter Wert: [attribute_old_value]
+Neuer Wert: [attribute_new_value]
+Elternordner: [folder_path]
+Benutzer: [username]
+URL: [url]',
+'folder_attribute_changed_email_subject' => '[sitename]: [name] - Attribut geändert',
 'folder_comment_changed_email' => 'Kommentar geändert',
 'folder_comment_changed_email_body' => 'Kommentar geändert
 Ordner: [name]
-Vorheriger Kommentar: [old_comment]
-Kommentar: [new_comment]
+Alter Kommentar: [old_comment]
+Neuer Kommentar: [new_comment]
 Elternordner: [folder_path]
 Benutzer: [username]
 URL: [url]',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 9ee32fd3d..19a41c2fe 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -321,6 +321,8 @@ $text = array(
 'documents_with_notification' => '',
 'document_already_checkedout' => '',
 'document_already_locked' => '',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => '',
 'document_comment_changed_email_body' => '',
 'document_comment_changed_email_subject' => '',
@@ -463,6 +465,8 @@ $text = array(
 'folders' => 'Φάκελοι',
 'folders_and_documents_statistic' => '',
 'folders_with_notification' => '',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => '',
 'folder_comment_changed_email_body' => '',
 'folder_comment_changed_email_subject' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index b37d658e6..b3b1469e1 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 (1690), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1696), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -350,13 +350,22 @@ URL: [url]',
 'documents_with_notification' => 'Documents with notification',
 'document_already_checkedout' => 'This document is already checked out',
 'document_already_locked' => 'This document is already locked',
+'document_attribute_changed_email_body' => 'Attribute changed
+Document: [name]
+Attribute: [attribute_name]
+Old value: [attribute_old_value]
+New value: [attribute_new_value]
+Parent folder: [folder_path]
+User: [username]
+URL: [url]',
+'document_attribute_changed_email_subject' => '[sitename]: [name] - Attribute changed',
 'document_comment_changed_email' => 'Comment changed',
-'document_comment_changed_email_body' => 'Comment changed
-Document: [name]
-Old comment: [old_comment]
-Comment: [new_comment]
-Parent folder: [folder_path]
-User: [username]
+'document_comment_changed_email_body' => 'Comment changed
+Document: [name]
+Old comment: [old_comment]
+New Comment: [new_comment]
+Parent folder: [folder_path]
+User: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Comment changed',
 'document_count' => 'Number of documents',
@@ -538,11 +547,20 @@ URL: [url]',
 'folders' => 'Folders',
 'folders_and_documents_statistic' => 'Contents overview',
 'folders_with_notification' => 'Folders with notification',
+'folder_attribute_changed_email_body' => 'Attribute changed
+Folder: [name]
+Attribute: [attribute_name]
+Old value: [attribute_old_value]
+New value: [attribute_new_value]
+Parent folder: [folder_path]
+User: [username]
+URL: [url]',
+'folder_attribute_changed_email_subject' => '[sitename]: [name] - Attribute changed',
 'folder_comment_changed_email' => 'Comment changed',
 'folder_comment_changed_email_body' => 'Comment changed
 Folder: [name]
 Old comment: [old_comment]
-Comment: [new_comment]
+New Comment: [new_comment]
 Parent folder: [folder_path]
 User: [username]
 URL: [url]',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 216c68865..10c302cc6 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -345,6 +345,8 @@ URL: [url]',
 'documents_with_notification' => '',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Este documento ya está bloqueado',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => 'Comentario modificado',
 'document_comment_changed_email_body' => 'Comentario modificado
 Documento: [name]
@@ -521,6 +523,8 @@ URL: [url]',
 'folders' => 'Carpetas',
 'folders_and_documents_statistic' => 'Vista general de contenidos',
 'folders_with_notification' => '',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => 'Comentario modificado',
 'folder_comment_changed_email_body' => 'Comentario modificado
 Carpeta: [name]
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index f347d87f8..96fef1ac4 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -350,6 +350,8 @@ URL: [url]',
 'documents_with_notification' => 'Documents avec notification',
 'document_already_checkedout' => 'Ce document est déjà débloqué',
 'document_already_locked' => 'Ce document est déjà verrouillé',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => 'Commentaire modifié',
 'document_comment_changed_email_body' => 'Commentaire modifié
 Document: [name]
@@ -538,6 +540,8 @@ URL : [url]',
 'folders' => 'Dossiers',
 'folders_and_documents_statistic' => 'Aperçu du contenu',
 'folders_with_notification' => 'Dossiers avec notification',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => 'Commentaire changé',
 'folder_comment_changed_email_body' => 'Commentaire changé
 Dossier: [name]
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index a53b460f4..4cb825653 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -350,6 +350,8 @@ Internet poveznica: [url]',
 'documents_with_notification' => '',
 'document_already_checkedout' => 'Ovaj dokument je već odjavljen',
 'document_already_locked' => 'Ovaj dokument je već zaključan',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => 'Promijenjen komentar',
 'document_comment_changed_email_body' => 'Promijenjen komentar
 Dokument: [name]
@@ -526,6 +528,8 @@ Internet poveznica: [url]',
 'folders' => 'Mape',
 'folders_and_documents_statistic' => 'Pregled sadržaja',
 'folders_with_notification' => '',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => 'Promijenjen komentar',
 'folder_comment_changed_email_body' => 'Promijenjen komentar
 Mapa: <b>[name]</b>
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index fcafc0012..4b3cf4674 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -345,6 +345,8 @@ URL: [url]',
 'documents_with_notification' => '',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Ez a dokumentum már zárolt',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => 'Megjegyzés módosult',
 'document_comment_changed_email_body' => 'Megjegyzés módosult
 Dokumentum: [name]
@@ -521,6 +523,8 @@ URL: [url]',
 'folders' => 'Mappák',
 'folders_and_documents_statistic' => 'Tartalmak áttekintése',
 'folders_with_notification' => '',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => 'Megjegyzés módosult',
 'folder_comment_changed_email_body' => 'Megjegyzés módosult
 Mappa: [name]
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 8b1d1a7da..44405c26f 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -351,6 +351,8 @@ URL: [url]',
 'documents_with_notification' => '',
 'document_already_checkedout' => 'Questo documento è già approvato',
 'document_already_locked' => 'Questo documento è già bloccato',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => 'Commento modificato',
 'document_comment_changed_email_body' => 'Commento modificato
 Documento: [name]
@@ -527,6 +529,8 @@ URL: [url]',
 'folders' => 'Cartelle',
 'folders_and_documents_statistic' => 'Visualizzazione generale',
 'folders_with_notification' => '',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => 'Commento modificato per la Cartella',
 'folder_comment_changed_email_body' => 'Commento modificato per la Cartella
 Cartella: [name]
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 398a917c3..422d4158f 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -353,6 +353,8 @@ URL: [url]',
 'documents_with_notification' => '',
 'document_already_checkedout' => '이문서는 이미 체크아웃 되었습니다',
 'document_already_locked' => '이미 잠겨진 문서',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => '주석 변경됨',
 'document_comment_changed_email_body' => '변경된 코멘트
 문서: [name]
@@ -527,6 +529,8 @@ URL: [url]',
 'folders' => '폴더',
 'folders_and_documents_statistic' => '개요 내용',
 'folders_with_notification' => '',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => '주석 변경됨',
 'folder_comment_changed_email_body' => '코멘트 변경
 폴더: [name]
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 141a9cc47..ce5133cde 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -343,6 +343,8 @@ URL: [url]',
 'documents_with_notification' => 'Documenten met notificatie',
 'document_already_checkedout' => 'Al in behandeling genomen documenten',
 'document_already_locked' => 'Dit document is al geblokkeerd',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => 'Commentaar gewijzigd',
 'document_comment_changed_email_body' => 'Commentaar gewijzigd
 Document: [name]
@@ -526,6 +528,8 @@ URL: [url]',
 'folders' => 'Mappen',
 'folders_and_documents_statistic' => 'Inhoudsopgave',
 'folders_with_notification' => 'Mappen met notificatie',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => 'Commentaar gewijzigd',
 'folder_comment_changed_email_body' => 'Commentaar gewijzigd
 Map: [name]
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index a8f0a2155..025c1024d 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -338,6 +338,8 @@ URL: [url]',
 'documents_with_notification' => '',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Ten dokument jest już zablokowany',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => 'Zmiana komentarza',
 'document_comment_changed_email_body' => 'Zmodyfikowano komentarz
 Dokument: [name]
@@ -514,6 +516,8 @@ URL: [url]',
 'folders' => 'Foldery',
 'folders_and_documents_statistic' => 'Podsumowanie zawartości',
 'folders_with_notification' => '',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => 'Zmiana komentarza',
 'folder_comment_changed_email_body' => 'Komentarz uległ zmianie
 Folder: [name]
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index ed69361b2..67a5e87a4 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -345,6 +345,8 @@ URL: [url]',
 'documents_with_notification' => '',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Este documento já está travado',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => 'Comentário modificado',
 'document_comment_changed_email_body' => 'Comentário modificado
 Documento: [name]
@@ -520,6 +522,8 @@ URL: [url]',
 'folders' => 'Pastas',
 'folders_and_documents_statistic' => 'Relatórios de pastas e documentos',
 'folders_with_notification' => '',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => 'Comentário mudou',
 'folder_comment_changed_email_body' => 'Comentário mudou
 Pasta: [name]
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 7bd005aac..620912d97 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -350,6 +350,8 @@ URL: [url]',
 'documents_with_notification' => '',
 'document_already_checkedout' => 'Acest document este deja verificat',
 'document_already_locked' => 'Acest document este deja blocat',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => 'Comentariu schimbat',
 'document_comment_changed_email_body' => 'Comentariu schimbat
 Document: [name]
@@ -526,6 +528,8 @@ URL: [url]',
 'folders' => 'Foldere',
 'folders_and_documents_statistic' => 'Privire de ansamblu asupra continutului',
 'folders_with_notification' => '',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => 'Comentariu schimbat',
 'folder_comment_changed_email_body' => 'Comentariu schimbat
 Folder: [name]
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index ef0bfc551..b55571d44 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -350,6 +350,8 @@ URL: [url]',
 'documents_with_notification' => '',
 'document_already_checkedout' => 'Этот документ уже проверен',
 'document_already_locked' => 'Документ уже заблокирован',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => 'Изменён комментарий',
 'document_comment_changed_email_body' => 'Изменён комментарий
 Документ: [name]
@@ -526,6 +528,8 @@ URL: [url]',
 'folders' => 'кат.',
 'folders_and_documents_statistic' => 'Обзор содержимого',
 'folders_with_notification' => '',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => 'Комментарий изменён',
 'folder_comment_changed_email_body' => 'Изменён комментарий каталога
 Каталог: [name]
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index f9d29db09..148ee5541 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -333,6 +333,8 @@ URL: [url]',
 'documents_with_notification' => 'Dokumenty s upozornením',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Tento dokument je už zamknutý',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => 'Komentár sa zmenil',
 'document_comment_changed_email_body' => '',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Komentár sa zmenil',
@@ -475,6 +477,8 @@ URL: [url]',
 'folders' => 'Zložky',
 'folders_and_documents_statistic' => 'Prehľad zložiek a dokumentov',
 'folders_with_notification' => 'Zložky s upozornením',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => 'Komentár sa zmenil',
 'folder_comment_changed_email_body' => 'Komentár zmenený pre Zložku: [name] Starý komentár: [old_comment] Komentár: [new_comment] Nadradená zložka: [folder_path] Používateľ: [username] URL: [url]',
 'folder_comment_changed_email_subject' => '[sitename]: [name] - Komentár zmenený',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 19c2d2e3e..b70864a21 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -351,6 +351,8 @@ URL: [url]',
 'documents_with_notification' => 'Dokument med meddelande',
 'document_already_checkedout' => 'Dokumentet är redan utcheckat',
 'document_already_locked' => 'Detta dokument är redan låst',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => 'Kommentar ändrad',
 'document_comment_changed_email_body' => 'Kommentar ändrat
 Document: [name]
@@ -539,6 +541,8 @@ URL: [url]',
 'folders' => 'Kataloger',
 'folders_and_documents_statistic' => 'Innehållsöversikt',
 'folders_with_notification' => 'Kataloger med meddelandefunktion',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => 'Kommentar har ändrats',
 'folder_comment_changed_email_body' => 'Kommentar har ändrats
 Katalog: [name]
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 58cf477c9..0423f42c4 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -344,6 +344,8 @@ URL: [url]',
 'documents_with_notification' => '',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Bu doküman zaten kilitli',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => 'Açıklama değişti',
 'document_comment_changed_email_body' => 'Açıklama değişti
 Doküman: [name]
@@ -520,6 +522,8 @@ URL: [url]',
 'folders' => 'Klasör',
 'folders_and_documents_statistic' => 'İçeriğe Bakış',
 'folders_with_notification' => '',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => 'Açıklama değişti',
 'folder_comment_changed_email_body' => 'Açıklama değişti
 Klasör: [name]
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index f72acb138..05f7b196b 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -350,6 +350,8 @@ URL: [url]',
 'documents_with_notification' => '',
 'document_already_checkedout' => 'Цей документ вже на опрацюванні',
 'document_already_locked' => 'Цей документ вже заблокований',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => 'Змінено коментар',
 'document_comment_changed_email_body' => 'Змінено коментар
 Документ: [name]
@@ -526,6 +528,8 @@ URL: [url]',
 'folders' => 'кат.',
 'folders_and_documents_statistic' => 'Огляд вмісту',
 'folders_with_notification' => '',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => 'Коментар змінено',
 'folder_comment_changed_email_body' => 'Змінено коментар каталогу
 Каталог: [name]
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 4fb4b861e..8557a97ed 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -344,6 +344,8 @@ URL: [url]',
 'documents_with_notification' => '',
 'document_already_checkedout' => '当前文档已签出',
 'document_already_locked' => '该文档已被锁定',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => '批注已更新',
 'document_comment_changed_email_body' => '批注已更新
 文档: [name]
@@ -522,6 +524,8 @@ URL: [url]',
 'folders' => '文件夹',
 'folders_and_documents_statistic' => '内容概要',
 'folders_with_notification' => '',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => '注释已更新',
 'folder_comment_changed_email_body' => '批注已更新
 文件夹: [name]
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index ec425ef66..00b71044c 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -325,6 +325,8 @@ URL: [url]',
 'documents_with_notification' => '',
 'document_already_checkedout' => '',
 'document_already_locked' => '該文檔已被鎖定',
+'document_attribute_changed_email_body' => '',
+'document_attribute_changed_email_subject' => '',
 'document_comment_changed_email' => '',
 'document_comment_changed_email_body' => '',
 'document_comment_changed_email_subject' => '',
@@ -467,6 +469,8 @@ URL: [url]',
 'folders' => '資料夾',
 'folders_and_documents_statistic' => '內容概要',
 'folders_with_notification' => '',
+'folder_attribute_changed_email_body' => '',
+'folder_attribute_changed_email_subject' => '',
 'folder_comment_changed_email' => '',
 'folder_comment_changed_email_body' => '',
 'folder_comment_changed_email_subject' => '',

From f6ba941e68deecf83a9cc8c7eb69d024e3515307 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Mar 2018 07:25:22 +0100
Subject: [PATCH 067/147] do not show groups as reviewer/approver without
 members

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

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index c6310934e..aebf2df4e 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -341,7 +341,7 @@ $(document).ready(function() {
 					$mandatory=false;
 					foreach ($res as $r) if ($r['reviewerGroupID']==$grp->getID()) $mandatory=true;	
 
-					if ($mandatory) print "<option value=\"".$grp->getID()."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
+					if ($mandatory || !$grp->getUsers()) print "<option value=\"".$grp->getID()."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
 					else print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
 				}
 ?>
@@ -503,7 +503,7 @@ $(document).ready(function() {
 					$mandatory=false;
 					foreach ($res as $r) if ($r['approverGroupID']==$grp->getID()) $mandatory=true;	
 
-					if ($mandatory) print "<option value=\"". $grp->getID() ."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
+					if ($mandatory || !$grp->getUsers()) print "<option value=\"". $grp->getID() ."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
 					else print "<option value=\"". $grp->getID() ."\">".htmlspecialchars($grp->getName())."</option>";
 
 				}

From 6211014896997958f8f3c5513904d86d6acb5d6d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Mar 2018 10:09:23 +0100
Subject: [PATCH 068/147] new version 6.0.6

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

diff --git a/Makefile b/Makefile
index d0a25fe22..93ffe7c98 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=6.0.5
+VERSION=6.0.6
 SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer
 # webapp
 
diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 25e538046..041205298 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -451,7 +451,7 @@ class SeedDMS_Core_DMS {
 		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '6.0.5';
+			$this->version = '6.0.6';
 	} /* }}} */
 
 	/**
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index 5df184501..d0f0cdc70 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "6.0.5";
+	public $_number = "6.0.6";
 	private $_string = "SeedDMS";
 
 	function __construct() {
diff --git a/install/install.php b/install/install.php
index 1642f2c80..d9dee4f5f 100644
--- a/install/install.php
+++ b/install/install.php
@@ -123,7 +123,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "6.0.5");
+define("SEEDDMS_VERSION", "6.0.6");
 
 require_once('../inc/inc.ClassSettings.php');
 

From 20d1a2695b79385fbef3feb9300f832453475ef9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Mar 2018 11:06:11 +0100
Subject: [PATCH 069/147] check if _converters['pdf'] is set, before passing to
 view

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

diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index 9b23d9608..f29dbe72d 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -84,7 +84,7 @@ if($view) {
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
 	$view->setParam('previewConverters', $settings->_converters['preview']);
 	$view->setParam('checkOutDir', $settings->_checkOutDir);
-	$view->setParam('pdfConverters', $settings->_converters['pdf']);
+	$view->setParam('pdfConverters', isset($settings->_converters['pdf']) ? $settings->_converters['pdf'] : null);
 	$view->setParam('showFullPreview', $settings->_showFullPreview);
 	$view->setParam('convertToPdf', $settings->_convertToPdf);
 	$view->setParam('currenttab', isset($_GET['currenttab']) ? $_GET['currenttab'] : "");

From 26d3c7a504ad0ca1bd061e9e463248a9f915219b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Mar 2018 11:06:38 +0100
Subject: [PATCH 070/147] do not set status for scheduled_revision in timeline
 data

---
 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 8ba83a35d..486a22ca5 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -161,7 +161,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					$msg = getMLText('timeline_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
 					break;
 				case 'scheduled_revision':
-					$msg = getMLText('timeline_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
+					$msg = getMLText('timeline_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version']));
 					break;
 				default:
 					$msg = '???';

From 49af6ab171f5e9af7fb4254fd53bfa46b0a59c21 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Mar 2018 11:08:08 +0100
Subject: [PATCH 071/147] make sure list of converters is an array, start new
 version 1.2.9

---
 SeedDMS_Preview/Preview/Base.php |  6 +++++-
 SeedDMS_Preview/package.xml      | 22 +++++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Preview/Preview/Base.php b/SeedDMS_Preview/Preview/Base.php
index 4d6b9cf1f..d00003379 100644
--- a/SeedDMS_Preview/Preview/Base.php
+++ b/SeedDMS_Preview/Preview/Base.php
@@ -55,6 +55,7 @@ class SeedDMS_Preview_Base {
 			$this->previewDir = $previewDir;
 		}
 		$this->timeout = intval($timeout);
+		$this->converters = array();
 	} /* }}} */
 
 	static function execWithTimeout($cmd, $timeout=5) { /* {{{ */
@@ -109,7 +110,10 @@ class SeedDMS_Preview_Base {
 	 * and the value is the command to be called for creating the preview
 	 */
 	function setConverters($arr) { /* {{{ */
-		$this->converters = $arr;
+		if(is_array($arr))
+			$this->converters = $arr;
+		else
+			$this->converters = array();
 	} /* }}} */
 
 	/**
diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index 2afd6da7b..9e39935d3 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -11,10 +11,10 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2018-03-08</date>
+ <date>2018-03-20</date>
  <time>10:59:39</time>
  <version>
-  <release>1.2.8</release>
+  <release>1.2.9</release>
   <api>1.2.0</api>
  </version>
  <stability>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-preview is also created if SeedDMS_Core_DocumentContent has a child class
+make sure list of converters is always an array
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -370,5 +370,21 @@ mod_xsendfile if available
 execWithTimeout() reads data from stderr and returns it together with stdout in array
    </notes>
   </release>
+  <release>
+   <date>2018-03-08</date>
+   <time>10:59:39</time>
+   <version>
+    <release>1.2.8</release>
+    <api>1.2.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+preview is also created if SeedDMS_Core_DocumentContent has a child class
+   </notes>
+  </release>
  </changelog>
 </package>

From 90affe7db1949f3b53b9fc018a8851d33f0949c6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Mar 2018 11:16:13 +0100
Subject: [PATCH 072/147] pass $dms and $user to Controller::factory()

---
 op/op.ApproveDocument.php       | 2 +-
 op/op.OverrideContentStatus.php | 2 +-
 op/op.ReceiptDocument.php       | 2 +-
 op/op.ReviewDocument.php        | 2 +-
 op/op.ReviseDocument.php        | 2 +-
 op/op.RoleMgr.php               | 2 +-
 op/op.TransmittalDownload.php   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php
index e9da967e2..7f2754e48 100644
--- a/op/op.ApproveDocument.php
+++ b/op/op.ApproveDocument.php
@@ -32,7 +32,7 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassController.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 /* Check if the form data comes from a trusted request */
diff --git a/op/op.OverrideContentStatus.php b/op/op.OverrideContentStatus.php
index be88140eb..f0bfb14cf 100644
--- a/op/op.OverrideContentStatus.php
+++ b/op/op.OverrideContentStatus.php
@@ -29,7 +29,7 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-//$controller = Controller::factory($tmp[1]);
+//$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 if(!$accessop->check_controller_access($tmp[1] /*$controller*/)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("access_denied"));
diff --git a/op/op.ReceiptDocument.php b/op/op.ReceiptDocument.php
index a978a7a2f..6f955a8ca 100644
--- a/op/op.ReceiptDocument.php
+++ b/op/op.ReceiptDocument.php
@@ -31,7 +31,7 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassController.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 /* Check if the form data comes for a trusted request */
diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index da2a1e160..92c8b95f6 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -32,7 +32,7 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassController.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 /* Check if the form data comes from a trusted request */
diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php
index a96f2b86d..cc4f1830f 100644
--- a/op/op.ReviseDocument.php
+++ b/op/op.ReviseDocument.php
@@ -31,7 +31,7 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassController.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 /* Check if the form data comes for a trusted request */
diff --git a/op/op.RoleMgr.php b/op/op.RoleMgr.php
index 2bfa947f2..62878bbb7 100644
--- a/op/op.RoleMgr.php
+++ b/op/op.RoleMgr.php
@@ -31,7 +31,7 @@ include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$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("admin_tools"),getMLText("access_denied"));
diff --git a/op/op.TransmittalDownload.php b/op/op.TransmittalDownload.php
index 9ddcf6ca2..57abc5b1f 100644
--- a/op/op.TransmittalDownload.php
+++ b/op/op.TransmittalDownload.php
@@ -31,7 +31,7 @@ include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
 if(isset($_GET["transmittalid"])) {
 	$transmittalid = $_GET["transmittalid"];

From 77c5645ccc1edd84cc045d75089b6149c1a47bfc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Mar 2018 12:16:01 +0100
Subject: [PATCH 073/147] check if group recipient is already in list of ind.
 recipients

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

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 9e00eefb5..095d12a5d 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -301,7 +301,8 @@ if (isset($_POST["grpIndRecipients"])) {
 			foreach($members as $member) {
 				/* Do not add the uploader itself and reviewers */
 				if(!$settings->_enableFilterReceipt || ($member->getID() != $user->getID() && !in_array($member->getID(), $reviewers['i'])))
-					$recipients["i"][] = $member->getID();
+					if(!in_array($member->getID(), $recipients["i"]))
+						$recipients["i"][] = $member->getID();
 			}
 		}
 	}

From 08e3a5aca33152610e88e11b630e926f10a45af6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Mar 2018 12:16:51 +0100
Subject: [PATCH 074/147] check if group recipient is already in list of ind.
 recipients, check for reviewer only

---
 op/op.CheckInDocument.php | 9 ++++++++-
 op/op.UpdateDocument.php  | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index f8b1b2880..37ee48e08 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -167,6 +167,12 @@ else
 					}
 			}
 		}
+		if($settings->_workflowMode == 'traditional' && !$settings->_allowReviewerOnly) {
+			/* Check if reviewers are send but no approvers */
+			if(($reviewers["i"] || $reviewers["g"]) && !$approvers["i"] && !$approvers["g"]) {
+				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_uploading_reviewer_only"));
+			}
+		}
 	} elseif($settings->_workflowMode == 'advanced') {
 		if(!$workflow = $user->getMandatoryWorkflow()) {
 			if(isset($_POST["workflow"]))
@@ -198,7 +204,8 @@ else
 				foreach($members as $member) {
 					/* Do not add the uploader itself and reviewers */
 					if(!$settings->_enableFilterReceipt || ($member->getID() != $user->getID() && !in_array($member->getID(), $reviewers['i'])))
-						$recipients["i"][] = $member->getID();
+						if(!in_array($member->getID(), $recipients["i"]))
+							$recipients["i"][] = $member->getID();
 				}
 			}
 		}
diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index 0fd0a4486..15616fe21 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -271,6 +271,12 @@ default:
 					}
 			}
 		}
+		if($settings->_workflowMode == 'traditional' && !$settings->_allowReviewerOnly) {
+			/* Check if reviewers are send but no approvers */
+			if(($reviewers["i"] || $reviewers["g"]) && !$approvers["i"] && !$approvers["g"]) {
+				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_uploading_reviewer_only"));
+			}
+		}
 	} elseif($settings->_workflowMode == 'advanced') {
 		if(!$workflows = $user->getMandatoryWorkflows()) {
 			if(isset($_POST["workflow"]))
@@ -310,7 +316,8 @@ default:
 				foreach($members as $member) {
 					/* Do not add the uploader itself and approvers */
 					if(!$settings->_enableFilterReceipt || ($member->getID() != $user->getID() && !in_array($member->getID(), $reviewers['i'])))
-						$recipients["i"][] = $member->getID();
+						if(!in_array($member->getID(), $recipients["i"]))
+							$recipients["i"][] = $member->getID();
 				}
 			}
 		}

From f9fc71eb4056190643559e10cf7e62dc777c7ab5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Mar 2018 21:25:16 +0100
Subject: [PATCH 075/147] check if converters are set at all (Closes #394)

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

diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index d63e96c54..a05b1c391 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -73,8 +73,8 @@ if($view) {
 	$view->setParam('workflowmode', $settings->_workflowMode);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
-	$view->setParam('previewConverters', $settings->_converters['preview']);
-	$view->setParam('pdfConverters', $settings->_converters['pdf']);
+	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
+	$view->setParam('pdfConverters', isset($settings->_converters['pdf']) ? $settings->_converters['pdf'] : array());
 	$view->setParam('showFullPreview', $settings->_showFullPreview);
 	$view->setParam('convertToPdf', $settings->_convertToPdf);
 	$view->setParam('currenttab', isset($_GET['currenttab']) ? $_GET['currenttab'] : "");

From a891adccd29b5ce66ed98d537a35258467a11af6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Mar 2018 08:45:29 +0100
Subject: [PATCH 076/147] add not for fixing #394

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

diff --git a/CHANGELOG b/CHANGELOG
index c66ab6aad..f547f9098 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@
 - do not list empty groups as reviewer/approver
 - fix sending notification when document attributes change
 - sending notification when folder attributes change
+- check if converters are set in out/out.ViewDocument.php at all (Closes #394)
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.6

From 2b960f1980f3a354a773956f0b6aa2e209a2be56 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Mar 2018 13:37:20 +0100
Subject: [PATCH 077/147] updateExtensionList() has new param $version and
 checks the http return code

---
 inc/inc.ClassExtensionMgr.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index 018847491..cd0f83e6d 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -60,7 +60,8 @@ class SeedDMS_Extension_Mgr {
 	/**
 	 * Compare two version
 	 *
-	 * This functions compares two version in the format x.x.x
+	 * This functions compares two version in the format x.x.x with x being
+	 * an integer
 	 *
 	 * @param string $ver1
 	 * @param string $ver2
@@ -372,10 +373,18 @@ class SeedDMS_Extension_Mgr {
 	 *
 	 * @param boolean $force force download even if file already exists
 	 */
-	public function updateExtensionList($force=false) { /* {{{ */
+	public function updateExtensionList($version='', $force=false) { /* {{{ */
 		if($this->reposurl) {
 			if(!file_exists($this->cachedir."/repository.json") || $force) {
-				$file = file_get_contents($this->reposurl);
+				$file = @file_get_contents($this->reposurl.($version ? '?seeddms_version='.$version : ''));
+				if(is_array($http_response_header)) {
+					$parts=explode(' ',$http_response_header[0]);
+					if(count($parts)>1) //HTTP/1.0 <code> <text>
+						if(intval($parts[1]) != 200) {
+							$this->errmsgs[] = 'Getting extension list returned http code ('.$parts[1].')';
+							return false;
+						}
+				}
 				file_put_contents($this->cachedir."/repository.json", $file);
 			}
 			return true;

From 7733da5133ac59a768eca3271d4af6e6fc0187cd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Mar 2018 13:38:00 +0100
Subject: [PATCH 078/147] pass repository url to extension mgr

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

diff --git a/inc/inc.Extension.php b/inc/inc.Extension.php
index c72458b28..b5ba1c203 100644
--- a/inc/inc.Extension.php
+++ b/inc/inc.Extension.php
@@ -16,7 +16,7 @@ require_once "inc.ClassExtBase.php";
 require_once "inc.Version.php";
 require_once "inc.Utils.php";
 
-$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
+$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir, $settings->_repositoryUrl);
 $EXT_CONF = $extMgr->getExtensionConfiguration();
 
 $version = new SeedDMS_Version;

From 16d9cb5c1eabbcf58c34f16b458ab48a331aaeb8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Mar 2018 13:39:38 +0100
Subject: [PATCH 079/147] move code for downloading new extension list into
 controller

---
 op/op.ExtensionMgr.php   | 13 +++++++++++++
 out/out.ExtensionMgr.php |  5 -----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/op/op.ExtensionMgr.php b/op/op.ExtensionMgr.php
index 7fcbe569c..d7c81d4c1 100644
--- a/op/op.ExtensionMgr.php
+++ b/op/op.ExtensionMgr.php
@@ -113,6 +113,19 @@ elseif ($action == "import") { /* {{{ */
 	add_log_line();
 	header("Location:../out/out.ExtensionMgr.php?currenttab=".$currenttab);
 } /* }}} */
+elseif ($action == "getlist") { /* {{{ */
+	$v = new SeedDMS_Version();
+	$controller->setParam('extmgr', $extMgr);
+	$controller->setParam('forceupdate', (isset($_POST['forceupdate']) && $_POST['forceupdate']) ? true : false);
+	$controller->setParam('version', $v->version());
+	if (!$controller($_POST)) {
+		$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('error_extension_getlist').$controller->getErrorMsg(), 'timeout'=>5000));
+	} else {
+		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_extension_getlist')));
+	}
+	add_log_line();
+	header("Location:../out/out.ExtensionMgr.php?currenttab=".$currenttab);
+} /* }}} */
 
 
 ?>
diff --git a/out/out.ExtensionMgr.php b/out/out.ExtensionMgr.php
index 6e056ad22..54339ccc4 100644
--- a/out/out.ExtensionMgr.php
+++ b/out/out.ExtensionMgr.php
@@ -41,11 +41,6 @@ if(isset($_GET['currenttab']))
 else
 	$currenttab = 'installed';
 
-if(isset($_GET['forceupdate']) && $_GET['forceupdate']==1)
-	$extmgr->updateExtensionList(true);
-else
-	$extmgr->updateExtensionList();
-
 if($view) {
 	$view->setParam('httproot', $settings->_httpRoot);
 	$view->setParam('extdir', $settings->_rootDir."/ext");

From 3a2e0d70d25d4b7b84b8f905305ee6f33f228a67 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Mar 2018 13:40:17 +0100
Subject: [PATCH 080/147] add missing controller

---
 controllers/class.ExtensionMgr.php | 81 ++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 controllers/class.ExtensionMgr.php

diff --git a/controllers/class.ExtensionMgr.php b/controllers/class.ExtensionMgr.php
new file mode 100644
index 000000000..9cae083e4
--- /dev/null
+++ b/controllers/class.ExtensionMgr.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Implementation of ExtensionMgr controller
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2018 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class which does the busines logic for managing extensions
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2018 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Controller_ExtensionMgr extends SeedDMS_Controller_Common {
+
+	public function refresh() { /* {{{ */
+		$dms = $this->params['dms'];
+		$extmgr = $this->params['extmgr'];
+
+		$extmgr->createExtensionConf();
+		return true;
+	} /* }}} */
+
+	public function download() { /* {{{ */
+		$dms = $this->params['dms'];
+		$settings = $this->params['settings'];
+		$extmgr = $this->params['extmgr'];
+		$extname = $this->params['extname'];
+
+		$filename = $extmgr->createArchive($extname, $GLOBALS['EXT_CONF'][$extname]['version']);
+
+		if(null === $this->callHook('download')) {
+			if(file_exists($filename)) {
+				header("Content-Transfer-Encoding: binary");
+				header("Content-Length: " . filesize($filename));
+				header("Content-Disposition: attachment; filename=\"" . utf8_basename($filename) . "\"; filename*=UTF-8''".utf8_basename($filename));
+				header("Content-Type: application/zip");
+				header("Cache-Control: must-revalidate");
+
+				sendFile($filename);
+			}
+		}
+		return true;
+	} /* }}} */
+
+	public function upload() { /* {{{ */
+		$dms = $this->params['dms'];
+		$extmgr = $this->params['extmgr'];
+		$file = $this->params['file'];
+
+		if($extmgr->updateExtension($file))
+			$extmgr->createExtensionConf();
+		else
+			return false;
+		return true;
+	} /* }}} */
+
+	public function getlist() { /* {{{ */
+		$dms = $this->params['dms'];
+		$extmgr = $this->params['extmgr'];
+		$forceupdate = $this->params['forceupdate'];
+		$version = $this->params['version'];
+
+		if(!$extmgr->updateExtensionList($version, $forceupdate)) {
+			$this->errormsg = $extmgr->getErrorMsg();
+			return false;
+		}
+
+		return true;
+	} /* }}} */
+
+}

From a66f9538f48c23294e74a31c0798c8ddd3c23e7b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Mar 2018 13:40:34 +0100
Subject: [PATCH 081/147] splash msg may have a timeout value

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

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 6f8382f26..f2a2edae6 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -123,7 +123,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "<body".(strlen($bodyClass)>0 ? " class=\"".$bodyClass."\"" : "").">\n";
 		if($this->params['session'] && $flashmsg = $this->params['session']->getSplashMsg()) {
 			$this->params['session']->clearSplashMsg();
-			echo "<div class=\"splash\" data-type=\"".$flashmsg['type']."\">".$flashmsg['msg']."</div>\n";
+			echo "<div class=\"splash\" data-type=\"".$flashmsg['type']."\"".(!empty($flashmsg['timeout']) ? ' data-timeout="'.$flashmsg['timeout'].'"': '').">".$flashmsg['msg']."</div>\n";
 		}
 		foreach($hookObjs as $hookObj) {
 			if (method_exists($hookObj, 'startBody')) {

From fe0450c0516db6ee52854d2291c761d387cea884 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Mar 2018 13:40:57 +0100
Subject: [PATCH 082/147] call controller when updating extension list

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

diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index 2f60bd842..d0bff6ad3 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -140,7 +140,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 				echo "<img src=\"".$httproot."ext/".$extname."/".$extconf['icon']."\" alt=\"".$extname."\" title=\"".$extname."\">";
 			echo "</td>";
 			echo "<td>".$extconf['title'];
-			if($extconf['changelog'] && file_exists($extdir."/".$extname."/".$extconf['changelog'])) {
+			if(!empty($extconf['changelog']) && file_exists($extdir."/".$extname."/".$extconf['changelog'])) {
 				echo $this->printPopupBox("<i class=\"icon-reorder\"></i>", '<div style="white-space: pre-wrap; font-family: monospace; padding: 0px;">'.file_get_contents($extdir."/".$extname."/".$extconf['changelog'])."</div>", true);
 			}
 			echo "<br /><small>".$extconf['description']."</small>";
@@ -215,7 +215,15 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 		}	
 		echo "</tbody></table>\n";
 ?>
-				<div><a href="?forceupdate=1&currenttab=repository" class="btn btn-delete"><?= getMLText('force_update')?></a></div>
+				<div>
+					<form method="post" action="../op/op.ExtensionMgr.php">
+					<?= createHiddenFieldWithKey('extensionmgr'); ?>
+					<input type="hidden" name="action" value="getlist" />
+					<input type="hidden" name="currenttab" value="repository" />
+					<input type="hidden" name="forceupdate" value="1" />
+          <button type="submit" class="btn btn-delete"><?= getMLText('force_update')?></button>
+					</form>
+</div>
 			</div>
 		</div>
   </div>

From e576e61166a0ae594544252016068319fa9ab397 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Mar 2018 14:26:19 +0100
Subject: [PATCH 083/147] set version to 1.0.1

---
 ext/example/changelog.md | 7 +++++++
 ext/example/conf.php     | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ext/example/changelog.md b/ext/example/changelog.md
index aa8f298be..f043a9089 100644
--- a/ext/example/changelog.md
+++ b/ext/example/changelog.md
@@ -1,2 +1,9 @@
+Changes in version 1.0.1
+==========================
+
+- added this changelog file
+
 Changes in version 1.0.0
 ==========================
+
+- Initial version
diff --git a/ext/example/conf.php b/ext/example/conf.php
index 2c39d9680..05ac31fbc 100644
--- a/ext/example/conf.php
+++ b/ext/example/conf.php
@@ -3,8 +3,8 @@ $EXT_CONF['example'] = array(
 	'title' => 'Example Extension',
 	'description' => 'This sample extension demonstrate the use of various hooks',
 	'disable' => false,
-	'version' => '1.0.0',
-	'releasedate' => '2013-05-03',
+	'version' => '1.0.1',
+	'releasedate' => '2018-03-21',
 	'author' => array('name'=>'Uwe Steinmann', 'email'=>'uwe@steinmann.cx', 'company'=>'MMK GmbH'),
 	'config' => array(
 		'input_field' => array(

From 0ad32b5517f4eeb48680ecc3a495b7fbf3ca0449 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Mar 2018 15:24:25 +0100
Subject: [PATCH 084/147] add icon to update button

---
 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 d0bff6ad3..fcc5378be 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -221,7 +221,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 					<input type="hidden" name="action" value="getlist" />
 					<input type="hidden" name="currenttab" value="repository" />
 					<input type="hidden" name="forceupdate" value="1" />
-          <button type="submit" class="btn btn-delete"><?= getMLText('force_update')?></button>
+          <button type="submit" class="btn btn-delete"><i class="icon-refresh"></i> <?= getMLText('force_update')?></button>
 					</form>
 </div>
 			</div>

From cc12a00db9ba29af47e3beea70f8b7455f3e325c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Mar 2018 15:24:45 +0100
Subject: [PATCH 085/147] replace hard coded repository url

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

diff --git a/op/op.ExtensionMgr.php b/op/op.ExtensionMgr.php
index d7c81d4c1..29fe71001 100644
--- a/op/op.ExtensionMgr.php
+++ b/op/op.ExtensionMgr.php
@@ -95,7 +95,7 @@ elseif ($action == "import") { /* {{{ */
 	if(!$_POST['url']) {
 		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
 	}
-	$reposurl = 'http://seeddms.steinmann.cx/repository';
+	$reposurl = $settings->_repositoryUrl;
 	$content = file_get_contents($reposurl."/".$_POST['url']);
 	$file = tempnam(sys_get_temp_dir(), '');
 	file_put_contents($file, $content);

From 4a83c561f19899f86951e724220918b0ef32ebc3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Mar 2018 15:25:03 +0100
Subject: [PATCH 086/147] check if $EXT_CONF is set

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

diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index cd0f83e6d..3f600891d 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -108,7 +108,7 @@ class SeedDMS_Extension_Mgr {
 				$this->createExtensionConf();
 			}
 			include($this->getExtensionsConfFile());
-			if($EXT_CONF) {
+			if(!empty($EXT_CONF)) {
 				$this->extconf = $EXT_CONF;
 			}
 		}

From ba13d0eba251caa2296f0098689b42a4954f9b8e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Mar 2018 06:30:15 +0100
Subject: [PATCH 087/147] fix typo in function name

---
 inc/inc.ClassExtensionMgr.php          | 2 +-
 views/bootstrap/class.ExtensionMgr.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index 3f600891d..fa60495ad 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -132,7 +132,7 @@ class SeedDMS_Extension_Mgr {
 	 *
 	 * @return boolean
 	 */
-	public function isWritableExitDir() { /* {{{ */
+	public function isWritableExtDir() { /* {{{ */
 		return is_writable($this->extdir);
 	} /* }}} */
 
diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index fcc5378be..2485a8deb 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -206,7 +206,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 				echo "<td nowrap>".$re['author']['name']."<br /><small>".$re['author']['company']."</small></td>";
 				echo "<td nowrap>";
 				echo "<div class=\"list-action\">";
-				if(!$checkmsgs && $extmgr->isWritableExitDir())
+				if(!$checkmsgs && $extmgr->isWritableExtDir())
 					echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$re['name']."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"currenttab\" value=\"repository\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$re['name']."\" title=\"".getMLText('import_extension')."\"><i class=\"icon-download\"></i></a></form>";
 				echo "</div>";
 				echo "</td>";

From d54ec75def93e49701c86e648216e73664d974f3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Mar 2018 08:42:41 +0100
Subject: [PATCH 088/147] getExtensionList() new returns only the latest
 version and php arrays

---
 inc/inc.ClassExtensionMgr.php | 61 +++++++++++++++++++++++++++++++----
 1 file changed, 54 insertions(+), 7 deletions(-)

diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index fa60495ad..8d77bb9fb 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -57,6 +57,11 @@ class SeedDMS_Extension_Mgr {
 	 */
 	protected $errmsgs;
 
+	/*
+	 * Name of json file containg available extension from repository
+	 */
+	const repos_list_file = 'repository.json';
+
 	/**
 	 * Compare two version
 	 *
@@ -219,6 +224,7 @@ class SeedDMS_Extension_Mgr {
 			}
 			$extname = key($EXT_CONF);
 			if(!$extname || !preg_match('/[a-zA-Z_]*/', $extname)) {
+				$this->errmsgs[] = "Extension has invalid or no name";
 				return false;
 			}
 
@@ -253,6 +259,9 @@ class SeedDMS_Extension_Mgr {
 			if(!empty($extconf['class']['file']) && !file_exists($dir."/".$extconf['class']['file'])) {
 				$this->errmsgs[] = "Missing class file";
 			}
+			if(!empty($extconf['icon']) && !file_exists($dir."/".$extconf['icon'])) {
+				$this->errmsgs[] = "Missing icon file";
+			}
 		}
 
 		if(!isset($options['noconstraints']) || $options['noconstraints'] == false) {
@@ -356,18 +365,56 @@ class SeedDMS_Extension_Mgr {
 	} /* }}} */
 
 	/**
-	 * Import list of extension from repository
+	 * Get list of extensions from cached repository index
 	 *
-	 * @param boolean $force force download even if file already exists
+	 * This function returns the whole repository index file separated in
+	 * single lines. Each line is either a comment if it starts with an '#'
+	 * or a json encoded array containing the extension configuration.
+	 *
+	 * Run SeedDMS_Extension_Mgr::updateExtensionList() to ensure the
+	 * currently cached extension list file is up to date.
+	 *
+	 * @return string[] list of json strings or comments
 	 */
-	public function getExtensionList() { /* {{{ */
-		if(file_exists($this->cachedir."/repository.json")) {
-			return file($this->cachedir."/repository.json");
+	public function getRawExtensionList() { /* {{{ */
+		if(file_exists($this->cachedir."/".self::repos_list_file)) {
+			return file($this->cachedir."/".self::repos_list_file);
 		} else {
 			return array();
 		}
 	} /* }}} */
 
+	/**
+	 * Get list of extensions from cached repository index
+	 *
+	 * This function reads the cache respository index and returns
+	 * a list of extension configurations. Only the most recent version
+	 * of an extension will be included.
+	 *
+	 * Run SeedDMS_Extension_Mgr::updateExtensionList() to ensure the
+	 * currently cached extension list file is up to date.
+	 *
+	 * @return array[] list of extension configurations
+	 */
+	public function getExtensionList() { /* {{{ */
+		$list = self::getRawExtensionList();
+		$result = array();
+		$vcache = array(); // keep highest version of extension
+		foreach($list as $e) {
+			if($e[0] != '#') {
+				$re = json_decode($e, true);
+				if(!isset($result[$re['name']])) {
+					$result[$re['name']] = $re;
+					$vcache[$re['name']] = $re['version'];
+				} elseif(self::cmpVersion($re['version'], $vcache[$re['name']]) > 0) {
+					$result[$re['name']] = $re;
+					$vcache[$re['name']] = $re['version'];
+				}
+			}
+		}
+		return $result;
+	} /* }}} */
+
 	/**
 	 * Import list of extension from repository
 	 *
@@ -375,7 +422,7 @@ class SeedDMS_Extension_Mgr {
 	 */
 	public function updateExtensionList($version='', $force=false) { /* {{{ */
 		if($this->reposurl) {
-			if(!file_exists($this->cachedir."/repository.json") || $force) {
+			if(!file_exists($this->cachedir."/".self::repos_list_file) || $force) {
 				$file = @file_get_contents($this->reposurl.($version ? '?seeddms_version='.$version : ''));
 				if(is_array($http_response_header)) {
 					$parts=explode(' ',$http_response_header[0]);
@@ -385,7 +432,7 @@ class SeedDMS_Extension_Mgr {
 							return false;
 						}
 				}
-				file_put_contents($this->cachedir."/repository.json", $file);
+				file_put_contents($this->cachedir."/".self::repos_list_file, $file);
 			}
 			return true;
 		} else {

From 0ad23035112723eb7864267e968bea69214e23c2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Mar 2018 08:43:21 +0100
Subject: [PATCH 089/147] fix typo in function name

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

diff --git a/op/op.ExtensionMgr.php b/op/op.ExtensionMgr.php
index 29fe71001..22c33c8bd 100644
--- a/op/op.ExtensionMgr.php
+++ b/op/op.ExtensionMgr.php
@@ -72,7 +72,7 @@ elseif ($action == "refresh") { /* {{{ */
 	header("Location:../out/out.ExtensionMgr.php?currenttab=".$currenttab);
 } /* }}} */
 elseif ($action == "upload") { /* {{{ */
-	if(!$extmgr->isWritableExitDir()) {
+	if(!$extmgr->isWritableExtDir()) {
 		UI::exitError(getMLText("admin_tools"),getMLText("extension_mgr_no_upload"));
 	}
 	if($_FILES['userfile']['error']) {

From e9d93860b9a3b7c1a64a60f06bbed52e76ca7424 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Mar 2018 08:43:41 +0100
Subject: [PATCH 090/147] json decoding is now done in SeedDMS_ExtensionMgr,
 show images in repository list

---
 views/bootstrap/class.ExtensionMgr.php | 59 ++++++++++++--------------
 1 file changed, 28 insertions(+), 31 deletions(-)

diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index 2485a8deb..f10bc58ce 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -82,7 +82,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 <div class="row-fluid">
 	<div class="span4">
 <?php
-		if($extmgr->isWritableExitDir()) {
+		if($extmgr->isWritableExtDir()) {
 ?>
 		<form class="form-horizontal" method="post" enctype="multipart/form-data" action="../op/op.ExtensionMgr.php">
 			<?= createHiddenFieldWithKey('extensionmgr') ?>
@@ -135,9 +135,9 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 					echo "<tr class=\"success\">";
 			} else
 				echo "<tr class=\"warning\">";
-			echo "<td>";
+			echo "<td width=\"32\">";
 			if($extconf['icon'])
-				echo "<img src=\"".$httproot."ext/".$extname."/".$extconf['icon']."\" alt=\"".$extname."\" title=\"".$extname."\">";
+				echo "<img width=\"32\" height=\"32\" src=\"".$httproot."ext/".$extname."/".$extconf['icon']."\" alt=\"".$extname."\" title=\"".$extname."\">";
 			echo "</td>";
 			echo "<td>".$extconf['title'];
 			if(!empty($extconf['changelog']) && file_exists($extdir."/".$extname."/".$extconf['changelog'])) {
@@ -183,35 +183,32 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 		print "<th></th>\n";	
 		print "</tr></thead><tbody>\n";
 		$list = $extmgr->getExtensionList();
-		foreach($list as $e) {
-			if($e[0] != '#') {
-				$re = json_decode($e, true);
-				$extmgr->checkExtension($re);
-				$checkmsgs = $extmgr->getErrorMsgs();
-				$needsupdate = !isset($GLOBALS['EXT_CONF'][$re['name']]) || SeedDMS_Extension_Mgr::cmpVersion($re['version'], $GLOBALS['EXT_CONF'][$re['name']]['version']) > 0;
-				echo "<tr";
-				if(isset($GLOBALS['EXT_CONF'][$re['name']])) {
-					if($needsupdate)
-						echo " class=\"warning\"";
-					else
-						echo " class=\"success\"";
-				}
-				echo ">";
-				echo "<td></td>";
-				echo "<td>".$re['title']."<br /><small>".$re['description']."</small>";
-				if($checkmsgs)
-					echo "<div><img src=\"".$this->getImgPath("attention.gif")."\"> ".implode('<br /><img src="'.$this->getImgPath("attention.gif").'"> ', $checkmsgs)."</div>";
-				echo "</td>";
-				echo "<td nowrap>".$re['version']."<br /><small>".$re['releasedate']."</small></td>";
-				echo "<td nowrap>".$re['author']['name']."<br /><small>".$re['author']['company']."</small></td>";
-				echo "<td nowrap>";
-				echo "<div class=\"list-action\">";
-				if(!$checkmsgs && $extmgr->isWritableExtDir())
-					echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$re['name']."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"currenttab\" value=\"repository\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$re['name']."\" title=\"".getMLText('import_extension')."\"><i class=\"icon-download\"></i></a></form>";
-				echo "</div>";
-				echo "</td>";
-				echo "</tr>";
+		foreach($list as $re) {
+			$extmgr->checkExtension($re);
+			$checkmsgs = $extmgr->getErrorMsgs();
+			$needsupdate = !isset($GLOBALS['EXT_CONF'][$re['name']]) || SeedDMS_Extension_Mgr::cmpVersion($re['version'], $GLOBALS['EXT_CONF'][$re['name']]['version']) > 0;
+			echo "<tr";
+			if(isset($GLOBALS['EXT_CONF'][$re['name']])) {
+				if($needsupdate)
+					echo " class=\"warning\"";
+				else
+					echo " class=\"success\"";
 			}
+			echo ">";
+			echo "<td width=\"32\">".($re['icon-data'] ? '<img width="32" height="32" alt="'.$re['name'].'" title="'.$re['name'].'" src="'.$re['icon-data'].'">' : '')."</td>";
+			echo "<td>".$re['title']."<br /><small>".$re['description']."</small>";
+			if($checkmsgs)
+				echo "<div><img src=\"".$this->getImgPath("attention.gif")."\"> ".implode('<br /><img src="'.$this->getImgPath("attention.gif").'"> ', $checkmsgs)."</div>";
+			echo "</td>";
+			echo "<td nowrap>".$re['version']."<br /><small>".$re['releasedate']."</small></td>";
+			echo "<td nowrap>".$re['author']['name']."<br /><small>".$re['author']['company']."</small></td>";
+			echo "<td nowrap>";
+			echo "<div class=\"list-action\">";
+			if(!$checkmsgs && $extmgr->isWritableExtDir())
+				echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$re['name']."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"currenttab\" value=\"repository\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$re['name']."\" title=\"".getMLText('import_extension')."\"><i class=\"icon-download\"></i></a></form>";
+			echo "</div>";
+			echo "</td>";
+			echo "</tr>";
 		}	
 		echo "</tbody></table>\n";
 ?>

From b1bf70e82831c4caa0e0469456276cb0541c8993 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Mar 2018 15:12:24 +0100
Subject: [PATCH 091/147] add more error msgs

---
 controllers/class.RemoveDocument.php | 1 +
 controllers/class.RemoveFolder.php   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/controllers/class.RemoveDocument.php b/controllers/class.RemoveDocument.php
index 6371ec1e1..0c6271dc2 100644
--- a/controllers/class.RemoveDocument.php
+++ b/controllers/class.RemoveDocument.php
@@ -45,6 +45,7 @@ class SeedDMS_Controller_RemoveDocument extends SeedDMS_Controller_Common {
 		$result = $this->callHook('removeDocument', $document);
 		if($result === null) {
 			if (!$document->remove()) {
+				$this->errormsg = "error_occured";
 				return false;
 			} else {
 
diff --git a/controllers/class.RemoveFolder.php b/controllers/class.RemoveFolder.php
index c41b7f74f..15ee910c8 100644
--- a/controllers/class.RemoveFolder.php
+++ b/controllers/class.RemoveFolder.php
@@ -59,6 +59,7 @@ class SeedDMS_Controller_RemoveFolder extends SeedDMS_Controller_Common {
 				$dms->setCallback('onPreRemoveDocument', 'removeFromIndex', array($index, $indexconf));
 
 			if (!$folder->remove()) {
+				$this->errormsg = 'error_occured';
 				return false;
 			} else {
 

From 75a6eafef47510308dbac8d5b290dd2bb3fc6d21 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Mar 2018 15:12:53 +0100
Subject: [PATCH 092/147] better error logging

---
 webdav/webdav.php | 145 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 115 insertions(+), 30 deletions(-)

diff --git a/webdav/webdav.php b/webdav/webdav.php
index 916bf9291..6dec4e080 100644
--- a/webdav/webdav.php
+++ b/webdav/webdav.php
@@ -55,18 +55,6 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 	 */
 	function ServeRequest($dms = null, $logger = null) /* {{{ */
 	{
-		// special treatment for litmus compliance test
-		// reply on its identifier header
-		// not needed for the test itself but eases debugging
-		if( function_exists('apache_request_headers') ) {
-			foreach (apache_request_headers() as $key => $value) {
-				if (stristr($key, "litmus")) {
-					error_log("Litmus test $value");
-					header("X-Litmus-reply: ".$value);
-				}
-			}
-		}
-
 		// set root directory, defaults to webserver document root if not set
 		if ($dms) {
 			$this->dms = $dms;
@@ -77,12 +65,18 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 		// set logger
 		$this->logger = $logger;
 
-		// establish connection to property/locking db
-				/*
-		mysql_connect($this->db_host, $this->db_user, $this->db_passwd) or die(mysql_error());
-		mysql_select_db($this->db_name) or die(mysql_error());
-				*/
-		// TODO throw on connection problems
+		// special treatment for litmus compliance test
+		// reply on its identifier header
+		// not needed for the test itself but eases debugging
+		if( function_exists('apache_request_headers') ) {
+			foreach (apache_request_headers() as $key => $value) {
+				if (stristr($key, "litmus")) {
+					if($this->logger)
+						$this->logger->log('Litmus test '.$value, PEAR_LOG_DEBUG);
+					header("X-Litmus-reply: ".$value);
+				}
+			}
+		}
 
 		// let the base class do all the work
 		parent::ServeRequest();
@@ -140,11 +134,17 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			$userobj = $authobj->authenticate($user, $pass);
 		} /* }}} */
 
-		if(!$userobj)
+		if(!$userobj) {
+			if($this->logger)
+				$this->logger->log('check_auth: No such user', PEAR_LOG_NOTICE);
 			return false;
+		}
 
-		if(($userobj->getID() == $settings->_guestID) && (!$settings->_enableGuestLogin))
+		if(($userobj->getID() == $settings->_guestID) && (!$settings->_enableGuestLogin)) {
+			if($this->logger)
+				$this->logger->log('check_auth: Login as guest is not allowed', PEAR_LOG_NOTICE);
 			return false;
+		}
 
 		if($userobj->isDisabled())
 			return false;
@@ -538,6 +538,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 	 */
 	function PUT(&$options) /* {{{ */
 	{
+		global $settings, $indexconf;
+
 		$this->log_options('PUT', $options);
 
 		$path   = $options["path"];
@@ -555,6 +557,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 
 		/* Check if user is logged in */
 		if(!$this->user) {
+			if($this->logger)
+				$this->logger->log('PUT: access forbidden', PEAR_LOG_ERR);
 			return "403 Forbidden";				 
 		}
 
@@ -580,47 +584,112 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 				if($lastDotIndex === false) $fileType = ".";
 				else $fileType = substr($name, $lastDotIndex);
 		}
+		if($this->logger)
+			$this->logger->log('PUT: file is of type '.$mimetype, PEAR_LOG_INFO);
+
 		/* First check whether there is already a file with the same name */
 		if($this->useorgfilename)
 			$document = $this->dms->getDocumentByOriginalFilename($name, $folder);
 		else
 			$document = $this->dms->getDocumentByName($name, $folder);
 		if($document) {
+			if($this->logger)
+				$this->logger->log('PUT: replacing document id='.$document->getID(), PEAR_LOG_INFO);
 			if ($document->getAccessMode($this->user) < M_READWRITE) {
+				if($this->logger)
+					$this->logger->log('PUT: no access on document', PEAR_LOG_ERR);
 				unlink($tmpFile);
 				return "403 Forbidden";
-			} else{
+			} else {
 				/* Check if the new version iѕ identical to the current version.
 				 * In that case just update the modification date
 				 */
 				$lc = $document->getLatestContent();
 				if($lc->getChecksum() == SeedDMS_Core_File::checksum($tmpFile)) {
+					if($this->logger)
+						$this->logger->log('PUT: identical to latest version', PEAR_LOG_INFO);
 					$lc->setDate();
 				} else {
 					if($this->user->getID() == $lc->getUser()->getID() &&
 						 $name == $lc->getOriginalFileName() &&
 						 $fileType == $lc->getFileType() &&
 						 $mimetype == $lc->getMimeType()) {
+						if($this->logger)
+							$this->logger->log('PUT: replacing latest version', PEAR_LOG_INFO);
 						if(!$document->replaceContent($lc->getVersion(), $this->user, $tmpFile, $name, $fileType, $mimetype)) {
+							if($this->logger)
+								$this->logger->log('PUT: error replacing latest version', PEAR_LOG_ERR);
 							unlink($tmpFile);
 							return "403 Forbidden";
 						}
 					} else {
+						if($this->logger)
+							$this->logger->log('PUT: adding new version', PEAR_LOG_INFO);
 						if(!$document->addContent('', $this->user, $tmpFile, $name, $fileType, $mimetype, array(), array(), 0)) {
+							if($this->logger)
+								$this->logger->log('PUT: error adding new version', PEAR_LOG_ERR);
 							unlink($tmpFile);
 							return "409 Conflict";
 						}
 					}
 				}
 			}
-
 		} else {
+			if($this->logger)
+				$this->logger->log('PUT: adding new document', PEAR_LOG_INFO);
 			if ($folder->getAccessMode($this->user) < M_READWRITE) {
+				if($this->logger)
+					$this->logger->log('PUT: no access on folder', PEAR_LOG_ERR);
 				unlink($tmpFile);
 				return "403 Forbidden";
-			} elseif(!$res = $folder->addDocument($name, '', 0, $this->user, '', array(), $tmpFile, $name, $fileType, $mimetype, 0, array(), array(), 0, "")) {
+			} 
+			if($settings->_enableFullSearch) {
+				$index = $indexconf['Indexer']::open($settings->_luceneDir);
+				$indexconf['Indexer']::init($settings->_stopWordsFile);
+			} else {
+				$index = null;
+				$indexconf = null;
+			}
+
+			$controller = Controller::factory('AddDocument');
+			$controller->setParam('dms', $this->dms);
+			$controller->setParam('user', $this->user);
+			$controller->setParam('documentsource', 'webdav');
+			$controller->setParam('folder', $folder);
+			$controller->setParam('index', $index);
+			$controller->setParam('indexconf', $indexconf);
+			$controller->setParam('name', $name);
+			$controller->setParam('comment', '');
+			$controller->setParam('expires', 0);
+			$controller->setParam('keywords', '');
+			$controller->setParam('categories', array());
+			$controller->setParam('owner', $this->user);
+			$controller->setParam('userfiletmp', $tmpFile);
+			$controller->setParam('userfilename', $name);
+			$controller->setParam('filetype', $fileType);
+			$controller->setParam('userfiletype', $mimetype);
+			$minmax = $folder->getDocumentsMinMax();
+			if($settings->_defaultDocPosition == 'start')
+				$controller->setParam('sequence', $minmax['min'] - 1);
+			else
+				$controller->setParam('sequence', $minmax['max'] + 1);
+			$controller->setParam('reviewers', array());
+			$controller->setParam('approvers', array());
+			$controller->setParam('reqversion', 0);
+			$controller->setParam('versioncomment', '');
+			$controller->setParam('attributes', array());
+			$controller->setParam('attributesversion', array());
+			$controller->setParam('workflow', null);
+			$controller->setParam('notificationgroups', array());
+			$controller->setParam('notificationusers', array());
+			$controller->setParam('maxsizeforfulltext', $settings->_maxSizeForFullText);
+			$controller->setParam('defaultaccessdocs', $settings->_defaultAccessDocs);
+			if(!$document = $controller->run()) {
+//			if(!$res = $folder->addDocument($name, '', 0, $this->user, '', array(), $tmpFile, $name, $fileType, $mimetype, 0, array(), array(), 0, "")) {
 				unlink($tmpFile);
-				return "409 Conflict";
+				if($this->logger)
+					$this->logger->log('PUT: error adding object: '.$controller->getErrorMsg(), PEAR_LOG_ERR);
+				return "409 Conflict ".$controller->getErrorMsg();
 			}
 		}
 
@@ -655,6 +724,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 
 		/* Check if parent of new folder is a folder */
 		if (get_class($folder) != $this->dms->getClassname('folder')) {
+			if($this->logger)
+				$this->logger->log('MKCOL: access forbidden', PEAR_LOG_ERR);
 			return "403 Forbidden";
 		}
 
@@ -669,10 +740,14 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 
 		/* Check if user is logged in */
 		if(!$this->user) {
+			if($this->logger)
+				$this->logger->log('MKCOL: access forbidden', PEAR_LOG_ERR);
 			return "403 Forbidden";				 
 		}
 
 		if ($folder->getAccessMode($this->user) < M_READWRITE) {
+			if($this->logger)
+				$this->logger->log('MKCOL: access forbidden', PEAR_LOG_ERR);
 			return "403 Forbidden";				 
 		}
 
@@ -688,7 +763,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 		$controller->setParam('notificationusers', array());
 		if(!$subFolder = $controller->run()) {
 //		if (!$folder->addSubFolder($name, '', $this->user, 0)) {
-			return "403 Forbidden";				 
+			return "409 Conflict ".$controller->getErrorMsg();				 
 		}
 
 		return ("201 Created");
@@ -718,6 +793,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 
 		// check for access rights
 		if($obj->getAccessMode($this->user) < M_ALL) {
+			if($this->logger)
+				$this->logger->log('DELETE: access forbidden', PEAR_LOG_ERR);
 			return "403 Forbidden";				 
 		}
 
@@ -731,6 +808,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 
 		if (get_class($obj) == $this->dms->getClassname('folder')) {
 			if($obj->hasDocuments() || $obj->hasSubFolders()) {
+				if($this->logger)
+					$this->logger->log('DELETE: cannot delete, folder has children', PEAR_LOG_ERR);
 				return "409 Conflict";
 			}
 			$controller = Controller::factory('RemoveFolder');
@@ -741,7 +820,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			$controller->setParam('indexconf', $indexconf);
 			if(!$controller->run()) {
 //			if(!$obj->remove()) {
-				return "409 Conflict";
+				return "409 Conflict ".$controller->getErrorMsg();
 			}
 		} else {
 			$controller = Controller::factory('RemoveDocument');
@@ -752,7 +831,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			$controller->setParam('indexconf', $indexconf);
 			if(!$controller->run()) {
 //			if(!$obj->remove()) {
-				return "409 Conflict";
+				return "409 Conflict".$controller->getErrorMsg();
 			}
 		}
 
@@ -802,6 +881,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 		 * destination object
 		 */
 		if (($objsource->getAccessMode($this->user) < M_READWRITE) || ($objdest->getAccessMode($this->user) < M_READWRITE)) {
+			if($this->logger)
+				$this->logger->log('MOVE: access forbidden', PEAR_LOG_ERR);
 			return "403 Forbidden";				 
 		}
 
@@ -901,6 +982,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 		 * access on the destination object
 		 */
 		if (($objsource->getAccessMode($this->user) < M_READ) || ($objdest->getAccessMode($this->user) < M_READWRITE)) {
+			if($this->logger)
+				$this->logger->log('COPY: access forbidden', PEAR_LOG_ERR);
 			return "403 Forbidden";				 
 		}
 
@@ -987,12 +1070,10 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			$controller->setParam('notificationusers', array());
 			$controller->setParam('maxsizeforfulltext', $settings->_maxSizeForFullText);
 			$controller->setParam('defaultaccessdocs', $settings->_defaultAccessDocs);
-
 			if(!$document = $controller->run()) {
-
 //			if(!$newdoc = $objdest->addDocument($newdocname, '', 0, $this->user, '', array(), $fspath, $content->getOriginalFileName(), $content->getFileType(), $content->getMimeType(), 0, array(), array(), 0, "")) {
 				if($this->logger)
-					$this->logger->log('COPY: error copying object', PEAR_LOG_INFO);
+					$this->logger->log('COPY: error copying object', PEAR_LOG_ERR);
 				return "409 Conflict";
 			}
 			return "201 Created";
@@ -1090,6 +1171,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 		}
 
 		if ($obj->getAccessMode($this->user) < M_READWRITE) {
+			if($this->logger)
+				$this->logger->log('LOCK: access forbidden', PEAR_LOG_ERR);
 			return "403 Forbidden";				 
 		}
 
@@ -1128,6 +1211,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 		}
 
 		if ($obj->getAccessMode($this->user) < M_READWRITE) {
+			if($this->logger)
+				$this->logger->log('UNLOCK: access forbidden', PEAR_LOG_ERR);
 			return "403 Forbidden";				 
 		}
 

From 0e64f8a7fc7ae3e6863d9fdef23deb615383595a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Mar 2018 15:13:09 +0100
Subject: [PATCH 093/147] do not log DEBUG by default

---
 webdav/index.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/webdav/index.php b/webdav/index.php
index 885e9c4a4..8d1cf3e92 100644
--- a/webdav/index.php
+++ b/webdav/index.php
@@ -15,9 +15,10 @@ if($settings->_logFileEnable) {
 	$logname = $settings->_contentDir."log/webdav-".$logname.".log";
 	if(!file_exists($settings->_contentDir.'log'))
 		@mkdir($settings->_contentDir.'log');
-	if(file_exists($settings->_contentDir.'log') && is_dir($settings->_contentDir.'log'))
+	if(file_exists($settings->_contentDir.'log') && is_dir($settings->_contentDir.'log')) {
 		$log = Log::factory('file', $logname);
-	else
+		$log->setMask(Log::MAX(PEAR_LOG_INFO));
+	} else
 		$log = null;
 } else {
 	$log = null;

From e13cd0fb497fccab575a94bff74ba9e55c7bb1f7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Mar 2018 15:15:13 +0100
Subject: [PATCH 094/147] add missing space

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

diff --git a/webdav/webdav.php b/webdav/webdav.php
index 6dec4e080..c0790d390 100644
--- a/webdav/webdav.php
+++ b/webdav/webdav.php
@@ -831,7 +831,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			$controller->setParam('indexconf', $indexconf);
 			if(!$controller->run()) {
 //			if(!$obj->remove()) {
-				return "409 Conflict".$controller->getErrorMsg();
+				return "409 Conflict ".$controller->getErrorMsg();
 			}
 		}
 

From 0a6e04b6445dc7a7b6781d5ca92b53b7bc802d34 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 23 Mar 2018 10:09:27 +0100
Subject: [PATCH 095/147] add method getExtensionListByName(), some more
 documentation

---
 inc/inc.ClassExtensionMgr.php | 42 +++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index 8d77bb9fb..9d1485e65 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -146,6 +146,8 @@ class SeedDMS_Extension_Mgr {
 	 *
 	 * This function will always create a file, even if no extensions
 	 * are installed.
+	 *
+	 * @return boolean true on success, false on error
 	 */
 	public function createExtensionConf() { /* {{{ */
 		$extensions = self::getExtensions();
@@ -166,6 +168,11 @@ class SeedDMS_Extension_Mgr {
 		}
 	} /* }}} */
 
+	/**
+	 * Get names of locally installed extensions by scanning the extension dir
+	 *
+	 * @return string[] list of extension names
+	 */
 	protected function getExtensions() { /* {{{ */
 		$extensions = array();
 		if(file_exists($this->extdir)) {
@@ -183,6 +190,13 @@ class SeedDMS_Extension_Mgr {
 		return $extensions;
 	} /* }}} */
 
+	/**
+	 * Create zip archive of an extension
+	 *
+	 * @param string $extname name of extension
+	 * @param string $version version of extension (x.y.z)
+	 * @return string name of temporary file with archive
+	 */
 	public function createArchive($extname, $version) { /* {{{ */
 		if(!is_dir($this->extdir ."/". $extname))
 			return false;
@@ -332,6 +346,7 @@ class SeedDMS_Extension_Mgr {
 	 * @return boolean true on success, othewise false
 	 */
 	public function updateExtension($file) { /* {{{ */
+		/* unzip the extension in a temporary directory */
 		$newdir = $this->cachedir ."/ext.new";
 		if(!mkdir($newdir, 0755)) {
 			$this->errmsgs[] = "Cannot create temp. extension directory";
@@ -340,6 +355,7 @@ class SeedDMS_Extension_Mgr {
 		$cmd = "cd ".$newdir."; unzip ".$file;
 		exec($cmd);
 
+		/* Check if extension is complete and fullfills the constraints */
 		if(!self::checkExtension($newdir)) {
 			self::rrmdir($newdir);
 			return false;
@@ -415,6 +431,32 @@ class SeedDMS_Extension_Mgr {
 		return $result;
 	} /* }}} */
 
+	/**
+	 * Get list of version of an extension from cached repository index
+	 *
+	 * This function reads the cache respository index and returns
+	 * a list of extension configurations. Only those extensions will
+	 * be included which maches the given name.
+	 *
+	 * Run SeedDMS_Extension_Mgr::updateExtensionList() to ensure the
+	 * currently cached extension list file is up to date.
+	 *
+	 * @return array[] list of extension configurations
+	 */
+	public function getExtensionListByName($extname) { /* {{{ */
+		$list = self::getRawExtensionList();
+		$result = array();
+		foreach($list as $e) {
+			if($e[0] != '#') {
+				$re = json_decode($e, true);
+				if($re['name'] == $extname) {
+					$result[$re['version']] = $re;
+				}
+			}
+		}
+		return $result;
+	} /* }}} */
+
 	/**
 	 * Import list of extension from repository
 	 *

From 5d2a3d9aba6d5726e1e9264942ab1edd3181a824 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 23 Mar 2018 10:09:53 +0100
Subject: [PATCH 096/147] add css for wider modal box

---
 styles/bootstrap/application.css | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css
index f4acf29d6..eb117fcd6 100644
--- a/styles/bootstrap/application.css
+++ b/styles/bootstrap/application.css
@@ -228,6 +228,13 @@ ul.qq-upload-list li span {
 	display: none;
 }
 
+@media (min-width: 1200px) {
+	.modal-wide {
+		width: 800px;
+		margin-left: -400px;
+	}
+}
+
 @media (max-width: 480px) { 
     .nav-tabs > li {
         float:none;

From 89e04299d034769ff02d586627b27beede22b0ca Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 23 Mar 2018 10:10:12 +0100
Subject: [PATCH 097/147] pass extension name to view

---
 out/out.ExtensionMgr.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/out/out.ExtensionMgr.php b/out/out.ExtensionMgr.php
index 54339ccc4..d75345e77 100644
--- a/out/out.ExtensionMgr.php
+++ b/out/out.ExtensionMgr.php
@@ -40,6 +40,10 @@ if(isset($_GET['currenttab']))
 	$currenttab = $_GET['currenttab'];
 else
 	$currenttab = 'installed';
+if(isset($_GET['extensionname']))
+	$extname = $_GET['extensionname'];
+else
+	$extname = '';
 
 if($view) {
 	$view->setParam('httproot', $settings->_httpRoot);
@@ -47,6 +51,7 @@ if($view) {
 	$view->setParam('version', $v);
 	$view->setParam('extmgr', $extmgr);
 	$view->setParam('currenttab', $currenttab);
+	$view->setParam('extname', $extname);
 	$view->setParam('reposurl', $reposurl);
 	$view($_GET);
 	exit;

From 752d3f4fdd0c240dbfff50c95c4d2e5766a3e01b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 23 Mar 2018 10:10:26 +0100
Subject: [PATCH 098/147] place version info and changelog into modal boxes

---
 views/bootstrap/class.ExtensionMgr.php | 97 ++++++++++++++++++++++++--
 1 file changed, 92 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index f10bc58ce..c4cc0e784 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -63,6 +63,66 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 <?php
 	} /* }}} */
 
+	function info() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$extmgr = $this->params['extmgr'];
+		$extname = $this->params['extname'];
+
+		echo "<table class=\"table _table-condensed\">\n";
+		print "<thead>\n<tr>\n";
+		print "<th></th>\n";	
+		print "<th>".getMLText('name')."</th>\n";	
+		print "<th>".getMLText('version')."</th>\n";	
+		print "<th>".getMLText('author')."</th>\n";	
+		print "<th></th>\n";	
+		print "</tr></thead><tbody>\n";
+		$list = $extmgr->getExtensionListByName($extname);
+		foreach($list as $re) {
+			$extmgr->checkExtension($re);
+			$checkmsgs = $extmgr->getErrorMsgs();
+			$needsupdate = !isset($GLOBALS['EXT_CONF'][$re['name']]) || SeedDMS_Extension_Mgr::cmpVersion($re['version'], $GLOBALS['EXT_CONF'][$re['name']]['version']) > 0;
+			echo "<tr";
+			if(isset($GLOBALS['EXT_CONF'][$re['name']])) {
+				if($needsupdate)
+					echo " class=\"warning\"";
+				else
+					echo " class=\"success\"";
+			}
+			echo ">";
+			echo "<td width=\"32\">".($re['icon-data'] ? '<img width="32" height="32" alt="'.$re['name'].'" title="'.$re['name'].'" src="'.$re['icon-data'].'">' : '')."</td>";
+			echo "<td>".$re['title']."<br /><small>".$re['description']."</small>";
+			if($checkmsgs)
+				echo "<div><img src=\"".$this->getImgPath("attention.gif")."\"> ".implode('<br /><img src="'.$this->getImgPath("attention.gif").'"> ', $checkmsgs)."</div>";
+			echo "</td>";
+			echo "<td nowrap>".$re['version']."<br /><small>".$re['releasedate']."</small></td>";
+			echo "<td nowrap>".$re['author']['name']."<br /><small>".$re['author']['company']."</small></td>";
+			echo "<td nowrap>";
+			echo "<div class=\"list-action\">";
+			if(!$checkmsgs && $extmgr->isWritableExtDir())
+				echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$re['name']."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"currenttab\" value=\"repository\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$re['name']."\" title=\"".getMLText('import_extension')."\"><i class=\"icon-download\"></i></a></form>";
+			echo "</div>";
+			echo "</td>";
+			echo "</tr>";
+		}	
+		echo "</tbody></table>\n";
+	} /* }}} */
+
+	function changelog() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$extdir = $this->params['extdir'];
+		$extmgr = $this->params['extmgr'];
+		$extname = $this->params['extname'];
+
+		if(isset($GLOBALS['EXT_CONF'][$extname])) {
+			$extconf = $GLOBALS['EXT_CONF'][$extname];
+			if(!empty($extconf['changelog']) && file_exists($extdir."/".$extname."/".$extconf['changelog'])) {
+				echo '<div style="white-space: pre-wrap; font-family: monospace; padding: 0px;">'.file_get_contents($extdir."/".$extname."/".$extconf['changelog'])."</div>";
+			}
+		}
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -140,9 +200,6 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 				echo "<img width=\"32\" height=\"32\" src=\"".$httproot."ext/".$extname."/".$extconf['icon']."\" alt=\"".$extname."\" title=\"".$extname."\">";
 			echo "</td>";
 			echo "<td>".$extconf['title'];
-			if(!empty($extconf['changelog']) && file_exists($extdir."/".$extname."/".$extconf['changelog'])) {
-				echo $this->printPopupBox("<i class=\"icon-reorder\"></i>", '<div style="white-space: pre-wrap; font-family: monospace; padding: 0px;">'.file_get_contents($extdir."/".$extname."/".$extconf['changelog'])."</div>", true);
-			}
 			echo "<br /><small>".$extconf['description']."</small>";
 			if($errmsgs)
 				echo "<div><img src=\"".$this->getImgPath("attention.gif")."\"> ".implode('<br /><img src="'.$this->getImgPath("attention.gif").'"> ', $errmsgs)."</div>";
@@ -153,6 +210,9 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			echo "<td nowrap><a href=\"mailto:".$extconf['author']['email']."\">".$extconf['author']['name']."</a><br /><small>".$extconf['author']['company']."</small></td>";
 			echo "<td nowrap>";
 			echo "<div class=\"list-action\">";
+			if(!empty($extconf['changelog']) && file_exists($extdir."/".$extname."/".$extconf['changelog'])) {
+				echo "<a data-target=\"#extensionChangelog\" href=\"../out/out.ExtensionMgr.php?action=changelog&extensionname=".$extname."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_changelog')."\"><i class=\"icon-reorder\"></i></a>\n";
+			}
 			if($extconf['config'])
 				echo "<a href=\"../out/out.Settings.php?currenttab=extensions#".$extname."\" title=\"".getMLText('configure_extension')."\"><i class=\"icon-cogs\"></i></a>";
 			echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$extname."-download\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"download\" /><input type=\"hidden\" name=\"extname\" value=\"".$extname."\" /><a class=\"download\" data-extname=\"".$extname."\" title=\"".getMLText('download_extension')."\"><i class=\"icon-download\"></i></a></form>";
@@ -196,7 +256,8 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			}
 			echo ">";
 			echo "<td width=\"32\">".($re['icon-data'] ? '<img width="32" height="32" alt="'.$re['name'].'" title="'.$re['name'].'" src="'.$re['icon-data'].'">' : '')."</td>";
-			echo "<td>".$re['title']."<br /><small>".$re['description']."</small>";
+			echo "<td>".$re['title'];
+			echo "<br /><small>".$re['description']."</small>";
 			if($checkmsgs)
 				echo "<div><img src=\"".$this->getImgPath("attention.gif")."\"> ".implode('<br /><img src="'.$this->getImgPath("attention.gif").'"> ', $checkmsgs)."</div>";
 			echo "</td>";
@@ -204,6 +265,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			echo "<td nowrap>".$re['author']['name']."<br /><small>".$re['author']['company']."</small></td>";
 			echo "<td nowrap>";
 			echo "<div class=\"list-action\">";
+			echo "<a data-target=\"#extensionInfo\" href=\"../out/out.ExtensionMgr.php?action=info&extensionname=".$re['name']."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_version_list')."\"><i class=\"icon-list-ol\"></i></a>\n";
 			if(!$checkmsgs && $extmgr->isWritableExtDir())
 				echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$re['name']."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"currenttab\" value=\"repository\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$re['name']."\" title=\"".getMLText('import_extension')."\"><i class=\"icon-download\"></i></a></form>";
 			echo "</div>";
@@ -224,7 +286,32 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			</div>
 		</div>
   </div>
- </div>
+</div>
+<div class="modal modal-wide hide" id="extensionInfo" tabindex="-1" role="dialog" aria-labelledby="extensionInfoLabel" aria-hidden="true">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    <h3 id="extensionInfoLabel"><?= getMLText("extension_version_list") ?></h3>
+  </div>
+  <div class="modal-body">
+		<p><?php printMLText('extension_loading') ?></p>
+  </div>
+  <div class="modal-footer">
+    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true"><?php printMLText("close") ?></button>
+  </div>
+</div>
+<div class="modal modal-wide hide" id="extensionChangelog" tabindex="-1" role="dialog" aria-labelledby="extensionChangelogLabel" aria-hidden="true">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    <h3 id="extensionChangelogLabel"><?= getMLText("extension_changelog") ?></h3>
+  </div>
+  <div class="modal-body">
+		<p><?php printMLText('extension_loading') ?></p>
+  </div>
+  <div class="modal-footer">
+    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true"><?php printMLText("close") ?></button>
+  </div>
+</div>
+
 <?php
 		$this->contentEnd();
 		$this->htmlEndPage();

From 15ef8c821a3d52ab15a6651f1d8a1d040cd2e2fd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 23 Mar 2018 10:12:20 +0100
Subject: [PATCH 099/147] new phrases, more french translations

---
 languages/ar_EG/lang.inc |  5 ++++
 languages/bg_BG/lang.inc |  5 ++++
 languages/ca_ES/lang.inc |  5 ++++
 languages/cs_CZ/lang.inc |  5 ++++
 languages/de_DE/lang.inc |  7 +++++-
 languages/el_GR/lang.inc |  5 ++++
 languages/en_GB/lang.inc |  7 +++++-
 languages/es_ES/lang.inc |  5 ++++
 languages/fr_FR/lang.inc | 49 ++++++++++++++++++++++++++++------------
 languages/hr_HR/lang.inc |  5 ++++
 languages/hu_HU/lang.inc |  5 ++++
 languages/it_IT/lang.inc |  5 ++++
 languages/ko_KR/lang.inc |  5 ++++
 languages/nl_NL/lang.inc |  5 ++++
 languages/pl_PL/lang.inc |  5 ++++
 languages/pt_BR/lang.inc | 11 ++++++---
 languages/ro_RO/lang.inc |  5 ++++
 languages/ru_RU/lang.inc |  5 ++++
 languages/sk_SK/lang.inc |  5 ++++
 languages/sv_SE/lang.inc |  5 ++++
 languages/tr_TR/lang.inc |  5 ++++
 languages/uk_UA/lang.inc |  5 ++++
 languages/zh_CN/lang.inc |  5 ++++
 languages/zh_TW/lang.inc |  5 ++++
 24 files changed, 154 insertions(+), 20 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 1763361f2..888bc5f6c 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -499,10 +499,13 @@ URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - تم تغيير تاريخ الصلاحية',
 'export' => '',
 'extension_archive' => '',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => 'ﺇﺩﺍﺭﺓ ﺍﻼﻣﺩﺍﺩﺎﺗ',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
+'extension_version_list' => '',
 'february' => 'فبراير',
 'file' => 'ملف',
 'files' => 'ملفات',
@@ -1438,6 +1441,8 @@ URL: [url]',
 'set_owner_error' => 'خطأ في تحديد المالك',
 'set_password' => 'تحديد كلمة السر',
 'set_workflow' => 'تحديد مسار العمل',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => 'تسجيل الدخول بإسم',
 'sign_in' => 'تسجيل الدخول',
 'sign_out' => 'تسجيل الخروج',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 16f3f6e4b..68fd60e65 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -448,10 +448,13 @@ $text = array(
 'expiry_changed_email_subject' => '',
 'export' => '',
 'extension_archive' => '',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => 'управление на добавките',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
+'extension_version_list' => '',
 'february' => 'Февруари',
 'file' => 'Файл',
 'files' => 'Файлове',
@@ -1301,6 +1304,8 @@ $text = array(
 'set_owner_error' => 'Грешка при установяване на собственика',
 'set_password' => 'Установи парола',
 'set_workflow' => 'Установи процес',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => 'Вход като',
 'sign_in' => 'вход',
 'sign_out' => 'изход',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index d2cdba1ca..44ef3f810 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -453,10 +453,13 @@ URL: [url]',
 'expiry_changed_email_subject' => '',
 'export' => '',
 'extension_archive' => '',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => 'Gestiona les Extensions',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
+'extension_version_list' => '',
 'february' => 'Febrer',
 'file' => 'Fitxer',
 'files' => 'Fitxers',
@@ -1306,6 +1309,8 @@ URL: [url]',
 'set_owner_error' => 'Error a l\'establir el propietari/a',
 'set_password' => '',
 'set_workflow' => '',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => 'Connectat com',
 'sign_in' => 'sign in',
 'sign_out' => 'desconnectar',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 6dc205388..8eeda817a 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -506,10 +506,13 @@ URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Datum ukončení platnosti změněn',
 'export' => '',
 'extension_archive' => '',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => 'Správa rozšíření',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
+'extension_version_list' => '',
 'february' => 'Únor',
 'file' => 'Soubor',
 'files' => 'Soubory',
@@ -1447,6 +1450,8 @@ URL: [url]',
 'set_owner_error' => 'Chybné nastavení vlastníka',
 'set_password' => 'Nastavení hesla',
 'set_workflow' => 'Nastavení pracovního postupu',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => 'Přihlášen jako',
 'sign_in' => 'Přihlásit',
 'sign_out' => 'Odhlásit',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 126897b0c..40e3eae39 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 (2582), dgrutsch (22)
+//    Translators: Admin (2588), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -529,10 +529,13 @@ URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Ablaufdatum geändert',
 'export' => 'Export',
 'extension_archive' => 'Erweiterung',
+'extension_changelog' => 'Versionshistorie',
+'extension_loading' => 'Lade Erweiterungen ...',
 'extension_manager' => 'Erweiterungen verwalten',
 'extension_mgr_installed' => 'Installiert',
 'extension_mgr_no_upload' => 'Der Upload neuer Erweiterungen ist nicht möglich, weil das Verzeichnis für Erweiterungen nicht beschreibbar ist.',
 'extension_mgr_repository' => 'Verfügbar',
+'extension_version_list' => 'Versionen',
 'february' => 'Februar',
 'file' => 'Datei',
 'files' => 'Dateien',
@@ -1527,6 +1530,8 @@ Name: [username]
 'set_owner_error' => 'Fehler beim Setzen des Besitzers',
 'set_password' => 'Passwort setzen',
 'set_workflow' => 'Workflow zuweisen',
+'show_extension_changelog' => 'Zeige Versionshistorie',
+'show_extension_version_list' => 'Zeige Liste der Versionen',
 'signed_in_as' => 'Angemeldet als',
 'sign_in' => 'Anmelden',
 'sign_out' => 'Abmelden',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 19a41c2fe..b753e1024 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -448,10 +448,13 @@ $text = array(
 'expiry_changed_email_subject' => '',
 'export' => '',
 'extension_archive' => '',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => '',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
+'extension_version_list' => '',
 'february' => 'Φεβρουάριος',
 'file' => 'Αρχείο',
 'files' => 'Αρχεία',
@@ -1312,6 +1315,8 @@ URL: [url]',
 'set_owner_error' => '',
 'set_password' => '',
 'set_workflow' => '',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => 'Σύνδεση σαν',
 'sign_in' => 'Σύνδεση',
 'sign_out' => 'Αποσύνδεση',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index b3b1469e1..cefc2b1ca 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 (1696), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1701), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -530,10 +530,13 @@ URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Expiry date changed',
 'export' => 'Export',
 'extension_archive' => 'Extension',
+'extension_changelog' => 'Changelog',
+'extension_loading' => 'Loading extensions ...',
 'extension_manager' => 'Manage extensions',
 'extension_mgr_installed' => 'Installed',
 'extension_mgr_no_upload' => 'Uploading new extensions is not possible because the extentension directory is not writable.',
 'extension_mgr_repository' => 'Available',
+'extension_version_list' => 'Versions',
 'february' => 'February',
 'file' => 'File',
 'files' => 'Files',
@@ -1522,6 +1525,8 @@ Name: [username]
 'set_owner_error' => 'Error setting owner',
 'set_password' => 'Set Password',
 'set_workflow' => 'Set Workflow',
+'show_extension_changelog' => 'Show Changelog',
+'show_extension_version_list' => 'Show list of versions',
 'signed_in_as' => 'Signed in as',
 'sign_in' => 'Sign in',
 'sign_out' => 'Sign out',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 10c302cc6..ec79de3b8 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -506,10 +506,13 @@ URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Fecha de caducidad modificada',
 'export' => '',
 'extension_archive' => '',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => 'Administrar extensiones',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
+'extension_version_list' => '',
 'february' => 'Febrero',
 'file' => 'Fichero',
 'files' => 'Ficheros',
@@ -1453,6 +1456,8 @@ URL: [url]',
 'set_owner_error' => 'Error estableciendo propietario',
 'set_password' => 'Establecer contraseña',
 'set_workflow' => 'Establecer Flujo de Trabajo',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => 'Conectado como',
 'sign_in' => 'Conectar',
 'sign_out' => 'Salir',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 96fef1ac4..836664ea5 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1080), jeromerobert (50), lonnnew (9), Oudiceval (660)
+//    Translators: Admin (1080), jeromerobert (50), lonnnew (9), Oudiceval (674)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -271,7 +271,7 @@ URL: [url]',
 'comment' => 'Commentaire',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Commentaires pour la version actuelle',
-'configure_extension' => '',
+'configure_extension' => 'Configurer l’extension',
 'confirm_clear_cache' => 'Confirmer l\'effacement du cache',
 'confirm_create_fulltext_index' => 'Oui, je souhaite recréer l\'index de recherche plein texte !',
 'confirm_move_document' => 'Veuillez confirmer le déplacement du document.',
@@ -350,8 +350,15 @@ URL: [url]',
 'documents_with_notification' => 'Documents avec notification',
 'document_already_checkedout' => 'Ce document est déjà débloqué',
 'document_already_locked' => 'Ce document est déjà verrouillé',
-'document_attribute_changed_email_body' => '',
-'document_attribute_changed_email_subject' => '',
+'document_attribute_changed_email_body' => 'Attribut modifié
+Document : [name]
+Attribut : [attribute_name]
+Ancienne valeur : [attribute_old_value]
+Nouvelle valeur : [attribute_new_value]
+Dossier parent : [folder_path]
+Utilisateur : [username]
+URL : [url]',
+'document_attribute_changed_email_subject' => '[sitename] : [name] - Attribut modifié',
 'document_comment_changed_email' => 'Commentaire modifié',
 'document_comment_changed_email_body' => 'Commentaire modifié
 Document: [name]
@@ -421,7 +428,7 @@ URL: [url]',
 'does_not_expire' => 'N\'expire jamais',
 'does_not_inherit_access_msg' => 'Accès hérité',
 'download' => 'Téléchargement',
-'download_extension' => '',
+'download_extension' => 'Télécharger l’extension en tant que fichier zip',
 'download_links' => 'Liens de téléchargement',
 'download_link_email_body' => 'Cliquez sur le lien suivant pour télécharger la version [version] du document
 « [docname] ».
@@ -522,11 +529,14 @@ Utilisateur : [username]
 URL : [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Date d\'expiration modifiée',
 'export' => '',
-'extension_archive' => '',
+'extension_archive' => 'Extension',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => 'Gestionnaire d\'extensions',
-'extension_mgr_installed' => '',
-'extension_mgr_no_upload' => '',
-'extension_mgr_repository' => '',
+'extension_mgr_installed' => 'Installées',
+'extension_mgr_no_upload' => 'L’ajout de nouvelles extensions n’est pas possible car le répertoire des extensions n’est pas accessible en écriture.',
+'extension_mgr_repository' => 'Disponibles',
+'extension_version_list' => '',
 'february' => 'Février',
 'file' => 'Fichier',
 'files' => 'Fichiers',
@@ -540,8 +550,15 @@ URL : [url]',
 'folders' => 'Dossiers',
 'folders_and_documents_statistic' => 'Aperçu du contenu',
 'folders_with_notification' => 'Dossiers avec notification',
-'folder_attribute_changed_email_body' => '',
-'folder_attribute_changed_email_subject' => '',
+'folder_attribute_changed_email_body' => 'Attribut modifié
+Dossier : [name]
+Attribut : [attribute_name]
+Ancienne valeur : [attribute_old_value]
+Nouvelle valeur : [attribute_new_value]
+Dossier parent : [folder_path]
+Utilisateur : [username]
+URL : [url]',
+'folder_attribute_changed_email_subject' => '[sitename] : [name] - Attribut modifié',
 'folder_comment_changed_email' => 'Commentaire changé',
 'folder_comment_changed_email_body' => 'Commentaire changé
 Dossier: [name]
@@ -618,7 +635,7 @@ URL: [url]',
 'identical_version' => 'Nouvelle version identique à l\'actuelle.',
 'import' => 'Importer',
 'importfs' => 'Importer depuis le système de fichiers',
-'import_extension' => '',
+'import_extension' => 'Importer l’extension',
 'import_fs' => 'Importer depuis le système de fichiers',
 'import_fs_warning' => 'L’importation peut se faire à partir du dossier de dépôt personnel uniquement. Tous les sous-dossiers et fichiers seront importés. Les fichiers seront immédiatement publiés.',
 'include_content' => 'Inclure le contenu',
@@ -714,7 +731,7 @@ URL: [url]',
 'local_file' => 'Fichier local',
 'locked_by' => 'Verrouillé par',
 'lock_document' => 'Verrouiller',
-'lock_message' => 'Ce document a été verrouillé par [username]. Seuls les utilisateurs autorisés peuvent déverrouiller ce document (voir fin de page).',
+'lock_message' => 'Ce document a été verrouillé par [username]. Seuls les utilisateurs autorisés peuvent déverrouiller ce document.',
 'lock_status' => 'Statut',
 'login' => 'Identification',
 'login_disabled_text' => 'Votre compte est désactivé, sans doute à cause de trop nombreuses connexions qui ont échoué.',
@@ -1492,6 +1509,8 @@ Nom : [username]
 'set_owner_error' => 'Erreur lors de la définition du propriétaire',
 'set_password' => 'Définir mot de passe',
 'set_workflow' => 'Définir le Workflow',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => 'Connecté en tant que',
 'sign_in' => 'Connexion',
 'sign_out' => 'Déconnexion',
@@ -1525,8 +1544,8 @@ Nom : [username]
 '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_send_download_link' => 'Erreur lors de l’envoi du lien de téléchargement',
-'splash_extension_import' => '',
-'splash_extension_refresh' => '',
+'splash_extension_import' => 'Extension installée',
+'splash_extension_refresh' => 'Liste des extensions actualisée',
 'splash_folder_edited' => 'Dossier modifié',
 'splash_importfs' => '[docs] documents et [folders] dossiers importés',
 'splash_inherit_access' => 'Droits d’accès hérités',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 4cb825653..1cb2b3031 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -511,10 +511,13 @@ Internet poveznica: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Promijenjen datum isteka',
 'export' => 'Izvoz',
 'extension_archive' => '',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => 'Upravljanje ekstenzijama',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
+'extension_version_list' => '',
 'february' => 'Veljača',
 'file' => 'Datoteka',
 'files' => 'Datoteke',
@@ -1474,6 +1477,8 @@ Internet poveznica: [url]',
 'set_owner_error' => 'Greška pri postavljanju vlasnika',
 'set_password' => 'Postavi lozinku',
 'set_workflow' => 'Postavi tok rada',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => 'Prijavljen kao',
 'sign_in' => 'Prijava u sustav',
 'sign_out' => 'Odjava',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 4b3cf4674..1e70228d0 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -506,10 +506,13 @@ URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Lejárati dátum módosítva',
 'export' => '',
 'extension_archive' => '',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => 'Bővítmények kezelése',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
+'extension_version_list' => '',
 'february' => 'Február',
 'file' => 'Állomány',
 'files' => 'Állományok',
@@ -1452,6 +1455,8 @@ URL: [url]',
 'set_owner_error' => 'Hiba a tulajdonos beállításakor',
 'set_password' => 'Jelszó beállítása',
 'set_workflow' => 'Munkafolyamat beállítása',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => 'Bejelentkezve mint',
 'sign_in' => 'Bejelentkezés',
 'sign_out' => 'Kijelentkezés',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 44405c26f..a5a58dd01 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -512,10 +512,13 @@ URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Scadenza cambiata',
 'export' => 'Esporta',
 'extension_archive' => '',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => 'Gestisci le estensioni dei files',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
+'extension_version_list' => '',
 'february' => 'Febbraio',
 'file' => 'File',
 'files' => 'Files',
@@ -1486,6 +1489,8 @@ URL: [url]',
 'set_owner_error' => 'Errore nell\'impostazione del proprietario',
 'set_password' => 'Imposta Password',
 'set_workflow' => 'Imposta il flusso di lavoro',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => 'Utente',
 'sign_in' => 'Accesso',
 'sign_out' => 'Disconnettiti',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 422d4158f..1c017124d 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -512,10 +512,13 @@ URL: [url]',
 'expiry_changed_email_subject' => '[sitename] : [name] - 유효 기간 변경',
 'export' => '내보내기',
 'extension_archive' => '',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => '확장자 관리',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
+'extension_version_list' => '',
 'february' => '2월',
 'file' => '파일',
 'files' => '파일',
@@ -1468,6 +1471,8 @@ URL : [url]',
 'set_owner_error' => '소유자 설정 오류',
 'set_password' => '비밀번호 설정',
 'set_workflow' => '워크플로우 설정',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => '로그인',
 'sign_in' => '로그인',
 'sign_out' => '로그 아웃',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index ce5133cde..04cf9446c 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -511,10 +511,13 @@ URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Vervaldatum gewijzigd',
 'export' => 'export',
 'extension_archive' => '',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => 'Beheer uitbreidingen',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
+'extension_version_list' => '',
 'february' => 'februari',
 'file' => 'Bestand',
 'files' => 'Bestanden',
@@ -1498,6 +1501,8 @@ Name: [username]
 'set_owner_error' => 'Fout bij instellen eigenaar',
 'set_password' => 'Stel wachtwoord in',
 'set_workflow' => 'Stel workflow in',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => 'Ingelogd als:',
 'sign_in' => 'Log in',
 'sign_out' => 'Log uit',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 025c1024d..f5dfbc1a7 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -499,10 +499,13 @@ URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Zmiana daty wygaśnięcia',
 'export' => '',
 'extension_archive' => '',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => 'Zarządzanie rozszerzeniami',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
+'extension_version_list' => '',
 'february' => 'Luty',
 'file' => 'Plik',
 'files' => 'Pliki',
@@ -1432,6 +1435,8 @@ URL: [url]',
 'set_owner_error' => 'Błąd podczas ustawiania właściciela',
 'set_password' => 'Zmień hasło',
 'set_workflow' => 'Ustaw proces',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => 'Zalogowany jako',
 'sign_in' => 'Zaloguj się',
 'sign_out' => 'Wyloguj',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 67a5e87a4..9e100c3a3 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (974), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (976), flaviove (627), lfcristofoli (352)
 
 $text = array(
 '2_factor_auth' => '',
@@ -291,8 +291,8 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Conteúdo',
 'continue' => 'Continue',
-'converter_new_cmd' => '',
-'converter_new_mimetype' => '',
+'converter_new_cmd' => 'Comando',
+'converter_new_mimetype' => 'Novo mimetype',
 'copied_to_checkout_as' => '',
 'create_download_link' => '',
 'create_fulltext_index' => 'Criar índice de texto completo',
@@ -505,10 +505,13 @@ URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Data de validade mudou',
 'export' => '',
 'extension_archive' => '',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => 'Gerenciar extensões',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
+'extension_version_list' => '',
 'february' => 'February',
 'file' => 'Arquivo',
 'files' => 'Arquivos',
@@ -1450,6 +1453,8 @@ URL: [url]',
 'set_owner_error' => 'Proprietário configuração de erro',
 'set_password' => 'Definir Senha',
 'set_workflow' => 'Definir fluxo de trabalho',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => 'Logado como',
 'sign_in' => 'Entrar',
 'sign_out' => 'Sair',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 620912d97..40c934602 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -511,10 +511,13 @@ URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Data de expirare schimbată',
 'export' => '',
 'extension_archive' => '',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => 'Gestionați extensiile',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
+'extension_version_list' => '',
 'february' => 'Februarie',
 'file' => 'Fișier',
 'files' => 'Fișiere',
@@ -1475,6 +1478,8 @@ URL: [url]',
 'set_owner_error' => 'Eroare setare proprietar',
 'set_password' => 'Setare Parolă',
 'set_workflow' => 'Setare Workflow',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => 'Autentificat ca',
 'sign_in' => 'Sign in',
 'sign_out' => 'Sign out',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index b55571d44..3e7ef96da 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -511,10 +511,13 @@ URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: изменен срок действия для «[name]»',
 'export' => 'Экспорт',
 'extension_archive' => '',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => 'Управление расширениями',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
+'extension_version_list' => '',
 'february' => 'Февраль',
 'file' => 'Файл',
 'files' => 'Файлы',
@@ -1482,6 +1485,8 @@ URL: [url]',
 'set_owner_error' => 'Ошибка при установке владельца',
 'set_password' => 'Установить пароль',
 'set_workflow' => 'Установить процесс',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => 'Пользователь',
 'sign_in' => 'Войти',
 'sign_out' => 'Выйти',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 148ee5541..2f0c1dfdb 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -460,10 +460,13 @@ URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Dátum vypršania platnosti bol zmenený',
 'export' => 'Exportovať',
 'extension_archive' => '',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => 'Správa rozšírení',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
+'extension_version_list' => '',
 'february' => 'Február',
 'file' => 'Súbor',
 'files' => 'Súbory',
@@ -1313,6 +1316,8 @@ URL: [url]',
 'set_owner_error' => '',
 'set_password' => 'Nastaviť heslo',
 'set_workflow' => '',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => 'Prihlásený ako',
 'sign_in' => 'Prihlásiť sa',
 'sign_out' => 'odhlásiť',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index b70864a21..fb1e4a92e 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -524,10 +524,13 @@ URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Utgångsdatum ändrat',
 'export' => 'Exportera',
 'extension_archive' => '',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => 'Hantera tillägg',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
+'extension_version_list' => '',
 'february' => 'februari',
 'file' => 'Fil',
 'files' => 'Filer',
@@ -1495,6 +1498,8 @@ Kommentar: [comment]',
 'set_owner_error' => 'Fel vid val av ägare',
 'set_password' => 'Ange lösenord',
 'set_workflow' => 'Välj arbetsflöde',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => 'Inloggad som',
 'sign_in' => 'Logga in',
 'sign_out' => 'Logga ut',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 0423f42c4..105cdfd20 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -505,10 +505,13 @@ URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Bitiş tarihi değişti',
 'export' => '',
 'extension_archive' => '',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => 'Uzantıları düzenle',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
+'extension_version_list' => '',
 'february' => 'Şubat',
 'file' => 'Dosya',
 'files' => 'Dosyalar',
@@ -1454,6 +1457,8 @@ URL: [url]',
 'set_owner_error' => 'Sahip belirlenirken hata oluştu',
 'set_password' => 'Parola Belirle',
 'set_workflow' => 'İş Akışı Tanımla',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => 'Giriş yapan kullanıcı',
 'sign_in' => 'Giriş',
 'sign_out' => 'Çıkış',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 05f7b196b..da0478502 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -511,10 +511,13 @@ URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: зміна дати терміну виконання для «[name]»',
 'export' => 'Експорт',
 'extension_archive' => '',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => 'Керування розширеннями',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
+'extension_version_list' => '',
 'february' => 'Лютий',
 'file' => 'Файл',
 'files' => 'Файли',
@@ -1475,6 +1478,8 @@ URL: [url]',
 'set_owner_error' => 'Помилка при призначенні власника',
 'set_password' => 'Встановити пароль',
 'set_workflow' => 'Вказати процес',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => 'Користувач',
 'sign_in' => 'Увійти',
 'sign_out' => 'Вийти',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 8557a97ed..ae14519de 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -507,10 +507,13 @@ URL: [url]',
 'expiry_changed_email_subject' => '',
 'export' => '导出',
 'extension_archive' => '',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => '扩展管理器',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
+'extension_version_list' => '',
 'february' => '二 月',
 'file' => '文件',
 'files' => '文件',
@@ -1456,6 +1459,8 @@ URL: [url]',
 'set_owner_error' => '错误 设置所有者',
 'set_password' => '设定密码',
 'set_workflow' => '',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => '登录为',
 'sign_in' => '登录',
 'sign_out' => '登出',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 00b71044c..2eecaa529 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -452,10 +452,13 @@ URL: [url]',
 'expiry_changed_email_subject' => '',
 'export' => '',
 'extension_archive' => '',
+'extension_changelog' => '',
+'extension_loading' => '',
 'extension_manager' => '整體索引進度',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
+'extension_version_list' => '',
 'february' => '二 月',
 'file' => '文件',
 'files' => '文件',
@@ -1305,6 +1308,8 @@ URL: [url]',
 'set_owner_error' => '錯誤 設置所有者',
 'set_password' => '',
 'set_workflow' => '',
+'show_extension_changelog' => '',
+'show_extension_version_list' => '',
 'signed_in_as' => '登錄為',
 'sign_in' => '',
 'sign_out' => '登出',

From 59d56ea49861eaebb2afef1c1a87649eb5e51bbe Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 23 Mar 2018 17:45:32 +0100
Subject: [PATCH 100/147] add target to create repository

---
 Makefile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 696af4d6c..dad42bf62 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,16 @@ webapp:
 	(cd tmp; tar --exclude=.svn -czvf ../seeddms-webapp-$(VERSION).tar.gz seeddms-webapp-$(VERSION))
 	rm -rf tmp
 
+repository:
+	mkdir -p tmp/seeddms-repository-$(VERSION)
+	cp -a repository/www repository/utils repository/doc tmp/seeddms-repository-$(VERSION)
+	mkdir -p tmp/seeddms-repository-$(VERSION)/files
+	mkdir -p tmp/seeddms-repository-$(VERSION)/accounts
+	cp -a repository/files/.htaccess tmp/seeddms-repository-$(VERSION)/files
+	cp -a repository/accounts/.htaccess tmp/seeddms-repository-$(VERSION)/accounts
+	(cd tmp; tar --exclude=.svn -czvf ../seeddms-repository-$(VERSION).tar.gz seeddms-repository-$(VERSION))
+	rm -rf tmp
+
 dynamic_content.tar.gz: ext/dynamic_content
 	tar czvf dynamic_content.tar.gz ext/dynamic_content
 
@@ -53,4 +63,4 @@ doc:
 apidoc:
 	apigen  generate -s SeedDMS_Core --exclude tests -d html
 
-.PHONY: webdav webapp
+.PHONY: webdav webapp repository

From 06efeae431e09a8abc9f7ef02c16351fab9dc024 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 23 Mar 2018 17:52:07 +0100
Subject: [PATCH 101/147] do not remove user when transfering objects

---
 op/op.UsrMgr.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php
index ef5bb0270..e955f3a85 100644
--- a/op/op.UsrMgr.php
+++ b/op/op.UsrMgr.php
@@ -245,9 +245,6 @@ else if ($action == "transferobjects") {
 	}
 
 	$userToAssign = $dms->getUser($_POST["assignTo"]);
-	if (!$userToRemove->remove($user, $userToAssign)) {
-		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
-	}
 		
 //	if(isset($_POST["status"]) && is_array($_POST["status"]) && $_POST["status"]) {
 		if (!$userToRemove->transferDocumentsFolders($userToAssign)) {

From 3c411102d0b30a8fe71854d0c0ee7814486a69dd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 23 Mar 2018 17:52:44 +0100
Subject: [PATCH 102/147] add entry for 5.1.6

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

diff --git a/CHANGELOG b/CHANGELOG
index f547f9098..20b254c8f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@
 - fix sending notification when document attributes change
 - sending notification when folder attributes change
 - check if converters are set in out/out.ViewDocument.php at all (Closes #394)
+- do not remove user when transfering objects
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.6

From 939cbd7a5641c68ece2c99ce332bd9257012a07e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 10:00:20 +0200
Subject: [PATCH 103/147] make counted task in menu selectable

---
 inc/inc.ClassSettings.php          | 20 +++++++++++++++++++-
 op/op.Settings.php                 |  1 +
 views/bootstrap/class.Settings.php | 11 +++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index d6747c118..29f3f8ff0 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -214,6 +214,8 @@ class Settings { /* {{{ */
 	var $_enableClipboard = true;
 	// enable/disable list of tasks in main menu
 	var $_enableMenuTasks = true;
+	// select which tasks show up in main menu
+	var $_tasksInMenu = array();
 	// enable/disable list of files in drop folder
 	var $_enableDropFolderList = false;
 	// enable/disable display of the session list
@@ -379,6 +381,18 @@ class Settings { /* {{{ */
 		return $out;
 	} /* }}} */
 
+	/**
+	 * Check if a variable is a string and returns an array
+	 *
+	 * @param array $var value
+	 * @return true/false
+	 */
+	function arrayVal($var) { /* {{{ */
+		if((string) $var)
+			return explode(';', $var);
+		return array();
+	} /* }}} */
+
 	/**
 	 * set $_viewOnlineFileTypes
 	 *
@@ -473,6 +487,7 @@ class Settings { /* {{{ */
 		$this->_enableSessionList = Settings::boolVal($tab["enableSessionList"]);
 		$this->_enableClipboard = Settings::boolVal($tab["enableClipboard"]);
 		$this->_enableMenuTasks = Settings::boolVal($tab["enableMenuTasks"]);
+		$this->_tasksInMenu = Settings::arrayVal($tab["tasksInMenu"]);
 		$this->_enableDropFolderList = Settings::boolVal($tab["enableDropFolderList"]);
 		$this->_enableDropUpload = Settings::boolVal($tab["enableDropUpload"]);
 		$this->_enableMultiUpload = Settings::boolVal($tab["enableMultiUpload"]);
@@ -733,7 +748,9 @@ class Settings { /* {{{ */
         $attributValue = "true";
       else
         $attributValue = "false";
-    }
+		} elseif(is_array($attributValue)) {
+			$attributValue = implode(';', $attributValue);
+		}
 
     if (isset($node[$attributName])) {
       $node[$attributName] = $attributValue;
@@ -808,6 +825,7 @@ class Settings { /* {{{ */
 		$this->setXMLAttributValue($node, "enableSessionList", $this->_enableSessionList);
 		$this->setXMLAttributValue($node, "enableClipboard", $this->_enableClipboard);
 		$this->setXMLAttributValue($node, "enableMenuTasks", $this->_enableMenuTasks);
+		$this->setXMLAttributValue($node, "tasksInMenu", $this->_tasksInMenu);
 		$this->setXMLAttributValue($node, "enableDropFolderList", $this->_enableDropFolderList);
 		$this->setXMLAttributValue($node, "enableDropUpload", $this->_enableDropUpload);
 		$this->setXMLAttributValue($node, "enableMultiUpload", $this->_enableMultiUpload);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 8c8aec43b..e16129949 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -88,6 +88,7 @@ if ($action == "saveSettings")
   $settings->_enableSessionList = getBoolValue("enableSessionList");
   $settings->_enableClipboard = getBoolValue("enableClipboard");
   $settings->_enableMenuTasks = getBoolValue("enableMenuTasks");
+  $settings->_tasksInMenu = $_POST["tasksInMenu"];
   $settings->_enableDropFolderList = getBoolValue("enableDropFolderList");
   $settings->_enableDropUpload = getBoolValue("enableDropUpload");
   $settings->_enableMultiUpload = getBoolValue("enableMultiUpload");
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 1d924fcf4..748638bda 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -288,6 +288,17 @@ if(!is_writeable($settings->_configFilePath)) {
 	    <tr title="<?php printMLText("settings_enableMenuTasks_desc");?>">
         <td><?php printMLText("settings_enableMenuTasks");?>:</td>
         <td><input name="enableMenuTasks" type="checkbox" <?php if ($settings->_enableMenuTasks) echo "checked" ?> /></td>
+      </tr>
+	    <tr title="<?php printMLText("settings_tasksInMenu_desc");?>">
+        <td><?php printMLText("settings_tasksInMenu");?>:</td>
+				<td>
+				  <select name="tasksInMenu[]" multiple>
+					  <option value="review" <?php if (in_array('review', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_review");?></option>
+					  <option value="approval" <?php if (in_array('approval', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_approval");?></option>
+					  <option value="receipt" <?php if (in_array('receipt', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_receipt");?></option>
+					  <option value="revision" <?php if (in_array('revision', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_revision");?></option>
+					</select>
+				</td>
       </tr>
 	    <tr title="<?php printMLText("settings_enableDropFolderList_desc");?>">
         <td><?php printMLText("settings_enableDropFolderList");?>:</td>

From fb9d04a3a9af54f6c846661009b82b7ea30a58e5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 10:00:53 +0200
Subject: [PATCH 104/147] pass _tasksInMenu to view

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

diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php
index 6a4031449..ee4930d4e 100644
--- a/inc/inc.ClassUI.php
+++ b/inc/inc.ClassUI.php
@@ -105,6 +105,7 @@ class UI extends UI_Default {
 			$view->setParam('enablelanguageselector', $settings->_enableLanguageSelector);
 			$view->setParam('enableclipboard', $settings->_enableClipboard);
 			$view->setParam('enablemenutasks', $settings->_enableMenuTasks);
+			$view->setParam('tasksinmenu', $settings->_tasksInMenu);
 			$view->setParam('enabledropfolderlist', $settings->_enableDropFolderList);
 			$view->setParam('dropfolderdir', $settings->_dropFolderDir);
 			$view->setParam('enablesessionlist', $settings->_enableSessionList);

From db66dff1919d783000b488f312aae95e402c588b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 10:02:58 +0200
Subject: [PATCH 105/147] reorder lists of documents

---
 views/bootstrap/class.MyDocuments.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 822f23534..cff5e9af7 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -708,18 +708,19 @@ $(document).ready( function() {
 		echo '<li class=""><a data-href="#documents_user_no_reception" data-action="listNoReceiveOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_no_reception").'</a></li>';
 		$resArr = $dms->getDocumentList('DraftOwner', $user);
 		echo '<li class=""><a data-href="#documents_user_draft" data-action="listDraftOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_draft").'</a></li>';
+		echo '</ul>';
+		$this->contentHeading(getMLText("documents_in_process"));
+		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
 		if($workflowmode == 'traditional') {
 			$resArr = $dms->getDocumentList('AppRevOwner', $user);
 			echo '<li class=""><a data-href="#documents_user_requiring_attention" data-action="listDocsToLookAt"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_requiring_attention").'</a></li>';
 			$resArr = $dms->getDocumentList('RejectOwner', $user);
 			echo '<li class=""><a data-href="#documents_user_rejected" data-action="listRejects"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_rejected").'</a></li>';
 		}
-		$resArr = $dms->getDocumentList('ExpiredOwner', $user);
-		echo '<li class=""><a data-href="#documents_user_expiration" data-action="listExpiredOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_expiration").'</a></li>';
-		$resArr = $dms->getDocumentList('ObsoleteOwner', $user);
-		echo '<li class=""><a data-href="#documents_user_obsolete" data-action="listObsoleteOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_obsolete").'</a></li>';
-		$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user);
-		echo '<li class=""><a data-href="#documents_user_needs_correction" data-action="listNeedsCorrectionOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_needs_correction").'</a></li>';
+		$resArr = $dms->getDocumentList('CheckedOutByMe', $user);
+		echo '<li class=""><a data-href="#documents_checked_out_by_you" data-action="listCheckedoutDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_checked_out_by_you").'</a></li>';
+		$resArr = $dms->getDocumentList('LockedByMe', $user);
+		echo '<li class=""><a data-href="#documents_locked_by_you" data-action="listLockedDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_locked_by_you").'</a></li>';
 		echo '</ul>';
 		$this->contentHeading(getMLText("tasks"));
 		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
@@ -738,13 +739,15 @@ $(document).ready( function() {
 		echo '<li class=""><a data-href="#documents_to_receipt" data-action="listReceipts"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_receipt").'</a></li>';
 		$resArr = $dms->getDocumentList('ReviseByMe', $user);
 		echo '<li class=""><a data-href="#documents_to_revise" data-action="listRevisions"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_revise").'</a></li>';
+		$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user);
+		echo '<li class=""><a data-href="#documents_user_needs_correction" data-action="listNeedsCorrectionOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_needs_correction").'</a></li>';
 		echo '</ul>';
-		$this->contentHeading(getMLText("misc"));
+		$this->contentHeading(getMLText("archive"));
 		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
-		$resArr = $dms->getDocumentList('LockedByMe', $user);
-		echo '<li class=""><a data-href="#documents_locked_by_you" data-action="listLockedDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_locked_by_you").'</a></li>';
-		$resArr = $dms->getDocumentList('CheckedOutByMe', $user);
-		echo '<li class=""><a data-href="#documents_checked_out_by_you" data-action="listCheckedoutDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_checked_out_by_you").'</a></li>';
+		$resArr = $dms->getDocumentList('ExpiredOwner', $user);
+		echo '<li class=""><a data-href="#documents_user_expiration" data-action="listExpiredOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_expiration").'</a></li>';
+		$resArr = $dms->getDocumentList('ObsoleteOwner', $user);
+		echo '<li class=""><a data-href="#documents_user_obsolete" data-action="listObsoleteOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_obsolete").'</a></li>';
 		echo '</ul>';
 		echo '</div>';
 		echo '<div class="span9">';

From 90bf0f13f480fac75d142a523577f6bb9e00e7ff Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 10:04:05 +0200
Subject: [PATCH 106/147] show counter for tasks only for selected tasks in
 configuration

---
 views/bootstrap/class.Tasks.php | 91 +++++++++++++++++++++------------
 1 file changed, 58 insertions(+), 33 deletions(-)

diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index 921e06539..846aa6219 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -39,43 +39,52 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 	private function __myTasks() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
-		$tasks['review'] = array();
-		$tasks['approval'] = array();
-		$tasks['receipt'] = array();
-		$tasks['revision'] = array();
-		$resArr = $dms->getDocumentList('ApproveByMe', $user);
-		if($resArr) {
-			foreach ($resArr as $res) {
-				$document = $dms->getDocument($res["id"]);
-				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-					$tasks['approval'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+		$tasksinmenu = $this->params['tasksinmenu'];
+		if(!$tasksinmenu || in_array('approval', $tasksinmenu)) {
+			$tasks['approval'] = array();
+			$resArr = $dms->getDocumentList('ApproveByMe', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['approval'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+					}
 				}
 			}
 		}
-		$resArr = $dms->getDocumentList('ReviewByMe', $user);
-		if($resArr) {
-			foreach ($resArr as $res) {
-				$document = $dms->getDocument($res["id"]);
-				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-					$tasks['review'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+		if(!$tasksinmenu || in_array('review', $tasksinmenu)) {
+			$tasks['review'] = array();
+			$resArr = $dms->getDocumentList('ReviewByMe', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['review'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+					}
 				}
 			}
 		}
-		$resArr = $dms->getDocumentList('ReceiptByMe', $user);
-		if($resArr) {
-			foreach ($resArr as $res) {
-				$document = $dms->getDocument($res["id"]);
-				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-					$tasks['receipt'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+		if(!$tasksinmenu || in_array('receipt', $tasksinmenu)) {
+			$tasks['receipt'] = array();
+			$resArr = $dms->getDocumentList('ReceiptByMe', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['receipt'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+					}
 				}
 			}
 		}
-		$resArr = $dms->getDocumentList('ReviseByMe', $user);
-		if($resArr) {
-			foreach ($resArr as $res) {
-				$document = $dms->getDocument($res["id"]);
-				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-					$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+		if(!$tasksinmenu || in_array('revision', $tasksinmenu)) {
+			$tasks['revision'] = array();
+			$resArr = $dms->getDocumentList('ReviseByMe', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+					}
 				}
 			}
 		}
@@ -135,13 +144,28 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 
 		$tasks = $this->__myTasks();
+		if(!$tasks)
+			return '';
 
 		$content = '';
 //		$content .= "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
 //		$content .= "    <li class=\"dropdown\">\n";
-		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." (".count($tasks['review'])."/".count($tasks['approval'])."/".count($tasks['receipt'])."/".count($tasks['revision']).") <i class=\"icon-caret-down\"></i></a>\n";
+		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." (";
+		$ct = array();
+		if(isset($tasks['review']))
+			$ct[] = count($tasks['review']);
+		if(isset($tasks['approval']))
+			$ct[] = count($tasks['approval']);
+		if(isset($tasks['receipt']))
+			$ct[] = count($tasks['receipt']);
+		if(isset($tasks['revision']))
+			$ct[] = count($tasks['revision']);
+		$content .= implode('/', $ct);
+		$content .= ")";
+		if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision'])) {
+		$content .= " <i class=\"icon-caret-down\"></i></a>\n";
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
-		if($tasks['review']) {
+		if(!empty($tasks['review'])) {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_review")."</a>\n";
 		$content .= "       <ul class=\"dropdown-menu\" role=\"menu\">\n";
@@ -152,7 +176,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
-		if($tasks['approval']) {
+		if(!empty($tasks['approval'])) {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_approve")."</a>\n";
 		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
@@ -163,7 +187,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
-		if($tasks['receipt']) {
+		if(!empty($tasks['receipt'])) {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_receipt")."</a>\n";
 		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
@@ -174,7 +198,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
-		if($tasks['revision']) {
+		if(!empty($tasks['revision'])) {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_revise")."</a>\n";
 		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
@@ -190,6 +214,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 			$content .= "    <li><a href=\"../out/out.MyDocuments.php\">".getMLText("my_documents")."</a></li>\n";
 		}
 		$content .= "     </ul>\n";
+		}
 //		$content .= "    </li>\n";
 //		$content .= "   </ul>\n";
 		echo $content;

From 5995286c17520ea743b789efc8b8acb10e47fa5e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 10:05:14 +0200
Subject: [PATCH 107/147] run js checkTasks() only if tasks in menu are turned
 on

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

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index f2a2edae6..8a79545f8 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -153,7 +153,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$tmp['action'] = 'webrootjs';
 		echo '<script src="'.$this->params['absbaseprefix'].'out/out.'.$this->params['class'].'.php?'.http_build_query($tmp).'"></script>'."\n";
 		echo '<script src="../styles/'.$this->theme.'/application.js"></script>'."\n";
-		if(isset($this->params['user']) && $this->params['user']) {
+		if($this->params['enablemenutasks'] && isset($this->params['user']) && $this->params['user']) {
 			$this->addFooterJS('checkTasks();');
 		}
 		if($this->footerjs) {

From b65badac62fb98497a049666794a194b0e3eae29 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 10:14:07 +0200
Subject: [PATCH 108/147] do not show task menu if there are no tasks

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

diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index 11c121d03..32eafd31a 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -104,7 +104,9 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content = '';
 //		$content .= "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
 //		$content .= "    <li class=\"dropdown\">\n";
-		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." (".count($tasks['review'])."/".count($tasks['approval']).") <i class=\"icon-caret-down\"></i></a>\n";
+		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." (".count($tasks['review'])."/".count($tasks['approval']).")";
+		if($tasks['review'] || $tasks['approval']) {
+		$content .= " <i class=\"icon-caret-down\"></i></a>\n";
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		if($tasks['review']) {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
@@ -131,6 +133,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "    <li class=\"divider\"></li>\n";
 		$content .= "    <li><a href=\"../out/out.MyDocuments.php\">".getMLText("my_documents")."</a></li>\n";
 		$content .= "     </ul>\n";
+		}
 //		$content .= "    </li>\n";
 //		$content .= "   </ul>\n";
 		echo $content;

From c3e59094112378a262d6a69ba1c3f120e4552faf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 10:16:07 +0200
Subject: [PATCH 109/147] add item for 6.0.6

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

diff --git a/CHANGELOG b/CHANGELOG
index d4a86c8ac..b2f28ebd5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
   documents status to 'needѕ correction' if this was turned off in the settings
 - a document will not leave draft status when setting the approver/reviewer
   without setting a reviewer/approver
+- tasks to be counted in menu can be configured
 - merge changes up to 5.1.6
 
 --------------------------------------------------------------------------------

From 91468235a5895eaff96ecc3126aadcccc0694bac Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 10:17:11 +0200
Subject: [PATCH 110/147] add entry for 5.1.7

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

diff --git a/CHANGELOG b/CHANGELOG
index 20b254c8f..db353411b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@
 - sending notification when folder attributes change
 - check if converters are set in out/out.ViewDocument.php at all (Closes #394)
 - do not remove user when transfering objects
+- do not periodically count tasks if task list in menu is turned off
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.6

From d9c4964e0d71bc2d68611450b26fa4612961a6e6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 10:18:37 +0200
Subject: [PATCH 111/147] add SeedDMS_AccessOperation() after $document is set

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

diff --git a/out/out.AddFile.php b/out/out.AddFile.php
index ce68400e4..88f35e789 100644
--- a/out/out.AddFile.php
+++ b/out/out.AddFile.php
@@ -32,7 +32,6 @@ include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
 if (!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"));
 }
@@ -43,6 +42,7 @@ if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
+$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
 $folder = $document->getFolder();
 
 if ($document->getAccessMode($user) < M_READWRITE) {

From 0c0472ae3c67e02cfab25409c0b269ab4e42289d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 12:46:50 +0200
Subject: [PATCH 112/147] minor adoption because directory ext has to stay in
 www directory

---
 doc/README.Dist-Layout | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/doc/README.Dist-Layout b/doc/README.Dist-Layout
index 5dd8a2d57..6bc98a03e 100644
--- a/doc/README.Dist-Layout
+++ b/doc/README.Dist-Layout
@@ -34,8 +34,6 @@ As MS Windows does not support soft links, this change will only apply to Linux/
 systems. The new layout is the following:
 
 seeddms51x ---+--- data --+-- log
-              |           |
-              |           +-- ext
               |           |
               |           +-- ...
               |
@@ -69,16 +67,16 @@ seeddms51x ---+--- data --+-- log
                          |
                          +-- index.php -> ../seeddms/index.php
                          |
-                         +-- ext -> ../data/ext
+                         +-- ext
 
 In order to convert to this layout you need to do the following in the seeddms51x
-directory:
+directory (replace seeddms-5.1.x with you installed version of seeddms):
 
 ln -s seeddms-5.1.x seeddms
-mv www/conf .
-mv www/ext data
+mv seeddms-5.1.x/conf .
 rm www
-mdkir www
+mkdir www
+mv seeddms-5.1.x/ext www
 cd www
 ln -s ../seeddms/inc
 ln -s ../seeddms/op
@@ -91,4 +89,3 @@ ln -s ../seeddms/webdav
 ln -s ../seeddms/restapi
 ln -s ../seeddms/pdfviewer
 ln -s ../seeddms/index.php
-ln -s ../data/ext

From 3514b0db89aa688ee380fc62afe19e8da6dd19f4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 13:09:13 +0200
Subject: [PATCH 113/147] check if $_POST["tasksInMenu"] is set

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

diff --git a/op/op.Settings.php b/op/op.Settings.php
index e16129949..4759040e2 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -88,7 +88,7 @@ if ($action == "saveSettings")
   $settings->_enableSessionList = getBoolValue("enableSessionList");
   $settings->_enableClipboard = getBoolValue("enableClipboard");
   $settings->_enableMenuTasks = getBoolValue("enableMenuTasks");
-  $settings->_tasksInMenu = $_POST["tasksInMenu"];
+  $settings->_tasksInMenu = isset($_POST["tasksInMenu"]) ? $_POST["tasksInMenu"] : array();
   $settings->_enableDropFolderList = getBoolValue("enableDropFolderList");
   $settings->_enableDropUpload = getBoolValue("enableDropUpload");
   $settings->_enableMultiUpload = getBoolValue("enableMultiUpload");

From d40dc681dcc85480c367eaf42e2f751733ad2de3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 13:09:36 +0200
Subject: [PATCH 114/147] add list of documents which need correction in menu

---
 views/bootstrap/class.Settings.php |  1 +
 views/bootstrap/class.Tasks.php    | 27 ++++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 748638bda..662325981 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -297,6 +297,7 @@ if(!is_writeable($settings->_configFilePath)) {
 					  <option value="approval" <?php if (in_array('approval', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_approval");?></option>
 					  <option value="receipt" <?php if (in_array('receipt', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_receipt");?></option>
 					  <option value="revision" <?php if (in_array('revision', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_revision");?></option>
+					  <option value="needscorrection" <?php if (in_array('needscorrection', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_needscorrection");?></option>
 					</select>
 				</td>
       </tr>
diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index 846aa6219..c8752e4ab 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -88,6 +88,18 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 				}
 			}
 		}
+		if(!$tasksinmenu || in_array('needscorrection', $tasksinmenu)) {
+			$tasks['needscorrection'] = array();
+			$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['needscorrection'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+					}
+				}
+			}
+		}
 		return $tasks;
 	} /* }}} */
 
@@ -160,9 +172,11 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 			$ct[] = count($tasks['receipt']);
 		if(isset($tasks['revision']))
 			$ct[] = count($tasks['revision']);
+		if(isset($tasks['needscorrection']))
+			$ct[] = count($tasks['needscorrection']);
 		$content .= implode('/', $ct);
 		$content .= ")";
-		if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision'])) {
+		if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision']) || !empty($tasks['needscorrection'])) {
 		$content .= " <i class=\"icon-caret-down\"></i></a>\n";
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		if(!empty($tasks['review'])) {
@@ -209,6 +223,17 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
+		if(!empty($tasks['needscorrection'])) {
+		$content .= "      <li class=\"dropdown-submenu\">\n";
+		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_correct")."</a>\n";
+		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		foreach($tasks['needscorrection'] as $t) {
+			$doc = $dms->getDocument($t['id']);
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=docinfo\">".$doc->getName()."</a></li>";
+		}
+		$content .= "       </ul>\n";
+		$content .= "      </li>\n";
+		}
 		if ($this->check_access('MyDocuments')) {
 			$content .= "    <li class=\"divider\"></li>\n";
 			$content .= "    <li><a href=\"../out/out.MyDocuments.php\">".getMLText("my_documents")."</a></li>\n";

From e913a657af5e583192201fd9a9399d18051464df Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 13:21:06 +0200
Subject: [PATCH 115/147] various new phrases

---
 languages/ar_EG/lang.inc |  8 ++++++++
 languages/bg_BG/lang.inc |  8 ++++++++
 languages/ca_ES/lang.inc |  8 ++++++++
 languages/cs_CZ/lang.inc | 14 +++++++++++---
 languages/de_DE/lang.inc | 10 +++++++++-
 languages/el_GR/lang.inc |  8 ++++++++
 languages/en_GB/lang.inc | 10 +++++++++-
 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/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 ++++++++
 24 files changed, 197 insertions(+), 5 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 888bc5f6c..ad62bb0d1 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -120,6 +120,7 @@ URL: [url]',
 'approver_already_assigned' => '',
 'approver_already_removed' => '',
 'april' => 'ابريل',
+'archive' => '',
 'archive_creation' => 'انشاء ارشيف',
 'archive_creation_warning' => 'من خلال العملية التالية يمكنك انشاء ارشيف يحتوي على كل ملفات النظام. بعد انشاء الارشيف سيتم حفظه في ملف البيانات على السيرفر.<br>تحذير: الارشيف الذي تم انشاؤه ليكون مقروء بواسطة المستخدم لن يكون نافعا كملف نسخ احتياطي للسيرفر',
 'ar_EG' => 'العربية',
@@ -323,6 +324,7 @@ URL: [url]',
 'documents_locked_by_you' => 'المستندات محمية من التعديل بواسطتك',
 'documents_only' => 'مستندات فقط',
 'documents_to_approve' => 'مستندات في انتظار الموافقة',
+'documents_to_correct' => '',
 'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'مستندات في انتظار المراجعة',
@@ -1415,6 +1417,12 @@ URL: [url]',
 'settings_strictFormCheck_desc' => '',
 'settings_suggestionvalue' => '',
 'settings_System' => 'نظام',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => 'الشكل الافتراضي',
 'settings_theme_desc' => '',
 'settings_titleDisplayHack' => '',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 68fd60e65..bd7b7dc0f 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -111,6 +111,7 @@ $text = array(
 'approver_already_assigned' => '',
 'approver_already_removed' => '',
 'april' => 'Април',
+'archive' => '',
 'archive_creation' => 'Създаване архив',
 'archive_creation_warning' => 'Тази операция ще създаде архив, съдържащ всички папки. След създаването архивът ще бъде съхранен в папката с данни на сървъра.<br>ВНИМАНИЕ: Архивът създаден като понятен за  човек, ще бъде непригоден за бекъп!',
 'ar_EG' => 'Арабски',
@@ -306,6 +307,7 @@ $text = array(
 'documents_locked_by_you' => 'Документи, блокирани от Вас',
 'documents_only' => 'Само документи',
 'documents_to_approve' => 'Документи, чакащи Вашето утвърждаване',
+'documents_to_correct' => '',
 'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Документы, чакащи Вашата рецензия',
@@ -1278,6 +1280,12 @@ $text = array(
 'settings_strictFormCheck_desc' => 'Ако е включено, то всички полета на формата ще се проверяват за запъване. Ако е включено, то коментарите и ключовите думи ще станат опционални. Коментарите винаги са обезателни при рецензиране или изменение на статуса.',
 'settings_suggestionvalue' => 'Предлагаемо значение',
 'settings_System' => 'Система',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => 'Тема по подразбиране',
 'settings_theme_desc' => 'Стил по подразбиране (подпапка в папка "styles")',
 'settings_titleDisplayHack' => 'Подпирачка за заглавия',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 44ef3f810..80c3d0383 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -116,6 +116,7 @@ URL: [url]',
 'approver_already_assigned' => '',
 'approver_already_removed' => '',
 'april' => 'Abril',
+'archive' => '',
 'archive_creation' => 'Creació d\'arxiu',
 'archive_creation_warning' => 'Amb aquesta operació pot crear un arxiu que contingui els fitxers de les carpetes del DMS complet. Després de crear-lo, l\'arxiu es guardarà a la carpeta de dades del servidor. <br>ATENCIÓ: un fitxer creat com llegible per humans no es podrà usar com a còpia de seguretat del servidor.',
 'ar_EG' => 'Àrab',
@@ -311,6 +312,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Documents bloquejats per vostè',
 'documents_only' => 'Només documents',
 'documents_to_approve' => 'Documents en espera d\'aprovació d\'usuaris',
+'documents_to_correct' => '',
 'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents en espera de revisió d\'usuaris',
@@ -1283,6 +1285,12 @@ URL: [url]',
 'settings_strictFormCheck_desc' => 'Strict form checking. If set to true, then all fields in the form will be checked for a value. If set to false, then (most) comments and keyword fields become optional. Comments are always required when submitting a review or overriding document status',
 'settings_suggestionvalue' => 'Suggestion value',
 'settings_System' => 'System',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => 'Default theme',
 'settings_theme_desc' => 'Default style (name of a subfolder in folder "styles")',
 'settings_titleDisplayHack' => 'Title Display Hack',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 8eeda817a..09294b3a0 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (740), kreml (455)
+//    Translators: Admin (742), kreml (455)
 
 $text = array(
 '2_factor_auth' => '',
@@ -127,6 +127,7 @@ URL: [url]',
 'approver_already_assigned' => '',
 'approver_already_removed' => '',
 'april' => 'Duben',
+'archive' => '',
 'archive_creation' => 'Archivování',
 'archive_creation_warning' => 'Pomocí této operace můžete vytvořit archiv obsahující soubory z celé složky DMS. Po jeho vytvoøení bude archiv ulžen v datové složce serveru. POZOR: archiv bude vytvořen jako běžně čitelný, nelze jej použít jako záložní server.',
 'ar_EG' => 'Arabština',
@@ -330,6 +331,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Vámi uzamčené dokumenty',
 'documents_only' => 'Pouze dokumenty',
 'documents_to_approve' => 'Dokumenty čekající na schválení uživatele',
+'documents_to_correct' => '',
 'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čekající na kontrolu uživatele',
@@ -602,7 +604,7 @@ URL: [url]',
 'hu_HU' => 'Maďarština',
 'id' => 'ID',
 'identical_version' => 'Nová verze je identická s verzí současnou',
-'import' => '',
+'import' => 'Nahrát',
 'importfs' => '',
 'import_extension' => '',
 'import_fs' => 'Nahrát ze souboru',
@@ -938,7 +940,7 @@ Nadřazená složka: [folder_path]
 Uživatel: [username]
 URL: [url]',
 'removed_workflow_email_subject' => '[sitename]: [name] - Odstraněn průběh práce z verze dokumentu',
-'removeFolderFromDropFolder' => '',
+'removeFolderFromDropFolder' => 'Odstranit složku po nahrání',
 'remove_marked_files' => 'Odstranit označené soubory',
 'repaired' => 'opraveno',
 'repairing_objects' => 'Opravuji dokumenty a složky.',
@@ -1424,6 +1426,12 @@ URL: [url]',
 'settings_strictFormCheck_desc' => 'Strict form checking. If set to true, then all fields in the form will be checked for a value. If set to false, then (most) comments and keyword fields become optional. Comments are always required when submitting a review or overriding document status',
 'settings_suggestionvalue' => 'Suggestion value',
 'settings_System' => 'System',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => 'Default theme',
 'settings_theme_desc' => 'Default style (name of a subfolder in folder "styles")',
 'settings_titleDisplayHack' => 'Title Display Hack',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 40e3eae39..a488384cf 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 (2588), dgrutsch (22)
+//    Translators: Admin (2596), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -132,6 +132,7 @@ URL: [url]',
 'approver_already_assigned' => 'Freigeber bereits zugewiesen',
 'approver_already_removed' => 'Freigeber wurde bereits aus dem Freigabevorgang         entfernt oder hat die Freigabe bereits abgeschlossen',
 'april' => 'April',
+'archive' => 'Archiv',
 'archive_creation' => 'Archiv erzeugen',
 'archive_creation_warning' => 'Mit dieser Operation können Sie ein Archiv mit allen Dokumenten des DMS erzeugen. Nach der Erstellung wird das Archiv im Datenordner Ihres Servers gespeichert.<br />Warnung: ein menschenlesbares Archiv ist als Server-Backup unbrauchbar.',
 'ar_EG' => 'Arabisch',
@@ -335,6 +336,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Von mir gesperrte Dokumente',
 'documents_only' => 'Nur Dokumente',
 'documents_to_approve' => 'Freigabe erforderlich',
+'documents_to_correct' => 'Korrektur erforderlich',
 'documents_to_process' => 'Dokumente, die bearbeitet werden müssen',
 'documents_to_receipt' => 'Empfangsbestätigung erforderlich',
 'documents_to_review' => 'Prüfung erforderlich',
@@ -1504,6 +1506,12 @@ Name: [username]
 'settings_strictFormCheck_desc' => 'Genaue Formularprüfung. Wenn dies eingeschaltet wird, dann werden alle Felder einiger Formulare auf einen Wert überprüft, anderenfalls sind einige Eingabefelder optional. Ein Kommentar ist beim Prüfen oder Freigeben eines Dokuments oder einer Statusänderung immer notwendig.',
 'settings_suggestionvalue' => 'Vorgeschlagener Wert',
 'settings_System' => 'System',
+'settings_tasksInMenu' => 'Ausgewähtlte Aufgaben',
+'settings_tasksInMenu_approval' => 'Freigaben',
+'settings_tasksInMenu_desc' => 'Setzt die Aufgaben, die gezählt werden sollen. Wenn keine Aufgaben ausgewählt werden, werden alle gezählt.',
+'settings_tasksInMenu_receipt' => 'Prüfungen',
+'settings_tasksInMenu_review' => 'Empfangsbestätigungen',
+'settings_tasksInMenu_revision' => 'Wiederholungsprüfungen',
 'settings_theme' => 'Aussehen',
 'settings_theme_desc' => 'Voreingestelltes Aussehen (Name des Unterordners \'styles\')',
 'settings_titleDisplayHack' => 'Title Display Hack',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index b753e1024..959b42255 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -111,6 +111,7 @@ $text = array(
 'approver_already_assigned' => '',
 'approver_already_removed' => '',
 'april' => 'Απρίλιος',
+'archive' => '',
 'archive_creation' => '',
 'archive_creation_warning' => '',
 'ar_EG' => 'Arabic/Αραβικά',
@@ -306,6 +307,7 @@ $text = array(
 'documents_locked_by_you' => '',
 'documents_only' => 'Έγγραφα μόνο',
 'documents_to_approve' => '',
+'documents_to_correct' => '',
 'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => '',
@@ -1289,6 +1291,12 @@ URL: [url]',
 'settings_strictFormCheck_desc' => '',
 'settings_suggestionvalue' => '',
 'settings_System' => '',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => '',
 'settings_theme_desc' => '',
 'settings_titleDisplayHack' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index cefc2b1ca..0654b8301 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 (1701), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1710), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -132,6 +132,7 @@ URL: [url]',
 'approver_already_assigned' => 'User is already assigned as an approver.',
 'approver_already_removed' => 'Approver has already been removed from approval process or has already submitted an approval.',
 'april' => 'April',
+'archive' => 'Archive',
 'archive_creation' => 'Archive creation',
 'archive_creation_warning' => 'With this operation you can create archive containing the files of entire DMS folders. After the creation the archive will be saved in the data folder of your server.<br>WARNING: an archive created as human readable will be unusable as server backup.',
 'ar_EG' => 'Arabic',
@@ -335,6 +336,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Documents locked by you',
 'documents_only' => 'Documents only',
 'documents_to_approve' => 'Documents awaiting your approval',
+'documents_to_correct' => 'Documents that need correction',
 'documents_to_process' => 'Documents that need processing',
 'documents_to_receipt' => 'Documents awaiting to confirm the receipt',
 'documents_to_review' => 'Documents awaiting your review',
@@ -1499,6 +1501,12 @@ Name: [username]
 'settings_strictFormCheck_desc' => 'Strict form checking. If set to true, then all fields in the form will be checked for a value. If set to false, then (most) comments and keyword fields become optional. Comments are always required when submitting a review or overriding document status',
 'settings_suggestionvalue' => 'Suggestion value',
 'settings_System' => 'System',
+'settings_tasksInMenu' => 'Selected tasks',
+'settings_tasksInMenu_approval' => 'Approvals',
+'settings_tasksInMenu_desc' => 'Select those tasks which are to be counted. If none is selected, then all tasks will be counted.',
+'settings_tasksInMenu_receipt' => 'Reviews',
+'settings_tasksInMenu_review' => 'Receipts',
+'settings_tasksInMenu_revision' => 'Revisions',
 'settings_theme' => 'Default theme',
 'settings_theme_desc' => 'Default style (name of a subfolder in folder "styles")',
 'settings_titleDisplayHack' => 'Title Display Hack',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index ec79de3b8..2542b73ab 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -127,6 +127,7 @@ URL: [url]',
 'approver_already_assigned' => '',
 'approver_already_removed' => '',
 'april' => 'Abril',
+'archive' => '',
 'archive_creation' => 'Creación de archivo',
 'archive_creation_warning' => 'Con esta operación usted puede crear un archivo que contenga los ficheros de las carpetas del DMS completo. Después de crearlo el archivo se guardará en la carpeta de datos de su servidor.<br>CUIDADO: un fichero creado como legible por humanos no podrá usarse como copia de seguridad del servidor.',
 'ar_EG' => 'Arabe',
@@ -330,6 +331,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Documentos bloqueados por usted',
 'documents_only' => 'Solo documentos',
 'documents_to_approve' => 'Documentos en espera de aprobación de usuarios',
+'documents_to_correct' => '',
 'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documentos en espera de revisión de usuarios',
@@ -1430,6 +1432,12 @@ URL: [url]',
 'settings_strictFormCheck_desc' => 'Comprobación estricta de formulario. Si se configura como cierto, entonces se comprobará el valor de todos los campos del formulario. Si se configura como false, entonces (la mayor parte) de los comentarios y campos de palabras clave se convertirán en opcionales. Los comentarios siempre son obligatorios al enviar una revisión o sobreescribir el estado de un documento',
 'settings_suggestionvalue' => 'Valor sugerido',
 'settings_System' => 'Sistema',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => 'Tema por defecto',
 'settings_theme_desc' => 'Estilo por defecto (nombre de una subcarpeta de la carpeta "styles")',
 'settings_titleDisplayHack' => 'Arreglo para mostrar título',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 836664ea5..f51a293c5 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -132,6 +132,7 @@ URL : [url]',
 'approver_already_assigned' => 'L’utilisateur est déjà affecté comme approbateur.',
 'approver_already_removed' => 'L’approbateur a déjà été retiré du processus d’approbation ou a déjà soumis l’approbation.',
 'april' => 'Avril',
+'archive' => '',
 'archive_creation' => 'Créer une archive',
 'archive_creation_warning' => 'Avec cette fonction, vous pouvez créer une archive contenant les fichiers de tous les dossiers DMS. Après la création, l\'archive sera sauvegardée dans le dossier de données de votre serveur.<br> AVERTISSEMENT: Une archive créée ainsi sera inutilisable en tant que sauvegarde du serveur.',
 'ar_EG' => 'Arabe – Égypte',
@@ -335,6 +336,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Documents verrouillés',
 'documents_only' => 'Documents uniquement',
 'documents_to_approve' => 'Documents en attente d\'approbation',
+'documents_to_correct' => '',
 'documents_to_process' => 'Documents à traiter',
 'documents_to_receipt' => 'Documents en attente de confirmation de réception',
 'documents_to_review' => 'Documents en attente de vérification',
@@ -1483,6 +1485,12 @@ Nom : [username]
 'settings_strictFormCheck_desc' => 'Contrôle strict des formulaires. Si cette option est activée, tous les champs du formulaire doivent être saisis. Sinon, la plupart des champs (commentaires et mots-clés) sont facultatifs. Les commentaires sont toujours obligatoires lors de la soumission d\'une vérification ou du changement de statut ​​d’un document.',
 'settings_suggestionvalue' => 'Valeur suggérée',
 'settings_System' => 'Système',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => 'Thème par défaut',
 'settings_theme_desc' => 'Thème par défaut(nom d\'un sous-répertoire du répertoire "styles")',
 'settings_titleDisplayHack' => 'Title Display Hack',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 1cb2b3031..758da9f25 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -132,6 +132,7 @@ Internet poveznica: [url]',
 'approver_already_assigned' => 'Korisnik je već dodijeljen kao odobravatelj',
 'approver_already_removed' => 'Odobravatelj je već uklonjen iz procesa odobrenja ili je već odobrio dokument.',
 'april' => 'Travanj',
+'archive' => '',
 'archive_creation' => 'Izrada arhive',
 'archive_creation_warning' => 'Ovom radnjom možete izraditi arhivu koja sadrži datoteke cijele DMS mape. Nakon izrade arhiva će biti pohranjena u podatkovnu mapu vašer servera.<br>UPOZORENJE: arhiva izrađena na način da je čitljiva ljudima, bit će bezkorisna kao sigurnosna kopija servera.',
 'ar_EG' => 'Arapski',
@@ -335,6 +336,7 @@ Internet poveznica: [url]',
 'documents_locked_by_you' => 'Dokumenti koje ste vi zaključali',
 'documents_only' => 'Samo dokumenti',
 'documents_to_approve' => 'Dokumenti koji čekaju vaše odobrenje',
+'documents_to_correct' => '',
 'documents_to_process' => '',
 'documents_to_receipt' => 'Dokumenti koji čekaju potvrdu primitka',
 'documents_to_review' => 'Dokumenti koji čekaju vaš pregled',
@@ -1451,6 +1453,12 @@ Internet poveznica: [url]',
 'settings_strictFormCheck_desc' => 'Provjeravanje striktnog obrasca. Ako je postavljeno na "true", tada će svim poljima u obrascu biti provjerena vrijednost. Ako je postavljeno na "false", tada (uglavnom) će polja komentara i ključnih riječi postati izborna. Komentari se uvijek zahtjevaju kada se podnose pregledi ili obilaženje statusa dokumenta',
 'settings_suggestionvalue' => 'Predložena vrijednost',
 'settings_System' => 'Sustav',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => 'Zadana tema',
 'settings_theme_desc' => 'Zadani stil (naziv podmape u mapi "stilovi")',
 'settings_titleDisplayHack' => 'Prikaz razdvojenog naslova',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 1e70228d0..2686f7d21 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -127,6 +127,7 @@ URL: [url]',
 'approver_already_assigned' => '',
 'approver_already_removed' => '',
 'april' => 'Április',
+'archive' => '',
 'archive_creation' => 'Archívum létrehozása',
 'archive_creation_warning' => 'Ezzel a művelettel archívumot hozhat létre, amely tartalmazza az összes DMS mappában található állományokat. A létrehozás követően az archívum a kiszolgáló adat mappájába lesz mentve.<br>FIGYELEM: az archívum értelmezhető formában kerül tárolásra és nem használható kiszolgáló mentésként.',
 'ar_EG' => 'Arab',
@@ -330,6 +331,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Ön által zárolt dokumentumok',
 'documents_only' => 'Csak dokumentumok',
 'documents_to_approve' => 'Jóváhagyására váró dokumentumok',
+'documents_to_correct' => '',
 'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Felülvizsgálatára váró dokumentumok',
@@ -1429,6 +1431,12 @@ URL: [url]',
 'settings_strictFormCheck_desc' => 'Szigorú űrlap ellenőrzés. Ha igazra állítja, minden űrlapmező ellenőrizve lesz egy értékkel. Ha hamisra állítja, akkor (a legtöbb) megjegyzés és kulcsszó mező opcionális. Megjegyzések mindig szükségesek amikor felülvizsgálat vagy dokumentum állapot felülírás történik',
 'settings_suggestionvalue' => 'Javasolt érték',
 'settings_System' => 'Rendszer',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => 'Alapértelmezett téma',
 'settings_theme_desc' => 'Alapértelmezett stílus (a "styles" mappa alkönyvtárának neve)',
 'settings_titleDisplayHack' => 'Címsor megjelenítő trükk',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index a5a58dd01..1c30a6b96 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -132,6 +132,7 @@ URL: [url]',
 'approver_already_assigned' => 'Utente già approvatore',
 'approver_already_removed' => 'Utente già rimosso dal processo di approvazione o ha già approvato',
 'april' => 'Aprile',
+'archive' => '',
 'archive_creation' => 'Creazione archivi',
 'archive_creation_warning' => 'Con questa operazione è possibile creare archivi contenenti i file di intere cartelle del DMS. Dopo la creazione l\'archivio viene salvato nella cartella dati del server. Attenzione: un archivio creato per uso esterno non è utilizzabile come backup del server.',
 'ar_EG' => 'Arabo',
@@ -336,6 +337,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Documenti bloccati da te',
 'documents_only' => 'Solo documenti',
 'documents_to_approve' => 'Documenti in attesa della tua approvazione',
+'documents_to_correct' => '',
 'documents_to_process' => 'I documenti che necessitano di trattamento',
 'documents_to_receipt' => 'Documenti in attesa di conferma ricezione',
 'documents_to_review' => 'Documenti in attesa della tua revisione',
@@ -1463,6 +1465,12 @@ URL: [url]',
 'settings_strictFormCheck_desc' => 'Rigido controllo sulla form. Se abilitato verrà richiesto che tutti i campi della form abbiano un valore. Se disabilitato la maggior parte dei commenti e dei campi parola-chiave diventano opzionali. NOTA: i commenti sono sempre necessari quando si carica una revisione o si scavalca lo stato di un documento.',
 'settings_suggestionvalue' => 'Valore suggerito',
 'settings_System' => 'Sistema',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => 'Tema di default',
 'settings_theme_desc' => 'Stile di default (nome della sottocartella nella cartella "styles")',
 'settings_titleDisplayHack' => 'Visualizzazione titoli lunghi',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 1c017124d..8d3916204 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -132,6 +132,7 @@ URL: [url]',
 'approver_already_assigned' => '사용자는 이미 승인자로 할당되어 있습니다.',
 'approver_already_removed' => '승인자가 이미 프로세스에서 삭제 되었거나 승인을 제출 했습니다.',
 'april' => '4월',
+'archive' => '',
 'archive_creation' => '백업 파일 생성',
 'archive_creation_warning' => '본 작업은 전체 DMS 폴더 내의 파일 모두에 아카이브를 만듭니다. 생성한 아카이브는 서버의 데이터 폴더에 저장됩니다.<br>경고 : 이렇게 만들어진 자료는 서버의 백업과 같이 가독성이 저하 됩니다.',
 'ar_EG' => '아랍어',
@@ -338,6 +339,7 @@ URL: [url]',
 'documents_locked_by_you' => '당신에 의해 잠긴 문서',
 'documents_only' => '문서',
 'documents_to_approve' => '당신의 승인을 기다리는 문서들',
+'documents_to_correct' => '',
 'documents_to_process' => '문서처리',
 'documents_to_receipt' => '당신의 접수확인을 기다리는 문서들',
 'documents_to_review' => '당신의 검토를 기다리는 문서',
@@ -1445,6 +1447,12 @@ URL : [url]',
 'settings_strictFormCheck_desc' => '엄격한 형식 검사. true로 설정하면, 다음 폼의 모든 필드 값을 확인한다. false로 설정하면, (대부분의) 의견과 키워드 필드는 선택 사항이된다. 리뷰 또는 문서 상태를 제출할 때 코맨트은 항상 필요합니다.',
 'settings_suggestionvalue' => '제안 값',
 'settings_System' => '시스템',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => '기본 테마',
 'settings_theme_desc' => '기본 스타일 (폴더 내에 있는 서브 폴더의 이름 "styles")',
 'settings_titleDisplayHack' => '제목 표시 해킹',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 04cf9446c..a135623f0 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -125,6 +125,7 @@ URL: [url]',
 'approver_already_assigned' => 'autoriseerder al aangewezen',
 'approver_already_removed' => 'autoriseerder reeds verwijderd',
 'april' => 'april',
+'archive' => '',
 'archive_creation' => 'Archief aanmaken',
 'archive_creation_warning' => 'Met deze handeling maakt U een Archief aan van alle bestanden in het DMS. Na het aanmaken van het Archief, wordt deze opgeslagen in de data-map van uw server.<br>Waarschuwing: een leesbaar Archief kan niet worden gebruikt voor server back-up doeleinde.',
 'ar_EG' => 'Arabisch',
@@ -328,6 +329,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Documenten door U geblokkeerd',
 'documents_only' => 'Alleen documenten',
 'documents_to_approve' => 'Documenten die wachten op uw goedkeuring',
+'documents_to_correct' => '',
 'documents_to_process' => 'Te verwerken documenten',
 'documents_to_receipt' => 'documenten te ontvangen',
 'documents_to_review' => 'Documenten die wachten op uw controle',
@@ -1475,6 +1477,12 @@ Name: [username]
 'settings_strictFormCheck_desc' => 'Strikte controle op het juiste formaat. Indien ingeschakeld, worden alle velden in het formulier gecontroleer op een waarde. Indien uitgeschakeld, worden de meeste commentaar en invoervelden opgevat als optioneel. Commentaren zijn altijd nodig bij een review of modificatie van een documentstatus',
 'settings_suggestionvalue' => 'Voorgestelde waarde',
 'settings_System' => 'Systeem',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => 'Standaard thema',
 'settings_theme_desc' => 'Standaard stijl (name of a subfolder in folder "styles")',
 'settings_titleDisplayHack' => 'Titel Tonen Oplossing',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index f5dfbc1a7..19f349f60 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -120,6 +120,7 @@ URL: [url]',
 'approver_already_assigned' => '',
 'approver_already_removed' => '',
 'april' => 'Kwiecień',
+'archive' => '',
 'archive_creation' => 'Tworzenie archiwum',
 'archive_creation_warning' => 'Ta operacja utworzy archiwum zawierające pliki z całego repozytorium. Po utworzeniu archiwum będzie zapisane w folderze na serwerze.<br>UWAGA: archiwum utworzone jako czytelne dla ludzi będzie bezużyteczne jako kopia serwera.',
 'ar_EG' => 'Arabski',
@@ -323,6 +324,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Dokumenty zablokowane przez Ciebie',
 'documents_only' => 'Tylko dokumenty',
 'documents_to_approve' => 'Dokumenty oczekujące na Twoje zatwierdzenie',
+'documents_to_correct' => '',
 'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty oczekujące na Twoją recenzję',
@@ -1409,6 +1411,12 @@ URL: [url]',
 'settings_strictFormCheck_desc' => 'Sprawdzanie poprawności forularzy. Jeśli ta opcja jest włączona, to wszystkie pola w formularzach będą obowiązkowe do wypełnienia. Jeśli nie włączysz tej opcji, to większość komentarzy i pól słów kluczowych będzie opcjonalna. Komentarze są zawsze wymagane przy zatwierdzaniu, opiniowaniu lub zmianie statusu dokumentu.',
 'settings_suggestionvalue' => 'Sugerowana wartość',
 'settings_System' => 'System',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => 'Domyślny motyw',
 'settings_theme_desc' => 'Domyślny styl wyglądu (nazwa podkatalogu w katalogu "styles")',
 'settings_titleDisplayHack' => 'Korekta wyświetlania tytułu',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 9e100c3a3..9be8811d3 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -127,6 +127,7 @@ URL: [url]',
 'approver_already_assigned' => '',
 'approver_already_removed' => '',
 'april' => 'April',
+'archive' => '',
 'archive_creation' => 'Archive creation',
 'archive_creation_warning' => 'With this operation you can create achive containing the files of entire DMS folders. After the creation the archive will be saved in the data folder of your server.<br>WARNING: an archive created as human readable will be unusable as server backup.',
 'ar_EG' => 'Árabe',
@@ -330,6 +331,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Documentos bloqueados por você',
 'documents_only' => 'Somente documentos',
 'documents_to_approve' => 'Documents Awaiting User\'s Approval',
+'documents_to_correct' => '',
 'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents Awaiting User\'s Review',
@@ -1427,6 +1429,12 @@ URL: [url]',
 'settings_strictFormCheck_desc' => 'Verificação de forma rigorosa. Se definido como verdadeiro, então todos os campos do formulário serão verificados por um valor. Se for definido como falso, então (a maioria) comentários e campos de palavra-chave tornar facultativo. Comentários são sempre necessários quando enviar um comentário ou substituindo status do documento',
 'settings_suggestionvalue' => 'Valor Sugestão',
 'settings_System' => 'Sistema',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => 'Tema padrão',
 'settings_theme_desc' => 'Estilo padrão (nome de uma subpasta na pasta "styles")',
 'settings_titleDisplayHack' => 'Título Exibir Hack',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 40c934602..edc59e570 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -132,6 +132,7 @@ URL: [url]',
 'approver_already_assigned' => 'Utilizatorul este deja asignat ca un aprobator.',
 'approver_already_removed' => 'Aprobatorul a fost deja eliminat din procesul de aprobare sau a trimis deja o aprobare.',
 'april' => 'Aprilie',
+'archive' => '',
 'archive_creation' => 'Creare arhiva',
 'archive_creation_warning' => 'Cu această operațiune puteți crea o arhiva care sa conțina fișierele din toate folderele DMS. După creare, arhiva va fi salvata în folderul de date din serverul dumneavoastră. <br> AVERTISMENT:. O arhivă creată ca lizibilă pentru om nu va putea fi utilizata ca server de backup.',
 'ar_EG' => 'Arabă',
@@ -335,6 +336,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Documente blocate de tine',
 'documents_only' => 'Doar documente',
 'documents_to_approve' => 'Documente care așteaptă aprobarea dumneavoastră',
+'documents_to_correct' => '',
 'documents_to_process' => '',
 'documents_to_receipt' => 'Documente in asteptare pentru confirmarea primirii',
 'documents_to_review' => 'Documente care așteaptă revizuirea dumneavoastră',
@@ -1452,6 +1454,12 @@ URL: [url]',
 'settings_strictFormCheck_desc' => 'Verificare strictă a form-urilor. Dacă este activată, atunci toate câmpurile din formular vor fi obligatorii. Dacă nu este activată, atunci (cele mai multe) câmpuri de comentarii și cuvinte cheie devin optionale. Comentariile sunt întotdeauna obligatorii la realizarea unei revizuiri sau la suprascrierea unui status pentru un document',
 'settings_suggestionvalue' => 'Valoare sugerată',
 'settings_System' => 'Sistem',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => 'Tema implicită',
 'settings_theme_desc' => 'Stilul implicit (numele unui subfolder în folderul "style")',
 'settings_titleDisplayHack' => 'Interpretarea afișarii titlului',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 3e7ef96da..ee221f92c 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -132,6 +132,7 @@ URL: [url]',
 'approver_already_assigned' => 'Пользователь уже назначен в качестве утверждающего.',
 'approver_already_removed' => 'Утверждающий уже удален из процесса утверждения или уже оставил утверждение.',
 'april' => 'Апрель',
+'archive' => '',
 'archive_creation' => 'Создать архив',
 'archive_creation_warning' => 'Эта операция создаст архив, содержащий все каталоги. После создания архив будет сохранен в каталоге данных сервера.<br><b>Внимание:</b> архив созданный как понятный человеку, будет непригоден в качестве резервной копии для восстановления!',
 'ar_EG' => 'Arabic',
@@ -335,6 +336,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Документы, заблокированные вами',
 'documents_only' => 'Только документы',
 'documents_to_approve' => 'Документы, ожидающие вашего утверждения',
+'documents_to_correct' => '',
 'documents_to_process' => 'Документы требующие обработки',
 'documents_to_receipt' => 'Документы, которые ожидают подтверждение получения',
 'documents_to_review' => 'Документы, ожидающие вашей рецензии',
@@ -1459,6 +1461,12 @@ URL: [url]',
 'settings_strictFormCheck_desc' => 'Если включено, то все поля формы будут проверяться заполнены ли они. Если выключено, то комментарии и метки станут опциональными. Комментарий всегда обязателен при рецензировании или изменении статуса.',
 'settings_suggestionvalue' => 'Предлагаемое значение',
 'settings_System' => 'Система',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => 'Тема по умолчанию',
 'settings_theme_desc' => 'Стиль по умолчанию (каталог в «styles»).',
 'settings_titleDisplayHack' => 'Приём для заголовков',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 2f0c1dfdb..727f8a24b 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -115,6 +115,7 @@ URL: [url]',
 'approver_already_assigned' => '',
 'approver_already_removed' => '',
 'april' => 'Apríl',
+'archive' => '',
 'archive_creation' => 'Vytvorenie archívu',
 'archive_creation_warning' => 'Touto akciou môžete vytvoriť archív obsahujúci celú DMS zložku. Po vytvorení bude každý súbor uložený do dátovej zložky súborov na vašom serveri.<br>UPOZORNENIE: uživateľsky prístupný archív nie je možné použiť ako zálohu servera.',
 'ar_EG' => 'Arabština',
@@ -318,6 +319,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Vami uzamknuté dokumenty',
 'documents_only' => 'Iba dokumenty',
 'documents_to_approve' => 'Dokumenty čakajúce na schválenie používateľa',
+'documents_to_correct' => '',
 'documents_to_process' => 'Dokumenty, ktoré potrebujú spracovanie',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čakajúce na kontrolu používateľa',
@@ -1290,6 +1292,12 @@ URL: [url]',
 'settings_strictFormCheck_desc' => '',
 'settings_suggestionvalue' => '',
 'settings_System' => 'Systém',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => 'Prednastavená téma',
 'settings_theme_desc' => '',
 'settings_titleDisplayHack' => '',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index fb1e4a92e..b98ef5718 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -133,6 +133,7 @@ URL: [url]',
 'approver_already_assigned' => 'Användaren är redan godkännare',
 'approver_already_removed' => 'Användaren har redan godkänt dokumentet alternativt tagits bort från arbetsflödet.',
 'april' => 'April',
+'archive' => '',
 'archive_creation' => 'Skapa arkiv',
 'archive_creation_warning' => 'Med denna funktion kan du skapa ett arkiv som innehåller filer från hela DMS-kataloger. När arkivet har skapats, kommer det att sparas i data-mappen på din server.<br>OBS! Skapas ett arkiv som är läsbart för användare, kan det inte användas för att återställa systemet.',
 'ar_EG' => 'arabiska',
@@ -336,6 +337,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Dokument som du har låst',
 'documents_only' => 'Endast dokument',
 'documents_to_approve' => 'Dokument som du behöver godkänna',
+'documents_to_correct' => '',
 'documents_to_process' => 'Dokument som kräver åtgärd',
 'documents_to_receipt' => 'Dokument som väntar på bekräftad mottagning',
 'documents_to_review' => 'Dokument som du behöver granska',
@@ -1472,6 +1474,12 @@ Kommentar: [comment]',
 'settings_strictFormCheck_desc' => 'Noggrann format-kontroll. Om ja, kontrolleras alla fält i ett formulär på att de innehåller ett värde. Om nej, blir de flesta kommentar- och nyckelordsfält frivilliga. Kommentarer måste alltid anges när en granskning skickas eller när dokumentstatus skrivs över.',
 'settings_suggestionvalue' => 'Föreslå ett värde',
 'settings_System' => 'System',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => 'Standardtema',
 'settings_theme_desc' => 'Standardtema (namn på undermappar i mappen "styles")',
 'settings_titleDisplayHack' => 'Titelvisningshack',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 105cdfd20..1628f2a76 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -126,6 +126,7 @@ URL: [url]',
 'approver_already_assigned' => '',
 'approver_already_removed' => '',
 'april' => 'Nisan',
+'archive' => '',
 'archive_creation' => 'Arşiv oluşturma',
 'archive_creation_warning' => 'Bu işlemle tüm DYS içeriğindeki dosyaların arşivini oluşturabilirsiniz. Arşiv oluşturulduktan sonra sunucudaki data klasörüne kaydedilecektir.<br>DİKKAT: Okunabilir olarak oluşturulan arşiv, sunucu yedeği olarak kullanılamaz.',
 'ar_EG' => 'Arapça',
@@ -329,6 +330,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Doküman sizin tarafınızdan kilitlendi',
 'documents_only' => 'Sadece dokümanlar',
 'documents_to_approve' => 'Onayınızı bekleyen dokümanlar',
+'documents_to_correct' => '',
 'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Kontrol etmenizi bekleyen dokümanlar',
@@ -1431,6 +1433,12 @@ URL: [url]',
 'settings_strictFormCheck_desc' => 'Bu seçenek seçilirse tüm form alanları zorunlu olacaktır. Seçilmezse birçok açıklama ve anahtar kelime alanları isteğe bağlı olacaktır. Kontrol veya geçersiz kılma gibi durumlarda açıklama yazmak çoğu zaman mecburi olmalıdır.',
 'settings_suggestionvalue' => 'Önerilen değer',
 'settings_System' => 'Sistem',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => 'Varsayılan tema',
 'settings_theme_desc' => 'Sitenin varsayılan teması ("styles" klasöründe bulunan alt klasör)',
 'settings_titleDisplayHack' => 'İki Satırlı Başlık Görüntüleme',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index da0478502..1a8e55770 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -132,6 +132,7 @@ URL: [url]',
 'approver_already_assigned' => 'Користувач вже призначений затверджувачем',
 'approver_already_removed' => 'Користувач вже виключений з процесу затвердження або вже затвердив документ',
 'april' => 'Квітень',
+'archive' => '',
 'archive_creation' => 'Створити архів',
 'archive_creation_warning' => 'Ця операція створить архів, який містить всі каталоги. Після створення архів буде збережений в каталозі даних сервера.<br><b>Увага:</b> архів, який створено в читабельному вигляді, буде непридатний в якості резервної копії для відновлення!',
 'ar_EG' => 'Arabic',
@@ -335,6 +336,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Документи, які ви заблокували',
 'documents_only' => 'лише документи',
 'documents_to_approve' => 'Документи, які чекають вашого затвердження',
+'documents_to_correct' => '',
 'documents_to_process' => 'Документи, які чекають опрацювання',
 'documents_to_receipt' => 'Документи, які чекають підтвердження отримання',
 'documents_to_review' => 'Документи, які чекають вашої рецензії',
@@ -1452,6 +1454,12 @@ URL: [url]',
 'settings_strictFormCheck_desc' => 'Якщо увімкнено, то всі поля форм будуть перевірятися чи вони заповнені. Якщо вимкнено, то коментарі і ключові слова стануть необов\'язковими. Коментар завжди обов\'язковий при рецензуванні і зміні статусу.',
 'settings_suggestionvalue' => 'Запропоноване значення',
 'settings_System' => 'Система',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => 'Тема по замовчуванню',
 'settings_theme_desc' => 'Стиль по замовчуванню (каталог в «styles»).',
 'settings_titleDisplayHack' => 'Прийом для заголовків',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index ae14519de..21e42c1e7 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -132,6 +132,7 @@ URL: [url]',
 'approver_already_assigned' => '用户已被设置为审核人。',
 'approver_already_removed' => '审核人已从审核进程中移除，或已提交审核结果。',
 'april' => '四 月',
+'archive' => '',
 'archive_creation' => '创建存档',
 'archive_creation_warning' => '通过此操作您可以创建一个包含这个DMS(文档管理系统)的数据文件夹。之后，所有文档都将保存到您服务器的数据文件夹中.<br>警告:如果所创建文档名为非数字的，那么将在服务器备份中不可用',
 'ar_EG' => '阿拉伯语',
@@ -329,6 +330,7 @@ URL: [url]',
 'documents_locked_by_you' => '被您锁定的文档',
 'documents_only' => '指定文件',
 'documents_to_approve' => '待您审核的文档',
+'documents_to_correct' => '',
 'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校对的文档',
@@ -1433,6 +1435,12 @@ URL: [url]',
 'settings_strictFormCheck_desc' => '严格表格检查。如果此项为是，将检查所有表格中字段的值。如果设置为否，内容和关键字段检查将成为可选项。同时提交评论或覆盖文件时，始终要求注释',
 'settings_suggestionvalue' => '推荐值',
 'settings_System' => '系统设置',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => '主题设置',
 'settings_theme_desc' => '默认风格（“风格”文件夹的一个子文件夹的名字',
 'settings_titleDisplayHack' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 2eecaa529..0d2de415c 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -115,6 +115,7 @@ URL: [url]',
 'approver_already_assigned' => '',
 'approver_already_removed' => '',
 'april' => '四 月',
+'archive' => '',
 'archive_creation' => '創建存檔',
 'archive_creation_warning' => '通過此操作您可以創建一個包含這個DMS(文檔管理系統)的資料檔案夾。之後，所有文檔都將保存到您伺服器的資料檔案夾中.<br>警告:如果所創建文檔名為非數字的，那麼將在伺服器備份中不可用',
 'ar_EG' => '阿拉伯語',
@@ -310,6 +311,7 @@ URL: [url]',
 'documents_locked_by_you' => '被您鎖定的文檔',
 'documents_only' => '指定檔',
 'documents_to_approve' => '待您審核的文檔',
+'documents_to_correct' => '',
 'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校對的文檔',
@@ -1282,6 +1284,12 @@ URL: [url]',
 'settings_strictFormCheck_desc' => '',
 'settings_suggestionvalue' => '',
 'settings_System' => '',
+'settings_tasksInMenu' => '',
+'settings_tasksInMenu_approval' => '',
+'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_receipt' => '',
+'settings_tasksInMenu_review' => '',
+'settings_tasksInMenu_revision' => '',
 'settings_theme' => '',
 'settings_theme_desc' => '',
 'settings_titleDisplayHack' => '',

From 5506c0ed691627eb4aa615f6b3f0123807f4b4b9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 13:22:39 +0200
Subject: [PATCH 116/147] add entry for 6.0.6

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

diff --git a/CHANGELOG b/CHANGELOG
index af49a3648..331b07661 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@
 - a document will not leave draft status when setting the approver/reviewer
   without setting a reviewer/approver
 - tasks to be counted in menu can be configured
+- add number of documents which need correction to menu
 - merge changes up to 5.1.6
 
 --------------------------------------------------------------------------------

From a9224b00700c852bd96710ff0f7637a340314274 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 14:08:12 +0200
Subject: [PATCH 117/147] fix some typos

---
 utils/README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/utils/README.md b/utils/README.md
index a1c7543b3..34e1af1fe 100644
--- a/utils/README.md
+++ b/utils/README.md
@@ -2,13 +2,13 @@ Running one of the scripts
 ---------------------------
 
 Scripts in this folder are ment to be called on the command line by
-either executing one of the shell wrappers 'seeddms-*' or by calling
-'php -f <scriptname> -- <script options>'.
-If you run the adddoc.php script make sure to run in with the permissions
-of the user running your web server. I will copy files right into
+either executing one of the shell wrappers `seeddms-*` or by calling
+`php -f <scriptname> -- <script options>`.
+If you run the adddoc.php script make sure to run it with the permissions
+of the user running your web server. It will copy files right into
 your content directory of your SeedDMS installation. Don't do this
 as root because you will most likely not be able to remove those documents
-from the web gui. If this happens by accident, you will still be able
+via the web gui. If this happens by accident, you will still be able
 to fix it manually by setting the propper file permissions for the document
 just created in your content directory. Just change the owner of the
 document folder and its content to the user running the web server.

From aa416f90ec888eddee3b1863d097078a337d1de0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Mar 2018 13:43:56 +0200
Subject: [PATCH 118/147] do not enforce 2facto auth for guest and when secret
 is set

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

diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index c29554c71..e1e782af4 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -166,8 +166,8 @@ if (!$user->isAdmin() && $origuser == null) {
  * if secret is not set and 2-factor authentication is turned on. Also check if
  * already on the page Setup2Factor.php and no user substiation has occured.
  */
-if($settings->_enable2FactorAuthentication && $origuser == null && $user->getSecret() == '') {
-	if(basename($_SERVER['SCRIPT_NAME']) != 'out.Setup2Factor.php') {
+if($settings->_enable2FactorAuthentication && $settings->_guestID != $user->getID() && $settings->_autoLoginUser != $user->getID() && $origuser == null && $user->getSecret() == '') {
+	if(basename($_SERVER['SCRIPT_NAME']) != 'out.Setup2Factor.php' && basename($_SERVER['SCRIPT_NAME']) != 'op.Setup2Factor.php') {
 		header("Location: ../out/out.Setup2Factor.php");
 		exit;
 	}

From ab3475f512a6c3ee43c18040a83278f0ccaaf5df Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Mar 2018 13:44:48 +0200
Subject: [PATCH 119/147] do not set user for controller, because it is not set
 at that time

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

diff --git a/op/op.Login.php b/op/op.Login.php
index b558e8af9..ddbd82942 100644
--- a/op/op.Login.php
+++ b/op/op.Login.php
@@ -39,7 +39,7 @@ function _printMessage($heading, $message) { /* {{{ */
 } /* }}} */
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
+$controller = Controller::factory($tmp[1], array('dms'=>$dms));
 
 if (isset($_REQUEST["sesstheme"]) && strlen($_REQUEST["sesstheme"])>0 && is_numeric(array_search($_REQUEST["sesstheme"],UI::getStyles())) ) {
 	$theme = $_REQUEST["sesstheme"];
@@ -131,10 +131,10 @@ if ($user->isAdmin() && ($_SERVER['REMOTE_ADDR'] != $settings->_adminIP ) && ( $
 }
 
 if($settings->_enable2FactorAuthentication) {
-	if($secret = $user->getSecret()) {
+	if($user->getSecret()) {
 		require "vendor/autoload.php";
 		$tfa = new \RobThree\Auth\TwoFactorAuth('SeedDMS');
-		if($tfa->verifyCode($secret, $_POST['twofactauth']) !== true) {
+		if($tfa->verifyCode($user->getSecret(), $_POST['twofactauth']) !== true) {
 			_printMessage(getMLText("login_error_title"),	getMLText("login_error_text"));
 			exit;
 		}

From 1a8a0c3621c715a1d26c48a08cb2dc2995463492 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Mar 2018 13:46:03 +0200
Subject: [PATCH 120/147] add item for 6.0.6

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

diff --git a/CHANGELOG b/CHANGELOG
index 331b07661..32fff0c8f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@
   without setting a reviewer/approver
 - tasks to be counted in menu can be configured
 - add number of documents which need correction to menu
+- minor 2 factor auth. fixes when initially setting the secret
 - merge changes up to 5.1.6
 
 --------------------------------------------------------------------------------

From ad5c4fc332b380bddd84079e9a9df8692773ac44 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Mar 2018 14:04:45 +0200
Subject: [PATCH 121/147] check if repository url is set

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

diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index c4cc0e784..043386afe 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -131,7 +131,6 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 		$version = $this->params['version'];
 		$extmgr = $this->params['extmgr'];
 		$currenttab = $this->params['currenttab'];
-		$reposurl = $this->params['reposurl'];
 	
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
@@ -234,6 +233,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 
 			<div class="tab-pane <?php if($currenttab == 'repository') echo 'active'; ?>" id="repository">
 <?php
+		if($extmgr->getRepositoryUrl()) {
 		echo "<table class=\"table _table-condensed\">\n";
 		print "<thead>\n<tr>\n";
 		print "<th></th>\n";	
@@ -282,7 +282,10 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 					<input type="hidden" name="forceupdate" value="1" />
           <button type="submit" class="btn btn-delete"><i class="icon-refresh"></i> <?= getMLText('force_update')?></button>
 					</form>
-</div>
+				</div>
+<?php
+		}
+?>
 			</div>
 		</div>
   </div>

From 7be573cac9a17b0e8469246e4f2d409d4f046267 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Mar 2018 14:05:04 +0200
Subject: [PATCH 122/147] format error message

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

diff --git a/op/op.ExtensionMgr.php b/op/op.ExtensionMgr.php
index 22c33c8bd..dedccbb0f 100644
--- a/op/op.ExtensionMgr.php
+++ b/op/op.ExtensionMgr.php
@@ -119,7 +119,7 @@ elseif ($action == "getlist") { /* {{{ */
 	$controller->setParam('forceupdate', (isset($_POST['forceupdate']) && $_POST['forceupdate']) ? true : false);
 	$controller->setParam('version', $v->version());
 	if (!$controller($_POST)) {
-		$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('error_extension_getlist').$controller->getErrorMsg(), 'timeout'=>5000));
+		$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('error_extension_getlist').": ".$controller->getErrorMsg(), 'timeout'=>5000));
 	} else {
 		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_extension_getlist')));
 	}

From f6a506ff9236200fd78ad333d3603cd12689496c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Mar 2018 14:05:22 +0200
Subject: [PATCH 123/147] new method getRepositoryUrl()

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

diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index 9d1485e65..eadf445cb 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -119,6 +119,10 @@ class SeedDMS_Extension_Mgr {
 		}
 	} /* }}} */
 
+	public function getRepositoryUrl() { /* {{{ */
+		return $this->reposurl;
+	} /* }}} */
+
 	protected function getExtensionsConfFile() { /* {{{ */
 		return $this->cachedir."/extensions.php";
 	} /* }}} */

From d0177269848245df9cf8ab112ab1e22033e9dcf0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Mar 2018 17:47:58 +0200
Subject: [PATCH 124/147] count workflows to trigger if workflowmode='advanced'

---
 out/out.Tasks.php               |  1 +
 styles/bootstrap/application.js | 12 ++---
 views/bootstrap/class.Tasks.php | 79 ++++++++++++++++++++++++---------
 3 files changed, 66 insertions(+), 26 deletions(-)

diff --git a/out/out.Tasks.php b/out/out.Tasks.php
index 0df3d3763..3c0df220e 100644
--- a/out/out.Tasks.php
+++ b/out/out.Tasks.php
@@ -32,6 +32,7 @@ $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 
 if($view) {
+	$view->setParam('workflowmode', $settings->_workflowMode);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view($_GET);
diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 9fd2192ad..dcbf9aba9 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -1003,7 +1003,7 @@ $(document).ready(function() { /* {{{ */
 	});
 }); /* }}} */
 
-	var approval_count, review_count, receipt_count, revision_count;
+	var approval_count, review_count, workflow_count;
 	var checkTasks = function() {
 		$.ajax({url: '../out/out.Tasks.php',
 			type: 'GET',
@@ -1011,11 +1011,13 @@ $(document).ready(function() { /* {{{ */
 			data: {action: 'mytasks'},
 			success: function(data) {
 				if(data) {
-					if(approval_count != data.data.approval.length ||
-						 review_count != data.data.review.length) {
+					if((typeof data.data.approval != 'undefined' && approval_count != data.data.approval.length) ||
+						 (typeof data.data.review != 'undefined' && review_count != data.data.review.length) ||
+						 (typeof data.data.workflow != 'undefined' && workflow_count != data.data.workflow.length)) {
 						$("#menu-tasks > ul > li").html('Loading').hide().load('../out/out.Tasks.php?action=menutasks').fadeIn('500')
-						approval_count = data.data.approval.length;
-						review_count = data.data.review.length;
+						approval_count = typeof data.data.approval != 'undefined' ? data.data.approval.length : 0;
+						review_count = typeof data.data.review != 'undefined' ? data.data.review.length : 0;
+						workflow_count = typeof data.data.workflow != 'undefined' ? data.data.workflow.length : 0;
 					}
 				}
 			},
diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index 32eafd31a..4ab43fe2f 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -39,25 +39,42 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 	private function __myTasks() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
-		$tasks['review'] = array();
-		$tasks['approval'] = array();
-		$tasks['receipt'] = array();
-		$tasks['revision'] = array();
-		$resArr = $dms->getDocumentList('ApproveByMe', $user);
-		if($resArr) {
-			foreach ($resArr as $res) {
-				$document = $dms->getDocument($res["id"]);
-				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-					$tasks['approval'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+		$workflowmode = $this->params['workflowmode'];
+		if($workflowmode == 'traditional')
+			$tasks['review'] = array();
+		elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval')
+			$tasks['approval'] = array();
+		elseif($workflowmode == 'advanced')
+			$tasks['workflow'] = array();
+
+		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
+			$resArr = $dms->getDocumentList('ApproveByMe', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['approval'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+					}
 				}
 			}
-		}
-		$resArr = $dms->getDocumentList('ReviewByMe', $user);
-		if($resArr) {
-			foreach ($resArr as $res) {
-				$document = $dms->getDocument($res["id"]);
-				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-					$tasks['review'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+		} elseif($workflowmode == 'traditional') {
+			$resArr = $dms->getDocumentList('ReviewByMe', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['review'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+					}
+				}
+			}
+		} elseif($workflowmode == 'advanced') {
+			$resArr = $dms->getDocumentList('WorkflowByMe', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['workflow'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+					}
 				}
 			}
 		}
@@ -104,11 +121,20 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content = '';
 //		$content .= "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
 //		$content .= "    <li class=\"dropdown\">\n";
-		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." (".count($tasks['review'])."/".count($tasks['approval']).")";
-		if($tasks['review'] || $tasks['approval']) {
+		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." (";
+		$ct = array();
+		if(isset($tasks['review']))
+			$ct[] = count($tasks['review']);
+		if(isset($tasks['approval']))
+			$ct[] = count($tasks['approval']);
+		if(isset($tasks['workflow']))
+			$ct[] = count($tasks['workflow']);
+		$content .= implode('/', $ct);
+		$content .= ")";
+		if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['workflow'])) {
 		$content .= " <i class=\"icon-caret-down\"></i></a>\n";
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
-		if($tasks['review']) {
+		if(!empty($tasks['review'])) {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_review")."</a>\n";
 		$content .= "       <ul class=\"dropdown-menu\" role=\"menu\">\n";
@@ -119,7 +145,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
-		if($tasks['approval']) {
+		if(!empty($tasks['approval'])) {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_approve")."</a>\n";
 		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
@@ -130,6 +156,17 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
+		if(!empty($tasks['workflow'])) {
+		$content .= "      <li class=\"dropdown-submenu\">\n";
+		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_trigger_workflow")."</a>\n";
+		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		foreach($tasks['workflow'] as $t) {
+			$doc = $dms->getDocument($t['id']);
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=workflow\">".$doc->getName()."</a></li>";
+		}
+		$content .= "       </ul>\n";
+		$content .= "      </li>\n";
+		}
 		$content .= "    <li class=\"divider\"></li>\n";
 		$content .= "    <li><a href=\"../out/out.MyDocuments.php\">".getMLText("my_documents")."</a></li>\n";
 		$content .= "     </ul>\n";

From 820b88c9cfd0aef516ad3048607b1a4e642d4c29 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Mar 2018 18:23:00 +0200
Subject: [PATCH 125/147] revision and receipt is also availabe in advanced
 workflow mode

---
 views/bootstrap/class.Tasks.php | 83 ++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 43 deletions(-)

diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index 5fa54654a..0bab3c497 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -68,45 +68,42 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 					}
 				}
 			}
-		if($workflowmode == 'traditional')
-			if(!$tasksinmenu || in_array('receipt', $tasksinmenu)) {
-				$tasks['receipt'] = array();
-				$resArr = $dms->getDocumentList('ReceiptByMe', $user);
-				if($resArr) {
-					foreach ($resArr as $res) {
-						$document = $dms->getDocument($res["id"]);
-						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-							$tasks['receipt'][] = array('id'=>$res['id'], 'name'=>$res['name']);
-						}
+		if(!$tasksinmenu || in_array('receipt', $tasksinmenu)) {
+			$tasks['receipt'] = array();
+			$resArr = $dms->getDocumentList('ReceiptByMe', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['receipt'][] = array('id'=>$res['id'], 'name'=>$res['name']);
 					}
 				}
 			}
-		if($workflowmode == 'traditional')
-			if(!$tasksinmenu || in_array('revision', $tasksinmenu)) {
-				$tasks['revision'] = array();
-				$resArr = $dms->getDocumentList('ReviseByMe', $user);
-				if($resArr) {
-					foreach ($resArr as $res) {
-						$document = $dms->getDocument($res["id"]);
-						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-							$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']);
-						}
+		}
+		if(!$tasksinmenu || in_array('revision', $tasksinmenu)) {
+			$tasks['revision'] = array();
+			$resArr = $dms->getDocumentList('ReviseByMe', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']);
 					}
 				}
 			}
-		if($workflowmode == 'traditional')
-			if(!$tasksinmenu || in_array('needscorrection', $tasksinmenu)) {
-				$tasks['needscorrection'] = array();
-				$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user);
-				if($resArr) {
-					foreach ($resArr as $res) {
-						$document = $dms->getDocument($res["id"]);
-						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-							$tasks['needscorrection'][] = array('id'=>$res['id'], 'name'=>$res['name']);
-						}
+		}
+		if(!$tasksinmenu || in_array('needscorrection', $tasksinmenu)) {
+			$tasks['needscorrection'] = array();
+			$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['needscorrection'][] = array('id'=>$res['id'], 'name'=>$res['name']);
 					}
 				}
 			}
+		}
 		if($workflowmode == 'advanced')
 			if(!$tasksinmenu || in_array('workflow', $tasksinmenu)) {
 				$tasks['workflow'] = array();
@@ -188,14 +185,14 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 			$ct[] = count($tasks['review']);
 		if(isset($tasks['approval']))
 			$ct[] = count($tasks['approval']);
+		if(isset($tasks['workflow']))
+			$ct[] = count($tasks['workflow']);
 		if(isset($tasks['receipt']))
 			$ct[] = count($tasks['receipt']);
 		if(isset($tasks['revision']))
 			$ct[] = count($tasks['revision']);
 		if(isset($tasks['needscorrection']))
 			$ct[] = count($tasks['needscorrection']);
-		if(isset($tasks['workflow']))
-			$ct[] = count($tasks['workflow']);
 		$content .= implode('/', $ct);
 		$content .= ")";
 		if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision']) || !empty($tasks['needscorrection']) || !empty($tasks['workflow'])) {
@@ -223,17 +220,6 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
-		if(!empty($tasks['receipt'])) {
-		$content .= "      <li class=\"dropdown-submenu\">\n";
-		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_receipt")."</a>\n";
-		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
-		foreach($tasks['receipt'] as $t) {
-			$doc = $dms->getDocument($t['id']);
-			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=recipients\">".$doc->getName()."</a></li>";
-		}
-		$content .= "       </ul>\n";
-		$content .= "      </li>\n";
-		}
 		if(!empty($tasks['workflow'])) {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_trigger_workflow")."</a>\n";
@@ -245,6 +231,17 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
+		if(!empty($tasks['receipt'])) {
+		$content .= "      <li class=\"dropdown-submenu\">\n";
+		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_receipt")."</a>\n";
+		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		foreach($tasks['receipt'] as $t) {
+			$doc = $dms->getDocument($t['id']);
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=recipients\">".$doc->getName()."</a></li>";
+		}
+		$content .= "       </ul>\n";
+		$content .= "      </li>\n";
+		}
 		if(!empty($tasks['revision'])) {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_revise")."</a>\n";

From 3e2931068e31852c7a2c9f47b6d3774320d2b2bf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Mar 2018 17:06:10 +0200
Subject: [PATCH 126/147] allow CSP worker-src blob:

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

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 444c0bcbc..f43c8ad5d 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -54,12 +54,13 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 			/* We still need unsafe-eval, because printDocumentChooserHtml and
 			 * printFolderChooserHtml will include a javascript file with ajax
 			 * which is evaled by jquery
+			 * worker-src blob: is needed for cytoscape
 			 * X-WebKit-CSP is deprecated, Chrome understands Content-Security-Policy
 			 * since version 25+
 			 * X-Content-Security-Policy is deprecated, Firefox understands
 			 * Content-Security-Policy since version 23+
 			 */
-			$csp_rules = "script-src 'self' 'unsafe-eval';"; // style-src 'self';";
+			$csp_rules = "script-src 'self' 'unsafe-eval'; worker-src blob:;"; // style-src 'self';";
 			foreach (array("X-WebKit-CSP", "X-Content-Security-Policy", "Content-Security-Policy") as $csp) {
 				header($csp . ": " . $csp_rules);
 			}

From 9f211d1fda39e8870e9180d70be254f98b71f1a1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Mar 2018 17:06:25 +0200
Subject: [PATCH 127/147] init $positions early

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

diff --git a/views/bootstrap/class.WorkflowGraph.php b/views/bootstrap/class.WorkflowGraph.php
index fa6e42d24..50503f559 100644
--- a/views/bootstrap/class.WorkflowGraph.php
+++ b/views/bootstrap/class.WorkflowGraph.php
@@ -42,8 +42,8 @@ class SeedDMS_View_WorkflowGraph extends SeedDMS_Bootstrap_Style {
 		header('Content-Type: application/javascript; charset=UTF-8');
 
 		$renderdata = $this->workflow->getLayoutData();
+		$positions = array();
 		if($renderdata) {
-			$positions = array();
 			$data = json_decode($renderdata);
 			foreach($data->nodes as $node) {
 				if($node->group == 'nodes') {

From bf1473fbb1a78aed724d39d9ced8d84f741e8e03 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Mar 2018 17:06:49 +0200
Subject: [PATCH 128/147] fix various errors when intializing the view

---
 out/out.ReturnFromSubWorkflow.php               | 13 ++++++++-----
 out/out.RunSubWorkflow.php                      |  4 +---
 views/bootstrap/class.ReturnFromSubWorkflow.php |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/out/out.ReturnFromSubWorkflow.php b/out/out.ReturnFromSubWorkflow.php
index 61dde19ec..b560347c4 100644
--- a/out/out.ReturnFromSubWorkflow.php
+++ b/out/out.ReturnFromSubWorkflow.php
@@ -23,11 +23,17 @@ include("../inc/inc.Settings.php");
 include("../inc/inc.LogInit.php");
 include("../inc/inc.Utils.php");
 include("../inc/inc.Language.php");
-include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassAccessOperation.php");
 include("../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 (!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"));
 }
@@ -64,16 +70,13 @@ if(isset($_POST["transition"]) && $_POST["transition"]) {
 
 $folder = $document->getFolder();
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
 	$view->setParam('version', $version);
 	$view->setParam('transition', $transition);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
 
-?>
-
diff --git a/out/out.RunSubWorkflow.php b/out/out.RunSubWorkflow.php
index 9e0c62bd6..57aaf0d59 100644
--- a/out/out.RunSubWorkflow.php
+++ b/out/out.RunSubWorkflow.php
@@ -32,7 +32,7 @@ include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 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"));
@@ -70,8 +70,6 @@ if (!is_object($subworkflow)) {
 
 $folder = $document->getFolder();
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
diff --git a/views/bootstrap/class.ReturnFromSubWorkflow.php b/views/bootstrap/class.ReturnFromSubWorkflow.php
index 4bc8842b3..54473ff72 100644
--- a/views/bootstrap/class.ReturnFromSubWorkflow.php
+++ b/views/bootstrap/class.ReturnFromSubWorkflow.php
@@ -117,7 +117,7 @@ $(document).ready(function() {
 	</form>
 	</div>
 	<div id="workflowgraph" class="span8">
-	<iframe src="out.WorkflowGraph.php?workflow=<?php echo $parentworkflow->getID(); ?>&transition=<?php echo $transition->getID(); ?>&documentid=<?php echo $document->getID(); ?>" width="100%" height="500" style="border: 1px solid #AAA;"></iframe>
+	<iframe src="out.WorkflowGraph.php?workflow=<?php echo $parentworkflow->getID(); ?>&transition=<?php echo ($transition ? $transition->getID() : ''); ?>&documentid=<?php echo $document->getID(); ?>" width="100%" height="500" style="border: 1px solid #AAA;"></iframe>
 	<h4>Workflow</h4>
 	</div>
 	</div>

From 3976657a66bb8fb12aa30fed44512fe1410ac9c6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Mar 2018 15:10:18 +0200
Subject: [PATCH 129/147] remove unneeded code, check if reception of document
 is allowed

---
 out/out.AddDocument.php               |  3 +++
 views/bootstrap/class.AddDocument.php | 35 +++++++--------------------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php
index 39196ce7d..cd94ec5bf 100644
--- a/out/out.AddDocument.php
+++ b/out/out.AddDocument.php
@@ -78,6 +78,9 @@ if($view) {
 	$view->setParam('enableadminrevapp', $settings->_enableAdminRevApp);
 	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
 	$view->setParam('enableselfrevapp', $settings->_enableSelfRevApp);
+	$view->setParam('enableadminreceipt', $settings->_enableAdminReceipt);
+	$view->setParam('enableownerreceipt', $settings->_enableOwnerReceipt);
+	$view->setParam('enableselfreceipt', $settings->_enableSelfReceipt);
 	$view->setParam('libraryfolder', $libfolder);
 	$view->setParam('dropfolderdir', $settings->_dropFolderDir);
 	$view->setParam('dropfolderfile', isset($_REQUEST["dropfolderfileform1"]) ?$_REQUEST["dropfolderfileform1"] : '');
diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 7139d9dd5..7f82dc4ff 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -160,6 +160,9 @@ $(document).ready(function() {
 		$enableadminrevapp = $this->params['enableadminrevapp'];
 		$enableownerrevapp = $this->params['enableownerrevapp'];
 		$enableselfrevapp = $this->params['enableselfrevapp'];
+		$enableadminreceipt = $this->params['enableadminreceipt'];
+		$enableownerreceipt = $this->params['enableownerreceipt'];
+		$enableselfreceipt = $this->params['enableselfreceipt'];
 		$strictformcheck = $this->params['strictformcheck'];
 		$dropfolderdir = $this->params['dropfolderdir'];
 		$libraryfolder = $this->params['libraryfolder'];
@@ -186,10 +189,6 @@ $(document).ready(function() {
 		$this->warningMsg($msg);
 		$this->contentHeading(getMLText("add_document"));
 		$this->contentContainerStart();
-		
-		// Retrieve a list of all users and groups that have review / approve
-		// privileges.
-		$docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp);
 ?>
 		<form action="../op/op.AddDocument.php" enctype="multipart/form-data" method="post" id="form1" name="form1">
 		<?php echo createHiddenFieldWithKey('adddocument'); ?>
@@ -438,6 +437,9 @@ $(document).ready(function() {
 		</tr>	
 <?php
 		} else {
+			// Retrieve a list of all users and groups that have review / approve
+			// privileges.
+			$docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp);
 			if($workflowmode == 'traditional') {
 ?>
 		<tr>
@@ -696,6 +698,9 @@ $(document).ready(function() {
 			</tr>	
 <?php
 		}
+		// Retrieve a list of all users and groups that have review / approve
+		// privileges.
+		$docAccess = $folder->getReadAccessList($enableadminreceipt, $enableownerreceipt);
 ?>
 		<tr>
 			<td colspan="2">
@@ -715,17 +720,6 @@ $(document).ready(function() {
 				}
 ?>
 				</select>
-<?php
-				$tmp = array();
-				foreach($receiptStatus as $r) {
-					if($r['type'] == 0) {
-						$tmp[] = $r['required'];
-					}
-				}
-				if($tmp) {
-					$this->printSelectPresetButtonHtml("IndRecipient", $tmp);
-				}
-?>
       </td>
     </tr>
       <tr>
@@ -754,17 +748,6 @@ $(document).ready(function() {
 				}
 ?>
 			</select>
-<?php
-				$tmp = array();
-				foreach($receiptStatus as $r) {
-					if($r['type'] == 1) {
-						$tmp[] = $r['required'];
-					}
-				}
-				if($tmp) {
-					$this->printSelectPresetButtonHtml("GrpRecipient", $tmp);
-				}
-?>
       </td>
 		</tr>
 		  <tr>	

From d7e22068afcf5c15c3cf47efad7c4b5cccc06412 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Mar 2018 15:12:52 +0200
Subject: [PATCH 130/147] add item for 6.0.6

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

diff --git a/CHANGELOG b/CHANGELOG
index 32fff0c8f..80e85839b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@
 - tasks to be counted in menu can be configured
 - add number of documents which need correction to menu
 - minor 2 factor auth. fixes when initially setting the secret
+- remove ѕome unneeded code from AddDocument which just caused php warnings
 - merge changes up to 5.1.6
 
 --------------------------------------------------------------------------------

From 8447c87ab09af192b685bf771e3388af98c612ce Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Mar 2018 15:16:39 +0200
Subject: [PATCH 131/147] remove empty script tag

---
 views/bootstrap/class.TriggerWorkflow.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/views/bootstrap/class.TriggerWorkflow.php b/views/bootstrap/class.TriggerWorkflow.php
index b7880b997..8849b8ef4 100644
--- a/views/bootstrap/class.TriggerWorkflow.php
+++ b/views/bootstrap/class.TriggerWorkflow.php
@@ -76,11 +76,6 @@ $(document).ready(function() {
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("trigger_workflow"));
-?>
-<script language="JavaScript">
-</script>
-
-<?php
 
 		$action = $transition->getAction();
 		$currentstate = $latestContent->getWorkflowState();

From d1ee8004236b2531dbe63a8c09969ad779ab5d6a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Mar 2018 15:39:10 +0200
Subject: [PATCH 132/147] remove formtoken from link to javascript files

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

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

From 05626a47597cae905942a758b8d63e7d9bcc8b0e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Mar 2018 15:39:39 +0200
Subject: [PATCH 133/147] use GET instead of POST

---
 out/out.RemoveWorkflowFromDocument.php |  8 ++++----
 out/out.TriggerWorkflow.php            | 19 +++++++++----------
 views/bootstrap/class.ViewDocument.php |  4 ++--
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/out/out.RemoveWorkflowFromDocument.php b/out/out.RemoveWorkflowFromDocument.php
index cfb92cc2e..73c5413b9 100644
--- a/out/out.RemoveWorkflowFromDocument.php
+++ b/out/out.RemoveWorkflowFromDocument.php
@@ -37,20 +37,20 @@ if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
-if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
+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"));
 }
 
-$document = $dms->getDocument(intval($_POST["documentid"]));
+$document = $dms->getDocument(intval($_GET["documentid"]));
 if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
-if (!isset($_POST["version"]) || !is_numeric($_POST["version"]) || intval($_POST["version"])<1) {
+if (!isset($_GET["version"]) || !is_numeric($_GET["version"]) || intval($_GET["version"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
 }
 
-$version = $_POST["version"];
+$version = $_GET["version"];
 $version = $document->getContentByVersion($version);
 
 if (!is_object($version)) {
diff --git a/out/out.TriggerWorkflow.php b/out/out.TriggerWorkflow.php
index 81febf72d..608ed7157 100644
--- a/out/out.TriggerWorkflow.php
+++ b/out/out.TriggerWorkflow.php
@@ -30,20 +30,24 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
-if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
+$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 (!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"));
 }
 
-$document = $dms->getDocument(intval($_POST["documentid"]));
+$document = $dms->getDocument(intval($_GET["documentid"]));
 if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
-if (!isset($_POST["version"]) || !is_numeric($_POST["version"]) || intval($_POST["version"])<1) {
+if (!isset($_GET["version"]) || !is_numeric($_GET["version"]) || intval($_GET["version"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
 }
 
-$version = $_POST["version"];
+$version = $_GET["version"];
 $version = $document->getContentByVersion($version);
 
 if (!is_object($version)) {
@@ -55,18 +59,13 @@ if (!is_object($workflow)) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("document_has_no_workflow"));
 }
 
-$transition = $dms->getWorkflowTransition($_POST["transition"]);
+$transition = $dms->getWorkflowTransition($_GET["transition"]);
 if (!is_object($transition)) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_workflow_transition"));
 }
 
 $folder = $document->getFolder();
 
-/* Create object for checking access to certain operations */
-$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) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 486a22ca5..12b30b80d 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1004,7 +1004,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			$this->contentContainerStart();
 			if($user->isAdmin()) {
 				if(SeedDMS_Core_DMS::checkIfEqual($workflow->getInitState(), $latestContent->getWorkflowState())) {
-					print "<form action=\"../out/out.RemoveWorkflowFromDocument.php\" method=\"post\">".createHiddenFieldWithKey('removeworkflowfromdocument')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn\"><i class=\"icon-remove\"></i> ".getMLText('rm_workflow')."</button></form>";
+					print "<form action=\"../out/out.RemoveWorkflowFromDocument.php\" method=\"get\">".createHiddenFieldWithKey('removeworkflowfromdocument')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn\"><i class=\"icon-remove\"></i> ".getMLText('rm_workflow')."</button></form>";
 				} else {
 					print "<form action=\"../out/out.RewindWorkflow.php\" method=\"post\">".createHiddenFieldWithKey('rewindworkflow')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn\"><i class=\"icon-refresh\"></i> ".getMLText('rewind_workflow')."</button></form>";
 				}
@@ -1106,7 +1106,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				echo "<td>";
 				if($latestContent->triggerWorkflowTransitionIsAllowed($user, $transition)) {
 					$action = $transition->getAction();
-					print "<form action=\"../out/out.TriggerWorkflow.php\" method=\"post\">".createHiddenFieldWithKey('triggerworkflow')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><input type=\"hidden\" name=\"transition\" value=\"".$transition->getID()."\" /><input type=\"submit\" class=\"btn\" value=\"".getMLText('action_'.strtolower($action->getName()), array(), $action->getName())."\" /></form>";
+					print "<form action=\"../out/out.TriggerWorkflow.php\" method=\"get\">".createHiddenFieldWithKey('triggerworkflow')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><input type=\"hidden\" name=\"transition\" value=\"".$transition->getID()."\" /><input type=\"submit\" class=\"btn\" value=\"".getMLText('action_'.strtolower($action->getName()), array(), $action->getName())."\" /></form>";
 					$allowedtransitions[] = $transition;
 				}
 				echo "</td>";

From 2259acc3f2ef9ed80bd17c6e9ba621336c1ea5ab Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Mar 2018 16:30:02 +0200
Subject: [PATCH 134/147] add counting documents in workflow and need
 correction in countTasks()

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

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 041205298..4ab83c02f 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -836,6 +836,9 @@ class SeedDMS_Core_DMS {
 	 * @return array list of documents records
 	 */
 	function countTasks($listtype, $user=null) { /* {{{ */
+		if (!$this->db->createTemporaryTable("ttstatid") || !$this->db->createTemporaryTable("ttcontentid")) {
+			return false;
+		}
 		$groups = array();
 		if($user) {
 			$tmp = $user->getGroups();
@@ -913,6 +916,41 @@ class SeedDMS_Core_DMS {
 			$queryStr .= "AND `tblDocumentRevisionLog`.`status` = 0 ";
 			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_IN_REVISION.") ";
 			break; /* }}} */
+		case 'NeedsCorrectionOwner':
+			$queryStr .=
+				"LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `ttcontentid`.`document` ";
+			$queryStr .= "WHERE `tblDocuments`.`owner` = '".$user->getID()."' ".
+				"AND `tblDocumentStatusLog`.`status` IN (".S_NEEDS_CORRECTION.") ";
+			break; /* }}} */
+		case 'WorkflowByMe':
+			// Get document list for the current user.
+			$workflowStatus = $user->getWorkflowStatus();
+
+			// Create a comma separated list of all the documentIDs whose information is
+			// required.
+			$dList = array();
+			foreach ($workflowStatus["u"] as $st) {
+				if (!in_array($st["document"], $dList)) {
+					$dList[] = $st["document"];
+				}
+			}
+			foreach ($workflowStatus["g"] as $st) {
+				if (!in_array($st["document"], $dList)) {
+					$dList[] = $st["document"];
+				}
+			}
+			$docCSV = "";
+			foreach ($dList as $d) {
+				$docCSV .= (strlen($docCSV)==0 ? "" : ", ")."'".$d."'";
+			}
+
+			if ($dList) {
+				$queryStr .=
+							"WHERE `ttcontentid`.`document` IN (" . implode(',', $dList) . ")";
+			} else {
+				$queryStr = '';
+			}
+			break;
 		}
 		if($queryStr) {
 			$resArr = $this->db->getResultArray($selectStr.$queryStr);

From c0c9f755a83a2496238b6b0004e53c0a3f402794 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Mar 2018 16:30:46 +0200
Subject: [PATCH 135/147] countTasks takes workflow mode and tasksinmenu into
 account

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

diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index 0bab3c497..b3707a97f 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -133,12 +133,29 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 	function countTasks() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$workflowmode = $this->params['workflowmode'];
+		$tasksinmenu = $this->params['tasksinmenu'];
+
 		$startts = microtime(true);
 		$tasks = array();
-		$tasks['review'] = $dms->countTasks('ReviewByMe', $user);
-		$tasks['approval'] = $dms->countTasks('ApproveByMe', $user);
-		$tasks['receipt'] = $dms->countTasks('ReceiptByMe', $user);
-		$tasks['revision'] = $dms->countTasks('ReviseByMe', $user);
+		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval')
+			if(!$tasksinmenu || in_array('approval', $tasksinmenu)) {
+				$tasks['approval'] = $dms->countTasks('ApproveByMe', $user);
+			}
+		if($workflowmode == 'traditional')
+			if(!$tasksinmenu || in_array('review', $tasksinmenu)) {
+				$tasks['review'] = $dms->countTasks('ReviewByMe', $user);
+			}
+		if($workflowmode == 'advanced')
+			if(!$tasksinmenu || in_array('workflow', $tasksinmenu)) {
+				$tasks['workflow'] = $dms->countTasks('WorkflowByMe', $user);
+			}
+		if(!$tasksinmenu || in_array('receipt', $tasksinmenu))
+			$tasks['receipt'] = $dms->countTasks('ReceiptByMe', $user);
+		if(!$tasksinmenu || in_array('revision', $tasksinmenu))
+			$tasks['revision'] = $dms->countTasks('ReviseByMe', $user);
+		if(!$tasksinmenu || in_array('needscorrection', $tasksinmenu))
+			$tasks['needscorrection'] = $dms->countTasks('NeedsCorrectionOwner', $user);
 
 		header('Content-Type: application/json');
 		echo json_encode(array('error'=>0, 'data'=>$tasks, 'processing_time'=>microtime(true)-$startts));

From 28c232374427c219a6bcbad75e2b1f535380fe92 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Mar 2018 16:45:39 +0200
Subject: [PATCH 136/147] add workflow to list of tasks in menu

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

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 662325981..8987461ea 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -295,6 +295,7 @@ if(!is_writeable($settings->_configFilePath)) {
 				  <select name="tasksInMenu[]" multiple>
 					  <option value="review" <?php if (in_array('review', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_review");?></option>
 					  <option value="approval" <?php if (in_array('approval', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_approval");?></option>
+					  <option value="workflow" <?php if (in_array('workflow', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_workflow");?></option>
 					  <option value="receipt" <?php if (in_array('receipt', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_receipt");?></option>
 					  <option value="revision" <?php if (in_array('revision', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_revision");?></option>
 					  <option value="needscorrection" <?php if (in_array('needscorrection', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_needscorrection");?></option>

From 666ced5fea880add75967946fb79776c373d6424 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Mar 2018 17:13:56 +0200
Subject: [PATCH 137/147] usage of sendfile can be configured

---
 SeedDMS_Preview/Preview/Base.php | 11 +++++++++--
 SeedDMS_Preview/package.xml      |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Preview/Preview/Base.php b/SeedDMS_Preview/Preview/Base.php
index d00003379..9b7554ed8 100644
--- a/SeedDMS_Preview/Preview/Base.php
+++ b/SeedDMS_Preview/Preview/Base.php
@@ -44,7 +44,13 @@ class SeedDMS_Preview_Base {
 	 */
 	protected $timeout;
 
-	function __construct($previewDir, $timeout=5) { /* {{{ */
+	/**
+	 * @var boolean $usesendfile use mod_sendfile if available
+	 * @access protected
+	 */
+	protected $usesendfile;
+
+	function __construct($previewDir, $timeout=5, $usesendfile=true) { /* {{{ */
 		if(!is_dir($previewDir)) {
 			if (!SeedDMS_Core_File::makeDir($previewDir)) {
 				$this->previewDir = '';
@@ -56,6 +62,7 @@ class SeedDMS_Preview_Base {
 		}
 		$this->timeout = intval($timeout);
 		$this->converters = array();
+		$this->usesendfile = $usesendfile;
 	} /* }}} */
 
 	static function execWithTimeout($cmd, $timeout=5) { /* {{{ */
@@ -148,7 +155,7 @@ class SeedDMS_Preview_Base {
  * @param string $filename
  */
 	protected function sendFile($filename) { /* {{{ */
-		if(function_exists('apache_get_modules') && in_array('mod_xsendfile',apache_get_modules())) {
+		if($this->usesendfile && function_exists('apache_get_modules') && in_array('mod_xsendfile',apache_get_modules())) {
 			header("X-Sendfile: ".$filename);
 		} else {
 			/* Make sure output buffering is off */
diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index 9e39935d3..651422851 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -11,7 +11,7 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2018-03-20</date>
+ <date>2018-03-29</date>
  <time>10:59:39</time>
  <version>
   <release>1.2.9</release>
@@ -24,6 +24,7 @@
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
 make sure list of converters is always an array
+usage of mod_sendfile can be configured
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From c2ecc4adbbaa44b3b2b7c7b4236a53ade8c1d4fb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 31 Mar 2018 14:28:57 +0200
Subject: [PATCH 138/147] check_controller_access() returns true if !guest and
 adv access controll is off

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

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 29253874c..011decf15 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -464,8 +464,12 @@ class SeedDMS_AccessOperation {
 	 * @return boolean true if access is allowed otherwise false
 	 */
 	function check_controller_access($controller, $get=array()) { /* {{{ */
-		if(!$this->settings->_advancedAcl)
-			return false;
+		if(!$this->settings->_advancedAcl) {
+			if($this->user->isGuest())
+				return false;
+			else
+				return true;
+		}
 		if(is_string($controller)) {
 			$scripts = array($controller);
 		} elseif(is_array($controller)) {

From 5c48206311c88511e657ecd65f1d3cb63536972f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 31 Mar 2018 14:38:27 +0200
Subject: [PATCH 139/147] use utf8_basename() instead of php basename()

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

diff --git a/CHANGELOG b/CHANGELOG
index db353411b..c637dcd7a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@
 - check if converters are set in out/out.ViewDocument.php at all (Closes #394)
 - do not remove user when transfering objects
 - do not periodically count tasks if task list in menu is turned off
+- use utf8_basename() in op.ImportFS.php
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.6
diff --git a/op/op.ImportFS.php b/op/op.ImportFS.php
index 83dd8ed67..b3f7de41e 100644
--- a/op/op.ImportFS.php
+++ b/op/op.ImportFS.php
@@ -57,7 +57,7 @@ function import_folder($dirname, $folder) { /* {{{ */
 		$path = $dirname.'/'.$entry;
 		if($entry != '.' && $entry != '..' && $entry != '.svn') {
 			if(is_file($path)) {
-				$name = basename($path);
+				$name = utf8_basename($path);
 				$filetmp = $path;
 
 				$reviewers = array();
@@ -86,7 +86,7 @@ function import_folder($dirname, $folder) { /* {{{ */
 				}
 				set_time_limit(30);
 			} elseif(is_dir($path)) {
-				$name = basename($path);
+				$name = utf8_basename($path);
 				if($newfolder = $folder->addSubFolder($name, '', $user, $sequence)) {
 					$foldercount++;
 					if(!import_folder($path, $newfolder))

From 20a798d9f1811ab7b01bdc58f4d2b30690109c73 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 31 Mar 2018 14:40:05 +0200
Subject: [PATCH 140/147] add some mor documentation

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

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 011decf15..61481007b 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -458,6 +458,8 @@ class SeedDMS_AccessOperation {
 	 *
 	 * If the parameter $controller is an array then each element is considered the
 	 * name of a controller and true will be returned if one is accesible.
+	 * If advanced access controll is turn off, this function will return false
+	 * for guest users and true otherwise.
 	 *
 	 * @param mixed $controller Instanz of controller, name of controller or array of controller names
 	 * @param string $get query parameters

From 8a0d9b2481e3ad00035d62e3485ef6f8616d0714 Mon Sep 17 00:00:00 2001
From: efinal <yangyubin@ebangshou.me>
Date: Sun, 1 Apr 2018 17:11:04 +0800
Subject: [PATCH 141/147] change to use utf8_basename, see
 https://sourceforge.net/p/seeddms/discussion/general/thread/b3b3b320/ for
 detail

---
 controllers/class.UpdateDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/class.UpdateDocument.php b/controllers/class.UpdateDocument.php
index c87084ddd..0c119e134 100644
--- a/controllers/class.UpdateDocument.php
+++ b/controllers/class.UpdateDocument.php
@@ -59,7 +59,7 @@ class SeedDMS_Controller_UpdateDocument extends SeedDMS_Controller_Common {
 		$result = $this->callHook('updateDocument');
 		if($result === null) {
 			$filesize = SeedDMS_Core_File::fileSize($userfiletmp);
-			$contentResult=$document->addContent($comment, $user, $userfiletmp, basename($userfilename), $filetype, $userfiletype, $reviewers, $approvers, $version=0, $attributes, $workflow);
+			$contentResult=$document->addContent($comment, $user, $userfiletmp, utf8_basename($userfilename), $filetype, $userfiletype, $reviewers, $approvers, $version=0, $attributes, $workflow);
 
 			if ($this->hasParam('expires')) {
 				if($document->setExpires($this->getParam('expires'))) {

From 311f068a77d1a2857e5e7337b61a2b4ecce48e32 Mon Sep 17 00:00:00 2001
From: efinal <yangyubin@ebangshou.me>
Date: Sun, 1 Apr 2018 21:18:09 +0800
Subject: [PATCH 142/147] change to use utf8_basename, see
 https://sourceforge.net/p/seeddms/discussion/general/thread/b3b3b320/ for
 detail

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

diff --git a/op/op.ImportFS.php b/op/op.ImportFS.php
index 83dd8ed67..7ea06f2c7 100644
--- a/op/op.ImportFS.php
+++ b/op/op.ImportFS.php
@@ -86,7 +86,7 @@ function import_folder($dirname, $folder) { /* {{{ */
 				}
 				set_time_limit(30);
 			} elseif(is_dir($path)) {
-				$name = basename($path);
+				$name = utf8_basename($path);
 				if($newfolder = $folder->addSubFolder($name, '', $user, $sequence)) {
 					$foldercount++;
 					if(!import_folder($path, $newfolder))

From ab3fc8ec7c3c490f0564d61a48341e8792574aaa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 2 Apr 2018 19:47:52 +0200
Subject: [PATCH 143/147] do not pass status to revision entry

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

diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php
index 11295434e..792a454d3 100644
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@@ -92,7 +92,7 @@ class SeedDMS_View_Timeline extends SeedDMS_Bootstrap_Style {
 					$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
 					break;
 				case 'scheduled_revision':
-					$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
+					$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version']));
 					break;
 				default:
 					$msg = '???';

From fd5920fc8d32edb1b657c777a1c1f3c6f2785f25 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 Apr 2018 09:32:36 +0200
Subject: [PATCH 144/147] take enable[Revision|Receipt]Workflow into account

---
 inc/inc.ClassSettings.php                 |  6 +--
 op/op.Settings.php                        |  2 +-
 out/out.AddDocument.php                   |  1 +
 out/out.CheckInDocument.php               |  1 +
 out/out.Tasks.php                         |  2 +
 out/out.UpdateDocument.php                |  1 +
 out/out.ViewDocument.php                  |  2 +
 views/bootstrap/class.AddDocument.php     |  5 +++
 views/bootstrap/class.CheckInDocument.php |  5 +++
 views/bootstrap/class.Settings.php        |  6 +--
 views/bootstrap/class.Tasks.php           | 52 +++++++++++++----------
 views/bootstrap/class.UpdateDocument.php  |  5 +++
 views/bootstrap/class.ViewDocument.php    |  6 ++-
 13 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 29f3f8ff0..b0750238a 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -185,7 +185,7 @@ class Settings { /* {{{ */
 	// the mode of workflow
 	var $_workflowMode = "traditional";
 	// enable/disable acknowledge workflow
-	var $_enableAcknowledgeWorkflow = true;
+	var $_enableReceiptWorkflow = true;
 	// enable/disable revision workflow
 	var $_enableRevisionWorkflow = true;
 	// enable/disable revision on vote reject
@@ -667,7 +667,7 @@ class Settings { /* {{{ */
 		$this->_initialDocumentStatus = intval($tab["initialDocumentStatus"]);
 		$this->_versioningFileName = strval($tab["versioningFileName"]);
 		$this->_workflowMode = strval($tab["workflowMode"]);
-		$this->_enableAcknowledgeWorkflow = strval($tab["enableAcknowledgeWorkflow"]);
+		$this->_enableReceiptWorkflow = strval($tab["enableReceiptWorkflow"]);
 		$this->_enableRevisionWorkflow = strval($tab["enableRevisionWorkflow"]);
 		$this->_enableRevisionOnVoteReject = strval($tab["enableRevisionOnVoteReject"]);
 		$this->_allowReviewerOnly = Settings::boolval($tab["allowReviewerOnly"]);
@@ -988,7 +988,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "initialDocumentStatus", $this->_initialDocumentStatus);
     $this->setXMLAttributValue($node, "versioningFileName", $this->_versioningFileName);
     $this->setXMLAttributValue($node, "workflowMode", $this->_workflowMode);
-    $this->setXMLAttributValue($node, "enableAcknowledgeWorkflow", $this->_enableAcknowledgeWorkflow);
+    $this->setXMLAttributValue($node, "enableReceiptWorkflow", $this->_enableReceiptWorkflow);
     $this->setXMLAttributValue($node, "enableRevisionWorkflow", $this->_enableRevisionWorkflow);
     $this->setXMLAttributValue($node, "enableRevisionOnVoteReject", $this->_enableRevisionOnVoteReject);
     $this->setXMLAttributValue($node, "allowReviewerOnly", $this->_allowReviewerOnly);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 4759040e2..8bb128224 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -180,7 +180,7 @@ if ($action == "saveSettings")
   $settings->_presetExpirationDate = $_POST["presetExpirationDate"];
   $settings->_initialDocumentStatus = $_POST["initialDocumentStatus"];
   $settings->_workflowMode = $_POST["workflowMode"];
-  $settings->_enableAcknowledgeWorkflow = getBoolValue("enableAcknowledgeWorkflow");
+  $settings->_enableReceiptWorkflow = getBoolValue("enableReceiptWorkflow");
   $settings->_enableRevisionWorkflow = getBoolValue("enableRevisionWorkflow");
   $settings->_enableRevisionOnVoteReject = getBoolValue("enableRevisionOnVoteReject");
   $settings->_allowReviewerOnly = getBoolValue("allowReviewerOnly");
diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php
index cd94ec5bf..77171f88c 100644
--- a/out/out.AddDocument.php
+++ b/out/out.AddDocument.php
@@ -78,6 +78,7 @@ if($view) {
 	$view->setParam('enableadminrevapp', $settings->_enableAdminRevApp);
 	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
 	$view->setParam('enableselfrevapp', $settings->_enableSelfRevApp);
+	$view->setParam('enablereceiptworkflow', $settings->_enableReceiptWorkflow);
 	$view->setParam('enableadminreceipt', $settings->_enableAdminReceipt);
 	$view->setParam('enableownerreceipt', $settings->_enableOwnerReceipt);
 	$view->setParam('enableselfreceipt', $settings->_enableSelfReceipt);
diff --git a/out/out.CheckInDocument.php b/out/out.CheckInDocument.php
index 7980a3025..1544eccd8 100644
--- a/out/out.CheckInDocument.php
+++ b/out/out.CheckInDocument.php
@@ -72,6 +72,7 @@ if($view) {
 	$view->setParam('enableadminrevapp', $settings->_enableAdminRevApp);
 	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
 	$view->setParam('enableselfrevapp', $settings->_enableSelfRevApp);
+	$view->setParam('enablereceiptworkflow', $settings->_enableReceiptWorkflow);
 	$view->setParam('enableselfreceipt', $settings->_enableSelfReceipt);
 	$view->setParam('dropfolderdir', $settings->_dropFolderDir);
 	$view->setParam('workflowmode', $settings->_workflowMode);
diff --git a/out/out.Tasks.php b/out/out.Tasks.php
index 3c0df220e..c1edc52a9 100644
--- a/out/out.Tasks.php
+++ b/out/out.Tasks.php
@@ -33,6 +33,8 @@ $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 
 if($view) {
 	$view->setParam('workflowmode', $settings->_workflowMode);
+	$view->setParam('enablereceiptworkflow', $settings->_enableReceiptWorkflow);
+	$view->setParam('enablerevisionworkflow', $settings->_enableRevisionWorkflow);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view($_GET);
diff --git a/out/out.UpdateDocument.php b/out/out.UpdateDocument.php
index 1a300a211..6e4bdc7b7 100644
--- a/out/out.UpdateDocument.php
+++ b/out/out.UpdateDocument.php
@@ -71,6 +71,7 @@ if($view) {
 	$view->setParam('enableadminrevapp', $settings->_enableAdminRevApp);
 	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
 	$view->setParam('enableselfrevapp', $settings->_enableSelfRevApp);
+	$view->setParam('enablereceiptworkflow', $settings->_enableReceiptWorkflow);
 	$view->setParam('enableselfreceipt', $settings->_enableSelfReceipt);
 	$view->setParam('dropfolderdir', $settings->_dropFolderDir);
 	$view->setParam('workflowmode', $settings->_workflowMode);
diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index ea9799396..c2c081bbc 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -76,6 +76,8 @@ if($view) {
 	$view->setParam('showtree', showtree());
 	$view->setParam('accessobject', $accessop);
 	$view->setParam('viewonlinefiletypes', $settings->_viewOnlineFileTypes);
+	$view->setParam('enablereceiptworkflow', $settings->_enableReceiptWorkflow);
+	$view->setParam('enablerevisionworkflow', $settings->_enableRevisionWorkflow);
 	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
 	$view->setParam('enableownerreceipt', $settings->_enableOwnerReceipt);
 	$view->setParam('cachedir', $settings->_cacheDir);
diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 7f82dc4ff..cc7736043 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -160,6 +160,7 @@ $(document).ready(function() {
 		$enableadminrevapp = $this->params['enableadminrevapp'];
 		$enableownerrevapp = $this->params['enableownerrevapp'];
 		$enableselfrevapp = $this->params['enableselfrevapp'];
+		$enablereceiptworkflow = $this->params['enablereceiptworkflow'];
 		$enableadminreceipt = $this->params['enableadminreceipt'];
 		$enableownerreceipt = $this->params['enableownerreceipt'];
 		$enableselfreceipt = $this->params['enableselfreceipt'];
@@ -698,6 +699,7 @@ $(document).ready(function() {
 			</tr>	
 <?php
 		}
+		if($enablereceiptworkflow) {
 		// Retrieve a list of all users and groups that have review / approve
 		// privileges.
 		$docAccess = $folder->getReadAccessList($enableadminreceipt, $enableownerreceipt);
@@ -750,6 +752,9 @@ $(document).ready(function() {
 			</select>
       </td>
 		</tr>
+<?php
+		}
+?>
 		  <tr>	
         <td>
 		<?php $this->contentSubHeading(getMLText("add_document_notify")); ?>
diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index aebf2df4e..dd8fba9c9 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -85,6 +85,7 @@ $(document).ready(function() {
 		$enableownerrevapp = $this->params['enableownerrevapp'];
 		$enableselfrevapp = $this->params['enableselfrevapp'];
 		$enableselfreceipt = $this->params['enableselfreceipt'];
+		$enablereceiptworkflow = $this->params['enablereceiptworkflow'];
 		$workflowmode = $this->params['workflowmode'];
 		$presetexpiration = $this->params['presetexpiration'];
 		$documentid = $document->getId();
@@ -606,6 +607,7 @@ $(document).ready(function() {
 		</tr>	
 <?php
 	}
+	if($enablereceiptworkflow) {
 ?>
 		<tr>
 			<td colspan="2">
@@ -677,6 +679,9 @@ $(document).ready(function() {
 ?>
       </td>
 		</tr>
+<?php
+	}
+?>
 		<tr>
 			<td></td>
 			<td><input type="submit" class="btn" value="<?php printMLText("checkin_document")?>"></td>
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 8987461ea..1b9c9906d 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -686,9 +686,9 @@ if(!is_writeable($settings->_configFilePath)) {
 					</select>
 				</td>
       </tr>
-      <tr title="<?php printMLText("settings_enableAcknowledgeWorkflow_desc");?>">
-        <td><?php printMLText("settings_enableAcknowledgeWorkflow");?>:</td>
-        <td><input name="enableAcknowledgeWorkflow" type="checkbox" <?php if ($settings->_enableAcknowledgeWorkflow) echo "checked" ?> /></td>
+      <tr title="<?php printMLText("settings_enableReceiptWorkflow_desc");?>">
+        <td><?php printMLText("settings_enableReceiptWorkflow");?>:</td>
+        <td><input name="enableReceiptWorkflow" type="checkbox" <?php if ($settings->_enableReceiptWorkflow) echo "checked" ?> /></td>
       </tr>
       <tr title="<?php printMLText("settings_enableRevisionWorkflow_desc");?>">
         <td><?php printMLText("settings_enableRevisionWorkflow");?>:</td>
diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index b3707a97f..d01065de8 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -39,6 +39,8 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 	private function __myTasks() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$enablereceiptworkflow = $this->params['enablereceiptworkflow'];
+		$enablerevisionworkflow = $this->params['enablerevisionworkflow'];
 		$workflowmode = $this->params['workflowmode'];
 		$tasksinmenu = $this->params['tasksinmenu'];
 
@@ -68,30 +70,32 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 					}
 				}
 			}
-		if(!$tasksinmenu || in_array('receipt', $tasksinmenu)) {
-			$tasks['receipt'] = array();
-			$resArr = $dms->getDocumentList('ReceiptByMe', $user);
-			if($resArr) {
-				foreach ($resArr as $res) {
-					$document = $dms->getDocument($res["id"]);
-					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-						$tasks['receipt'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+		if($enablereceiptworkflow)
+			if(!$tasksinmenu || in_array('receipt', $tasksinmenu)) {
+				$tasks['receipt'] = array();
+				$resArr = $dms->getDocumentList('ReceiptByMe', $user);
+				if($resArr) {
+					foreach ($resArr as $res) {
+						$document = $dms->getDocument($res["id"]);
+						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+							$tasks['receipt'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+						}
 					}
 				}
 			}
-		}
-		if(!$tasksinmenu || in_array('revision', $tasksinmenu)) {
-			$tasks['revision'] = array();
-			$resArr = $dms->getDocumentList('ReviseByMe', $user);
-			if($resArr) {
-				foreach ($resArr as $res) {
-					$document = $dms->getDocument($res["id"]);
-					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-						$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+		if($enablerevisionworkflow)
+			if(!$tasksinmenu || in_array('revision', $tasksinmenu)) {
+				$tasks['revision'] = array();
+				$resArr = $dms->getDocumentList('ReviseByMe', $user);
+				if($resArr) {
+					foreach ($resArr as $res) {
+						$document = $dms->getDocument($res["id"]);
+						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+							$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+						}
 					}
 				}
 			}
-		}
 		if(!$tasksinmenu || in_array('needscorrection', $tasksinmenu)) {
 			$tasks['needscorrection'] = array();
 			$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user);
@@ -133,6 +137,8 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 	function countTasks() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$enablereceiptworkflow = $this->params['enablereceiptworkflow'];
+		$enablerevisionworkflow = $this->params['enablerevisionworkflow'];
 		$workflowmode = $this->params['workflowmode'];
 		$tasksinmenu = $this->params['tasksinmenu'];
 
@@ -150,10 +156,12 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 			if(!$tasksinmenu || in_array('workflow', $tasksinmenu)) {
 				$tasks['workflow'] = $dms->countTasks('WorkflowByMe', $user);
 			}
-		if(!$tasksinmenu || in_array('receipt', $tasksinmenu))
-			$tasks['receipt'] = $dms->countTasks('ReceiptByMe', $user);
-		if(!$tasksinmenu || in_array('revision', $tasksinmenu))
-			$tasks['revision'] = $dms->countTasks('ReviseByMe', $user);
+		if($enablereceiptworkflow)
+			if(!$tasksinmenu || in_array('receipt', $tasksinmenu))
+				$tasks['receipt'] = $dms->countTasks('ReceiptByMe', $user);
+		if($enablerevisionworkflow)
+			if(!$tasksinmenu || in_array('revision', $tasksinmenu))
+				$tasks['revision'] = $dms->countTasks('ReviseByMe', $user);
 		if(!$tasksinmenu || in_array('needscorrection', $tasksinmenu))
 			$tasks['needscorrection'] = $dms->countTasks('NeedsCorrectionOwner', $user);
 
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 66eff2560..44249a18e 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -146,6 +146,7 @@ console.log(element);
 		$enableadminrevapp = $this->params['enableadminrevapp'];
 		$enableownerrevapp = $this->params['enableownerrevapp'];
 		$enableselfrevapp = $this->params['enableselfrevapp'];
+		$enablereceiptworkflow = $this->params['enablereceiptworkflow'];
 		$enableselfreceipt = $this->params['enableselfreceipt'];
 		$dropfolderdir = $this->params['dropfolderdir'];
 		$workflowmode = $this->params['workflowmode'];
@@ -716,6 +717,7 @@ console.log(element);
 		</tr>	
 <?php
 	}
+	if($enablereceiptworkflow) {
 ?>
 		<tr>
 			<td colspan="2">
@@ -787,6 +789,9 @@ console.log(element);
 ?>
       </td>
 		</tr>
+<?php
+	}
+?>
 		<tr>
 			<td></td>
 			<td><input type="submit" class="btn" value="<?php printMLText("update_document")?>"></td>
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 12b30b80d..648909c67 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -433,6 +433,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$viewonlinefiletypes = $this->params['viewonlinefiletypes'];
 		$enableownerrevapp = $this->params['enableownerrevapp'];
 		$enableownerreceipt = $this->params['enableownerreceipt'];
+		$enablereceiptworkflow = $this->params['enablereceiptworkflow'];
+		$enablerevisionworkflow = $this->params['enablerevisionworkflow'];
 		$workflowmode = $this->params['workflowmode'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidthlist = $this->params['previewWidthList'];
@@ -666,11 +668,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			if($accessop->mayOverrideStatus($document)) {
 				print "<li>".$this->html_link('OverrideContentStatus', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-align-justify\"></i>".getMLText("change_status"), false, true)."</li>";
 			}
-		if($accessop->check_controller_access('SetRecipients'))
+		if($enablereceiptworkflow && $accessop->check_controller_access('SetRecipients'))
 			if($accessop->maySetRecipients($document)) {
 				print "<li>".$this->html_link('SetRecipients', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-check\"></i>".getMLText("change_recipients"), false, true)."</li>";
 			}
-		if($accessop->check_controller_access('SetRevisors'))
+		if($enablerevisionworkflow && $accessop->check_controller_access('SetRevisors'))
 			if($accessop->maySetRevisors($document)) {
 				print "<li>".$this->html_link('SetRevisors', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-refresh\"></i>".getMLText("change_revisors"), false, true)."</li>";
 			}

From c5396932883818431f5482cd58117afbe9bc4b67 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 Apr 2018 10:57:29 +0200
Subject: [PATCH 145/147] fix name for log files

---
 SeedDMS_Core/Core/inc.FileUtils.php     |  2 +-
 op/op.RemoveLog.php                     |  6 +++---
 out/out.LogManagement.php               |  2 +-
 out/out.RemoveLog.php                   |  2 +-
 views/bootstrap/class.LogManagement.php | 14 +++++++-------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.FileUtils.php b/SeedDMS_Core/Core/inc.FileUtils.php
index 2a322a0ae..abc56fb86 100644
--- a/SeedDMS_Core/Core/inc.FileUtils.php
+++ b/SeedDMS_Core/Core/inc.FileUtils.php
@@ -284,4 +284,4 @@ class SeedDMS_Core_File {
 		if($error) return false;
 		else return $dest;
 	} /* }}} */
-}
\ No newline at end of file
+}
diff --git a/op/op.RemoveLog.php b/op/op.RemoveLog.php
index 7836514c7..d698965b6 100644
--- a/op/op.RemoveLog.php
+++ b/op/op.RemoveLog.php
@@ -41,15 +41,15 @@ if (!isset($_POST["lognames"]) || !is_array($_POST["lognames"])) {
 
 $lognames = $_POST["lognames"];
 foreach($lognames as $file) {
-	if(!file_exists($settings->_contentDir.$file)) {
+	if(!file_exists($settings->_contentDir.'log/'.$file)) {
 		UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
 	}
 
-	if (@readlink($settings->_contentDir."current.log")==$settings->_contentDir.$file){
+	if (@readlink($settings->_contentDir."current.log")==$settings->_contentDir.'log/'.$file){
 		UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 	}
 
-	if (!SeedDMS_Core_File::removeFile($settings->_contentDir.$file)) {
+	if (!SeedDMS_Core_File::removeFile($settings->_contentDir.'log/'.$file)) {
 		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
 	}
 }
diff --git a/out/out.LogManagement.php b/out/out.LogManagement.php
index b6b2ba6cc..0984e4fcd 100644
--- a/out/out.LogManagement.php
+++ b/out/out.LogManagement.php
@@ -42,7 +42,7 @@ else $mode='web';
 if($view) {
 	$view->setParam('logname', $logname);
 	$view->setParam('mode', $mode);
-	$view->setParam('contentdir', $settings->_contentDir);
+	$view->setParam('logdir', $settings->_contentDir.'log/');
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.RemoveLog.php b/out/out.RemoveLog.php
index f8e39942c..5910d9e9e 100644
--- a/out/out.RemoveLog.php
+++ b/out/out.RemoveLog.php
@@ -47,7 +47,7 @@ if(!is_array($_GET["logname"]))
 else
 	$lognames = $_GET["logname"];
 foreach($lognames as $file) {
-	if(!file_exists($settings->_contentDir.$file)) {
+	if(!file_exists($settings->_contentDir.'log/'.$file)) {
 		UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
 	}
 }
diff --git a/views/bootstrap/class.LogManagement.php b/views/bootstrap/class.LogManagement.php
index 6641571cf..93659ec29 100644
--- a/views/bootstrap/class.LogManagement.php
+++ b/views/bootstrap/class.LogManagement.php
@@ -52,8 +52,8 @@ class SeedDMS_View_LogManagement extends SeedDMS_Bootstrap_Style {
 			print "<td><input type=\"checkbox\" name=\"logname[]\" value=\"".$entry."\"/></td>\n";
 			print "<td><a href=\"out.LogManagement.php?logname=".$entry."\">".$entry."</a></td>\n";
 			print "\n";
-			print "<td>".getLongReadableDate(filectime($this->contentdir.$entry))."</td>\n";
-			print "<td>".SeedDMS_Core_File::format_filesize(filesize($this->contentdir.$entry))."</td>\n";
+			print "<td>".getLongReadableDate(filectime($this->logdir.$entry))."</td>\n";
+			print "<td>".SeedDMS_Core_File::format_filesize(filesize($this->logdir.$entry))."</td>\n";
 			print "<td>";
 			
 			print "<a href=\"out.RemoveLog.php?mode=".$mode."&logname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("rm_file")."</a>";
@@ -86,7 +86,7 @@ $(document).ready( function() {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
-		$this->contentdir = $this->params['contentdir'];
+		$this->logdir = $this->params['logdir'];
 		$logname = $this->params['logname'];
 		$mode = $this->params['mode'];
 
@@ -100,10 +100,10 @@ $(document).ready( function() {
 
 		$entries = array();
 		$wentries = array();
-		$handle = opendir($this->contentdir);
+		$handle = opendir($this->logdir);
 		if($handle) {
 			while ($e = readdir($handle)){
-				if (is_dir($this->contentdir.$e)) continue;
+				if (is_dir($this->logdir.$e)) continue;
 				if (strpos($e,".log")==FALSE) continue;
 				if (strcmp($e,"current.log")==0) continue;
 				if(substr($e, 0, 6) ==  'webdav') {
@@ -151,9 +151,9 @@ $(document).ready( function() {
 <?php
 		$this->contentEnd();
 		$this->htmlEndPage();
-		} elseif(file_exists($this->contentdir.$logname)){
+		} elseif(file_exists($this->logdir.$logname)){
 			echo $logname."<pre>\n";
-			readfile($this->contentdir.$logname);
+			readfile($this->logdir.$logname);
 			echo "</pre>\n";
 		} else {
 			UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));

From 57dc5fa31ab2231e806c5807454e5824d7ee8f2f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 Apr 2018 11:27:12 +0200
Subject: [PATCH 146/147] do not set the uploader of a document to the owner

use the currently logged in user instead
---
 CHANGELOG                             | 2 ++
 SeedDMS_Core/Core/inc.ClassDMS.php    | 9 +++++----
 SeedDMS_Core/Core/inc.ClassFolder.php | 5 ++---
 SeedDMS_Core/package.xml              | 3 ++-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ec567bbe5..7c83aeef8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,8 @@
 - add number of documents which need correction to menu
 - minor 2 factor auth. fixes when initially setting the secret
 - remove ѕome unneeded code from AddDocument which just caused php warnings
+- do not set the uploader of new documents to owner if the owner is different from
+  the uploader
 - merge changes up to 5.1.6
 
 --------------------------------------------------------------------------------
diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 4ab83c02f..959057ba6 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -439,6 +439,7 @@ class SeedDMS_Core_DMS {
 		$this->enableConverting = false;
 		$this->convertFileTypes = array();
 		$this->noReadForStatus = array();
+		$this->user = null;
 		$this->classnames = array();
 		$this->classnames['folder'] = 'SeedDMS_Core_Folder';
 		$this->classnames['document'] = 'SeedDMS_Core_Document';
@@ -620,8 +621,9 @@ class SeedDMS_Core_DMS {
 	/**
 	 * Set the logged in user
 	 *
-	 * If user authentication was done externally, this function can
-	 * be used to tell the dms who is currently logged in.
+	 * This method tells SeeDMS_Core_DMS the currently logged in user. It must be
+	 * called right after instanciating the class, because some methods in
+	 * SeedDMS_Core_Document() require the currently logged in user.
 	 *
 	 * @param object $user
 	 *
@@ -633,8 +635,7 @@ class SeedDMS_Core_DMS {
 	/**
 	 * Get the logged in user
 	 *
-	 * If user authentication was done externally, this function can
-	 * be used to tell the dms who is currently logged in.
+	 * Returns the currently logged in user, as set by setUser()
 	 *
 	 * @return SeedDMS_Core_User $user
 	 *
diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index 0761bc6c5..cc7cfa80a 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -917,9 +917,8 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 
 		$document = $this->_dms->getDocument($db->getInsertID('tblDocuments'));
 
-//		if ($version_comment!="")
-			$res = $document->addContent($version_comment, $owner, $tmpFile, $orgFileName, $fileType, $mimeType, $reviewers, $approvers, $reqversion, $version_attributes, $workflow, $initstate);
-//		else $res = $document->addContent($comment, $owner, $tmpFile, $orgFileName, $fileType, $mimeType, $reviewers, $approvers,$reqversion, $version_attributes, $workflow);
+		$curuser = $this->_dms->getLoggedInUser();
+		$res = $document->addContent($version_comment, $curuser ? $curuser : $owner, $tmpFile, $orgFileName, $fileType, $mimeType, $reviewers, $approvers, $reqversion, $version_attributes, $workflow, $initstate);
 
 		if (is_bool($res) && !$res) {
 			$db->rollbackTransaction();
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index cd247a9ac..2095ca85e 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,7 +12,7 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2018-03-14</date>
+ <date>2018-04-03</date>
  <time>09:19:24</time>
  <version>
   <release>6.0.6</release>
@@ -24,6 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
+SeedDMS_Core_Folder::addContent() uses currently logged in user as uploader instead of owner
 SeedDMS_Core_DocumentContent::verifyStatus() will not set status to S_RELEASED
 if currently in S_DRAFT status und no workflow, review, approval, or revision
 is pending.

From 9627e319a8519ac3a0c726364b9f2e973a4ed8e6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 Apr 2018 14:33:29 +0200
Subject: [PATCH 147/147] various minor updates

---
 languages/ar_EG/lang.inc |  9 +++++++--
 languages/bg_BG/lang.inc | 15 ++++++++++-----
 languages/ca_ES/lang.inc |  9 +++++++--
 languages/cs_CZ/lang.inc |  9 +++++++--
 languages/de_DE/lang.inc | 13 +++++++++----
 languages/el_GR/lang.inc |  9 +++++++--
 languages/en_GB/lang.inc | 19 ++++++++++++-------
 languages/es_ES/lang.inc |  9 +++++++--
 languages/fr_FR/lang.inc | 17 +++++++++++------
 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/nl_NL/lang.inc | 13 +++++++++----
 languages/pl_PL/lang.inc |  9 +++++++--
 languages/pt_BR/lang.inc |  9 +++++++--
 languages/ro_RO/lang.inc |  9 +++++++--
 languages/ru_RU/lang.inc |  9 +++++++--
 languages/sk_SK/lang.inc |  9 +++++++--
 languages/sv_SE/lang.inc | 13 +++++++++----
 languages/tr_TR/lang.inc |  9 +++++++--
 languages/uk_UA/lang.inc |  9 +++++++--
 languages/zh_CN/lang.inc | 21 +++++++++++++--------
 languages/zh_TW/lang.inc |  9 +++++++--
 24 files changed, 192 insertions(+), 72 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index ad62bb0d1..ca3270aea 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -329,6 +329,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'مستندات في انتظار المراجعة',
 'documents_to_revise' => '',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_needs_correction' => '',
@@ -465,6 +466,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'لم يتم اختيار مستند',
 'error_no_folder_selected' => 'لم يتم اختيار مجلد',
@@ -1184,8 +1186,6 @@ URL: [url]',
 'settings_editOnlineFileTypes_desc' => '',
 'settings_enable2FactorAuthentication' => '',
 'settings_enable2FactorAuthentication_desc' => '',
-'settings_enableAcknowledgeWorkflow' => '',
-'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminReceipt' => '',
 'settings_enableAdminReceipt_desc' => '',
 'settings_enableAdminRevApp' => '',
@@ -1236,6 +1236,8 @@ URL: [url]',
 'settings_enableOwnerRevApp_desc' => '',
 'settings_enablePasswordForgotten' => '',
 'settings_enablePasswordForgotten_desc' => '',
+'settings_enableReceiptWorkflow' => '',
+'settings_enableReceiptWorkflow_desc' => '',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
 'settings_enableRevisionOnVoteReject' => '',
@@ -1420,9 +1422,11 @@ URL: [url]',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => 'الشكل الافتراضي',
 'settings_theme_desc' => '',
 'settings_titleDisplayHack' => '',
@@ -1484,6 +1488,7 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_getlist' => '',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_folder_edited' => '',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index bd7b7dc0f..64bc9aa77 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (839)
+//    Translators: Admin (841)
 
 $text = array(
 '2_factor_auth' => '',
@@ -312,6 +312,7 @@ $text = array(
 'documents_to_receipt' => '',
 'documents_to_review' => 'Документы, чакащи Вашата рецензия',
 'documents_to_revise' => '',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_needs_correction' => '',
@@ -418,6 +419,7 @@ $text = array(
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Няма избрани документи',
 'error_no_folder_selected' => 'Няма избрани папки',
@@ -1047,8 +1049,6 @@ $text = array(
 'settings_editOnlineFileTypes_desc' => '',
 'settings_enable2FactorAuthentication' => '',
 'settings_enable2FactorAuthentication_desc' => '',
-'settings_enableAcknowledgeWorkflow' => '',
-'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminReceipt' => '',
 'settings_enableAdminReceipt_desc' => '',
 'settings_enableAdminRevApp' => 'Разреши Admin Rev App',
@@ -1099,6 +1099,8 @@ $text = array(
 'settings_enableOwnerRevApp_desc' => '',
 'settings_enablePasswordForgotten' => 'Включи възстанавяване на парола',
 'settings_enablePasswordForgotten_desc' => 'Ако е включено, разрешава на потребителите да си възстанавяват паролата на email.',
+'settings_enableReceiptWorkflow' => '',
+'settings_enableReceiptWorkflow_desc' => '',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
 'settings_enableRevisionOnVoteReject' => '',
@@ -1283,9 +1285,11 @@ $text = array(
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => 'Тема по подразбиране',
 'settings_theme_desc' => 'Стил по подразбиране (подпапка в папка "styles")',
 'settings_titleDisplayHack' => 'Подпирачка за заглавия',
@@ -1347,6 +1351,7 @@ $text = array(
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_getlist' => '',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_folder_edited' => '',
@@ -1457,12 +1462,12 @@ $text = array(
 'timeline_skip_status_change_3' => '',
 'timeline_skip_status_change_4' => '',
 'timeline_skip_status_change_5' => '',
-'timeline_status_change' => '',
+'timeline_status_change' => 'Версия [version]: [status]',
 'to' => 'към',
 'toggle_manager' => 'Превключи мениджър',
 'toggle_qrcode' => '',
 'to_before_from' => '',
-'transfer_document' => '',
+'transfer_document' => 'Прехвърли документ',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',
 'transfer_objects' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 80c3d0383..ea8c434cd 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -317,6 +317,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents en espera de revisió d\'usuaris',
 'documents_to_revise' => '',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_needs_correction' => '',
@@ -423,6 +424,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => '',
 'error_no_folder_selected' => '',
@@ -1052,8 +1054,6 @@ URL: [url]',
 'settings_editOnlineFileTypes_desc' => '',
 'settings_enable2FactorAuthentication' => '',
 'settings_enable2FactorAuthentication_desc' => '',
-'settings_enableAcknowledgeWorkflow' => '',
-'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminReceipt' => '',
 'settings_enableAdminReceipt_desc' => '',
 'settings_enableAdminRevApp' => '',
@@ -1104,6 +1104,8 @@ URL: [url]',
 'settings_enableOwnerRevApp_desc' => '',
 'settings_enablePasswordForgotten' => '',
 'settings_enablePasswordForgotten_desc' => '',
+'settings_enableReceiptWorkflow' => '',
+'settings_enableReceiptWorkflow_desc' => '',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
 'settings_enableRevisionOnVoteReject' => '',
@@ -1288,9 +1290,11 @@ URL: [url]',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => 'Default theme',
 'settings_theme_desc' => 'Default style (name of a subfolder in folder "styles")',
 'settings_titleDisplayHack' => 'Title Display Hack',
@@ -1352,6 +1356,7 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_getlist' => '',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_folder_edited' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 09294b3a0..992784ca3 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -336,6 +336,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čekající na kontrolu uživatele',
 'documents_to_revise' => '',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_needs_correction' => '',
@@ -472,6 +473,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Není vybrán žádný dokument.',
 'error_no_folder_selected' => 'Není vybrána žádná složka',
@@ -1193,8 +1195,6 @@ URL: [url]',
 'settings_editOnlineFileTypes_desc' => '',
 'settings_enable2FactorAuthentication' => '',
 'settings_enable2FactorAuthentication_desc' => '',
-'settings_enableAcknowledgeWorkflow' => '',
-'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminReceipt' => '',
 'settings_enableAdminReceipt_desc' => '',
 'settings_enableAdminRevApp' => '',
@@ -1245,6 +1245,8 @@ URL: [url]',
 'settings_enableOwnerRevApp_desc' => 'Povolte to, pokud chcete, aby byl vlastník dokumentu uveden jako posuzovatel/schvalovatel a pro přechody pracovního postupu.',
 'settings_enablePasswordForgotten' => 'Enable Password forgotten',
 'settings_enablePasswordForgotten_desc' => '',
+'settings_enableReceiptWorkflow' => '',
+'settings_enableReceiptWorkflow_desc' => '',
 'settings_enableRecursiveCount' => 'Povolit rekurzivní počítání dokumentů/složek',
 'settings_enableRecursiveCount_desc' => 'Při zapnutí je počet dokumentů a složek v zobrazení složek určen počítáním všech objektů při rekurzivním zpracování složek a počítáním těch dokumentů a složek, ke kterým má uživatel přístup.',
 'settings_enableRevisionOnVoteReject' => '',
@@ -1429,9 +1431,11 @@ URL: [url]',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => 'Default theme',
 'settings_theme_desc' => 'Default style (name of a subfolder in folder "styles")',
 'settings_titleDisplayHack' => 'Title Display Hack',
@@ -1493,6 +1497,7 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_getlist' => '',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Změny složky uloženy',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index a488384cf..1f05409d1 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 (2596), dgrutsch (22)
+//    Translators: Admin (2602), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -66,7 +66,7 @@ URL: [url]',
 'add_multiple_documents' => 'Mehrere Dokumente anlegen',
 'add_multiple_files' => 'Mehrere Dateien hochladen (Dateiname wird als Dokumentenname verwendet)',
 'add_receipt' => 'Empfang bestätigen',
-'add_review' => 'Wiederholungsprüfung hinzufügen',
+'add_review' => 'Prüfung hinzufügen',
 'add_revision' => 'Wiederholungsprüfung hinzufügen',
 'add_role' => 'Neue Rolle anlegen',
 'add_subfolder' => 'Unterordner anlegen',
@@ -341,6 +341,7 @@ URL: [url]',
 'documents_to_receipt' => 'Empfangsbestätigung erforderlich',
 'documents_to_review' => 'Prüfung erforderlich',
 'documents_to_revise' => 'Erneute Prüfung erforderlich',
+'documents_to_trigger_workflow' => 'Dokumente im Workflow',
 'documents_user_draft' => 'Entwürfe',
 'documents_user_expiration' => 'Abgelaufende Dokumente',
 'documents_user_needs_correction' => 'Dokumente, die korrigiert werden müssen',
@@ -495,6 +496,7 @@ Der Link ist bis zum [valid] gültig.
 'error_add_aro' => 'Fehler beim Hinzufügen des Zugriffsobjekt',
 'error_add_permission' => 'Fehler beim Hinzufügen der Berechtigung',
 'error_cleared_cache' => 'Fehler beim Löschen des Cache',
+'error_extension_getlist' => 'Fehler beim Holen der Liste der Erweiterungen aus dem Repositorium',
 'error_importfs' => 'Fehler beim Importieren aus dem Dateisystem',
 'error_no_document_selected' => 'Kein Dokument ausgewählt',
 'error_no_folder_selected' => 'Kein Ordner ausgewählt',
@@ -1273,8 +1275,6 @@ Name: [username]
 'settings_editOnlineFileTypes_desc' => 'Dateien mit den angegebenen Endungen können Online editiert werden (benutzen Sie ausschließlich Kleinbuchstaben).',
 'settings_enable2FactorAuthentication' => '2-Faktor Authentifizierung einschalten',
 'settings_enable2FactorAuthentication_desc' => 'Schaltet die 2-Faktor Authentifizierung ein, welche den Google Authenticator auf dem Mobiltelefon erfordert.',
-'settings_enableAcknowledgeWorkflow' => 'Ermögliche Bestätigung des Dokumentenempfang',
-'settings_enableAcknowledgeWorkflow_desc' => 'Anwählen, um den Workflow zur Kenntnisnahme von Dokumenten einzuschalten',
 'settings_enableAdminReceipt' => 'Admin darf Empfang bestätigen',
 'settings_enableAdminReceipt_desc' => 'Anwählen, um Administratoren in der Liste der Personen für eine Empfangsbestätigung auszugeben',
 'settings_enableAdminRevApp' => 'Admin darf freigeben/prüfen',
@@ -1325,6 +1325,8 @@ Name: [username]
 'settings_enableOwnerRevApp_desc' => 'Anwählen, um den Besitzer eines Dokuments in der Liste der Prüfer/Freigeber und für Workflow-Aktionen auswählbar zu machen.',
 'settings_enablePasswordForgotten' => 'Passwort-Vergessen Funktion einschalten',
 'settings_enablePasswordForgotten_desc' => 'Setzen Sie diese Option, wenn Benutzer ein neues Password per E-Mail anfordern dürfen.',
+'settings_enableReceiptWorkflow' => 'Ermögliche Bestätigung des Dokumentenempfang',
+'settings_enableReceiptWorkflow_desc' => 'Anwählen, um den Workflow zur Kenntnisnahme von Dokumenten einzuschalten',
 'settings_enableRecursiveCount' => 'Rekursive Dokumenten-/Ordner-Zählung',
 'settings_enableRecursiveCount_desc' => 'Wenn diese Option eingeschaltet ist, wird die Anzahl der Dokumente und Ordner in der Ordner-Ansicht rekursiv, unter Berücksichtigung der Zugriffsrechte ermittelt.',
 'settings_enableRevisionOnVoteReject' => 'Ablehnung durch einen Wiederholungsprüfer',
@@ -1509,9 +1511,11 @@ Name: [username]
 'settings_tasksInMenu' => 'Ausgewähtlte Aufgaben',
 'settings_tasksInMenu_approval' => 'Freigaben',
 'settings_tasksInMenu_desc' => 'Setzt die Aufgaben, die gezählt werden sollen. Wenn keine Aufgaben ausgewählt werden, werden alle gezählt.',
+'settings_tasksInMenu_needscorrection' => 'Korrektur erforderlich',
 'settings_tasksInMenu_receipt' => 'Prüfungen',
 'settings_tasksInMenu_review' => 'Empfangsbestätigungen',
 'settings_tasksInMenu_revision' => 'Wiederholungsprüfungen',
+'settings_tasksInMenu_workflow' => 'Workflow',
 'settings_theme' => 'Aussehen',
 'settings_theme_desc' => 'Voreingestelltes Aussehen (Name des Unterordners \'styles\')',
 'settings_titleDisplayHack' => 'Title Display Hack',
@@ -1573,6 +1577,7 @@ Name: [username]
 'splash_error_add_to_transmittal' => 'Fehler beim Hinzufügen zur Dokumentenliste',
 'splash_error_rm_download_link' => 'Fehler beim Löschen des Download-Links',
 'splash_error_send_download_link' => 'Fehler beim Verschicken des Download-Links',
+'splash_extension_getlist' => 'Liste der Erweiterungen im Repositorium aktualisiert.',
 'splash_extension_import' => 'Erweiterung installiert',
 'splash_extension_refresh' => 'Liste der Erweiterungen neu geladen',
 'splash_folder_edited' => 'Änderungen am Ordner gespeichert',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 959b42255..16546ab8e 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -312,6 +312,7 @@ $text = array(
 'documents_to_receipt' => '',
 'documents_to_review' => '',
 'documents_to_revise' => '',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_needs_correction' => '',
@@ -418,6 +419,7 @@ $text = array(
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Δεν έχει επιλεγεί έγγραφο',
 'error_no_folder_selected' => '',
@@ -1058,8 +1060,6 @@ URL: [url]',
 'settings_editOnlineFileTypes_desc' => '',
 'settings_enable2FactorAuthentication' => '',
 'settings_enable2FactorAuthentication_desc' => '',
-'settings_enableAcknowledgeWorkflow' => '',
-'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminReceipt' => '',
 'settings_enableAdminReceipt_desc' => '',
 'settings_enableAdminRevApp' => '',
@@ -1110,6 +1110,8 @@ URL: [url]',
 'settings_enableOwnerRevApp_desc' => '',
 'settings_enablePasswordForgotten' => '',
 'settings_enablePasswordForgotten_desc' => '',
+'settings_enableReceiptWorkflow' => '',
+'settings_enableReceiptWorkflow_desc' => '',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
 'settings_enableRevisionOnVoteReject' => '',
@@ -1294,9 +1296,11 @@ URL: [url]',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => '',
 'settings_theme_desc' => '',
 'settings_titleDisplayHack' => '',
@@ -1358,6 +1362,7 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_getlist' => '',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_folder_edited' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 0654b8301..26a81aeda 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 (1710), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1720), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -324,7 +324,7 @@ URL: [url]',
 'de_DE' => 'German',
 'disclaimer' => 'This is a classified area. Access is permitted only to authorized personnel. Any violation will be prosecuted according to the national and international laws.',
 'discspace' => 'Disc space',
-'docs_in_reception_no_access' => 'Documents with recepiton without access by recipient',
+'docs_in_reception_no_access' => 'Documents with reception without access by recipient',
 'docs_in_revision_no_access' => 'Documents in revision without access by revisor',
 'document' => 'Document',
 'documentcontent' => 'Document content',
@@ -341,6 +341,7 @@ URL: [url]',
 'documents_to_receipt' => 'Documents awaiting to confirm the receipt',
 'documents_to_review' => 'Documents awaiting your review',
 'documents_to_revise' => 'Documents awaiting your revision',
+'documents_to_trigger_workflow' => 'Documents in workflow',
 'documents_user_draft' => 'Drafts',
 'documents_user_expiration' => 'Expired documents',
 'documents_user_needs_correction' => 'Documents that need to be corrected',
@@ -496,6 +497,7 @@ The link is valid until [valid].
 'error_add_aro' => 'Error while adding access request object',
 'error_add_permission' => 'Error while add permission',
 'error_cleared_cache' => 'Error while clearing cache',
+'error_extension_getlist' => 'Error getting extension list from repository',
 'error_importfs' => 'Error while importing form file system',
 'error_no_document_selected' => 'No document selected',
 'error_no_folder_selected' => 'No folder selected',
@@ -1268,9 +1270,7 @@ Name: [username]
 'settings_editOnlineFileTypes_desc' => 'Files with one of the following endings can be edited online (USE ONLY LOWER CASE CHARACTERS)',
 'settings_enable2FactorAuthentication' => 'Enable 2-factor authentication',
 'settings_enable2FactorAuthentication_desc' => 'Enable/disable 2 factor authentication. The users will need the Google Authenticator on its mobile phone.',
-'settings_enableAcknowledgeWorkflow' => 'Enable acknowledge of document reception',
-'settings_enableAcknowledgeWorkflow_desc' => 'Enable, to turn on the workflow to acknowledge document reception.',
-'settings_enableAdminReceipt' => 'Allow recepiton of documetns for admins',
+'settings_enableAdminReceipt' => 'Allow reception of documents for admins',
 'settings_enableAdminReceipt_desc' => 'Enable this if you want administrators to be listed as recipients of documents.',
 'settings_enableAdminRevApp' => 'Allow review/approval for admins',
 'settings_enableAdminRevApp_desc' => 'Enable this if you want administrators to be listed as reviewers/approvers and for workflow transitions.',
@@ -1314,19 +1314,21 @@ Name: [username]
 'settings_enableNotificationWorkflow_desc' => 'If this option is enabled, the users and groups which need to take action in the next workflow transition will be notified. Even if they have not added a notification for the document.',
 'settings_enableOwnerNotification' => 'Enable owner notification by default',
 'settings_enableOwnerNotification_desc' => 'Check for adding a notification for the owner if a document when it is added.',
-'settings_enableOwnerReceipt' => 'Allow acknowleging document by owner',
+'settings_enableOwnerReceipt' => 'Allow reception of documents by owner',
 'settings_enableOwnerReceipt_desc' => 'Enable this if you want the owner of a document to be listed as a recipient.',
 'settings_enableOwnerRevApp' => 'Allow review/approval for owner',
 'settings_enableOwnerRevApp_desc' => 'Enable this if you want the owner of a document to be listed as reviewers/approvers and for workflow transitions.',
 'settings_enablePasswordForgotten' => 'Enable Password forgotten',
 'settings_enablePasswordForgotten_desc' => 'If you want to allow user to set a new password and send it by mail, check this option.',
+'settings_enableReceiptWorkflow' => 'Enable acknowledge of document reception',
+'settings_enableReceiptWorkflow_desc' => 'Enable, to turn on the workflow to acknowledge document reception.',
 'settings_enableRecursiveCount' => 'Enable recursive document/folder count',
 'settings_enableRecursiveCount_desc' => 'If turned on, the number of documents and folders in the folder view will be determined by counting all objects by recursively processing the folders and counting those documents and folders the user is allowed to access.',
 'settings_enableRevisionOnVoteReject' => 'Reject by one revisor',
 'settings_enableRevisionOnVoteReject_desc' => 'If set the document will be reject if one revisor rejects the document.',
 'settings_enableRevisionWorkflow' => 'Enable revision of documents',
 'settings_enableRevisionWorkflow_desc' => 'Enable, to be able to run the workflow for revising a document after a given period of time.',
-'settings_enableSelfReceipt' => 'Allow reception for logged in user',
+'settings_enableSelfReceipt' => 'Allow reception of documents for logged in user',
 'settings_enableSelfReceipt_desc' => 'Enable this if you want the currently logged in user to be listed as recipient for a document.',
 'settings_enableSelfRevApp' => 'Allow review/approval for logged in user',
 'settings_enableSelfRevApp_desc' => 'Enable this if you want the currently logged in user to be listed as reviewers/approvers and for workflow transitions.',
@@ -1504,9 +1506,11 @@ Name: [username]
 'settings_tasksInMenu' => 'Selected tasks',
 'settings_tasksInMenu_approval' => 'Approvals',
 'settings_tasksInMenu_desc' => 'Select those tasks which are to be counted. If none is selected, then all tasks will be counted.',
+'settings_tasksInMenu_needscorrection' => 'Correction needed',
 'settings_tasksInMenu_receipt' => 'Reviews',
 'settings_tasksInMenu_review' => 'Receipts',
 'settings_tasksInMenu_revision' => 'Revisions',
+'settings_tasksInMenu_workflow' => 'Workflow',
 'settings_theme' => 'Default theme',
 'settings_theme_desc' => 'Default style (name of a subfolder in folder "styles")',
 'settings_titleDisplayHack' => 'Title Display Hack',
@@ -1568,6 +1572,7 @@ Name: [username]
 'splash_error_add_to_transmittal' => 'Error while adding document to transmittal',
 'splash_error_rm_download_link' => 'Error when removing download link',
 'splash_error_send_download_link' => 'Error while sending download link',
+'splash_extension_getlist' => 'Updated list of extensions from repository',
 'splash_extension_import' => 'Extensition installed',
 'splash_extension_refresh' => 'Refreshed list of extensions',
 'splash_folder_edited' => 'Save folder changes',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 2542b73ab..d9149f94d 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -336,6 +336,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documentos en espera de revisión de usuarios',
 'documents_to_revise' => '',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_needs_correction' => '',
@@ -472,6 +473,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Ningún documento seleccionado',
 'error_no_folder_selected' => 'Ninguna carpeta seleccionada',
@@ -1199,8 +1201,6 @@ URL: [url]',
 'settings_editOnlineFileTypes_desc' => 'Los  archivos con las siguientes terminaciones pueden ser editados online (USE SOLO MINUSCULAS)',
 'settings_enable2FactorAuthentication' => '',
 'settings_enable2FactorAuthentication_desc' => '',
-'settings_enableAcknowledgeWorkflow' => '',
-'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminReceipt' => '',
 'settings_enableAdminReceipt_desc' => '',
 'settings_enableAdminRevApp' => 'Habilitar Administrador Rev Apr',
@@ -1251,6 +1251,8 @@ URL: [url]',
 'settings_enableOwnerRevApp_desc' => 'Habilitar esto si quiere que el propietario de un documento sea listado como revisor/aprobador y para las transiciones del flujo de trabajo.',
 'settings_enablePasswordForgotten' => 'Habilitar recordatorio de contraseña',
 'settings_enablePasswordForgotten_desc' => 'Si quiere permitir a los usuarios fijar una nueva contraseña recibiendo un correo electrónico, active esta opción.',
+'settings_enableReceiptWorkflow' => '',
+'settings_enableReceiptWorkflow_desc' => '',
 'settings_enableRecursiveCount' => 'Habilitar cuenta de documento/carpeta recursivo',
 'settings_enableRecursiveCount_desc' => 'Si cambia a activado, el número de documentos y carpetas en la carpeta será determinado por la cuenta de todos los objetos recursivos procesados de la carpeta y una vez contados el usuarios tendrá permiso para acceder.',
 'settings_enableRevisionOnVoteReject' => '',
@@ -1435,9 +1437,11 @@ URL: [url]',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => 'Tema por defecto',
 'settings_theme_desc' => 'Estilo por defecto (nombre de una subcarpeta de la carpeta "styles")',
 'settings_titleDisplayHack' => 'Arreglo para mostrar título',
@@ -1499,6 +1503,7 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_getlist' => '',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Cambios a la carpeta guardados',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index f51a293c5..d1637bd0c 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1080), jeromerobert (50), lonnnew (9), Oudiceval (674)
+//    Translators: Admin (1083), jeromerobert (50), lonnnew (9), Oudiceval (674)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -341,6 +341,7 @@ URL: [url]',
 'documents_to_receipt' => 'Documents en attente de confirmation de réception',
 'documents_to_review' => 'Documents en attente de vérification',
 'documents_to_revise' => 'Documents en attente de votre révision',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => 'Ébauches',
 'documents_user_expiration' => 'Documents expirés',
 'documents_user_needs_correction' => 'Documents nécessitant une correction',
@@ -496,6 +497,7 @@ Le lien est valide jusqu’au [valid].
 'error_add_aro' => '',
 'error_add_permission' => 'Erreur lors de l’ajout de permission',
 'error_cleared_cache' => 'Erreur lors du vidage du cache',
+'error_extension_getlist' => '',
 'error_importfs' => 'Erreur lors de l’import depuis le système de fichiers',
 'error_no_document_selected' => 'Aucun document sélectionné',
 'error_no_folder_selected' => 'Aucun dossier sélectionné',
@@ -532,13 +534,13 @@ URL : [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Date d\'expiration modifiée',
 'export' => '',
 'extension_archive' => 'Extension',
-'extension_changelog' => '',
+'extension_changelog' => 'Journal des modifications',
 'extension_loading' => '',
 'extension_manager' => 'Gestionnaire d\'extensions',
 'extension_mgr_installed' => 'Installées',
 'extension_mgr_no_upload' => 'L’ajout de nouvelles extensions n’est pas possible car le répertoire des extensions n’est pas accessible en écriture.',
 'extension_mgr_repository' => 'Disponibles',
-'extension_version_list' => '',
+'extension_version_list' => 'Versions',
 'february' => 'Février',
 'file' => 'Fichier',
 'files' => 'Fichiers',
@@ -1252,8 +1254,6 @@ Nom : [username]
 'settings_editOnlineFileTypes_desc' => 'Le contenu des fichiers portant les extensions précisées pourra être modifié en ligne (utiliser des lettres minuscules)',
 'settings_enable2FactorAuthentication' => 'Activer l’authentification forte',
 'settings_enable2FactorAuthentication_desc' => 'Active/désactive l\'authentification forte à 2 facteurs. Les utilisateurs devront installer Google Authenticator sur leur téléphone mobile.',
-'settings_enableAcknowledgeWorkflow' => 'Activer la réception de document',
-'settings_enableAcknowledgeWorkflow_desc' => 'Activer cette option pour permettre de confirmer la réception de document dans le workflow.',
 'settings_enableAdminReceipt' => 'Réception de document autorisée par l’administrateur',
 'settings_enableAdminReceipt_desc' => 'Activer cette option pour permettre aux administrateurs d’être listés en tant que destinataires.',
 'settings_enableAdminRevApp' => 'Autoriser vérification/approbation par les administrateurs',
@@ -1304,6 +1304,8 @@ Nom : [username]
 'settings_enableOwnerRevApp_desc' => 'Activer cette option pour ajouter le propriétaire du document à la liste des examinateurs/approbateurs et pour les transitions de workflow.',
 'settings_enablePasswordForgotten' => 'Activer Mot de passe oublié',
 'settings_enablePasswordForgotten_desc' => 'Si vous voulez permettre à l\'utilisateur de définir un nouveau mot de passe et l\'envoyer par mail, cochez cette option.',
+'settings_enableReceiptWorkflow' => 'Activer la réception de document',
+'settings_enableReceiptWorkflow_desc' => 'Activer cette option pour permettre de confirmer la réception de document dans le workflow.',
 'settings_enableRecursiveCount' => 'Décompte récursif des documents/dossiers',
 'settings_enableRecursiveCount_desc' => 'Si activé, le nombre de documents et répertoires dans un répertoire est calculé en comptant récursivement le contenu des sous-répertoires auxquels l\'utilisateur a accès.',
 'settings_enableRevisionOnVoteReject' => 'Rejet par un réviseur',
@@ -1488,9 +1490,11 @@ Nom : [username]
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => 'Thème par défaut',
 'settings_theme_desc' => 'Thème par défaut(nom d\'un sous-répertoire du répertoire "styles")',
 'settings_titleDisplayHack' => 'Title Display Hack',
@@ -1518,7 +1522,7 @@ Nom : [username]
 'set_password' => 'Définir mot de passe',
 'set_workflow' => 'Définir le Workflow',
 'show_extension_changelog' => '',
-'show_extension_version_list' => '',
+'show_extension_version_list' => 'Afficher la liste des versions',
 'signed_in_as' => 'Connecté en tant que',
 'sign_in' => 'Connexion',
 'sign_out' => 'Déconnexion',
@@ -1552,6 +1556,7 @@ Nom : [username]
 '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_send_download_link' => 'Erreur lors de l’envoi du lien de téléchargement',
+'splash_extension_getlist' => '',
 'splash_extension_import' => 'Extension installée',
 'splash_extension_refresh' => 'Liste des extensions actualisée',
 'splash_folder_edited' => 'Dossier modifié',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 758da9f25..b8ec42921 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -341,6 +341,7 @@ Internet poveznica: [url]',
 'documents_to_receipt' => 'Dokumenti koji čekaju potvrdu primitka',
 'documents_to_review' => 'Dokumenti koji čekaju vaš pregled',
 'documents_to_revise' => 'Dokumenti za reviziju',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_needs_correction' => '',
@@ -477,6 +478,7 @@ Internet poveznica: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Nije odabran dokument',
 'error_no_folder_selected' => 'Nije odabrana mapa',
@@ -1220,8 +1222,6 @@ Internet poveznica: [url]',
 'settings_editOnlineFileTypes_desc' => '',
 'settings_enable2FactorAuthentication' => '',
 'settings_enable2FactorAuthentication_desc' => '',
-'settings_enableAcknowledgeWorkflow' => 'Omogućavanje potvrđivanja prijema dokumenta',
-'settings_enableAcknowledgeWorkflow_desc' => 'Omogućite kako bi omogućili tok rada za potvrđivajne prijema dokumenta.',
 'settings_enableAdminReceipt' => '',
 'settings_enableAdminReceipt_desc' => '',
 'settings_enableAdminRevApp' => 'Dopusti pregled/ovjeru za administratore',
@@ -1272,6 +1272,8 @@ Internet poveznica: [url]',
 'settings_enableOwnerRevApp_desc' => 'Omogućite ovo ako želite da vlasnik dokumenta bude naveden kao recezent/validator i za promjene tokova rada.',
 'settings_enablePasswordForgotten' => 'Omogući zaboravljanje lozinke',
 'settings_enablePasswordForgotten_desc' => 'Ako želite omogućiti korisniku da postavi novu lozinku i pošalje ju e-mailom, označite ovu opciju.',
+'settings_enableReceiptWorkflow' => 'Omogućavanje potvrđivanja prijema dokumenta',
+'settings_enableReceiptWorkflow_desc' => 'Omogućite kako bi omogućili tok rada za potvrđivajne prijema dokumenta.',
 'settings_enableRecursiveCount' => 'Omogući rekurzivno brojanje dokumenta/mape',
 'settings_enableRecursiveCount_desc' => 'Ako je uključeno, broj dokumenata i mapa u pregledu mape će biti određen brojanjem svih objekata rekurzivnom obradom mapa i brojanjem tih dokumenata i mapa kojima je korisniku omogućen pristup.',
 'settings_enableRevisionOnVoteReject' => '',
@@ -1456,9 +1458,11 @@ Internet poveznica: [url]',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => 'Zadana tema',
 'settings_theme_desc' => 'Zadani stil (naziv podmape u mapi "stilovi")',
 'settings_titleDisplayHack' => 'Prikaz razdvojenog naslova',
@@ -1520,6 +1524,7 @@ Internet poveznica: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_getlist' => '',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Pohrani izmjene mape',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 2686f7d21..4a1f58e43 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -336,6 +336,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Felülvizsgálatára váró dokumentumok',
 'documents_to_revise' => '',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_needs_correction' => '',
@@ -472,6 +473,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Nincs kijelölt dokumentum',
 'error_no_folder_selected' => 'Nincs kijelölt mappa',
@@ -1198,8 +1200,6 @@ URL: [url]',
 'settings_editOnlineFileTypes_desc' => '',
 'settings_enable2FactorAuthentication' => '',
 'settings_enable2FactorAuthentication_desc' => '',
-'settings_enableAcknowledgeWorkflow' => '',
-'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminReceipt' => '',
 'settings_enableAdminReceipt_desc' => '',
 'settings_enableAdminRevApp' => 'Engedélyezi a felülvizsgálatot/jóváhagyást az adminisztrátorok számára',
@@ -1250,6 +1250,8 @@ URL: [url]',
 'settings_enableOwnerRevApp_desc' => 'Engedélyezze, ha szeretné, hogy a dokumentum tulajdonosa listázásra kerüljön a felülvizsgálóknál/jóváhagyóknál és a munkamenet átmeneteknél.',
 'settings_enablePasswordForgotten' => 'Jelszó emlékeztető engedélyezése',
 'settings_enablePasswordForgotten_desc' => 'Ha azt szeretné, hogy a felhasználó megadhasson új jelszót és elküldhesse azt emailben, engedélyezze ezt a lehetőséget.',
+'settings_enableReceiptWorkflow' => '',
+'settings_enableReceiptWorkflow_desc' => '',
 'settings_enableRecursiveCount' => 'Engedélyezi a rekurzív dokumentum/mappa számot',
 'settings_enableRecursiveCount_desc' => 'Ha be van kapcsolva a mappa nézetben a dokumentumok és mappák száma minden objektum rekurzív feldolgozásával kerül meghatározásra és a dokumentumok és mappák száma a felhasználó számára engedélyezett.',
 'settings_enableRevisionOnVoteReject' => '',
@@ -1434,9 +1436,11 @@ URL: [url]',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => 'Alapértelmezett téma',
 'settings_theme_desc' => 'Alapértelmezett stílus (a "styles" mappa alkönyvtárának neve)',
 'settings_titleDisplayHack' => 'Címsor megjelenítő trükk',
@@ -1498,6 +1502,7 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_getlist' => '',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Mappa változásainak mentése',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 1c30a6b96..cdc3c821b 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -342,6 +342,7 @@ URL: [url]',
 'documents_to_receipt' => 'Documenti in attesa di conferma ricezione',
 'documents_to_review' => 'Documenti in attesa della tua revisione',
 'documents_to_revise' => 'Documenti da revisionare.',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_needs_correction' => '',
@@ -478,6 +479,7 @@ URL: [url]',
 'error_add_aro' => 'Errore durante l\'accesso aggiungendo richiesta oggetto',
 'error_add_permission' => 'Errore durante l\'aggiunta di permesso',
 'error_cleared_cache' => 'Errore durante svuotare la cache',
+'error_extension_getlist' => '',
 'error_importfs' => 'Errore durante l\'importazione dal file system',
 'error_no_document_selected' => 'Nessun documento selezionato',
 'error_no_folder_selected' => 'Nessuna cartella selezionata',
@@ -1232,8 +1234,6 @@ URL: [url]',
 'settings_editOnlineFileTypes_desc' => 'I file con uno dei seguenti terminali possono essere modificati on-line (usare solo caratteri minuscoli)',
 'settings_enable2FactorAuthentication' => 'Permettere autenticazione a due fattori',
 'settings_enable2FactorAuthentication_desc' => 'Abilitare / disabilitare autenticazione a due fattori. Gli utenti avranno bisogno di "Google Authenticator" sul tuo telefono cellulare.',
-'settings_enableAcknowledgeWorkflow' => 'Abilitare per notifiche',
-'settings_enableAcknowledgeWorkflow_desc' => 'Abilitare per attivare sul workflow le ricevute di notifica.',
 'settings_enableAdminReceipt' => '',
 'settings_enableAdminReceipt_desc' => '',
 'settings_enableAdminRevApp' => 'Permetti la revisione/approvazione da parte degli amministratori',
@@ -1284,6 +1284,8 @@ URL: [url]',
 'settings_enableOwnerRevApp_desc' => 'Spuntare per aggiungere il proprietario del documento alla lista dei revisori/approvatori e per le transizioni del flusso di lavoro.',
 'settings_enablePasswordForgotten' => 'Abilita recupero password',
 'settings_enablePasswordForgotten_desc' => 'Spuntare nel caso si desideri permettere all\'utente di re-impostare la password inviata per email.',
+'settings_enableReceiptWorkflow' => 'Abilitare per notifiche',
+'settings_enableReceiptWorkflow_desc' => 'Abilitare per attivare sul workflow le ricevute di notifica.',
 'settings_enableRecursiveCount' => 'Abilita il conteggio ricursivo di documenti/cartelle',
 'settings_enableRecursiveCount_desc' => 'Se selezionato il numero di documenti e sottocartelle accessibili all\'utente sarà calcolato con un conteggio ricursivo di tutti gli oggetti contenuti nella cartella.',
 'settings_enableRevisionOnVoteReject' => '',
@@ -1468,9 +1470,11 @@ URL: [url]',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => 'Tema di default',
 'settings_theme_desc' => 'Stile di default (nome della sottocartella nella cartella "styles")',
 'settings_titleDisplayHack' => 'Visualizzazione titoli lunghi',
@@ -1532,6 +1536,7 @@ URL: [url]',
 'splash_error_add_to_transmittal' => 'Errore durante l\'aggiunta di documento per la trasmissione',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_getlist' => '',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Cartella modificata',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 8d3916204..ce8052189 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -344,6 +344,7 @@ URL: [url]',
 'documents_to_receipt' => '당신의 접수확인을 기다리는 문서들',
 'documents_to_review' => '당신의 검토를 기다리는 문서',
 'documents_to_revise' => '문서 정정',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_needs_correction' => '',
@@ -478,6 +479,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => '선택되지 문서는',
 'error_no_folder_selected' => '어떤 폴더를 선택하지',
@@ -1214,8 +1216,6 @@ URL : [url]',
 'settings_editOnlineFileTypes_desc' => '',
 'settings_enable2FactorAuthentication' => '',
 'settings_enable2FactorAuthentication_desc' => '',
-'settings_enableAcknowledgeWorkflow' => '문서 수신의 응답 활성화',
-'settings_enableAcknowledgeWorkflow_desc' => '문서의 수신 확인을 위해 워크플로어를 선택하고 활성화 합니다.',
 'settings_enableAdminReceipt' => '',
 'settings_enableAdminReceipt_desc' => '',
 'settings_enableAdminRevApp' => '관리자에 대한 검토 / 승인 허용',
@@ -1266,6 +1266,8 @@ URL : [url]',
 'settings_enableOwnerRevApp_desc' => '이 문서의 소유자가 검토 / 승인으로 워크 플로우 전환에 대한 나열하고자 할 경우에 사용합니다.',
 'settings_enablePasswordForgotten' => '비밀번호 분실 활성화',
 'settings_enablePasswordForgotten_desc' => '옵션을 사용자가 새 비밀번호를 설정하도록 메일로 보내 확인 할 수 있습니다.',
+'settings_enableReceiptWorkflow' => '문서 수신의 응답 활성화',
+'settings_enableReceiptWorkflow_desc' => '문서의 수신 확인을 위해 워크플로어를 선택하고 활성화 합니다.',
 'settings_enableRecursiveCount' => '재귀적 문서 / 폴더 수 사용',
 'settings_enableRecursiveCount_desc' => 'If turned on, the number of documents and folders in the folder view will be determined by counting all objects by recursively processing the folders and counting those documents and folders the user is allowed to access.',
 'settings_enableRevisionOnVoteReject' => '',
@@ -1450,9 +1452,11 @@ URL : [url]',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => '기본 테마',
 'settings_theme_desc' => '기본 스타일 (폴더 내에 있는 서브 폴더의 이름 "styles")',
 'settings_titleDisplayHack' => '제목 표시 해킹',
@@ -1514,6 +1518,7 @@ URL : [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_getlist' => '',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_folder_edited' => '저장 폴더 변경',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index a135623f0..8363639ed 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (747), gijsbertush (610), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (748), gijsbertush (610), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 '2_factor_auth' => '2-factor-authenticatie',
@@ -334,6 +334,7 @@ URL: [url]',
 'documents_to_receipt' => 'documenten te ontvangen',
 'documents_to_review' => 'Documenten die wachten op uw controle',
 'documents_to_revise' => 'Te reviseren documenten',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_needs_correction' => '',
@@ -477,6 +478,7 @@ De link is geldig tot [valid].
 'error_add_aro' => 'Verzoek om toegang toegevoegd',
 'error_add_permission' => 'Voeg permissie toe',
 'error_cleared_cache' => 'Fout bij het leegmaken van de cache',
+'error_extension_getlist' => '',
 'error_importfs' => 'Fout bij het importeren van form file systeem',
 'error_no_document_selected' => 'Geen document geselecteerd',
 'error_no_folder_selected' => 'Geen map geselecteerd',
@@ -1244,8 +1246,6 @@ Name: [username]
 'settings_editOnlineFileTypes_desc' => 'Bestanden met één van de volgende extensies kunnen online bewerkt worden (ALLEEN KLEINE LETTERS GEBRUIKEN!)',
 'settings_enable2FactorAuthentication' => 'Schakel 2-factor-authenticatie in',
 'settings_enable2FactorAuthentication_desc' => 'In/Uitschakelen 2-factor-authenticatie. Gebruikers moeten Google Authenticator op hun mobile telefoon installeren.',
-'settings_enableAcknowledgeWorkflow' => 'Aanzetten Workflow-stappen',
-'settings_enableAcknowledgeWorkflow_desc' => 'Aanzetten workflow-stappen',
 'settings_enableAdminReceipt' => 'Sta ontvangst van documenten door admins toe',
 'settings_enableAdminReceipt_desc' => 'Inschakelen als u admins documenten wilt laten ontvangen',
 'settings_enableAdminRevApp' => 'Inschakelen Beheer Contr/Beoord',
@@ -1296,6 +1296,8 @@ Name: [username]
 'settings_enableOwnerRevApp_desc' => 'Activeer dit als de eigenaar van een document genoteerd staat as beoordelaar/ goedkeurder en voor workflow overdrachten.',
 'settings_enablePasswordForgotten' => '\'wachtwoord vergeten\' aanzetten',
 'settings_enablePasswordForgotten_desc' => 'Inschakelen om een wachtwoord via mail te versturen als de gebruiker een nieuw wachtwoord heeft ingesteld.',
+'settings_enableReceiptWorkflow' => 'Aanzetten Workflow-stappen',
+'settings_enableReceiptWorkflow_desc' => 'Aanzetten workflow-stappen',
 'settings_enableRecursiveCount' => 'Document/ map teller herhalen toestaan',
 'settings_enableRecursiveCount_desc' => 'If turned on, the number of documents and folders in the folder view will be determined by counting all objects by recursively processing the folders and counting those documents and folders the user is allowed to access.',
 'settings_enableRevisionOnVoteReject' => '',
@@ -1480,9 +1482,11 @@ Name: [username]
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => 'Standaard thema',
 'settings_theme_desc' => 'Standaard stijl (name of a subfolder in folder "styles")',
 'settings_titleDisplayHack' => 'Titel Tonen Oplossing',
@@ -1544,6 +1548,7 @@ Name: [username]
 'splash_error_add_to_transmittal' => 'Fout: toevoeging aan verzending',
 'splash_error_rm_download_link' => 'Fout bij verwijderen download-link',
 'splash_error_send_download_link' => 'Fout bij verzenden download-link',
+'splash_extension_getlist' => '',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Opslaan mapwijzigingen',
@@ -1787,7 +1792,7 @@ URL: [url]',
 'workflow_summary' => 'Workflow samenvatting',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Gebruiker samenvatting',
-'x_more_objects' => '',
+'x_more_objects' => 'meer items',
 'year_view' => 'Jaar Overzicht',
 'yes' => 'Ja',
 'zh_CN' => 'Chinees (CN)',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 19f349f60..bc6048254 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -329,6 +329,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty oczekujące na Twoją recenzję',
 'documents_to_revise' => '',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_needs_correction' => '',
@@ -465,6 +466,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Brak wybranych dokumentów',
 'error_no_folder_selected' => 'Brak wybranych katalogów',
@@ -1178,8 +1180,6 @@ URL: [url]',
 'settings_editOnlineFileTypes_desc' => 'Pliki z następującymi rozszerzeniami mogą być edytowane online (używaj tylko małych liter)',
 'settings_enable2FactorAuthentication' => '',
 'settings_enable2FactorAuthentication_desc' => '',
-'settings_enableAcknowledgeWorkflow' => '',
-'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminReceipt' => '',
 'settings_enableAdminReceipt_desc' => '',
 'settings_enableAdminRevApp' => 'Dołącz Administratora do recenzji/rewizji',
@@ -1230,6 +1230,8 @@ URL: [url]',
 'settings_enableOwnerRevApp_desc' => 'Włącz tę opcję jeżeli właściciel dokumentu powinien być wymieniony jako zatwierdzających/recenzentów oraz dla przepływu procesu',
 'settings_enablePasswordForgotten' => 'Włącz odzyskiwanie hasła po jego zapomnieniu',
 'settings_enablePasswordForgotten_desc' => 'Jeśli chcesz zezwolić użytkownikom na zmianę własnego hasła i wysyłanie go emailem, zaznacz tę opcję.',
+'settings_enableReceiptWorkflow' => '',
+'settings_enableReceiptWorkflow_desc' => '',
 'settings_enableRecursiveCount' => 'Włącz licznik rekurencji dokumentu/folderu',
 'settings_enableRecursiveCount_desc' => 'Jeżeli jest włączone, to liczba dokumentów i folderów w widoku będzie ustalona poprzez zliczenie wszystkich obiektów przez rekurencyjnie przetwarzane foldery i policzenia tych dokumentów i folderów do których użytkownik ma dostęp',
 'settings_enableRevisionOnVoteReject' => '',
@@ -1414,9 +1416,11 @@ URL: [url]',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => 'Domyślny motyw',
 'settings_theme_desc' => 'Domyślny styl wyglądu (nazwa podkatalogu w katalogu "styles")',
 'settings_titleDisplayHack' => 'Korekta wyświetlania tytułu',
@@ -1478,6 +1482,7 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_getlist' => '',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Zapisz zmiany folderu',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 9be8811d3..807340648 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -336,6 +336,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents Awaiting User\'s Review',
 'documents_to_revise' => '',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_needs_correction' => '',
@@ -471,6 +472,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Nenhum documento selecionado',
 'error_no_folder_selected' => 'Nenhuma pasta selecionada',
@@ -1196,8 +1198,6 @@ URL: [url]',
 'settings_editOnlineFileTypes_desc' => 'Arquivos com as seguintes extensões podem ser editados online (use somente letras minúsculas)',
 'settings_enable2FactorAuthentication' => '',
 'settings_enable2FactorAuthentication_desc' => '',
-'settings_enableAcknowledgeWorkflow' => '',
-'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminReceipt' => '',
 'settings_enableAdminReceipt_desc' => '',
 'settings_enableAdminRevApp' => 'Permitir revisão/aprovação para administradores',
@@ -1248,6 +1248,8 @@ URL: [url]',
 'settings_enableOwnerRevApp_desc' => 'Habilite esta opção se quiser que o proprietário de um documento seja listado como revisores/aprovadores e para transições de fluxo de trabalho.',
 'settings_enablePasswordForgotten' => 'Ativar Senhas esquecidas',
 'settings_enablePasswordForgotten_desc' => 'Se você quiser permitir o usuário definir uma nova senha e enviá-la por e-mail, marque esta opção.',
+'settings_enableReceiptWorkflow' => '',
+'settings_enableReceiptWorkflow_desc' => '',
 'settings_enableRecursiveCount' => 'Ativar contagem de documentos/pasta recursiva',
 'settings_enableRecursiveCount_desc' => 'Se estiver ativado, o número de documentos e pastas na exibição de pasta será determinada pela contagem de todos os objetos de forma recursiva proceáando as pastas e contando eáes documentos e pastas que o usuário tem permissão de acesso.',
 'settings_enableRevisionOnVoteReject' => '',
@@ -1432,9 +1434,11 @@ URL: [url]',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => 'Tema padrão',
 'settings_theme_desc' => 'Estilo padrão (nome de uma subpasta na pasta "styles")',
 'settings_titleDisplayHack' => 'Título Exibir Hack',
@@ -1496,6 +1500,7 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_getlist' => '',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Salvar modificação de pastas',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index edc59e570..3d6f42435 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -341,6 +341,7 @@ URL: [url]',
 'documents_to_receipt' => 'Documente in asteptare pentru confirmarea primirii',
 'documents_to_review' => 'Documente care așteaptă revizuirea dumneavoastră',
 'documents_to_revise' => 'Documente de revizut',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_needs_correction' => '',
@@ -477,6 +478,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Nici un document selectat',
 'error_no_folder_selected' => 'Nici un folder selectat',
@@ -1221,8 +1223,6 @@ URL: [url]',
 'settings_editOnlineFileTypes_desc' => '',
 'settings_enable2FactorAuthentication' => '',
 'settings_enable2FactorAuthentication_desc' => '',
-'settings_enableAcknowledgeWorkflow' => '',
-'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminReceipt' => '',
 'settings_enableAdminReceipt_desc' => '',
 'settings_enableAdminRevApp' => 'Permite revizuirea/aprobarea pentru admini',
@@ -1273,6 +1273,8 @@ URL: [url]',
 'settings_enableOwnerRevApp_desc' => 'Activați această opțiune dacă doriți ca proprietarul unui document să fie listat ca revizuitor/aprobator sau in tranzițiile workflow-ului.',
 'settings_enablePasswordForgotten' => 'Activați Am uitat parola',
 'settings_enablePasswordForgotten_desc' => 'Dacă doriți să permiteti utilizatorilor să stabilească o nouă parolă și să le fie trimisă prin e-mail, bifați această opțiune.',
+'settings_enableReceiptWorkflow' => '',
+'settings_enableReceiptWorkflow_desc' => '',
 'settings_enableRecursiveCount' => 'Activați numararea recursiva pentru documente/foldere',
 'settings_enableRecursiveCount_desc' => 'Dacă este activată, numărul de documente și foldere din vizualizarea unui director va fi determinat prin numărarea tuturor obiectelor recursiv din folderele unde accesul utilizatorului este permis.',
 'settings_enableRevisionOnVoteReject' => '',
@@ -1457,9 +1459,11 @@ URL: [url]',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => 'Tema implicită',
 'settings_theme_desc' => 'Stilul implicit (numele unui subfolder în folderul "style")',
 'settings_titleDisplayHack' => 'Interpretarea afișarii titlului',
@@ -1521,6 +1525,7 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_getlist' => '',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Salvați modificările folderului',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index ee221f92c..e160f1286 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -341,6 +341,7 @@ URL: [url]',
 'documents_to_receipt' => 'Документы, которые ожидают подтверждение получения',
 'documents_to_review' => 'Документы, ожидающие вашей рецензии',
 'documents_to_revise' => 'Документы на ревизии',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_needs_correction' => '',
@@ -477,6 +478,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => 'Ошибка добавления разрешения',
 'error_cleared_cache' => 'Ошибка очиски кеша',
+'error_extension_getlist' => '',
 'error_importfs' => 'Ошибка импорта из файловой системы',
 'error_no_document_selected' => 'Нет выбранных документов',
 'error_no_folder_selected' => 'Нет выбранных каталогов',
@@ -1228,8 +1230,6 @@ URL: [url]',
 'settings_editOnlineFileTypes_desc' => 'Типы файлов перечисленные через точку-запятую, например, ".txt;.html" (ИСПОЛЬЗОВАТЬ ТОЛЬКО нижний РЕГИСТР)',
 'settings_enable2FactorAuthentication' => '',
 'settings_enable2FactorAuthentication_desc' => '',
-'settings_enableAcknowledgeWorkflow' => 'Включить подтверждение получения документа',
-'settings_enableAcknowledgeWorkflow_desc' => 'Включить для активации функции подтверждения получения документа',
 'settings_enableAdminReceipt' => '',
 'settings_enableAdminReceipt_desc' => '',
 'settings_enableAdminRevApp' => 'Администратор как<br/>рецензирующий и утверждающий',
@@ -1280,6 +1280,8 @@ URL: [url]',
 'settings_enableOwnerRevApp_desc' => 'Включите для того, чтобы владелец документа был в списке рецензентов/утверждающих и в изменении процесса.',
 'settings_enablePasswordForgotten' => 'Включить восстановление пароля',
 'settings_enablePasswordForgotten_desc' => 'Если включено, разрешает пользователям восстанавливать пароль через e-mail.',
+'settings_enableReceiptWorkflow' => 'Включить подтверждение получения документа',
+'settings_enableReceiptWorkflow_desc' => 'Включить для активации функции подтверждения получения документа',
 'settings_enableRecursiveCount' => 'Рекурсивно подсчитывать<br/>документы и каталоги',
 'settings_enableRecursiveCount_desc' => 'Если включено, количество документов и каталогов в виде каталога будет определятся рекурсивным подсчётом всех документов и каталогов разрешённых для доступа пользователя.',
 'settings_enableRevisionOnVoteReject' => '',
@@ -1464,9 +1466,11 @@ URL: [url]',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => 'Тема по умолчанию',
 'settings_theme_desc' => 'Стиль по умолчанию (каталог в «styles»).',
 'settings_titleDisplayHack' => 'Приём для заголовков',
@@ -1528,6 +1532,7 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_getlist' => '',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Изменения каталога сохранены',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 727f8a24b..c9142b77b 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -324,6 +324,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čakajúce na kontrolu používateľa',
 'documents_to_revise' => 'Dokumenty čakajúce na vašu revíziu',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_needs_correction' => '',
@@ -430,6 +431,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => 'Chyba pri vymazaní vyrovnávacej pamäte',
+'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Nie je vybratý žiadny dokument',
 'error_no_folder_selected' => 'Nie je vybratá žiadna zložka',
@@ -1059,8 +1061,6 @@ URL: [url]',
 'settings_editOnlineFileTypes_desc' => '',
 'settings_enable2FactorAuthentication' => '',
 'settings_enable2FactorAuthentication_desc' => '',
-'settings_enableAcknowledgeWorkflow' => '',
-'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminReceipt' => '',
 'settings_enableAdminReceipt_desc' => '',
 'settings_enableAdminRevApp' => '',
@@ -1111,6 +1111,8 @@ URL: [url]',
 'settings_enableOwnerRevApp_desc' => '',
 'settings_enablePasswordForgotten' => 'Povoliť zabudnuté heslo',
 'settings_enablePasswordForgotten_desc' => '',
+'settings_enableReceiptWorkflow' => '',
+'settings_enableReceiptWorkflow_desc' => '',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
 'settings_enableRevisionOnVoteReject' => '',
@@ -1295,9 +1297,11 @@ URL: [url]',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => 'Prednastavená téma',
 'settings_theme_desc' => '',
 'settings_titleDisplayHack' => '',
@@ -1359,6 +1363,7 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_getlist' => '',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Uložiť zmeny zložky',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index b98ef5718..e51797584 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1155), MagnusI (649), tmichelfelder (106)
+//    Translators: Admin (1156), MagnusI (649), tmichelfelder (106)
 
 $text = array(
 '2_factor_auth' => '2-faktors autentisering',
@@ -342,6 +342,7 @@ URL: [url]',
 'documents_to_receipt' => 'Dokument som väntar på bekräftad mottagning',
 'documents_to_review' => 'Dokument som du behöver granska',
 'documents_to_revise' => 'Dokument som väntar på din granskning',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => 'Utgångna dokument',
 'documents_user_needs_correction' => '',
@@ -490,6 +491,7 @@ Länken är giltig t o m [valid].
 'error_add_aro' => 'Fel vid begärd åtkomst till objekt',
 'error_add_permission' => 'Fel vid tilldelning av behörighet',
 'error_cleared_cache' => 'Fel vid rensning av cache',
+'error_extension_getlist' => '',
 'error_importfs' => 'Fel vid import från filsystem',
 'error_no_document_selected' => 'Inget dokument har valts',
 'error_no_folder_selected' => 'Ingen katalog har valts',
@@ -1145,7 +1147,7 @@ URL: [url]',
 'select_one' => 'Välj',
 'select_user' => '',
 'select_users' => 'Välj användare',
-'select_value' => '',
+'select_value' => 'Välj värde',
 'select_workflow' => 'Välj arbetsflöde',
 'send_email' => 'Skicka e-post',
 'send_login_data' => 'Skicka inloggningsuppgifter',
@@ -1241,8 +1243,6 @@ Kommentar: [comment]',
 'settings_editOnlineFileTypes_desc' => 'Filer med en av följande filtyper kan redigeras online OBS! ANVÄND BARA SMÅ BOKSTÄVER)',
 'settings_enable2FactorAuthentication' => 'Aktivera 2-faktorsautentisering',
 'settings_enable2FactorAuthentication_desc' => 'Aktvierar/avaktiverar 2-faktorsautentisering. Användaren behöver Google Authenticater installerad på sin mobiltelefon.',
-'settings_enableAcknowledgeWorkflow' => 'Aktivera notifiering vid mottagande av dokument',
-'settings_enableAcknowledgeWorkflow_desc' => 'Aktivera notifiering av meddelanden i arbetsflödet.',
 'settings_enableAdminReceipt' => 'Tillåt Administratörer som mottagare av meddelanden.',
 'settings_enableAdminReceipt_desc' => 'Aktivera denna om du vill att Administratörer ska vara valbara för mottagande av meddelanden i arbetsflöden.',
 'settings_enableAdminRevApp' => 'Visa Admin i listan granska/godkänna',
@@ -1293,6 +1293,8 @@ Kommentar: [comment]',
 'settings_enableOwnerRevApp_desc' => 'Aktivera om du vill att en dokumentägare visas i listan för personer som granskar/godkänner dokumentet och i övergång på arbetsflöden.',
 'settings_enablePasswordForgotten' => 'Aktivera glömt lösenord',
 'settings_enablePasswordForgotten_desc' => 'Om du vill tillåta att användare kan få nytt lösenord genom att skicka e-post, aktivera denna option.',
+'settings_enableReceiptWorkflow' => 'Aktivera notifiering vid mottagande av dokument',
+'settings_enableReceiptWorkflow_desc' => 'Aktivera notifiering av meddelanden i arbetsflödet.',
 'settings_enableRecursiveCount' => 'Aktivera rekursiv räkning av dokument/katalog',
 'settings_enableRecursiveCount_desc' => 'Om detta sätts på, kommer antal dokument och kataloger i katalogvyn fastställas genom att räkna alla objekter via rekursiv hantering av alla kataloger och räkna dessa dokument och kataloger som användaren har rättigheter till.',
 'settings_enableRevisionOnVoteReject' => '',
@@ -1477,9 +1479,11 @@ Kommentar: [comment]',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => 'Standardtema',
 'settings_theme_desc' => 'Standardtema (namn på undermappar i mappen "styles")',
 'settings_titleDisplayHack' => 'Titelvisningshack',
@@ -1541,6 +1545,7 @@ Kommentar: [comment]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => 'Fel vid borttagande av nedladdningslänk',
 'splash_error_send_download_link' => 'Fel vid sändning av nedladdningslänk',
+'splash_extension_getlist' => '',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Spara ändringar i katalog',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 1628f2a76..4a5564cf4 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -335,6 +335,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Kontrol etmenizi bekleyen dokümanlar',
 'documents_to_revise' => '',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_needs_correction' => '',
@@ -471,6 +472,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Hiçbir doküman seçilmedi',
 'error_no_folder_selected' => 'Hiçbir klasör seçilmedi',
@@ -1200,8 +1202,6 @@ URL: [url]',
 'settings_editOnlineFileTypes_desc' => '',
 'settings_enable2FactorAuthentication' => '',
 'settings_enable2FactorAuthentication_desc' => '',
-'settings_enableAcknowledgeWorkflow' => '',
-'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminReceipt' => '',
 'settings_enableAdminReceipt_desc' => '',
 'settings_enableAdminRevApp' => 'Yöneticilere kontrol/onay izni ver',
@@ -1252,6 +1252,8 @@ URL: [url]',
 'settings_enableOwnerRevApp_desc' => 'Bir dokümanın sahibinin kontrol eden/onaylayan listesinde  ve iş akışında olmasını isterseniz bunu etkinleştirin.',
 'settings_enablePasswordForgotten' => 'Parola Kurtarmayı Etkinleştir',
 'settings_enablePasswordForgotten_desc' => 'Kullanıcının unuttuğu parolayı kendisine gönderilecek e-posta ile sıfırlamasına izin vermek için bu seçeneği etkinleştirebilirsiniz.',
+'settings_enableReceiptWorkflow' => '',
+'settings_enableReceiptWorkflow_desc' => '',
 'settings_enableRecursiveCount' => 'Özyinelenen doküman/klasör sayımını etkinleştir',
 'settings_enableRecursiveCount_desc' => 'Aktif hale getirildiğinde, klasör içindeki dokümanlar ve diğer klasörlerin sayısı kullanıcının erişim hakkı olan tüm nesnelerin özyinelemeli olarak sayılması yolu ile bulunur.',
 'settings_enableRevisionOnVoteReject' => '',
@@ -1436,9 +1438,11 @@ URL: [url]',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => 'Varsayılan tema',
 'settings_theme_desc' => 'Sitenin varsayılan teması ("styles" klasöründe bulunan alt klasör)',
 'settings_titleDisplayHack' => 'İki Satırlı Başlık Görüntüleme',
@@ -1500,6 +1504,7 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_getlist' => '',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Klasör değişiklikleri kaydedildi',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 1a8e55770..c78521ba5 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -341,6 +341,7 @@ URL: [url]',
 'documents_to_receipt' => 'Документи, які чекають підтвердження отримання',
 'documents_to_review' => 'Документи, які чекають вашої рецензії',
 'documents_to_revise' => 'Документи для повторного розгляду',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_needs_correction' => '',
@@ -477,6 +478,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Немає вибраних документів',
 'error_no_folder_selected' => 'Немає вибраних каталогів',
@@ -1221,8 +1223,6 @@ URL: [url]',
 'settings_editOnlineFileTypes_desc' => '',
 'settings_enable2FactorAuthentication' => '',
 'settings_enable2FactorAuthentication_desc' => '',
-'settings_enableAcknowledgeWorkflow' => 'Увімкнути підтвердження отримання документу',
-'settings_enableAcknowledgeWorkflow_desc' => 'Включіть для активації функції підтвердження отримання документу',
 'settings_enableAdminReceipt' => '',
 'settings_enableAdminReceipt_desc' => '',
 'settings_enableAdminRevApp' => 'Адміністратор може бути<br/>рецензент і затверджувач',
@@ -1273,6 +1273,8 @@ URL: [url]',
 'settings_enableOwnerRevApp_desc' => 'Увімкніть для того, щоб власник відображався в списку рецензентів/затверджувачів і для зміни процесу.',
 'settings_enablePasswordForgotten' => 'Включити відновлення паролю',
 'settings_enablePasswordForgotten_desc' => 'Якщо увімкнено, дозволяє користувачам відновлювати пароль через e-mail.',
+'settings_enableReceiptWorkflow' => 'Увімкнути підтвердження отримання документу',
+'settings_enableReceiptWorkflow_desc' => 'Включіть для активації функції підтвердження отримання документу',
 'settings_enableRecursiveCount' => 'Рекурсивно підраховувати<br/>документи і каталоги',
 'settings_enableRecursiveCount_desc' => 'Якщо увімкнено, кількість документів і каталогів при перегляді каталогу буде підраховано рекурсивно для всіх документів до яких користувач має доступ.',
 'settings_enableRevisionOnVoteReject' => '',
@@ -1457,9 +1459,11 @@ URL: [url]',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => 'Тема по замовчуванню',
 'settings_theme_desc' => 'Стиль по замовчуванню (каталог в «styles»).',
 'settings_titleDisplayHack' => 'Прийом для заголовків',
@@ -1521,6 +1525,7 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_getlist' => '',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_folder_edited' => 'Зміни каталогу збережено',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 21e42c1e7..f317045e1 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 (738), archonwang (469), fengjohn (5)
+//    Translators: Admin (744), archonwang (469), fengjohn (5)
 
 $text = array(
 '2_factor_auth' => '双重认证',
@@ -335,6 +335,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校对的文档',
 'documents_to_revise' => '',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_needs_correction' => '',
@@ -477,6 +478,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '添加权限时出错',
 'error_cleared_cache' => '清理缓存时出错',
+'error_extension_getlist' => '',
 'error_importfs' => '从文件系统导入时出错',
 'error_no_document_selected' => '请选择文档',
 'error_no_folder_selected' => '请选择文件夹',
@@ -509,13 +511,13 @@ URL: [url]',
 'expiry_changed_email_subject' => '',
 'export' => '导出',
 'extension_archive' => '',
-'extension_changelog' => '',
+'extension_changelog' => '更新日志',
 'extension_loading' => '',
 'extension_manager' => '扩展管理器',
 'extension_mgr_installed' => '',
 'extension_mgr_no_upload' => '',
 'extension_mgr_repository' => '',
-'extension_version_list' => '',
+'extension_version_list' => '版本列表',
 'february' => '二 月',
 'file' => '文件',
 'files' => '文件',
@@ -566,7 +568,7 @@ URL: [url]',
 URL: [url]',
 'folder_renamed_email_subject' => '[sitename]: [name] - 文件夹已重命名',
 'folder_title' => '文件夹 \'[foldername]\'',
-'force_update' => '',
+'force_update' => '强制更新',
 'friday' => 'Friday',
 'friday_abbr' => '',
 'from' => '从',
@@ -1106,7 +1108,7 @@ URL: [url]',
 'select_one' => '选择一个',
 'select_user' => '',
 'select_users' => '点击选择用户',
-'select_value' => '',
+'select_value' => '选择值',
 'select_workflow' => '选择工作流',
 'send_email' => '发送邮件',
 'send_login_data' => '发送登录数据',
@@ -1202,8 +1204,6 @@ URL: [url]',
 'settings_editOnlineFileTypes_desc' => '',
 'settings_enable2FactorAuthentication' => '启用双重认证',
 'settings_enable2FactorAuthentication_desc' => '启用/禁用双重认证机制。用户将需要在手机上进行 Google 认证。',
-'settings_enableAcknowledgeWorkflow' => '启用文档接收确认通知',
-'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminReceipt' => '',
 'settings_enableAdminReceipt_desc' => '',
 'settings_enableAdminRevApp' => '允许管理员账号进行校对/审核处理',
@@ -1254,6 +1254,8 @@ URL: [url]',
 'settings_enableOwnerRevApp_desc' => '',
 'settings_enablePasswordForgotten' => '启用忘记密码功能',
 'settings_enablePasswordForgotten_desc' => '如您想让用户可以通过邮件方式自主设置新密码，请勾选此选项',
+'settings_enableReceiptWorkflow' => '启用文档接收确认通知',
+'settings_enableReceiptWorkflow_desc' => '',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
 'settings_enableRevisionOnVoteReject' => '',
@@ -1438,9 +1440,11 @@ URL: [url]',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => '主题设置',
 'settings_theme_desc' => '默认风格（“风格”文件夹的一个子文件夹的名字',
 'settings_titleDisplayHack' => '',
@@ -1502,6 +1506,7 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '移除下载链接时报错',
 'splash_error_send_download_link' => '发送下载链接时报错',
+'splash_extension_getlist' => '',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_folder_edited' => '更新文件夹',
@@ -1618,7 +1623,7 @@ URL: [url]',
 'toggle_qrcode' => '显示/隐藏 QR 码',
 'to_before_from' => '结束日期不能早于开始日期',
 'transfer_document' => '共享文档',
-'transfer_no_read_access' => '',
+'transfer_no_read_access' => '用户没有该文件夹的读权限',
 'transfer_no_write_access' => '当前用户没有文件夹写入权限',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 0d2de415c..6241d0fd9 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -316,6 +316,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校對的文檔',
 'documents_to_revise' => '',
+'documents_to_trigger_workflow' => '',
 'documents_user_draft' => '',
 'documents_user_expiration' => '',
 'documents_user_needs_correction' => '',
@@ -422,6 +423,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => '請選擇文檔',
 'error_no_folder_selected' => '請選擇資料夾',
@@ -1051,8 +1053,6 @@ URL: [url]',
 'settings_editOnlineFileTypes_desc' => '',
 'settings_enable2FactorAuthentication' => '',
 'settings_enable2FactorAuthentication_desc' => '',
-'settings_enableAcknowledgeWorkflow' => '',
-'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminReceipt' => '',
 'settings_enableAdminReceipt_desc' => '',
 'settings_enableAdminRevApp' => '',
@@ -1103,6 +1103,8 @@ URL: [url]',
 'settings_enableOwnerRevApp_desc' => '',
 'settings_enablePasswordForgotten' => '',
 'settings_enablePasswordForgotten_desc' => '',
+'settings_enableReceiptWorkflow' => '',
+'settings_enableReceiptWorkflow_desc' => '',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
 'settings_enableRevisionOnVoteReject' => '',
@@ -1287,9 +1289,11 @@ URL: [url]',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
 'settings_tasksInMenu_desc' => '',
+'settings_tasksInMenu_needscorrection' => '',
 'settings_tasksInMenu_receipt' => '',
 'settings_tasksInMenu_review' => '',
 'settings_tasksInMenu_revision' => '',
+'settings_tasksInMenu_workflow' => '',
 'settings_theme' => '',
 'settings_theme_desc' => '',
 'settings_titleDisplayHack' => '',
@@ -1351,6 +1355,7 @@ URL: [url]',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
 'splash_error_send_download_link' => '',
+'splash_extension_getlist' => '',
 'splash_extension_import' => '',
 'splash_extension_refresh' => '',
 'splash_folder_edited' => '',