Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

CHANGELOG

@@ -41,6 +41,14 @@
 --------------------------------------------------------------------------------
 - 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
+- log correct ip even after a reverse proxy (Closes #206)
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.27

inc/inc.ClassSettings.php

@@ -93,6 +93,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
@@ -188,7 +190,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
@@ -389,6 +391,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"]);
@@ -686,6 +689,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);

inc/inc.Utils.php

@@ -355,10 +355,14 @@ function add_log_line($msg="", $priority=null) { /* {{{ */
 
 	if(!$logger) return;
 
-	if($user)
+	if(!empty($_SERVER['HTTP_X_FORWARDED_FOR']))
-		$logger->log($user->getLogin()." (".$_SERVER['REMOTE_ADDR'].") ".basename($_SERVER["REQUEST_URI"], ".php").$msg, $priority);
+		$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="") { /* {{{ */

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' => '',

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' => 'Настройка за известяване',

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' => '',

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í',

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',

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 (1418), 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 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',

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',

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',

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',

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',

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',

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' => '알림 설정',

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',

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ń',

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',

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',

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' => 'Ограничение рекурсивного подсчёта<br/>документов и каталогов',
 'settings_maxRecursiveCount_desc' => 'Максимальное количество документов или каталогов, которые будут проверены на права доступа при рекурсивном подсчёте объектов. При превышении этого количества, будет оценено количество документов и каталогов в виде каталога.',
+'settings_maxSizeForFullText' => '',
+'settings_maxSizeForFullText_desc' => '',
 'settings_more_settings' => 'Прочие настройки. Логин по умолчанию: admin/admin',
 'settings_notfound' => 'Не найден',
 'settings_Notification' => 'Настройки извещения',

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' => '',

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',

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ı',

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' => 'Обмеження рекурсивного підрахунку<br/>документів і каталогів',
 'settings_maxRecursiveCount_desc' => 'Максимальна кількість документів і каталогів, які будуть перевірені на права доступу при рекурсивному підрахунку об\'єктів. При перевищенні цієї кількості, буде оцінено кількість документів і каталогів у вигляді каталогу.',
+'settings_maxSizeForFullText' => '',
+'settings_maxSizeForFullText_desc' => '',
 'settings_more_settings' => 'Інші налаштування. Логін по замовчуванню: admin/admin',
 'settings_notfound' => 'Не знайдено',
 'settings_Notification' => 'Налаштування сповіщення',

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' => '通知设置',

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' => '通知設置',

op/op.AddDocument.php

@@ -295,6 +295,7 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 		}
 	}
 
+	$filesize = SeedDMS_Core_File::fileSize($userfiletmp);
 	$res = $folder->addDocument($name, $comment, $expires, $user, $keywords,
 															$cats, $userfiletmp, basename($userfilename),
 	                            $fileType, $userfiletype, $sequence,
@@ -316,7 +317,7 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 			$index = $indexconf['Indexer']::open($settings->_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)));
 			}
 		}
 

op/op.RemoveVersion.php

@@ -69,6 +69,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";
@@ -117,6 +129,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();

op/op.Settings.php

@@ -70,8 +70,9 @@ if ($action == "saveSettings")
   $settings->_enableEmail =getBoolValue("enableEmail");
   $settings->_enableUsersView = getBoolValue("enableUsersView");
   $settings->_enableFullSearch = getBoolValue("enableFullSearch");
-	$settings->_fullSearchEngine = $_POST["fullSearchEngine"];
+  $settings->_maxSizeForFullText = intval($_POST["maxSizeForFullText"]);
-	$settings->_defaultSearchMethod = $_POST["defaultSearchMethod"];
+  $settings->_fullSearchEngine = $_POST["fullSearchEngine"];
+  $settings->_defaultSearchMethod = $_POST["defaultSearchMethod"];
   $settings->_enableClipboard = getBoolValue("enableClipboard");
   $settings->_enableDropUpload = getBoolValue("enableDropUpload");
   $settings->_enableFolderTree = getBoolValue("enableFolderTree");
@@ -81,9 +82,9 @@ if ($action == "saveSettings")
   $settings->_enableHelp = getBoolValue("enableHelp");
   $settings->_enableThemeSelector = getBoolValue("enableThemeSelector");
   $settings->_expandFolderTree = intval($_POST["expandFolderTree"]);
-	$settings->_stopWordsFile = $_POST["stopWordsFile"];
+  $settings->_stopWordsFile = $_POST["stopWordsFile"];
-	$settings->_sortUsersInList = $_POST["sortUsersInList"];
+  $settings->_sortUsersInList = $_POST["sortUsersInList"];
-	$settings->_sortFoldersDefault = $_POST["sortFoldersDefault"];
+  $settings->_sortFoldersDefault = $_POST["sortFoldersDefault"];
 
   // SETTINGS - SITE - CALENDAR
   $settings->_enableCalendar = getBoolValue("enableCalendar");

op/op.UpdateDocument.php

@@ -229,11 +229,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();

op/op.UpdateDocument2.php

@@ -152,34 +152,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();
@@ -207,20 +202,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();

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 "<li>".htmlspecialchars($group->getName());
 			if($group->getComment())
 				echo " : ".htmlspecialchars($group->getComment());
-			foreach($managers as $manager)
+			$ismanager = $group->isMember($user, 1);
-				if($manager->getId() == $user->getId()) {
+			if($ismanager)
-					echo " : ".getMLText("manager_of_group");
+				echo " : ".getMLText("manager_of_group");
-					$ismanager = true;
-				}
 			echo "</li>";
 
 			echo "<ul>\n";

views/bootstrap/class.Settings.php

@@ -207,6 +207,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_enableFullSearch");?>:</td>
         <td><input name="enableFullSearch" type="checkbox" <?php if ($settings->_enableFullSearch) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_maxSizeForFullText_desc");?>">
+        <td><?php printMLText("settings_maxSizeForFullText");?>:</td>
+        <td><?php $this->showTextField("maxSizeForFullText", $settings->_maxSizeForFullText); ?></td>
+      </tr>
       <tr title="<?php printMLText("settings_fullSearchEngine_desc");?>">
         <td><?php printMLText("settings_fullSearchEngine");?>:</td>
 				<td>

views/bootstrap/class.UserList.php

@@ -56,7 +56,7 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 			echo "<tr>";
 			echo "<td>";
 			if ($currUser->hasImage())
-				print "<img width=\"50\" src=\"".$httproot . "out/out.UserImage.php?userid=".$currUser->getId()."\">";
+				print "<img width=\"100\" src=\"".$httproot . "out/out.UserImage.php?userid=".$currUser->getId()."\">";
 			echo "</td>";
 			echo "<td>";
 			echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")<br />";

views/bootstrap/class.UsrView.php

@@ -46,36 +46,32 @@ class SeedDMS_View_UsrView extends SeedDMS_Bootstrap_Style {
 		$this->contentHeading(getMLText("users"));
 		$this->contentContainerStart();
 
-		echo "<table class=\"table-condensed\">\n";
+		echo "<table class=\"table table-condensed\">\n";
 		echo "<thead>\n<tr>\n";
+		if($enableuserimage) echo "<th></th>\n";
 		echo "<th>".getMLText("name")."</th>\n";
-		echo "<th>".getMLText("email")."</th>\n";
-		echo "<th>".getMLText("comment")."</th>\n";
-		if ($enableuserimage) echo "<th>".getMLText("user_image")."</th>\n";
 		echo "</tr>\n</thead>\n";
 
 		foreach ($users as $currUser) {
 
 			if ($currUser->isGuest())
 				continue;
-				
+
 			if ($currUser->isHidden()=="1") continue;
-				
+
-			echo "<tr>\n";
+			echo "<tr>";
-			
+			if($enableuserimage) {
-			print "<td>".htmlspecialchars($currUser->getFullName())."</td>";
+				echo "<td>";
-			
+				if ($currUser->hasImage())
-			print "<td><a href=\"mailto:".htmlspecialchars($currUser->getEmail())."\">".htmlspecialchars($currUser->getEmail())."</a></td>";
+					print "<img width=\"100\" src=\"".$httproot . "out/out.UserImage.php?userid=".$currUser->getId()."\">";
-			print "<td>".htmlspecialchars($currUser->getComment())."</td>";
+				echo "</td>";
-			
-			if ($enableuserimage){
-				print "<td>";
-				if ($currUser->hasImage()) print "<img src=\"".$httproot . "out/out.UserImage.php?userid=".$currUser->getId()."\">";
-				else printMLText("no_user_image");
-				print "</td>";	
 			}
-			
+			echo "<td>";
-			echo "</tr>\n";
+			echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")<br />";
+			echo "<a href=\"mailto:".$currUser->getEmail()."\">".htmlspecialchars($currUser->getEmail())."</a><br />";
+			echo "<small>".htmlspecialchars($currUser->getComment())."</small>";
+			echo "</td>";
+			echo "</tr>";
 		}
 
 		echo "</table>\n";