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

CHANGELOG

@@ -26,12 +26,14 @@
                      Changes in version 5.1.0
 --------------------------------------------------------------------------------
 - added support for postgresql
+- document attachments can linked to a version and be public or hidden
 
 --------------------------------------------------------------------------------
                      Changes in version 5.0.10
 --------------------------------------------------------------------------------
 - merged changes from 4.3.33
 - new javascript base calendar
+- overhaul indexing of documents
 
 --------------------------------------------------------------------------------
                      Changes in version 5.0.9

SeedDMS_Core/Core/inc.ClassDMS.php

@@ -2965,7 +2965,7 @@ class SeedDMS_Core_DMS {
 			$endts = $startts+86400;
 		$timeline = array();
 
-		$queryStr = "SELECT DISTINCT `document` FROM `tblDocumentContent` WHERE `date` > ".$startts." AND `date` < ".$endts." UNION SELECT DISTINCT `document` FROM `tblDocumentFiles` WHERE `date` > ".$startts." AND `date` < ".$endts;
+		$queryStr = "SELECT DISTINCT document FROM `tblDocumentContent` WHERE `date` > ".$startts." AND `date` < ".$endts." UNION SELECT DISTINCT document FROM `tblDocumentFiles` WHERE `date` > ".$startts." AND `date` < ".$endts;
 		$resArr = $this->db->getResultArray($queryStr);
 		if ($resArr === false)
 			return false;

controllers/class.AddDocument.php

@@ -87,7 +87,10 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 			}
 
 			if($index) {
-				$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $maxsizeforfulltext)));
+				$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText));
+				if(!$this->callHook('preIndexDocument', $document, $idoc)) {
+				}
+				$index->addDocument($idoc);
 			}
 
 			/* Add a default notification for the owner of the document */

doc/README.Extensions

@@ -1,5 +1,5 @@
 Extensions in SeedDMS
-====================
+=====================
 
 Since verson 5.0.0 SeedDMS can be extended by extensions. Extensions
 can hook up functions into certain operations, e.g.

doc/README.Hooks

@@ -0,0 +1,85 @@
+Hooks
+======
+
+Attention: the api for hooks isn't stable yet!
+
+Hooks in SeedDMS are user definied methods which are being called by
+the application. The SeedDMS Core also has hooks which are being
+called from the core itself. They are not subject of this document.
+The SeedDMS application distinguishes between
+
+* view hooks and
+* controller hooks
+
+view hooks usually return some html output which is send to the browser
+and either replaces the default output or adds additional information.
+A view hooks which returns false will be considered as not being called
+at all.
+
+controller hooks implement additional functions which either replace
+existing functions or add new ones. If such a hook returns null then
+this is treated as if the hook was not called. If the hook returns
+false it will prevent other hooks implementing the same function from
+being called. All other return values will not stop other hooks from
+being called.
+
+Currently available controller hooks
+------------------------------------
+AddDocument::preAddDocument
+  Called before a new document will be added
+
+AddDocument::postAddDocument
+  Called after a new document has been added
+
+AddDocument::preIndexDocument
+  Called before a new document will be indexed
+
+UpdateDocument::preUpdateDocument
+  Called before a new document will be updated
+
+UpdateDocument::postUpdateDocument
+  Called after a new document has been updated
+
+UpdateDocument::preIndexDocument
+  Called before an updated document will be indexed
+
+RemoveDocument::preRemoveDocument
+  Called before a document will be removed
+
+RemoveDocument::removeDocument
+  Called for removing the document. If the hook returns null the
+  regular document removal will happen.
+
+RemoveDocument::postRemoveDocument
+  Called after a document was removed
+
+RemoveFolder::preRemoveFolder
+  Called before a document will be removed
+
+RemoveFolder::removeFolder
+  Called for removing the folder. If the hook returns null the
+  regular folder removal will happen.
+
+RemoveFolder::postRemoveFolder
+  Called after a document was removed
+
+EditFolder::preEditFolder
+
+EditFolder::EditFolder
+
+EditFolder::postEditFolder
+
+ViewOnline::version
+  Called when a document is downloaded for online view
+
+Download::version
+  Called when a document is downloaded for saving on disk
+
+Login::postLogin
+  Called after user in fully logged in
+
+Logout::postLogout
+  Called after user is logged out
+
+Currently available view hooks
+------------------------------------

doc/README.Notification

@@ -108,7 +108,6 @@ op/op.TriggerWorkflow.php
 * Workflow transition was triggered
   subscribers of the document
 
-op/op.UpdateDocument2.php
 op/op.UpdateDocument.php
 * document was updated
   subscribers of the document

doc/README.Translation

@@ -0,0 +1,42 @@
+Help translating SeedDMS
+===========================
+
+SeedDMS has got many translations over the years and it is a major
+task to keep them all updated. If you would like to give a helping
+hand, then this will be much appreciated. There are various ways
+to contribute translations.
+
+1. The demo version of SeedDMS at https://demo.seeddms.org will list
+all missing translations in a formular on the bottom of the page
+while using the software. You can easily provide a missing translation
+by filling out the form and submitting it. The translation will not
+instantly be used, but is taken over into the official version of
+SeedDMS once in a while. This method does not allow to submit corrected
+translations of existing phrases.
+
+2. Fixing translations is only possible by modifying one of the language
+files in `lanuages/xx_XX/lang.inc`. These files are php files containing
+one large array named `$text`. Any modification will be visible right away
+in your SeedDMS installation. If you intend to pass your modifications to
+the developers of SeedDMS, than keep your changes seperate from the
+original translation. A good way is to put your changes into a new
+file, e.g. `lang-local.inc` containing an array named `$text_local` and
+merge that array with the original translation array. Just put at the
+end of `lanuages/xx_XX/lang.inc` the follwing code:
+
+  include('lang-local.inc');
+	array_merge($text, $text_local);
+
+Also create the file `lang-local.inc` with the content
+
+  <?php
+	$text_local = array(
+		'xxx' => 'yyy',
+	);
+	?>
+
+Once you are ready with your local modifications and you think those are
+good enough for the public version of SeedDMS, then please mail them to
+info@seeddms.org
+
+

languages/ar_EG/lang.inc

@@ -541,8 +541,13 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'اشمل مستندات',
 'include_subdirectories' => 'اشمل مجلدات فرعية',
+'indexing_tasks_in_queue' => '',
 'index_converters' => 'فهرس تحويل المستند',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => 'ﻒﻫﺮﺳﺓ ﺎﻠﻤﺠﻟﺩ',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => 'افراد',
 'indivіduals_in_groups' => '',
 'inherited' => 'موروث',
@@ -761,6 +766,7 @@ URL: [url]',
 'only_jpg_user_images' => 'فقط يمكنك استخدام ملفات من تنسيق jpg كصورة المستخدم',
 'order_by_sequence_off' => '',
 'original_filename' => 'اسم الملف الاصلي',
+'overall_indexing_progress' => '',
 'owner' => 'المالك',
 'ownership_changed_email' => 'تم تغيير المالك',
 'ownership_changed_email_body' => 'تم تغيير المالك
@@ -1321,9 +1327,11 @@ URL: [url]',
 'splash_document_added' => '',
 'splash_document_checkedout' => '',
 'splash_document_edited' => '',
+'splash_document_indexed' => '',
 'splash_document_locked' => 'تم قفل المستند',
 'splash_document_unlocked' => 'تم الغاء قفل المستند',
 'splash_edit_attribute' => '',
+'splash_edit_event' => '',
 'splash_edit_group' => '',
 'splash_edit_role' => '',
 'splash_edit_user' => '',

languages/bg_BG/lang.inc

@@ -472,8 +472,13 @@ $text = array(
 'include_content' => '',
 'include_documents' => 'Включи документи',
 'include_subdirectories' => 'Включи под-папки',
+'indexing_tasks_in_queue' => '',
 'index_converters' => 'Index document conversion',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => '',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => 'Личности',
 'indivіduals_in_groups' => '',
 'inherited' => 'наследен',
@@ -668,6 +673,7 @@ $text = array(
 'only_jpg_user_images' => 'Разрешени са само .jpg-изображения',
 'order_by_sequence_off' => '',
 'original_filename' => 'Оригинално име на файл',
+'overall_indexing_progress' => '',
 'owner' => 'Собственик',
 'ownership_changed_email' => 'Собственикът променен',
 'ownership_changed_email_body' => '',
@@ -1186,9 +1192,11 @@ $text = array(
 'splash_document_added' => '',
 'splash_document_checkedout' => '',
 'splash_document_edited' => '',
+'splash_document_indexed' => '',
 'splash_document_locked' => '',
 'splash_document_unlocked' => '',
 'splash_edit_attribute' => '',
+'splash_edit_event' => '',
 'splash_edit_group' => '',
 'splash_edit_role' => '',
 'splash_edit_user' => '',

languages/ca_ES/lang.inc

@@ -477,8 +477,13 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'Incloure documents',
 'include_subdirectories' => 'Incloure subdirectoris',
+'indexing_tasks_in_queue' => '',
 'index_converters' => '',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => 'Carpeta d\'índex',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => 'Individuals',
 'indivіduals_in_groups' => '',
 'inherited' => '',
@@ -673,6 +678,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Només pot utilitzar imatges .jpg com imatges d\'usuari',
 'order_by_sequence_off' => '',
 'original_filename' => '',
+'overall_indexing_progress' => '',
 'owner' => 'Propietari/a',
 'ownership_changed_email' => 'Propietari/a canviat',
 'ownership_changed_email_body' => '',
@@ -1191,9 +1197,11 @@ URL: [url]',
 'splash_document_added' => '',
 'splash_document_checkedout' => '',
 'splash_document_edited' => '',
+'splash_document_indexed' => '',
 'splash_document_locked' => 'Document blocat',
 'splash_document_unlocked' => 'Document desblocat',
 'splash_edit_attribute' => '',
+'splash_edit_event' => '',
 'splash_edit_group' => '',
 'splash_edit_role' => '',
 'splash_edit_user' => '',

languages/cs_CZ/lang.inc

@@ -548,8 +548,13 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'Včetně dokumentů',
 'include_subdirectories' => 'Včetně podadresářů',
+'indexing_tasks_in_queue' => '',
 'index_converters' => 'Index konverze dokumentu',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => 'Složka indexu',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => 'Jednotlivci',
 'indivіduals_in_groups' => '',
 'inherited' => 'Zděděno',
@@ -768,6 +773,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Pro obrázky uživatelů je možné použít pouze obrázky .jpg',
 'order_by_sequence_off' => '',
 'original_filename' => 'Originální název souboru',
+'overall_indexing_progress' => '',
 'owner' => 'Vlastník',
 'ownership_changed_email' => 'Vlastník změněn',
 'ownership_changed_email_body' => 'Vlastník změněn
@@ -1330,9 +1336,11 @@ URL: [url]',
 'splash_document_added' => 'Dokument přidán',
 'splash_document_checkedout' => '',
 'splash_document_edited' => 'Dokument uložen',
+'splash_document_indexed' => '',
 'splash_document_locked' => 'Dokument zamčen',
 'splash_document_unlocked' => 'Dokument odemčen',
 'splash_edit_attribute' => 'Atribut uložen',
+'splash_edit_event' => '',
 'splash_edit_group' => 'Skupina uložena',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Uživatel uložen',

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 (2368), dgrutsch (22)
+//    Translators: Admin (2376), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -553,8 +553,13 @@ URL: [url]',
 'include_content' => 'Inhalte mit exportieren',
 'include_documents' => 'Dokumente miteinbeziehen',
 'include_subdirectories' => 'Unterverzeichnisse miteinbeziehen',
+'indexing_tasks_in_queue' => 'Indiziervorgänge in der Warteschleife',
 'index_converters' => 'Index Dokumentenumwandlung',
+'index_done' => 'Fertig',
+'index_error' => 'Fehler',
 'index_folder' => 'Indiziere Ordner',
+'index_pending' => 'Vorgemerkt',
+'index_waiting' => 'Warte',
 'individuals' => 'Einzelpersonen',
 'indivіduals_in_groups' => 'Mitglieder einer Gruppe',
 'inherited' => 'geerbt',
@@ -772,6 +777,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Es sind nur JPG-Bilder erlaubt',
 'order_by_sequence_off' => 'Die Sortierung nach Folge ist in den Einstellungen ausgeschaltet. Wenn dieser Parameter wirksam sein soll, muss sie wieder eingeschaltet werden.',
 'original_filename' => 'Original filename',
+'overall_indexing_progress' => 'Gesamtfortschritt bei der Indizierung',
 'owner' => 'Besitzer',
 'ownership_changed_email' => 'Besitzer geändert',
 'ownership_changed_email_body' => 'Besitzer geändert
@@ -1380,9 +1386,11 @@ URL: [url]',
 'splash_document_added' => 'Dokument hinzugefügt',
 'splash_document_checkedout' => 'Dokument ausgecheckt',
 'splash_document_edited' => 'Dokument gespeichert',
+'splash_document_indexed' => 'Dokument \'[name]\' indiziert.',
 'splash_document_locked' => 'Dokument gesperrt',
 'splash_document_unlocked' => 'Dokumentensperre aufgehoben',
 'splash_edit_attribute' => 'Attribut gespeichert',
+'splash_edit_event' => 'Ereignis gespeichert',
 'splash_edit_group' => 'Gruppe gespeichert',
 'splash_edit_role' => 'Rolle gespeichert',
 'splash_edit_user' => 'Benutzer gespeichert',

languages/el_GR/lang.inc

@@ -472,8 +472,13 @@ $text = array(
 'include_content' => '',
 'include_documents' => '',
 'include_subdirectories' => '',
+'indexing_tasks_in_queue' => '',
 'index_converters' => '',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => '',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => 'Άτομα',
 'indivіduals_in_groups' => '',
 'inherited' => '',
@@ -679,6 +684,7 @@ URL: [url]',
 'only_jpg_user_images' => '',
 'order_by_sequence_off' => '',
 'original_filename' => '',
+'overall_indexing_progress' => '',
 'owner' => 'Ιδιοκτήτης',
 'ownership_changed_email' => '',
 'ownership_changed_email_body' => '',
@@ -1197,9 +1203,11 @@ URL: [url]',
 'splash_document_added' => '',
 'splash_document_checkedout' => '',
 'splash_document_edited' => '',
+'splash_document_indexed' => '',
 'splash_document_locked' => '',
 'splash_document_unlocked' => '',
 'splash_edit_attribute' => '',
+'splash_edit_event' => '',
 'splash_edit_group' => '',
 'splash_edit_role' => '',
 'splash_edit_user' => '',

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 (1495), dgrutsch (9), netixw (14)
+//    Translators: Admin (1503), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -553,8 +553,13 @@ URL: [url]',
 'include_content' => 'Include content',
 'include_documents' => 'Include documents',
 'include_subdirectories' => 'Include subdirectories',
+'indexing_tasks_in_queue' => 'Indexing tasks in queue',
 'index_converters' => 'Index document conversion',
+'index_done' => 'Done',
+'index_error' => 'Error',
 'index_folder' => 'Index folder',
+'index_pending' => 'Pending',
+'index_waiting' => 'Waiting',
 'individuals' => 'Individuals',
 'indivіduals_in_groups' => 'Members of a group',
 'inherited' => 'inherited',
@@ -773,6 +778,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Only .jpg-images may be used as user-images',
 'order_by_sequence_off' => 'Ordering by sequence is turned off in the settings. If you want this parameter to have effect, you will have to turn it back on.',
 'original_filename' => 'Original filename',
+'overall_indexing_progress' => 'Overall indexing progress',
 'owner' => 'Owner',
 'ownership_changed_email' => 'Owner changed',
 'ownership_changed_email_body' => 'Owner changed
@@ -1374,9 +1380,11 @@ URL: [url]',
 'splash_document_added' => 'Document added',
 'splash_document_checkedout' => 'Document checked out',
 'splash_document_edited' => 'Document saved',
+'splash_document_indexed' => 'Document \'[name]\' indexed.',
 'splash_document_locked' => 'Document locked',
 'splash_document_unlocked' => 'Document unlocked',
 'splash_edit_attribute' => 'Attribute saved',
+'splash_edit_event' => 'Event saved',
 'splash_edit_group' => 'Group saved',
 'splash_edit_role' => 'Role saved',
 'splash_edit_user' => 'User saved',

languages/es_ES/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: acabello (20), Admin (1008), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1009), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -548,8 +548,13 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'Incluir documentos',
 'include_subdirectories' => 'Incluir subcarpetas',
+'indexing_tasks_in_queue' => '',
 'index_converters' => 'Conversión de índice de documentos',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => 'Índice de carpetas',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => 'Individuales',
 'indivіduals_in_groups' => '',
 'inherited' => 'heredado',
@@ -625,7 +630,7 @@ URL: [url]',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Si desea subir archivos mayores que el tamaño máximo actualmente permitido, por favor, utilice la <a href="%s">página de subida</a> alternativa.',
 'link_to_version' => '',
-'list_access_rights' => '',
+'list_access_rights' => 'Listar los derechos de acceso',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Fichero local',
@@ -768,6 +773,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Sólo puede usar imágenes .jpg como imágenes de usuario',
 'order_by_sequence_off' => 'El orden secuencial está desactivado en la configuración. Si quiere utilizar este parámetro, deberá activarlo.',
 'original_filename' => 'Nombre de fichero original',
+'overall_indexing_progress' => '',
 'owner' => 'Propietario',
 'ownership_changed_email' => 'Propietario modificado',
 'ownership_changed_email_body' => 'Propietario modificado
@@ -1336,9 +1342,11 @@ URL: [url]',
 'splash_document_added' => 'Documento añadido',
 'splash_document_checkedout' => '',
 'splash_document_edited' => 'Documento guardado',
+'splash_document_indexed' => '',
 'splash_document_locked' => 'Documento bloqueado',
 'splash_document_unlocked' => 'Documento desbloqueado',
 'splash_edit_attribute' => 'Atributo guardado',
+'splash_edit_event' => '',
 'splash_edit_group' => 'Grupo guardado',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Usuario guardado',

languages/fr_FR/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1058), jeromerobert (50), lonnnew (9), Oudiceval (182)
+//    Translators: Admin (1060), jeromerobert (50), lonnnew (9), Oudiceval (182)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -553,8 +553,13 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'Inclure les documents',
 'include_subdirectories' => 'Inclure les sous-dossiers',
+'indexing_tasks_in_queue' => '',
 'index_converters' => 'Conversion de document Index',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => 'Dossier Index',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => 'Individuels',
 'indivіduals_in_groups' => '',
 'inherited' => 'hérité',
@@ -773,6 +778,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Images d\'utilisateur au format .jpg seulement',
 'order_by_sequence_off' => 'Le tri par séquence est désactivé dans les préférences. Si vous souhaitez que ce paramètre prenne effet, vous devez l\'activer.',
 'original_filename' => 'Nom de fichier original',
+'overall_indexing_progress' => '',
 'owner' => 'Propriétaire',
 'ownership_changed_email' => 'Propriétaire modifié',
 'ownership_changed_email_body' => 'Propriétaire modifié
@@ -1126,8 +1132,8 @@ URL: [url]',
 'settings_enableThemeSelector_desc' => 'Activer/désactiver le sélecteur de thème sur la page de connexion.',
 'settings_enableUpdateReceipt' => '',
 'settings_enableUpdateReceipt_desc' => '',
-'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp' => 'Autorise la modification de révisions et approbations existantes',
-'settings_enableUpdateRevApp_desc' => '',
+'settings_enableUpdateRevApp_desc' => 'A activer si l\'utilisateur qui a fait la révision/approbations peut changer sa position alors que l\'étape actuelle du processus n\'est pas terminée',
 'settings_enableUserImage' => 'Activer image utilisateurs',
 'settings_enableUserImage_desc' => 'Activer les images utilisateurs',
 'settings_enableUsersView' => 'Activer Vue des Utilisateurs',
@@ -1324,9 +1330,11 @@ URL: [url]',
 'splash_document_added' => 'Document ajouté',
 'splash_document_checkedout' => 'Document bloqué',
 'splash_document_edited' => 'Document sauvegardé',
+'splash_document_indexed' => '',
 'splash_document_locked' => 'Document vérouillé',
 'splash_document_unlocked' => 'Document déverrouillé',
 'splash_edit_attribute' => 'Attribut modifié',
+'splash_edit_event' => '',
 'splash_edit_group' => 'Groupe sauvé',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Utilisateur modifié',

languages/hr_HR/lang.inc

@@ -553,8 +553,13 @@ Internet poveznica: [url]',
 'include_content' => 'Uključi sadržaj',
 'include_documents' => 'Sadrži dokumente',
 'include_subdirectories' => 'Sadrži podmape',
+'indexing_tasks_in_queue' => '',
 'index_converters' => 'Pretvorba indeksa dokumenta',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => 'Mapa indeksa',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => 'Pojedinci',
 'indivіduals_in_groups' => '',
 'inherited' => 'naslijeđeno',
@@ -772,6 +777,7 @@ Internet poveznica: [url]',
 'only_jpg_user_images' => 'Kao korisničke slike mogu se koristiti samo .jpg slike',
 'order_by_sequence_off' => 'Sortiranje po sekvencei ne isključeno u postavkama. Ako želite da ovaj parametar ima utjecaja, morat ćete ga ponovno uključiti.',
 'original_filename' => 'Izvorni naziv datoteke',
+'overall_indexing_progress' => '',
 'owner' => 'Vlasnik',
 'ownership_changed_email' => 'Promijenjen vlasnik',
 'ownership_changed_email_body' => 'Promijenjen vlasnik
@@ -1357,9 +1363,11 @@ Internet poveznica: [url]',
 'splash_document_added' => 'Dokument dodan',
 'splash_document_checkedout' => 'Dokument odjavljen',
 'splash_document_edited' => 'Dokument pohranjen',
+'splash_document_indexed' => '',
 'splash_document_locked' => 'Dokument zaključan',
 'splash_document_unlocked' => 'Dokument otključan',
 'splash_edit_attribute' => 'Atribut pohranjen',
+'splash_edit_event' => '',
 'splash_edit_group' => 'Groupa pohranjena',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Korisnik pohranjen',

languages/hu_HU/lang.inc

@@ -548,8 +548,13 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'Tartalmazó dokumentumok',
 'include_subdirectories' => 'Tartalmazó alkönyvtárak',
+'indexing_tasks_in_queue' => '',
 'index_converters' => 'Index dokumentum konverzió',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => 'Mappa indexelése',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => 'Egyedek',
 'indivіduals_in_groups' => '',
 'inherited' => 'örökölt',
@@ -768,6 +773,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Felhasználói képként csak .jpg állományok adhatók meg',
 'order_by_sequence_off' => '',
 'original_filename' => 'Eredeti fájlnév',
+'overall_indexing_progress' => '',
 'owner' => 'Tulajdonos',
 'ownership_changed_email' => 'Tulajdonos megváltozott',
 'ownership_changed_email_body' => 'Tulajdonos megváltozott
@@ -1335,9 +1341,11 @@ URL: [url]',
 'splash_document_added' => '',
 'splash_document_checkedout' => '',
 'splash_document_edited' => 'Dokumentum elmentve',
+'splash_document_indexed' => '',
 'splash_document_locked' => 'Dokumentum zárolva',
 'splash_document_unlocked' => 'Dokumentum zárolás feloldva',
 'splash_edit_attribute' => 'Jellemző mentve',
+'splash_edit_event' => '',
 'splash_edit_group' => 'Csoport mentve',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Felhasználó mentve',

languages/it_IT/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1537), rickr (144), s.pnt (26)
+//    Translators: Admin (1538), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -554,8 +554,13 @@ URL: [url]',
 'include_content' => 'Includi contenuto',
 'include_documents' => 'Includi documenti',
 'include_subdirectories' => 'Includi sottocartelle',
+'indexing_tasks_in_queue' => '',
 'index_converters' => 'Indice di conversione documenti',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => 'Indicizza cartella',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => 'Singoli',
 'indivіduals_in_groups' => 'I membri de la gruppo',
 'inherited' => 'ereditato',
@@ -774,6 +779,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Possono essere utilizzate solo immagini di tipo jpeg',
 'order_by_sequence_off' => 'Ordina in sequenza disabilitato',
 'original_filename' => 'Nome file originale',
+'overall_indexing_progress' => '',
 'owner' => 'Proprietario',
 'ownership_changed_email' => 'Proprietario cambiato',
 'ownership_changed_email_body' => 'Cambio di proprietario
@@ -1056,7 +1062,7 @@ URL: [url]',
 'settings_Authentication' => 'Impostazioni di Autenticazione',
 'settings_autoLoginUser' => 'Login automatico',
 'settings_autoLoginUser_desc' => 'Utilizzare questo ID utente per l\'accesso se l\'utente non è già connesso. Questo tipo di accesso non creerà una sessione.',
-'settings_available_languages' => '',
+'settings_available_languages' => 'Lingue disponibili',
 'settings_available_languages_desc' => '',
 'settings_backupDir' => 'Directory di backup',
 'settings_backupDir_desc' => 'Directory in cui lo strumento di backup salva i backup. Se questa directory non è impostato o non è possibile accedervi, quindi i backup vengono salvati nella directory dei contenuti.',
@@ -1369,9 +1375,11 @@ URL: [url]',
 'splash_document_added' => 'Documento aggiunto',
 'splash_document_checkedout' => 'Documento approvato',
 'splash_document_edited' => 'Documento modificato',
+'splash_document_indexed' => '',
 'splash_document_locked' => 'Documento bloccato',
 'splash_document_unlocked' => 'Documento sbloccato',
 'splash_edit_attribute' => 'Attributo modificato',
+'splash_edit_event' => '',
 'splash_edit_group' => 'Gruppo modificato',
 'splash_edit_role' => 'Ruolo memorizzata',
 'splash_edit_user' => 'Utente modificato',

languages/ko_KR/lang.inc

@@ -553,8 +553,13 @@ URL: [url]',
 'include_content' => '내용을 포함',
 'include_documents' => '문서 포함',
 'include_subdirectories' => '서브 디렉토리를 포함',
+'indexing_tasks_in_queue' => '',
 'index_converters' => '인덱스 문서 변환',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => '인덱스 폴더',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => '개인',
 'indivіduals_in_groups' => '개별 그룹',
 'inherited' => '상속',
@@ -773,6 +778,7 @@ URL : [url]',
 'only_jpg_user_images' => '.JPG - 이미지만 사용자가 이미지로 사용할 수 있습니다',
 'order_by_sequence_off' => '순서에 의한 정렬 설정이 켜져 있습니다. 이 매개 변수를 사용하고 싶은 경우 이것을 활성화 해야 합니다.',
 'original_filename' => '원래본 파일명',
+'overall_indexing_progress' => '',
 'owner' => '소유자',
 'ownership_changed_email' => '소유자 변경',
 'ownership_changed_email_body' => '소유자 변경
@@ -1350,9 +1356,11 @@ URL : [url]',
 'splash_document_added' => '문서를 추가',
 'splash_document_checkedout' => '문서 체크아웃',
 'splash_document_edited' => '문서 저장',
+'splash_document_indexed' => '',
 'splash_document_locked' => '문서 잠금',
 'splash_document_unlocked' => '문서 잠금 해제',
 'splash_edit_attribute' => '속성 저장',
+'splash_edit_event' => '',
 'splash_edit_group' => '그룹 저장',
 'splash_edit_role' => '',
 'splash_edit_user' => '사용자 저장',

languages/nl_NL/lang.inc

@@ -546,8 +546,13 @@ URL: [url]',
 'include_content' => 'inclusief inhoud',
 'include_documents' => 'Inclusief documenten',
 'include_subdirectories' => 'Inclusief submappen',
+'indexing_tasks_in_queue' => '',
 'index_converters' => 'Index document conversie',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => 'Inhoud',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => 'Individuen',
 'indivіduals_in_groups' => 'Individuen in groepen',
 'inherited' => 'overgeerfd',
@@ -765,6 +770,7 @@ URL: [url]',
 'only_jpg_user_images' => 'U mag alleen .jpg afbeeldingen gebruiken als gebruikersafbeeldingen.',
 'order_by_sequence_off' => 'Volgorde uit',
 'original_filename' => 'Originele bestandsnaam',
+'overall_indexing_progress' => '',
 'owner' => 'Eigenaar',
 'ownership_changed_email' => 'Eigenaar gewijzigd',
 'ownership_changed_email_body' => 'Eigenaar gewijzigd
@@ -1363,9 +1369,11 @@ URL: [url]',
 'splash_document_added' => 'Nieuw document toegevoegd',
 'splash_document_checkedout' => 'Document in gebruik genomen',
 'splash_document_edited' => 'Document opgeslagen',
+'splash_document_indexed' => '',
 'splash_document_locked' => 'Document vergrendeld',
 'splash_document_unlocked' => 'Document ontgrendeld',
 'splash_edit_attribute' => 'Attribuut opgeslagen',
+'splash_edit_event' => '',
 'splash_edit_group' => 'Groep opgeslagen',
 'splash_edit_role' => 'Rol opgeslagen',
 'splash_edit_user' => 'Gebruiker opgeslagen',

languages/pl_PL/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (748), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (752), netixw (84), romi (93), uGn (112)
 
 $text = array(
 '2_factor_auth' => '',
@@ -541,8 +541,13 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'Uwzględnij dokumenty',
 'include_subdirectories' => 'Uwzględnij podkatalogi',
+'indexing_tasks_in_queue' => '',
 'index_converters' => 'Konwersja indeksu dokumentów',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => 'Indeksuj folder',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => 'Indywidualni',
 'indivіduals_in_groups' => '',
 'inherited' => 'dziedziczony',
@@ -761,6 +766,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Wyłącznie pliki typu .jpg mogą być użyte jako obrazy użytkowników',
 'order_by_sequence_off' => '',
 'original_filename' => 'Oryginalna nazwa pliku',
+'overall_indexing_progress' => '',
 'owner' => 'Właściciel',
 'ownership_changed_email' => 'Właściciel zmieniony',
 'ownership_changed_email_body' => 'Zmiana właściciela
@@ -1002,7 +1008,7 @@ URL: [url]',
 'settings_Authentication' => 'Ustawienia uwierzytelniania',
 'settings_autoLoginUser' => '',
 'settings_autoLoginUser_desc' => '',
-'settings_available_languages' => '',
+'settings_available_languages' => 'Dostępne języki',
 'settings_available_languages_desc' => '',
 'settings_backupDir' => '',
 'settings_backupDir_desc' => '',
@@ -1212,9 +1218,9 @@ URL: [url]',
 'settings_php_version' => 'Wersja PHP',
 'settings_presetExpirationDate' => '',
 'settings_presetExpirationDate_desc' => '',
-'settings_previewWidthDetail' => '',
+'settings_previewWidthDetail' => 'Szerokość obrazka podglądu (szczegóły)',
-'settings_previewWidthDetail_desc' => '',
+'settings_previewWidthDetail_desc' => 'Szerokość obrazka podglądu na stronie szczegółów',
-'settings_previewWidthList' => '',
+'settings_previewWidthList' => 'Szerokość obrazka podglądu (lista)',
 'settings_previewWidthList_desc' => 'Szerokość podglądu obrazu pokazanego na liście',
 'settings_printDisclaimer' => 'Wyświetlaj Zrzeczenie się',
 'settings_printDisclaimer_desc' => 'Zaznaczenie tej opcji spowoduje, że na dole strony będzie wyświetlany komunikat zrzeczenia się zawarty w pliku lang.inc.',
@@ -1315,9 +1321,11 @@ URL: [url]',
 'splash_document_added' => '',
 'splash_document_checkedout' => '',
 'splash_document_edited' => 'Dokument został zapisany',
+'splash_document_indexed' => '',
 'splash_document_locked' => 'Dokument zablokowany',
 'splash_document_unlocked' => 'Odblokowano dokument',
 'splash_edit_attribute' => 'Zapisano atrybuty',
+'splash_edit_event' => '',
 'splash_edit_group' => 'Grupa zapisana',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Zapisano użytkownika',

languages/pt_BR/lang.inc

@@ -547,8 +547,13 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'Include documents',
 'include_subdirectories' => 'Include subdirectories',
+'indexing_tasks_in_queue' => '',
 'index_converters' => 'Índice de conversão de documentos',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => 'Pasta Raiz',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => 'Individuals',
 'indivіduals_in_groups' => '',
 'inherited' => 'herdado',
@@ -766,6 +771,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Somente imagens jpg podem ser utilizadas como avatar',
 'order_by_sequence_off' => '',
 'original_filename' => 'Arquivo original',
+'overall_indexing_progress' => '',
 'owner' => 'Proprietário',
 'ownership_changed_email' => 'O proprietário mudou',
 'ownership_changed_email_body' => 'Proprietário mudou
@@ -1333,9 +1339,11 @@ URL: [url]',
 'splash_document_added' => 'Documento inserido',
 'splash_document_checkedout' => '',
 'splash_document_edited' => 'Documento salvo',
+'splash_document_indexed' => '',
 'splash_document_locked' => 'Documento bloqueado',
 'splash_document_unlocked' => 'Documento desbloqueado',
 'splash_edit_attribute' => 'Atributo salvo',
+'splash_edit_event' => '',
 'splash_edit_group' => 'Grupo salvo',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Usuário salvo',

languages/ro_RO/lang.inc

@@ -553,8 +553,13 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'Include documente',
 'include_subdirectories' => 'Include subfoldere',
+'indexing_tasks_in_queue' => '',
 'index_converters' => 'Indexare conversie documente',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => 'Index folder',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => 'Individuals',
 'indivіduals_in_groups' => '',
 'inherited' => 'moștenit',
@@ -773,6 +778,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Doar imagini .jpg pot fi utilizate ca imagine-utilizator',
 'order_by_sequence_off' => 'Ordonarea dupa secventa este dezactivata in setari. Daca doriti acest parametru sa aiba efect, va trebui sa-l reactivati.',
 'original_filename' => 'Nume de fișier original',
+'overall_indexing_progress' => '',
 'owner' => 'Proprietar',
 'ownership_changed_email' => 'Proprietar schimbat',
 'ownership_changed_email_body' => 'Proprietar schimbat
@@ -1358,9 +1364,11 @@ URL: [url]',
 'splash_document_added' => 'Document adăugat',
 'splash_document_checkedout' => 'Document verificat',
 'splash_document_edited' => 'Document salvat',
+'splash_document_indexed' => '',
 'splash_document_locked' => 'Document blocat',
 'splash_document_unlocked' => 'Document deblocat',
 'splash_edit_attribute' => 'Atribut salvat',
+'splash_edit_event' => '',
 'splash_edit_group' => 'Grup salvat',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Utilizator salvat',

languages/ru_RU/lang.inc

@@ -553,8 +553,13 @@ URL: [url]',
 'include_content' => 'Включая содержимое',
 'include_documents' => 'Включая документы',
 'include_subdirectories' => 'Включая подкаталоги',
+'indexing_tasks_in_queue' => '',
 'index_converters' => 'Индексирование документов',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => 'Полнотекстовый индекс',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => 'Пользователи',
 'indivіduals_in_groups' => 'Пользователи группы',
 'inherited' => 'унаследованный',
@@ -772,6 +777,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Разрешены только .jpg-изображения',
 'order_by_sequence_off' => 'Сортировка последовательности выключена в настройках. Если вы хотите применить этот эффект, вам необходимо его включить',
 'original_filename' => 'Исходное имя файла',
+'overall_indexing_progress' => '',
 'owner' => 'Владелец',
 'ownership_changed_email' => 'Владелец изменён',
 'ownership_changed_email_body' => 'Изменён владелец
@@ -1365,9 +1371,11 @@ URL: [url]',
 'splash_document_added' => 'Добавлен документ',
 'splash_document_checkedout' => 'Документ отправлен на обработку',
 'splash_document_edited' => 'Документ сохранён',
+'splash_document_indexed' => '',
 'splash_document_locked' => 'Документ заблокирован',
 'splash_document_unlocked' => 'Документ разблокирован',
 'splash_edit_attribute' => 'Атрибут сохранён',
+'splash_edit_event' => '',
 'splash_edit_group' => 'Группа сохранена',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Пользователь сохранён',

languages/sk_SK/lang.inc

@@ -476,8 +476,13 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'Vrátane súborov',
 'include_subdirectories' => 'Vrátane podzložiek',
+'indexing_tasks_in_queue' => '',
 'index_converters' => '',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => 'Indexovať zložku',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => 'Jednotlivci',
 'indivіduals_in_groups' => '',
 'inherited' => 'zdedené',
@@ -672,6 +677,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Ako obrázky používateľov je možné použiť iba obrázky .jpg',
 'order_by_sequence_off' => '',
 'original_filename' => '',
+'overall_indexing_progress' => '',
 'owner' => 'Vlastník',
 'ownership_changed_email' => 'Majitel zmeneny',
 'ownership_changed_email_body' => '',
@@ -1190,9 +1196,11 @@ URL: [url]',
 'splash_document_added' => '',
 'splash_document_checkedout' => '',
 'splash_document_edited' => '',
+'splash_document_indexed' => '',
 'splash_document_locked' => 'Dokument uzamknutý',
 'splash_document_unlocked' => 'Dokument odomknutý',
 'splash_edit_attribute' => '',
+'splash_edit_event' => '',
 'splash_edit_group' => '',
 'splash_edit_role' => '',
 'splash_edit_user' => '',

languages/sv_SE/lang.inc

@@ -541,8 +541,13 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'Inkludera dokument',
 'include_subdirectories' => 'Inkludera under-kataloger',
+'indexing_tasks_in_queue' => '',
 'index_converters' => 'Omvandling av indexdokument',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => 'Index mapp',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => 'Personer',
 'indivіduals_in_groups' => '',
 'inherited' => 'ärvd',
@@ -761,6 +766,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Bara .jpg-bilder kan användas som användarbild',
 'order_by_sequence_off' => '',
 'original_filename' => 'Ursprungligt filnamn',
+'overall_indexing_progress' => '',
 'owner' => 'Ägare',
 'ownership_changed_email' => 'Ägare har ändrats',
 'ownership_changed_email_body' => 'Ägare har ändrats
@@ -1321,9 +1327,11 @@ URL: [url]',
 'splash_document_added' => '',
 'splash_document_checkedout' => '',
 'splash_document_edited' => 'Dokument sparad',
+'splash_document_indexed' => '',
 'splash_document_locked' => 'Dokument låst',
 'splash_document_unlocked' => 'Dokument upplåst',
 'splash_edit_attribute' => 'Attribut sparat',
+'splash_edit_event' => '',
 'splash_edit_group' => 'Grupp sparat',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Användare sparat',

languages/tr_TR/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1046), aydin (83)
+//    Translators: Admin (1048), aydin (83)
 
 $text = array(
 '2_factor_auth' => '',
@@ -399,7 +399,7 @@ URL: [url]',
 'dump_creation_warning' => 'Bu işlemle veritabanınızın dump dosyasını oluşturabilirsiniz. Dump dosyası sunucunuzdaki data klasörüne kaydedilcektir.',
 'dump_list' => 'Mevcut dump dosyaları',
 'dump_remove' => 'Dump dosyasını sil',
-'duplicate_content' => '',
+'duplicate_content' => 'içeriği_klonla',
 'edit' => 'Düzenle',
 'edit_attributes' => 'Nitelikleri düzenle',
 'edit_comment' => 'Açıklamayı düzenle',
@@ -547,8 +547,13 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'Dokümanları kapsa',
 'include_subdirectories' => 'Alt klasörleri kapsa',
+'indexing_tasks_in_queue' => '',
 'index_converters' => 'Doküman dönüştürmeyi indeksle',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => 'Klasörü indeksle',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => 'Bireysel',
 'indivіduals_in_groups' => '',
 'inherited' => 'devralındı',
@@ -767,6 +772,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Kullanıcı resmi olarak sadece .jpg uzantı resimler kullanılabilir',
 'order_by_sequence_off' => '',
 'original_filename' => 'Orijinal dosya adı',
+'overall_indexing_progress' => '',
 'owner' => 'Sahibi',
 'ownership_changed_email' => 'Sahip değişti',
 'ownership_changed_email_body' => 'Sahip değişti
@@ -1024,7 +1030,7 @@ URL: [url]',
 'settings_Authentication' => 'Yetkilendirme ayarları',
 'settings_autoLoginUser' => '',
 'settings_autoLoginUser_desc' => '',
-'settings_available_languages' => '',
+'settings_available_languages' => 'kullanılabilir diller',
 'settings_available_languages_desc' => '',
 'settings_backupDir' => '',
 'settings_backupDir_desc' => '',
@@ -1337,9 +1343,11 @@ URL: [url]',
 'splash_document_added' => 'Doküman eklendi',
 'splash_document_checkedout' => '',
 'splash_document_edited' => 'Doküman kaydedildi',
+'splash_document_indexed' => '',
 'splash_document_locked' => 'Doküman kilitlendi',
 'splash_document_unlocked' => 'Doküman kiliti açıldı',
 'splash_edit_attribute' => 'Nitelik kaydedildi',
+'splash_edit_event' => '',
 'splash_edit_group' => 'Grup kaydedildi',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Kullanıcı kaydedildi',

languages/uk_UA/lang.inc

@@ -553,8 +553,13 @@ URL: [url]',
 'include_content' => 'Включно з вмістом',
 'include_documents' => 'Включно з документами',
 'include_subdirectories' => 'Включно з підкаталогами',
+'indexing_tasks_in_queue' => '',
 'index_converters' => 'Індексування документів',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => 'Каталог індексу',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => 'Користувачі',
 'indivіduals_in_groups' => 'Користувачі групи',
 'inherited' => 'успадкований',
@@ -772,6 +777,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Дозволені лише .jpg-зображення',
 'order_by_sequence_off' => 'Можливість ручного сортування відключена в налаштуваннях. Якщо ви хочете використовувати цю функцію, ви повинні знову її включити.',
 'original_filename' => 'Початкова назва файлу',
+'overall_indexing_progress' => '',
 'owner' => 'Власник',
 'ownership_changed_email' => 'Власника змінено',
 'ownership_changed_email_body' => 'Змінено власника
@@ -1358,9 +1364,11 @@ URL: [url]',
 'splash_document_added' => 'Додано документ',
 'splash_document_checkedout' => 'Документ відправлено на опрацювання',
 'splash_document_edited' => 'Документ збережено',
+'splash_document_indexed' => '',
 'splash_document_locked' => 'Документ заблоковано',
 'splash_document_unlocked' => 'Документ розблоковано',
 'splash_edit_attribute' => 'Атрибут збережено',
+'splash_edit_event' => '',
 'splash_edit_group' => 'Групу збережено',
 'splash_edit_role' => '',
 'splash_edit_user' => 'Користувача збережено',

languages/zh_CN/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (664), fengjohn (5)
+//    Translators: Admin (674), fengjohn (5)
 
 $text = array(
 '2_factor_auth' => '',
@@ -237,7 +237,7 @@ URL: [url]',
 'comment_changed_email' => '',
 'comment_for_current_version' => '版本说明',
 'confirm_clear_cache' => '',
-'confirm_create_fulltext_index' => '',
+'confirm_create_fulltext_index' => '确认重新创建全文索引',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
 'confirm_pwd' => '确认密码',
@@ -478,8 +478,13 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => '包含文档',
 'include_subdirectories' => '包含子目录',
+'indexing_tasks_in_queue' => '',
 'index_converters' => '索引文件转换',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => '索引目录',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => '个人',
 'indivіduals_in_groups' => '',
 'inherited' => '继承',
@@ -674,6 +679,7 @@ URL: [url]',
 'only_jpg_user_images' => '只用jpg格式的图片才可以作为用户身份图片',
 'order_by_sequence_off' => '',
 'original_filename' => '原始文件名',
+'overall_indexing_progress' => '',
 'owner' => '所有者',
 'ownership_changed_email' => '所有者已变更',
 'ownership_changed_email_body' => '',
@@ -886,8 +892,8 @@ URL: [url]',
 'settings_cacheDir' => '',
 'settings_cacheDir_desc' => '',
 'settings_Calendar' => '',
-'settings_calendarDefaultView' => '',
+'settings_calendarDefaultView' => '日历默认试图',
-'settings_calendarDefaultView_desc' => '',
+'settings_calendarDefaultView_desc' => '日历默认试图',
 'settings_cannot_disable' => '',
 'settings_checkOutDir' => '',
 'settings_checkOutDir_desc' => '',
@@ -897,8 +903,8 @@ URL: [url]',
 'settings_contentDir_desc' => '',
 'settings_contentOffsetDir' => '内容偏移目录',
 'settings_contentOffsetDir_desc' => '要解决在底层文件系统的限制，一个新的目录结构已制定了内容目录（内容目录）中存在的。这需要从它开始一个基本目录。通常离开这个为默认设置，1048576，也可以是内（内容目录）不存在任何数字或字符串',
-'settings_convertToPdf' => '',
+'settings_convertToPdf' => '将文档转换为pdf预览',
-'settings_convertToPdf_desc' => '',
+'settings_convertToPdf_desc' => '如果浏览器不支持原始文件预览，允许转换为pdf文件预览',
 'settings_cookieLifetime' => '',
 'settings_cookieLifetime_desc' => '',
 'settings_coreDir' => 'SeedDMS核心目录',
@@ -934,7 +940,7 @@ URL: [url]',
 'settings_dropFolderDir' => '',
 'settings_dropFolderDir_desc' => '',
 'settings_Edition' => '编辑设置',
-'settings_editOnlineFileTypes' => '',
+'settings_editOnlineFileTypes' => '编辑在线文件类型',
 'settings_editOnlineFileTypes_desc' => '',
 'settings_enable2FactorAuthentication' => '',
 'settings_enable2FactorAuthentication_desc' => '',
@@ -1015,7 +1021,7 @@ URL: [url]',
 'settings_Extensions' => '',
 'settings_extraPath' => '额外的PHP的include路径',
 'settings_extraPath_desc' => '附加软件的路径。这是包含目录，例如在ADODB目录或额外的PEAR包',
-'settings_firstDayOfWeek' => '',
+'settings_firstDayOfWeek' => '每周第一天',
 'settings_firstDayOfWeek_desc' => '',
 'settings_footNote' => '附注',
 'settings_footNote_desc' => '显示在每个页面底部的信息',
@@ -1101,14 +1107,14 @@ URL: [url]',
 'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => '',
 'settings_restricted_desc' => '',
-'settings_rootDir' => '',
+'settings_rootDir' => '根目录',
 'settings_rootDir_desc' => '',
 'settings_rootFolderID' => '',
 'settings_rootFolderID_desc' => '',
 'settings_SaveError' => '',
-'settings_Server' => '',
+'settings_Server' => '服务设置',
 'settings_showFullPreview' => '显示完整的文档',
-'settings_showFullPreview_desc' => '',
+'settings_showFullPreview_desc' => '启用/禁用详细页面完整预览, 如果浏览器>支持的话',
 'settings_showMissingTranslations' => '显示丢失的翻译',
 'settings_showMissingTranslations_desc' => '',
 'settings_showSingleSearchHit' => '',
@@ -1192,9 +1198,11 @@ URL: [url]',
 'splash_document_added' => '',
 'splash_document_checkedout' => '',
 'splash_document_edited' => '',
+'splash_document_indexed' => '',
 'splash_document_locked' => '文档已被锁定',
 'splash_document_unlocked' => '已解锁的文档',
 'splash_edit_attribute' => '',
+'splash_edit_event' => '',
 'splash_edit_group' => '',
 'splash_edit_role' => '',
 'splash_edit_user' => '',

languages/zh_TW/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 (2374)
+//    Translators: Admin (2376)
 
 $text = array(
 '2_factor_auth' => '',
@@ -476,8 +476,13 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => '包含文檔',
 'include_subdirectories' => '包含子目錄',
+'indexing_tasks_in_queue' => '',
 'index_converters' => '索引檔轉換',
+'index_done' => '',
+'index_error' => '',
 'index_folder' => '索引目錄',
+'index_pending' => '',
+'index_waiting' => '',
 'individuals' => '個人',
 'indivіduals_in_groups' => '',
 'inherited' => '繼承',
@@ -672,6 +677,7 @@ URL: [url]',
 'only_jpg_user_images' => '只用jpg格式的圖片才可以作為使用者身份圖片',
 'order_by_sequence_off' => '',
 'original_filename' => '',
+'overall_indexing_progress' => '',
 'owner' => '所有者',
 'ownership_changed_email' => '所有者已變更',
 'ownership_changed_email_body' => '',
@@ -1129,9 +1135,9 @@ URL: [url]',
 'settings_smtpUser_desc' => '',
 'settings_sortFoldersDefault' => '',
 'settings_sortFoldersDefault_desc' => '',
-'settings_sortFoldersDefault_val_name' => '',
+'settings_sortFoldersDefault_val_name' => '按名称',
 'settings_sortFoldersDefault_val_sequence' => '',
-'settings_sortFoldersDefault_val_unsorted' => '',
+'settings_sortFoldersDefault_val_unsorted' => '不排序',
 'settings_sortUsersInList' => '',
 'settings_sortUsersInList_desc' => '',
 'settings_sortUsersInList_val_fullname' => '',
@@ -1190,9 +1196,11 @@ URL: [url]',
 'splash_document_added' => '',
 'splash_document_checkedout' => '',
 'splash_document_edited' => '',
+'splash_document_indexed' => '',
 'splash_document_locked' => '文檔已被鎖定',
 'splash_document_unlocked' => '已解鎖的文檔',
 'splash_edit_attribute' => '',
+'splash_edit_event' => '',
 'splash_edit_group' => '',
 'splash_edit_role' => '',
 'splash_edit_user' => '',

op/op.AddDocument.php

@@ -406,6 +406,66 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 	if(!$document = $controller->run()) {
 		UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText($controller->getErrorMsg()));
 	} else {
+<<<<<<< HEAD
+=======
+		$document = $res[0];
+
+		/* Set access as specified in settings. */
+		if($settings->_defaultAccessDocs) {
+			if($settings->_defaultAccessDocs > 0 && $settings->_defaultAccessDocs < 4) {
+				$document->setInheritAccess(0, true);
+				$document->setDefaultAccess($settings->_defaultAccessDocs, true);
+			}
+		}
+
+		if(isset($GLOBALS['SEEDDMS_HOOKS']['addDocument'])) {
+			foreach($GLOBALS['SEEDDMS_HOOKS']['addDocument'] as $hookObj) {
+				if (method_exists($hookObj, 'postAddDocument')) {
+					$hookObj->postAddDocument($document);
+				}
+			}
+		}
+		if($settings->_enableFullSearch) {
+			$index = $indexconf['Indexer']::open($settings->_luceneDir);
+			if($index) {
+				$indexconf['Indexer']::init($settings->_stopWordsFile);
+				$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText));
+				if(isset($GLOBALS['SEEDDMS_HOOKS']['addDocument'])) {
+					foreach($GLOBALS['SEEDDMS_HOOKS']['addDocument'] as $hookObj) {
+						if (method_exists($hookObj, 'preIndexDocument')) {
+							$hookObj->preIndexDocument(null, $document, $idoc);
+						}
+					}
+				}
+				$index->addDocument($idoc);
+			}
+		}
+
+		/* Add a default notification for the owner of the document */
+		if($settings->_enableOwnerNotification) {
+			$res = $document->addNotify($user->getID(), true);
+		}
+		/* Check if additional notification shall be added */
+		if(!empty($_POST['notification_users'])) {
+			foreach($_POST['notification_users'] as $notuserid) {
+				$notuser = $dms->getUser($notuserid);
+				if($notuser) {
+					if($document->getAccessMode($user) >= M_READ)
+						$res = $document->addNotify($notuserid, true);
+				}
+			}
+		}
+		if(!empty($_POST['notification_groups'])) {
+			foreach($_POST['notification_groups'] as $notgroupid) {
+				$notgroup = $dms->getGroup($notgroupid);
+				if($notgroup) {
+					if($document->getGroupAccessMode($notgroup) >= M_READ)
+						$res = $document->addNotify($notgroupid, false);
+				}
+			}
+		}
+
+>>>>>>> seeddms-5.1.x
 		// Send notification to subscribers of folder.
 		if($notifier) {
 			$fnl = $folder->getNotifyList();

op/op.Ajax.php

@@ -741,8 +741,8 @@ switch($command) {
 						}
 					}
 
-					if(isset($GLOBALS['SEEDDMS_HOOKS']['postAddDocument'])) {
+					if(isset($GLOBALS['SEEDDMS_HOOKS']['addDocument'])) {
-						foreach($GLOBALS['SEEDDMS_HOOKS']['postAddDocument'] as $hookObj) {
+						foreach($GLOBALS['SEEDDMS_HOOKS']['addDocument'] as $hookObj) {
 							if (method_exists($hookObj, 'postAddDocument')) {
 								$hookObj->postAddDocument($document);
 							}
@@ -752,7 +752,15 @@ switch($command) {
 						$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, !($filesize < $settings->_maxSizeForFullText)));
+							$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText));
+							if(isset($GLOBALS['SEEDDMS_HOOKS']['addDocument'])) {
+								foreach($GLOBALS['SEEDDMS_HOOKS']['addDocument'] as $hookObj) {
+									if (method_exists($hookObj, 'preIndexDocument')) {
+										$hookObj->preIndexDocument($document, $idoc);
+									}
+								}
+							}
+							$index->addDocument($idoc);
 						}
 					}
 
@@ -925,5 +933,38 @@ switch($command) {
 			echo json_encode(array('error'=>0, 'data'=>array('review'=>$reviews, 'approval'=>$approvals, 'receipt'=>$receipts, 'revision'=>$revisions), 'processing_time'=>microtime(true)-$startts));
 		}
 		break; /* }}} */
+	case 'indexdocument': /* {{{ */
+		if($user && $user->isAdmin()) {
+			if($settings->_enableFullSearch) {
+				$document = $dms->getDocument($_REQUEST['id']);
+				if($document) {
+						$index = $indexconf['Indexer']::open($settings->_luceneDir);
+						if($index) {
+							$indexconf['Indexer']::init($settings->_stopWordsFile);
+							$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false);
+							if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) {
+								foreach($GLOBALS['SEEDDMS_HOOKS']['indexDocument'] as $hookObj) {
+									if (method_exists($hookObj, 'preIndexDocument')) {
+										$hookObj->preIndexDocument(null, $document, $idoc);
+									}
+								}
+							}
+							$index->addDocument($idoc);
+							header('Content-Type: application/json');
+							echo json_encode(array('success'=>true, 'message'=>getMLText('splash_document_indexed'), 'data'=>$document->getID()));
+						} else {
+							header('Content-Type: application/json');
+							echo json_encode(array('success'=>false, 'message'=>getMLText('error_occured'), 'data'=>$document->getID()));
+						}
+				} else {
+					header('Content-Type: application/json');
+					echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id'), 'data'=>''));
+				}
+			} else {
+				header('Content-Type: application/json');
+				echo json_encode(array('success'=>false, 'message'=>getMLText('error_occured'), 'data'=>''));
+			}
+		}
+		break; /* }}} */
 }
 ?>

op/op.PdfPreview.php

@@ -0,0 +1,77 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010-2016 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
+$documentid = $_GET["documentid"];
+if (!isset($documentid) || !is_numeric($documentid) || intval($documentid)<1) {
+	exit;
+}
+
+$document = $dms->getDocument($documentid);
+if (!is_object($document)) {
+	exit;
+}
+
+if ($document->getAccessMode($user) < M_READ) {
+	exit;
+}
+
+if(isset($_GET['version'])) {
+	$version = $_GET["version"];
+	if (!is_numeric($version))
+		exit;
+	if(intval($version)<1)
+		$object = $document->getLatestContent();
+	else
+		$object = $document->getContentByVersion($version);
+} elseif(isset($_GET['file'])) {
+	$file = $_GET['file'];
+	if (!is_numeric($file) || intval($file)<1)
+		exit;
+	$object = $document->getDocumentFile($file);
+} else {
+	exit;
+}
+
+if (!is_object($object)) {
+	exit;
+}
+
+$previewer = new SeedDMS_Preview_PdfPreviewer($settings->_cacheDir);
+if(!$previewer->hasPreview($object))
+	$previewer->createPreview($object);
+header('Content-Type: application/pdf');
+$previewer->getPreview($object);
+

op/op.UpdateDocument.php

@@ -257,12 +257,27 @@ if ($_FILES['userfile']['error'] == 0) {
 		$attributes = array();
 	}
 
+	if(isset($GLOBALS['SEEDDMS_HOOKS']['updateDocument'])) {
+		foreach($GLOBALS['SEEDDMS_HOOKS']['updateDocument'] as $hookObj) {
+			if (method_exists($hookObj, 'preUpdateDocument')) {
+				$hookObj->preUpdateDocument(array('name'=>&$name, 'comment'=>&$comment));
+			}
+		}
+	}
+
 	$filesize = SeedDMS_Core_File::fileSize($userfiletmp);
 	$contentResult=$document->addContent($comment, $user, $userfiletmp, basename($userfilename), $fileType, $userfiletype, $reviewers, $approvers, $version=0, $attributes, $workflow, $settings->_initialDocumentStatus);
 	if (is_bool($contentResult) && !$contentResult) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 	}
 	else {
+		if(isset($GLOBALS['SEEDDMS_HOOKS']['updateDocument'])) {
+			foreach($GLOBALS['SEEDDMS_HOOKS']['updateDocument'] as $hookObj) {
+				if (method_exists($hookObj, 'postUpdateDocument')) {
+					$hookObj->postUpdateDocument($document);
+				}
+			}
+		}
 		if($settings->_enableFullSearch) {
 			$index = $indexconf['Indexer']::open($settings->_luceneDir);
 			if($index) {
@@ -271,7 +286,15 @@ if ($_FILES['userfile']['error'] == 0) {
 					$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)));
+				$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText));
+				if(isset($GLOBALS['SEEDDMS_HOOKS']['updateDocument'])) {
+					foreach($GLOBALS['SEEDDMS_HOOKS']['updateDocument'] as $hookObj) {
+						if (method_exists($hookObj, 'preIndexDocument')) {
+							$hookObj->preIndexDocument(null, $document, $idoc);
+						}
+					}
+				}
+				$index->addDocument($idoc);
 				$index->commit();
 			}
 		}

out/out.Indexer.php

@@ -70,6 +70,7 @@ if($view) {
 	$view->setParam('index', $index);
 	$view->setParam('indexconf', $indexconf);
 	$view->setParam('recreate', (isset($_GET['create']) && $_GET['create']==1));
+	$view->setParam('forceupdate', (isset($_GET['forceupdate']) && $_GET['forceupdate']==1));
 	$view->setParam('folder', $folder);
 	$view->setParam('converters', $settings->_converters['fulltext']);
 	$view->setParam('timeout', $settings->_cmdTimeout);

themes/default/DocumentPageEnd.html

@@ -1,34 +0,0 @@
-<!-- 
-    MyDMS. Document Management System
-    Copyright (C) 2002-2005  Markus Westphal
-    Copyright (C) 2006 Malcolm Cowe
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-     </ul>
-    </td>
-  </tr>
-	<tr><td>&nbsp;</td></tr>
-  <tr>
-    <td height="25">
-      <table width="100%" height="25" border="0" cellpadding="0" cellspacing="0">
-        <tr>
-          <td class="editfolder" valign="center"><b><?php echo $title ?>:</b></td>
-          <td class="editfolder" align="left"><?php echo $menu ?></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>

themes/default/DocumentPageStart.html

@@ -1,41 +0,0 @@
-
-<!-- 
-    MyDMS. Document Management System
-    Copyright (C) 2002-2005  Markus Westphal
-    Copyright (C) 2006 Malcolm Cowe
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-<table width="100%" cellpadding="0" cellspacing="0" border="0" height="600">
-  <tr>
-    <td height="30" valign="center" class="header1"><?php echo $title2?></td>
-  </tr>
-  <tr>
-    <td class="hline" height="1"><img src="images/dummy.gif" height="1" width="1"></td>
-  </tr>
-  <tr>
-    <td height="53" valign="top">
-      <table cellpadding="0" cellspacing="0">
-        <tr>
-          <td><img src="<?php echo printImgPath("path_left.gif")?>" width="53" height="19" border="0" alt=""></td>
-          <td class="path"><?php echo $txtpath?></td>
-          <td><img src="<?php echo printImgPath("path_right.gif")?>" width="42" height="19" border="0" alt=""></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td valign="top">
-      <ul>

themes/default/EndBox.html

@@ -1,26 +0,0 @@
-
-<!-- 
-    MyDMS. Document Management System
-    Copyright (C) 2002-2005  Markus Westphal
-    Copyright (C) 2006 Malcolm Cowe
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-				  </td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>

themes/default/FolderPageEnd.html

@@ -1,34 +0,0 @@
-<!-- 
-    MyDMS. Document Management System
-    Copyright (C) 2002-2005  Markus Westphal
-    Copyright (C) 2006 Malcolm Cowe
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-      </ul>
-    </td>
-  </tr>
-	<tr><td>&nbsp;</td></tr>
-  <tr>
-    <td height="25">
-      <table width="100%" height="25" border="0" cellpadding="0" cellspacing="0">
-        <tr>
-          <td class="editfolder" valign="center"><b><?php echo $title ?>:</b></td>
-          <td class="editfolder" align="left"><?php echo $menu ?></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>

themes/default/FolderPageStart.html

@@ -1,41 +0,0 @@
-
-<!-- 
-    MyDMS. Document Management System
-    Copyright (C) 2002-2005  Markus Westphal
-    Copyright (C) 2006 Malcolm Cowe
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-<table width="100%" cellpadding="0" cellspacing="0" border="0" height="600">
-  <tr>
-    <td height="30" valign="center" class="header1"><?php echo $title2?></td>
-  </tr>
-  <tr>
-    <td class="hline" height="1"><img src="images/dummy.gif" height="1" width="1"></td>
-  </tr>
-  <tr>
-    <td height="53" valign="top">
-      <table cellpadding="0" cellspacing="0">
-        <tr>
-          <td><img src="<?php echo printImgPath("path_left.gif")?>" width="53" height="19" border="0" alt=""></td>
-          <td class="path"><?php echo $txtpath?></td>
-          <td><img src="<?php echo printImgPath("path_right.gif")?>" width="42" height="19" border="0" alt=""></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td valign="top">
-      <ul>

themes/default/HTMLFoot.html

@@ -1,21 +0,0 @@
-
-<!-- 
-    MyDMS. Document Management System
-    Copyright (C) 2002-2005  Markus Westphal
-    Copyright (C) 2006 Malcolm Cowe
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-</body></html>

themes/default/HTMLHead.html

@@ -1,26 +0,0 @@
-
-<!-- 
-    MyDMS. Document Management System
-    Copyright (C) 2002-2005  Markus Westphal
-    Copyright (C) 2006 Malcolm Cowe
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-<html>
-<head>
-  <title><?php echo $title?></title>
-  <link rel="STYLESHEET" type="text/css" href="<?php echo $stylesheet?>">
-</head>
-<body>

themes/default/NextBox.html

@@ -1,42 +0,0 @@
-	
-<!-- 
-    MyDMS. Document Management System
-    Copyright (C) 2002-2005  Markus Westphal
-    Copyright (C) 2006 Malcolm Cowe
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">&nbsp;</td>
-	</tr>
-	<tr>
-		<td colspan="2">
-			<table cellpadding="0" cellspacing="0" border="0">
-				<tr>
-					<td class="boxHeader">&nbsp;<?php echo $header?>:</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-	<tr>
-		<td class="boxBorder">
-			<table cellpadding="10" width="100%">
-				<tr>
-					<td>

themes/default/StartBox.html

@@ -1,35 +0,0 @@
-
-<!-- 
-    MyDMS. Document Management System
-    Copyright (C) 2002-2005  Markus Westphal
-    Copyright (C) 2006 Malcolm Cowe
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-<table cellpadding="0" cellspacing="0" width="600" border="0">
-	<tr>
-		<td colspan="2">
-			<table cellpadding="0" cellspacing="0" border="0">
-				<tr>
-					<td class="boxHeader">&nbsp;<?php echo $header?>:</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-	<tr>
-		<td class="boxBorder">
-			<table cellpadding="10" width="100%">
-				<tr>
-					<td>

themes/default/TitleBar.html

@@ -1,26 +0,0 @@
-
-<!-- 
-    MyDMS. Document Management System
-    Copyright (C) 2002-2005  Markus Westphal
-    Copyright (C) 2006 Malcolm Cowe
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-<table class='titlebar' width='100%' cellpadding='5' cellspacing='0'>
-	<tr>
-		<td class='titlebar'><?php echo $title?></td>
-		<td align='right' class='titlebar'><?php echo $menu?></td>
-	</tr>
-</table>

themes/default/styles.css

@@ -1,189 +0,0 @@
-a { text-decoration: none; }
-a:hover { text-decoration: underline; }
-
-.titlebar {
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	background-color : #000080;
-	font-size : 12pt;
-	color : White;
-	font-weight: bold;
-}
-
-.header1 {
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size : 11pt;
-	font-style : italic;
-	color : #000080;
-}
-
-.foldertree {
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size : 10pt;
-	color: black;
-}
-
-.foldertree_inpath {
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size : 10pt;
-	color: black;
-	font-style: italic;
-}
-
-.foldertree_active {
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size : 9pt;
-	color: black;
-	font-weight: bold;
-}
-
-.path {
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	background-color : #A0A1CE;
-	font-size : 10pt;
-	color: black;
-}
-
-.editfolder {
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	background-color : #A0A1CE;
-	font-size : 10pt;
-	color: black;
-}
-
-.editdocument {
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	background-color : #A0A1CE;
-	font-size : 10pt;
-	color: black;
-}
-
-.infos {
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size : 10pt;
-	color: black;
-}
-
-.filelist {
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size : 10pt;
-	color: black;
-}
-
-.subfolderlist {
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size : 10pt;
-	color: black;
-}
-
-.linklist {
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size : 10pt;
-	color: black;
-}
-
-.boxHeader {
-		color : White;
-		background-color : #000080;
-		font-style : italic;
-		font-size : 11pt;
-		font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-}
-
-.boxBorder {
-		border: 1pt solid #000080;
-}
-
-.pageHeader {
-		font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-		font-size: 13pt;
-		font-weight: bold;
-		color: #000080;
-}
-
- .inputDescription {
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size : 10pt;
-	color: black;
-	font-style: italic;
-}
-
-.notifylist {
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size : 10pt;
-	color: black;
-}
-
-.inheritAccess
-{
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size : 10pt;
-	color: black;
-}
-
-.accessList
-{
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size : 10pt;
-	color: black;
-}
-
-.defaultAccess
-{
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size : 10pt;
-	color: black;
-}
-
-.msgLocked
-{
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size : 10pt;
-	color: black;
-}
-
-.standardText
-{
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size : 10pt;
-	color: black;
-}
-
-.groupMembers
-{
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size : 10pt;
-	color: black;
-}
-
-.hline
-{
-	background-color : #000080;
-}
-
-.mimeicon {
-	height: 24px;
-	width: 24px;
-	border: 0;
-}
-
-/*
- * Classes for Checkbox Selection 'Widget'.
- */
-.cbSelectTitle {
-	float:left;
-	width: 6em;
-}
-.cbSelectContainer {
-	overflow:auto;
-	height: 6em;
-	border: thin solid;
-}
-.cbSelectList {
-	padding: 0.1em;
-}
-.cbSelectItem{
-	list-style-type: none;
-}
-.cbSelectMargin {
- margin-top:0.2em;
-}

themes/original/DocumentPageEnd.html

@@ -1,45 +0,0 @@
-<!-- 
-    MyDMS. Document Management System
-    Copyright (C) 2002-2005  Markus Westphal
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-     </ul>
-    </td>
-  </tr>
-  <tr>
-    <td width="45" height="25" background="<?php echo printImgPath("line_vert_edit.gif")?>">
-      &nbsp;
-    </td>
-    <td height="25">
-      <table width="100%" height="25" border="0" cellpadding="0" cellspacing="0">
-        <tr>
-          <td class="editfolder" valign="center">
-	    <b><?php echo $title ?>:</b>
-	  </td>
-          <td class="editfolder" align="left">
-	    <?php echo $menu ?>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td width="45" background="<?php echo printImgPath("line_vert.gif")?>">
-      &nbsp;
-    </td>
-    <td>&nbsp;</td>
-  </tr>
-</table>

themes/original/DocumentPageStart.html

@@ -1,67 +0,0 @@
-
-<!-- 
-    MyDMS. Document Management System
-    Copyright (C) 2002-2005  Markus Westphal
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-<table width="100%" cellpadding="0" cellspacing="0" border="0" height="600">
-  <tr>
-    <td width="5" height="30" rowspan="6">
-      &nbsp;
-    </td>
-    <td width="200" height="30" align="right" class="header1">
-      <?php echo $title1?>
-    </td>
-    <td width="45" height="30" background="<?php echo printImgPath("line_vert.gif")?>">
-      &nbsp;
-    </td>
-    <td height="30" valign="center" class="header1">
-      <?php echo $title2?>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="3" class="hline" 
-        height="1"><img src="images/dummy.gif" 
-	                height="1" width="1"></td>
-  </tr>
-  <tr>
-    <td rowspan="4" align="center" valign="top" class="subfolderlist">
-      &nbsp;<p>
-      <?php printFolderTree($folder->getPath(), 0, $document, false); ?>
-    </td>
-    <td width="45" height="53" background="<?php echo printImgPath("line_vert.gif")?>">
-      &nbsp;
-    </td>
-    <td height="53" valign="top">
-      <table cellpadding="0" cellspacing="0">
-        <tr>
-          <td><img src="<?php echo printImgPath("path_left.gif")?>" 
-	         width="53" height="19" border="0" alt=""></td>
-          <td class="path">
-	    <?php echo $txtpath?>
-          </td>
-          <td><img src="<?php echo printImgPath("path_right.gif")?>"
-	         width="42" height="19" border="0" alt=""></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td width="45" background="<?php echo printImgPath("line_vert.gif")?>">
-      &nbsp;
-    </td>
-    <td valign="top">
-      <ul>

themes/original/EndBox.html

@@ -1,25 +0,0 @@
-
-<!-- 
-    MyDMS. Document Management System
-    Copyright (C) 2002-2005  Markus Westphal
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-				  </td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>

themes/original/FolderPageEnd.html

@@ -1,46 +0,0 @@
-
-<!-- 
-    MyDMS. Document Management System
-    Copyright (C) 2002-2005  Markus Westphal
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-      </ul>
-    </td>
-  </tr>
-  <tr>
-    <td width="45" height="25" background="<?php echo printImgPath("line_vert_edit.gif")?>">
-      &nbsp;
-    </td>
-    <td height="25">
-      <table width="100%" height="25" border="0" cellpadding="0" cellspacing="0">
-        <tr>
-          <td class="editfolder" valign="center">
-	    <b><?php echo $title ?>:</b>
-	  </td>
-          <td class="editfolder" align="left">
-	    <?php echo $menu ?>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td width="45" background="<?php echo printImgPath("line_vert.gif")?>">
-      &nbsp;
-    </td>
-    <td>&nbsp;</td>
-  </tr>
-</table>

themes/original/FolderPageStart.html

@@ -1,67 +0,0 @@
-
-<!-- 
-    MyDMS. Document Management System
-    Copyright (C) 2002-2005  Markus Westphal
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-<table width="100%" cellpadding="0" cellspacing="0" border="0" height="600">
-  <tr>
-    <td width="5" height="30" rowspan="6">
-      &nbsp;
-    </td>
-    <td width="200" height="30" align="right" class="header1">
-      <?php echo $title1?>
-    </td>
-    <td width="45" height="30" background="<?php echo printImgPath("line_vert.gif")?>">
-      &nbsp;
-    </td>
-    <td height="30" valign="center" class="header1">
-      <?php echo $title2?>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="3" class="hline" 
-        height="1"><img src="images/dummy.gif" 
-	                height="1" width="1"></td>
-  </tr>
-  <tr>
-    <td rowspan="4" align="center" valign="top" class="subfolderlist">
-      &nbsp;<p>
-      <?php printFolderTree($folder->getPath(), 0, $folder, true); ?>
-    </td>
-    <td width="45" height="53" background="<?php echo printImgPath("line_vert.gif")?>">
-      &nbsp;
-    </td>
-    <td height="53" valign="top">
-      <table cellpadding="0" cellspacing="0">
-        <tr>
-          <td><img src="<?php echo printImgPath("path_left.gif")?>" 
-	         width="53" height="19" border="0" alt=""></td>
-          <td class="path">
-	    <?php echo $txtpath?>
-          </td>
-          <td><img src="<?php echo printImgPath("path_right.gif")?>"
-	         width="42" height="19" border="0" alt=""></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td width="45" background="<?php echo printImgPath("line_vert.gif")?>">
-      &nbsp;
-    </td>
-    <td valign="top">
-      <ul>

themes/original/HTMLFoot.html

@@ -1,20 +0,0 @@
-
-<!-- 
-    MyDMS. Document Management System
-    Copyright (C) 2002-2005  Markus Westphal
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-</body></html>

themes/original/HTMLHead.html

@@ -1,25 +0,0 @@
-
-<!-- 
-    MyDMS. Document Management System
-    Copyright (C) 2002-2005  Markus Westphal
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-<html>
-<head>
-  <title><?php echo $title?></title>
-  <link rel="STYLESHEET" type="text/css" href="<?php echo $stylesheet?>">
-</head>
-<body marginheight="0" marginwidth="0" topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">

themes/original/NextBox.html

@@ -1,42 +0,0 @@
-	
-<!-- 
-    MyDMS. Document Management System
-    Copyright (C) 2002-2005  Markus Westphal
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">&nbsp;</td>
-	</tr>
-	<tr>
-		<td colspan="2">
-			<table cellpadding="0" cellspacing="0" border="0">
-				<tr>
-					<td class="boxHeader">&nbsp;<?php echo $header?>:</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-	<tr>
-		<td width="30"><img src="images/dummy.gif" width="30" height="1" border="0" alt=""></td>
-		<td class="boxBorder">
-			<table cellpadding="10" width="100%">
-				<tr>
-					<td>

themes/original/StartBox.html

@@ -1,35 +0,0 @@
-
-<!-- 
-    MyDMS. Document Management System
-    Copyright (C) 2002-2005  Markus Westphal
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-<table cellpadding="0" cellspacing="0" width="600" border="0">
-	<tr>
-		<td colspan="2">
-			<table cellpadding="0" cellspacing="0" border="0">
-				<tr>
-					<td class="boxHeader">&nbsp;<?php echo $header?>:</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-	<tr>
-		<td width="30"><img src="images/dummy.gif" width="30" height="1" border="0" alt=""></td>
-		<td class="boxBorder">
-			<table cellpadding="10" width="100%">
-				<tr>
-					<td>

themes/original/TitleBar.html

@@ -1,27 +0,0 @@
-
-<!-- 
-    MyDMS. Document Management System
-    Copyright (C) 2002-2005  Markus Westphal
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-<table class='titlebar' width='100%' cellpadding='5' cellspacing='0'>
-	<tr>
-		<td class='titlebar'><?php echo $title?></td>
-		<td align='right' class='titlebar'>
-<?php echo $menu?>
-		</td>
-	</tr>
-</table>

themes/original/styles.css

@@ -1,161 +0,0 @@
-	a { text-decoration: none; }
-	a:hover { text-decoration: underline; }
-
-	.titlebar {
-		font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-		background-color : #000080;
-		font-size : 12pt;
-		color : White;
-		font-weight: bold;
-	}
-
-	.header1 {
-		font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-		font-size : 11pt;
-		font-style : italic;
-		color : #000080;
-	}
-
-	.foldertree {
-		font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-		font-size : 10pt;
-		color: black;
-	}
-	
-	.foldertree_inpath {
-		font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-		font-size : 10pt;
-		color: black;
-		font-style: italic;
-	}
-	
-	.foldertree_active {
-		font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-		font-size : 9pt;
-		color: black;
-		font-weight: bold;
-	}
-	
-	.path {
-		font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-		background-color : #A0A1CE;
-		font-size : 10pt;
-		color: black;
-	}
-	
-	.editfolder {
-		font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-		background-color : #A0A1CE;
-		font-size : 10pt;
-		color: black;
-	}
-	
-	.editdocument {
-		font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-		background-color : #A0A1CE;
-		font-size : 10pt;
-		color: black;
-	}
-	
-	.infos {
-		font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-		font-size : 10pt;
-		color: black;
-	}
-	
-	.filelist {
-		font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-		font-size : 10pt;
-		color: black;
-	}
-
-	.subfolderlist {
-		font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-		font-size : 10pt;
-		color: black;
-	}
-	
-	.linklist {
-		font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-		font-size : 10pt;
-		color: black;
-	}
-	
-	.boxHeader {
-			color : White;
-		        background-color : #000080;
-			font-style : italic;
-			font-size : 11pt;
-			font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	}
-
-	.boxBorder {
-			border: 1pt solid #000080;
-	}
-	
-	.pageHeader {
-			font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-			font-size: 13pt;
-			font-weight: bold;
-			color: #000080;
-	}
-	
-	 .inputDescription {
-		font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-		font-size : 10pt;
-		color: black;
-		font-style: italic;
-	}
-	
-	.notifylist {
-		font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-		font-size : 10pt;
-		color: black;
-	}
-	
-	.inheritAccess
-	{
-		font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-		font-size : 10pt;
-		color: black;
-	}
-	
-	.accessList
-	{
-		font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-		font-size : 10pt;
-		color: black;
-	}
-	
-	.defaultAccess
-	{
-		font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-		font-size : 10pt;
-		color: black;
-	}
-	
-	.msgLocked
-	{
-		font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-		font-size : 10pt;
-		color: black;
-	}
-	
-	.standardText
-	{
-		font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-		font-size : 10pt;
-		color: black;
-	}
-	
-	.groupMembers
-	{
-		font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-		font-size : 10pt;
-		color: black;
-	}
-
-	.hline
-	{
-		background-color : #000080;
-	}

views/bootstrap/class.Indexer.php

@@ -31,25 +31,121 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_Indexer extends SeedDMS_Bootstrap_Style {
 
-	function tree($dms, $index, $indexconf, $folder, $indent='') { /* {{{ */
+	function js() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+
+		header('Content-Type: application/javascript');
+?>
+var queue_count = 0;          // Number of functions being called
+var funcArray = [];     // Array of functions waiting
+var MAX_REQUESTS = 5;   // Max requests
+var CALL_WAIT = 100;        // 100ms
+var docstoindex = 0; // total number of docs to index
+
+function check_queue() {
+		// Check if count doesn't exceeds or if there aren't any functions to call
+		console.log('Queue has ' + funcArray.length + '/' + docstoindex + ' items');
+		console.log('Currently processing ' + queue_count + ' requests (' + $.active + ')');
+    if(queue_count >= MAX_REQUESTS) {
+			setTimeout(function() { check_queue() }, CALL_WAIT);
+			return;
+		}
+		if(funcArray.length == 0) {
+			return;
+		}
+		docid = funcArray.pop();
+		$('#status_'+docid).html('Processsing ...');
+		$.ajax({url: '../op/op.Ajax.php',
+			type: 'GET',
+			dataType: "json",
+			data: {command: 'indexdocument', id: docid},
+			beforeSend: function() {
+				queue_count++;            // Add request to the counter
+			},
+			error: function(xhr, textstatus) {
+				noty({
+					text: textstatus,
+					type: 'error',
+					dismissQueue: true,
+					layout: 'topRight',
+					theme: 'defaultTheme',
+					timeout: 1500,
+				});
+			},
+			success: function(data) {
+				// console.log('success ' + data.data);
+				if(data.success) {
+					$('#status_'+data.data).html('<?php printMLText('index_done'); ?>');
+				} else {
+					$('#status_'+data.data).html('<?php printMLText('index_error'); ?>');
+					noty({
+						text: data.message,
+						type: (data.success) ? 'success' : 'error',
+						dismissQueue: true,
+						layout: 'topRight',
+						theme: 'defaultTheme',
+						timeout: 1500,
+					});
+				}
+			},
+			complete: function(xhr, textstatus) {
+				queue_count--;        // Substract request to the counter
+				$('.queue-bar').css('width', (queue_count*100/MAX_REQUESTS)+'%');
+				$('.total-bar').css('width', (100 - (funcArray.length+queue_count)*100/docstoindex)+'%');
+				$('.total-bar').text(Math.round(100 - (funcArray.length+queue_count)*100/docstoindex)+' %');
+				if(funcArray.length+queue_count == 0)
+					$('.total-bar').addClass('bar-success');
+			}
+		}); 
+		setTimeout(function() { check_queue() }, CALL_WAIT);
+}
+
+$(document).ready( function() {
+	$('.tree-toggle').click(function () {
+		$(this).parent().children('ul.tree').toggle(200);
+	});
+
+	$('.indexme').each(function(index) {
+		var element = $(this);
+		var docid = element.data('docid');
+		element.html('<?php printMLText('index_pending'); ?>');
+    funcArray.push(docid);
+	});
+	docstoindex = funcArray.length;
+	check_queue();  // First call to start polling. It will call itself each 100ms
+});
+<?php
+	} /* }}} */
+
+	protected function tree($dms, $index, $indexconf, $folder, $indent='') { /* {{{ */
+		$forceupdate = $this->params['forceupdate'];
+
 		set_time_limit(30);
-		echo $indent."D ".htmlspecialchars($folder->getName())."\n";
+//		echo $indent."D ".htmlspecialchars($folder->getName())."\n";
+		echo '<ul class="nav nav-list"><li><label class="tree-toggle nav-header">'.htmlspecialchars($folder->getName()).'</label>'."\n";
 		$subfolders = $folder->getSubFolders();
 		foreach($subfolders as $subfolder) {
 			$this->tree($dms, $index, $indexconf, $subfolder, $indent.'  ');
 		}
 		$documents = $folder->getDocuments();
+		if($documents) {
+		echo '<ul class="nav nav-list">'."\n";
 		foreach($documents as $document) {
-			echo $indent."  ".$document->getId().":".htmlspecialchars($document->getName())." ";
+//			echo $indent."  ".$document->getId().":".htmlspecialchars($document->getName());
+			echo "<li class=\"document\">".$document->getId().":".htmlspecialchars($document->getName());
 			/* If the document wasn't indexed before then just add it */
 			$lucenesearch = new $indexconf['Search']($index);
 			if(!($hit = $lucenesearch->getDocument($document->getId()))) {
+				echo " <span id=\"status_".$document->getID()."\" class=\"indexme indexstatus\" data-docid=\"".$document->getID()."\">".getMLText('index_waiting')."</span>";
+				/*
 				try {
 					$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, $this->converters ? $this->converters : null, false, $this->timeout));
 					echo "(document added)";
 				} catch(Exception $e) {
 					echo $indent."(adding document failed '".$e->getMessage()."')";
 				}
+				 */
 			} else {
 				/* Check if the attribute created is set or has a value older
 				 * than the lasted content. Documents without such an attribute
@@ -62,20 +158,27 @@ class SeedDMS_View_Indexer extends SeedDMS_Bootstrap_Style {
 					$created = 0;
 				}
 				$content = $document->getLatestContent();
-				if($created >= $content->getDate()) {
+				if($created >= $content->getDate() && !$forceupdate) {
-					echo $indent."(document unchanged)";
+					echo $indent."<span id=\"status_".$document->getID()."\" class=\"indexstatus\" data-docid=\"".$document->getID()."\">document unchanged</span>";
 				} else {
 					$index->delete($hit->id);
+					echo " <span id=\"status_".$document->getID()."\" class=\"indexme indexstatus\" data-docid=\"".$document->getID()."\">".getMLText('index_waiting')."</span>";
+					/*
 					try {
 						$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, $this->converters ? $this->converters : null, false, $this->timeout));
 						echo $indent."(document updated)";
 					} catch(Exception $e) {
 						echo $indent."(updating document failed)";
 					}
+					 */
 				}
 			}
+			echo "</li>";
 			echo "\n";
 		}
+		echo "</ul>\n";
+		}
+		echo "</li></ul>\n";
 	} /* }}} */
 
 	function show() { /* {{{ */
@@ -83,7 +186,7 @@ class SeedDMS_View_Indexer extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$index = $this->params['index'];
 		$indexconf = $this->params['indexconf'];
-		$recreate = $this->params['recreate'];
+		$forceupdate = $this->params['forceupdate'];
 		$folder = $this->params['folder'];
 		$this->converters = $this->params['converters'];
 		$this->timeout = $this->params['timeout'];
@@ -93,10 +196,32 @@ class SeedDMS_View_Indexer extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 		$this->contentHeading(getMLText("update_fulltext_index"));
-
+?>
-		echo "<pre>";
+<style type="text/css">
+li {line-height: 20px;}
+.nav-header {line-height: 19px; margin-bottom: 0px;}
+.nav-list {padding-right: 0px;}
+.nav-list>li.document:hover {background-color: #eee;}
+.indexstatus {font-weight: bold; float: right;}
+.progress {margin-bottom: 2px;}
+.bar-legend {text-align: right; font-size: 85%; margin-bottom: 15px;}
+</style>
+		<div style="max-width: 900px;">
+		<div>
+			<div class="progress">
+				<div class="bar total-bar" role="progressbar" style="width: 100%;"></div>
+			</div>
+			<div class="bar-legend"><?php printMLText('overall_indexing_progress'); ?></div>
+		</div>
+		<div>
+			<div class="progress">
+				<div class="bar queue-bar" role="progressbar" style="width: 100%;"></div>
+			</div>
+			<div class="bar-legend"><?php printMLText('indexing_tasks_in_queue'); ?></div>
+		</div>
+<?php
 		$this->tree($dms, $index, $indexconf, $folder);
-		echo "</pre>";
+		echo "</div>";
 
 		$index->commit();
 		$index->optimize();