diff --git a/CHANGELOG b/CHANGELOG
index 9ab198a37..c043ba0f1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -147,6 +147,10 @@
   user extension
 - whether the apache module xsendfile is used, can be configured
 - add hooks for filtering tasks shown in the menu bar
+- allow to set more parameters when upload a document or creating a new folder
+  via restapi
+- add an input field on the substitute user and extension list page for filtering
+  table rows by string
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.9
diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 01163ad68..e86b53b52 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -5381,7 +5381,9 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 		if (!$this->_workflowState) {
 			$queryStr=
-				"SELECT b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflowStates` b ON a.`state` = b.id WHERE `a`.`id`=". $this->_workflow['id'];
+				"SELECT b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflowStates` b ON a.`state` = b.`id` WHERE `workflow`=". intval($this->_workflow->getID())
+				." AND a.`version`='".$this->_version
+				."' AND a.`document` = '". $this->_document->getID() ."' ";
 			$recs = $db->getResultArray($queryStr);
 			if (is_bool($recs) && !$recs)
 				return false;
@@ -5445,7 +5447,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 		if (!isset($this->_workflow)) {
 			$queryStr=
-				"SELECT a.id as wdcid, a.parent, b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflows` b ON a.`workflow` = b.id WHERE a.`version`='".$this->_version
+				"SELECT b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflows` b ON a.`workflow` = b.`id` WHERE a.`version`='".$this->_version
 				."' AND a.`document` = '". $this->_document->getID() ."' "
 				." AND a.`state` IS NOT NULL"
 				." ORDER BY `date` DESC LIMIT 1";
diff --git a/SeedDMS_Preview/Preview/PdfPreviewer.php b/SeedDMS_Preview/Preview/PdfPreviewer.php
index 9d240a488..daae6a4ed 100644
--- a/SeedDMS_Preview/Preview/PdfPreviewer.php
+++ b/SeedDMS_Preview/Preview/PdfPreviewer.php
@@ -53,9 +53,10 @@ class SeedDMS_Preview_PdfPreviewer 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();
 				break;
 			case "SeedDMS_Core_DocumentFile":
diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index 9e2fe2a34..b8df0ca1c 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -52,7 +52,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
 	 * @param integer $width width of preview image
 	 * @return string file name of preview image
 	 */
-	public function getFileName($object, $width) { /* {{{ */
+	protected function getFileName($object, $width) { /* {{{ */
 		if(!$object)
 			return false;
 
diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index a24c55a29..9ecce9466 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2019-01-18</date>
+ <date>2019-02-11</date>
  <time>10:59:39</time>
  <version>
-  <release>1.2.9</release>
-  <api>1.2.9</api>
+  <release>1.2.10</release>
+  <api>1.2.10</api>
  </version>
  <stability>
   <release>stable</release>
@@ -26,6 +26,7 @@
 make sure list of converters is always an array
 usage of mod_sendfile can be configured
 new parameter for enabling/disabling xsendfile
+fix creation of pdf preview if document content class is not SeedDMS_Core_DocumentContent
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -388,5 +389,22 @@ execWithTimeout() reads data from stderr and returns it together with stdout in
 preview is also created if SeedDMS_Core_DocumentContent has a child class
    </notes>
   </release>
+  <release>
+   <date>2018-07-13</date>
+   <time>10:59:39</time>
+   <version>
+    <release>1.2.9</release>
+    <api>1.2.9</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <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>
+  </release>
  </changelog>
 </package>
diff --git a/controllers/class.Download.php b/controllers/class.Download.php
index 12526c29a..a7e19abe2 100644
--- a/controllers/class.Download.php
+++ b/controllers/class.Download.php
@@ -176,7 +176,15 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 
 		$version = $this->params['version'];
 		$document = $this->params['document'];
-		$content = $document->getContentByVersion($version);
+		if($version < 1) {
+			$content = $this->callHook('documentLatestContent', $document);
+			if($content === null)
+				$content = $document->getLatestContent();
+		} else {
+			$content = $this->callHook('documentContent', $document, $version);
+			if($content === null)
+				$content = $document->getContentByVersion($version);
+		}
 		if (!is_object($content)) {
 			$this->errormsg = 'invalid_version';
 			return false;
diff --git a/controllers/class.UpdateDocument.php b/controllers/class.UpdateDocument.php
index 09d93987a..352ed776d 100644
--- a/controllers/class.UpdateDocument.php
+++ b/controllers/class.UpdateDocument.php
@@ -35,7 +35,6 @@ class SeedDMS_Controller_UpdateDocument extends SeedDMS_Controller_Common {
 			return null;
 		}
 
-		$name = $this->getParam('name');
 		$comment = $this->getParam('comment');
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
diff --git a/index.php b/index.php
index 27fef289d..757176741 100644
--- a/index.php
+++ b/index.php
@@ -38,7 +38,7 @@ if(true) {
 				$file = $uri->getPath();
 			else
 				$file = substr($uri->getPath(), 1);
-			if(file_exists($file)) {
+			if(file_exists($file) && is_file($file)) {
 				$_SERVER['SCRIPT_FILENAME'] = basename($file);
 				include($file);
 				exit;
@@ -55,7 +55,7 @@ if(true) {
 	if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) {
 		foreach($GLOBALS['SEEDDMS_HOOKS']['initDMS'] as $hookObj) {
 			if (method_exists($hookObj, 'addRoute')) {
-				$hookObj->addRoute(array('dms'=>$dms, 'app'=>$app, 'settings'=>$settings));
+				$hookObj->addRoute(array('dms'=>$dms, 'user'=>$user, 'app'=>$app, 'settings'=>$settings));
 			}
 		}
 	}
diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index e5a3c9f3e..2578d6f78 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -470,6 +470,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_edit_task' => '',
 'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'لم يتم اختيار مستند',
@@ -722,6 +723,7 @@ URL: [url]',
 'logout' => 'خروج',
 'log_management' => 'ادارة ملفات السجلات',
 'lo_LA' => 'ﺎﻠﻤﻛﺎﻧ',
+'malformed_expiration_date' => '',
 'manager' => 'مدير',
 'manager_of_group' => '',
 'mandatory_approvergroups' => '',
@@ -1517,6 +1519,7 @@ URL: [url]',
 'splash_edit_event' => '',
 'splash_edit_group' => '',
 'splash_edit_role' => '',
+'splash_edit_task' => '',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 67f25933d..9d4d80eab 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -423,6 +423,7 @@ $text = array(
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_edit_task' => '',
 'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Няма избрани документи',
@@ -651,6 +652,7 @@ $text = array(
 'logout' => 'Изход',
 'log_management' => 'Управление на логове',
 'lo_LA' => 'Лаос',
+'malformed_expiration_date' => '',
 'manager' => 'Началник',
 'manager_of_group' => '',
 'mandatory_approvergroups' => '',
@@ -1380,6 +1382,7 @@ $text = array(
 'splash_edit_event' => '',
 'splash_edit_group' => '',
 'splash_edit_role' => '',
+'splash_edit_task' => '',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index be88487dc..f09c7f3b1 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -428,6 +428,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_edit_task' => '',
 'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => '',
@@ -656,6 +657,7 @@ URL: [url]',
 'logout' => 'Desconnectar',
 'log_management' => 'Gestió de fitxers de registre',
 'lo_LA' => 'Laosià',
+'malformed_expiration_date' => '',
 'manager' => 'Manager',
 'manager_of_group' => '',
 'mandatory_approvergroups' => '',
@@ -1385,6 +1387,7 @@ URL: [url]',
 'splash_edit_event' => '',
 'splash_edit_group' => '',
 'splash_edit_role' => '',
+'splash_edit_task' => '',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index b94253ea6..a045cd91c 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -501,6 +501,7 @@ Odkaz je platný do [valid].
 'error_add_aro' => 'Chyba při přidávání požadavku přístupu k objektu',
 'error_add_permission' => 'Chyba při přidání oprávnění',
 'error_cleared_cache' => 'Chyba při vymazání mezipaměti',
+'error_edit_task' => '',
 'error_extension_getlist' => 'Chyba při získání seznamu rozšíření z úložiště',
 'error_importfs' => 'Chyba při importu formy souborového systému',
 'error_no_document_selected' => 'Není vybrán žádný dokument.',
@@ -760,6 +761,7 @@ URL: [url]',
 'logout' => 'Odhlášení',
 'log_management' => 'Správa LOG souborů',
 'lo_LA' => 'Laosština',
+'malformed_expiration_date' => '',
 'manager' => 'Správce',
 'manager_of_group' => 'Jste správcem této skupiny',
 'mandatory_approvergroups' => 'Stanovená skupina schvalovatelů',
@@ -1596,6 +1598,7 @@ Jméno: [username]
 'splash_edit_event' => 'Událost uložena',
 'splash_edit_group' => 'Skupina uložena',
 'splash_edit_role' => 'Role uložena',
+'splash_edit_task' => '',
 'splash_edit_user' => 'Uživatel uložen',
 'splash_error_add_to_transmittal' => 'Chyba při přidávání dokumentu k přenosu',
 'splash_error_rm_download_link' => 'Chyba při odstranění odkazu ke stažení',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 87d2a07e3..b5783ca27 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 (2649), dgrutsch (22)
+//    Translators: Admin (2652), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -500,6 +500,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_edit_task' => 'Fehler beim Speichern der Task',
 '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',
@@ -759,6 +760,7 @@ URL: [url]',
 'logout' => 'Abmelden',
 'log_management' => 'Management der Log-Dateien',
 'lo_LA' => 'Laotisch',
+'malformed_expiration_date' => 'Fehlerhaftes Ablaufdatum',
 'manager' => 'Manager',
 'manager_of_group' => 'Sie sind der Manager dieser Gruppe',
 'mandatory_approvergroups' => 'Zwingende Gruppen von Freigebern',
@@ -1606,6 +1608,7 @@ Name: [username]
 'splash_edit_event' => 'Ereignis gespeichert',
 'splash_edit_group' => 'Gruppe gespeichert',
 'splash_edit_role' => 'Rolle gespeichert',
+'splash_edit_task' => 'Task gespeichert',
 'splash_edit_user' => 'Benutzer gespeichert',
 'splash_error_add_to_transmittal' => 'Fehler beim Hinzufügen zur Dokumentenliste',
 'splash_error_rm_download_link' => 'Fehler beim Löschen des Download-Links',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 7cb9ab41a..593082dcf 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -423,6 +423,7 @@ $text = array(
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_edit_task' => '',
 'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Δεν έχει επιλεγεί έγγραφο',
@@ -651,6 +652,7 @@ $text = array(
 'logout' => 'Εποσύνδεση',
 'log_management' => 'Διαχείριση αρχείων καταγραφής',
 'lo_LA' => 'Τοποθεσία',
+'malformed_expiration_date' => '',
 'manager' => 'Διαχειριστής',
 'manager_of_group' => 'Είστε διαχειριστής της ομάδας',
 'mandatory_approvergroups' => '',
@@ -1391,6 +1393,7 @@ URL: [url]',
 'splash_edit_event' => '',
 'splash_edit_group' => '',
 'splash_edit_role' => '',
+'splash_edit_task' => '',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index e28272bbe..b86b1a918 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 (1766), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1769), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -501,6 +501,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_edit_task' => 'Error when saving task',
 'error_extension_getlist' => 'Error getting extension list from repository',
 'error_importfs' => 'Error while importing form file system',
 'error_no_document_selected' => 'No document selected',
@@ -760,6 +761,7 @@ URL: [url]',
 'logout' => 'Logout',
 'log_management' => 'Log files management',
 'lo_LA' => 'Laotian',
+'malformed_expiration_date' => 'Malformed expiration date',
 'manager' => 'Manager',
 'manager_of_group' => 'You are the manager of this group',
 'mandatory_approvergroups' => 'Mandatory Groups of approvers',
@@ -1601,6 +1603,7 @@ Name: [username]
 'splash_edit_event' => 'Event saved',
 'splash_edit_group' => 'Group saved',
 'splash_edit_role' => 'Role saved',
+'splash_edit_task' => 'Task saved',
 'splash_edit_user' => 'User saved',
 'splash_error_add_to_transmittal' => 'Error while adding document to transmittal',
 'splash_error_rm_download_link' => 'Error when removing download link',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 2168d97c4..fbad627fb 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 (1107), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1111), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -269,7 +269,7 @@ URL: [url]',
 'comment' => 'Comentarios',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Comentario de la versión actual',
-'configure_extension' => '',
+'configure_extension' => 'Configurar extensión',
 'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '¡Sí, quiero regenerar el índice te texto completo¡',
 'confirm_move_document' => '',
@@ -416,7 +416,7 @@ URL: [url]',
 'does_not_expire' => 'No caduca',
 'does_not_inherit_access_msg' => 'heredar el acceso',
 'download' => 'Descargar',
-'download_extension' => '',
+'download_extension' => 'Descargar como archivo zip',
 'download_links' => '',
 'download_link_email_body' => '',
 'download_link_email_subject' => '',
@@ -477,6 +477,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_edit_task' => '',
 'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Ningún documento seleccionado',
@@ -704,7 +705,7 @@ URL: [url]',
 'librarydoc' => '',
 'linked_documents' => 'Documentos relacionados',
 'linked_files' => 'Adjuntos',
-'linked_to_current_version' => '',
+'linked_to_current_version' => 'Vinculado a la versión actual',
 'linked_to_document' => 'Enlazado al documento',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Si desea subir archivos mayores que el tamaño máximo actualmente permitido, por favor, utilice la <a href="%s">página de subida</a> alternativa.',
@@ -729,6 +730,7 @@ URL: [url]',
 'logout' => 'Desconectar',
 'log_management' => 'Gestión de ficheros de registro',
 'lo_LA' => 'Laotian',
+'malformed_expiration_date' => '',
 'manager' => 'Administrador',
 'manager_of_group' => 'Usted es el administrador de este grupo',
 'mandatory_approvergroups' => 'Grupo obligatorio de aprobadores',
@@ -1501,7 +1503,7 @@ URL: [url]',
 'set_owner_error' => 'Error estableciendo propietario',
 'set_password' => 'Establecer contraseña',
 'set_workflow' => 'Establecer Flujo de Trabajo',
-'show_extension_changelog' => '',
+'show_extension_changelog' => 'Mostrar log de cambios',
 'show_extension_version_list' => 'Lista corta de versiones',
 'signed_in_as' => 'Conectado como',
 'sign_in' => 'Conectar',
@@ -1532,6 +1534,7 @@ URL: [url]',
 'splash_edit_event' => '',
 'splash_edit_group' => 'Grupo guardado',
 'splash_edit_role' => '',
+'splash_edit_task' => '',
 'splash_edit_user' => 'Usuario guardado',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 930d7d8b5..d6cfc2799 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 (1089), jeromerobert (50), lonnnew (9), Oudiceval (725)
+//    Translators: Admin (1091), jeromerobert (50), lonnnew (9), Oudiceval (725)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -501,6 +501,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_edit_task' => '',
 'error_extension_getlist' => 'Erreur lors de l’obtention de la liste des extensions depuis le dépôt',
 'error_importfs' => 'Erreur lors de l’import depuis le système de fichiers',
 'error_no_document_selected' => 'Aucun document sélectionné',
@@ -760,6 +761,7 @@ URL: [url]',
 'logout' => 'Déconnexion',
 'log_management' => 'Gestion des fichiers journaux',
 'lo_LA' => 'Laotien',
+'malformed_expiration_date' => '',
 'manager' => 'Responsable',
 'manager_of_group' => 'Vous êtes le gestionnaire de ce groupe',
 'mandatory_approvergroups' => 'Obligatoire : groupes de valideurs',
@@ -1360,8 +1362,8 @@ Nom : [username]
 '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_enableWebdavReplaceDoc' => 'Remplacer le document lors de l’enregistrement',
 'settings_enableWebdavReplaceDoc_desc' => 'Si activé, l’enregistrement d’une nouvelle version d’un document remplacera l’ancien document plutôt que de créer une nouvelle version. Cela s’appliquera uniquement si l’utilisateur, le type MIME et le nom du fichier sont identiques à la dernière version. Cela peut être utile quand les applications enregistrent automatiquement un document à intervalles fixes.',
-'settings_enableXsendfile' => '',
-'settings_enableXsendfile_desc' => '',
+'settings_enableXsendfile' => 'Utiliser le module apache xsendfile',
+'settings_enableXsendfile_desc' => 'Si cette option est définie et que le module apache xsendfile est installé, il sera utilisé pour la livraison des images.',
 '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',
@@ -1585,6 +1587,7 @@ Nom : [username]
 'splash_edit_event' => 'Événement modifié',
 'splash_edit_group' => 'Groupe modifié',
 'splash_edit_role' => 'Rôle modifié',
+'splash_edit_task' => '',
 'splash_edit_user' => 'Utilisateur modifié',
 'splash_error_add_to_transmittal' => 'Erreur lors de l’ajout du document à la transmission',
 'splash_error_rm_download_link' => 'Erreur lors de la suppression du lien de téléchargement',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index b6e5c44e6..1b379a1dc 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -482,6 +482,7 @@ Internet poveznica: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_edit_task' => '',
 'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Nije odabran dokument',
@@ -734,6 +735,7 @@ Internet poveznica: [url]',
 'logout' => 'Odjava',
 'log_management' => 'Upravljanje datotekama zapisa',
 'lo_LA' => 'Laocijanski',
+'malformed_expiration_date' => '',
 'manager' => 'Upravitelj',
 'manager_of_group' => 'Vi ste upravitelj ove grupe',
 'mandatory_approvergroups' => 'Obavezne grupe validatora',
@@ -1553,6 +1555,7 @@ Internet poveznica: [url]',
 'splash_edit_event' => '',
 'splash_edit_group' => 'Groupa pohranjena',
 'splash_edit_role' => '',
+'splash_edit_task' => '',
 'splash_edit_user' => 'Korisnik pohranjen',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 4fb4587d2..71e88d17b 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 (629), ribaz (1036)
+//    Translators: Admin (631), ribaz (1036)
 
 $text = array(
 '2_factor_auth' => 'Kétfaktoros azonosítás',
@@ -477,6 +477,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_edit_task' => '',
 'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Nincs kijelölt dokumentum',
@@ -729,6 +730,7 @@ URL: [url]',
 'logout' => 'Kijelentkezés',
 'log_management' => 'Napló állományok kezelése',
 'lo_LA' => 'Laoszi',
+'malformed_expiration_date' => '',
 'manager' => 'Kezelő',
 'manager_of_group' => 'Ön a vezető ebben a csoportban',
 'mandatory_approvergroups' => 'Kötelező csoportjai a jóváhagyóknak',
@@ -1109,7 +1111,7 @@ URL: [url]',
 'select_attrdefgrp_show' => '',
 'select_attribute_value' => '',
 'select_category' => 'Kattintson a kategória kiválasztásához',
-'select_group' => '',
+'select_group' => 'Csoport kiválasztása',
 'select_groups' => 'Kattintson a csoportok kijelöléséhez',
 'select_grp_approvers' => 'Kattintson a csoport jóváhagyó kijelöléséhez',
 'select_grp_ind_approvers' => '',
@@ -1127,7 +1129,7 @@ URL: [url]',
 'select_ind_reviewers' => 'Kattintson az önálló felülvizsgáló kijelöléséhez',
 'select_ind_revisors' => '',
 'select_one' => 'Vßlasszon egyet',
-'select_user' => '',
+'select_user' => 'Felhasználó kiválasztása',
 'select_users' => 'Kattintson a felhasználó kiválasztásához',
 'select_value' => '',
 'select_workflow' => 'Munkafolyamat választás',
@@ -1531,6 +1533,7 @@ URL: [url]',
 'splash_edit_event' => '',
 'splash_edit_group' => 'Csoport mentve',
 'splash_edit_role' => '',
+'splash_edit_task' => '',
 'splash_edit_user' => 'Felhasználó mentve',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 3b6faaedb..2b939c5d3 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 (1620), rickr (144), s.pnt (26)
+//    Translators: Admin (1622), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -483,6 +483,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_edit_task' => '',
 'error_extension_getlist' => '',
 'error_importfs' => 'Errore durante l\'importazione dal file system',
 'error_no_document_selected' => 'Nessun documento selezionato',
@@ -735,6 +736,7 @@ URL: [url]',
 'logout' => 'Logout',
 'log_management' => 'Amministrazione file di log',
 'lo_LA' => 'Laotiano',
+'malformed_expiration_date' => '',
 'manager' => 'Manager',
 'manager_of_group' => 'Tu sei l\'Amministratore di questo gruppo',
 'mandatory_approvergroups' => 'Gruppi di Approvatori necessari',
@@ -1340,8 +1342,8 @@ URL: [url]',
 'settings_enableVersionModification_desc' => 'Abilita/disabilita il permesso di modificare le versioni di un documento da parte di un qualsiasi utente. Gli Amministratori hanno sempre e comunque tale facoltà.',
 'settings_enableWebdavReplaceDoc' => 'Sostituisci il documento durante il salvataggio',
 'settings_enableWebdavReplaceDoc_desc' => 'Se abilitato, durante il salvataggio il documento verrà sostituito invece di crearne uno nuovo. Si applica solo se l\'utente, estensione e nome del file sono uguali all\'ultima versione. E\' utile per applicazioni che ad intervalli regolari salvano un documento.',
-'settings_enableXsendfile' => '',
-'settings_enableXsendfile_desc' => '',
+'settings_enableXsendfile' => 'Usa il modulo apache xsendfile',
+'settings_enableXsendfile_desc' => 'Se selezionato ed e\' installato il modulo apache xsendfile, questo puo\' essere usato per inviare immagini',
 'settings_encryptionKey' => 'Chiave di criptazione',
 'settings_encryptionKey_desc' => 'La chiave viene usata per creare un identificatore unico da aggiungere come campo nascosto ad un formulario per protezione da attacchi CSRF.',
 'settings_error' => 'Errore',
@@ -1565,6 +1567,7 @@ URL: [url]',
 'splash_edit_event' => '',
 'splash_edit_group' => 'Gruppo modificato',
 'splash_edit_role' => 'Ruolo memorizzata',
+'splash_edit_task' => '',
 'splash_edit_user' => 'Utente modificato',
 'splash_error_add_to_transmittal' => 'Errore durante l\'aggiunta di documento per la trasmissione',
 'splash_error_rm_download_link' => '',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 312210620..c5733f683 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -483,6 +483,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_edit_task' => '',
 'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => '선택되지 문서는',
@@ -735,6 +736,7 @@ URL: [url]',
 'logout' => '로그 아웃',
 'log_management' => '파일 관리 로그',
 'lo_LA' => '',
+'malformed_expiration_date' => '',
 'manager' => '관리자',
 'manager_of_group' => '당신은 이 그룹의 관리자 입니다.',
 'mandatory_approvergroups' => '필수 승인 그룹',
@@ -1547,6 +1549,7 @@ URL : [url]',
 'splash_edit_event' => '',
 'splash_edit_group' => '그룹 저장',
 'splash_edit_role' => '',
+'splash_edit_task' => '',
 'splash_edit_user' => '사용자 저장',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc
index 37b4cae5c..d2a6be267 100644
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@@ -487,6 +487,7 @@ URL: [url]',
 'error_add_aro' => 'ເກີດຂໍຜິດພາດຂະນະເພີ່ມການເພີ່ມຄຳຂໍການເຂົາເຖິງ',
 'error_add_permission' => 'ເກີດຂໍ້ຜິດພາດໃນຂະນະເພີ່ມສິດ',
 'error_cleared_cache' => 'ເກີດຂໍ້ຜິດພາດໃນຂະນະລ້າງແຄຣ',
+'error_edit_task' => '',
 'error_extension_getlist' => '',
 'error_importfs' => 'ເກີດຂໍ້ຜິດພາດໃນຂະນະເຂົ້າລະບົບໄຟລຟອມ',
 'error_no_document_selected' => 'ບໍ່ມີເອກະສານທີເລືອກ',
@@ -739,6 +740,7 @@ URL: [url]',
 'logout' => 'ອອກຈາກລະບົບ',
 'log_management' => 'ການຈັດການຟາຍບັນທຶກ',
 'lo_LA' => '',
+'malformed_expiration_date' => '',
 'manager' => 'ຜູ້ຈັດການ',
 'manager_of_group' => 'ເຈົ້າເປັນຜູ້ດູແລກຸ່ມນີ້',
 'mandatory_approvergroups' => 'ກຸ່ມຜູ້ອະນຸມັດທີ່ຈຳເປັນ',
@@ -1580,6 +1582,7 @@ URL: [url]',
 'splash_edit_event' => 'ບັນທຶກກິດຈະກຳແລ້ວ',
 'splash_edit_group' => 'ບັນທຶກກຸ່ມແລ້ວ',
 'splash_edit_role' => 'ບັນທຶກບົດບາດແລ້ວ',
+'splash_edit_task' => '',
 'splash_edit_user' => 'ບັນທຶກຜູ້ໄຊ້ແລ້ວ',
 'splash_error_add_to_transmittal' => 'ເກີດຂໍ້ຜິດພາດໃນຂະນະທີ່ເພີ່ມເອກະສານເພື່ອຕິດຕໍ່',
 'splash_error_rm_download_link' => 'ຂໍ້ຜິດພາດໃນການລົບລິງການດາວໂຫລດ',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 493f884dd..ce443f923 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -482,6 +482,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_edit_task' => '',
 'error_extension_getlist' => '',
 'error_importfs' => 'Fout bij het importeren van form file systeem',
 'error_no_document_selected' => 'Geen document geselecteerd',
@@ -734,6 +735,7 @@ URL: [url]',
 'logout' => 'Log uit',
 'log_management' => 'Logbestanden beheer',
 'lo_LA' => 'Laotiaans',
+'malformed_expiration_date' => '',
 'manager' => 'Beheerder',
 'manager_of_group' => 'U bent beheerder van deze groep',
 'mandatory_approvergroups' => 'Verplichte groep \'[group]\'',
@@ -1577,6 +1579,7 @@ Name: [username]
 'splash_edit_event' => 'Gebeurtenis opgeslagen',
 'splash_edit_group' => 'Groep opgeslagen',
 'splash_edit_role' => 'Rol opgeslagen',
+'splash_edit_task' => '',
 'splash_edit_user' => 'Gebruiker opgeslagen',
 'splash_error_add_to_transmittal' => 'Fout: toevoeging aan verzending',
 'splash_error_rm_download_link' => 'Fout bij verwijderen download-link',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 0930f4ccb..31cad25b9 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 (829), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (830), netixw (84), romi (93), uGn (112)
 
 $text = array(
 '2_factor_auth' => '',
@@ -470,6 +470,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_edit_task' => '',
 'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Brak wybranych dokumentów',
@@ -722,6 +723,7 @@ URL: [url]',
 'logout' => 'Wyloguj',
 'log_management' => 'Zarządzanie plikami dziennika',
 'lo_LA' => 'Laotański',
+'malformed_expiration_date' => '',
 'manager' => 'Zarządca',
 'manager_of_group' => '',
 'mandatory_approvergroups' => '',
@@ -1511,6 +1513,7 @@ URL: [url]',
 'splash_edit_event' => '',
 'splash_edit_group' => 'Grupa zapisana',
 'splash_edit_role' => '',
+'splash_edit_task' => '',
 'splash_edit_user' => 'Zapisano użytkownika',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
@@ -1633,7 +1636,7 @@ URL: [url]',
 'timeline_skip_status_change_-3' => 'przedawniony',
 'timeline_skip_status_change_0' => 'oczekuje na opinię',
 'timeline_skip_status_change_1' => 'oczekuje na zatwierdzenie',
-'timeline_skip_status_change_2' => '',
+'timeline_skip_status_change_2' => 'wydany',
 'timeline_skip_status_change_3' => 'w obiegu',
 'timeline_skip_status_change_4' => '',
 'timeline_skip_status_change_5' => '',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index ac44086dc..2d020901e 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -476,6 +476,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_edit_task' => '',
 'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Nenhum documento selecionado',
@@ -728,6 +729,7 @@ URL: [url]',
 'logout' => 'Sair',
 'log_management' => 'Gerenciamento de Logs',
 'lo_LA' => 'Laoiano',
+'malformed_expiration_date' => '',
 'manager' => 'Manager',
 'manager_of_group' => 'Você é o gerente deste grupo',
 'mandatory_approvergroups' => 'Grupos obrigatórios de aprovadores',
@@ -1529,6 +1531,7 @@ URL: [url]',
 'splash_edit_event' => '',
 'splash_edit_group' => 'Grupo salvo',
 'splash_edit_role' => '',
+'splash_edit_task' => '',
 'splash_edit_user' => 'Usuário salvo',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 6f8736bcb..44c80298b 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 (1081), balan (87)
+//    Translators: Admin (1082), balan (87)
 
 $text = array(
 '2_factor_auth' => '',
@@ -482,6 +482,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_edit_task' => '',
 'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Nici un document selectat',
@@ -733,7 +734,8 @@ URL: [url]',
 'login_restrictions_apply' => '',
 'logout' => 'Logout',
 'log_management' => 'Log management de fișiere',
-'lo_LA' => '',
+'lo_LA' => 'Laoțiană',
+'malformed_expiration_date' => '',
 'manager' => 'Manager',
 'manager_of_group' => 'Sunteți managerul acestui grup',
 'mandatory_approvergroups' => 'Grupuri obligatorii de aprobatori',
@@ -1554,6 +1556,7 @@ URL: [url]',
 'splash_edit_event' => '',
 'splash_edit_group' => 'Grup salvat',
 'splash_edit_role' => '',
+'splash_edit_task' => '',
 'splash_edit_user' => 'Utilizator salvat',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index be0b1badd..fcc6bfc10 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -482,6 +482,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => 'Ошибка добавления разрешения',
 'error_cleared_cache' => 'Ошибка очиски кеша',
+'error_edit_task' => '',
 'error_extension_getlist' => '',
 'error_importfs' => 'Ошибка импорта из файловой системы',
 'error_no_document_selected' => 'Нет выбранных документов',
@@ -734,6 +735,7 @@ URL: [url]',
 'logout' => 'Выход',
 'log_management' => 'Управление журналами',
 'lo_LA' => 'Лаос',
+'malformed_expiration_date' => '',
 'manager' => 'Менеджер',
 'manager_of_group' => 'Вы являетесь менеджером данной группы',
 'mandatory_approvergroups' => 'Обязательные группы утверждающих',
@@ -1561,6 +1563,7 @@ URL: [url]',
 'splash_edit_event' => '',
 'splash_edit_group' => 'Группа сохранена',
 'splash_edit_role' => '',
+'splash_edit_task' => '',
 'splash_edit_user' => 'Пользователь сохранён',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index bde97b83e..f2e84f61d 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -501,6 +501,7 @@ Odkaz je platný do [valid].
 'error_add_aro' => 'Error while adding access request object',
 'error_add_permission' => 'Error while add permission',
 'error_cleared_cache' => 'Chyba pri vymazaní vyrovnávacej pamäte',
+'error_edit_task' => '',
 'error_extension_getlist' => 'Error getting extension list from repository',
 'error_importfs' => 'Chyba pri importe zo súborového systému',
 'error_no_document_selected' => 'Nie je vybratý žiadny dokument',
@@ -760,6 +761,7 @@ URL: [url]',
 'logout' => 'Odhlásenie',
 'log_management' => 'Správa protokolov',
 'lo_LA' => 'Laoský',
+'malformed_expiration_date' => '',
 'manager' => 'Manažér',
 'manager_of_group' => 'Ste správcom tejto skupiny',
 'mandatory_approvergroups' => 'Mandatory Groups of approvers',
@@ -1601,6 +1603,7 @@ Meno: [username]
 'splash_edit_event' => 'Udalosť bola uložená',
 'splash_edit_group' => 'Skupina bola uložená',
 'splash_edit_role' => 'Rola bola uložená',
+'splash_edit_task' => '',
 'splash_edit_user' => 'Používateľ bol uložený',
 'splash_error_add_to_transmittal' => 'Error while adding document to transmittal',
 'splash_error_rm_download_link' => 'Error when removing download link',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 79b0ba23a..ec4285d62 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -495,6 +495,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_edit_task' => '',
 'error_extension_getlist' => '',
 'error_importfs' => 'Fel vid import från filsystem',
 'error_no_document_selected' => 'Inget dokument har valts',
@@ -747,6 +748,7 @@ URL: [url]',
 'logout' => 'Logga ut',
 'log_management' => 'Loggfilshantering',
 'lo_LA' => 'Laotisk',
+'malformed_expiration_date' => '',
 'manager' => 'Manager',
 'manager_of_group' => 'Du är förvaltaren av denna grupp',
 'mandatory_approvergroups' => 'Obligatoriska grupper för godkännande',
@@ -1574,6 +1576,7 @@ Kommentar: [comment]',
 'splash_edit_event' => 'Händelse sparad',
 'splash_edit_group' => 'Grupp sparad',
 'splash_edit_role' => 'Roll sparad',
+'splash_edit_task' => '',
 'splash_edit_user' => 'Användare sparad',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => 'Fel vid borttagande av nedladdningslänk',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 183fe51b2..393ebd32e 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -476,6 +476,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_edit_task' => '',
 'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Hiçbir doküman seçilmedi',
@@ -728,6 +729,7 @@ URL: [url]',
 'logout' => 'Çıkış',
 'log_management' => 'Log yönetimi',
 'lo_LA' => 'Laotian',
+'malformed_expiration_date' => '',
 'manager' => 'Yönetici',
 'manager_of_group' => 'Bu grubun yöneticisi sizsiniz',
 'mandatory_approvergroups' => 'Onaylayıcılar için zorunlu grup',
@@ -1533,6 +1535,7 @@ URL: [url]',
 'splash_edit_event' => '',
 'splash_edit_group' => 'Grup kaydedildi',
 'splash_edit_role' => '',
+'splash_edit_task' => '',
 'splash_edit_user' => 'Kullanıcı kaydedildi',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index b1d9a038c..c69a2334b 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -482,6 +482,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_edit_task' => '',
 'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => 'Немає вибраних документів',
@@ -734,6 +735,7 @@ URL: [url]',
 'logout' => 'Вихід',
 'log_management' => 'Керування журналами',
 'lo_LA' => 'Лаоська',
+'malformed_expiration_date' => '',
 'manager' => 'Менеджер',
 'manager_of_group' => 'Менеджер групи',
 'mandatory_approvergroups' => 'Обов\'язкові групи затвержувачів',
@@ -1554,6 +1556,7 @@ URL: [url]',
 'splash_edit_event' => '',
 'splash_edit_group' => 'Групу збережено',
 'splash_edit_role' => '',
+'splash_edit_task' => '',
 'splash_edit_user' => 'Користувача збережено',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index c571544a2..5f13d24f7 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 (751), archonwang (469), fengjohn (5), yang86 (1)
+//    Translators: Admin (757), archonwang (469), fengjohn (5), yang86 (1)
 
 $text = array(
 '2_factor_auth' => '双重认证',
@@ -266,7 +266,7 @@ URL: [url]',
 'comment' => '说明',
 'comment_changed_email' => '',
 'comment_for_current_version' => '版本说明',
-'configure_extension' => '',
+'configure_extension' => '配置扩展',
 'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '确认重新创建全文索引',
 'confirm_move_document' => '',
@@ -415,7 +415,7 @@ URL: [url]',
 'does_not_expire' => '永不过期',
 'does_not_inherit_access_msg' => '继承访问权限',
 'download' => '下载',
-'download_extension' => '',
+'download_extension' => '以ZIP格式下载扩展',
 'download_links' => '下载链接',
 'download_link_email_body' => '点击以下链接下载文档 \'[docname]\' 的 [version] 版本。
 
@@ -482,6 +482,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '添加权限时出错',
 'error_cleared_cache' => '清理缓存时出错',
+'error_edit_task' => '',
 'error_extension_getlist' => '',
 'error_importfs' => '从文件系统导入时出错',
 'error_no_document_selected' => '请选择文档',
@@ -521,9 +522,9 @@ URL: [url]',
 'export' => '导出',
 'extension_archive' => '',
 'extension_changelog' => '更新日志',
-'extension_loading' => '',
+'extension_loading' => '加载扩展',
 'extension_manager' => '扩展管理器',
-'extension_mgr_installed' => '',
+'extension_mgr_installed' => '已安装',
 'extension_mgr_no_upload' => '上传新扩展名是不可能的，因为extentension目录不可写',
 'extension_mgr_repository' => '可得到',
 'extension_version_list' => '版本列表',
@@ -730,6 +731,7 @@ URL: [url]',
 'logout' => '登出',
 'log_management' => '日志管理',
 'lo_LA' => '老挝',
+'malformed_expiration_date' => '',
 'manager' => '管理员',
 'manager_of_group' => '您是当前组的管理员',
 'mandatory_approvergroups' => '',
@@ -1504,8 +1506,8 @@ URL: [url]',
 'set_owner_error' => '错误 设置所有者',
 'set_password' => '设定密码',
 'set_workflow' => '',
-'show_extension_changelog' => '',
-'show_extension_version_list' => '',
+'show_extension_changelog' => '显示更新记录',
+'show_extension_version_list' => '显示版本列表',
 'signed_in_as' => '登录为',
 'sign_in' => '登录',
 'sign_out' => '登出',
@@ -1535,6 +1537,7 @@ URL: [url]',
 'splash_edit_event' => '事件已保存',
 'splash_edit_group' => '组已保存',
 'splash_edit_role' => '角色已保存',
+'splash_edit_task' => '',
 'splash_edit_user' => '用户信息已保存',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '移除下载链接时报错',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 44f5419d1..ec317d2be 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -427,6 +427,7 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_cleared_cache' => '',
+'error_edit_task' => '',
 'error_extension_getlist' => '',
 'error_importfs' => '',
 'error_no_document_selected' => '請選擇文檔',
@@ -655,6 +656,7 @@ URL: [url]',
 'logout' => '登出',
 'log_management' => '日誌管理',
 'lo_LA' => '',
+'malformed_expiration_date' => '',
 'manager' => '管理員',
 'manager_of_group' => '',
 'mandatory_approvergroups' => '',
@@ -1384,6 +1386,7 @@ URL: [url]',
 'splash_edit_event' => '',
 'splash_edit_group' => '',
 'splash_edit_role' => '',
+'splash_edit_task' => '',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => '',
diff --git a/restapi/index.php b/restapi/index.php
index 16b14a690..d4e2afa91 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -65,6 +65,8 @@ function __getLatestVersionData($lc) { /* {{{ */
         'keywords'=>$document->getKeywords(),
         'mimetype'=>$lc->getMimeType(),
         'version'=>$lc->getVersion(),
+        'version_comment'=>$lc->getComment(),
+        'version_date'=>$lc->getDate(),
         'size'=>$lc->getFileSize(),
     );
     $cats = $document->getCategories();
@@ -388,6 +390,17 @@ function createFolder($request, $response, $args) { /* {{{ */
             $params = $request->getParsedBody();
             if(!empty($params['name'])) {
                 $comment = isset($params['comment']) ? $params['comment'] : '';
+								if(isset($params['sequence'])) {
+										$sequence = str_replace(',', '.', $params["sequence"]);
+										if (!is_numeric($sequence))
+												return $response->withJson(array('success'=>false, 'message'=>getMLText("invalid_sequence"), 'data'=>''), 400);
+								} else {
+										$dd = $parent->getSubFolders('s');
+										if(count($dd) > 1)
+												$sequence = $dd[count($dd)-1]->getSequence() + 1;
+										else
+												$sequence = 1.0;
+								}
                 $newattrs = array();
                 if(!empty($params['attributes'])) {
                     foreach($params['attributes'] as $attrname=>$attrvalue) {
@@ -397,7 +410,7 @@ function createFolder($request, $response, $args) { /* {{{ */
                         }
                     }
                 }
-                if($folder = $parent->addSubFolder($params['name'], $comment, $userobj, 0, $newattrs)) {
+                if($folder = $parent->addSubFolder($params['name'], $comment, $userobj, $sequence, $newattrs)) {
 
                     $rec = __getFolderData($folder);
                     return $response->withJson(array('success'=>true, 'message'=>'', 'data'=>$rec), 201);
@@ -570,7 +583,7 @@ function uploadDocument($request, $response, $args) { /* {{{ */
             unlink($temp);
             if($res) {
                 $doc = $res[0];
-                $rec = array('id'=>(int)$doc->getId(), 'name'=>$doc->getName());
+                $rec = array('id'=>(int)$doc->getId(), 'name'=>$doc->getName(), 'version'=>$doc->getLatestContent()->getVersion());
                 return $response->withJson(array('success'=>true, 'message'=>'Upload succeded', 'data'=>$rec), 200);
             } else {
                 return $response->withJson(array('success'=>false, 'message'=>'Upload failed', 'data'=>''), 500);
@@ -600,11 +613,23 @@ function updateDocument($request, $response, $args) { /* {{{ */
 
     $document = $dms->getDocument($args['id']);
     if($document) {
-        $uploadedFiles = $request->getUploadedFiles();
         if ($document->getAccessMode($userobj, 'updateDocument') >= M_READWRITE) {
             $params = $request->getParsedBody();
             $origfilename = isset($params['origfilename']) ? $params['origfilename'] : null;
             $comment = isset($params['comment']) ? $params['comment'] : null;
+            $attributes = isset($params["attributes"]) ? $params["attributes"] : array();
+            foreach($attributes as $attrdefid=>$attribute) {
+                if($attrdef = $dms->getAttributeDefinition($attrdefid)) {
+                    if($attribute) {
+                        if(!$attrdef->validate($attribute)) {
+                            return $response->withJson(array('success'=>false, 'message'=>getAttributeValidationText($attrdef->getValidationError(), $attrdef->getName(), $attribute), 'data'=>''), 400);
+                        }
+                    } elseif($attrdef->getMinValues() > 0) {
+                        return $response->withJson(array('success'=>false, 'message'=>getMLText("attr_min_values", array("attrname"=>$attrdef->getName())), 'data'=>''), 400);
+                    }
+                }
+            }
+            $uploadedFiles = $request->getUploadedFiles();
             if (count($uploadedFiles) == 0) {
                 return $response->withJson(array('success'=>false, 'message'=>'No file detected', 'data'=>''), 400);
             }
@@ -616,11 +641,11 @@ function updateDocument($request, $response, $args) { /* {{{ */
             $userfiletype = finfo_file($finfo, $temp);
             $fileType = ".".pathinfo($origfilename, PATHINFO_EXTENSION);
             finfo_close($finfo);
-            $res=$document->addContent($comment, $userobj, $temp, $origfilename, $fileType, $userfiletype);
+            $res=$document->addContent($comment, $userobj, $temp, $origfilename, $fileType, $userfiletype, array(), array(), 0, $attributes);
 
             unlink($temp);
             if($res) {
-                $rec = array('id'=>(int)$document->getId(), 'name'=>$document->getName());
+                $rec = array('id'=>(int)$document->getId(), 'name'=>$document->getName(), 'version'=>$document->getLatestContent()->getVersion());
                 return $response->withJson(array('success'=>true, 'message'=>'Upload succeded', 'data'=>$rec), 200);
             } else {
                 return $response->withJson(array('success'=>false, 'message'=>'Upload failed', 'data'=>''), 500);
@@ -738,6 +763,36 @@ function uploadDocumentFile($request, $response, $args) { /* {{{ */
     }
 } /* }}} */
 
+function addDocumentLink($request, $response, $args) { /* {{{ */
+    global $dms, $userobj;
+
+    if(!$userobj) {
+        return $response->withJson(array('success'=>false, 'message'=>'Not logged in', 'data'=>''), 403);
+    }
+
+    if(!ctype_digit($args['id']) || $args['id'] == 0) {
+        return $response->withJson(array('success'=>false, 'message'=>'No source document given', 'data'=>''), 400);
+        return;
+    }
+    $sourcedoc = $dms->getDocument($args['id']);
+    $targetdoc = $dms->getDocument($args['documentid']);
+    if($sourcedoc && $targetdoc) {
+        if($sourcedoc->getAccessMode($userobj, 'addDocumentLink') >= M_READ) {
+					$params = $request->getParsedBody();
+					  $public = !isset($params['public']) ? true : false;
+						if ($sourcedoc->addDocumentLink($targetdoc->getId(), $userobj->getID(), $public)){
+                return $response->withJson(array('success'=>true, 'message'=>'', 'data'=>''), 201);
+						} else {
+								return $response->withJson(array('success'=>false, 'message'=>'Could not create document link', 'data'=>''), 500);
+						}
+        } else {
+            return $response->withJson(array('success'=>false, 'message'=>'No access on source document', 'data'=>''), 403);
+        }
+    } else {
+        return $response->withJson(array('success'=>false, 'message'=>'Could not find source or target document', 'data'=>''), 500);
+    }
+} /* }}} */
+
 function getDocument($request, $response, $args) { /* {{{ */
     global $dms, $userobj;
     $document = $dms->getDocument($args['id']);
@@ -939,6 +994,34 @@ function getDocumentVersion($request, $response, $args) { /* {{{ */
     }
 } /* }}} */
 
+function updateDocumentVersion($request, $response, $args) { /* {{{ */
+    global $dms, $userobj;
+    $document = $dms->getDocument($args['id']);
+
+    if($document) {
+        if ($document->getAccessMode($userobj) >= M_READ) {
+            $lc = $document->getContentByVersion($args['version']);
+            if($lc) {
+              $params = $request->getParsedBody();
+              if (isset($params['comment'])) {
+                $lc->setComment($params['comment']);
+                return $response->withJson(array('success'=>true, 'message'=>'', 'data'=>''), 200);
+              }
+            } else {
+              return $response->withJson(array('success'=>false, 'message'=>'No such version', 'data'=>''), 400);
+            }
+        } else {
+            return $response->withJson(array('success'=>false, 'message'=>'No access', 'data'=>''), 403);
+        }
+    } else {
+        if($document === null)
+            $status=400;
+        else
+            $status=500;
+        return $response->withJson(array('success'=>false, 'message'=>'No document', 'data'=>''), $status);
+    }
+} /* }}} */
+
 function getDocumentFiles($request, $response, $args) { /* {{{ */
     global $dms, $userobj;
     $document = $dms->getDocument($args['id']);
@@ -1173,10 +1256,16 @@ function doSearch($request, $response) { /* {{{ */
 
     $params = $request->getQueryParams();
     $querystr = $params['query'];
-    $mode = $params['mode'];
-    if(!$limit = $params['limit'])
+    $mode = isset($params['mode']) ? $params['mode'] : '';
+    if(!isset($params['limit']) || !$limit = $params['limit'])
         $limit = 5;
-    $resArr = $dms->search($querystr);
+    if(!isset($params['offset']) || !$offset = $params['offset'])
+        $offset = 0;
+    if(!isset($params['searchin']) || !$searchin = explode(",",$params['searchin']))
+        $searchin = array();
+    if(!isset($params['objects']) || !$objects = $params['objects'])
+        $objects = 0x3;
+    $resArr = $dms->search($querystr, $limit, $offset, 'AND', $searchin, null, null, array(), array(), array(), array(), array(), array(), array(), $objects);
     if($resArr === false) {
         return $response->withJson(array(), 200);
     }
@@ -1266,7 +1355,7 @@ function doSearchByAttr($request, $response) { /* {{{ */
     $params = $request->getQueryParams();
     $attrname = $params['name'];
     $query = $params['value'];
-    if(!$limit = $params['limit'])
+    if(empty($params['limit']) || !$limit = $params['limit'])
         $limit = 50;
     $attrdef = $dms->getAttributeDefinitionByName($attrname);
     $entries = array();
@@ -1961,9 +2050,11 @@ $app->post('/document/{id}/move/{folderid}', 'moveDocument');
 $app->get('/document/{id}/content', 'getDocumentContent');
 $app->get('/document/{id}/versions', 'getDocumentVersions');
 $app->get('/document/{id}/version/{version}', 'getDocumentVersion');
+$app->put('/document/{id}/version/{version}', 'updateDocumentVersion');
 $app->get('/document/{id}/files', 'getDocumentFiles');
 $app->get('/document/{id}/file/{fileid}', 'getDocumentFile');
 $app->get('/document/{id}/links', 'getDocumentLinks');
+$app->post('/document/{id}/link/{documentid}', 'addDocumentLink');
 $app->get('/document/{id}/attributes', 'getDocumentAttributes');
 $app->get('/document/{id}/preview/{version}/{width}', 'getDocumentPreview');
 $app->delete('/document/{id}/categories', 'removeDocumentCategories');
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 88d2715fb..4ae40b86d 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1587,7 +1587,7 @@ $(document).ready(function() {
 				} else {
 					$content .= "\"";
 				}
-				$content .= "".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '')." class=\"chzn-select-deselect\" data-placeholder=\"".getMLText("select_value")."\">";
+				$content .= "".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '')." class=\"chzn-select\" data-placeholder=\"".getMLText("select_value")."\">";
 				if(!$attrdef->getMultipleValues()) {
 					$content .= "<option value=\"\"></option>";
 				}
@@ -1907,6 +1907,12 @@ $(function() {
 			$('#jqtree<?php echo $formid ?>').tree('openNode', node);
 //			event.preventDefault();
 			if(node.is_folder) {
+				if(typeof node.fetched == 'undefined') {
+					node.fetched = true;
+					$(this).tree('loadDataFromUrl', node, function () {
+						$(this).tree('openNode', node);}
+					);
+				}
 				folderSelected<?php echo $formid ?>(node.id, node.name);
 			} else
 				documentSelected<?php echo $formid ?>(node.id, node.name);
diff --git a/views/bootstrap/class.ErrorDlg.php b/views/bootstrap/class.ErrorDlg.php
index 10873999e..ef5cc64ed 100644
--- a/views/bootstrap/class.ErrorDlg.php
+++ b/views/bootstrap/class.ErrorDlg.php
@@ -37,9 +37,10 @@ class SeedDMS_View_ErrorDlg extends SeedDMS_Bootstrap_Style {
 		$pagetitle = $this->params['pagetitle'];
 		$errormsg = $this->params['errormsg'];
 		$plain = $this->params['plain'];
+		$settings = $this->params['settings'];
 
-		if(!$plain) {	
-			$this->htmlStartPage($pagetitle);
+		if(!$plain) {
+			$this->htmlStartPage($pagetitle, 'errorpage', $settings->_httpRoot."out");
 			$this->globalNavigation();
 			$this->contentStart();
 		}
diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index 4d2e2cb4e..0ea9adb1a 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -59,6 +59,13 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 				var element = $(this);
 				$('#'+element.data('extname')+'-import').submit();
 			});
+
+			$("#extensionfilter").on("keyup", function() {
+				var value = $(this).val().toLowerCase();
+				$("#extensionlist tbody tr").filter(function() {
+					$(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
+				});
+			});
 		});
 <?php
 
@@ -169,9 +176,10 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 		</ul>
 		<div class="tab-content">
 			<div class="tab-pane <?php if(!$currenttab || $currenttab == 'installed') echo 'active'; ?>" id="installed">
+			<input id="extensionfilter" type="text">
 <?php
 //		$this->contentContainerStart();
-		echo "<table class=\"table _table-condensed\">\n";
+		echo "<table id=\"extensionlist\" class=\"table _table-condensed\">\n";
 		print "<thead>\n<tr>\n";
 		print "<th></th>\n";	
 		print "<th>".getMLText('name')."</th>\n";	
diff --git a/views/bootstrap/class.FolderAccess.php b/views/bootstrap/class.FolderAccess.php
index 4a5f18b9d..bf3905d05 100644
--- a/views/bootstrap/class.FolderAccess.php
+++ b/views/bootstrap/class.FolderAccess.php
@@ -193,7 +193,7 @@ $(document).ready(function() {
 		$options[] = array(-1, getMLText('select_one'));
 		foreach ($allUsers as $currUser) {
 			if (!$currUser->isGuest())
-				$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()), ($currUser->getID()==$user->getID()), array(array('data-subtitle', htmlspecialchars($currUser->getFullName()))));
+				$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()), false, array(array('data-subtitle', htmlspecialchars($currUser->getFullName()))));
 		}
 		$this->formField(
 			getMLText("user"),
diff --git a/views/bootstrap/class.Login.php b/views/bootstrap/class.Login.php
index 9eeb941d0..81fbcfcde 100644
--- a/views/bootstrap/class.Login.php
+++ b/views/bootstrap/class.Login.php
@@ -32,6 +32,7 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_Login extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
+		header('Content-Type: application/javascript; charset=UTF-8');
 ?>
 document.form1.login.focus();
 function checkForm()
diff --git a/views/bootstrap/class.OverrideContentStatus.php b/views/bootstrap/class.OverrideContentStatus.php
index 9ea9dfebd..d1a6a7aed 100644
--- a/views/bootstrap/class.OverrideContentStatus.php
+++ b/views/bootstrap/class.OverrideContentStatus.php
@@ -100,7 +100,7 @@ $(document).ready(function() {
 		$options[] = array('', '');
 		if ($overallStatus["status"] == S_OBSOLETE)
 			$options[] = array(S_RELEASED, getOverallStatusText(S_RELEASED));
-		if ($overallStatus["status"] == S_RELEASED)
+		if ($overallStatus["status"] != S_OBSOLETE)
 			$options[] = array(S_OBSOLETE, getOverallStatusText(S_OBSOLETE));
 		if ($overallStatus["status"] != S_DRAFT)
 			$options[] = array(S_DRAFT, getOverallStatusText(S_DRAFT));
diff --git a/views/bootstrap/class.SubstituteUser.php b/views/bootstrap/class.SubstituteUser.php
index 584a721f9..7ac8a5f14 100644
--- a/views/bootstrap/class.SubstituteUser.php
+++ b/views/bootstrap/class.SubstituteUser.php
@@ -32,6 +32,16 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
+?>
+		$(document).ready(function(){
+			$("#myInput").on("keyup", function() {
+				var value = $(this).val().toLowerCase();
+				$("#myTable tbody tr").filter(function() {
+					$(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
+				});
+			});
+		});
+<?php
 	} /* }}} */
 
 	function show() { /* {{{ */
@@ -46,7 +56,8 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 
 		$this->contentHeading(getMLText("substitute_user"));
 ?>
-	<table class="table table-condensed">
+  <input type="text" id="myInput">
+	<table id="myTable" class="table table-condensed">
 		<thead>
 		<tr><th><?php printMLText('name'); ?></th><th><?php printMLText('email');?></th><th><?php printMLText('role'); ?></th><th><?php printMLText('groups'); ?></th><th></th></tr>
 		</thead>
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 6cdabba0f..dbe02e23b 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -461,6 +461,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 	function show() { /* {{{ */
 		parent::show();
+
+		$this->callHook('preViewDocument');
+
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index c07c24a29..722b6799c 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -136,7 +136,7 @@ $('#loadmore').click(function(e) {
 <?php } ?>
 <?php
 		if($showtree == 1)
-			$this->printNewTreeNavigationJs($folder->getID(), M_READ, 0, '', $expandFolderTree == 2, $orderby);
+			$this->printNewTreeNavigationJs($folder->getID(), M_READ, 0, '', ($expandFolderTree == 1) ? -1 : 3, $orderby);
 
 		if ($enableDropUpload && $folder->getAccessMode($user) >= M_READWRITE) {
 			echo "SeedDMSUpload.setUrl('../op/op.Ajax.php');";
@@ -283,7 +283,7 @@ $('#loadmore').click(function(e) {
 					 * access expandFolderTree with $this->params because it can
 					 * be changed by preContent hook.
 					 */
-					$this->printNewTreeNavigationHtml($folderid, M_READ, 0, '', $this->params['expandFolderTree'], $orderby);
+					$this->printNewTreeNavigationHtml($folderid, M_READ, 0, '', ($this->params['expandFolderTree'] == 1) ? -1 : 3, $orderby);
 					$this->contentContainerEnd();
 				} else {
 					$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=1\"><i class=\"icon-plus-sign\"></i></a>", true);