diff --git a/CHANGELOG b/CHANGELOG index 884f9bc65..e0a1918f6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -96,6 +96,16 @@ - list of available languages can be set in configuration - check for cycles in workflows and issue warning - major update of russian language (Thanks to r3code) +- when updating or adding a document do not send request for approval + if review needs to be done before +- uncheck checkbox for expiration date if date is selected. +- remove some old references to Lucene when indexing a document + uploaded by fast upload +- show workflow state in list of documents instead of just 'in workflow' +- overhaul notification system. Do not send extra notifications to owner + anymore. Send notifications to users/groups watching the old and new + folder if a document/folder is moved. +- drop alternative themes blue, hc, and clean -------------------------------------------------------------------------------- Changes in version 4.3.30 @@ -103,7 +113,7 @@ - fix adding new workflows - fix moving documents/folders via drag&drop in Edge (Closes #286) - update folder tree after moving a document/folder with drag&drop (Closes #288) -- trim each value of a value sets of attribute definitions bevor saving +- trim each value of a value sets of attribute definitions before saving - assign role 'user' instead of 'admin' to accounts automatically created during ldap authentication diff --git a/Makefile b/Makefile index 734579b60..84ccffaa5 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ PHPDOC=~/Downloads/phpDocumentor-2.8.1/bin/phpdoc dist: mkdir -p tmp/seeddms-$(VERSION) cp -a $(SRC) tmp/seeddms-$(VERSION) - (cd tmp; tar --exclude=.svn -czvf ../seeddms-$(VERSION).tar.gz seeddms-$(VERSION)) + (cd tmp; tar --exclude=.svn --exclude=views/blue --exclude=views/hc --exclude=views/clean --exclude=styles/blue --exclude=styles/hc --exclude=styles/clean -czvf ../seeddms-$(VERSION).tar.gz seeddms-$(VERSION)) rm -rf tmp pear: diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index a98e02ca5..741f63920 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -429,6 +429,8 @@ URL: [url]', 'error_no_document_selected' => 'لم يتم اختيار مستند', 'error_no_folder_selected' => 'لم يتم اختيار مجلد', 'error_occured' => 'حدث خطأ', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => '', 'error_toogle_permission' => '', 'es_ES' => 'الإسبانية', @@ -606,6 +608,9 @@ URL: [url]', 'librarydoc' => '', 'linked_documents' => 'مستندات متعلقة', 'linked_files' => 'ملحقات', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => 'اذا كنت تود تحميل ملفات اكبر من حجم الملفات المتاحة حاليا, من فضلك استخدم البديل صفحة التحميل.', 'list_contains_no_access_docs' => '', 'list_hooks' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index aa52d94ee..d04d5514e 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -384,6 +384,8 @@ $text = array( 'error_no_document_selected' => 'Няма избрани документи', 'error_no_folder_selected' => 'Няма избрани папки', 'error_occured' => 'Стана грешка', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => '', 'error_toogle_permission' => '', 'es_ES' => '', @@ -537,6 +539,9 @@ $text = array( 'librarydoc' => '', 'linked_documents' => 'Свързани документи', 'linked_files' => 'Приложения', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Ако искате да качите файлове над текущия лимит, използвайте друг начин.', 'list_contains_no_access_docs' => '', 'list_hooks' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index ed73b0ee9..16e0a96ec 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_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: Admin (702) +// Translators: Admin (710) $text = array( '2_factor_auth' => '', @@ -199,7 +199,7 @@ URL: [url]', 'change_recipients' => '', 'change_revisors' => '', 'change_status' => 'Canviar estat', -'charts' => '', +'charts' => 'Gràfiques', 'chart_docsaccumulated_title' => '', 'chart_docspercategory_title' => '', 'chart_docspermimetype_title' => '', @@ -260,7 +260,7 @@ URL: [url]', 'converter_new_cmd' => '', 'converter_new_mimetype' => '', 'copied_to_checkout_as' => '', -'create_fulltext_index' => '', +'create_fulltext_index' => 'Crea un índex full-text', 'create_fulltext_index_warning' => '', 'creation_date' => 'Creació', 'cs_CZ' => 'Txec', @@ -276,7 +276,7 @@ URL: [url]', 'december' => 'Desembre', 'default_access' => 'Mode d\'accés predeterminat', 'default_keywords' => '', -'definitions' => '', +'definitions' => 'Definicions', 'delete' => 'Eliminar', 'details' => 'Detalls', 'details_version' => 'Detalls de la versió: [version]', @@ -370,7 +370,7 @@ URL: [url]', 'edit_user' => 'Editar usuari...', 'edit_user_details' => 'Editar detalls d\'usuari', 'edit_version' => '', -'el_GR' => '', +'el_GR' => 'Grec', 'email' => 'Email', 'email_error_title' => '', 'email_footer' => 'Sempre es pot canviar la configuració de correu electrònic utilitzant les funcions de «El meu compte»', @@ -389,6 +389,8 @@ URL: [url]', 'error_no_document_selected' => '', 'error_no_folder_selected' => '', 'error_occured' => 'Ha succeït un error', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => '', 'error_toogle_permission' => '', 'es_ES' => 'Castellà', @@ -432,11 +434,11 @@ URL: [url]', 'friday_abbr' => '', 'from' => 'Des de', 'fr_FR' => 'Francès', -'fullsearch' => '', +'fullsearch' => 'Cerca full-text', 'fullsearch_hint' => '', -'fulltext_info' => '', +'fulltext_info' => 'Informació de full-text', 'global_attributedefinitiongroups' => '', -'global_attributedefinitions' => '', +'global_attributedefinitions' => 'Atributs', 'global_default_keywords' => 'Mots clau globals', 'global_document_categories' => 'Categories', 'global_workflows' => '', @@ -465,7 +467,7 @@ URL: [url]', 'identical_version' => '', 'import' => '', 'importfs' => '', -'import_fs' => '', +'import_fs' => 'Importa del sistema d\'arxius', 'import_fs_warning' => '', 'include_content' => '', 'include_documents' => 'Incloure documents', @@ -542,6 +544,9 @@ URL: [url]', 'librarydoc' => '', 'linked_documents' => 'Documents relacionats', 'linked_files' => 'Adjunts', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index be3dfe1ff..37fc056c2 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (710), kreml (455) +// Translators: Admin (715), kreml (455) $text = array( '2_factor_auth' => '', @@ -436,6 +436,8 @@ URL: [url]', 'error_no_document_selected' => 'Není vybrán žádný dokument.', 'error_no_folder_selected' => 'Není vybrána žádná složka', 'error_occured' => 'Vyskytla se chyba', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => '', 'error_toogle_permission' => '', 'es_ES' => 'Španělština', @@ -613,6 +615,9 @@ URL: [url]', 'librarydoc' => '', 'linked_documents' => 'Související dokumenty', 'linked_files' => 'Přílohy', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Hodláte-li nahrát soubory větší než je maximální velikost pro nahrávání, použijte prosím alternativní stránku.', 'list_contains_no_access_docs' => '', 'list_hooks' => '', @@ -1050,7 +1055,7 @@ URL: [url]', 'settings_Display' => 'Nastavení zobrazení', 'settings_dropFolderDir' => 'Adresář pro přetažení složky', 'settings_dropFolderDir_desc' => 'Tento adresář může být použit k ukládání souborů do souborového systému serveru a jejich importování odtud, místo natahování přes prohlížeč. Adresář musí obsahovat podadresář pro každého uživatele, kterému je povoleno importovat soubory touto cestou.', -'settings_Edition' => '', +'settings_Edition' => 'Nastavení vydání (edice)', 'settings_editOnlineFileTypes' => '', 'settings_editOnlineFileTypes_desc' => '', 'settings_enable2FactorAuthentication' => '', @@ -1065,7 +1070,7 @@ URL: [url]', 'settings_enableCalendar_desc' => '', 'settings_enableClipboard' => 'Povolit schránku', 'settings_enableClipboard_desc' => 'Povolit/zakázat schránku', -'settings_enableConverting' => '', +'settings_enableConverting' => 'Povolit konverzi', 'settings_enableConverting_desc' => '', 'settings_enableDropUpload' => 'Povolit rychlý upload', 'settings_enableDropUpload_desc' => 'Povolit/zakázat pokládácí prostor na stránce \'Zobrazení složek\' pro upload souborů pomocí Drag&Drop.', @@ -1112,7 +1117,7 @@ URL: [url]', 'settings_enableUserImage' => '', 'settings_enableUserImage_desc' => '', 'settings_enableUsersView' => '', -'settings_enableUsersView_desc' => '', +'settings_enableUsersView_desc' => 'Povolit/zakázat zobrazení skupiny a uživatele pro všechny', 'settings_enableVersionDeletion' => 'Povolit odstranění předchozích verzí', 'settings_enableVersionDeletion_desc' => 'Povolit/zakázat odstranění předchozích verzí dokumentů běžným uživatelům. Administrátor může odstranit staré verze kdykoliv.', 'settings_enableVersionModification' => 'Povolit změnu verze', @@ -1220,8 +1225,8 @@ URL: [url]', 'settings_rootFolderID_desc' => 'ID of root-folder (mostly no need to change)', 'settings_SaveError' => 'Configuration file save error', 'settings_Server' => '', -'settings_showFullPreview' => '', -'settings_showFullPreview_desc' => '', +'settings_showFullPreview' => 'Zobrazit celý dokument', +'settings_showFullPreview_desc' => 'Povolit/zakázat zobrazení skupiny a uživatele pro všechny', 'settings_showMissingTranslations' => 'Zobrazit chybějící překlady', 'settings_showMissingTranslations_desc' => 'Vypsat všechny chybějící překlady na stránce v dolní části. Přihlášený uživatel bude moci předložit návrh na chybějící překlad, který bude uložen v souboru CSV. Nezapínejte tuto funkci v produkčním prostředí!', 'settings_showSingleSearchHit' => '', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 5f575cca0..daee0de3a 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2337), dgrutsch (21) +// Translators: Admin (2346), dgrutsch (21) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -441,6 +441,8 @@ URL: [url]', 'error_no_document_selected' => 'Kein Dokument ausgewählt', 'error_no_folder_selected' => 'Kein Ordner ausgewählt', 'error_occured' => 'Ein Fehler ist aufgetreten. Bitte Administrator benachrichtigen.', +'error_remove_document' => 'Fehler beim Löschen des Dokuments', +'error_remove_folder' => 'Fehler beim Löschen des Ordners', 'error_remove_permission' => 'Fehler beim Entfernen der Berechtigung', 'error_toogle_permission' => 'Fehler beim Ändern der Berechtigung', 'es_ES' => 'Spanisch', @@ -618,6 +620,9 @@ URL: [url]', 'librarydoc' => 'Dokument aus Bibliothek', 'linked_documents' => 'verknüpfte Dokumente', 'linked_files' => 'Anhänge', +'linked_to_current_version' => 'Mit aktueller Version verknüpft', +'linked_to_document' => 'Mit dem Dokument verknüpft', +'linked_to_this_version' => 'Mit dieser Version verknüpft', 'link_alt_updatedocument' => 'Wenn Sie ein Dokument hochladen möchten, das größer als die maximale Dateigröße ist, dann benutzen Sie bitte die alternative Upload-Seite.', 'list_contains_no_access_docs' => 'Die Liste enthält weitere Dokumente auf die Sie keinen Zugriff haben und deshalb nicht angezeigt werden.', 'list_hooks' => 'Liste interne Aufrufe', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index 3206c6ccc..e9d2f934e 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (206) +// Translators: Admin (212) $text = array( '2_factor_auth' => '', @@ -384,6 +384,8 @@ $text = array( 'error_no_document_selected' => 'Δεν έχει επιλεγεί έγγραφο', 'error_no_folder_selected' => '', 'error_occured' => 'Έγινε λάθος', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => '', 'error_toogle_permission' => '', 'es_ES' => 'Spanish/Ισπανικά', @@ -527,7 +529,7 @@ $text = array( 'keep' => '', 'keep_doc_status' => '', 'keywords' => 'Κλειδιά', -'keywords_loading' => '', +'keywords_loading' => 'Παρακαλούμε αναμείνατε. Φόρτωση λίστας λέξεων κλειδιών', 'keyword_exists' => 'Το κλειδί υπάρχει', 'ko_KR' => '', 'language' => 'Γλώσσα', @@ -537,6 +539,9 @@ $text = array( 'librarydoc' => '', 'linked_documents' => '', 'linked_files' => '', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', @@ -807,7 +812,7 @@ URL: [url]', 'ru_RU' => 'Russian/Ρωσσικά', 'saturday' => 'Σαββάτο', 'saturday_abbr' => 'Σα', -'save' => '', +'save' => 'Αποθήκευση', 'search' => 'Αναζήτηση', 'search_fulltext' => '', 'search_in' => '', @@ -827,7 +832,7 @@ URL: [url]', 'seconds' => 'δεύτερα', 'selection' => 'Επιλογή', 'select_attrdefgrp_show' => '', -'select_category' => '', +'select_category' => 'Επιλογή κατηγορίας', 'select_groups' => '', 'select_grp_approvers' => '', 'select_grp_ind_approvers' => '', @@ -851,8 +856,8 @@ URL: [url]', 'sequence' => 'Σειρά', 'seq_after' => 'Μετά "[prevname]"', 'seq_end' => 'Στο τέλος', -'seq_keep' => '', -'seq_start' => '', +'seq_keep' => 'Διατήρηση θέσης', +'seq_start' => 'Τοποθέτηση στην αρχή', 'settings' => 'Ρυθμίσεις', 'settings_activate_module' => '', 'settings_activate_php_extension' => '', @@ -1292,7 +1297,7 @@ URL: [url]', 'under_folder' => '', 'unknown_attrdef' => '', 'unknown_command' => '', -'unknown_document_category' => '', +'unknown_document_category' => 'Άγνωστη κατηγορία', 'unknown_group' => '', 'unknown_id' => '', 'unknown_keyword_category' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index d309c93d4..09b953050 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1470), dgrutsch (7), netixw (14) +// Translators: Admin (1475), dgrutsch (7), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -441,6 +441,8 @@ URL: [url]', 'error_no_document_selected' => 'No document selected', 'error_no_folder_selected' => 'No folder selected', 'error_occured' => 'An error has occurred', +'error_remove_document' => 'Error while deleting document', +'error_remove_folder' => 'Error while deleting folder', 'error_remove_permission' => 'Error while remove permission', 'error_toogle_permission' => 'Error while changing permission', 'es_ES' => 'Spanish', @@ -618,6 +620,9 @@ URL: [url]', 'librarydoc' => 'Document from library', 'linked_documents' => 'Related Documents', 'linked_files' => 'Attachments', +'linked_to_current_version' => 'Linked to current version', +'linked_to_document' => 'Linked to document', +'linked_to_this_version' => 'Linked to this version', 'link_alt_updatedocument' => 'If you would like to upload files bigger than the current maximum upload size, please use the alternative upload page.', 'list_contains_no_access_docs' => 'The list contains more documents you have no access to and are not displayed.', 'list_hooks' => 'List hooks', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index f2703fac8..31e720c9a 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -436,6 +436,8 @@ URL: [url]', 'error_no_document_selected' => 'Ningún documento seleccionado', 'error_no_folder_selected' => 'Ninguna carpeta seleccionada', 'error_occured' => 'Ha ocurrido un error', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => '', 'error_toogle_permission' => '', 'es_ES' => 'Castellano', @@ -613,6 +615,9 @@ URL: [url]', 'librarydoc' => '', 'linked_documents' => 'Documentos relacionados', 'linked_files' => 'Adjuntos', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Si desea subir archivos mayores que el tamaño máximo actualmente permitido, por favor, utilice la página de subida alternativa.', 'list_contains_no_access_docs' => '', 'list_hooks' => '', diff --git a/languages/fr_FR/help.htm b/languages/fr_FR/help.htm index b7fa69458..ddbafbd54 100644 --- a/languages/fr_FR/help.htm +++ b/languages/fr_FR/help.htm @@ -1,7 +1,181 @@ -

TODO

+

Notes Générales

+ +

+Un DMS (Document Management System) est conçu pour permettre le partage de documents en +contrôlant les flux d'approbation, les autorisations d'accès et l'organisation en général. +

+ +

+En utilisant le menu de premier niveau, l'utilisateur peut accéder aux différentes informations stockées dans le système : +

+

+ +

+Ce DMS fournit également un calendrier qui sert de pour partager des notes, des nominations, +des échéances et des engagements. +

+

Permissions

+ +

+Les utilisateurs autorisés peuvent définir si et comment d'autres utilisateurs auront accès à divers dossiers +et documents soumis. +

+ +

Niveaux d'autorisations

+

+Les niveaux d'accès possibles sont : +

+

+ +

+Par défaut, les administrateurs disposent d'autorisations totales sur chaque document et dossier +sur le système. De même, le titulaire du document a une permission totale sur ses documents. +

+ +

+Seuls les utilisateurs avec des droits administrateurs peuvent modifier le propriétaire d'un document. +

+ +

Gestion de permissions

+

+Pour chaque dossier ou documents les autorisations sont gérées par deux canaux différents : +

+

+ +

Héritage d'autorisations

+

+Les permissions des dossiers et des documents peuvent être définies comme héritées. +Dans ce cas, les fichiers et dossiers héritent des mêmes permissions du dossier +qui les contient. +

+

Chaîne d'approbation des documents

+ +

+Le système gère automatiquement le workflow pour chaque document et stocke +les modifications, les versons, les commentaires, etc... +

+ +

Cycle de validation

+

+Le flux de travail normal requiert, lors du chargement d'un nouveau document ou nouvelle version +d'indiquer certains utilisateurs ou groupes d'utilisateurs comme examinateurs et / ou approbateurs. +Les utilisateurs répertoriés comme examinateurs et approbateurs doivent expliquer leur approbation au document. +lorsque cette opération est effectuée tous les utilisateurs figurant sur la liste examinateurs/approbateur voient l'état du document mis à «libéré». +

+ +

+L'évaluateur/approbateur peut refuser son approbation au document. +Dans ce cas, l'état du document est réglé sur «rejeté». +

+ +

+Un document ou ne sont pas définis des réviseurs/approbateurs prend immédiatement l'état de «libéré». +

+ +

+Comme approbateurs/examinateurs, on peut indiquer des groupes d'utilisateurs. Dans ce cas, +l'examen ou l'approbation doit être fait par l'un des utilisateurs appartenant au groupe. +

+ +

+Le propriétaire du document peut à tout moment modifier la liste des examinateurs / approbateurs. +

+ +

Statut des Documents

+

+Les états possibles pour un document sont: +

+

+ +

Expiration

+

+Pour chaque document en production, vous pouvez définir une date d'échéance. +Une fois passé le délai, les révisions ou approbations ne sont plus possibles. +Le document entre dans un état «expiré». +

+ +

+La date limite n'est prise en compte que pour la dernière version du document +et n'a d'effet que sur le traitement des documents. +

+

Autres Fonctionnalités

+ +

Fonction Verrouillage

+

+La fonction de verrouillage est conçue pour indiquer aux autres utilisateurs qu'un document +est en cours. Les utilisateurs ayant une autorisation totale sur le document peuvent +annuler le verrouillage et procéder à une modification du document. +

+ +

Notifications

+

+Chaque utilisateur peut demander une notification sur les documents et les dossiers. +Ajout d'un fichier ou d'un dossier dans votre liste de notifications et vous recevrez +une notification des transactions par d'autres utilisateurs. +

+ +

+Seul le gestionnaire d'un groupe peut décider d'intégrer ou non un utilisateur dans le groupes des +rapports sur les documents et les dossiers. Une fois insérées, les notifications sont envoyées à +tous les membres du groupe. +

+ +

Mots clés et Recherche

+

+Chaque document permet d'inclure une description et quelques mots-clés. +Ces informations sont utilisées pour accélérer la fonction de recherche. +

+

+Dans le menu de compte personnel, chaque utilisateur peut stocker un ensemble de mots-clés regroupés +par catégories, afin d'accélérer le remplissage lors du chargement des documents. +

+ +

+En appuyant sur le bouton de recherche sans entrer de mot, vous accédez à la page de recherche avancée. +

+ + +

Calendrier

+ +

+Il ya trois vues : par semaine, mois, année. Les événements sont affichés dans l'ordre +d'insertion dans le calendrier. +

+ +

+Une fois insérés, les événements sont publics et visibles pour tous. Seul l'administrateur +qui a rentré l'événement peut le modifier plus tard. +

+ diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 26f7a46bf..54e4bf6fd 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1055), jeromerobert (50), lonnnew (9), Oudiceval (130) +// Translators: Admin (1055), jeromerobert (50), lonnnew (9), Oudiceval (132) $text = array( '2_factor_auth' => 'Authentification forte', @@ -437,10 +437,12 @@ URL: [url]', 'error_add_aro' => '', 'error_add_permission' => 'Erreur lors de l’ajout de permission', 'error_clearcache' => 'Erreur lors du vidage du cache', -'error_importfs' => '', +'error_importfs' => 'Erreur lors de l’import depuis le système de fichiers', 'error_no_document_selected' => 'Aucun document sélectionné', 'error_no_folder_selected' => 'Aucun dossier sélectionné', 'error_occured' => 'Une erreur s\'est produite', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => 'Erreur lors de la suppression de permission', 'error_toogle_permission' => 'Erreur lors de la modification de permission', 'es_ES' => 'Espagnol', @@ -618,6 +620,9 @@ URL: [url]', 'librarydoc' => '', 'linked_documents' => 'Documents liés', 'linked_files' => 'Fichiers attachés', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Pour déposer des fichiers de taille supérieure, utilisez la page d\'ajout multiple.', 'list_contains_no_access_docs' => '', 'list_hooks' => '', @@ -1271,7 +1276,7 @@ URL: [url]', 'settings_zendframework' => 'Zend Framework', 'set_expiry' => 'Modifier la date d\'expiration', 'set_owner' => 'Sélection du propriétaire', -'set_owner_error' => 'Error setting owner', +'set_owner_error' => 'Erreur lors de la définition du propriétaire', 'set_password' => 'Définir mot de passe', 'set_workflow' => 'Définir le Workflow', 'signed_in_as' => 'Connecté en tant que', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index f00a7643d..f1348bb51 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1190), marbanas (16) +// Translators: Admin (1191), marbanas (16) $text = array( '2_factor_auth' => '', @@ -441,6 +441,8 @@ Internet poveznica: [url]', 'error_no_document_selected' => 'Nije odabran dokument', 'error_no_folder_selected' => 'Nije odabrana mapa', 'error_occured' => 'Dogodila se greška', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => '', 'error_toogle_permission' => '', 'es_ES' => 'Španjolski', @@ -541,7 +543,7 @@ Internet poveznica: [url]', 'identical_version' => 'Nova verzija je identična trenutnoj verziji.', 'import' => '', 'importfs' => '', -'import_fs' => '', +'import_fs' => 'Importaj iz FS-a', 'import_fs_warning' => '', 'include_content' => 'Uključi sadržaj', 'include_documents' => 'Sadrži dokumente', @@ -618,6 +620,9 @@ Internet poveznica: [url]', 'librarydoc' => 'Dokument iz biblioteke', 'linked_documents' => 'Vezani dokumenti', 'linked_files' => 'Prilozi', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Ako želite prenijeti datoteke veće od trenutne maksimalne veličine prijenosa, molimo koristite alternativu upload page.', 'list_contains_no_access_docs' => '', 'list_hooks' => '', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index d343c24f5..9f849983c 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (598), ribaz (1023) +// Translators: Admin (601), ribaz (1023) $text = array( '2_factor_auth' => '', @@ -436,6 +436,8 @@ URL: [url]', 'error_no_document_selected' => 'Nincs kijelölt dokumentum', 'error_no_folder_selected' => 'Nincs kijelölt mappa', 'error_occured' => 'Hiba történt', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => '', 'error_toogle_permission' => '', 'es_ES' => 'Spanyol', @@ -613,6 +615,9 @@ URL: [url]', 'librarydoc' => '', 'linked_documents' => 'Kapcsolódó dokumentumok', 'linked_files' => 'Mellékletek', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Ha a jelenlegi maximális feltöltési méretnél nagyobb állományokat szeretne feltölteni, akkor használja az alternatív feltöltő oldalt.', 'list_contains_no_access_docs' => '', 'list_hooks' => '', @@ -796,7 +801,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a 'personal_default_keywords' => 'Személyes kulcsszó lista', 'pl_PL' => 'Lengyel', 'possible_substitutes' => '', -'preview' => '', +'preview' => 'Előnézet', 'preview_converters' => '', 'preview_markdown' => '', 'preview_plain' => '', @@ -1392,7 +1397,7 @@ URL: [url]', 'thursday' => 'Csütörtök', 'thursday_abbr' => 'Cs', 'timeline' => 'Vremenska crta', -'timeline_add_file' => '', +'timeline_add_file' => 'Új csatolmány', 'timeline_add_version' => '', 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 72079a429..19a2f7e08 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1532), rickr (144), s.pnt (26) +// Translators: Admin (1537), rickr (144), s.pnt (26) $text = array( '2_factor_auth' => 'Autorizzazione a due fattori', @@ -442,6 +442,8 @@ URL: [url]', 'error_no_document_selected' => 'Nessun documento selezionato', 'error_no_folder_selected' => 'Nessuna cartella selezionata', 'error_occured' => 'Ooops... Si è verificato un errore', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => 'Errore durante la rimozione delle autorizzazioni', 'error_toogle_permission' => 'Errore durante la modifica permessi', 'es_ES' => 'Spagnolo', @@ -619,6 +621,9 @@ URL: [url]', 'librarydoc' => 'Documento da cartella', 'linked_documents' => 'Documenti collegati', 'linked_files' => 'Allegati', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Se vuoi caricare file più grandi del limite massimo attuale, usa la pagina alternativa di upload.', 'list_contains_no_access_docs' => '', 'list_hooks' => 'Lista ganci', @@ -1056,7 +1061,7 @@ URL: [url]', 'settings_contentOffsetDir' => 'Cartella Offset', 'settings_contentOffsetDir_desc' => 'Per supplire a limitazioni all\'utilizzo del filesystem è stata concepita una nuova struttura di cartelle all\'interno della cartella contenitore (Content Directory). Questa necessita di una cartella di partenza: di solito è sufficiente lasciare il nome di default, 1048576, ma può essere usato un qualsiasi numero o stringa che non esistano già all\'interno della cartella contenitore (Content Directory)', 'settings_convertToPdf' => '', -'settings_convertToPdf_desc' => '', +'settings_convertToPdf_desc' => 'Se il documento non può essere nativamente mostrato nel browser, verrà mostrata una versione in PDF.', 'settings_cookieLifetime' => 'Tempo di vita del cookie', 'settings_cookieLifetime_desc' => 'Tempo di vita del cookie in secondi: se impostato su 0 il cookie verrà rimosso alla chiusura del browser', 'settings_coreDir' => 'Cartella principale dell\'applicazione', @@ -1259,12 +1264,12 @@ URL: [url]', 'settings_rootFolderID_desc' => 'ID della cartella principale (non dovrebbe essere necessario modificarlo)', 'settings_SaveError' => 'Errore di salvataggio del file di configurazione', 'settings_Server' => 'Impostazioni Server', -'settings_showFullPreview' => '', -'settings_showFullPreview_desc' => '', +'settings_showFullPreview' => 'Mostra il documento completo', +'settings_showFullPreview_desc' => 'Abilita/disabilita una preview completa del documento sulla pagina dei dettagli, se il browser è in grado di eseguirlo.', 'settings_showMissingTranslations' => 'Mostra traduzioni mancanti', 'settings_showMissingTranslations_desc' => 'Elenca tutte le traduzioni mancanti alla fine della pagina. L\'utente collegato potrà sottoporre una proposta per le traduzioni mancanti che verrà salvata in un file .csv. Da non usarsi in un ambiente di produzione.', -'settings_showSingleSearchHit' => '', -'settings_showSingleSearchHit_desc' => '', +'settings_showSingleSearchHit' => 'Salta direttamente ad un singolo elemento di ricerca', +'settings_showSingleSearchHit_desc' => 'Se i risultati di ricerca daranno origine ad un solo elemento, allora sarà visualizzato al posto della lista dei risultati.', 'settings_Site' => 'Sito', 'settings_siteDefaultPage' => 'Pagina iniziale', 'settings_siteDefaultPage_desc' => 'Pagina iniziale di default del sito. Se lasciato vuoto punta su: out/out.ViewFolder.php', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 956aa0a67..e97e9af67 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -441,6 +441,8 @@ URL: [url]', 'error_no_document_selected' => '선택되지 문서는', 'error_no_folder_selected' => '어떤 폴더를 선택하지', 'error_occured' => '오류가 발생했습니다', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => '', 'error_toogle_permission' => '', 'es_ES' => '스페인어', @@ -618,6 +620,9 @@ URL: [url]', 'librarydoc' => '라이브러리의 문서', 'linked_documents' => '관련 문서', 'linked_files' => '첨부 파일', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => '최대 업로드 크기보다 큰 파일을 업로드하려는 경우, 대체 업로드 페이지를 upload page 사용하십시오.', 'list_contains_no_access_docs' => '', 'list_hooks' => '', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 40e6fc25f..f72bff827 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -434,6 +434,8 @@ URL: [url]', 'error_no_document_selected' => 'Geen document geselecteerd', 'error_no_folder_selected' => 'Geen map geselecteerd', 'error_occured' => 'Er is een fout opgetreden', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => 'Verwijder permissie', 'error_toogle_permission' => 'Wijzig permissie', 'es_ES' => 'Spaans', @@ -611,6 +613,9 @@ URL: [url]', 'librarydoc' => 'Bibliotheek', 'linked_documents' => 'Gerelateerde Documenten', 'linked_files' => 'Bijlagen', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Als u bestanden wilt uploaden groter dan het huidige maximum, gebruik aub de alternatieve upload pagina.', 'list_contains_no_access_docs' => '', 'list_hooks' => '', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index e46ce1b57..b4dbddec3 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -429,6 +429,8 @@ URL: [url]', 'error_no_document_selected' => 'Brak wybranych dokumentów', 'error_no_folder_selected' => 'Brak wybranych katalogów', 'error_occured' => 'Wystąpił błąd', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => '', 'error_toogle_permission' => '', 'es_ES' => 'Hiszpański', @@ -606,6 +608,9 @@ URL: [url]', 'librarydoc' => '', 'linked_documents' => 'Powiązane dokumenty', 'linked_files' => 'Załączniki', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Jeśli chcesz wczytać pliki większe niż bieżące maksimum, użyj alternatywnej strony wczytywania.', 'list_contains_no_access_docs' => '', 'list_hooks' => '', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 6a1e6016d..58c2a543b 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/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 (931), flaviove (627), lfcristofoli (352) +// Translators: Admin (932), flaviove (627), lfcristofoli (352) $text = array( '2_factor_auth' => '', @@ -435,6 +435,8 @@ URL: [url]', 'error_no_document_selected' => 'Nenhum documento selecionado', 'error_no_folder_selected' => 'Nenhuma pasta selecionada', 'error_occured' => 'Ocorreu um erro', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => '', 'error_toogle_permission' => '', 'es_ES' => 'Espanhol', @@ -612,6 +614,9 @@ URL: [url]', 'librarydoc' => '', 'linked_documents' => 'Documentos relacionados', 'linked_files' => 'Arquivos anexados', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Se você gostaria de fazer envio de arquivos maiores que o tamanho permitido, por favor use a página alternativa de envio.', 'list_contains_no_access_docs' => '', 'list_hooks' => '', @@ -794,7 +799,7 @@ Se você ainda tiver problemas para fazer o login, por favor, contate o administ 'personal_default_keywords' => 'palavras-chave pessoais', 'pl_PL' => 'Polonês', 'possible_substitutes' => '', -'preview' => '', +'preview' => 'visualizar', 'preview_converters' => '', 'preview_markdown' => '', 'preview_plain' => '', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index c7e44a3b5..ec2bd5c11 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -441,6 +441,8 @@ URL: [url]', 'error_no_document_selected' => 'Nici un document selectat', 'error_no_folder_selected' => 'Nici un folder selectat', 'error_occured' => 'An error has occured', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => '', 'error_toogle_permission' => '', 'es_ES' => 'Spaniola', @@ -618,6 +620,9 @@ URL: [url]', 'librarydoc' => '', 'linked_documents' => 'Documente relationate', 'linked_files' => 'Atașamente', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Dacă doriți să încărcați fișiere mai mari decât dimensiunea maximă curentă de încărcare, vă rugăm să folosiți alternativa pagină de încărcare.', 'list_contains_no_access_docs' => '', 'list_hooks' => '', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 4fbd5c782..f41592d02 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -441,6 +441,8 @@ URL: [url]', 'error_no_document_selected' => 'Нет выбранных документов', 'error_no_folder_selected' => 'Нет выбранных каталогов', 'error_occured' => 'Произошла ошибка', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => 'Ошибка снятия разрешения', 'error_toogle_permission' => 'Ошибка смены разрешения', 'es_ES' => 'Spanish', @@ -618,6 +620,9 @@ URL: [url]', 'librarydoc' => 'Документ из библиотеки', 'linked_documents' => 'Связанные документы', 'linked_files' => 'Приложения', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Для загрузки файлов, превышающих ограничение размера, используйте другой способ.', 'list_contains_no_access_docs' => '', 'list_hooks' => 'Список хуков', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 343166698..4547b86aa 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -388,6 +388,8 @@ URL: [url]', 'error_no_document_selected' => '', 'error_no_folder_selected' => '', 'error_occured' => 'Vyskytla sa chyba', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => '', 'error_toogle_permission' => '', 'es_ES' => 'Španielčina', @@ -541,6 +543,9 @@ URL: [url]', 'librarydoc' => '', 'linked_documents' => 'Súvisiace dokumenty', 'linked_files' => 'Prílohy', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 170c9a9b7..e1c583724 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -429,6 +429,8 @@ URL: [url]', 'error_no_document_selected' => 'Inget dokument har valts', 'error_no_folder_selected' => 'Ingen katalog har valts', 'error_occured' => 'Ett fel har inträffat.', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => '', 'error_toogle_permission' => '', 'es_ES' => 'spanska', @@ -606,6 +608,9 @@ URL: [url]', 'librarydoc' => '', 'linked_documents' => 'Relaterade dokument', 'linked_files' => 'Bilagor', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Om du vill ladda upp filer som är större än den aktuella största tillåtna storleken, använd dig av den alternativa metoden att ladda upp filer Alternativ uppladdning.', 'list_contains_no_access_docs' => '', 'list_hooks' => '', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 19194291b..b76029cb1 100644 --- a/languages/tr_TR/lang.inc +++ b/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 (1044), aydin (83) +// Translators: Admin (1045), aydin (83) $text = array( '2_factor_auth' => '', @@ -435,6 +435,8 @@ URL: [url]', 'error_no_document_selected' => 'Hiçbir doküman seçilmedi', 'error_no_folder_selected' => 'Hiçbir klasör seçilmedi', 'error_occured' => 'Bir hata oluştu', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => '', 'error_toogle_permission' => '', 'es_ES' => 'İspanyolca', @@ -612,6 +614,9 @@ URL: [url]', 'librarydoc' => '', 'linked_documents' => 'İlgili Dokümanlar', 'linked_files' => 'Ekler', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Mevcut maksimum yükleme boyutundan daha büyük dosya yüklemek istiyorsanız alternatif yükleme sayfası için tıklayın.', 'list_contains_no_access_docs' => '', 'list_hooks' => '', @@ -797,7 +802,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü 'personal_default_keywords' => 'Kişisel anahtar kelimeler', 'pl_PL' => 'Polonyaca', 'possible_substitutes' => '', -'preview' => '', +'preview' => 'Önizle', 'preview_converters' => '', 'preview_markdown' => '', 'preview_plain' => '', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 244941549..8a8212eeb 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -441,6 +441,8 @@ URL: [url]', 'error_no_document_selected' => 'Немає вибраних документів', 'error_no_folder_selected' => 'Немає вибраних каталогів', 'error_occured' => 'Виникла помилка', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => '', 'error_toogle_permission' => '', 'es_ES' => 'Spanish', @@ -618,6 +620,9 @@ URL: [url]', 'librarydoc' => 'Документ з бібліотеки', 'linked_documents' => 'Пов\'язані документи', 'linked_files' => 'Пов\'язані файли', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Для завантаження файлів, які перевищують обмеження розміру, використовуйте інший метод.', 'list_contains_no_access_docs' => '', 'list_hooks' => '', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index c29636bd1..e5b6fa96e 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -390,6 +390,8 @@ URL: [url]', 'error_no_document_selected' => '请选择文档', 'error_no_folder_selected' => '请选择文件夹', 'error_occured' => '出错', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => '', 'error_toogle_permission' => '', 'es_ES' => '西班牙语', @@ -543,6 +545,9 @@ URL: [url]', 'librarydoc' => '', 'linked_documents' => '相关文档', 'linked_files' => '附件', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => '超过20M大文件，请选择上传大文件.', 'list_contains_no_access_docs' => '', 'list_hooks' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 0442e3e71..2e70edf5c 100644 --- a/languages/zh_TW/lang.inc +++ b/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 (2371) +// Translators: Admin (2374) $text = array( '2_factor_auth' => '', @@ -227,7 +227,7 @@ URL: [url]', 'choose_workflow_action' => '選擇流程行為', 'choose_workflow_state' => '選擇流程狀態', 'class_name' => '', -'clear_cache' => '', +'clear_cache' => '清除緩存', 'clear_clipboard' => '清除剪貼簿', 'clear_password' => '', 'clipboard' => '剪貼簿', @@ -369,7 +369,7 @@ URL: [url]', 'edit_user' => '編輯用戶', 'edit_user_details' => '編輯用戶詳情', 'edit_version' => '', -'el_GR' => '', +'el_GR' => '希臘語', 'email' => 'Email', 'email_error_title' => '', 'email_footer' => '您可以用‘我的帳戶’選項來改變您的e-mail設置', @@ -388,6 +388,8 @@ URL: [url]', 'error_no_document_selected' => '請選擇文檔', 'error_no_folder_selected' => '請選擇資料夾', 'error_occured' => '出錯', +'error_remove_document' => '', +'error_remove_folder' => '', 'error_remove_permission' => '', 'error_toogle_permission' => '', 'es_ES' => '西班牙語', @@ -464,7 +466,7 @@ URL: [url]', 'identical_version' => '新版本的內容與舊版本完全相同', 'import' => '', 'importfs' => '', -'import_fs' => '', +'import_fs' => '由檔案系統匯入', 'import_fs_warning' => '', 'include_content' => '', 'include_documents' => '包含文檔', @@ -541,6 +543,9 @@ URL: [url]', 'librarydoc' => '', 'linked_documents' => '相關文檔', 'linked_files' => '附件', +'linked_to_current_version' => '', +'linked_to_document' => '', +'linked_to_this_version' => '', 'link_alt_updatedocument' => '超過20M大檔，請選擇上傳大檔.', 'list_contains_no_access_docs' => '', 'list_hooks' => '', diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php index c984f13f8..f6d16a63f 100644 --- a/op/op.AddDocument.php +++ b/op/op.AddDocument.php @@ -379,8 +379,12 @@ for ($file_num=0;$file_numgetNotifyList(); - $notifyList2 = $document->getNotifyList(); + $fnl = $folder->getNotifyList(); + $dnl = $document->getNotifyList(); + $nl = array( + 'users'=>array_merge($dnl['users'], $fnl['users']), + 'groups'=>array_merge($dnl['groups'], $fnl['groups']) + ); $subject = "new_document_email_subject"; $message = "new_document_email_body"; @@ -394,12 +398,8 @@ for ($file_num=0;$file_num_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $notifier->toList($user, $notifyList1["users"], $subject, $message, $params); - foreach ($notifyList1["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message, $params); - } - $notifier->toList($user, $notifyList2["users"], $subject, $message, $params); - foreach ($notifyList2["groups"] as $grp) { + $notifier->toList($user, $nl["users"], $subject, $message, $params); + foreach ($nl["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); } @@ -450,7 +450,7 @@ for ($file_num=0;$file_numfalse, 'message'=>'Error removing folder', 'data'=>'')); + echo json_encode(array('success'=>false, 'message'=>getMLText('error_remove_folder'), 'data'=>'')); } } else { header('Content-Type: application/json'); @@ -441,7 +441,7 @@ switch($command) { add_log_line(); } else { header('Content-Type: application/json'); - echo json_encode(array('success'=>false, 'message'=>'Error removing document', 'data'=>'')); + echo json_encode(array('success'=>false, 'message'=>getMLText('error_remove_document'), 'data'=>'')); } } else { header('Content-Type: application/json'); @@ -719,6 +719,7 @@ switch($command) { $cats = array(); + $filesize = SeedDMS_Core_File::fileSize($userfiletmp); $res = $folder->addDocument($name, '', $expires, $user, '', array(), $userfiletmp, basename($userfilename), $fileType, $userfiletype, 0, @@ -739,15 +740,10 @@ switch($command) { } } if($settings->_enableFullSearch) { - if(!empty($settings->_luceneClassDir)) - require_once($settings->_luceneClassDir.'/Lucene.php'); - else - require_once('SeedDMS/Lucene.php'); - - $index = SeedDMS_Lucene_Indexer::open($settings->_luceneDir); + $index = $indexconf['Indexer']::open($settings->_luceneDir); if($index) { - SeedDMS_Lucene_Indexer::init($settings->_stopWordsFile); - $index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, true)); + $indexconf['Indexer']::init($settings->_stopWordsFile); + $index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText))); } } diff --git a/op/op.DocumentAccess.php b/op/op.DocumentAccess.php index 13029104b..fcdc674c3 100644 --- a/op/op.DocumentAccess.php +++ b/op/op.DocumentAccess.php @@ -129,26 +129,6 @@ if ($action == "setowner") { if($notifier) { $notifyList = $document->getNotifyList(); $folder = $document->getFolder(); - -/* - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("ownership_changed_email"); - $message = getMLText("ownership_changed_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("old").": ".$oldOwner->getFullName()."\r\n". - getMLText("new").": ".$newOwner->getFullName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - getMLText("comment").": ".$document->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toList($user, $document->_notifyList["users"], $subject, $message); - foreach ($document->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } - // Send notification to previous owner. - $notifier->toIndividual($user, $oldOwner, $subject, $message); -*/ - $subject = "ownership_changed_email_subject"; $message = "ownership_changed_email_body"; $params = array(); @@ -164,7 +144,7 @@ if ($action == "setowner") { foreach ($notifyList["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); } - $notifier->toIndividual($user, $oldOwner, $subject, $message, $params); +// $notifier->toIndividual($user, $oldOwner, $subject, $message, $params); } } @@ -178,21 +158,6 @@ else if ($action == "notinherit") { if($notifier) { $notifyList = $document->getNotifyList(); $folder = $document->getFolder(); - -/* - // Send notification to subscribers. - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("access_permission_changed_email"); - $message = getMLText("access_permission_changed_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toList($user, $document->_notifyList["users"], $subject, $message); - foreach ($document->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ $subject = "access_permission_changed_email_subject"; $message = "access_permission_changed_email_body"; $params = array(); @@ -213,24 +178,6 @@ else if ($action == "notinherit") { if($notifier) { $notifyList = $document->getNotifyList(); $folder = $document->getFolder(); - -/* - // Send notification to subscribers. - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("access_permission_changed_email"); - $message = getMLText("access_permission_changed_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - -// $subject=mydmsDecodeString($subject); -// $message=mydmsDecodeString($message); - - $notifier->toList($user, $document->_notifyList["users"], $subject, $message); - foreach ($document->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ $subject = "access_permission_changed_email_subject"; $message = "access_permission_changed_email_body"; $params = array(); @@ -260,8 +207,26 @@ else if ($action == "notinherit") { // Change to inherit----------------------------------------------------- else if ($action == "inherit") { - $document->clearAccessList(); - $document->setInheritAccess(true); + if($document->clearAccessList() && $document->setInheritAccess(true)) { + if($notifier) { + $notifyList = $document->getNotifyList(); + $folder = $document->getFolder(); + $subject = "access_permission_changed_email_subject"; + $message = "access_permission_changed_email_body"; + $params = array(); + $params['name'] = $document->getName(); + $params['folder_path'] = $folder->getFolderPathPlain(); + $params['username'] = $user->getFullName(); + $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['sitename'] = $settings->_siteName; + $params['http_root'] = $settings->_httpRoot; + $notifier->toList($user, $notifyList["users"], $subject, $message, $params); + foreach ($notifyList["groups"] as $grp) { + $notifier->toGroup($user, $grp, $subject, $message, $params); + } + + } + } } // Set default permissions ---------------------------------------------- @@ -270,21 +235,6 @@ else if ($action == "setdefault") { if($notifier) { $notifyList = $document->getNotifyList(); $folder = $document->getFolder(); - -/* - // Send notification to subscribers. - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("access_permission_changed_email"); - $message = getMLText("access_permission_changed_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toList($user, $document->_notifyList["users"], $subject, $message); - foreach ($document->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ $subject = "access_permission_changed_email_subject"; $message = "access_permission_changed_email_body"; $params = array(); diff --git a/op/op.DocumentNotify.php b/op/op.DocumentNotify.php index 5b1e99aca..fd9c8f6c6 100644 --- a/op/op.DocumentNotify.php +++ b/op/op.DocumentNotify.php @@ -97,22 +97,6 @@ if ($action == "delnotify"){ case 0: // Email user / group, informing them of subscription change. if($notifier) { -/* - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("notify_deleted_email"); - $message = getMLText("notify_deleted_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("folder").": ".$path."\r\n". - getMLText("comment").": ".$document->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - if (isset($userid)) { - $notifier->toIndividual($user, $obj, $subject, $message); - } - else if (isset($groupid)) { - $notifier->toGroup($user, $obj, $subject, $message); - } -*/ $subject = "notify_deleted_email_subject"; $message = "notify_deleted_email_body"; $params = array(); @@ -156,25 +140,6 @@ else if ($action == "addnotify") { // Email user / group, informing them of subscription. if ($notifier){ $obj = $dms->getUser($userid); -/* - $path=""; - $folder = $document->getFolder(); - $folderPath = $folder->getPath(); - for ($i = 0; $i < count($folderPath); $i++) { - $path .= $folderPath[$i]->getName(); - if ($i +1 < count($folderPath)) - $path .= " / "; - } - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("notify_added_email"); - $message = getMLText("notify_added_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("folder").": ".$path."\r\n". - getMLText("comment").": ".$document->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toIndividual($user, $obj, $subject, $message); -*/ $subject = "notify_added_email_subject"; $message = "notify_added_email_body"; $params = array(); @@ -209,25 +174,6 @@ else if ($action == "addnotify") { case 0: if ($notifier){ $obj = $dms->getGroup($groupid); -/* - $path=""; - $folder = $document->getFolder(); - $folderPath = $folder->getPath(); - for ($i = 0; $i < count($folderPath); $i++) { - $path .= $folderPath[$i]->getName(); - if ($i +1 < count($folderPath)) - $path .= " / "; - } - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("notify_added_email"); - $message = getMLText("notify_added_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("folder").": ".$path."\r\n". - getMLText("comment").": ".$document->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toGroup($user, $obj, $subject, $message); -*/ $subject = "notify_added_email_subject"; $message = "notify_added_email_body"; $params = array(); diff --git a/op/op.EditAttributes.php b/op/op.EditAttributes.php index d961aeec9..22051bf74 100644 --- a/op/op.EditAttributes.php +++ b/op/op.EditAttributes.php @@ -93,8 +93,8 @@ if($attributes) { $notifier->toGroup($user, $grp, $subject, $message, $params); } // if user is not owner send notification to owner - if ($user->getID() != $document->getOwner()->getID()) - $notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params); +// if ($user->getID() != $document->getOwner()->getID()) +// $notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params); } } diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php index fd5b62c96..35ab44e6b 100644 --- a/op/op.EditDocument.php +++ b/op/op.EditDocument.php @@ -79,25 +79,6 @@ if (($oldname = $document->getName()) != $name) { if($notifier) { $notifyList = $document->getNotifyList(); $folder = $document->getFolder(); -/* - $subject = "###SITENAME###: ".$oldname." - ".getMLText("document_renamed_email"); - $message = getMLText("document_renamed_email")."\r\n"; - $message .= - getMLText("old").": ".$oldname."\r\n". - getMLText("new").": ".$name."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - getMLText("comment").": ".$document->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toList($user, $document->_notifyList["users"], $subject, $message); - foreach ($document->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } - - // if user is not owner send notification to owner - if ($user->getID() != $document->getOwner()->getID()) - $notifier->toIndividual($user, $document->getOwner(), $subject, $message); -*/ $subject = "document_renamed_email_subject"; $message = "document_renamed_email_body"; $params = array(); @@ -132,25 +113,6 @@ if (($oldcomment = $document->getComment()) != $comment) { if($notifier) { $notifyList = $document->getNotifyList(); $folder = $document->getFolder(); - -/* - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("comment_changed_email"); - $message = getMLText("document_comment_changed_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - getMLText("comment").": ".$comment."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toList($user, $document->_notifyList["users"], $subject, $message); - foreach ($document->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } - - // if user is not owner send notification to owner - if ($user->getID() != $document->getOwner()) - $notifier->toIndividual($user, $document->getOwner(), $subject, $message); -*/ $subject = "document_comment_changed_email_subject"; $message = "document_comment_changed_email_body"; $params = array(); diff --git a/op/op.EditFolder.php b/op/op.EditFolder.php index 09261361b..c6ac9dee0 100644 --- a/op/op.EditFolder.php +++ b/op/op.EditFolder.php @@ -99,8 +99,8 @@ if($oldname != $name) { $notifier->toGroup($user, $grp, $subject, $message, $params); } // if user is not owner send notification to owner - if ($user->getID() != $folder->getOwner()->getID()) - $notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params); +// if ($user->getID() != $folder->getOwner()->getID()) +// $notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params); } } @@ -125,8 +125,8 @@ if($oldcomment != $comment) { $notifier->toGroup($user, $grp, $subject, $message, $params); } // if user is not owner send notification to owner - if ($user->getID() != $folder->getOwner()->getID()) - $notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params); +// if ($user->getID() != $folder->getOwner()->getID()) +// $notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params); } } diff --git a/op/op.FolderAccess.php b/op/op.FolderAccess.php index cff716a57..27cf95b27 100644 --- a/op/op.FolderAccess.php +++ b/op/op.FolderAccess.php @@ -126,23 +126,6 @@ if ($action == "setowner") { if($notifier) { // Send notification to subscribers. $notifyList = $folder->getNotifyList(); -/* - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("ownership_changed_email"); - $message = getMLText("ownership_changed_email")."\r\n"; - $message .= - getMLText("name").": ".$folder->getName()."\r\n". - getMLText("old").": ".$oldOwner->getFullName()."\r\n". - getMLText("new").": ".$newOwner->getFullName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - getMLText("comment").": ".$folder->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - - $notifier->toList($user, $folder->_notifyList["users"], $subject, $message); - foreach ($folder->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ - $subject = "ownership_changed_email_subject"; $message = "ownership_changed_email_body"; $params = array(); @@ -161,7 +144,7 @@ if ($action == "setowner") { foreach ($notifyList["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); } - $notifier->toIndividual($user, $oldOwner, $subject, $message, $params); +// $notifier->toIndividual($user, $oldOwner, $subject, $message, $params); } } else { @@ -177,19 +160,6 @@ else if ($action == "notinherit") { if($notifier) { // Send notification to subscribers. $notifyList = $folder->getNotifyList(); -/* - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("access_permission_changed_email"); - $message = getMLText("access_permission_changed_email")."\r\n"; - $message .= - getMLText("name").": ".$folder->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - - $notifier->toList($user, $folder->_notifyList["users"], $subject, $message); - foreach ($folder->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ $subject = "access_permission_changed_email_subject"; $message = "access_permission_changed_email_body"; $params = array(); @@ -213,19 +183,6 @@ else if ($action == "notinherit") { if($notifier) { // Send notification to subscribers. $notifyList = $folder->getNotifyList(); -/* - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("access_permission_changed_email"); - $message = getMLText("access_permission_changed_email")."\r\n"; - $message .= - getMLText("name").": ".$folder->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - - $notifier->toList($user, $folder->_notifyList["users"], $subject, $message); - foreach ($folder->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ $subject = "access_permission_changed_email_subject"; $message = "access_permission_changed_email_body"; $params = array(); @@ -265,21 +222,6 @@ else if ($action == "inherit") { if($notifier) { // Send notification to subscribers. $notifyList = $folder->getNotifyList(); - -/* - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("access_permission_changed_email"); - $message = getMLText("access_permission_changed_email")."\r\n"; - $message .= - getMLText("name").": ".$folder->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - - $notifier->toList($user, $folder->_notifyList["users"], $subject, $message); - foreach ($folder->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ - $subject = "access_permission_changed_email_subject"; $message = "access_permission_changed_email_body"; $params = array(); @@ -307,20 +249,6 @@ else if ($action == "setdefault") { if($notifier) { // Send notification to subscribers. $notifyList = $folder->getNotifyList(); -/* - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("access_permission_changed_email"); - $message = getMLText("access_permission_changed_email")."\r\n"; - $message .= - getMLText("name").": ".$folder->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - - $notifier->toList($user, $folder->_notifyList["users"], $subject, $message); - foreach ($folder->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ - $subject = "access_permission_changed_email_subject"; $message = "access_permission_changed_email_body"; $params = array(); diff --git a/op/op.FolderNotify.php b/op/op.FolderNotify.php index 5c54f7fe8..67c7a75bd 100644 --- a/op/op.FolderNotify.php +++ b/op/op.FolderNotify.php @@ -96,22 +96,6 @@ if ($action == "delnotify") { case 0: if($notifier) { // Email user / group, informing them of subscription. -/* - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("notify_deleted_email"); - $message = getMLText("notify_deleted_email")."\r\n"; - $message .= - getMLText("name").": ".$folder->getName()."\r\n". - getMLText("folder").": ".$path."\r\n". - getMLText("comment").": ".$folder->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - - if ($userid > 0) { - $notifier->toIndividual($user, $obj, $subject, $message); - } - else { - $notifier->toGroup($user, $obj, $subject, $message); - } -*/ $subject = "notify_deleted_email_subject"; $message = "notify_deleted_email_body"; $params = array(); @@ -155,24 +139,6 @@ else if ($action == "addnotify") { if($notifier) { $obj = $dms->getUser($userid); // Email user / group, informing them of subscription. -/* - $path=""; - $folderPath = $folder->getPath(); - for ($i = 0; $i < count($folderPath); $i++) { - $path .= $folderPath[$i]->getName(); - if ($i +1 < count($folderPath)) - $path .= " / "; - } - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("notify_added_email"); - $message = getMLText("notify_added_email")."\r\n"; - $message .= - getMLText("name").": ".$folder->getName()."\r\n". - getMLText("folder").": ".$path."\r\n". - getMLText("comment").": ".$folder->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - - $notifier->toIndividual($user, $obj, $subject, $message); -*/ $subject = "notify_added_email_subject"; $message = "notify_added_email_body"; $params = array(); @@ -208,24 +174,6 @@ else if ($action == "addnotify") { if($notifier) { $obj = $dms->getGroup($groupid); // Email user / group, informing them of subscription. -/* - $path=""; - $folderPath = $folder->getPath(); - for ($i = 0; $i < count($folderPath); $i++) { - $path .= $folderPath[$i]->getName(); - if ($i +1 < count($folderPath)) - $path .= " / "; - } - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("notify_added_email"); - $message = getMLText("notify_added_email")."\r\n"; - $message .= - getMLText("name").": ".$folder->getName()."\r\n". - getMLText("folder").": ".$path."\r\n". - getMLText("comment").": ".$folder->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - - $notifier->toGroup($user, $obj, $subject, $message); -*/ $subject = "notify_added_email_subject"; $message = "notify_added_email_body"; $params = array(); diff --git a/op/op.ManageNotify.php b/op/op.ManageNotify.php index 0cfed8632..c58d7d665 100644 --- a/op/op.ManageNotify.php +++ b/op/op.ManageNotify.php @@ -113,25 +113,6 @@ if ($_GET["type"]=="document"){ if($notifier) { $obj = $dms->getUser($userid); // Email user / group, informing them of subscription. -/* - $path=""; - $folderPath = $folder->getPath(); - for ($i = 0; $i < count($folderPath); $i++) { - $path .= $folderPath[$i]->getName(); - if ($i +1 < count($folderPath)) - $path .= " / "; - } - - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("notify_deleted_email"); - $message = getMLText("notify_deleted_email")."\r\n"; - $message .= - getMLText("name").": ".$folder->getName()."\r\n". - getMLText("folder").": ".$path."\r\n". - getMLText("comment").": ".$folder->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - - $notifier->toIndividual($user, $obj, $subject, $message); -*/ $subject = "notify_deleted_email_subject"; $message = "notify_deleted_email_body"; $params = array(); diff --git a/op/op.MoveClipboard.php b/op/op.MoveClipboard.php index 7b93bec05..5dae9c0b1 100644 --- a/op/op.MoveClipboard.php +++ b/op/op.MoveClipboard.php @@ -56,7 +56,13 @@ foreach($clipboard['docs'] as $documentid) { if ($document->setFolder($targetFolder)) { // Send notification to subscribers. if($notifier) { - $notifyList = $document->getNotifyList(); + $nl1 = $oldFolder->getNotifyList(); + $nl2 = $document->getNotifyList(); + $nl3 = $targetFolder->getNotifyList(); + $nl = array( + 'users'=>array_merge($nl1['users'], $nl2['users'], $nl3['users']), + 'groups'=>array_merge($nl1['groups'], $nl2['groups'], $nl3['groups']) + ); $subject = "document_moved_email_subject"; $message = "document_moved_email_body"; $params = array(); @@ -67,13 +73,13 @@ foreach($clipboard['docs'] as $documentid) { $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $notifier->toList($user, $notifyList["users"], $subject, $message, $params); - foreach ($notifyList["groups"] as $grp) { + $notifier->toList($user, $nl["users"], $subject, $message, $params); + foreach ($nl["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); } // if user is not owner send notification to owner - if ($user->getID() != $document->getOwner()->getID()) - $notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params); +// if ($user->getID() != $document->getOwner()->getID()) +// $notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params); } $session->removeFromClipboard($document); @@ -97,7 +103,13 @@ foreach($clipboard['folders'] as $folderid) { if ($folder->setParent($targetFolder)) { // Send notification to subscribers. if($notifier) { - $notifyList = $folder->getNotifyList(); + $nl1 = $oldFolder->getNotifyList(); + $nl2 = $folder->getNotifyList(); + $nl3 = $targetFolder->getNotifyList(); + $nl = array( + 'users'=>array_merge($nl1['users'], $nl2['users'], $nl3['users']), + 'groups'=>array_merge($nl1['groups'], $nl2['groups'], $nl3['groups']) + ); $subject = "folder_moved_email_subject"; $message = "folder_moved_email_body"; $params = array(); @@ -108,13 +120,13 @@ foreach($clipboard['folders'] as $folderid) { $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $notifier->toList($user, $notifyList["users"], $subject, $message, $params); - foreach ($notifyList["groups"] as $grp) { + $notifier->toList($user, $nl["users"], $subject, $message, $params); + foreach ($nl["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); } // if user is not owner send notification to owner - if ($user->getID() != $folder->getOwner()->getID()) - $notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params); +// if ($user->getID() != $folder->getOwner()->getID()) +// $notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params); } $session->removeFromClipboard($folder); diff --git a/op/op.MoveDocument.php b/op/op.MoveDocument.php index 6b4a1f154..8fa4d9e95 100644 --- a/op/op.MoveDocument.php +++ b/op/op.MoveDocument.php @@ -66,25 +66,13 @@ if ($targetid != $oldFolder->getID()) { if ($document->setFolder($targetFolder)) { // Send notification to subscribers. if($notifier) { - $notifyList = $document->getNotifyList(); -/* - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_moved_email"); - $message = getMLText("document_moved_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("folder").": ".$oldFolder->getFolderPathPlain()."\r\n". - getMLText("new_folder").": ".$targetFolder->getFolderPathPlain()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toList($user, $document->_notifyList["users"], $subject, $message); - foreach ($document->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } - - // if user is not owner send notification to owner - if ($user->getID()!= $document->getOwner()) - $notifier->toIndividual($user, $document->getOwner(), $subject, $message); -*/ + $nl1 = $oldFolder->getNotifyList(); + $nl2 = $document->getNotifyList(); + $nl3 = $targetFolder->getNotifyList(); + $nl = array( + 'users'=>array_merge($nl1['users'], $nl2['users'], $nl3['users']), + 'groups'=>array_merge($nl1['groups'], $nl2['groups'], $nl3['groups']) + ); $subject = "document_moved_email_subject"; $message = "document_moved_email_body"; $params = array(); @@ -95,13 +83,13 @@ if ($targetid != $oldFolder->getID()) { $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $notifier->toList($user, $notifyList["users"], $subject, $message, $params); - foreach ($notifyList["groups"] as $grp) { + $notifier->toList($user, $nl["users"], $subject, $message, $params); + foreach ($nl["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); } // if user is not owner send notification to owner - if ($user->getID() != $document->getOwner()->getID()) - $notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params); +// if ($user->getID() != $document->getOwner()->getID()) +// $notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params); } } else { diff --git a/op/op.MoveFolder.php b/op/op.MoveFolder.php index 19d521db2..2519b551f 100644 --- a/op/op.MoveFolder.php +++ b/op/op.MoveFolder.php @@ -64,21 +64,13 @@ $oldFolder = $folder->getParent(); if ($folder->setParent($targetFolder)) { // Send notification to subscribers. if($notifier) { - $notifyList = $folder->getNotifyList(); -/* - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("folder_moved_email"); - $message = getMLText("folder_moved_email")."\r\n"; - $message .= - getMLText("name").": ".$folder->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - getMLText("comment").": ".$folder->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - - $notifier->toList($user, $folder->_notifyList["users"], $subject, $message); - foreach ($folder->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ + $nl1 = $oldFolder->getNotifyList(); + $nl2 = $folder->getNotifyList(); + $nl3 = $targetFolder->getNotifyList(); + $nl = array( + 'users'=>array_merge($nl1['users'], $nl2['users'], $nl3['users']), + 'groups'=>array_merge($nl1['groups'], $nl2['groups'], $nl3['groups']) + ); $subject = "folder_moved_email_subject"; $message = "folder_moved_email_body"; $params = array(); @@ -89,8 +81,8 @@ if ($folder->setParent($targetFolder)) { $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $notifier->toList($user, $notifyList["users"], $subject, $message, $params); - foreach ($notifyList["groups"] as $grp) { + $notifier->toList($user, $nl["users"], $subject, $message, $params); + foreach ($nl["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); } // if user is not owner send notification to owner diff --git a/op/op.OverrideContentStatus.php b/op/op.OverrideContentStatus.php index 7b124cc92..ce46dc537 100644 --- a/op/op.OverrideContentStatus.php +++ b/op/op.OverrideContentStatus.php @@ -76,21 +76,6 @@ if ($overrideStatus != $overallStatus["status"]) { if($notifier) { $nl = $document->getNotifyList(); $folder = $document->getFolder(); -/* - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_status_changed_email"); - $message = getMLText("document_status_changed_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("status").": ".getOverallStatusText($overrideStatus)."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - getMLText("comment").": ".$document->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n"; - - $notifier->toList($user, $nl["users"], $subject, $message); - foreach ($nl["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ $subject = "document_status_changed_email_subject"; $message = "document_status_changed_email_body"; $params = array(); @@ -106,7 +91,7 @@ if ($overrideStatus != $overallStatus["status"]) { $notifier->toGroup($user, $grp, $subject, $message, $params); } - $notifier->toIndividual($user, $content->getUser(), $subject, $message, $params); +// $notifier->toIndividual($user, $content->getUser(), $subject, $message, $params); } } } diff --git a/op/op.RemoveDocument.php b/op/op.RemoveDocument.php index d5d2ec975..c5639d9fb 100644 --- a/op/op.RemoveDocument.php +++ b/op/op.RemoveDocument.php @@ -88,7 +88,7 @@ $controller->setParam('document', $document); $controller->setParam('index', $index); $controller->setParam('indexconf', $indexconf); if(!$controller->run()) { - UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("error_occured")); + UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($docname)))),getMLText("error_remove_document")); } if ($notifier){ diff --git a/op/op.RemoveFolder.php b/op/op.RemoveFolder.php index e2f8ac792..34758e135 100644 --- a/op/op.RemoveFolder.php +++ b/op/op.RemoveFolder.php @@ -80,7 +80,7 @@ $controller->setParam('folder', $folder); $controller->setParam('index', $index); $controller->setParam('indexconf', $indexconf); if(!$controller->run()) { - UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id")); + UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($foldername))),getMLText("error_remove_folder")); } if ($notifier) { diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php index 1cc04b015..45c36916e 100644 --- a/op/op.ReviewDocument.php +++ b/op/op.ReviewDocument.php @@ -132,7 +132,7 @@ if ($_POST["reviewType"] == "ind" || $_POST["reviewType"] == "grp") { foreach ($nl["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); } - $notifier->toIndividual($user, $content->getUser(), $subject, $message, $params); +// $notifier->toIndividual($user, $content->getUser(), $subject, $message, $params); } } @@ -156,7 +156,7 @@ if($olddocstatus['status'] != $newdocstatus['status']) { foreach ($nl["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); } - $notifier->toIndividual($user, $content->getUser(), $subject, $message, $params); +// $notifier->toIndividual($user, $content->getUser(), $subject, $message, $params); } } diff --git a/op/op.Settings.php b/op/op.Settings.php index 8b5bae5c4..3332f6cde 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -198,17 +198,17 @@ if ($action == "saveSettings") $settings->_converters['fulltext'] = $_POST["converters"]["fulltext"]; else $settings->_converters['fulltext'] = $_POST["converters"]; - if(trim($settings->_converters['fulltext']['newmimetype']) && - trim($settings->_converters['fulltext']['newcmd'])) - $settings->_converters['fulltext'][$settings->_converters['fulltext']['newmimetype']] = trim($settings->_converters['fulltext']['newcmd']); + $newmimetype = preg_replace('#[^A-Za-z0-9_/+.]+#', '', $settings->_converters["fulltext"]["newmimetype"]); + if($newmimetype && trim($settings->_converters['fulltext']['newcmd'])) + $settings->_converters['fulltext'][$newmimetype] = trim($settings->_converters['fulltext']['newcmd']); unset($settings->_converters['fulltext']['newmimetype']); unset($settings->_converters['fulltext']['newcmd']); if(isset($_POST["converters"]["preview"])) $settings->_converters['preview'] = $_POST["converters"]["preview"]; - if(trim($settings->_converters['preview']['newmimetype']) && - trim($settings->_converters['preview']['newcmd'])) - $settings->_converters['preview'][$settings->_converters['preview']['newmimetype']] = trim($settings->_converters['preview']['newcmd']); + $newmimetype = preg_replace('#[^A-Za-z0-9_/+.]+#', '', $settings->_converters["preview"]["newmimetype"]); + if($newmimetype && trim($settings->_converters['preview']['newcmd'])) + $settings->_converters['preview'][$newmimetype] = trim($settings->_converters['preview']['newcmd']); unset($settings->_converters['preview']['newmimetype']); unset($settings->_converters['preview']['newcmd']); diff --git a/op/op.TriggerWorkflow.php b/op/op.TriggerWorkflow.php index c7bc30ae7..1b183ada5 100644 --- a/op/op.TriggerWorkflow.php +++ b/op/op.TriggerWorkflow.php @@ -80,7 +80,6 @@ if($version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) { if ($notifier) { $nl = $document->getNotifyList(); $folder = $document->getFolder(); - $subject = "transition_triggered_email_subject"; $message = "transition_triggered_email_body"; $params = array(); diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php index 53844bf9b..d02553937 100644 --- a/op/op.UpdateDocument.php +++ b/op/op.UpdateDocument.php @@ -281,8 +281,8 @@ if ($_FILES['userfile']['error'] == 0) { $notifier->toGroup($user, $grp, $subject, $message, $params); } // if user is not owner send notification to owner - if ($user->getID() != $document->getOwner()->getID()) - $notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params); +// if ($user->getID() != $document->getOwner()->getID()) +// $notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params); if($workflow && $settings->_enableNotificationWorkflow) { $subject = "request_workflow_action_email_subject"; @@ -331,7 +331,7 @@ if ($_FILES['userfile']['error'] == 0) { } } - if($approvers['i'] || $approvers['g']) { + elseif($approvers['i'] || $approvers['g']) { $subject = "approval_request_email_subject"; $message = "approval_request_email_body"; $params = array(); diff --git a/op/op.UpdateDocument2.php b/op/op.UpdateDocument2.php index edfcecfbb..f9e45e32c 100644 --- a/op/op.UpdateDocument2.php +++ b/op/op.UpdateDocument2.php @@ -192,8 +192,8 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) { $notifier->toGroup($user, $grp, $subject, $message, $params); } // if user is not owner send notification to owner - if ($user->getID() != $document->getOwner()->getID()) - $notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params); +// if ($user->getID() != $document->getOwner()->getID()) +// $notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params); } $expires = ($_POST["expires"] == "true") ? mktime(0,0,0, $_POST["expmonth"], $_POST["expday"], $_POST["expyear"]) : false; diff --git a/out/out.KeywordChooser.php b/out/out.KeywordChooser.php index a1fde2285..386c61462 100644 --- a/out/out.KeywordChooser.php +++ b/out/out.KeywordChooser.php @@ -36,7 +36,7 @@ foreach($allusers as $u) { $categories = $dms->getAllKeywordCategories($userids); if($_GET['target']) { - $target = sanitizeString($_GET['target']); + $target = preg_replace('/[^A-Za-z0-9_]+/', '', $_GET['target']); } else { $target = 'form1'; } diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index 89d4f5a37..1d0178610 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -17,6 +17,8 @@ $(document).ready( function() { $('.datepicker, #expirationdate, #fromdate, #todate, #createstartdate, #createenddate, #expirationstartdate, #expirationenddate, #revisionstartdate') .datepicker() .on('changeDate', function(ev){ + if(ev.date && $(ev.target).data('checkbox')) + $($(ev.target).data('checkbox')).prop('checked', false); $(ev.currentTarget).datepicker('hide'); }); @@ -340,7 +342,7 @@ $(document).ready( function() { input.trigger('fileselect', [numFiles, label]); }); - $('#upload-files').on('fileselect', '.btn-file :file', function(event, numFiles, label) { + $(document).on('fileselect', '#upload-file .btn-file :file', function(event, numFiles, label) { var input = $(this).parents('.input-append').find(':text'), log = numFiles > 1 ? numFiles + ' files selected' : label; diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index 1b35eb974..c5d485cb6 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -231,12 +231,12 @@ console.log(element); : - +   diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index a14184a2e..abc762436 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1948,7 +1948,8 @@ $(document).ready( function() { for(var i in arr) { $("#"+target+" option[value='"+arr[i]+"']").attr("selected", "selected"); } - $("#"+target).trigger("chosen:updated"); +// $("#"+target).trigger("chosen:updated"); + $("#"+target).trigger("change"); } }); }); @@ -2126,9 +2127,14 @@ $(document).ready( function() { $content .= count($files)." ".getMLText("linked_files")."
"; if(count($links)) $content .= count($links)." ".getMLText("linked_documents")."
"; - $content .= getOverallStatusText($status["status"]).""; - $content .= "\n"; - + if($status["status"] == S_IN_WORKFLOW && $workflowmode == 'advanced') { + $workflowstate = $latestContent->getWorkflowState(); + $content .= 'getName().'">'.$workflowstate->getName().''; + } else { + $content .= getOverallStatusText($status["status"]); + } + $content .= ""; +// $content .= "".$version.""; $content .= ""; $content .= "
"; if($document->getAccessMode($user) >= M_ALL) { diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php index fb085e5e3..e6d62c0ec 100644 --- a/views/bootstrap/class.EditDocument.php +++ b/views/bootstrap/class.EditDocument.php @@ -154,12 +154,12 @@ $(document).ready( function() { : - +
diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php index 59d91df1b..489660c73 100644 --- a/views/bootstrap/class.ExtensionMgr.php +++ b/views/bootstrap/class.ExtensionMgr.php @@ -95,7 +95,10 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { if($errmsgs) echo "
getImgPath("attention.gif")."\"> ".implode('
', $errmsgs)."
"; echo ""; - echo "".$extconf['version']."
".$extconf['releasedate'].""; + echo "".$extconf['version']."
".$extconf['releasedate'].""; + if($extconf['config']) + echo "
"; + echo ""; echo "".$extconf['author']['name']."
".$extconf['author']['company'].""; echo "\n"; } diff --git a/views/bootstrap/class.KeywordChooser.php b/views/bootstrap/class.KeywordChooser.php index a76dff632..07ff44590 100644 --- a/views/bootstrap/class.KeywordChooser.php +++ b/views/bootstrap/class.KeywordChooser.php @@ -108,7 +108,6 @@ myTA.focus(); $dms = $this->params['dms']; $user = $this->params['user']; $categories = $this->params['categories']; - $form = $this->params['form']; // $this->htmlStartPage(getMLText("use_default_keywords")); ?> diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 6db54b65b..e2b4f5043 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -770,8 +770,8 @@ if(!is_writeable($settings->_configFilePath)) { } ?> - showTextField("converters[preview][newmimetype]", ""); ?>: - showTextField("converters[preview][newcmd]", ""); ?> + showTextField("converters[preview][newmimetype]", "", '', getMLText('mimetype')); ?>: + showTextField("converters[preview][newcmd]", "", '', getMLText('command')); ?> contentContainerEnd(); ?> @@ -786,7 +786,7 @@ if(!is_writeable($settings->_configFilePath)) { $extconf) { ?> - + $conf) { ?>