diff --git a/CHANGELOG b/CHANGELOG index 544dafe11..493326a7b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -294,6 +294,8 @@ -------------------------------------------------------------------------------- - check access rights on EditDocumentFile and RemoveDocumentFile - allow to set expiration dates in the past again +- fix authentication with ldap if AD is used +- fix progress bar in list of users if quota is active -------------------------------------------------------------------------------- Changes in version 5.1.34 diff --git a/inc/inc.ClassLdapAuthentication.php b/inc/inc.ClassLdapAuthentication.php index db9ae1449..29e434e1a 100644 --- a/inc/inc.ClassLdapAuthentication.php +++ b/inc/inc.ClassLdapAuthentication.php @@ -199,7 +199,7 @@ class SeedDMS_LdapAuthentication extends SeedDMS_Authentication { if (!is_bool($info) && $info["count"]>0) { $dn = $info[0]['dn']; /* Set username to login name in case the email was used for authentication */ - $username = $info[0][$ldapSearchAttribut][0]; + $username = $info[0][strtolower($ldapSearchAttribut)][0]; } } } elseif(!empty($settings->_enableLoginByEmail)) { diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index bda8be37e..d7ae27e2b 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -459,6 +459,7 @@ Parent folder: [folder_path] 'document_files' => '', 'document_has_no_workflow' => 'المستند لايحتوى مسار عمل', 'document_infos' => 'معلومات المستند', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => 'تم سحب المستند', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index d943080d4..f5933d90a 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -433,6 +433,7 @@ $text = array( 'document_files' => '', 'document_has_no_workflow' => 'Документът няма процес', 'document_infos' => 'Информация за документа', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 1e4291c76..f76aaedfc 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -438,6 +438,7 @@ URL: [url]', 'document_files' => '', 'document_has_no_workflow' => '', 'document_infos' => 'Informacions', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 4c5f97e95..9e8aec22b 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -478,6 +478,7 @@ Uživatel: [username]', 'document_files' => '', 'document_has_no_workflow' => 'Dokument nemá workflow', 'document_infos' => 'Informace o dokumentu', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => 'Dokument je aktuálně zkontrolován. Pokud nahrajete novou verzi, nemůžete již kontrolovanou verzi zkontrolovat.', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index b265fec76..839fba5f5 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 (3380), dgrutsch (22) +// Translators: Admin (3381), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -553,6 +553,7 @@ Benutzer: [username]
', 'document_files' => 'Dokumentenanhänge', 'document_has_no_workflow' => 'Dokument hat keinen Workflow', 'document_infos' => 'Informationen', +'document_in_revision_no_date' => 'Das Dokument ist zur Zeit in der Wiederholungsprüfung. Ein neues Datum kann erst nach Abschluss der Prüfung gesetzt werden.', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => 'Das Dokument ist zur Zeit ausgecheckt. Wenn Sie das Dokument löschen kann die ausgecheckte Version nicht mehr hochgeladen werden und verbleibt im Auscheck-Bereich.', 'document_is_checked_out_update' => 'Das Dokument ist zur Zeit ausgecheckt. Wenn Sie eine neue Version hochladen, werden Sie die ausgecheckte Version nicht mehr einchecken können.', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index d1579226a..c0f860bd0 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -433,6 +433,7 @@ $text = array( 'document_files' => '', 'document_has_no_workflow' => '', 'document_infos' => 'Πληροφορίες Εγγράφου', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 4d8d07084..d009d034b 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 (2480), archonwang (3), dgrutsch (9), netixw (14) +// Translators: Admin (2481), archonwang (3), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -553,6 +553,7 @@ User: [username]', 'document_files' => 'Attachments', 'document_has_no_workflow' => 'Document has no workflow', 'document_infos' => 'Document Information', +'document_in_revision_no_date' => 'The document is currently in revision. A new revision date can be set when the revision was finished.', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => 'Document is currently checked out. If you delete the document, the checked out version can not be added anymore and remains in the checkout area.', 'document_is_checked_out_update' => 'Document is currently checked out. If you upload a new version, then the checked out version cannot be checked back in anymore.', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 7e33574d3..0934f21e7 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -472,6 +472,7 @@ Usuario: [username]', 'document_files' => '', 'document_has_no_workflow' => 'Documento sin flujo de trabajo', 'document_infos' => 'Informaciones', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => '', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 336e97458..3a490dbfe 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -528,6 +528,7 @@ Utilisateur : [username]', 'document_files' => 'Fichiers attachés', 'document_has_no_workflow' => 'Le document n\'a pas de workflow', 'document_infos' => 'Informations sur le document', +'document_in_revision_no_date' => '', 'document_is_checked_out' => 'Ce document est vérifié', 'document_is_checked_out_remove' => 'Le document est actuellement vérifié. Si vous supprimez le document, la version vérifiée ne pourra plus être ajoutée et restera dans la zone de vérification.', 'document_is_checked_out_update' => 'Le document est actuellement vérifié. Si vous ajoutez une nouvelle version, la version vérifiée ne pourra plus être vérifiée à nouveau.', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 583b42771..67a010e70 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -471,6 +471,7 @@ Korisnik: [username]', 'document_files' => '', 'document_has_no_workflow' => 'Dokument nema tok rada', 'document_infos' => 'Informacije o dokumentu', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => 'Dokument je trenutno odjavljen. Ako učitate novu verziju, tada odjavljena verzija ne može više biti ponovno prijavljena.', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 8ba47c472..4a1a9ee3d 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -466,6 +466,7 @@ Felhasználó: [username]', 'document_files' => '', 'document_has_no_workflow' => 'Dokumentumhoz nincs munkafolyamat', 'document_infos' => 'Dokumentum információ', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => '', diff --git a/languages/id_ID/lang.inc b/languages/id_ID/lang.inc index 21969bdff..031773441 100644 --- a/languages/id_ID/lang.inc +++ b/languages/id_ID/lang.inc @@ -490,6 +490,7 @@ Pengguna: [username]', 'document_files' => 'Lampiran', 'document_has_no_workflow' => 'Dokumen tidak memiliki alur kerja', 'document_infos' => 'Informasi Dokumen', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => 'Dokumen sedang diperiksa. Jika Anda menghapus dokumen, versi check out tidak dapat ditambahkan lagi dan tetap berada di area checkout.', 'document_is_checked_out_update' => '', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 4ea9cdfd3..e3fd4dbf9 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -471,6 +471,7 @@ Utente: [username]', 'document_files' => '', 'document_has_no_workflow' => 'Il documento non ha un flusso di lavoro', 'document_infos' => 'Informazioni documento', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => 'Il documento é approvato. Se aggiorni il documento, la versione approvata verrà sovrascritta definitivamente', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index ee95a5cae..ccddc7c19 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -474,6 +474,7 @@ URL: [url]', 'document_files' => '', 'document_has_no_workflow' => '문서에 워크플로우가 없습니다', 'document_infos' => '문서 정보', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => '문서가 현재 체크아웃 되어 있습니다. 새 버전을 업로드하면 체크아웃된 버전은 더 이상 확인 할 수 없습니다.', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index 4df8aadd7..320d9969c 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -469,6 +469,7 @@ URL: [url]', 'document_files' => '', 'document_has_no_workflow' => 'ເອກະສານບໍ່ມີເວີກໂຟ', 'document_infos' => 'ຂໍ້ມູນເອກະສານ', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => 'ຂະນະນີ້ມີການກວດສອບເອກະສານ ຫາກເຈົ້າອັບໂຫລດເວີຊັນໄຫມ່ລະບົບຈະບໍ່ສາມາດກວດສອບລະບົບທີປິດອອກໄດ້ອີກຕໍ່ໄປ', diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc index 75c1b2bc3..6efad18c9 100644 --- a/languages/nb_NO/lang.inc +++ b/languages/nb_NO/lang.inc @@ -478,6 +478,7 @@ Bruker: [username]', 'document_files' => '', 'document_has_no_workflow' => 'Dokumentet har ingen arbeidsflyt', 'document_infos' => 'Dokumentinformation', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => 'Dokumentet er allerede utsjekket. Hvis du laster opp en ny version kan den utsjekkede versionen ikke sjekkes inn igen.', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 9e3ad855a..084a39eac 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -471,6 +471,7 @@ Gebruiker: [username]', 'document_files' => '', 'document_has_no_workflow' => 'Document bevat geen workflow', 'document_infos' => 'Document-informatie', +'document_in_revision_no_date' => '', 'document_is_checked_out' => 'Document is uitgecheckt.', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => 'Document is uitgecheckt.', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index c5f4111d5..f81f3298f 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -459,6 +459,7 @@ Użytkownik: [username]', 'document_files' => '', 'document_has_no_workflow' => 'Dokument nie ma przypisanego procesu', 'document_infos' => 'Informacje o dokumencie', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => 'Ten dokument jest pobierany', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 4a5b8bf8f..aa48c8128 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -478,6 +478,7 @@ Usuário: [username]', 'document_files' => '', 'document_has_no_workflow' => 'Documento não tem fluxo de trabalho', 'document_infos' => 'Informações', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => 'O documento está atualmente com estado de retirado. Se você fizer o envio de uma nova versão, a versão retirada não poderá mais ser registrada.', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index c0e30e382..f525cf9b0 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -471,6 +471,7 @@ Utilizator: [username]', 'document_files' => '', 'document_has_no_workflow' => 'Documentul nu are workflow', 'document_infos' => 'Informații document', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => 'Documentul este in prezent verificat. Daca incarcati o noua versiune, versiunea verificata nu mai poate fi verificata din nou.', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index b14aed4ca..184d0bd21 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -471,6 +471,7 @@ URL: [url]', 'document_files' => '', 'document_has_no_workflow' => 'Для документа не назначен процесс', 'document_infos' => 'Информация о документе', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => 'Документ в настоящее время проверяется. Если вы загрузить новую версию, то проверяемая версия не может быть возвращена обратно.', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index d2e0223f4..33d0db9ac 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -478,6 +478,7 @@ Používateľ: [username]', 'document_files' => '', 'document_has_no_workflow' => 'Dokument nemá pracovný postup', 'document_infos' => 'Informácie o dokumente', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => 'Document is currently checked out. If you upload a new version, then the checked out version cannot be checked back in anymore.', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index fd79bca42..60ddfdf5e 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -472,6 +472,7 @@ Användare: [username]', 'document_files' => '', 'document_has_no_workflow' => 'Dokumentet saknar arbetsflöde', 'document_infos' => 'Dokumentinformation', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => 'Dokumentet är redan utcheckat. Om du laddar upp en ny version kan den utcheckade versionen inte checkas in igen.', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 8625e9bbd..7b6123467 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -465,6 +465,7 @@ Kullanıcı: [username]', 'document_files' => '', 'document_has_no_workflow' => 'Dokümanın iş akışı yok', 'document_infos' => 'Doküman Bilgisi', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => '', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 02c3a5126..b1c7f664b 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -471,6 +471,7 @@ URL: [url]', 'document_files' => '', 'document_has_no_workflow' => 'Документові не призначено процес', 'document_infos' => 'Інформація про документ', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => 'Документ на опрацюванні', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 876dc75ea..f30e33587 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -465,6 +465,7 @@ URL: [url]', 'document_files' => '', 'document_has_no_workflow' => '文档未配置工作流', 'document_infos' => '文档信息', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '文档已签出。如上传了新版本,则已签出的版本则不能再被签回。', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => '文档已签出。如上传了新版本,则已签出的版本则不能再被签回。', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 90ca1abc2..3b17ffa30 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -478,6 +478,7 @@ URL: [url]', 'document_files' => '', 'document_has_no_workflow' => '文件沒有工作流程', 'document_infos' => '文件資訊', +'document_in_revision_no_date' => '', 'document_is_checked_out' => '', 'document_is_checked_out_remove' => '', 'document_is_checked_out_update' => '當前已簽出文檔。如果您上傳新版本,那麼簽出的版本將無法再簽回。', diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php index 16d45ea9e..950e59413 100644 --- a/views/bootstrap4/class.Bootstrap4.php +++ b/views/bootstrap4/class.Bootstrap4.php @@ -3959,8 +3959,8 @@ $(document).ready(function() { } $html = '