From 8770aaecb3b32cdfacd9124de8a39a1b9cb24acd Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 2 Aug 2016 17:08:54 +0200 Subject: [PATCH 01/10] add new paramter maxSizeForFullText --- inc/inc.ClassSettings.php | 6 +++++- op/op.Settings.php | 11 ++++++----- views/bootstrap/class.Settings.php | 4 ++++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index af8c14ccc..e2cac868d 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -91,6 +91,8 @@ class Settings { /* {{{ */ var $_stopWordsFile = null; // enable/disable lucene fulltext search var $_enableFullSearch = true; + // max size of documents for direct indexing + var $_maxSizeForFullText = 0; // fulltext search engine var $_fullSearchEngine = 'lucene'; // default search method @@ -186,7 +188,7 @@ class Settings { /* {{{ */ var $_sortUsersInList = ''; // Sort method for forders and documents ('n' (name) or '') var $_sortFoldersDefault = ''; - // enable/disable lucene fulltext search + // Set valid IP for admin logins // if enabled admin can login only by specified IP addres var $_adminIP = ""; // Max Execution Time @@ -382,6 +384,7 @@ class Settings { /* {{{ */ $this->_enableLanguageSelector = Settings::boolVal($tab["enableLanguageSelector"]); $this->_enableThemeSelector = Settings::boolVal($tab["enableThemeSelector"]); $this->_enableFullSearch = Settings::boolVal($tab["enableFullSearch"]); + $this->_maxSizeForFullText = intval($tab["maxSizeForFullText"]); $this->_fullSearchEngine = strval($tab["fullSearchEngine"]); $this->_defaultSearchMethod = strval($tab["defaultSearchMethod"]); $this->_stopWordsFile = strval($tab["stopWordsFile"]); @@ -662,6 +665,7 @@ class Settings { /* {{{ */ $this->setXMLAttributValue($node, "enableLanguageSelector", $this->_enableLanguageSelector); $this->setXMLAttributValue($node, "enableThemeSelector", $this->_enableThemeSelector); $this->setXMLAttributValue($node, "enableFullSearch", $this->_enableFullSearch); + $this->setXMLAttributValue($node, "maxSizeForFullText", $this->_maxSizeForFullText); $this->setXMLAttributValue($node, "fullSearchEngine", $this->_fullSearchEngine); $this->setXMLAttributValue($node, "defaultSearchMethod", $this->_defaultSearchMethod); $this->setXMLAttributValue($node, "expandFolderTree", $this->_expandFolderTree); diff --git a/op/op.Settings.php b/op/op.Settings.php index e152e0545..e5325d967 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -68,8 +68,9 @@ if ($action == "saveSettings") $settings->_enableEmail =getBoolValue("enableEmail"); $settings->_enableUsersView = getBoolValue("enableUsersView"); $settings->_enableFullSearch = getBoolValue("enableFullSearch"); - $settings->_fullSearchEngine = $_POST["fullSearchEngine"]; - $settings->_defaultSearchMethod = $_POST["defaultSearchMethod"]; + $settings->_maxSizeForFullText = intval($_POST["maxSizeForFullText"]); + $settings->_fullSearchEngine = $_POST["fullSearchEngine"]; + $settings->_defaultSearchMethod = $_POST["defaultSearchMethod"]; $settings->_enableClipboard = getBoolValue("enableClipboard"); $settings->_enableDropUpload = getBoolValue("enableDropUpload"); $settings->_enableFolderTree = getBoolValue("enableFolderTree"); @@ -79,9 +80,9 @@ if ($action == "saveSettings") $settings->_enableHelp = getBoolValue("enableHelp"); $settings->_enableThemeSelector = getBoolValue("enableThemeSelector"); $settings->_expandFolderTree = intval($_POST["expandFolderTree"]); - $settings->_stopWordsFile = $_POST["stopWordsFile"]; - $settings->_sortUsersInList = $_POST["sortUsersInList"]; - $settings->_sortFoldersDefault = $_POST["sortFoldersDefault"]; + $settings->_stopWordsFile = $_POST["stopWordsFile"]; + $settings->_sortUsersInList = $_POST["sortUsersInList"]; + $settings->_sortFoldersDefault = $_POST["sortFoldersDefault"]; // SETTINGS - SITE - CALENDAR $settings->_enableCalendar = getBoolValue("enableCalendar"); diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 2d15782b9..181fc97a5 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -186,6 +186,10 @@ if(!is_writeable($settings->_configFilePath)) { : _enableFullSearch) echo "checked" ?> /> + "> + : + showTextField("maxSizeForFullText", $settings->_maxSizeForFullText); ?> + "> : From 04d7fdf258dd3b8c15bb362f5f9bf7249b4cce58 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 2 Aug 2016 17:09:49 +0200 Subject: [PATCH 02/10] update full text engine also index content if file size is less the a configured size (Closes: #270) --- op/op.AddDocument.php | 3 ++- op/op.RemoveVersion.php | 27 ++++++++++++++++++++++ op/op.UpdateDocument.php | 14 ++++++++++++ op/op.UpdateDocument2.php | 47 ++++++++++++--------------------------- 4 files changed, 57 insertions(+), 34 deletions(-) diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php index d808ed727..95ef13b53 100644 --- a/op/op.AddDocument.php +++ b/op/op.AddDocument.php @@ -285,6 +285,7 @@ for ($file_num=0;$file_numaddDocument($name, $comment, $expires, $user, $keywords, $cats, $userfiletmp, basename($userfilename), $fileType, $userfiletype, $sequence, @@ -306,7 +307,7 @@ for ($file_num=0;$file_num_luceneDir); if($index) { $indexconf['Indexer']::init($settings->_stopWordsFile); - $index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, true)); + $index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText))); } } diff --git a/op/op.RemoveVersion.php b/op/op.RemoveVersion.php index c1d8390cd..99aca31d7 100644 --- a/op/op.RemoveVersion.php +++ b/op/op.RemoveVersion.php @@ -67,6 +67,18 @@ if (count($document->getContent())==1) { if (!$document->remove()) { UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured")); } else { + /* Remove the document from the fulltext index */ + if($settings->_enableFullSearch) { + $index = $indexconf['Indexer']::open($settings->_luceneDir); + if($index) { + $lucenesearch = new $indexconf['Search']($index); + if($hit = $lucenesearch->getDocument($documentid)) { + $index->delete($hit->id); + $index->commit(); + } + } + } + if ($notifier){ $subject = "document_deleted_email_subject"; $message = "document_deleted_email_body"; @@ -115,6 +127,21 @@ else { if (!$document->removeContent($version)) { UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured")); } else { + /* Remove the document from the fulltext index and reindex latest version */ + if($settings->_enableFullSearch) { + $index = $indexconf['Indexer']::open($settings->_luceneDir); + if($index) { + $lucenesearch = new $indexconf['Search']($index); + if($hit = $lucenesearch->getDocument($document->getID())) { + $index->delete($hit->id); + } + $version = $document->getLatestContent(); + $indexconf['Indexer']::init($settings->_stopWordsFile); + $index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($version->getFileSize() < $settings->_maxSizeForFullText))); + $index->commit(); + } + } + // Notify affected users. if ($notifier){ $nl=$document->getNotifyList(); diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php index 18d060cc6..78c992a07 100644 --- a/op/op.UpdateDocument.php +++ b/op/op.UpdateDocument.php @@ -227,11 +227,25 @@ if ($_FILES['userfile']['error'] == 0) { $attributes = array(); } + $filesize = SeedDMS_Core_File::fileSize($userfiletmp); $contentResult=$document->addContent($comment, $user, $userfiletmp, basename($userfilename), $fileType, $userfiletype, $reviewers, $approvers, $version=0, $attributes, $workflow); if (is_bool($contentResult) && !$contentResult) { UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured")); } else { + 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); + $index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText))); + $index->commit(); + } + } + // Send notification to subscribers. if ($notifier){ $notifyList = $document->getNotifyList(); diff --git a/op/op.UpdateDocument2.php b/op/op.UpdateDocument2.php index 38504df4c..3922069d6 100644 --- a/op/op.UpdateDocument2.php +++ b/op/op.UpdateDocument2.php @@ -150,34 +150,29 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) { } } - + $filesize = SeedDMS_Core_File::fileSize($userfiletmp); $contentResult=$document->addContent($comment, $user, $userfiletmp, basename($userfilename), $fileType, $userfiletype, $reviewers, $approvers); unlink($userfiletmp); if (is_bool($contentResult) && !$contentResult) { echo getMLText("error_occured"); } else { + 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); + $index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText))); + $index->commit(); + } + } + // Send notification to subscribers. if ($notifier){ $notifyList = $document->getNotifyList(); $folder = $document->getFolder(); -/* - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_updated_email"); - $message = getMLText("document_updated_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - getMLText("comment").": ".$document->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toList($user, $document->_notifyList["users"], $subject, $message); - foreach ($document->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } - - // if user is not owner send notification to owner - if ($user->getID()!= $document->getOwner()->getID()) - $notifier->toIndividual($user, $document->getOwner(), $subject, $message); -*/ $subject = "document_updated_email_subject"; $message = "document_updated_email_body"; $params = array(); @@ -205,20 +200,6 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) { $notifyList = $document->getNotifyList(); $folder = $document->getFolder(); // Send notification to subscribers. -/* - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("expiry_changed_email"); - $message = getMLText("expiry_changed_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - getMLText("comment").": ".$document->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toList($user, $document->_notifyList["users"], $subject, $message); - foreach ($document->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ $subject = "expiry_changed_email_subject"; $message = "expiry_changed_email_body"; $params = array(); From 8cc7da6679e5da11542c5cc26e8493f640c59b7c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 2 Aug 2016 17:19:06 +0200 Subject: [PATCH 03/10] add new phrases for maxSizeForFullText config var --- languages/ar_EG/lang.inc | 5 +++++ languages/bg_BG/lang.inc | 5 +++++ languages/ca_ES/lang.inc | 5 +++++ languages/cs_CZ/lang.inc | 5 +++++ languages/de_DE/lang.inc | 7 ++++++- languages/en_GB/lang.inc | 9 +++++++-- languages/es_ES/lang.inc | 5 +++++ languages/fr_FR/lang.inc | 5 +++++ languages/hr_HR/lang.inc | 5 +++++ languages/hu_HU/lang.inc | 5 +++++ languages/it_IT/lang.inc | 5 +++++ languages/ko_KR/lang.inc | 5 +++++ languages/nl_NL/lang.inc | 5 +++++ languages/pl_PL/lang.inc | 5 +++++ languages/pt_BR/lang.inc | 5 +++++ languages/ro_RO/lang.inc | 5 +++++ languages/ru_RU/lang.inc | 5 +++++ languages/sk_SK/lang.inc | 5 +++++ languages/sv_SE/lang.inc | 5 +++++ languages/tr_TR/lang.inc | 5 +++++ languages/uk_UA/lang.inc | 5 +++++ languages/zh_CN/lang.inc | 5 +++++ languages/zh_TW/lang.inc | 5 +++++ 23 files changed, 118 insertions(+), 3 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 4596e5c60..47b3fc05e 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -390,8 +390,10 @@ URL: [url]', 'edit_document_props' => 'تعديل مستند', 'edit_event' => 'تعديل الحدث', 'edit_existing_access' => 'تعديل قائمة الصلاحيات', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'تعديل قائمة التنبيهات', 'edit_folder_access' => 'تعديل صلاحيات', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'تعديل قائمة التنبيهات', 'edit_folder_props' => 'تعديل مجلد', 'edit_group' => 'تعديل مجموعة', @@ -405,6 +407,7 @@ URL: [url]', 'email_footer' => 'يمكنك دائما تغيير اعدادات بريدك الالكتروني من خلال خاصية - مستنداتي', 'email_header' => 'هذا رسالة تلقائية من نظام ادارة المستندات!', 'email_not_given' => 'من فضلك ادخل بريد الكتروني صحيح.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'لايوجد مستندات او مجلدات', 'empty_notify_list' => 'لايوجد مدخلات', 'en_GB' => 'الإنكليزية (GB)', @@ -1126,6 +1129,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => '', 'settings_maxRecursiveCount' => '', 'settings_maxRecursiveCount_desc' => '', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => '', 'settings_notfound' => '', 'settings_Notification' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index d0c54d687..023e3b225 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -345,8 +345,10 @@ $text = array( 'edit_document_props' => 'Редактирай документ', 'edit_event' => 'Редактирай събитие', 'edit_existing_access' => 'Редактирай списъкът за достъп', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Редактирай списъкът с уведомявания', 'edit_folder_access' => 'Редактирай достъп', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Списък с уведомявания за папка', 'edit_folder_props' => 'Редактирай папка', 'edit_group' => 'Редактирай група', @@ -360,6 +362,7 @@ $text = array( 'email_footer' => 'Винаги можете да измените e-mail исползвайки функцията \'Моя учетка\'', 'email_header' => 'Това е автоматично уведомяване от сървъра за документооборот', 'email_not_given' => 'Въведете настоящ email.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Няма документи или папки', 'empty_notify_list' => 'Няма записи', 'en_GB' => '', @@ -991,6 +994,8 @@ $text = array( 'settings_maxExecutionTime_desc' => 'Установява максимално време за изпълнение на скрипта, преди да бъде прибит от парсера', 'settings_maxRecursiveCount' => '', 'settings_maxRecursiveCount_desc' => '', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Още настройки. Логин по подразбиране: admin/admin', 'settings_notfound' => 'Не е намерено', 'settings_Notification' => 'Настройка за известяване', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index bbc4be098..0210bb706 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -350,8 +350,10 @@ URL: [url]', 'edit_document_props' => 'Editar document', 'edit_event' => 'Editar event', 'edit_existing_access' => 'Editar llista d\'accés', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Editar llista de notificació', 'edit_folder_access' => 'Editar accés', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Llista de notificació', 'edit_folder_props' => 'Editar directori', 'edit_group' => 'Editar grup...', @@ -365,6 +367,7 @@ URL: [url]', 'email_footer' => 'Sempre es pot canviar la configuració de correu electrònic utilitzant les funcions de «El meu compte»', 'email_header' => 'Aquest es un missatge automàtic del servidor de DMS.', 'email_not_given' => '', +'empty_attribute_group_list' => '', 'empty_folder_list' => '', 'empty_notify_list' => 'No hi ha entrades', 'en_GB' => 'Anglès (Regne Unit)', @@ -996,6 +999,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => '', 'settings_maxRecursiveCount' => '', 'settings_maxRecursiveCount_desc' => '', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => '', 'settings_notfound' => '', 'settings_Notification' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 7b556cba1..9f8220029 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -397,8 +397,10 @@ URL: [url]', 'edit_document_props' => 'Upravit dokument', 'edit_event' => 'Upravit akci', 'edit_existing_access' => 'Upravit seznam řízení přístupu', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Upravit seznam upozornění', 'edit_folder_access' => 'Upravit přístup', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Seznam upozornění', 'edit_folder_props' => 'Upravit adresář', 'edit_group' => 'Upravit skupinu', @@ -412,6 +414,7 @@ URL: [url]', 'email_footer' => 'Změnu nastavení e-mailu můžete kdykoliv provést pomocí funkce\'Můj účet\'', 'email_header' => 'Toto je automatická zpráva ze serveru DMS.', 'email_not_given' => 'Zadejte prosím platnou emailovou adresu.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Žádné dokumenty nebo složky', 'empty_notify_list' => 'Žádné položky', 'en_GB' => 'Angličtina (GB)', @@ -1135,6 +1138,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => '', 'settings_maxRecursiveCount' => 'Max. počet rekurzívních počítání dokumentů/složek', 'settings_maxRecursiveCount_desc' => 'Toto je max. počet dokumentů a složek, kterým bude kontrolováno přístupové právo při rekurzivním počítání objektů. Po jeho překročení bude počet složek a dokumentů odhadnut.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Configure more settings. Default login: admin/admin', 'settings_notfound' => '', 'settings_Notification' => 'Nastavení upozornění', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index aeb8de847..5fd8f1d11 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 (2263), dgrutsch (21) +// Translators: Admin (2269), dgrutsch (21) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -402,8 +402,10 @@ URL: [url]', 'edit_document_props' => 'Bearbeiten', 'edit_event' => 'Ereignis editieren', 'edit_existing_access' => 'Bestehende Berechtigungen bearbeiten', +'edit_existing_attribute_groups' => 'Attributgruppen bearbeiten', 'edit_existing_notify' => 'Beobachter bearbeiten', 'edit_folder_access' => 'Zugriffsrechte bearbeiten', +'edit_folder_attrdefgrp' => 'Attributgruppen bearbeiten', 'edit_folder_notify' => 'Beobachtung von Ordnern', 'edit_folder_props' => 'Bearbeiten', 'edit_group' => 'Gruppe bearbeiten', @@ -417,6 +419,7 @@ URL: [url]', 'email_footer' => 'Sie können zu jeder Zeit Ihre E-Mail-Adresse über \'Mein Profil\' ändern.', 'email_header' => 'Dies ist eine automatische Nachricht des DMS-Servers.', 'email_not_given' => 'Bitte geben Sie eine gültige E-Mail-Adresse ein.', +'empty_attribute_group_list' => 'Keine Attributgruppen', 'empty_folder_list' => 'Keine Dokumente oder Ordner', 'empty_notify_list' => 'Keine Beobachter', 'en_GB' => 'Englisch (GB)', @@ -1172,6 +1175,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Maximale Zeit in Sekunden bis ein Skript beendet wird.', 'settings_maxRecursiveCount' => 'Max. Anzahl Anzahl rekursiver Dokumente/Ordner.', 'settings_maxRecursiveCount_desc' => 'Dies ist die maximale Anzahl der Dokumente und Ordner die auf Zugriffsrechte geprüft werden, wenn rekursiv gezählt wird. Wenn diese Anzahl überschritten wird, wird die Anzahl der Dokumente und Unterordner in der Ordner Ansicht geschätzt.', +'settings_maxSizeForFullText' => 'Maximale Dateigröße für sofortige Indezierung', +'settings_maxSizeForFullText_desc' => 'Alle neue Version eines Dokuments, die kleiner als die die konfigurierte Dateigröße sind, werden sofort indiziert. In allen anderen Fällen werden nur die Metadaten erfasst.', 'settings_more_settings' => 'Weitere Einstellungen. Login mit admin/admin', 'settings_notfound' => 'Nicht gefunden', 'settings_Notification' => 'Benachrichtigungen-Einstellungen', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index e243e345b..e01c14b67 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 (1410), dgrutsch (7), netixw (14) +// Translators: Admin (1417), dgrutsch (7), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -133,7 +133,7 @@ URL: [url]', 'assumed_released' => 'Assumed released', 'attrdefgroup_management' => 'Attribute groups managament', 'attrdefgrp_show_detail' => 'Details', -'attrdefgrp_show_list' => 'list', +'attrdefgrp_show_list' => 'List', 'attrdefgrp_show_search' => 'Search', 'attrdef_exists' => 'Attribute definition already exists', 'attrdef_info' => 'Information', @@ -402,8 +402,10 @@ URL: [url]', 'edit_document_props' => 'Edit document', 'edit_event' => 'Edit event', 'edit_existing_access' => 'Edit Access List', +'edit_existing_attribute_groups' => 'Edit attribute groups', 'edit_existing_notify' => 'Edit notification list', 'edit_folder_access' => 'Edit access', +'edit_folder_attrdefgrp' => 'Edit attribute groups', 'edit_folder_notify' => 'Folder Notification List', 'edit_folder_props' => 'Edit folder', 'edit_group' => 'Edit group', @@ -417,6 +419,7 @@ URL: [url]', 'email_footer' => 'You can always change your e-mail settings using \'My Account\' functions', 'email_header' => 'This is an automatic message from the DMS server.', 'email_not_given' => 'Please enter a valid email address.', +'empty_attribute_group_list' => 'No attribute groups', 'empty_folder_list' => 'No documents or folders', 'empty_notify_list' => 'No entries', 'en_GB' => 'English (GB)', @@ -1173,6 +1176,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'This sets the maximum time in seconds a script is allowed to run before it is terminated by the parse', 'settings_maxRecursiveCount' => 'Max. number of recursive document/folder count', 'settings_maxRecursiveCount_desc' => 'This is the maximum number of documents or folders that will be checked for access rights, when recursively counting objects. If this number is exceeded, the number of documents and folders in the folder view will be estimated.', +'settings_maxSizeForFullText' => 'Maximum filesize for instant indexing', +'settings_maxSizeForFullText_desc' => 'All new document vresion smaller than the configured size will be fully indexed right after uploading. In all other cases only the metadata will be indexed.', 'settings_more_settings' => 'Configure more settings. Default login: admin/admin', 'settings_notfound' => 'Not found', 'settings_Notification' => 'Notification settings', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index e75977c3e..a0823431f 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -397,8 +397,10 @@ URL: [url]', 'edit_document_props' => 'Editar propiedades de documento', 'edit_event' => 'Editar evento', 'edit_existing_access' => 'Editar lista de acceso', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Editar lista de notificación', 'edit_folder_access' => 'Editar acceso', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Lista de notificación', 'edit_folder_props' => 'Editar carpeta', 'edit_group' => 'Editar grupo...', @@ -412,6 +414,7 @@ URL: [url]', 'email_footer' => 'Siempre se puede cambiar la configuración de correo electrónico utilizando las funciones de «Mi cuenta»', 'email_header' => 'Este es un mensaje automático del servidor de DMS.', 'email_not_given' => 'Por favor, introduzca una dirección de correo válida.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Sin documentos o carpetas', 'empty_notify_list' => 'Sin entradas', 'en_GB' => 'Ingless (GB)', @@ -1141,6 +1144,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Esto configura el tiempo máximo en segundos que un script puede estar ejectutándose antes de que el analizador lo pare', 'settings_maxRecursiveCount' => 'Número máximo del contador de carpetas/documentos recursivos', 'settings_maxRecursiveCount_desc' => 'Este es el número máximo de documentos o carpetas que pueden ser revisados con derechos de acceso, contando objetos recursivos. Si este número es excedido , el número de carpetas y documentos en la vista de carpeta será estimado.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Configure más parámetros. Acceso por defecto: admin/admin', 'settings_notfound' => 'No encontrado', 'settings_Notification' => 'Parámetros de notificación', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 2e2224b1d..95dde7918 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -397,8 +397,10 @@ URL: [url]', 'edit_document_props' => 'Modifier le document', 'edit_event' => 'Modifier l\'événement', 'edit_existing_access' => 'Modifier la liste des droits d\'accès', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Modifier les notifications', 'edit_folder_access' => 'Modifier les droits d\'accès', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Liste de notification de dossiers', 'edit_folder_props' => 'Modifier le dossier', 'edit_group' => 'Modifier un groupe', @@ -412,6 +414,7 @@ URL: [url]', 'email_footer' => 'Vous pouvez modifier les paramètres de messagerie via \'Mon compte\'.', 'email_header' => 'Ceci est un message automatique généré par le serveur DMS.', 'email_not_given' => 'SVP Entrer une adresse email valide.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Pas de documents ou de dossier', 'empty_notify_list' => 'Aucune entrée', 'en_GB' => 'Anglais (RU)', @@ -1117,6 +1120,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Ceci définit la durée maximale en secondes q\'un script est autorisé à exécuter avant de se terminer par l\'analyse syntaxique', 'settings_maxRecursiveCount' => 'Nombre maximal de document/dossier récursif', 'settings_maxRecursiveCount_desc' => 'Nombre maximum de documents et répertoires dont l\'accès sera vérifié, lors d\'un décompte récursif. Si ce nombre est dépassé, le nombre de documents et répertoires affichés sera approximé.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Configurer d\'autres paramètres. Connexion par défaut: admin/admin', 'settings_notfound' => 'Introuvable', 'settings_Notification' => 'Notifications', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 77299c3d6..00092d650 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -402,8 +402,10 @@ Internet poveznica: [url]', 'edit_document_props' => 'Uredi dokument', 'edit_event' => 'Uredi događaj', 'edit_existing_access' => 'Uredi popis pristupa', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Uredi popis za primanje obavijesti', 'edit_folder_access' => 'Uredi pristup', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Popis za obavijesti o mapi', 'edit_folder_props' => 'Uredi mapu', 'edit_group' => 'Uredi mapu', @@ -417,6 +419,7 @@ Internet poveznica: [url]', 'email_footer' => 'Koristeći funckcije \'Moj račun\' možete promijeniti postavke email obavještavanja.', 'email_header' => 'Ovo je automatski generirana poruka iz DMS sustava', 'email_not_given' => 'Molimo unesite valjanu email adresu.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Nema dokumenata ili mapa', 'empty_notify_list' => 'Nema zapisa', 'en_GB' => 'Engleski (GB)', @@ -1162,6 +1165,8 @@ Internet poveznica: [url]', 'settings_maxExecutionTime_desc' => 'Ovo postavlja maksimalno vrijeme u sekundama u kojem je skripti dopušteno da se pokrene prije nego se prekine rasčlanjivanjem', 'settings_maxRecursiveCount' => 'Max. broj rekurzivnog dokumenta/mape', 'settings_maxRecursiveCount_desc' => 'To je maksimalni broj dokumenata ili mapa koji će biti označen pristupnim pravima, pri rekurzivnom brojanju objekata. Ako se taj broj premaši, broj dokumenata i mapa u pregledu mape će biti procjenjen.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Konfiguriraj više postavki. Zadana prijava: admin/admin', 'settings_notfound' => 'Nije pronađeno', 'settings_Notification' => 'Postavke bilježenja', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 672561adb..2d3c8e7ea 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -397,8 +397,10 @@ URL: [url]', 'edit_document_props' => 'Dokumentum szerkesztése', 'edit_event' => 'Esemény szerkesztése', 'edit_existing_access' => 'Hozzáférési lista szerkesztése', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Értesítési lista szerkesztése', 'edit_folder_access' => 'Hozzáférés szerkesztése', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Mappa értesítési lista', 'edit_folder_props' => 'Mappa szerkesztése', 'edit_group' => 'Csoport szerkesztése', @@ -412,6 +414,7 @@ URL: [url]', 'email_footer' => 'Bármikor módosíthatja email beállításait a \'My Account\' funkcióval', 'email_header' => 'Ez egy automatikus üzenet a DMS kiszolgálótól.', 'email_not_given' => 'Kérem adjon meg egy érvényes email címet.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Mappa vagy dokumentum nem található', 'empty_notify_list' => 'Nincsenek bejegyzések', 'en_GB' => 'Angol (GB)', @@ -1140,6 +1143,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Beállítja a szkript maximális engedélyezett futási idejét másodpercben mielőtt megszakítja az értelmező', 'settings_maxRecursiveCount' => 'Rekurzív dokumentum/mappa számláló legnagyobb értéke', 'settings_maxRecursiveCount_desc' => 'A dokumentumok és mappák maximális mennyisége amelyeken ellenőrizni fogják a hozzáférési jogokat, ha rekurzívan számláló tárgyakat. Ha ezt az értéket túllépik, a dokumentumok számát és mappák a Mappa nézetben is becsülhetők.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'További beállítások konfigurálása. Alapértelmezett bejelentkezés: admin/admin', 'settings_notfound' => 'Nem található', 'settings_Notification' => 'Értesítés beállításai', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 7a6a418a1..3ccc0f428 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -403,8 +403,10 @@ URL: [url]', 'edit_document_props' => 'Modifica le proprietà del documento', 'edit_event' => 'Modifica l\'evento', 'edit_existing_access' => 'Modifica i permessi', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Gestione lista di notifica', 'edit_folder_access' => 'Modifica permessi', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Modifica la lista di notifica per la cartella', 'edit_folder_props' => 'Modifica proprietà cartella', 'edit_group' => 'Modifica il gruppo', @@ -418,6 +420,7 @@ URL: [url]', 'email_footer' => 'Puoi cambiare l\'impostazione della tua email utilizzando le funzioni del menu \'Account personale\'', 'email_header' => 'Questo è un messaggio automatico inviato dal server DMS', 'email_not_given' => 'Inserisci un indirizzo email valido.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Cartella vuota', 'empty_notify_list' => 'Nessun record', 'en_GB' => 'Inglese (GB)', @@ -1164,6 +1167,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Imposta il tempo limite per l\'esecuzione di uno script prima che il parser lo termini.', 'settings_maxRecursiveCount' => 'Conteggio ricursivo Max di files e cartelle', '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' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Ulteriori configurazioni. Login di default: admin/admin', 'settings_notfound' => 'Non trovato', 'settings_Notification' => 'Impostazioni di notifica', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 087261953..7c6bd2b8f 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -402,8 +402,10 @@ URL: [url]', 'edit_document_props' => '문서 편집', 'edit_event' => '편집 이벤트', 'edit_existing_access' => '편집 액세스 목록', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => '편집 알림 리스트', 'edit_folder_access' => '액세스 편집', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => '폴더 알림 목록', 'edit_folder_props' => '폴더 편집', 'edit_group' => '편집 그룹', @@ -417,6 +419,7 @@ URL: [url]', 'email_footer' => '내 계정\'을 사용하여 전자 메일 설정을 변경 할 수 있습니다', 'email_header' => 'DMS 서버에서 자동 생성된 메시지 입니다.', 'email_not_given' => '유효한 이메일 주소를 입력하십시오.', +'empty_attribute_group_list' => '', 'empty_folder_list' => '문서 또는 폴더 입력', 'empty_notify_list' => '항목을 입력하세요', 'en_GB' => '영어 (GB)', @@ -1155,6 +1158,8 @@ URL : [url]', 'settings_maxExecutionTime_desc' => '종료되기 전 스크립트의 구문 분석 할 수있는 최대 시간을 초 단위로 설정', 'settings_maxRecursiveCount' => '최대 재귀 문서 / 폴더의 수', 'settings_maxRecursiveCount_desc' => '이것은 재귀적으로 개체를 셀 때 사용 권한이 확인됩니다 문서 및 폴더의 최대 수입니다. 이 수를 초과하면 폴더보기에서 문서 나 폴더의 수가 추정됩니다.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => '기타 설정을 구성합니다. 기본 로그인 : admin/admin', 'settings_notfound' => '찾을 수 없음', 'settings_Notification' => '알림 설정', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 1288a7bc2..04cb3258b 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -395,8 +395,10 @@ URL: [url]', 'edit_document_props' => 'Wijzig document', 'edit_event' => 'Activiteit wijzigen', 'edit_existing_access' => 'Wijzig toegangslijst', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Wijzig Notificatie lijst', 'edit_folder_access' => 'Wijzig toegang', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Map Notificatie Lijst', 'edit_folder_props' => 'Wijzig Map eigenschappen', 'edit_group' => 'Wijzig Groep', @@ -410,6 +412,7 @@ URL: [url]', 'email_footer' => 'U kunt altijd uw e-mail instellingen wijzigen via de \'Mijn Account\' opties', 'email_header' => 'Dit is een automatisch gegenereerd bericht van de DMS server.', 'email_not_given' => 'Voer aub een geldig email adres in.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Geen documenten of mappen', 'empty_notify_list' => 'Geen gegevens', 'en_GB' => 'Engels (GB)', @@ -1168,6 +1171,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Dit bepaald de maximale tijd in seconden waarin een script mag worden uitgevoerd, voordat het afgebroken wordt', 'settings_maxRecursiveCount' => 'Max. nummers of recursieve document/map telling', 'settings_maxRecursiveCount_desc' => 'Dit is het maximum aantal documenten of mappen dat zal worden gecontroleerd voor toegangsrechten bij recursieve objecten telling. Als dit aantal is overschreden, zal het aantal documenten en mappen in de het map overzicht worden geschat.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Meer instellingen. Standaard login: admin/admin', 'settings_notfound' => 'Niet gevonden', 'settings_Notification' => 'Notificatie instellingen', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index d3f71b3b2..888f4dd07 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -390,8 +390,10 @@ URL: [url]', 'edit_document_props' => 'Edytuj dokument', 'edit_event' => 'Edytuj zdarzenie', 'edit_existing_access' => 'Edytuj listę dostępu', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Edytuj listę powiadomień', 'edit_folder_access' => 'Edytuj dostęp', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Lista powiadomień dla folderu', 'edit_folder_props' => 'Edytuj folder', 'edit_group' => 'Edytuj grupę', @@ -405,6 +407,7 @@ URL: [url]', 'email_footer' => 'W każdej chwili możesz zmienić swój email używając zakładki \'Moje konto\'.', 'email_header' => 'To jest automatyczne powiadomienie serwera DMS.', 'email_not_given' => 'Proszę podać poprawny adres email.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Nie ma dokumentów lub folderów', 'empty_notify_list' => 'Brak elementów', 'en_GB' => 'Angielski (GB)', @@ -1120,6 +1123,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Ustawia maksymalny czas, liczony w sekundach, jaki ma na wykonanie skrypt zanim zostanie zakończony.', 'settings_maxRecursiveCount' => 'Max. liczba rekurencji dokumentów/folderów', 'settings_maxRecursiveCount_desc' => 'Jest to maksymalna liczba dokumentów i folderów, które będą sprawdzane pod kątem praw dostępu, gdy włączone jest rekurencyjnie liczenie obiektów. Jeżeli liczba ta zostanie przekroczona to ilości dokumentów i folderów w widoku zostaną oszacowane.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Wykonaj dalszą konfigurację. Domyślny login/hasło: admin/admin', 'settings_notfound' => 'Nie znaleziono', 'settings_Notification' => 'Ustawienia powiadomień', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index ce2327cff..0d6f16b30 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -396,8 +396,10 @@ URL: [url]', 'edit_document_props' => 'Editar documento', 'edit_event' => 'Edit event', 'edit_existing_access' => 'Editar lista de acesso.', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Editar lista de notificação', 'edit_folder_access' => 'Editar permissões da pasta', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Lista de notificação', 'edit_folder_props' => 'Editar pasta', 'edit_group' => 'Editar grupo', @@ -411,6 +413,7 @@ URL: [url]', 'email_footer' => 'You can always change your e-mail settings using \'My Account\' functions', 'email_header' => 'This is an automatic menager from the DMS server.', 'email_not_given' => 'Por favor insira um endereço de e-mail válido.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Nenhum documento ou pasta', 'empty_notify_list' => 'Sem entradas', 'en_GB' => 'Inglês (GB)', @@ -1138,6 +1141,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Isso define o tempo máximo em segundos que é permitido executar antes de ser finalizado pelo parse', 'settings_maxRecursiveCount' => 'Max. número de contagem de documentos/pasta recursiva', 'settings_maxRecursiveCount_desc' => 'Este é o número máximo de documentos ou pastas que serão verificados por direitos de acesso, quando recursivamente contar objetos. Se esse número for ultrapassado, será estimado o número de documentos e pastas na visualização da pasta.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Configurar outras configurações. Login padrão: admin/admin', 'settings_notfound' => 'Não encontrado', 'settings_Notification' => 'Configurações de notificação', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 1e8b3bf51..10e7f1906 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -402,8 +402,10 @@ URL: [url]', 'edit_document_props' => 'Editează document', 'edit_event' => 'Editează eveniment', 'edit_existing_access' => 'Editează Lista acces', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Editează lista de notificări', 'edit_folder_access' => 'Editează acces', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Listă de notificare pentru folder', 'edit_folder_props' => 'Editează folder', 'edit_group' => 'Editează grup', @@ -417,6 +419,7 @@ URL: [url]', 'email_footer' => 'Puteți schimba oricând setările de e-mail folosind functionalitatile din \'Contul meu\'', 'email_header' => 'Acesta este un mesaj automat de la serverul DMS.', 'email_not_given' => 'Vă rugăm să introduceți o adresă de email validă.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Nu există documente sau foldere', 'empty_notify_list' => 'Nu există înregistrări', 'en_GB' => 'Engleza (GB)', @@ -1163,6 +1166,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Acesta stabilește timpul maxim în secunde în care un script este permis să ruleze înainte de a fi oprit', 'settings_maxRecursiveCount' => 'Numarul Maxim recursiv de numarare documente/foldere', 'settings_maxRecursiveCount_desc' => 'Acesta este numărul maxim de documente sau foldere care vor fi verificate pentru drepturile de acces, atunci când se numără recursiv obiectele. Dacă acest număr este depășit, numărul de documente și foldere în vizualizarea directorului va fi estimat.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Configurare mai multe setări. Autentificare implicită: admin/admin', 'settings_notfound' => 'Nu a fost găsit', 'settings_Notification' => 'Setările de notificare', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 746e1315a..6055744b7 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -402,8 +402,10 @@ URL: [url]', 'edit_document_props' => 'Изменить документ', 'edit_event' => 'Изменить событие', 'edit_existing_access' => 'Изменить доступ', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Изменить уведомления', 'edit_folder_access' => 'Изменить доступ', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Список уведомления каталога', 'edit_folder_props' => 'Изменить каталог', 'edit_group' => 'Изменить группу', @@ -417,6 +419,7 @@ URL: [url]', 'email_footer' => 'Вы можете изменить e-mail используя меню «Моя учётка».', 'email_header' => 'Это автоматическое уведомление сервера документооборота.', 'email_not_given' => 'Введите настоящий адрес e-mail.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Нет документов или каталогов', 'empty_notify_list' => 'Нет записей', 'en_GB' => 'English (GB)', @@ -1170,6 +1173,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Устанавливает максимальное время выполнения скрипта, перед тем как он будет завершён.', 'settings_maxRecursiveCount' => 'Ограничение рекурсивного подсчёта
документов и каталогов', 'settings_maxRecursiveCount_desc' => 'Максимальное количество документов или каталогов, которые будут проверены на права доступа при рекурсивном подсчёте объектов. При превышении этого количества, будет оценено количество документов и каталогов в виде каталога.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Прочие настройки. Логин по умолчанию: admin/admin', 'settings_notfound' => 'Не найден', 'settings_Notification' => 'Настройки извещения', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 883506a5c..d8a330ae1 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -349,8 +349,10 @@ URL: [url]', 'edit_document_props' => 'Upraviť dokument', 'edit_event' => 'Upraviť udalosť', 'edit_existing_access' => 'Upraviť zoznam riadenia prístupu', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Upraviť zoznam upozornení', 'edit_folder_access' => 'Upraviť prístup', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Zoznam upozornení', 'edit_folder_props' => 'Uprav priečinok', 'edit_group' => 'Upraviť skupinu', @@ -364,6 +366,7 @@ URL: [url]', 'email_footer' => 'Nastavenia e-mailu si kedykoľvek môžete zmeniť cez \'Môj účet\'', 'email_header' => 'Toto je automatická správa od DMS servera.', 'email_not_given' => '', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Žiadne dokumenty alebo priečinky', 'empty_notify_list' => 'Žiadne položky', 'en_GB' => 'Angličtina (UK)', @@ -995,6 +998,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => '', 'settings_maxRecursiveCount' => '', 'settings_maxRecursiveCount_desc' => '', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => '', 'settings_notfound' => '', 'settings_Notification' => '', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 899544cbe..eec4bd2bc 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -390,8 +390,10 @@ URL: [url]', 'edit_document_props' => 'Ändra', 'edit_event' => 'Ändra händelse', 'edit_existing_access' => 'Ändra lista med behörigheter', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Ändra lista med meddelanden', 'edit_folder_access' => 'Ändra behörighet', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Katalog-meddelandelista', 'edit_folder_props' => 'Ändra katalog', 'edit_group' => 'Ändra grupp', @@ -405,6 +407,7 @@ URL: [url]', 'email_footer' => 'Du kan alltid ändra dina e-postinställningar genom att gå till \'Min Sida\'', 'email_header' => 'Detta meddelande skapades automatiskt från dokumentservern.', 'email_not_given' => 'Skriv in en giltig e-postadress.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Inga dokument eller mappar', 'empty_notify_list' => 'Inga meddelanden', 'en_GB' => 'engelska (GB)', @@ -1126,6 +1129,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Detta sätter hösta tillåtna tiden i sekunder som ett skript får på sig att utföras innan det avslutas.', 'settings_maxRecursiveCount' => 'Max antal rekursiva dokument/katalog', 'settings_maxRecursiveCount_desc' => 'Detta är maximum antal av dokument eller katalog som kommer att testas om att det har korrekt rättigheter, när objekt räknas rekursiv. Om detta nummer överskrids, kommer antalet av dokument och katalog i katalogvyn bara bli uppskattat.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Konfigurera flera inställningar. Standard-inloggning: admin/admin', 'settings_notfound' => 'Hittades inte', 'settings_Notification' => 'Meddelandeinställningar', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 1e2013838..0a587dc76 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -396,8 +396,10 @@ URL: [url]', 'edit_document_props' => 'Dokümanı düzenle', 'edit_event' => 'Etkinliği düzenle', 'edit_existing_access' => 'Erişim Listesini Düzenle', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Bildirim listesini düzenle', 'edit_folder_access' => 'Erişimi düzenle', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Klasör Bildirim Listesi', 'edit_folder_props' => 'Klasörü düzenle', 'edit_group' => 'Grubu düzenle', @@ -411,6 +413,7 @@ URL: [url]', 'email_footer' => '\'My Account\' özelliklerini kullanarak her zaman e-posta ayarlarınızı değiştirebilirsiniz', 'email_header' => 'Bu DYS sunucusu tarafından gönderilen otomatik bir mesajdır.', 'email_not_given' => 'Lütfen geçerli bir e-posta adresi giriniz.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Hiç klasör veya doküman yok', 'empty_notify_list' => 'Giriş yok', 'en_GB' => 'İngilizce', @@ -1142,6 +1145,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Durdurulmadan önce bir betikin en fazla kaç saniye çalışabileceğini ayarlar', 'settings_maxRecursiveCount' => 'Maks. özyinelemeli doküman/klasör sayısı', 'settings_maxRecursiveCount_desc' => 'Nesneleri özyinelemeli olarak erişim hakkı kontrolü için sayarken bu değer en fazla sayılacak doküman ve klasör sayısını belirler. Bu sayı aşıldığında klasörün içindeki dosya ve diğer klasörlerin sayısı tahmin yolu ile belirlenecektir.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Daha fazla ayar yapın. Varsayılan kullanıcı adı/parola: admin/admin', 'settings_notfound' => 'Bulunamadı', 'settings_Notification' => 'Bildirim ayarları', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 32e64bff1..b1d969d21 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -402,8 +402,10 @@ URL: [url]', 'edit_document_props' => 'Змінити документ', 'edit_event' => 'Змінити подію', 'edit_existing_access' => 'Змінити доступ', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Змінити сповіщення', 'edit_folder_access' => 'Змінити доступ', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Список сповіщення каталогу', 'edit_folder_props' => 'Змінити каталог', 'edit_group' => 'Змінити групу', @@ -417,6 +419,7 @@ URL: [url]', 'email_footer' => 'Ви можете змінити e-mail використовуючи меню «Мій обліковий запис».', 'email_header' => 'Це автоматичне сповіщення сервера документообігу', 'email_not_given' => 'Введіть справжній e-mail.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Немає документів або каталогів', 'empty_notify_list' => 'Немає записів', 'en_GB' => 'English (GB)', @@ -1163,6 +1166,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Встановлює максимальний час виконання скрипта, перед тим як він буде завершений.', 'settings_maxRecursiveCount' => 'Обмеження рекурсивного підрахунку
документів і каталогів', 'settings_maxRecursiveCount_desc' => 'Максимальна кількість документів і каталогів, які будуть перевірені на права доступу при рекурсивному підрахунку об\'єктів. При перевищенні цієї кількості, буде оцінено кількість документів і каталогів у вигляді каталогу.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Інші налаштування. Логін по замовчуванню: admin/admin', 'settings_notfound' => 'Не знайдено', 'settings_Notification' => 'Налаштування сповіщення', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index cda733cff..31d13c264 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -351,8 +351,10 @@ URL: [url]', 'edit_document_props' => '编辑文档', 'edit_event' => '编辑事件', 'edit_existing_access' => '编辑访问列表', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => '编辑通知列表', 'edit_folder_access' => '编辑访问权限', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => '文件夹通知列表', 'edit_folder_props' => '编辑文件夹', 'edit_group' => '编辑组别', @@ -366,6 +368,7 @@ URL: [url]', 'email_footer' => '您可以用‘我的账户’选项来改变您的e-mail设置', 'email_header' => '这是来自于DMS(文档管理系统)的自动发送消息', 'email_not_given' => '', +'empty_attribute_group_list' => '', 'empty_folder_list' => '没有文件或子目录', 'empty_notify_list' => '没有条目', 'en_GB' => '英语', @@ -997,6 +1000,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => '此设置最长时间，以秒为脚本允许运行之前它是由解析终止', 'settings_maxRecursiveCount' => '', 'settings_maxRecursiveCount_desc' => '', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => '', 'settings_notfound' => '', 'settings_Notification' => '通知设置', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index a8b9370d4..20e66e97a 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -349,8 +349,10 @@ URL: [url]', 'edit_document_props' => '編輯文檔', 'edit_event' => '編輯事件', 'edit_existing_access' => '編輯訪問列表', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => '編輯通知列表', 'edit_folder_access' => '編輯存取權限', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => '資料夾通知列表', 'edit_folder_props' => '編輯資料夾', 'edit_group' => '編輯組別', @@ -364,6 +366,7 @@ URL: [url]', 'email_footer' => '您可以用‘我的帳戶’選項來改變您的e-mail設置', 'email_header' => '這是來自于DMS(文檔管理系統)的自動發送消息', 'email_not_given' => '', +'empty_attribute_group_list' => '', 'empty_folder_list' => '沒有檔或子目錄', 'empty_notify_list' => '沒有條目', 'en_GB' => '英語', @@ -995,6 +998,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => '此設置最長時間，以秒為腳本允許運行之前它是由解析終止', 'settings_maxRecursiveCount' => '', 'settings_maxRecursiveCount_desc' => '', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => '', 'settings_notfound' => '', 'settings_Notification' => '通知設置', From 97e288d054e3f522fccda79c18ae3b80f1c20caf Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 2 Aug 2016 17:21:27 +0200 Subject: [PATCH 04/10] fix typo --- languages/en_GB/lang.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index e01c14b67..5a6f0c10b 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 (1417), dgrutsch (7), netixw (14) +// Translators: Admin (1418), dgrutsch (7), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -1177,7 +1177,7 @@ URL: [url]', 'settings_maxRecursiveCount' => 'Max. number of recursive document/folder count', 'settings_maxRecursiveCount_desc' => 'This is the maximum number of documents or folders that will be checked for access rights, when recursively counting objects. If this number is exceeded, the number of documents and folders in the folder view will be estimated.', 'settings_maxSizeForFullText' => 'Maximum filesize for instant indexing', -'settings_maxSizeForFullText_desc' => 'All new document vresion smaller than the configured size will be fully indexed right after uploading. In all other cases only the metadata will be indexed.', +'settings_maxSizeForFullText_desc' => 'All new document version smaller than the configured size will be fully indexed right after uploading. In all other cases only the metadata will be indexed.', 'settings_more_settings' => 'Configure more settings. Default login: admin/admin', 'settings_notfound' => 'Not found', 'settings_Notification' => 'Notification settings', From ba10acc14cb9aec86228b50bafbd7f3674024fd3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 3 Aug 2016 08:06:25 +0200 Subject: [PATCH 05/10] show group only if admin or a member of that group --- views/bootstrap/class.GroupView.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/views/bootstrap/class.GroupView.php b/views/bootstrap/class.GroupView.php index 279fcdbe5..44b89fddf 100644 --- a/views/bootstrap/class.GroupView.php +++ b/views/bootstrap/class.GroupView.php @@ -60,6 +60,8 @@ $(document).ready( function() { foreach ($allGroups as $group){ + if(!$group->isMember($user) && !$user->isAdmin()) + continue; $members = $group->getUsers(); $managers = $group->getManagers(); $ismanager = false; /* set to true if current user is manager */ @@ -67,11 +69,9 @@ $(document).ready( function() { echo "
  • ".htmlspecialchars($group->getName()); if($group->getComment()) echo " : ".htmlspecialchars($group->getComment()); - foreach($managers as $manager) - if($manager->getId() == $user->getId()) { - echo " : ".getMLText("manager_of_group"); - $ismanager = true; - } + $ismanager = $group->isMember($user, 1); + if($ismanager) + echo " : ".getMLText("manager_of_group"); echo "
    • "; echo "
      \n"; From 7b73a442c2567769185f7f9c93f16bcfb07563cb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 3 Aug 2016 08:06:53 +0200 Subject: [PATCH 06/10] set user image to 100px wide --- views/bootstrap/class.UserList.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.UserList.php b/views/bootstrap/class.UserList.php index 6d57fcf18..8873c0f09 100644 --- a/views/bootstrap/class.UserList.php +++ b/views/bootstrap/class.UserList.php @@ -56,7 +56,7 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style { echo ""; echo ""; if ($currUser->hasImage()) - print ""; + print ""; echo ""; echo ""; echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")
      "; From 6cd0e98618a3eced852ad999a7e2e44cd36ed87c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 3 Aug 2016 08:07:38 +0200 Subject: [PATCH 07/10] make list look like UserList --- views/bootstrap/class.UsrView.php | 36 ++++++++++++++----------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/views/bootstrap/class.UsrView.php b/views/bootstrap/class.UsrView.php index 1c7953c82..d091d5db4 100644 --- a/views/bootstrap/class.UsrView.php +++ b/views/bootstrap/class.UsrView.php @@ -46,36 +46,32 @@ class SeedDMS_View_UsrView extends SeedDMS_Bootstrap_Style { $this->contentHeading(getMLText("users")); $this->contentContainerStart(); - echo "\n"; + echo "
      \n"; echo "\n\n"; + if($enableuserimage) echo "\n"; echo "\n"; - echo "\n"; - echo "\n"; - if ($enableuserimage) echo "\n"; echo "\n\n"; foreach ($users as $currUser) { if ($currUser->isGuest()) continue; - + if ($currUser->isHidden()=="1") continue; - - echo "\n"; - - print ""; - - print ""; - print ""; - - if ($enableuserimage){ - print ""; + + echo ""; + if($enableuserimage) { + echo ""; } - - echo "\n"; + echo ""; + echo ""; } echo "
      ".getMLText("name")."".getMLText("email")."".getMLText("comment")."".getMLText("user_image")."
      ".htmlspecialchars($currUser->getFullName())."getEmail())."\">".htmlspecialchars($currUser->getEmail())."".htmlspecialchars($currUser->getComment()).""; - if ($currUser->hasImage()) print ""; - else printMLText("no_user_image"); - print "
      "; + if ($currUser->hasImage()) + print ""; + echo "
      "; + echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")
      "; + echo "getEmail()."\">".htmlspecialchars($currUser->getEmail())."
      "; + echo "".htmlspecialchars($currUser->getComment()).""; + echo "
      \n"; From fdd369f8ec7f532d0dfbe660f5593549d9040a09 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 3 Aug 2016 08:07:51 +0200 Subject: [PATCH 08/10] add entries for 4.3.28 --- CHANGELOG | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 0120147ae..b20967bcd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,13 @@ -------------------------------------------------------------------------------- - add expiration in list of documents - fix SetReviewersApprovers if reviewer/approver is an admin or the owner +- full text index documents after upload if they are smaller than a configured + size +- reindex documents when versions were added or removed in order to keep the + full text index up to date +- show only those groups in GroupView the current user is a member of (partly + fixes #239) +- make UserView look similar to UserList -------------------------------------------------------------------------------- Changes in version 4.3.27 From 06347ff2125343dda7a3ac315a63523f21d38f02 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 3 Aug 2016 08:53:14 +0200 Subject: [PATCH 09/10] check for HTTP_X_FORWARDED_FOR in add_log_line() use it instead of REMOTE_ADDR --- inc/inc.Utils.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php index 08b10bc35..25e6f47e2 100644 --- a/inc/inc.Utils.php +++ b/inc/inc.Utils.php @@ -322,10 +322,14 @@ function add_log_line($msg="", $priority=null) { /* {{{ */ if(!$logger) return; - if($user) - $logger->log($user->getLogin()." (".$_SERVER['REMOTE_ADDR'].") ".basename($_SERVER["REQUEST_URI"], ".php").$msg, $priority); + if(!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) + $ip = $_SERVER['HTTP_X_FORWARDED_FOR']; else - $logger->log("-- (".$_SERVER['REMOTE_ADDR'].") ".basename($_SERVER["REQUEST_URI"], ".php").$msg, $priority); + $ip = $_SERVER['REMOTE_ADDR']; + if($user) + $logger->log($user->getLogin()." (".$ip.") ".basename($_SERVER["REQUEST_URI"], ".php").$msg, $priority); + else + $logger->log("-- (".$ip.") ".basename($_SERVER["REQUEST_URI"], ".php").$msg, $priority); } /* }}} */ function _add_log_line($msg="") { /* {{{ */ From 0fdc68e7f7a78c52de93b676464168301becc70a Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 3 Aug 2016 08:53:58 +0200 Subject: [PATCH 10/10] add entry for 4.3.28 (fix for #206) --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index b20967bcd..3c870e46b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,7 @@ - show only those groups in GroupView the current user is a member of (partly fixes #239) - make UserView look similar to UserList +- log correct ip even after a reverse proxy (Closes #206) -------------------------------------------------------------------------------- Changes in version 4.3.27