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

2024-11-26 15:32:13 +00:00 · 2017-05-12 08:23:42 +02:00 · 2017-05-12 08:23:42 +02:00 · 092967004a
commit 092967004a
parent 3cc572a1cd ba44ee14a7
41 changed files with 405 additions and 208 deletions
--- a/1
+++ b/1
@ -145,6 +145,7 @@
 - fix authentication in webdav.php (Closes #250)
 - update last access time only once a minute
 - run action 'css' in view if it exists, move css code for timeline
+- show role of users in user list and substitute user list

 --------------------------------------------------------------------------------
                     Changes in version 4.3.34
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@ -2341,9 +2341,9 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		/* Check if 'onPreRemoveDocument' callback is set */
 		if(isset($this->_dms->callbacks['onPreRemoveDocument'])) {
 			foreach($this->_dms->callbacks['onPreRemoveDocument'] as $callback) {
-				if(!call_user_func($callback[0], $callback[1], $this)) {
-					return false;
-				}
+				$ret = call_user_func($callback[0], $callback[1], $this);
+				if(is_bool($ret))
+					return $ret;
 			}
 		}

--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@ -884,9 +884,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		/* Check if 'onPreRemoveFolder' callback is set */
 		if(isset($this->_dms->callbacks['onPreRemoveFolder'])) {
 			foreach($this->_dms->callbacks['onPreRemoveFolder'] as $callback) {
-				if(!call_user_func($callback[0], $callback[1], $this)) {
-					return false;
-				}
+				$ret = call_user_func($callback[0], $callback[1], $this);
+				if(is_bool($ret))
+					return $ret;
 			}
 		}

--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@ -1426,6 +1426,7 @@ SeedDMS_Core_DMS::getDuplicateDocumentContent() returns complete document
 - all changes from 5.0.12 merged
 - SeedDMS_Core_DMS::filterDocumentFiles() returns also documents which are not public
 if the owner tries to access them
+- Check return value of onPreRemove[Document|Folder], return from calling method if bool
 	 </notes>
  </release>
  <release>
--- a/controllers/class.UpdateDocument.php
+++ b/controllers/class.UpdateDocument.php
@ -0,0 +1,87 @@
+<?php
+/**
+ * Implementation of UpdateDocument controller
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class which does the busines logic for downloading a document
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Controller_UpdateDocument extends SeedDMS_Controller_Common {
+
+	public function run() { /* {{{ */
+		$name = $this->getParam('name');
+		$comment = $this->getParam('comment');
+
+		/* Call preUpdateDocument early, because it might need to modify some
+		 * of the parameters.
+		 */
+		if(false === $this->callHook('preUpdateDocument')) {
+			$this->errormsg = 'hook_preUpdateDocument_failed';
+			return null;
+		}
+
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$document = $this->params['document'];
+		$settings = $this->params['settings'];
+		$index = $this->params['index'];
+		$indexconf = $this->params['indexconf'];
+		$folder = $this->params['folder'];
+		$userfiletmp = $this->getParam('userfiletmp');
+		$userfilename = $this->getParam('userfilename');
+		$filetype = $this->getParam('filetype');
+		$userfiletype = $this->getParam('userfiletype');
+		$reviewers = $this->getParam('reviewers');
+		$approvers = $this->getParam('approvers');
+		$reqversion = $this->getParam('reqversion');
+		$comment = $this->getParam('comment');
+		$attributes = $this->getParam('attributes');
+		$workflow = $this->getParam('workflow');
+		$maxsizeforfulltext = $this->getParam('maxsizeforfulltext');
+
+		$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);
+
+			if ($this->hasParam('expires')) {
+				if($document->setExpires($this->getParam('expires'))) {
+				} else {
+				}
+			}
+
+			if($index) {
+				$lucenesearch = new $indexconf['Search']($index);
+				if($hit = $lucenesearch->getDocument((int) $document->getId())) {
+					$index->delete($hit->id);
+				}
+				$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText));
+				if(!$this->callHook('preIndexDocument', $document, $idoc)) {
+				}
+				$index->addDocument($idoc);
+				$index->commit();
+			}
+
+			if(!$this->callHook('postUpdateDocument', $document, $contentResult->getContent())) {
+			}
+			$result = $contentResult->getContent();
+		}
+
+		return $result;
+	} /* }}} */
+}
+
--- a/ext/example/class.example.php
+++ b/ext/example/class.example.php
@ -37,9 +37,6 @@ class SeedDMS_ExtExample extends SeedDMS_ExtBase {
 	 *
 	 * Use this method to do some initialization like setting up the hooks
 	 * You have access to the following global variables:
-	 * $GLOBALS['dms'] : object representing dms
-	 * $GLOBALS['user'] : currently logged in user
-	 * $GLOBALS['session'] : current session
 	 * $GLOBALS['settings'] : current global configuration
 	 * $GLOBALS['settings']['_extensions']['example'] : configuration of this extension
 	 * $GLOBALS['LANG'] : the language array with translations for all languages
--- a/inc/inc.ClassControllerCommon.php
+++ b/inc/inc.ClassControllerCommon.php
@ -142,6 +142,9 @@ class SeedDMS_Controller_Common {
 			foreach($GLOBALS['SEEDDMS_HOOKS']['controller'][lcfirst($tmp[2])] as $hookObj) {
 				if (method_exists($hookObj, $hook)) {
 					switch(func_num_args()) {
+						case 3:
+							$result = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2));
+							break;
 						case 2:
 							$result = $hookObj->$hook($this, func_get_arg(1));
 							break;
--- a/inc/inc.ClassEmailNotify.php
+++ b/inc/inc.ClassEmailNotify.php
@ -82,10 +82,15 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 			return false;
 		}

+		$returnpath = '';
 		if(is_object($sender) && !strcasecmp(get_class($sender), $this->_dms->getClassname('user'))) {
 			$from = $sender->getFullName() ." <". $sender->getEmail() .">";
+			if($this->from_address)
+				$returnpath = $this->from_address;
 		} elseif(is_string($sender) && trim($sender) != "") {
 			$from = $sender;
+			if($this->from_address)
+				$returnpath = $this->from_address;
 		} else {
 			$from = $this->from_address;
 		}
@ -96,6 +101,8 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {

 		$headers = array ();
 		$headers['From'] = $from;
+		if($returnpath)
+			$headers['Return-Path'] = $returnpath;
 		$headers['To'] = $to;
 		$preferences = array("input-charset" => "UTF-8", "output-charset" => "UTF-8");
 		$encoded_subject = iconv_mime_encode("Subject", getMLText($subject, $params, "", $lang), $preferences);
@ -125,7 +132,6 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 		} else {
 			return true;
 		}
-
 	} /* }}} */

 	function toGroup($sender, $groupRecipient, $subject, $message, $params=array()) { /* {{{ */
--- a/inc/inc.ClassHook.php
+++ b/inc/inc.ClassHook.php
@ -0,0 +1,41 @@
+<?php
+/**
+ * Implementation of hook response class
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2017 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Parent class for all hook response classes
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2017 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Hook_Response {
+	protected $data;
+
+	protected $error;
+
+	public function __construct($error = false, $data = null) {
+		$this->data = $data;
+		$this->error = $error;
+	}
+
+	public function setData($data) {
+		$this->data = $data;
+	}
+
+	public function getData() {
+		return $this->data;
+	}
+}
+
--- a/inc/inc.ClassViewCommon.php
+++ b/inc/inc.ClassViewCommon.php
@ -13,6 +13,8 @@
 * @version    Release: @package_version@
 */

+require_once "inc/inc.ClassHook.php";
+
 /**
 * Parent class for all view classes
 *
@ -92,37 +94,26 @@ class SeedDMS_View_Common {
 					switch(func_num_args()) {
 						case 1:
 							$tmpret = $hookObj->$hook($this);
-							if(is_string($tmpret))
-								$ret .= $tmpret;
-							else
-								$ret = $tmpret;
 							break;
 						case 2:
 							$tmpret = $hookObj->$hook($this, func_get_arg(1));
-							if(is_string($tmpret))
-								$ret .= $tmpret;
-							else
-								$ret = $tmpret;
 							break;
 						case 3:
 							$tmpret = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2));
-							if(is_string($tmpret))
-								$ret .= $tmpret;
-							else
-								$ret = $tmpret;
 							break;
 						case 4:
 							$tmpret = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2), func_get_arg(3));
-							if(is_string($tmpret))
-								$ret .= $tmpret;
-							else
-								$ret = $tmpret;
 							break;
 						default:
 						case 5:
 							$tmpret = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2), func_get_arg(3), func_get_arg(4));
+							break;
+					}
+					if($tmpret) {
 						if(is_string($tmpret))
 							$ret .= $tmpret;
+						elseif(is_array($tmpret) || is_object($tmpret))
+							$ret = ($ret === null) ? $tmpret : array_merge($ret, $tmpret);
 						else
 							$ret = $tmpret;
 					}
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@ -1129,6 +1129,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => '',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',
--- 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 (791)
+//    Translators: Admin (822)

 $text = array(
 '2_factor_auth' => '',
@ -53,7 +53,7 @@ $text = array(
 'add_attrdefgroup' => '',
 'add_document' => 'Добави документ',
 'add_document_link' => 'Добави препратка',
-'add_document_notify' => '',
+'add_document_notify' => 'Добави нотификация',
 'add_doc_reviewer_approver_warning' => 'Документът получава статус ДОСТЪПЕН автоматично ако няма нито рецензент нито утвърждаващ',
 'add_doc_workflow_warning' => 'N.B. Документът автоматично семаркира като освободен ако не се работи по него.',
 'add_event' => 'Добави събитие',
@ -105,7 +105,7 @@ $text = array(
 'april' => 'Април',
 'archive_creation' => 'Създаване архив',
 'archive_creation_warning' => 'Тази операция ще създаде архив, съдържащ всички папки. След създаването архивът ще бъде съхранен в папката с данни на сървъра.<br>ВНИМАНИЕ: Архивът създаден като понятен за  човек, ще бъде непригоден за бекъп!',
-'ar_EG' => '',
+'ar_EG' => 'Арабски',
 'assign_approvers' => 'Назначи утвърждаващи',
 'assign_reviewers' => 'Назначи рецензенти',
 'assign_user_property_to' => 'Назначи свойства на потребителя',
@ -166,7 +166,7 @@ $text = array(
 'backup_remove' => 'Изтрий бекъп',
 'backup_tools' => 'Иструменти за бекъп',
 'between' => 'между',
-'bg_BG' => '',
+'bg_BG' => 'Български',
 'browse' => 'Преглеждане',
 'calendar' => 'Календар',
 'calendar_week' => '',
@ -187,7 +187,7 @@ $text = array(
 'category_info' => '',
 'category_in_use' => 'Тази категория се използва от документите',
 'category_noname' => 'Въведете име на категорията',
-'ca_ES' => '',
+'ca_ES' => 'Каталунски',
 'change_assignments' => 'Промени предназначението',
 'change_password' => 'Промени паролата',
 'change_password_message' => 'Паролата променена',
@ -260,7 +260,7 @@ $text = array(
 'create_fulltext_index' => 'Създай пълнотекстов индекс',
 'create_fulltext_index_warning' => 'Вие искате да пресъздадете пълнотекстов индекс. Това ще отнеме време и ще понижи производителността. Да продолжа ли?',
 'creation_date' => 'Създаден',
-'cs_CZ' => '',
+'cs_CZ' => 'Чешки',
 'current_password' => 'Текуща парола',
 'current_quota' => '',
 'current_state' => '',
@ -277,7 +277,7 @@ $text = array(
 'delete' => 'Изтрий',
 'details' => 'Детайли',
 'details_version' => 'Детайли за версия: [version]',
-'de_DE' => '',
+'de_DE' => 'Немски',
 'disclaimer' => 'Работим аккуратно и задълбочено. От това зависи бъдeщето на нашата страна и благополучието на народа.nПетилетката за три години!nДа не оставим неодрусана слива в наше село!',
 'discspace' => '',
 'docs_in_reception_no_access' => '',
@ -375,7 +375,7 @@ $text = array(
 'edit_user' => 'Редактирай потребител',
 'edit_user_details' => 'Редактирай данните на потребителя',
 'edit_version' => '',
-'el_GR' => '',
+'el_GR' => 'Гръцки',
 'email' => 'Email',
 'email_error_title' => 'Email не е указан',
 'email_footer' => 'Винаги можете да измените e-mail исползвайки функцията \'Моя учетка\'',
@ -384,7 +384,7 @@ $text = array(
 'empty_attribute_group_list' => '',
 'empty_folder_list' => 'Няма документи или папки',
 'empty_notify_list' => 'Няма записи',
-'en_GB' => '',
+'en_GB' => 'Английски (Великобритания)',
 'equal_transition_states' => 'Началното и крайно състояние са еднакви',
 'error' => 'Грешка',
 'error_add_aro' => '',
@ -398,7 +398,7 @@ $text = array(
 'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
-'es_ES' => '',
+'es_ES' => 'Испански',
 'event_details' => 'Детайли за събитието',
 'exclude_items' => '',
 'expired' => 'Изтекъл',
@ -449,7 +449,7 @@ $text = array(
 'friday' => 'петък',
 'friday_abbr' => '',
 'from' => 'От',
-'fr_FR' => '',
+'fr_FR' => 'Френски',
 'fullsearch' => 'Пълнотекстово търсене',
 'fullsearch_hint' => 'Използвай пълнотекстов индекс',
 'fulltextsearch_disabled' => '',
@ -478,9 +478,9 @@ $text = array(
 'hook_name' => '',
 'hourly' => 'Ежечасно',
 'hours' => 'часа',
-'hr_HR' => '',
+'hr_HR' => 'Хърватски',
 'human_readable' => 'Човекопонятен архив',
-'hu_HU' => '',
+'hu_HU' => 'Унгарски',
 'id' => 'ID',
 'identical_version' => 'Новата версия е идентична с текущата.',
 'import' => '',
@ -494,7 +494,7 @@ $text = array(
 'index_converters' => 'Index document conversion',
 'index_done' => '',
 'index_error' => '',
-'index_folder' => '',
+'index_folder' => 'Индекс на директорията',
 'index_pending' => '',
 'index_waiting' => '',
 'individuals' => 'Личности',
@ -531,7 +531,7 @@ $text = array(
 'in_workflow' => 'в процес',
 'is_disabled' => 'забранена сметка',
 'is_hidden' => 'Не показвай в списъка с потребители',
-'it_IT' => '',
+'it_IT' => 'Италиански',
 'january' => 'януари',
 'js_form_error' => '',
 'js_form_errors' => '',
@ -558,9 +558,9 @@ $text = array(
 'keep' => '',
 'keep_doc_status' => 'Запази статуса на документа',
 'keywords' => 'Ключови думи',
-'keywords_loading' => '',
+'keywords_loading' => 'Моля, изчакайте, докато ключовите думи се зареждат',
 'keyword_exists' => 'Ключовата дума съществува',
-'ko_KR' => '',
+'ko_KR' => 'Корейски',
 'language' => 'Език',
 'lastaccess' => '',
 'last_update' => 'Последно обновление',
@ -645,7 +645,7 @@ $text = array(
 'new_subfolder_email_subject' => '',
 'new_user_image' => 'Ново изображение',
 'next_state' => 'Ново състояние',
-'nl_NL' => '',
+'nl_NL' => 'Холандски',
 'no' => 'Не',
 'notify_added_email' => 'Вие сте добавен в списъка с уведомявани',
 'notify_added_email_body' => '',
@ -719,7 +719,7 @@ $text = array(
 'pending_reviews' => '',
 'pending_workflows' => '',
 'personal_default_keywords' => 'Личен списък с ключови думи',
-'pl_PL' => '',
+'pl_PL' => 'Полски',
 'possible_substitutes' => '',
 'preset_expires' => '',
 'preview' => '',
@ -729,7 +729,7 @@ $text = array(
 'preview_plain' => '',
 'previous_state' => 'Предишно състояние',
 'previous_versions' => 'Предишни версии',
-'pt_BR' => '',
+'pt_BR' => 'Португалски (Бразилия)',
 'quota' => 'Квота',
 'quota_exceeded' => 'Вашата дискова квота е превишена с [bytes].',
 'quota_is_disabled' => '',
@ -834,11 +834,11 @@ $text = array(
 'role_name' => '',
 'role_type' => '',
 'role_user' => 'Потребител',
-'ro_RO' => '',
+'ro_RO' => 'Румънски',
 'run_subworkflow' => 'Пусни под-процес',
 'run_subworkflow_email_body' => '',
 'run_subworkflow_email_subject' => '',
-'ru_RU' => '',
+'ru_RU' => 'Руски',
 'saturday' => 'събота',
 'saturday_abbr' => '',
 'save' => 'Съхрани',
@ -868,12 +868,12 @@ $text = array(
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '',
-'select_grp_notification' => '',
+'select_grp_notification' => 'Избор на групова нотификация',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Кликни да избереш група рецензенти',
 'select_grp_revisors' => '',
 'select_ind_approvers' => 'Кликни да избереш утвърждаващ',
-'select_ind_notification' => '',
+'select_ind_notification' => 'Избор на индивидуална нотификация',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Кликни да избереш рецензент',
 'select_ind_revisors' => '',
@ -994,6 +994,8 @@ $text = array(
 'settings_enableLargeFileUpload_desc' => 'Ако е включено, качване на файлове е дустъпно и чрез джава-аплет, именован jumploader, без лимит за размер на файла. Това също ще позволи да се качват няколко файла наведнъж.',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Разреши уведомление до рецензиращи/утвърждаващи',
 'settings_enableNotificationAppRev_desc' => 'Избери за изпращане на уведомление до рецензиращи/утвърждаващи когато се добавя нова версия на документа',
 'settings_enableNotificationWorkflow' => '',
@ -1203,7 +1205,7 @@ $text = array(
 'sign_in' => 'вход',
 'sign_out' => 'изход',
 'sign_out_user' => '',
-'sk_SK' => '',
+'sk_SK' => 'Словашки',
 'space_used_on_data_folder' => 'Размер на каталога с данните',
 'splash_added_to_clipboard' => '',
 'splash_add_attribute' => '',
@ -1286,14 +1288,14 @@ $text = array(
 'submit_userinfo' => 'Изпрати информация за потребител',
 'subsribe_timelinefeed' => '',
 'substitute_to_user' => '',
-'substitute_user' => '',
+'substitute_user' => 'Заместващ потребител',
 'success_add_aro' => '',
 'success_add_permission' => '',
 'success_remove_permission' => '',
 'success_toogle_permission' => '',
 'sunday' => 'неделя',
 'sunday_abbr' => '',
-'sv_SE' => '',
+'sv_SE' => 'Шведски',
 'switched_to' => '',
 'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => '',
@ -1337,12 +1339,12 @@ $text = array(
 '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' => 'Командата не е позната.',
@ -1386,7 +1388,7 @@ $text = array(
 'user_login' => 'Идентификатор на потребителя',
 'user_management' => 'Управление на потребителите',
 'user_name' => 'Пълно име',
-'use_comment_of_document' => '',
+'use_comment_of_document' => 'Използвай коментара от документа',
 'use_default_categories' => 'Исползвай предопределени категории',
 'use_default_keywords' => 'Исползовай предопределенни ключови думи',
 'valid_till' => '',
@ -1433,7 +1435,7 @@ $text = array(
 'workflow_user_summary' => 'Резюме за потребител',
 'year_view' => 'годишен изглед',
 'yes' => 'Да',
-'zh_CN' => '',
-'zh_TW' => '',
+'zh_CN' => 'Китайски (Китай)',
+'zh_TW' => 'Китайски (Тайван)',
 );
 ?>
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@ -999,6 +999,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => '',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',
--- 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 (720), kreml (455)
+//    Translators: Admin (722), kreml (455)

 $text = array(
 '2_factor_auth' => '',
@ -566,7 +566,7 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'Včetně dokumentů',
 'include_subdirectories' => 'Včetně podadresářů',
-'indexing_tasks_in_queue' => '',
+'indexing_tasks_in_queue' => 'Indexování úkolů ve frontě',
 'index_converters' => 'Index konverze dokumentu',
 'index_done' => '',
 'index_error' => '',
@ -792,7 +792,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Pro obrázky uživatelů je možné použít pouze obrázky .jpg',
 'order_by_sequence_off' => '',
 'original_filename' => 'Originální název souboru',
-'overall_indexing_progress' => '',
+'overall_indexing_progress' => 'Celkový průběh indexování',
 'owner' => 'Vlastník',
 'ownership_changed_email' => 'Vlastník změněn',
 'ownership_changed_email_body' => 'Vlastník změněn
@ -1138,6 +1138,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'If set, file upload is also available through a java applet called jumploader without a file size limit set by the browser. It also allows to upload several files in one step.',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Povolit oznámení posuzovateli/schvalovateli',
 'settings_enableNotificationAppRev_desc' => 'Označit pro oznamování posuzovateli/schvalovateli, pokud je přidána nová verze dokumentu.',
 'settings_enableNotificationWorkflow' => '',
--- 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 (2411), dgrutsch (22)
+//    Translators: Admin (2413), dgrutsch (22)

 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@ -1194,6 +1194,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Wenn dies gesetzt ist, dann ist ebenfalls der Upload von Dokumenten durch ein java applet mit Namen \'jumploader\' ohne Begrenzung der maximalen Dateigröße möglich. Auch das Hochladen mehrerer Dokumente in einem Schritt wird dadurch ermöglicht. Das Einschalten bewirkt, dass keine http only Cookies mehr gesetzt werden.',
 'settings_enableMenuTasks' => 'Aufgabenliste im Menü',
 'settings_enableMenuTasks_desc' => 'Ein-/Ausschalten des Menüeintrags, der anstehenden Aufgaben des Benutzers enthält. Diese Liste beinhaltet Dokumente die geprüft, freigegeben, usw. werden müssen.',
+'settings_enableMultiUpload' => 'Erlaube Hochladen mehrerer Dateien',
+'settings_enableMultiUpload_desc' => 'Beim Erstellen eines neuen Dokuments können mehrere Dateien in einem Vorgang hochgeladen werden. Jede Datei erzeugt ein neues Dokument.',
 'settings_enableNotificationAppRev' => 'Prűfer/Freigeber benachrichtigen',
 'settings_enableNotificationAppRev_desc' => 'Setzen Sie diese Option, wenn die Prüfer und Freigeber eines Dokuments beim Hochladen einer neuen Version benachrichtigt werden sollen.',
 'settings_enableNotificationWorkflow' => 'Sende Benachrichtigung an Benutzer im nächsten Workflow-Schritt',
--- 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 (220)
+//    Translators: Admin (224)

 $text = array(
 '2_factor_auth' => '',
@ -166,7 +166,7 @@ $text = array(
 'backup_remove' => '',
 'backup_tools' => 'Εργαλεία εφεδρικής καταγραφής',
 'between' => 'μεταξύ',
-'bg_BG' => '',
+'bg_BG' => 'Βουλγάρικα',
 'browse' => '',
 'calendar' => 'Ημερολόγιο',
 'calendar_week' => 'Εβδομάδα',
@ -187,7 +187,7 @@ $text = array(
 'category_info' => '',
 'category_in_use' => 'Η Κατηγορία αυτή είναι σε χρήση.',
 'category_noname' => 'Δεν δόθηκε όνομα κατηγορίας.',
-'ca_ES' => '',
+'ca_ES' => 'Καταλανικά',
 'change_assignments' => '',
 'change_password' => 'Αλλαγή κωδικού',
 'change_password_message' => 'Ο κωδικός σας έχει αλλάξει.',
@ -226,7 +226,7 @@ $text = array(
 'clear_cache' => '',
 'clear_clipboard' => '',
 'clear_password' => '',
-'clipboard' => '',
+'clipboard' => 'Πρόχειρο',
 'close' => 'Κλέισιμο',
 'command' => '',
 'comment' => 'Σχόλιο',
@ -342,7 +342,7 @@ $text = array(
 'draft' => '',
 'draft_pending_approval' => '',
 'draft_pending_review' => '',
-'drag_icon_here' => '',
+'drag_icon_here' => 'Σείρτε την εικόνα του φακέλου ή το έγγραφο εδώ!',
 'dropfolderdir_missing' => '',
 'dropfolder_file' => '',
 'dropfolder_folder' => '',
@ -1005,6 +1005,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => '',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',
--- 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 (1538), dgrutsch (9), netixw (14)
+//    Translators: Admin (1540), dgrutsch (9), netixw (14)

 $text = array(
 '2_factor_auth' => '2-factor authentication',
@ -1189,6 +1189,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'If set, file upload is also available through a java applet called jumploader without a file size limit set by the browser. It also allows to upload several files in one step. Turning this on will turn off http only cookies.',
 'settings_enableMenuTasks' => 'Enable task list in menu',
 'settings_enableMenuTasks_desc' => 'Enable/Disable the menu item which contains all tasks for the user. This contains documents, that need to be reviewed, approved, etc.',
+'settings_enableMultiUpload' => 'Allow upload of multiple files',
+'settings_enableMultiUpload_desc' => 'When creating a new document, multiple files can be uploaded. Each will create a new document.',
 'settings_enableNotificationAppRev' => 'Enable reviewer/approver notification',
 'settings_enableNotificationAppRev_desc' => 'Check to send a notification to the reviewer/approver when a new document version is added',
 'settings_enableNotificationWorkflow' => 'Send notification to users in next workflow transition',
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@ -1144,6 +1144,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Si se habilita, la carga de ficheros también estará disponible a través de un applet java llamado jumploader, sin límite de tamaño de fichero fijado por el navegador. También permite la carga de múltiples ficheros de una sola vez.',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Habilitar notificación a revisor/aprobador',
 'settings_enableNotificationAppRev_desc' => 'Habilitar para enviar notificación a revisor/aprobador cuando se añade una nueva versión de documento',
 'settings_enableNotificationWorkflow' => 'Enviar notificación a los usuarios en la siguiente transacción del flujo.',
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@ -1139,6 +1139,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Si défini, le téléchargement de fichier est également disponible via un applet java appelé jumploader sans limite de taille définie par le navigateur. Il permet également de télécharger plusieurs fichiers en une seule fois.',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Notification correcteur/approbateur',
 'settings_enableNotificationAppRev_desc' => 'Cochez pour envoyer une notification au correcteur/approbateur quand une nouvelle version du document est ajoutée',
 'settings_enableNotificationWorkflow' => 'Envoyer les notifications aux utilisateurs dans le prochain workflow',
--- 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 (1195), marbanas (16)
+//    Translators: Admin (1196), marbanas (16)

 $text = array(
 '2_factor_auth' => '',
@ -654,7 +654,7 @@ Internet poveznica: [url]',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Ako želite prenijeti datoteke veće od trenutne maksimalne veličine prijenosa, molimo koristite alternativu <a href="%s">upload page</a>.',
 'link_to_version' => '',
-'list_access_rights' => '',
+'list_access_rights' => 'Izlistaj sve dozvole pristupa',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Lokalna datoteka',
@ -1165,6 +1165,8 @@ Internet poveznica: [url]',
 'settings_enableLargeFileUpload_desc' => 'Ako je postavljeno, učitavanje datoteke je također dostupno kroz Java aplet naziva "jumploader" bez postavljenog ograničenja veličine datoteke od strane pretraživača. To također omogućuje učitavanje nekoliko datoteka u jednom koraku. Uključivanjem ovoga isključit će se samo http kolačići.',
 'settings_enableMenuTasks' => 'Omogućavanje liste zadataka u izborniku',
 'settings_enableMenuTasks_desc' => 'Omogućavanje/onemogućavanje stavke izbornika koja sadrži sve zadatke za korisnika. Ovo sadrži dokumente koji trebaju biti revidirani, odobreni itd.',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Omogući bilježenje recezenta/validatora',
 'settings_enableNotificationAppRev_desc' => 'Označi za slanje obavijesti recezentu/validatoru kada je dodana nova verzija dokumenta',
 'settings_enableNotificationWorkflow' => 'Omogući obavijesti o zadanom toku rada',
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@ -1143,6 +1143,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Ha beállítja az állományok feltöltése elérhető lesz egy jumploadernek hívott java appleten keresztül a böngészőprogram állomány méret korlátja nélkül. Ez engedélyezi több állomány feltöltését egy lépésben.',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'A felülvizsgáló/jóváhagyó értesítés engedélyezése',
 'settings_enableNotificationAppRev_desc' => 'Ellenőrzi az értesítés küldését a felülvizsgálónak/jóváhagyónak új dokumentum változat hozzáadásakor',
 'settings_enableNotificationWorkflow' => 'A felhasználó értesítése a következő munkafolyamatnál',
--- 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 (1539), rickr (144), s.pnt (26)
+//    Translators: Admin (1551), rickr (144), s.pnt (26)

 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@ -256,7 +256,7 @@ URL: [url]',
 'clear_password' => 'Cancella la password',
 'clipboard' => 'Appunti',
 'close' => 'Chiudi',
-'command' => '',
+'command' => 'Comando',
 'comment' => 'Commento',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Commento per la versione',
@ -311,7 +311,7 @@ URL: [url]',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
 'document' => 'Documento',
-'documentcontent' => '',
+'documentcontent' => 'Contenuto documento',
 'documents' => 'Documenti',
 'documents_checked_out_by_you' => 'Documenti approvati da te',
 'documents_in_process' => 'Documenti in lavorazione',
@ -410,7 +410,7 @@ URL: [url]',
 'dump_creation_warning' => 'Con questa operazione è possibile creare un file di dump del contenuto del database. Dopo la creazione il file viene salvato nella cartella dati del server.',
 'dump_list' => 'List dei dump presenti',
 'dump_remove' => 'Cancella il file di dump',
-'duplicates' => '',
+'duplicates' => 'Duplicati',
 'duplicate_content' => 'Contenuto Duplicato',
 'edit' => 'Modifica',
 'edit_attributes' => 'Modifica gli attributi',
@ -572,7 +572,7 @@ URL: [url]',
 'include_content' => 'Includi contenuto',
 'include_documents' => 'Includi documenti',
 'include_subdirectories' => 'Includi sottocartelle',
-'indexing_tasks_in_queue' => '',
+'indexing_tasks_in_queue' => 'Operazione di indicizzazione in corso',
 'index_converters' => 'Indice di conversione documenti',
 'index_done' => '',
 'index_error' => '',
@ -1085,7 +1085,7 @@ URL: [url]',
 'settings_autoLoginUser' => 'Login automatico',
 'settings_autoLoginUser_desc' => 'Utilizzare questo ID utente per l\'accesso se l\'utente non è già connesso. Questo tipo di accesso non creerà una sessione.',
 'settings_available_languages' => 'Lingue disponibili',
-'settings_available_languages_desc' => '',
+'settings_available_languages_desc' => 'Solo le lingue selezionate verranno caricate e mostrate nel selettore. La lingua predefinita sarà sempre caricata.',
 'settings_backupDir' => 'Directory di backup',
 'settings_backupDir_desc' => 'Directory in cui lo strumento di backup salva i backup. Se questa directory non è impostato o non è possibile accedervi, quindi i backup vengono salvati nella directory dei contenuti.',
 'settings_cacheDir' => 'Cartella di cache',
@ -1102,7 +1102,7 @@ URL: [url]',
 'settings_contentDir_desc' => 'Cartella in cui vengono conservati i files caricati, si consiglia di scegliere una cartella sul web-server che non sia direttamente accessibile.',
 'settings_contentOffsetDir' => 'Cartella Offset',
 'settings_contentOffsetDir_desc' => 'Per supplire a limitazioni all\'utilizzo del filesystem è stata concepita una nuova struttura di cartelle all\'interno della cartella contenitore (Content Directory). Questa necessita di una cartella di partenza: di solito è sufficiente lasciare il nome di default, 1048576, ma può essere usato un qualsiasi numero o stringa che non esistano già all\'interno della cartella contenitore (Content Directory)',
-'settings_convertToPdf' => '',
+'settings_convertToPdf' => 'Converti documento in PDF per anteprima',
 'settings_convertToPdf_desc' => 'Se il documento non può essere nativamente mostrato nel browser, verrà mostrata una versione in PDF.',
 'settings_cookieLifetime' => 'Tempo di vita del cookie',
 'settings_cookieLifetime_desc' => 'Tempo di vita del cookie in secondi: se impostato su 0 il cookie verrà rimosso alla chiusura del browser',
@ -1125,8 +1125,8 @@ URL: [url]',
 'settings_dbUser' => 'Utente',
 'settings_dbUser_desc' => 'Utente per accedere al database da utilizzarsi durante il processo di installazione. Non modificare questo campo se non assolutamente necessario, per esempio nel caso di trasferimento del database su un nuovo Host.',
 'settings_dbVersion' => 'Schema del database obsoleto',
-'settings_defaultAccessDocs' => '',
-'settings_defaultAccessDocs_desc' => '',
+'settings_defaultAccessDocs' => 'Diritto di accesso per i nuovi documenti',
+'settings_defaultAccessDocs_desc' => 'Quando si crea un nuovo documento, questo sarà il diritto di accesso predefinito',
 'settings_defaultSearchMethod' => 'Metodo di ricerca predefinito',
 'settings_defaultSearchMethod_desc' => 'Metodo di ricerca predefinito, quando la ricerca viene avviata dal modulo di ricerca nel menu principale.',
 'settings_defaultSearchMethod_valdatabase' => 'database',
@ -1177,6 +1177,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Se selezionato, il caricamento (upload) dei files può essere effettuato anche attraverso un\'applet Java chiamata Jumploader evitando il limite di dimensioni file imposto dal browser; Jumploader permette anche il caricamento di diversi files contemporaneamente.',
 'settings_enableMenuTasks' => 'Abilita compito delle attività nel menù',
 'settings_enableMenuTasks_desc' => 'Abilita / Disabilita la voce di menu che contiene tutte le attività degli utenti. Questo conterrà i documenti che devono essere rivisti, approvati, etc.',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Abilita/disabilita notifica a revisore/approvatore',
 'settings_enableNotificationAppRev_desc' => 'Spuntare per inviare una notifica al revisore/approvatore nel momento in cui viene aggiunta una nuova versione del documento.',
 'settings_enableNotificationWorkflow' => 'Invia notifiche ai partecipanti al flusso di lavoro',
@ -1268,8 +1270,8 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => 'Numero massimo di documenti e cartelle considerati dal conteggio ricursivo per il controllo dei diritti d\'accesso. Se tale valore dovesse essere superato, il risultato del conteggio sarà stimato.',
 'settings_maxSizeForFullText' => 'La lungeza massima del file per l\'indicizzazione istantanea',
 'settings_maxSizeForFullText_desc' => 'Tutte le nuove versioni dei documenti più in basso della dimensione configurata saranno completamente indicizzati dopo il caricamento. In tutti gli altri casi sarà indicizzato solo i metadati.',
-'settings_maxUploadSize' => '',
-'settings_maxUploadSize_desc' => '',
+'settings_maxUploadSize' => 'Dimensiona massima dei file da caricare',
+'settings_maxUploadSize_desc' => 'Questa è la dimensiona massima del file da caricare. Avrà impatto sulla versione del documento e sull\'allegato.',
 'settings_more_settings' => 'Ulteriori configurazioni. Login di default: admin/admin',
 'settings_notfound' => 'Non trovato',
 'settings_Notification' => 'Impostazioni di notifica',
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@ -1158,6 +1158,8 @@ URL : [url]',
 'settings_enableLargeFileUpload_desc' => '설정하면, 브라우저가 설정 한 파일 크기 제한없이 jumploader라는 파일 업로드 자바 애플릿을 통해 사용할 수 있습니다. 또한 한 번에 여러 파일을 업로드 할 수 있습니다.',
 'settings_enableMenuTasks' => '메뉴의 작업 목록 허용',
 'settings_enableMenuTasks_desc' => '사용자의 모든 작업이 포함되어있는 메뉴 항목을 활성/비활성 합니다. 이것은 검토, 승인등이 필요한 문서를 포함 합니다',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => '검토 / 승인 알림 사용',
 'settings_enableNotificationAppRev_desc' => '새 문서 버전이 추가 된 경우 리뷰 / 승인자에게 알림을 보내 확인',
 'settings_enableNotificationWorkflow' => '다음 작업 사용자에게 알림을 보냅니다.',
--- 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 (723), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (724), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)

 $text = array(
 '2_factor_auth' => '',
@ -1171,6 +1171,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Indien ingeschakeld, is bestandsupload ook beschikbaar via een java applet jumploader genaamd zonder een bestandsgrootte limiet door de browser. Het staat ook toe om meerdere bestanden in een keer te versturen.',
 'settings_enableMenuTasks' => 'Menu-taken aanzetten',
 'settings_enableMenuTasks_desc' => 'Menu-taken aanzetten',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Inschakelen controleur/beoordeler notificatie',
 'settings_enableNotificationAppRev_desc' => 'Vink aan om een notificatie te versturen naar de controleur/beoordeler als een nieuw document versie is toegevoegd.',
 'settings_enableNotificationWorkflow' => 'Workflow-notificatie aanzetten',
@ -1310,7 +1312,7 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'ID van basismap (meestal geen verandering nodig)',
 'settings_SaveError' => 'Opslagfout Configuratiebestand',
 'settings_Server' => 'Server instellingen',
-'settings_showFullPreview' => '',
+'settings_showFullPreview' => 'Toon volledige document',
 'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => 'Ontbrekende vertalingen weergeven',
 'settings_showMissingTranslations_desc' => 'Geef alle ontbrekende vertalingen onder aan de pagina weer. De gebruiker kan een verzoek tot vertaling indienen dat wordt opgeslagen als csv bestand. Let op! Zet deze functie niet aan in productieomgevingen!',
--- 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 (767), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (768), netixw (84), romi (93), uGn (112)

 $text = array(
 '2_factor_auth' => '',
@ -559,7 +559,7 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'Uwzględnij dokumenty',
 'include_subdirectories' => 'Uwzględnij podkatalogi',
-'indexing_tasks_in_queue' => '',
+'indexing_tasks_in_queue' => 'Zadanie indeksowania w kolejce',
 'index_converters' => 'Konwersja indeksu dokumentów',
 'index_done' => '',
 'index_error' => '',
@ -1123,6 +1123,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Jeśli zaznaczone, wczytywanie plików będzie możliwe również przez aplet javy nazywany jumploader bez limitu rozmiaru plików. Aplet ten pozwala również na wczytywanie wielu plików jednocześnie.',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Włącz/Wyłącz powiadomienia dla zatwierdzających/recenzentów',
 'settings_enableNotificationAppRev_desc' => 'Zaznacz aby wysyłać powiadomienia do zatwierdzających i recenzentów kiedy pojawi się nowa wersja dokumentu',
 'settings_enableNotificationWorkflow' => '',
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@ -1141,6 +1141,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Se selecionado, o upload de arquivo também estará disponível através de um applet java chamado jumploader sem limite de tamanho de arquivo definido pelo navegador. Ele também permite fazer o upload de vários arquivos de uma só vez.',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Habilitar notificações revisor/aprovador',
 'settings_enableNotificationAppRev_desc' => 'Verificar o envio de uma notificação para o revisor/aprovador quando uma nova versão do documento for adicionada',
 'settings_enableNotificationWorkflow' => '',
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@ -1166,6 +1166,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Dacă este setat, incărcarea este de asemenea disponibilă prin intermediul unui applet Java numit jumploader fără limită de dimensiune a fișierului stabilită de browser. De asemenea, permite încărcarea mai multor fișiere într-un singur pas. Activand aceasta optiune va dezactiva optiunea http only cookies.',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Activare notificari rezuitor/aprobator',
 'settings_enableNotificationAppRev_desc' => 'Bifati pentru a trimite o notificare către revizuitor/aprobator când se adaugă o nouă versiune la document',
 'settings_enableNotificationWorkflow' => 'Trimite notificare utilizatorilor din urmatorul pas al workflow-ului',
--- 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 (1643)
+//    Translators: Admin (1644)

 $text = array(
 '2_factor_auth' => 'Двухфакторная аутентификация',
@ -310,7 +310,7 @@ URL: [url]',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
 'document' => 'Документ',
-'documentcontent' => '',
+'documentcontent' => 'Содержание документа',
 'documents' => 'док.',
 'documents_checked_out_by_you' => 'Документ проверен вами',
 'documents_in_process' => 'Документы в работе',
@ -1173,6 +1173,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Если включено, загрузка файлов доступна так же через Java-апплет, называемый jumploader, без ограничения размера файла. Это также позволит загружать несколько файлов за раз.',
 'settings_enableMenuTasks' => 'Включить список задач в меню',
 'settings_enableMenuTasks_desc' => 'Включить/отключить пункт меню, который содержит все задачи пользователя. Там содержатся документы, которые нуждаются в рецензии, утверждении и т.д.',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Извещать рецензента или утверждающего',
 'settings_enableNotificationAppRev_desc' => 'Включите для отправки извещения рецензенту или утверждающему при добавлении новой версии документа.',
 'settings_enableNotificationWorkflow' => 'Отправить уведомление пользователям в следующей стадии процесса',
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@ -998,6 +998,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => '',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@ -1129,6 +1129,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Om aktiverad, kan filer laddas upp via javaapplet med namnet jumploader, utan begränsningar i filstorlek. Flera filer kan även laddas upp samtidigt i ett steg.',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Aktivera meddelande till personer som granskar/godkänner',
 'settings_enableNotificationAppRev_desc' => 'Kryssa i, för att skicka ett meddelande till personer som granskar/godkänner när en ny version av dokumentet har lagts till',
 'settings_enableNotificationWorkflow' => '',
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@ -1145,6 +1145,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Etkinleştirilirse, büyük dosyalar dosya limitine bakılmaksızın jumploader isimli java applet aracılığıyla yüklenebilir. Bu ayrıca bir seferde birden çok dosya yüklemeyi de sağlar. Bu açıldığında sadece http çerezleri kapanmış olur.',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Kontrol eden/onaylayan bildirimlerini etkinleştir',
 'settings_enableNotificationAppRev_desc' => 'Dokümanın yeni versiyonu yüklendiğinde kontrol eden/onaylayana bildirim mesajı gitmesi için bunu etkinleştirin.',
 'settings_enableNotificationWorkflow' => 'Bir sonraki iş akışında kullanıcıları bilgilendir',
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@ -1166,6 +1166,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Якщо увімкнено, завантаження файлів доступне також через Java-аплет jumploader без обмеження розміру файлів. Це також дозволить завантажувати кілька файлів за раз.',
 'settings_enableMenuTasks' => 'Включити список завдань в меню',
 'settings_enableMenuTasks_desc' => 'Включити/відключити пункт меню, який містить всі завдання користувача. Там містяться документи, які потребують рецензії, затвердження і т.ін.',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Сповіщати рецензента і затверджувача',
 'settings_enableNotificationAppRev_desc' => 'Увімкніть для відправки сповіщення рецензенту чи затверджувачеві при додаванні нової версії документа.',
 'settings_enableNotificationWorkflow' => 'Відсилати сповіщення користувачам, задіяним в наступній стадії процесу',
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@ -1000,6 +1000,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => '',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@ -998,6 +998,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => '',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
+'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@ -24,8 +24,17 @@ include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassController.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$controller = Controller::factory($tmp[1]);
+
+/* Check if the form data comes from a trusted request */
+if(!checkFormKey('updatedocument')) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
+}

 if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
@ -58,11 +67,12 @@ if ($document->isLocked()) {
 	else $document->setLocked(false);
 }

-if(isset($_POST['fineuploaderuuids']) && $_POST['fineuploaderuuids']) {
-	$uuids = explode(';', $_POST['fineuploaderuuids']);
-	$names = explode(';', $_POST['fineuploadernames']);
+$prefix = 'userfile';
+if(isset($_POST[$prefix.'-fine-uploader-uuids']) && $_POST[$prefix.'-fine-uploader-uuids']) {
+	$uuids = explode(';', $_POST[$prefix.'-fine-uploader-uuids']);
+	$names = explode(';', $_POST[$prefix.'-fine-uploader-names']);
 	$uuid = $uuids[0];
-	$fullfile = $settings->_stagingDir.'/'.basename($uuid);
+	$fullfile = $settings->_stagingDir.'/'.utf8_basename($uuid);
 	if(file_exists($fullfile)) {
 		$finfo = finfo_open(FILEINFO_MIME_TYPE);
 		$mimetype = finfo_file($finfo, $fullfile);
@ -74,12 +84,7 @@ if(isset($_POST['fineuploaderuuids']) && $_POST['fineuploaderuuids']) {
 	}
 }

-if(isset($_POST["comment"]))
-	$comment  = $_POST["comment"];
-else
-	$comment = "";
-
-if ($_FILES['userfile']['error'] == 0) {
+if (isset($_FILES['userfile']) && $_FILES['userfile']['error'] == 0) {
 //	if(!is_uploaded_file($_FILES["userfile"]["tmp_name"]))
 //		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured")."lsajdflk");

@ -121,6 +126,46 @@ if ($_FILES['userfile']['error'] == 0) {

 	$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);

+if($settings->_enableFullSearch) {
+	$index = $indexconf['Indexer']::open($settings->_luceneDir);
+	$indexconf['Indexer']::init($settings->_stopWordsFile);
+} else {
+	$index = null;
+}
+
+if(isset($_POST["comment"]))
+	$comment  = $_POST["comment"];
+else
+	$comment = "";
+
+$oldexpires = $document->getExpires();
+switch($_POST["presetexpdate"]) {
+case "date":
+	$tmp = explode('-', $_POST["expdate"]);
+	$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]);
+	break;
+case "1w":
+	$tmp = explode('-', date('Y-m-d'));
+	$expires = mktime(0,0,0, $tmp[1], $tmp[2]+7, $tmp[0]);
+	break;
+case "1m":
+	$tmp = explode('-', date('Y-m-d'));
+	$expires = mktime(0,0,0, $tmp[1]+1, $tmp[2], $tmp[0]);
+	break;
+case "1y":
+	$tmp = explode('-', date('Y-m-d'));
+	$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]+1);
+	break;
+case "2y":
+	$tmp = explode('-', date('Y-m-d'));
+	$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]+2);
+	break;
+case "never":
+default:
+	$expires = null;
+	break;
+}
+
 	// Get the list of reviewers and approvers for this document.
 	$reviewers = array();
 	$approvers = array();
@ -257,48 +302,25 @@ if ($_FILES['userfile']['error'] == 0) {
 		$attributes = array();
 	}

-	if(isset($GLOBALS['SEEDDMS_HOOKS']['updateDocument'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['updateDocument'] as $hookObj) {
-			if (method_exists($hookObj, 'preUpdateDocument')) {
-				$hookObj->preUpdateDocument(null, $document, array('name'=>&$name, 'comment'=>&$comment));
-			}
-		}
-	}
-
-	$filesize = SeedDMS_Core_File::fileSize($userfiletmp);
-	$contentResult=$document->addContent($comment, $user, $userfiletmp, basename($userfilename), $fileType, $userfiletype, $reviewers, $approvers, $version=0, $attributes, $workflow, $settings->_initialDocumentStatus);
-	if (is_bool($contentResult) && !$contentResult) {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
-	}
-	else {
-		if(isset($GLOBALS['SEEDDMS_HOOKS']['updateDocument'])) {
-			foreach($GLOBALS['SEEDDMS_HOOKS']['updateDocument'] as $hookObj) {
-				if (method_exists($hookObj, 'postUpdateDocument')) {
-					$hookObj->postUpdateDocument(null, $document, $contentResult->getContent());
-				}
-			}
-		}
-		if($settings->_enableFullSearch) {
-			$index = $indexconf['Indexer']::open($settings->_luceneDir);
-			if($index) {
-				$lucenesearch = new $indexconf['Search']($index);
-				if($hit = $lucenesearch->getDocument((int) $document->getId())) {
-					$index->delete($hit->id);
-				}
-				$indexconf['Indexer']::init($settings->_stopWordsFile);
-				$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText));
-				if(isset($GLOBALS['SEEDDMS_HOOKS']['updateDocument'])) {
-					foreach($GLOBALS['SEEDDMS_HOOKS']['updateDocument'] as $hookObj) {
-						if (method_exists($hookObj, 'preIndexDocument')) {
-							$hookObj->preIndexDocument(null, $document, $idoc);
-						}
-					}
-				}
-				$index->addDocument($idoc);
-				$index->commit();
-			}
-		}
+	$controller->setParam('folder', $folder);
+	$controller->setParam('document', $document);
+	$controller->setParam('index', $index);
+	$controller->setParam('indexconf', $indexconf);
+	$controller->setParam('comment', $comment);
+	if($oldexpires != $expires)
+		$controller->setParam('expires', $expires);
+	$controller->setParam('userfiletmp', $userfiletmp);
+	$controller->setParam('userfilename', $userfilename);
+	$controller->setParam('filetype', $fileType);
+	$controller->setParam('userfiletype', $userfiletype);
+	$controller->setParam('reviewers', $reviewers);
+	$controller->setParam('approvers', $approvers);
+	$controller->setParam('attributes', $attributes);
+	$controller->setParam('workflow', $workflow);

+	if(!$content = $controller->run()) {
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));
+	} else {
 		// Send notification to subscribers.
 		if ($notifier){
 			$notifyList = $document->getNotifyList();
@ -311,7 +333,7 @@ if ($_FILES['userfile']['error'] == 0) {
 			$params['folder_path'] = $folder->getFolderPathPlain();
 			$params['username'] = $user->getFullName();
 			$params['comment'] = $document->getComment();
-			$params['version_comment'] = $contentResult->getContent()->getComment();
+			$params['version_comment'] = $content->getComment();
 			$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;
@ -328,7 +350,7 @@ if ($_FILES['userfile']['error'] == 0) {
 				$message = "request_workflow_action_email_body";
 				$params = array();
 				$params['name'] = $document->getName();
-				$params['version'] = $contentResult->getContent()->getVersion();
+				$params['version'] = $content->getVersion();
 				$params['workflow'] = $workflow->getName();
 				$params['folder_path'] = $folder->getFolderPathPlain();
 				$params['current_state'] = $workflow->getInitState()->getName();
@ -355,8 +377,8 @@ if ($_FILES['userfile']['error'] == 0) {
 					$params = array();
 					$params['name'] = $document->getName();
 					$params['folder_path'] = $folder->getFolderPathPlain();
-					$params['version'] = $contentResult->getContent()->getVersion();
-					$params['comment'] = $contentResult->getContent()->getComment();
+					$params['version'] = $content->getVersion();
+					$params['comment'] = $content->getComment();
 					$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;
@ -376,8 +398,8 @@ if ($_FILES['userfile']['error'] == 0) {
 					$params = array();
 					$params['name'] = $document->getName();
 					$params['folder_path'] = $folder->getFolderPathPlain();
-					$params['version'] = $contentResult->getContent()->getVersion();
-					$params['comment'] = $contentResult->getContent()->getComment();
+					$params['version'] = $content->getVersion();
+					$params['comment'] = $content->getComment();
 					$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;
@ -391,41 +413,8 @@ if ($_FILES['userfile']['error'] == 0) {
 					}
 				}
 			}
-		}
-
-		switch($_POST["presetexpdate"]) {
-		case "date":
-			$tmp = explode('-', $_POST["expdate"]);
-			$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]);
-			break;
-		case "1w":
-			$tmp = explode('-', date('Y-m-d'));
-			$expires = mktime(0,0,0, $tmp[1], $tmp[2]+7, $tmp[0]);
-			break;
-		case "1m":
-			$tmp = explode('-', date('Y-m-d'));
-			$expires = mktime(0,0,0, $tmp[1]+1, $tmp[2], $tmp[0]);
-			break;
-		case "1y":
-			$tmp = explode('-', date('Y-m-d'));
-			$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]+1);
-			break;
-		case "2y":
-			$tmp = explode('-', date('Y-m-d'));
-			$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]+2);
-			break;
-		case "never":
-		default:
-			$expires = null;
-			break;
-		}
-
-		if ($expires) {
-			if($document->setExpires($expires)) {
-				if($notifier) {
-					$notifyList = $document->getNotifyList();
-					$folder = $document->getFolder();

+			if($oldexpires != $document->getExpires()) {
 				// Send notification to subscribers.
 				$subject = "expiry_changed_email_subject";
 				$message = "expiry_changed_email_body";
@ -441,10 +430,8 @@ if ($_FILES['userfile']['error'] == 0) {
 					$notifier->toGroup($user, $grp, $subject, $message, $params);
 				}
 			}
-			} else {
-				UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
-			}
 		}
+
 		if($settings->_removeFromDropFolder) {
 			if(file_exists($userfiletmp)) {
 				unlink($userfiletmp);
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@ -93,7 +93,11 @@ $(document).ready(function() {
 		if($enablelargefileupload) {
 ?>
 		submitHandler: function(form) {
+			/* fileuploader may not have any files if drop folder is used */
+			if(userfileuploader.getUploads().length)
 				userfileuploader.uploadStoredFiles();
+			else
+				form.submit();
 		},
 <?php
 		}
--- a/views/bootstrap/class.AddFile.php
+++ b/views/bootstrap/class.AddFile.php
@ -158,7 +158,7 @@ $(document).ready( function() {
 	</div>
 </div>
 <div class="control-group">
-	<label class="control-label"><?php printMLText("link_to_version");?>:</label>
+	<label class="control-label"><?php printMLText("version");?>:</label>
 	<div class="controls"><select name="version" id="version">
 		<option value=""></option>
 <?php
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@ -90,8 +90,8 @@ $(document).ready( function() {
 							$content .= "<td>";
 							/* Check if value is in value set */
 							if($selattrdef->getValueSet()) {
-								foreach($values as $v) {
-									if(!in_array($value, $selattrdef->getValueSetAsArray()))
+								foreach($value as $v) {
+									if(!in_array($v, $selattrdef->getValueSetAsArray()))
 										$content .= getMLText("attribute_value_not_in_valueset");
 								}
 							}
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@ -823,7 +823,7 @@ if(!is_writeable($settings->_configFilePath)) {
 <?php
 					foreach($extconf['config'] as $confkey=>$conf) {
 ?>
-      <tr title="<?php echo $extconf['title'];?>">
+      <tr title="<?php echo isset($conf['help']) ? $conf['help'] : '';?>">
        <td><?php echo $conf['title'];?>:</td><td>
 <?php
 						switch($conf['type']) {
@ -903,7 +903,7 @@ if(!is_writeable($settings->_configFilePath)) {
 								break;
 							default:
 ?>
-        <input type="text" name="<?php echo "extensions[".$extname."][".$confkey."]"; ?>" title="<?php echo isset($conf['help']) ? $conf['help'] : ''; ?>" value="<?php if(isset($settings->_extensions[$extname][$confkey])) echo $settings->_extensions[$extname][$confkey]; ?>" size="<?php echo $conf['size']; ?>" />
+        <input type="text" name="<?php echo "extensions[".$extname."][".$confkey."]"; ?>" title="<?php echo isset($conf['help']) ? $conf['help'] : ''; ?>" value="<?php if(isset($settings->_extensions[$extname][$confkey])) echo $settings->_extensions[$extname][$confkey]; ?>" <?php echo isset($conf['size']) ? 'size="'.$conf['size'].'"' : ""; ?>" />
 <?php
 						}
 ?>
--- a/views/bootstrap/class.SubstituteUser.php
+++ b/views/bootstrap/class.SubstituteUser.php
@ -76,6 +76,19 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 			}
 			echo "</td>";
 			echo "<td>";
+			switch($currUser->getRole()) {
+			case SeedDMS_Core_User::role_user:
+				printMLText("role_user");
+				break;
+			case SeedDMS_Core_User::role_admin:
+				printMLText("role_admin");
+				break;
+			case SeedDMS_Core_User::role_guest:
+				printMLText("role_guest");
+				break;
+			}
+			echo "</td>";
+			echo "<td>";
 			if($currUser->getID() != $user->getID()) {
 				echo "<a class=\"btn\" href=\"../op/op.SubstituteUser.php?userid=".((int) $currUser->getID())."&formtoken=".createFormKey('substituteuser')."\"><i class=\"icon-exchange\"></i> ".getMLText('substitute_user')."</a> ";
 			}
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@ -68,6 +68,8 @@ $(document).ready( function() {
 		return false;
 	}, "<?php printMLText("js_no_file");?>");
 	$("#form1").validate({
+		debug: false,
+		ignore: ":hidden:not(.do_validate)",
 		invalidHandler: function(e, validator) {
 			noty({
 				text:  (validator.numberOfInvalids() == 1) ? "<?php printMLText("js_form_error");?>".replace('#', validator.numberOfInvalids()) : "<?php printMLText("js_form_errors");?>".replace('#', validator.numberOfInvalids()),
@ -82,7 +84,11 @@ $(document).ready( function() {
 		if($enablelargefileupload) {
 ?>
 		submitHandler: function(form) {
-			manualuploader.uploadStoredFiles();
+			/* fileuploader may not have any files if drop folder is used */
+			if(userfileuploader.getUploads().length)
+				userfileuploader.uploadStoredFiles();
+			else
+				form.submit();
 		},
 <?php
 		}
@ -91,8 +97,8 @@ $(document).ready( function() {
 <?php
 		if($enablelargefileupload) {
 ?>
-			fineuploaderuuids: {
-				fineuploader: [ manualuploader, $('#dropfolderfileform1') ]
+			'userfile-fine-uploader-uuids': {
+				fineuploader: [ userfileuploader, $('#dropfolderfileform1') ]
 			}
 <?php
 		} else {
@ -216,6 +222,7 @@ console.log(element);
 ?>

 <form action="../op/op.UpdateDocument.php" enctype="multipart/form-data" method="post" name="form1" id="form1">
+	<?php echo createHiddenFieldWithKey('updatedocument'); ?>
 	<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
 	<table class="table-condensed">
 	
@ -309,6 +316,17 @@ console.log(element);
 			}
 		}
 	}
+
+	$arrs = $this->callHook('addDocumentContentAttributes', $folder);
+	if(is_array($arrs)) {
+		foreach($arrs as $arr) {
+			echo "<tr>";
+			echo "<td>".$arr[0].":</td>";
+			echo "<td>".$arr[1]."</td>";
+			echo "</tr>";
+		}
+	}
+
 	if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 		// Retrieve a list of all users and groups that have review / approve
 		// privileges.