From c27f7218aaf24e6b5f7282ee3eb6c1eb816d85fd Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 23 Nov 2015 08:07:09 +0100 Subject: [PATCH 01/65] add new translations --- languages/nl_NL/lang.inc | 21 +++++++++++++-------- languages/sk_SK/lang.inc | 4 ++-- languages/zh_CN/lang.inc | 32 ++++++++++++++++---------------- 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index e5b27dd47..a3c55c0dd 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/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), pepijn (45), reinoutdijkstra@hotmail.com (270) +// Translators: Admin (710), gijsbertush (7), pepijn (45), reinoutdijkstra@hotmail.com (270) $text = array( 'accept' => 'Accept', @@ -51,7 +51,7 @@ URL: [url]', 'add_approval' => 'Verzend [Goedkeuring]', 'add_document' => 'Document toevoegen', 'add_document_link' => 'Link toevoegen', -'add_document_notify' => '', +'add_document_notify' => 'Notificatie toekennen', 'add_doc_reviewer_approver_warning' => 'N.B. Documenten zijn automatisch gemarkeeerd als [Gepubliceerd] als geen [Autoriseerder] of [Controleur] is toegewezen.', 'add_doc_workflow_warning' => 'N.B. Documenten worden automatisch gemarkeerd als vrijgegeven, indien er geen workflow is toegewezen.', 'add_event' => 'Activiteit toevoegen', @@ -59,13 +59,13 @@ URL: [url]', 'add_member' => 'Lid toevoegen', 'add_multiple_documents' => 'Meerdere Documenten Toevoegen', 'add_multiple_files' => 'Meerdere bestanden toevoegen (Gebruikt bestandsnaam als document naam)', -'add_receipt' => '', +'add_receipt' => 'Bericht ontvangst', 'add_review' => 'Verzend [Controle]', -'add_revision' => '', +'add_revision' => 'Voeg goedkeuring toe', 'add_subfolder' => 'Submap toevoegen', 'add_to_clipboard' => 'Toevoegen aan klembord', -'add_to_transmittal' => '', -'add_transmittal' => '', +'add_to_transmittal' => 'Toevoegen aan verzending', +'add_transmittal' => 'Verzending toevoegen', 'add_user' => 'Nieuwe gebruiker toevoegen', 'add_user_to_group' => 'Gebruiker aan groep toevoegen', 'add_workflow' => 'Nieuwe workflow toevoegen', @@ -82,8 +82,13 @@ URL: [url]', 'and' => 'en', 'apply' => 'Toepassen', 'approval_deletion_email' => 'Goedkeuring verzoek verwijderd', -'approval_deletion_email_body' => '', -'approval_deletion_email_subject' => '', +'approval_deletion_email_body' => 'Vraag om goedkeuring verwijderd +Document: [name] +Versie: [version] +Map: [folder_path] +Gebruiker: [username] +URL: [url]', +'approval_deletion_email_subject' => '[sitename]: [name] - Verzoek om goedkeuring verwijderd', 'approval_file' => '', 'approval_group' => 'Goedkeuring Groep', 'approval_log' => 'Goedkeuring overzicht', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 5d5b7ae12..f0b507065 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/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 (488) +// Translators: Admin (489) $text = array( 'accept' => 'Prijať', @@ -1153,7 +1153,7 @@ $text = array( 'uploaded_by' => 'Nahral', 'uploading_failed' => 'Nahranie zlyhalo. Prosám, kontaktujte správcu.', 'uploading_maxsize' => 'Uploadovaný súbor prekročil maximálnu povolenú velkosť.', -'uploading_zerosize' => '', +'uploading_zerosize' => 'Nahrávate prázdny súbor. Nahrávanie je zrušené.', 'used_discspace' => 'Využitý priestor na disku', 'user' => 'Používateľ', 'users' => 'Používateľ', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index bb7a97e9c..db5689c9e 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (593), fengjohn (5) +// Translators: Admin (608), fengjohn (5) $text = array( 'accept' => '接受', @@ -238,7 +238,7 @@ URL: [url]', 'current_quota' => '', 'current_state' => '', 'current_version' => '当前版本', -'daily' => '', +'daily' => '天', 'databasesearch' => '数据库搜索', 'date' => '日期', 'days' => '', @@ -405,7 +405,7 @@ URL: [url]', 'guest_login_disabled' => '来宾登录被禁止', 'help' => '帮助', 'home_folder' => '', -'hourly' => '', +'hourly' => '小时', 'hours' => '', 'hr_HR' => '克罗地亚人', 'human_readable' => '可读存档', @@ -517,7 +517,7 @@ URL: [url]', 'missing_transition_user_group' => '', 'monday' => 'Monday', 'monday_abbr' => '', -'monthly' => '', +'monthly' => '月', 'month_view' => '月视图', 'move' => '移动', 'move_clipboard' => '移动剪切板', @@ -800,27 +800,27 @@ URL: [url]', 'settings_Display' => '设置显示', 'settings_dropFolderDir' => '', 'settings_dropFolderDir_desc' => '', -'settings_Edition' => '', +'settings_Edition' => '编辑设置', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => '', 'settings_enableAdminRevApp_desc' => '', 'settings_enableCalendar' => '', 'settings_enableCalendar_desc' => '', -'settings_enableClipboard' => '', +'settings_enableClipboard' => '允许剪切板', 'settings_enableClipboard_desc' => '', -'settings_enableConverting' => '', -'settings_enableConverting_desc' => '', -'settings_enableDropUpload' => '', +'settings_enableConverting' => '打开转换', +'settings_enableConverting_desc' => '打开/关闭文件转换', +'settings_enableDropUpload' => '允许快速上传', 'settings_enableDropUpload_desc' => '', 'settings_enableDuplicateDocNames' => '允许重复的文件名', 'settings_enableDuplicateDocNames_desc' => '', -'settings_enableEmail' => '', -'settings_enableEmail_desc' => '', +'settings_enableEmail' => '开启邮件', +'settings_enableEmail_desc' => '开启/关闭邮件自动提醒', 'settings_enableFolderTree' => '', 'settings_enableFolderTree_desc' => '', -'settings_enableFullSearch' => '', -'settings_enableFullSearch_desc' => '', +'settings_enableFullSearch' => '允许全文搜索', +'settings_enableFullSearch_desc' => '允许全文搜索', 'settings_enableGuestLogin' => '', 'settings_enableGuestLogin_desc' => '', 'settings_enableLanguageSelector' => '', @@ -849,7 +849,7 @@ URL: [url]', 'settings_enableThemeSelector_desc' => '', 'settings_enableUserImage' => '', 'settings_enableUserImage_desc' => '', -'settings_enableUsersView' => '', +'settings_enableUsersView' => '开启用户视图', 'settings_enableUsersView_desc' => '', 'settings_enableVersionDeletion' => '', 'settings_enableVersionDeletion_desc' => '', @@ -870,7 +870,7 @@ URL: [url]', 'settings_firstDayOfWeek_desc' => '', 'settings_footNote' => '附注', 'settings_footNote_desc' => '显示在每个页面底部的信息', -'settings_fullSearchEngine' => '', +'settings_fullSearchEngine' => '全文搜索引擎', 'settings_fullSearchEngine_desc' => '', 'settings_fullSearchEngine_vallucene' => 'Zend Lucene', 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS', @@ -954,7 +954,7 @@ URL: [url]', 'settings_rootFolderID_desc' => '', 'settings_SaveError' => '', 'settings_Server' => '', -'settings_showMissingTranslations' => '', +'settings_showMissingTranslations' => '显示丢失的翻译', 'settings_showMissingTranslations_desc' => '', 'settings_Site' => '站点设置', 'settings_siteDefaultPage' => '网站的默认页', From 446f8d367d186ee0d163d4c7dc91cc2fafa97f7e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 23 Nov 2015 21:47:10 +0100 Subject: [PATCH 02/65] add new strings --- languages/ar_EG/lang.inc | 3 +++ languages/bg_BG/lang.inc | 3 +++ languages/ca_ES/lang.inc | 3 +++ languages/cs_CZ/lang.inc | 3 +++ languages/de_DE/lang.inc | 5 ++++- languages/en_GB/lang.inc | 5 ++++- languages/es_ES/lang.inc | 3 +++ languages/fr_FR/lang.inc | 3 +++ languages/hr_HR/lang.inc | 3 +++ languages/hu_HU/lang.inc | 3 +++ languages/it_IT/lang.inc | 3 +++ languages/ko_KR/lang.inc | 3 +++ languages/nl_NL/lang.inc | 3 +++ languages/pl_PL/lang.inc | 3 +++ languages/pt_BR/lang.inc | 3 +++ languages/ro_RO/lang.inc | 3 +++ languages/ru_RU/lang.inc | 3 +++ languages/sk_SK/lang.inc | 3 +++ languages/sv_SE/lang.inc | 3 +++ languages/tr_TR/lang.inc | 3 +++ languages/uk_UA/lang.inc | 3 +++ languages/zh_CN/lang.inc | 3 +++ languages/zh_TW/lang.inc | 3 +++ 23 files changed, 71 insertions(+), 2 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index be6e9379a..823bd9b36 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -709,7 +709,10 @@ URL: [url]', 'personal_default_keywords' => 'قوائم الكلمات البحثية الشخصية', 'pl_PL' => 'ﺎﻠﺑﻮﻠﻧﺪﻳﺓ', 'possible_substitutes' => '', +'preview' => '', 'preview_converters' => '', +'preview_markdown' => '', +'preview_plain' => '', 'previous_state' => 'حالة سابقة', 'previous_versions' => 'اصدارات سابقة', 'pt_BR' => 'البرتغالية (BR)', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index e172da925..820119b27 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -610,7 +610,10 @@ $text = array( 'personal_default_keywords' => 'Личен списък с ключови думи', 'pl_PL' => '', 'possible_substitutes' => '', +'preview' => '', 'preview_converters' => '', +'preview_markdown' => '', +'preview_plain' => '', 'previous_state' => 'Предишно състояние', 'previous_versions' => 'Предишни версии', 'pt_BR' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index bf9f868fc..5397b5c20 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -615,7 +615,10 @@ URL: [url]', 'personal_default_keywords' => 'Mots clau personals', 'pl_PL' => '', 'possible_substitutes' => '', +'preview' => '', 'preview_converters' => '', +'preview_markdown' => '', +'preview_plain' => '', 'previous_state' => '', 'previous_versions' => 'Versions anteriors', 'pt_BR' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index e2afe51b3..2c5206401 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -720,7 +720,10 @@ Pokud budete mít problém s přihlášením i po změně hesla, kontaktujte Adm 'personal_default_keywords' => 'Osobní klíčová slova', 'pl_PL' => 'Polština', 'possible_substitutes' => '', +'preview' => '', 'preview_converters' => '', +'preview_markdown' => '', +'preview_plain' => '', 'previous_state' => 'Předchozí stav', 'previous_versions' => 'Předešlé verze', 'pt_BR' => 'Portugalština (BR)', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 4ee360ab8..c5d815dd6 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 (2137), dgrutsch (18) +// Translators: Admin (2140), dgrutsch (18) $text = array( 'accept' => 'Übernehmen', @@ -728,7 +728,10 @@ Sollen Sie danach immer noch Problem bei der Anmeldung haben, dann kontaktieren 'personal_default_keywords' => 'Persönliche Stichwortlisten', 'pl_PL' => 'Polnisch', 'possible_substitutes' => 'Vertreter', +'preview' => 'Vorschau', 'preview_converters' => 'Vorschau Dokumentenumwandlung', +'preview_markdown' => 'Markdown', +'preview_plain' => 'Text', 'previous_state' => 'Voriger Status', 'previous_versions' => 'Vorhergehende Versionen', 'pt_BR' => 'Portugiesisch (BR)', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 572677476..2460c9820 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 (1272), dgrutsch (3), netixw (14) +// Translators: Admin (1275), dgrutsch (3), netixw (14) $text = array( 'accept' => 'Accept', @@ -728,7 +728,10 @@ If you have still problems to login, then please contact your administrator.', 'personal_default_keywords' => 'Personal keywordlists', 'pl_PL' => 'Polish', 'possible_substitutes' => 'Substitutes', +'preview' => 'Preview', 'preview_converters' => 'Preview document conversion', +'preview_markdown' => 'Markdown', +'preview_plain' => 'Text', 'previous_state' => 'Previous state', 'previous_versions' => 'Previous versions', 'pt_BR' => 'Portugese (BR)', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 1430f2f81..0f50ac5cd 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -724,7 +724,10 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado 'personal_default_keywords' => 'Listas de palabras clave personales', 'pl_PL' => 'Polaco', 'possible_substitutes' => '', +'preview' => '', 'preview_converters' => '', +'preview_markdown' => '', +'preview_plain' => '', 'previous_state' => 'Estado anterior', 'previous_versions' => 'Versiones anteriores', 'pt_BR' => 'Portuges (BR)', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 2853eed30..cf1bd0b8f 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -721,7 +721,10 @@ En cas de problème persistant, veuillez contacter votre administrateur.', 'personal_default_keywords' => 'Mots-clés personnels', 'pl_PL' => 'Polonais', 'possible_substitutes' => '', +'preview' => '', 'preview_converters' => '', +'preview_markdown' => '', +'preview_plain' => '', 'previous_state' => 'Previous state', 'previous_versions' => 'Versions précédentes', 'pt_BR' => 'Portuguais (BR)', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 6b93b1e27..2d9475df5 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -723,7 +723,10 @@ Ako i dalje imate problema s prijavom, molimo kontaktirajte Vašeg administrator 'personal_default_keywords' => 'Osobni popis ključnih riječi', 'pl_PL' => 'Poljski', 'possible_substitutes' => '', +'preview' => '', 'preview_converters' => '', +'preview_markdown' => '', +'preview_plain' => '', 'previous_state' => 'Prethodni status', 'previous_versions' => 'Prethodne verzije', 'pt_BR' => 'Portugalski (BR)', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index cb1416ba9..9ce024e42 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -724,7 +724,10 @@ 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_converters' => '', +'preview_markdown' => '', +'preview_plain' => '', 'previous_state' => 'Előző állapot', 'previous_versions' => 'Előző változatok', 'pt_BR' => 'Portugál (BR)', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 88e83a379..41ad92077 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -730,7 +730,10 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di 'personal_default_keywords' => 'Parole-chiave personali', 'pl_PL' => 'Polacco', 'possible_substitutes' => 'Sostituti', +'preview' => '', 'preview_converters' => 'Anteprima convesione documento', +'preview_markdown' => '', +'preview_plain' => '', 'previous_state' => 'Stato precedente', 'previous_versions' => 'Versioni precedenti', 'pt_BR' => 'Portoghese (BR)', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index c5c65534d..8f5fde14a 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -721,7 +721,10 @@ URL : [url]', 'personal_default_keywords' => '개인 키워드 목록', 'pl_PL' => '폴란드어', 'possible_substitutes' => '대체', +'preview' => '', 'preview_converters' => '문서 변환 미리보기', +'preview_markdown' => '', +'preview_plain' => '', 'previous_state' => '이전 상태', 'previous_versions' => '이전 버전', 'pt_BR' => '포르투갈어 (BR)', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index a3c55c0dd..ed99f6538 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -722,7 +722,10 @@ Mocht u de komende minuten geen email ontvangen, probeer het dan nogmaals en con 'personal_default_keywords' => 'Persoonlijke sleutelwoorden', 'pl_PL' => 'Polen', 'possible_substitutes' => '', +'preview' => '', 'preview_converters' => '', +'preview_markdown' => '', +'preview_plain' => '', 'previous_state' => 'Vorige staat', 'previous_versions' => 'Vorige versies', 'pt_BR' => 'Portugees (BR)', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 18ebb746c..26ce89c69 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -717,7 +717,10 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem 'personal_default_keywords' => 'Osobiste sława kluczowe', 'pl_PL' => 'Polski', 'possible_substitutes' => '', +'preview' => '', 'preview_converters' => '', +'preview_markdown' => '', +'preview_plain' => '', 'previous_state' => 'Poprzedni stan', 'previous_versions' => 'Poprzednie wersje', 'pt_BR' => 'Portugalski(BR)', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 4057a0666..004943fe0 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -722,7 +722,10 @@ 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_converters' => '', +'preview_markdown' => '', +'preview_plain' => '', 'previous_state' => 'Estado anterior', 'previous_versions' => 'Previous Versions', 'pt_BR' => 'Português (BR)', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 53e0cd093..6c40cd2e8 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -729,7 +729,10 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț 'personal_default_keywords' => 'Liste de cuvinte cheie personale', 'pl_PL' => 'Poloneză', 'possible_substitutes' => '', +'preview' => '', 'preview_converters' => '', +'preview_markdown' => '', +'preview_plain' => '', 'previous_state' => 'Stare precedentă', 'previous_versions' => 'Versiune precedentă', 'pt_BR' => 'Portugheză (BR)', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index ccac6a60a..e6e51513c 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -714,7 +714,10 @@ URL: [url]', 'personal_default_keywords' => 'Личный список меток', 'pl_PL' => 'Polish', 'possible_substitutes' => '', +'preview' => '', 'preview_converters' => '', +'preview_markdown' => '', +'preview_plain' => '', 'previous_state' => 'Предыдущее состояние', 'previous_versions' => 'Предыдущие версии', 'pt_BR' => 'Portugese (BR)', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index f0b507065..a0e169cb9 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -610,7 +610,10 @@ $text = array( 'personal_default_keywords' => 'Osobné kľúčové slová', 'pl_PL' => 'Polština', 'possible_substitutes' => '', +'preview' => '', 'preview_converters' => '', +'preview_markdown' => '', +'preview_plain' => '', 'previous_state' => '', 'previous_versions' => 'Predošlé verzie', 'pt_BR' => 'Portugalčina', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index aa018dd89..84812f325 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -709,7 +709,10 @@ URL: [url]', 'personal_default_keywords' => 'Personlig nyckelordslista', 'pl_PL' => 'polska', 'possible_substitutes' => '', +'preview' => '', 'preview_converters' => '', +'preview_markdown' => '', +'preview_plain' => '', 'previous_state' => 'Föregående status', 'previous_versions' => 'Tidigare versioner', 'pt_BR' => 'portugisiska (BR)', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 74926dff0..debe80794 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -725,7 +725,10 @@ 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_converters' => '', +'preview_markdown' => '', +'preview_plain' => '', 'previous_state' => 'Önceki durum', 'previous_versions' => 'Önceki versiyonlar', 'pt_BR' => 'Portekizce', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index ef193edab..ab323ba41 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -726,7 +726,10 @@ URL: [url]', 'personal_default_keywords' => 'Особистий список ключових слів', 'pl_PL' => 'Polish', 'possible_substitutes' => 'Підстановки', +'preview' => '', 'preview_converters' => '', +'preview_markdown' => '', +'preview_plain' => '', 'previous_state' => 'Попередній стан', 'previous_versions' => 'Попередні версії', 'pt_BR' => 'Portugese (BR)', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index db5689c9e..715f55500 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -616,7 +616,10 @@ URL: [url]', 'personal_default_keywords' => '用户关键字', 'pl_PL' => '波兰语', 'possible_substitutes' => '', +'preview' => '', 'preview_converters' => '', +'preview_markdown' => '', +'preview_plain' => '', 'previous_state' => '', 'previous_versions' => '先前版本', 'pt_BR' => '葡萄牙语', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index a39cb9fc0..ea2006daa 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -614,7 +614,10 @@ URL: [url]', 'personal_default_keywords' => '用戶關鍵字', 'pl_PL' => '波蘭語', 'possible_substitutes' => '', +'preview' => '', 'preview_converters' => '', +'preview_markdown' => '', +'preview_plain' => '', 'previous_state' => '', 'previous_versions' => '先前版本', 'pt_BR' => '葡萄牙語', From eda80242ea43c7ec6cafc3c7e75d055a765f5ace Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Nov 2015 16:49:09 +0100 Subject: [PATCH 03/65] some reorganization of email notification --- inc/inc.Authentication.php | 4 +- ...lassEmail.php => inc.ClassEmailNotify.php} | 2 +- inc/inc.ClassEmailUtils.php | 40 +++++++++++++++++++ op/op.AddDocument.php | 1 - op/op.AddDocumentLink.php | 1 - op/op.AddEvent.php | 1 - op/op.AddFile.php | 1 - op/op.AddFile2.php | 1 - op/op.AddMultiDocument.php | 1 - op/op.AddSubFolder.php | 1 - op/op.AddToClipboard.php | 1 - op/op.AddTransitionToWorkflow.php | 1 - op/op.Ajax.php | 4 +- op/op.ApproveDocument.php | 1 - op/op.AttributeMgr.php | 1 - op/op.Categories.php | 1 - op/op.ChangePassword.php | 1 - op/op.ClearClipboard.php | 1 - op/op.CreateDump.php | 1 - op/op.CreateFolderArchive.php | 3 +- op/op.CreateStatusIndex.php | 1 - op/op.CreateSubFolderIndex.php | 1 - op/op.CreateVersioningFiles.php | 1 - op/op.DefaultKeywords.php | 1 - op/op.DocumentAccess.php | 1 - op/op.DocumentNotify.php | 1 - op/op.Download.php | 2 +- op/op.EditAttributes.php | 1 - op/op.EditComment.php | 3 +- op/op.EditDocument.php | 1 - op/op.EditEvent.php | 1 - op/op.EditFolder.php | 1 - op/op.FolderAccess.php | 1 - op/op.FolderNotify.php | 1 - op/op.GroupMgr.php | 1 - op/op.GroupView.php | 1 - op/op.Login.php | 3 +- op/op.ManageNotify.php | 1 - op/op.MoveClipboard.php | 1 - op/op.MoveDocument.php | 1 - op/op.MoveFolder.php | 1 - op/op.OverrideContentStatus.php | 1 - op/op.PasswordForgotten.php | 6 +-- op/op.RemoveDocument.php | 1 - op/op.RemoveDocumentFile.php | 1 - op/op.RemoveEvent.php | 1 - op/op.RemoveFolder.php | 1 - op/op.RemoveFolderFiles.php | 1 - op/op.RemoveFromClipboard.php | 1 - op/op.RemoveTransitionFromWorkflow.php | 1 - op/op.RemoveVersion.php | 1 - op/op.RemoveWorkflow.php | 1 - op/op.RemoveWorkflowAction.php | 1 - op/op.RemoveWorkflowFromDocument.php | 1 - op/op.RemoveWorkflowState.php | 1 - op/op.ReturnFromSubWorkflow.php | 1 - op/op.ReviewDocument.php | 1 - op/op.RewindWorkflow.php | 1 - op/op.RunSubWorkflow.php | 1 - op/op.SetExpires.php | 1 - op/op.SetLanguage.php | 1 - op/op.SetReviewersApprovers.php | 1 - op/op.SetWorkflow.php | 1 - op/op.TriggerWorkflow.php | 1 - op/op.UpdateDocument.php | 1 - op/op.UpdateDocument2.php | 1 - 66 files changed, 52 insertions(+), 72 deletions(-) rename inc/{inc.ClassEmail.php => inc.ClassEmailNotify.php} (98%) create mode 100644 inc/inc.ClassEmailUtils.php diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php index 37b81e885..d10c88dd1 100644 --- a/inc/inc.Authentication.php +++ b/inc/inc.Authentication.php @@ -24,7 +24,7 @@ if (!isset($_COOKIE["mydms_session"])) { } require_once("inc.Utils.php"); -require_once("inc.ClassEmail.php"); +require_once("inc.ClassEmailNotify.php"); require_once("inc.ClassSession.php"); /* Load session */ @@ -54,7 +54,7 @@ if (!is_object($user)) { $dms->setUser($user); if($settings->_enableEmail) { - $notifier = new SeedDMS_Email(); + $notifier = new SeedDMS_EmailNotify(); $notifier->setSender($user); } else { $notifier = null; diff --git a/inc/inc.ClassEmail.php b/inc/inc.ClassEmailNotify.php similarity index 98% rename from inc/inc.ClassEmail.php rename to inc/inc.ClassEmailNotify.php index 9a6d11313..13249be4d 100644 --- a/inc/inc.ClassEmail.php +++ b/inc/inc.ClassEmailNotify.php @@ -29,7 +29,7 @@ require_once("inc.ClassNotify.php"); * 2010 Uwe Steinmann * @version Release: @package_version@ */ -class SeedDMS_Email extends SeedDMS_Notify { +class SeedDMS_EmailNotify extends SeedDMS_Notify { function toIndividual($sender, $recipient, $subject, $message, $params=array()) { /* {{{ */ global $settings; diff --git a/inc/inc.ClassEmailUtils.php b/inc/inc.ClassEmailUtils.php new file mode 100644 index 000000000..5b1814053 --- /dev/null +++ b/inc/inc.ClassEmailUtils.php @@ -0,0 +1,40 @@ + + * @copyright Copyright (C) 2002-2005 Markus Westphal, + * 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli, + * 2010 Uwe Steinmann + * @version Release: @package_version@ + */ + +/** + * Class to send email + * + * @category DMS + * @package SeedDMS + * @author Markus Westphal, Malcolm Cowe, Uwe Steinmann + * @copyright Copyright (C) 2002-2005 Markus Westphal, + * 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli, + * 2010 Uwe Steinmann + * @version Release: @package_version@ + */ +class SeedDMS_EmailUtils { + + function sendPassword($sender, $recipient, $subject, $message) { /* {{{ */ + $headers = array(); + $headers[] = "MIME-Version: 1.0"; + $headers[] = "Content-type: text/plain; charset=utf-8"; + $headers[] = "From: ". $sender; + $headers[] = "Reply-To: ". $sender; + + $subject = "=?UTF-8?B?".base64_encode($this->replaceMarker($subject))."?="; + return (mail($recipient->getEmail(), $subject, $this->replaceMarker($message), implode("\r\n", $headers)) ? 0 : -1); + } /* }}} */ +} +?> diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php index e24a40781..966eedc75 100644 --- a/op/op.AddDocument.php +++ b/op/op.AddDocument.php @@ -21,7 +21,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.AddDocumentLink.php b/op/op.AddDocumentLink.php index cf747292b..1f33487aa 100644 --- a/op/op.AddDocumentLink.php +++ b/op/op.AddDocumentLink.php @@ -23,7 +23,6 @@ include("../inc/inc.Utils.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { diff --git a/op/op.AddEvent.php b/op/op.AddEvent.php index 8e7c73162..e315569a0 100644 --- a/op/op.AddEvent.php +++ b/op/op.AddEvent.php @@ -21,7 +21,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.AddFile.php b/op/op.AddFile.php index 1da0ee0b3..589923437 100644 --- a/op/op.AddFile.php +++ b/op/op.AddFile.php @@ -19,7 +19,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.AddFile2.php b/op/op.AddFile2.php index 0780345a1..4e64ba7e3 100644 --- a/op/op.AddFile2.php +++ b/op/op.AddFile2.php @@ -19,7 +19,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.AddMultiDocument.php b/op/op.AddMultiDocument.php index ad7ff767e..05d2e902e 100644 --- a/op/op.AddMultiDocument.php +++ b/op/op.AddMultiDocument.php @@ -22,7 +22,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.Authentication.php"); diff --git a/op/op.AddSubFolder.php b/op/op.AddSubFolder.php index 0b531c4be..31c0588ba 100644 --- a/op/op.AddSubFolder.php +++ b/op/op.AddSubFolder.php @@ -24,7 +24,6 @@ include("../inc/inc.Utils.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); /* Check if the form data comes for a trusted request */ diff --git a/op/op.AddToClipboard.php b/op/op.AddToClipboard.php index 5e6f9db7d..5426f43df 100644 --- a/op/op.AddToClipboard.php +++ b/op/op.AddToClipboard.php @@ -23,7 +23,6 @@ include("../inc/inc.LogInit.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); if (isset($_GET["id"]) && is_numeric($_GET["id"]) && isset($_GET['type'])) { diff --git a/op/op.AddTransitionToWorkflow.php b/op/op.AddTransitionToWorkflow.php index e1e96d691..8f77b9064 100644 --- a/op/op.AddTransitionToWorkflow.php +++ b/op/op.AddTransitionToWorkflow.php @@ -19,7 +19,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.Ajax.php b/op/op.Ajax.php index c3b415afd..7f462bd20 100644 --- a/op/op.Ajax.php +++ b/op/op.Ajax.php @@ -19,7 +19,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassEmail.php"); +include("../inc/inc.ClassEmailNotify.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); @@ -54,7 +54,7 @@ if (isset($_COOKIE["mydms_session"])) { } } if($settings->_enableEmail) { - $notifier = new SeedDMS_Email(); + $notifier = new SeedDMS_EmailNotify(); $notifier->setSender($user); } else { $notifier = null; diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php index f73ed1c68..d17aeb195 100644 --- a/op/op.ApproveDocument.php +++ b/op/op.ApproveDocument.php @@ -21,7 +21,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.AttributeMgr.php b/op/op.AttributeMgr.php index 1cbffa260..ac30787d9 100644 --- a/op/op.AttributeMgr.php +++ b/op/op.AttributeMgr.php @@ -22,7 +22,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); if (!$user->isAdmin()) { diff --git a/op/op.Categories.php b/op/op.Categories.php index 723c1086f..f46d81aeb 100644 --- a/op/op.Categories.php +++ b/op/op.Categories.php @@ -21,7 +21,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); if (!$user->isAdmin()) { diff --git a/op/op.ChangePassword.php b/op/op.ChangePassword.php index ef5d8167a..cc54a228c 100644 --- a/op/op.ChangePassword.php +++ b/op/op.ChangePassword.php @@ -25,7 +25,6 @@ include("../inc/inc.Language.php"); include("../inc/inc.ClassSession.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); function _printMessage($heading, $message) { diff --git a/op/op.ClearClipboard.php b/op/op.ClearClipboard.php index e315ac44d..a01e0856e 100644 --- a/op/op.ClearClipboard.php +++ b/op/op.ClearClipboard.php @@ -23,7 +23,6 @@ include("../inc/inc.LogInit.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); $session->clearClipboard(); diff --git a/op/op.CreateDump.php b/op/op.CreateDump.php index db28cd3c9..c2de3e316 100644 --- a/op/op.CreateDump.php +++ b/op/op.CreateDump.php @@ -18,7 +18,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.CreateFolderArchive.php b/op/op.CreateFolderArchive.php index b1c16f6e4..71a42c759 100644 --- a/op/op.CreateFolderArchive.php +++ b/op/op.CreateFolderArchive.php @@ -17,8 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); +include("../inc/inc.LogInit.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.CreateStatusIndex.php b/op/op.CreateStatusIndex.php index 67c3a6a08..0baefdff0 100644 --- a/op/op.CreateStatusIndex.php +++ b/op/op.CreateStatusIndex.php @@ -19,7 +19,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.CreateSubFolderIndex.php b/op/op.CreateSubFolderIndex.php index 7d9da04f8..ddc082c95 100644 --- a/op/op.CreateSubFolderIndex.php +++ b/op/op.CreateSubFolderIndex.php @@ -21,7 +21,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); UI::htmlStartPage("Create Document Folder Index"); diff --git a/op/op.CreateVersioningFiles.php b/op/op.CreateVersioningFiles.php index 33bb31009..a89845163 100644 --- a/op/op.CreateVersioningFiles.php +++ b/op/op.CreateVersioningFiles.php @@ -18,7 +18,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.DefaultKeywords.php b/op/op.DefaultKeywords.php index c611b1f4f..a4c78de6a 100644 --- a/op/op.DefaultKeywords.php +++ b/op/op.DefaultKeywords.php @@ -21,7 +21,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); if (!$user->isAdmin()) { diff --git a/op/op.DocumentAccess.php b/op/op.DocumentAccess.php index 3dc8da260..89c5ae7a4 100644 --- a/op/op.DocumentAccess.php +++ b/op/op.DocumentAccess.php @@ -23,7 +23,6 @@ include("../inc/inc.Utils.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { diff --git a/op/op.DocumentNotify.php b/op/op.DocumentNotify.php index 8b88002ec..7e1339ca4 100644 --- a/op/op.DocumentNotify.php +++ b/op/op.DocumentNotify.php @@ -22,7 +22,6 @@ include("../inc/inc.Utils.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { diff --git a/op/op.Download.php b/op/op.Download.php index 922b937cf..29e793ddc 100644 --- a/op/op.Download.php +++ b/op/op.Download.php @@ -20,7 +20,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); +include("../inc/inc.LogInit.php"); include("../inc/inc.Utils.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); diff --git a/op/op.EditAttributes.php b/op/op.EditAttributes.php index cdca6d929..bd9e33c72 100644 --- a/op/op.EditAttributes.php +++ b/op/op.EditAttributes.php @@ -24,7 +24,6 @@ include("../inc/inc.Utils.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); /* Check if the form data comes for a trusted request */ diff --git a/op/op.EditComment.php b/op/op.EditComment.php index b371cf610..df04e54b6 100644 --- a/op/op.EditComment.php +++ b/op/op.EditComment.php @@ -19,12 +19,11 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); +include("../inc/inc.LogInit.php"); include("../inc/inc.Utils.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); /* Check if the form data comes for a trusted request */ diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php index 43e65380e..2f9e8533c 100644 --- a/op/op.EditDocument.php +++ b/op/op.EditDocument.php @@ -23,7 +23,6 @@ include("../inc/inc.Utils.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) { diff --git a/op/op.EditEvent.php b/op/op.EditEvent.php index 14a54a8f0..772c75716 100644 --- a/op/op.EditEvent.php +++ b/op/op.EditEvent.php @@ -21,7 +21,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.EditFolder.php b/op/op.EditFolder.php index 6d79743b9..ef438246c 100644 --- a/op/op.EditFolder.php +++ b/op/op.EditFolder.php @@ -23,7 +23,6 @@ include("../inc/inc.Utils.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); if (!isset($_POST["folderid"]) || !is_numeric($_POST["folderid"]) || intval($_POST["folderid"])<1) { diff --git a/op/op.FolderAccess.php b/op/op.FolderAccess.php index ae42595a1..d69a8e690 100644 --- a/op/op.FolderAccess.php +++ b/op/op.FolderAccess.php @@ -23,7 +23,6 @@ include("../inc/inc.Utils.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) { diff --git a/op/op.FolderNotify.php b/op/op.FolderNotify.php index d2d417b7e..bd5db4432 100644 --- a/op/op.FolderNotify.php +++ b/op/op.FolderNotify.php @@ -22,7 +22,6 @@ include("../inc/inc.Utils.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); if(!checkFormKey('foldernotify')) { diff --git a/op/op.GroupMgr.php b/op/op.GroupMgr.php index 95cfe1e74..f8786a799 100644 --- a/op/op.GroupMgr.php +++ b/op/op.GroupMgr.php @@ -23,7 +23,6 @@ include("../inc/inc.LogInit.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); if (!$user->isAdmin()) { diff --git a/op/op.GroupView.php b/op/op.GroupView.php index 32ec5774b..996f9dc49 100644 --- a/op/op.GroupView.php +++ b/op/op.GroupView.php @@ -23,7 +23,6 @@ include("../inc/inc.LogInit.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); /* Get the group and check if the currently logged in user is a manager */ diff --git a/op/op.Login.php b/op/op.Login.php index cc87bc9df..ec29efb7a 100644 --- a/op/op.Login.php +++ b/op/op.Login.php @@ -18,13 +18,12 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); +include("../inc/inc.LogInit.php"); include("../inc/inc.Utils.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassSession.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc"; diff --git a/op/op.ManageNotify.php b/op/op.ManageNotify.php index aaa9cb851..d4efec291 100644 --- a/op/op.ManageNotify.php +++ b/op/op.ManageNotify.php @@ -20,7 +20,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); if ($user->isGuest()) { diff --git a/op/op.MoveClipboard.php b/op/op.MoveClipboard.php index 046644a30..ec7acfc0f 100644 --- a/op/op.MoveClipboard.php +++ b/op/op.MoveClipboard.php @@ -22,7 +22,6 @@ include("../inc/inc.LogInit.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); if (!isset($_GET["targetid"]) || !is_numeric($_GET["targetid"]) || $_GET["targetid"]<1) { diff --git a/op/op.MoveDocument.php b/op/op.MoveDocument.php index ee30cd3a8..b9e94f5ac 100644 --- a/op/op.MoveDocument.php +++ b/op/op.MoveDocument.php @@ -22,7 +22,6 @@ include("../inc/inc.LogInit.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { diff --git a/op/op.MoveFolder.php b/op/op.MoveFolder.php index bbc944b86..abdcdd19b 100644 --- a/op/op.MoveFolder.php +++ b/op/op.MoveFolder.php @@ -22,7 +22,6 @@ include("../inc/inc.LogInit.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) { diff --git a/op/op.OverrideContentStatus.php b/op/op.OverrideContentStatus.php index 84e014db7..d6e51cc2b 100644 --- a/op/op.OverrideContentStatus.php +++ b/op/op.OverrideContentStatus.php @@ -20,7 +20,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Utils.php"); include("../inc/inc.Language.php"); diff --git a/op/op.PasswordForgotten.php b/op/op.PasswordForgotten.php index ed9af5c32..63eca6ab6 100644 --- a/op/op.PasswordForgotten.php +++ b/op/op.PasswordForgotten.php @@ -25,7 +25,7 @@ include("../inc/inc.Language.php"); include("../inc/inc.ClassSession.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); +include("../inc/inc.ClassEmailUtils.php"); include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc"; @@ -53,11 +53,11 @@ if (empty($email) || empty($login)) { $user = $dms->getUserByLogin($login, $email); if($user) { if($hash = $dms->createPasswordRequest($user)) { - $emailobj = new SeedDMS_Email(); + $emailobj = new SeedDMS_EmailUtils(); $subject = "###SITENAME###: ".getMLText("password_forgotten_email_subject"); $message = str_replace('###HASH###', $hash, getMLText("password_forgotten_email_body")); - $emailobj->sendPassword('', $user, $subject, $message); + $emailobj->sendPassword($settings->_smtpSendFrom, $user, $subject, $message); } } diff --git a/op/op.RemoveDocument.php b/op/op.RemoveDocument.php index afaf8ac00..cec2dc468 100644 --- a/op/op.RemoveDocument.php +++ b/op/op.RemoveDocument.php @@ -19,7 +19,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.RemoveDocumentFile.php b/op/op.RemoveDocumentFile.php index df9d5eb1f..4c9c988ea 100644 --- a/op/op.RemoveDocumentFile.php +++ b/op/op.RemoveDocumentFile.php @@ -18,7 +18,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.RemoveEvent.php b/op/op.RemoveEvent.php index a5c505e5b..9f4a4ab35 100644 --- a/op/op.RemoveEvent.php +++ b/op/op.RemoveEvent.php @@ -21,7 +21,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.RemoveFolder.php b/op/op.RemoveFolder.php index 73e9080ef..a0f375c09 100644 --- a/op/op.RemoveFolder.php +++ b/op/op.RemoveFolder.php @@ -19,7 +19,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.RemoveFolderFiles.php b/op/op.RemoveFolderFiles.php index 3aa72471a..2d3c6d982 100644 --- a/op/op.RemoveFolderFiles.php +++ b/op/op.RemoveFolderFiles.php @@ -18,7 +18,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.RemoveFromClipboard.php b/op/op.RemoveFromClipboard.php index 4f84569e7..7065be794 100644 --- a/op/op.RemoveFromClipboard.php +++ b/op/op.RemoveFromClipboard.php @@ -23,7 +23,6 @@ include("../inc/inc.LogInit.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); if (isset($_GET["id"]) && is_numeric($_GET["id"]) && isset($_GET['type'])) { diff --git a/op/op.RemoveTransitionFromWorkflow.php b/op/op.RemoveTransitionFromWorkflow.php index 63d0377dc..cdadd7f98 100644 --- a/op/op.RemoveTransitionFromWorkflow.php +++ b/op/op.RemoveTransitionFromWorkflow.php @@ -19,7 +19,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.RemoveVersion.php b/op/op.RemoveVersion.php index 9084ff968..c3136f11d 100644 --- a/op/op.RemoveVersion.php +++ b/op/op.RemoveVersion.php @@ -19,7 +19,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.RemoveWorkflow.php b/op/op.RemoveWorkflow.php index 1cd47f7d7..23643eaf9 100644 --- a/op/op.RemoveWorkflow.php +++ b/op/op.RemoveWorkflow.php @@ -19,7 +19,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.RemoveWorkflowAction.php b/op/op.RemoveWorkflowAction.php index 58c7e91c4..37323e7f1 100644 --- a/op/op.RemoveWorkflowAction.php +++ b/op/op.RemoveWorkflowAction.php @@ -19,7 +19,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.RemoveWorkflowFromDocument.php b/op/op.RemoveWorkflowFromDocument.php index 0dfcb0035..c3e211b92 100644 --- a/op/op.RemoveWorkflowFromDocument.php +++ b/op/op.RemoveWorkflowFromDocument.php @@ -19,7 +19,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.RemoveWorkflowState.php b/op/op.RemoveWorkflowState.php index 2620970b8..540a31127 100644 --- a/op/op.RemoveWorkflowState.php +++ b/op/op.RemoveWorkflowState.php @@ -19,7 +19,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.ReturnFromSubWorkflow.php b/op/op.ReturnFromSubWorkflow.php index d97e42089..50834fa02 100644 --- a/op/op.ReturnFromSubWorkflow.php +++ b/op/op.ReturnFromSubWorkflow.php @@ -19,7 +19,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php index abf1519e6..fe3ea55af 100644 --- a/op/op.ReviewDocument.php +++ b/op/op.ReviewDocument.php @@ -20,7 +20,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.RewindWorkflow.php b/op/op.RewindWorkflow.php index 1e8fd826d..dd25610ce 100644 --- a/op/op.RewindWorkflow.php +++ b/op/op.RewindWorkflow.php @@ -19,7 +19,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.RunSubWorkflow.php b/op/op.RunSubWorkflow.php index daeb9cbd6..9070e43c4 100644 --- a/op/op.RunSubWorkflow.php +++ b/op/op.RunSubWorkflow.php @@ -19,7 +19,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.SetExpires.php b/op/op.SetExpires.php index e9fca58e3..e1caa967b 100644 --- a/op/op.SetExpires.php +++ b/op/op.SetExpires.php @@ -23,7 +23,6 @@ include("../inc/inc.LogInit.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) { diff --git a/op/op.SetLanguage.php b/op/op.SetLanguage.php index 72e87b606..a0a283ca3 100644 --- a/op/op.SetLanguage.php +++ b/op/op.SetLanguage.php @@ -23,7 +23,6 @@ include("../inc/inc.LogInit.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); $session->setLanguage($_GET['lang']); diff --git a/op/op.SetReviewersApprovers.php b/op/op.SetReviewersApprovers.php index ac6b0a656..4e69ca64d 100644 --- a/op/op.SetReviewersApprovers.php +++ b/op/op.SetReviewersApprovers.php @@ -20,7 +20,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Utils.php"); include("../inc/inc.Language.php"); diff --git a/op/op.SetWorkflow.php b/op/op.SetWorkflow.php index eb9d3be70..3b7cf03b9 100644 --- a/op/op.SetWorkflow.php +++ b/op/op.SetWorkflow.php @@ -23,7 +23,6 @@ include("../inc/inc.LogInit.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); /* Check if the form data comes for a trusted request */ diff --git a/op/op.TriggerWorkflow.php b/op/op.TriggerWorkflow.php index c985aeb62..4f1f3f981 100644 --- a/op/op.TriggerWorkflow.php +++ b/op/op.TriggerWorkflow.php @@ -19,7 +19,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php index fcecc9a26..5ce4dba94 100644 --- a/op/op.UpdateDocument.php +++ b/op/op.UpdateDocument.php @@ -19,7 +19,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.UpdateDocument2.php b/op/op.UpdateDocument2.php index 7f98b4fec..38504df4c 100644 --- a/op/op.UpdateDocument2.php +++ b/op/op.UpdateDocument2.php @@ -19,7 +19,6 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); From f021f1e2fd04f4036aaf39a07dfe699825a1e721 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Nov 2015 17:02:15 +0100 Subject: [PATCH 04/65] remove sendPassword() because it is now in SeedDMS_EmailUtils --- inc/inc.ClassEmailNotify.php | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/inc/inc.ClassEmailNotify.php b/inc/inc.ClassEmailNotify.php index 13249be4d..c02ac8159 100644 --- a/inc/inc.ClassEmailNotify.php +++ b/inc/inc.ClassEmailNotify.php @@ -82,18 +82,5 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify { return true; } /* }}} */ - - function sendPassword($sender, $recipient, $subject, $message) { /* {{{ */ - global $settings; - - $headers = array(); - $headers[] = "MIME-Version: 1.0"; - $headers[] = "Content-type: text/plain; charset=utf-8"; - $headers[] = "From: ". $settings->_smtpSendFrom; - $headers[] = "Reply-To: ". $settings->_smtpSendFrom; - - $subject = "=?UTF-8?B?".base64_encode($this->replaceMarker($subject))."?="; - return (mail($recipient->getEmail(), $subject, $this->replaceMarker($message), implode("\r\n", $headers)) ? 0 : -1); - } /* }}} */ } ?> From 401f3ba685ee99cc1bd363a841c07187bd8ff5d5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Nov 2015 17:18:58 +0100 Subject: [PATCH 05/65] move set sender into EmailNotify --- inc/inc.ClassEmailNotify.php | 9 +++++++++ inc/inc.ClassNotify.php | 18 ------------------ 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/inc/inc.ClassEmailNotify.php b/inc/inc.ClassEmailNotify.php index c02ac8159..96149acd4 100644 --- a/inc/inc.ClassEmailNotify.php +++ b/inc/inc.ClassEmailNotify.php @@ -30,6 +30,15 @@ require_once("inc.ClassNotify.php"); * @version Release: @package_version@ */ class SeedDMS_EmailNotify extends SeedDMS_Notify { + /* User sending the notification + * Will only be used if the sender of one of the notify methods + * is not set + */ + protected $sender; + + function setSender($user) { + $this->sender = $user; + } function toIndividual($sender, $recipient, $subject, $message, $params=array()) { /* {{{ */ global $settings; diff --git a/inc/inc.ClassNotify.php b/inc/inc.ClassNotify.php index ea32608bc..8274c8a90 100644 --- a/inc/inc.ClassNotify.php +++ b/inc/inc.ClassNotify.php @@ -25,27 +25,9 @@ * @version Release: @package_version@ */ abstract class SeedDMS_Notify { - /* User sending the notification - * Will only be used if the sender of one of the notify methods - * is not set - */ - protected $sender; - abstract function toIndividual($sender, $recipient, $subject, $message, $params=array()); abstract function toGroup($sender, $groupRecipient, $subject, $message, $params=array()); abstract function toList($sender, $recipients, $subject, $message, $params=array()); - function replaceMarker($text) { - global $settings; - - return(str_replace( - array('###SITENAME###', '###HTTP_ROOT###', '###URL_PREFIX###'), - array($settings->_siteName, $settings->_httpRoot, "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot), - $text)); - } - - function setSender($user) { - $this->sender = $user; - } } ?> From 8d888441904f3892f89da89c981323f94b650388 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Nov 2015 17:19:28 +0100 Subject: [PATCH 06/65] move replaceMarker from Notify --- inc/inc.ClassEmailUtils.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/inc/inc.ClassEmailUtils.php b/inc/inc.ClassEmailUtils.php index 5b1814053..a36672304 100644 --- a/inc/inc.ClassEmailUtils.php +++ b/inc/inc.ClassEmailUtils.php @@ -36,5 +36,15 @@ class SeedDMS_EmailUtils { $subject = "=?UTF-8?B?".base64_encode($this->replaceMarker($subject))."?="; return (mail($recipient->getEmail(), $subject, $this->replaceMarker($message), implode("\r\n", $headers)) ? 0 : -1); } /* }}} */ + + function replaceMarker($text) { /* {{{ */ + global $settings; + + return(str_replace( + array('###SITENAME###', '###HTTP_ROOT###', '###URL_PREFIX###'), + array($settings->_siteName, $settings->_httpRoot, "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot), + $text)); + } /* }}} */ + } ?> From a8dbe053463fac516830bed5e42f3c0d162b51fe Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Nov 2015 21:39:51 +0100 Subject: [PATCH 07/65] send mail to notifier of folder too, remove old code --- op/op.RemoveDocument.php | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/op/op.RemoveDocument.php b/op/op.RemoveDocument.php index cec2dc468..eb6897322 100644 --- a/op/op.RemoveDocument.php +++ b/op/op.RemoveDocument.php @@ -53,7 +53,12 @@ if($document->isLocked()) { $folder = $document->getFolder(); /* Get the notify list before removing the document */ -$nl = $document->getNotifyList(); +$dnl = $document->getNotifyList(); +$fnl = $folder->getNotifyList(); +$nl = array( + 'users'=>array_merge($dnl['users'], $fnl['users']), + 'groups'=>array_merge($dnl['groups'], $fnl['groups']) +); $docname = $document->getName(); if (!$document->remove()) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("error_occured")); @@ -72,29 +77,6 @@ if (!$document->remove()) { } if ($notifier){ -/* - $path = ""; - $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("document_deleted_email"); - $message = getMLText("document_deleted_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("folder").": ".$path."\r\n". - getMLText("comment").": ".$document->getComment()."\r\n". - getMLText("user").": ".$user->getFullName()." <". $user->getEmail() ."> "; - - // Send notification to subscribers. - $notifier->toList($user, $nl["users"], $subject, $message); - foreach ($nl["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ $subject = "document_deleted_email_subject"; $message = "document_deleted_email_body"; $params = array(); From 44ee028bcd3af8910fc6a62fb2ae51d397fe90a8 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 26 Nov 2015 13:01:20 +0100 Subject: [PATCH 08/65] send notification mails when document ist deleted --- op/op.Ajax.php | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/op/op.Ajax.php b/op/op.Ajax.php index 7f462bd20..6507c2a4f 100644 --- a/op/op.Ajax.php +++ b/op/op.Ajax.php @@ -318,6 +318,15 @@ switch($command) { $document = $dms->getDocument($_REQUEST['id']); if($document) { if ($document->getAccessMode($user) >= M_READWRITE) { + $folder = $document->getFolder(); + /* Get the notify list before removing the document */ + $dnl = $document->getNotifyList(); + $fnl = $folder->getNotifyList(); + $nl = array( + 'users'=>array_merge($dnl['users'], $fnl['users']), + 'groups'=>array_merge($dnl['groups'], $fnl['groups']) + ); + $docname = $document->getName(); if($document->remove()) { /* Remove the document from the fulltext index */ if($settings->_enableFullSearch) { @@ -330,6 +339,22 @@ switch($command) { } } } + + if ($notifier){ + $subject = "document_deleted_email_subject"; + $message = "document_deleted_email_body"; + $params = array(); + $params['name'] = $docname; + $params['folder_path'] = $folder->getFolderPathPlain(); + $params['username'] = $user->getFullName(); + $params['sitename'] = $settings->_siteName; + $params['http_root'] = $settings->_httpRoot; + $notifier->toList($user, $nl["users"], $subject, $message, $params); + foreach ($nl["groups"] as $grp) { + $notifier->toGroup($user, $grp, $subject, $message, $params); + } + } + header('Content-Type: application/json'); echo json_encode(array('success'=>true, 'message'=>'', 'data'=>'')); } else { From b018e0d9730e648f4467887132e2a49a88cf8e0a Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 27 Nov 2015 08:21:34 +0100 Subject: [PATCH 09/65] start changelog for 4.3.23 --- CHANGELOG | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 8f8d56df1..fd9fe0ee1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +-------------------------------------------------------------------------------- + Changes in version 4.3.23 +-------------------------------------------------------------------------------- +- send notification if document is delete to those users watching the folder + -------------------------------------------------------------------------------- Changes in version 4.3.22 -------------------------------------------------------------------------------- From 7a44d2b35b38448ad13e92b090b585de0a634730 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 3 Dec 2015 15:12:05 +0100 Subject: [PATCH 10/65] various updates from demo --- languages/cs_CZ/lang.inc | 12 +- languages/de_DE/lang.inc | 4 +- languages/en_GB/lang.inc | 4 +- languages/hr_HR/lang.inc | 349 ++++++++++++++++++++------------------- languages/nl_NL/lang.inc | 4 +- languages/pl_PL/lang.inc | 6 +- languages/pt_BR/lang.inc | 4 +- languages/ru_RU/lang.inc | 10 +- languages/sk_SK/lang.inc | 8 +- languages/zh_CN/lang.inc | 6 +- languages/zh_TW/lang.inc | 10 +- 11 files changed, 216 insertions(+), 201 deletions(-) diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 2c5206401..9f8b3c707 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 (697), kreml (455) +// Translators: Admin (702), kreml (455) $text = array( 'accept' => 'Přijmout', @@ -51,7 +51,7 @@ URL: [url]', 'add_approval' => 'Poslat ke schválení', 'add_document' => 'Přidat dokument', 'add_document_link' => 'Přidat odkaz', -'add_document_notify' => '', +'add_document_notify' => 'Přiřaďte oznámení', 'add_doc_reviewer_approver_warning' => 'Pozn.: Dokumenty se automaticky označí jako vydané, když není přidělen žádný kontrolor nebo schvalovatel.', 'add_doc_workflow_warning' => 'Pozn. Není-li zadán pracovní postup, jsou dokumenty automaticky označeny jako uvolněné.', 'add_event' => 'Přidat akci', @@ -408,7 +408,7 @@ URL: [url]', 'files' => 'Soubory', 'files_deletion' => 'Soubor odstraněn', 'files_deletion_warning' => 'Pomocí této volby můžete odstranit všechny soubory z celé složky DMS. Verzovací informace zůstanou viditelné.', -'files_loading' => '', +'files_loading' => 'Vyčkejte dokud se nenahraje seznam souborů ...', 'file_size' => 'Velikost souboru', 'filter_for_documents' => 'Další filtr pro dokumenty', 'filter_for_folders' => 'Další filtr pro složky', @@ -541,7 +541,7 @@ URL: [url]', 'keep' => 'Neměňte', 'keep_doc_status' => 'Zachovat stav dokumentu', 'keywords' => 'Klíčová slova', -'keywords_loading' => '', +'keywords_loading' => 'Vyčkejte dokud se nenahraje seznam klíčových slov ...', 'keyword_exists' => 'Klíčové slovo už existuje', 'ko_KR' => 'Korejština', 'language' => 'Jazyk', @@ -869,12 +869,12 @@ URL: [url]', 'select_category' => 'Kliknutím vyberte kategorii', 'select_groups' => 'Kliknutím vyberte skupiny', 'select_grp_approvers' => 'Kliknutím vyberte skupinu schvalovatele', -'select_grp_notification' => '', +'select_grp_notification' => 'Klikněte pro výběr skupinového oznámení', 'select_grp_recipients' => '', 'select_grp_reviewers' => 'Kliknutím vyberte skupinu posuzovatele', 'select_grp_revisors' => '', 'select_ind_approvers' => 'Kliknutím vyberte jednotlivého schvalovatele', -'select_ind_notification' => '', +'select_ind_notification' => 'Klikněte pro výběr individuálního oznámení', 'select_ind_recipients' => '', 'select_ind_reviewers' => 'Klepnutím vyberte jednotlivého posuzovatele', 'select_ind_revisors' => '', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index c5d815dd6..4c5ef06dc 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 (2140), dgrutsch (18) +// Translators: Admin (2141), dgrutsch (18) $text = array( 'accept' => 'Übernehmen', @@ -250,7 +250,7 @@ URL: [url]', 'continue' => 'fortführen', 'converter_new_cmd' => 'Kommando', 'converter_new_mimetype' => 'Neuer Mime-Type', -'copied_to_checkout_as' => 'Datei in den Checkout-Space als \'[filename]\' kopiert.', +'copied_to_checkout_as' => 'Datei am [date] in den Checkout-Space als \'[filename]\' kopiert.', 'create_fulltext_index' => 'Erzeuge Volltextindex', 'create_fulltext_index_warning' => 'Sie möchten den Volltextindex neu erzeugen. Dies kann beträchtlich Zeit in Anspruch nehmen und Gesamtleistung Ihres System beeinträchtigen. Bestätigen Sie bitte diese Operation.', 'creation_date' => 'Erstellt am', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 2460c9820..bd72e9acb 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 (1275), dgrutsch (3), netixw (14) +// Translators: Admin (1276), dgrutsch (3), netixw (14) $text = array( 'accept' => 'Accept', @@ -250,7 +250,7 @@ URL: [url]', 'continue' => 'Continue', 'converter_new_cmd' => 'Command', 'converter_new_mimetype' => 'New mimetype', -'copied_to_checkout_as' => 'File copied to checkout space as \'[filename]\'', +'copied_to_checkout_as' => 'File copied to checkout space as \'[filename]\' on [date]', 'create_fulltext_index' => 'Create fulltext index', 'create_fulltext_index_warning' => 'You are about to recreate the fulltext index. This can take a considerable amount of time and reduce your overall system performance. If you really want to recreate the index, please confirm your operation.', 'creation_date' => 'Created', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 2d9475df5..817e5aeea 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 (1025) +// Translators: Admin (1175), marbanas (16) $text = array( 'accept' => 'Prihvati', @@ -48,10 +48,10 @@ Internet poveznica: [url]', 'action_review' => 'Pregledaj', 'action_revise' => 'Izmijeni', 'add' => 'Dodaj', -'add_approval' => '', +'add_approval' => 'Dodaj odobrenje', 'add_document' => 'Dodaj dokument', 'add_document_link' => 'Dodaj poveznicu', -'add_document_notify' => '', +'add_document_notify' => 'Dodijeli obavještavanje', 'add_doc_reviewer_approver_warning' => 'N.B. Dokumenti se automatski označavaju kao objavljeni ako nije dodijeljen recezent ili validator.', 'add_doc_workflow_warning' => 'N.B. Dokumenti se automatski označavaju kao objavljeni ako nije dodijeljen tok rada.', 'add_event' => 'Dodaj događaj', @@ -59,13 +59,13 @@ Internet poveznica: [url]', 'add_member' => 'Dodaj člana', 'add_multiple_documents' => 'Dodaj više dokumenata odjednom', 'add_multiple_files' => 'Dodaj više datoteka (koristit će naziv datoteke kao naziv dokumenta)', -'add_receipt' => '', -'add_review' => '', -'add_revision' => '', +'add_receipt' => 'Potvrdi prijem', +'add_review' => 'Dodaj osvrt', +'add_revision' => 'Dodaj reviziju', 'add_subfolder' => 'Dodaj podmapu', 'add_to_clipboard' => 'Dodaj u međuspremnik', -'add_to_transmittal' => '', -'add_transmittal' => '', +'add_to_transmittal' => 'Dodaj u proslijeđivanje', +'add_transmittal' => 'Dodaj proslijeđivanje', 'add_user' => 'Dodaj novog korisnika', 'add_user_to_group' => 'Dodaj korisnika u grupu', 'add_workflow' => 'Dodaj novi tok rada', @@ -82,9 +82,14 @@ Internet poveznica: [url]', 'and' => 'i', 'apply' => 'Primjeni', 'approval_deletion_email' => 'Izbrisan zahtjev za odobrenje', -'approval_deletion_email_body' => '', -'approval_deletion_email_subject' => '', -'approval_file' => '', +'approval_deletion_email_body' => 'Zahtjev za odobrenjem izbrisan +Dokument: [name] +Verzija: [version] +Glavna mapa: [folder_path] +Korisnik: [username] +URL: [url]', +'approval_deletion_email_subject' => '[sitename]: [name] - Zahtjev za odobrenjem izbrisan', +'approval_file' => 'Datoteka', 'approval_group' => 'Grupa odobrenja', 'approval_log' => 'Popis odobrenja', 'approval_request_email' => 'Zahtjev za odobrenje', @@ -96,7 +101,7 @@ Korisnik: [username] Internet poveznica: [url]', 'approval_request_email_subject' => '[sitename]: [name] - Zahtjev za odobrenje', 'approval_status' => 'Status odobrenja', -'approval_submit_email' => '', +'approval_submit_email' => 'Predan zahtjev za odobrenje', 'approval_submit_email_body' => 'Odobrenje dokumenta Dokument: [name] Verzija: [version] @@ -109,8 +114,8 @@ Internet poveznica: [url]', 'approval_summary' => 'Pregled odobrenja', 'approval_update_failed' => 'Greška pri ažuriranju statusa odobrenja. Ažuriranje nije uspjelo.', 'approvers' => 'Validatori', -'approver_already_assigned' => '', -'approver_already_removed' => '', +'approver_already_assigned' => 'Korisnik je već dodijeljen kao odobravatelj', +'approver_already_removed' => 'Odobravatelj je već uklonjen iz procesa odobrenja ili je već odobrio dokument.', 'april' => 'Travanj', 'archive_creation' => 'Izrada arhive', 'archive_creation_warning' => 'Ovom radnjom možete izraditi arhivu koja sadrži datoteke cijele DMS mape. Nakon izrade arhiva će biti pohranjena u podatkovnu mapu vašer servera.
UPOZORENJE: arhiva izrađena na način da je čitljiva ljudima, bit će bezkorisna kao sigurnosna kopija servera.', @@ -132,13 +137,13 @@ Internet poveznica: [url]', 'attrdef_objtype' => 'Vrsta objekta', 'attrdef_regex' => 'Pravilni izraz', 'attrdef_type' => 'Vrsta', -'attrdef_type_boolean' => '', -'attrdef_type_date' => '', -'attrdef_type_email' => '', -'attrdef_type_float' => '', -'attrdef_type_int' => '', -'attrdef_type_string' => '', -'attrdef_type_url' => '', +'attrdef_type_boolean' => 'Boolean', +'attrdef_type_date' => 'Datum', +'attrdef_type_email' => 'Email', +'attrdef_type_float' => 'Float', +'attrdef_type_int' => 'Integer', +'attrdef_type_string' => 'String', +'attrdef_type_url' => 'URL', 'attrdef_valueset' => 'Skup vrijednosti', 'attributes' => 'Atributi', 'attribute_changed_email_body' => 'Promijenjen atribut @@ -151,8 +156,8 @@ Internet poveznica: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Promijenjen atribut', 'attribute_count' => 'Broj uporaba', 'attribute_value' => 'Vrijednost atributa', -'attr_malformed_email' => '', -'attr_malformed_url' => '', +'attr_malformed_email' => 'Vrijednost atributa \'[value]\' za atribut \'[attrname]\' nije važeći URL.', +'attr_malformed_url' => 'Vrijednost atributa \'[value]\' za atribut \'[attrname]\' nije važeći URL.', 'attr_max_values' => 'Premašen je maksimalni broj zahtjevanih vrijednosti za atribute[attrname].', 'attr_min_values' => 'Minimalni broj zahtjevanih vrijednosti za atribute[attrname] nije dostignut.', 'attr_no_regex_match' => 'Vrijednost atributa ne odgovara pravilnom izrazu', @@ -181,7 +186,7 @@ Internet poveznica: [url]', 'cannot_retrieve_review_snapshot' => 'Nije moguće dohvatiti snimku statusa pregleda za ovu verziju dokumenta.', 'cannot_rm_root' => 'Greška: Ne možete izbrisati root mapu.', 'categories' => 'Kategorije', -'categories_loading' => '', +'categories_loading' => 'Molimo pričekati dok se ne učita lista kategorija...', 'category' => 'Kategorija', 'category_exists' => 'Kategorija već postoji.', 'category_filter' => 'Samo kategorije', @@ -191,8 +196,8 @@ Internet poveznica: [url]', 'change_assignments' => 'Promjena zadataka', 'change_password' => 'Promjeni lozinku', 'change_password_message' => 'Vaša lozinka je promijenjena.', -'change_recipients' => '', -'change_revisors' => '', +'change_recipients' => 'Promijeni listu primatelja', +'change_revisors' => 'Promijeni ponovno slanje', 'change_status' => 'Promijeni status', 'charts' => 'Grafikoni', 'chart_docsaccumulated_title' => 'Broj dokumenata', @@ -203,12 +208,12 @@ Internet poveznica: [url]', 'chart_docsperuser_title' => 'Dokumenata po korisniku', 'chart_selection' => 'Odaberi grafikon', 'chart_sizeperuser_title' => 'Prostor na disku po korisniku', -'checkedout_file_has_different_version' => '', -'checkedout_file_has_disappeared' => '', -'checkedout_file_is_unchanged' => '', -'checkin_document' => '', -'checkout_document' => '', -'checkout_is_disabled' => '', +'checkedout_file_has_different_version' => 'Odjavljena verzija nije identična trenutnoj verziji. Prijava neće izmijeniti dokument.', +'checkedout_file_has_disappeared' => 'Datoteka odjavljenog dokumenta je nestala. Prijava neće biti moguća.', +'checkedout_file_is_unchanged' => 'Datoteka odjavljenog dokumenta je još uvijek nepromijenjena. Prijava neće biti moguća. Ukoliko ne planirate izmjene, možete resetirati status odjave.', +'checkin_document' => 'Prijava', +'checkout_document' => 'Odjava', +'checkout_is_disabled' => 'Odjava dokumenata je onemogućena u konfiguraciji.', 'choose_attrdef' => 'Molim odaberite definiciju atributa', 'choose_category' => 'Molim odaberite', 'choose_group' => 'Odaberite grupu', @@ -224,7 +229,7 @@ Internet poveznica: [url]', 'clipboard' => 'Međuspremnik', 'close' => 'Zatvori', 'comment' => 'Komentar', -'comment_changed_email' => '', +'comment_changed_email' => 'Promjena komentara', 'comment_for_current_version' => 'Verzija komentara', 'confirm_create_fulltext_index' => 'Da, želim ponovo indeksirati cijeli tekst!', 'confirm_pwd' => 'Potvrdi lozinku', @@ -237,15 +242,15 @@ Internet poveznica: [url]', 'confirm_rm_folder_files' => 'Da li zaista želite ukloniti sve datoteke u mapi "[foldername]" i sve podmape?
Oprez: ova radnja nije povratna.', 'confirm_rm_group' => 'Da li zaista želite ukloniti grupu "[groupname]"?
Oprez: ova radnja nije povratna.', 'confirm_rm_log' => 'Da li zaista želite ukloniti log datoteku "[logname]"?
Oprez: ova radnja nije povratna.', -'confirm_rm_transmittalitem' => '', +'confirm_rm_transmittalitem' => 'Potvrdi uklanjanje', 'confirm_rm_user' => 'Da li zaista želite ukloniti korisnika "[username]"?
Oprez: ova radnja nije povratna.', 'confirm_rm_version' => 'Da li zaista želite ukloniti verziju [version] dokumenta "[documentname]"?
Oprez: ova radnja nije povratna.', -'confirm_update_transmittalitem' => '', +'confirm_update_transmittalitem' => 'Potvrdi izmjenu', 'content' => 'Sadržaj', 'continue' => 'Nastavi', -'converter_new_cmd' => '', -'converter_new_mimetype' => '', -'copied_to_checkout_as' => '', +'converter_new_cmd' => 'Komanda', +'converter_new_mimetype' => 'Novi tip datoteke', +'copied_to_checkout_as' => 'Datoteka je kopirana u prostor odjave kao \'[filename]\'', 'create_fulltext_index' => 'Indeksiraj cijeli tekst', 'create_fulltext_index_warning' => 'Želite ponovo indeksirati cijeli tekst. To može duže potrajati i smanjiti sveukupne performanse sustava. Ako zaista želite ponovno indeksirati, molimo potvrdite vašu radnju.', 'creation_date' => 'Izrađeno', @@ -270,17 +275,17 @@ Internet poveznica: [url]', 'discspace' => 'Prostor na disku', 'document' => 'Dokument', 'documents' => 'Dokumenti', -'documents_checked_out_by_you' => '', +'documents_checked_out_by_you' => 'Dokumenti koje ste Vi odjavili', 'documents_in_process' => 'Dokumenti u postupku', 'documents_locked_by_you' => 'Dokumenti koje ste vi zaključali', 'documents_only' => 'Samo dokumenti', 'documents_to_approve' => 'Dokumenti koji čekaju vaše odobrenje', -'documents_to_receipt' => '', +'documents_to_receipt' => 'Dokumenti koji čekaju potvrdu primitka', 'documents_to_review' => 'Dokumenti koji čekaju vaš pregled', -'documents_to_revise' => '', -'documents_user_rejected' => '', +'documents_to_revise' => 'Dokumenti za reviziju', +'documents_user_rejected' => 'Odbijeni dokumenti', 'documents_user_requiring_attention' => 'Dokumenti u vašem vlasništvu koji zahtjevaju pažnju', -'document_already_checkedout' => '', +'document_already_checkedout' => 'Ovaj dokument je već odjavljen', 'document_already_locked' => 'Ovaj dokument je već zaključan', 'document_comment_changed_email' => 'Promijenjen komentar', 'document_comment_changed_email_body' => 'Promijenjen komentar @@ -301,7 +306,7 @@ Korisnik: [username]', 'document_duplicate_name' => 'Duplicate document name', 'document_has_no_workflow' => 'Dokument nema tok rada', 'document_infos' => 'Informacije o dokumentu', -'document_is_checked_out' => '', +'document_is_checked_out' => 'Dokument je trenutno odjavljen. Ako učitate novu verziju, tada odjavljena verzija ne može više biti ponovno prijavljena.', 'document_is_not_locked' => 'Ovaj dokument nije zaključan', 'document_link_by' => 'Povezao', 'document_link_public' => 'Javno', @@ -313,7 +318,7 @@ Nova mapa: [new_folder_path] Korisnik: [username] Internet poveznica: [url]', 'document_moved_email_subject' => '[sitename]: [name] - Premješten dokument', -'document_not_checkedout' => '', +'document_not_checkedout' => 'Dokument je odjavljen.', 'document_renamed_email' => 'Preimenovan dokument', 'document_renamed_email_body' => 'Promjenjen naziv dokumenta Dokument: [name] @@ -347,7 +352,7 @@ Internet poveznica: [url]', 'do_object_setchecksum' => 'Postavi kontrolnu sumu', 'do_object_setfilesize' => 'Postavi veličinu datoteke', 'do_object_unlink' => 'Izbriši verziju dokumenta', -'draft' => '', +'draft' => 'Nacrt', 'draft_pending_approval' => 'Skica - čeka odobrenje', 'draft_pending_review' => 'Skica - čeka pregled', 'drag_icon_here' => 'Ovdje povuci ikonu mape ili dokumenta!', @@ -358,7 +363,7 @@ Internet poveznica: [url]', 'dump_creation_warning' => 'Ovom radnjom možete stvoriti datoteku za odlaganje sadržaja vaše baze podataka. Nakon izrade datoteka za odlaganje će biti pohranjena u podatkovnoj mapi na vašem serveru.', 'dump_list' => 'Postojeće datoteke za odlaganje', 'dump_remove' => 'Ukloni datoteku za odlaganje', -'duplicate_content' => '', +'duplicate_content' => 'Duplicirani sadržaj', 'edit' => 'Uredi', 'edit_attributes' => 'Uredi atribute', 'edit_comment' => 'Uredi komentar', @@ -373,7 +378,7 @@ Internet poveznica: [url]', 'edit_folder_notify' => 'Popis za obavijesti o mapi', 'edit_folder_props' => 'Uredi mapu', 'edit_group' => 'Uredi mapu', -'edit_transmittal_props' => '', +'edit_transmittal_props' => 'Izmjena postavki proslijeđivanja', 'edit_user' => 'Uredi korisnika', 'edit_user_details' => 'Uredi detalje korisnika', 'email' => 'Email', @@ -391,7 +396,7 @@ Internet poveznica: [url]', 'error_occured' => 'Dogodila se greška', 'es_ES' => 'Španjolski', 'event_details' => 'Detalji događaja', -'exclude_items' => '', +'exclude_items' => 'Isključivanje stavki', 'expired' => 'Isteklo', 'expires' => 'Datum isteka', 'expiry_changed_email' => 'Promijenjen datum isteka', @@ -401,14 +406,14 @@ Glavna mapa: [folder_path] Korisnik: [username] Internet poveznica: [url]', 'expiry_changed_email_subject' => '[sitename]: [name] - Promijenjen datum isteka', -'export' => '', +'export' => 'Izvoz', 'extension_manager' => 'Upravljanje ekstenzijama', 'february' => 'Veljača', 'file' => 'Datoteka', 'files' => 'Datoteke', 'files_deletion' => 'Brisanje datoteke', 'files_deletion_warning' => 'Ovom opcijom možete izbrisati sve datoteke ili cjelokupne DMS mape. Informacije o verzijama će ostati vidljive.', -'files_loading' => '', +'files_loading' => 'Molimo pričekati dok se ne učita lista datoteka...', 'file_size' => 'Veličina datoteke', 'filter_for_documents' => 'Dodatni filter za dokumente', 'filter_for_folders' => 'Dodatni filter za dokumente', @@ -469,7 +474,7 @@ Internet poveznica: [url]', 'group_exists' => 'Grupa već postoji.', 'group_management' => 'Upravljanje grupama', 'group_members' => 'Članovi grupe', -'group_receipt_summary' => '', +'group_receipt_summary' => 'Sažetak prijema za grupu', 'group_review_summary' => 'Sažetak pregleda grupe', 'guest_login' => 'Prijavite se kao gost', 'guest_login_disabled' => 'Prijava "kao gost" je onemogućena.', @@ -482,7 +487,7 @@ Internet poveznica: [url]', 'hu_HU' => 'Mađarski', 'id' => 'ID', 'identical_version' => 'Nova verzija je identična trenutnoj verziji.', -'include_content' => '', +'include_content' => 'Uključi sadržaj', 'include_documents' => 'Sadrži dokumente', 'include_subdirectories' => 'Sadrži podmape', 'index_converters' => 'Pretvorba indeksa dokumenta', @@ -500,8 +505,8 @@ Internet poveznica: [url]', 'invalid_create_date_end' => 'Pogrešan krajnji datum za izradu vremenskog raspona.', 'invalid_create_date_start' => 'Pogrešan početni datum za izradu vremenskog raspona.', 'invalid_doc_id' => 'Pogrešan ID dokumenta', -'invalid_expiration_date_end' => '', -'invalid_expiration_date_start' => '', +'invalid_expiration_date_end' => 'Neispravan datum isteka za datumski raspon isteka.', +'invalid_expiration_date_start' => 'Neispravan početni datum za datumski raspon isteka.', 'invalid_file_id' => 'Pogrešan ID datoteke', 'invalid_folder_id' => 'Pogrešan ID mape', 'invalid_group_id' => 'Pogrešan ID grupe', @@ -514,7 +519,7 @@ Internet poveznica: [url]', 'invalid_target_folder' => 'Pogrešan ID ciljane mape', 'invalid_user_id' => 'Pogrešan ID korisnika', 'invalid_version' => 'Pogrešna verzija dokumenta', -'in_revision' => '', +'in_revision' => 'U reviziji', 'in_workflow' => 'U toku rada', 'is_disabled' => 'Onemogući klijenta', 'is_hidden' => 'Sakrij iz popisa korisnika', @@ -541,14 +546,14 @@ Internet poveznica: [url]', 'keep' => 'Ne mijenjaj', 'keep_doc_status' => 'Zadrži status dokumenta', 'keywords' => 'Ključne riječi', -'keywords_loading' => '', +'keywords_loading' => 'Molimo pričekati dok se ne učita lista ključnih riječi...', 'keyword_exists' => 'Ključna riječ već postoji', 'ko_KR' => 'Korejski', 'language' => 'Jezik', 'lastaccess' => 'Zadnji pristup', 'last_update' => 'Zadnje ažuriranje', 'legend' => 'Kazalo', -'librarydoc' => '', +'librarydoc' => 'Dokument iz biblioteke', 'linked_documents' => 'Vezani dokumenti', 'linked_files' => 'Prilozi', 'link_alt_updatedocument' => 'Ako želite prenijeti datoteke veće od trenutne maksimalne veličine prijenosa, molimo koristite alternativu upload page.', @@ -595,7 +600,7 @@ Internet poveznica: [url]', 'move_folder' => 'Premjesti mapu', 'my_account' => 'Moj korisnički račun', 'my_documents' => 'Moji dokumenti', -'my_transmittals' => '', +'my_transmittals' => 'Moja proslijeđivanja', 'name' => 'Naziv', 'needs_workflow_action' => 'Ovaj dokument zahtjeva vašu pažnju. Molimo provjerite karticu toka rada.', 'never' => 'nikada', @@ -655,34 +660,34 @@ Internet poveznica: [url]', 'no_attached_files' => 'Nema priloženih datoteka', 'no_current_version' => 'Koristite na staru verziju ProsperaDMS-a. Najnovija dostupna verzija je[latestversion].', 'no_default_keywords' => 'Nema dostupnih ključnih riječi', -'no_docs_checked_out' => '', +'no_docs_checked_out' => 'Niti jedan dokument nije odjavljen', 'no_docs_locked' => 'Nema zaključanih dokumenata.', 'no_docs_to_approve' => 'Trenutno nema dokumenata koji zahtjevaju odobrenje.', 'no_docs_to_look_at' => 'Nema dokumenata na koje treba obratiti pozornost.', -'no_docs_to_receipt' => '', +'no_docs_to_receipt' => 'Nema potvrda o primitku dokumenta', 'no_docs_to_review' => 'Trenutno nema dokumenata koji zahtjevaju pregled.', -'no_docs_to_revise' => '', +'no_docs_to_revise' => 'Trenutno nema dokumenata za reviziju.', 'no_email_or_login' => 'Moraju biti unešeni korisničko ime i e-mail', 'no_fulltextindex' => 'Nema dostupnog indeksa punog teksta', 'no_groups' => 'Nema grupa', 'no_group_members' => 'Ova grupa nema članova', 'no_linked_files' => 'Nema povezanih datoteka', 'no_previous_versions' => 'Nema pronađenih drugih verzija', -'no_receipt_needed' => '', +'no_receipt_needed' => 'Nije potrebna potvrda primitka', 'no_review_needed' => 'Nema pregleda na čekanju.', -'no_revision_needed' => '', -'no_revision_planed' => '', +'no_revision_needed' => 'Nema revizije na čekanju.', +'no_revision_planed' => 'Nema zakazane revizije dokumenta', 'no_update_cause_locked' => 'Dakle, ne možete ažurirati ovaj dokument. Molim kontaktirajte korisnika koji zaključava.', 'no_user_image' => 'Nema pronađene slike', 'no_version_check' => 'Neuspješna provjera nove verzije ProsperaDMS-a! Uzrok može biti ako je parametar allow_url_fopen u vašoj php konfiguraciji postavljen na 0.', -'no_version_modification' => '', -'no_workflow_available' => '', +'no_version_modification' => 'Nema modifikacije verzije', +'no_workflow_available' => 'Nema dostupnog toka rada', 'objectcheck' => 'Provjera mapa / dokumenata', 'obsolete' => 'Zastarjelo', 'october' => 'Listopad', 'old' => 'Staro', 'only_jpg_user_images' => 'Kao korisničke slike mogu se koristiti samo .jpg slike', -'order_by_sequence_off' => '', +'order_by_sequence_off' => 'Sortiranje po sekvencei ne isključeno u postavkama. Ako želite da ovaj parametar ima utjecaja, morat ćete ga ponovno uključiti.', 'original_filename' => 'Izvorni naziv datoteke', 'owner' => 'Vlasnik', 'ownership_changed_email' => 'Promijenjen vlasnik', @@ -722,11 +727,11 @@ Ako i dalje imate problema s prijavom, molimo kontaktirajte Vašeg administrator 'password_wrong' => 'Pogrešna lozinka', 'personal_default_keywords' => 'Osobni popis ključnih riječi', 'pl_PL' => 'Poljski', -'possible_substitutes' => '', -'preview' => '', -'preview_converters' => '', -'preview_markdown' => '', -'preview_plain' => '', +'possible_substitutes' => 'Zamjene', +'preview' => 'Predpregled', +'preview_converters' => 'Pretpregled konverzije dokumenta', +'preview_markdown' => 'Smanjenje', +'preview_plain' => 'Obični tekst', 'previous_state' => 'Prethodni status', 'previous_versions' => 'Prethodne verzije', 'pt_BR' => 'Portugalski (BR)', @@ -734,9 +739,9 @@ Ako i dalje imate problema s prijavom, molimo kontaktirajte Vašeg administrator 'quota_exceeded' => 'Vaša kvota na disku je premašena za [bytes].', 'quota_is_disabled' => 'Podrška kvoti je trenutno onemogućena u postavkama. Postavka korisničke kvote neće imati utjecaja dok se ponovno ne omogući.', 'quota_warning' => 'Vaš maksimalni prostor na disku je premašen za [bytes]. Molimo uklonite dokumente ili prethodne verzije.', -'receipt_log' => '', -'receipt_summary' => '', -'recipients' => '', +'receipt_log' => 'Zapisi prijema', +'receipt_summary' => 'Sažetak prijema', +'recipients' => 'Primatelji', 'refresh' => 'Osvježi', 'rejected' => 'Odbijeno', 'released' => 'Obrađeno', @@ -747,9 +752,9 @@ Dokument: [document] Korisnik: [username] Internet poveznica: [url]', 'removed_file_email_subject' => '[sitename]: [document] - Uklonjeni privitak', -'removed_recipient' => '', +'removed_recipient' => 'je uklonjen s liste primatelja.', 'removed_reviewer' => 'je uklonjen iz popisa recezenata.', -'removed_revispr' => '', +'removed_revispr' => 'je uklonjen s liste revizora.', 'removed_workflow_email_body' => 'Uklonjeni tok rada iz ove verzije dokumenta Dokument: [name] Verzija: [version] @@ -770,7 +775,7 @@ Glavna mapa: [folder_path] Korisnik: [username] URL poveznica: [url]', 'request_workflow_action_email_subject' => 'Zahtijeva se aktivnost po poslovnom toku', -'reset_checkout' => '', +'reset_checkout' => 'Dovršite odjavu', 'results_page' => 'Stranica rezultata', 'return_from_subworkflow' => 'Povratak iz pod-toka rada', 'return_from_subworkflow_email_body' => 'Povratak iz toka rada @@ -787,14 +792,24 @@ Internet poveznica: [url]', 'reviewer_already_assigned' => 'je već dodijeljen kao recezent', 'reviewer_already_removed' => 'je već uklonjen iz postupka pregleda ili je već podnijet pregled.', 'review_deletion_email' => 'Izbrisan zahtjev za pregled', -'review_deletion_email_body' => '', -'review_deletion_email_subject' => '', -'review_file' => '', +'review_deletion_email_body' => 'Zahtjev za pregled izbrisan +Dokument: [name] +Verzija: [version] +Glavna mapa: [folder_path] +Korisnik: [username] +URL: [url]', +'review_deletion_email_subject' => '[sitename]: [name] - Zahtjev za recenzijom izbrisan', +'review_file' => 'Datoteka', 'review_group' => 'Grupa pregleda', 'review_log' => 'Log pregleda', 'review_request_email' => 'Zahtjev za pregled', -'review_request_email_body' => '', -'review_request_email_subject' => '', +'review_request_email_body' => 'Zahtjev za pregled +Dokument: [name] +Verzija: [version] +Glavna mapa: [folder_path] +Korisnik: [username] +URL: [url]', +'review_request_email_subject' => '[sitename]: [name] - Zahtjev za pregled', 'review_status' => 'Status pregleda:', 'review_submit_email' => 'Predani pregled', 'review_submit_email_body' => 'Postavljen pregled @@ -808,13 +823,13 @@ Internet poveznica: [url]', 'review_submit_email_subject' => '[sitename]: [name] - Predan pregled', 'review_summary' => 'Sažetak pregleda', 'review_update_failed' => 'Greška kod izmjene statusa pregleda. Izmjena nije uspjela.', -'revise_document' => '', -'revise_document_on' => '', -'revision_date' => '', -'revision_log' => '', -'revisors' => '', -'revisor_already_assigned' => '', -'revisor_already_removed' => '', +'revise_document' => 'Revidiraj dokument', +'revise_document_on' => 'Slijedeća revizija verzije dokumenta na dan [date]', +'revision_date' => 'Datum revizije', +'revision_log' => 'Zapisi revizije', +'revisors' => 'Revizori', +'revisor_already_assigned' => 'Korisnik je već dodijeljen kao revizor', +'revisor_already_removed' => 'Revizor je uklonjen iz procesa revizije ili je već revidirao dokument.', 'rewind_workflow' => 'Vrati tok rada na početak', 'rewind_workflow_email_body' => 'Tok rada je vraćen Dokument: [name] @@ -833,8 +848,8 @@ Internet poveznica: [url]', 'rm_folder' => 'Uklonite mapu', 'rm_from_clipboard' => 'Uklonite iz međuspremnika', 'rm_group' => 'Uklonite ovu grupu', -'rm_transmittal' => '', -'rm_transmittalitem' => '', +'rm_transmittal' => 'Uklanjanje preusmjerenja', +'rm_transmittalitem' => 'Uklanjanje stavke', 'rm_user' => 'Uklonite ovog korisnika', 'rm_version' => 'Uklonite verziju', 'rm_workflow' => 'Uklonite tok rada', @@ -881,15 +896,15 @@ Internet poveznica: [url]', 'select_category' => 'Kliknite za odabir kategorije', 'select_groups' => 'Kliknite za odabir grupa', 'select_grp_approvers' => 'Kliknite za odabir validatora grupe', -'select_grp_notification' => '', -'select_grp_recipients' => '', +'select_grp_notification' => 'Kliknite za odabir grupnog obavještavanja', +'select_grp_recipients' => 'Kliknite za odabir grupe primatelja', 'select_grp_reviewers' => 'Kliknite za odabir recezenta grupe', -'select_grp_revisors' => '', +'select_grp_revisors' => 'Kliknite za odabir grupe revizora', 'select_ind_approvers' => 'Kliknite za odabir pojedinačnog validatora', -'select_ind_notification' => '', -'select_ind_recipients' => '', +'select_ind_notification' => 'Kliknite za odabir pojedinačnog obavještavanja', +'select_ind_recipients' => 'Kliknite za odabir pojedinačnog primatelja', 'select_ind_reviewers' => 'Kliknite za odabir pojedinačnog recezenta', -'select_ind_revisors' => '', +'select_ind_revisors' => 'Kliknite za odabir pojedinačnog revizora', 'select_one' => 'Odaberite jednog', 'select_users' => 'Kliknite za odabir korisnika', 'select_workflow' => 'Odaberite tok rada', @@ -907,20 +922,20 @@ Internet poveznica: [url]', 'settings_Advanced' => 'Napredno', 'settings_apache_mod_rewrite' => 'Apache - Modul prepisa', 'settings_Authentication' => 'Postavke autentifikacije', -'settings_autoLoginUser' => '', -'settings_autoLoginUser_desc' => '', -'settings_backupDir' => '', -'settings_backupDir_desc' => '', +'settings_autoLoginUser' => 'Automatska prijava', +'settings_autoLoginUser_desc' => 'Koristite ovaj korisnički ID za pristup ukoliko korisnik već nije prijavljen. Takav pristup neće otvoriti sesiju.', +'settings_backupDir' => 'Mapa za sigurnosnu kopiju', +'settings_backupDir_desc' => 'Mapa gdje alat za sigurnosne kopije sprema podatke. Ako ova mapa nije postavljena ili joj se ne može pristupiti, tada se sigurnosne kopije spremaju u mapu sadržaja.', 'settings_cacheDir' => 'Mapa predmemorije', 'settings_cacheDir_desc' => 'Gdje se spremaju slike pregleda (najbolje da odaberete mapu koja nije dostupna kroz vaš web-server)', 'settings_Calendar' => 'Postavke kalendara', 'settings_calendarDefaultView' => 'Zadani prikaz kalendara', 'settings_calendarDefaultView_desc' => 'Zadani prikaz kalendara', 'settings_cannot_disable' => 'Datoteka ENABLE_INSTALL_TOOL se ne može izbrisati', -'settings_checkOutDir' => '', -'settings_checkOutDir_desc' => '', -'settings_cmdTimeout' => '', -'settings_cmdTimeout_desc' => '', +'settings_checkOutDir' => 'Mapa za odjavljene dokumente', +'settings_checkOutDir_desc' => 'Ovo je mapa gdje se sprema kopija zadnjeg sadržaja dokumenta ako je dokument odjavljen. Ako korisnicima omogućite pristup ovoj mapi oni tada mogu mijenjati datoteku i ponovno prijaviti kad dovrše izmjene.', +'settings_cmdTimeout' => 'Istek vremena za vanjske komande', +'settings_cmdTimeout_desc' => 'Ovo trajanje u sekundama određuje kada će vanjska komanda (npr. Za kreiranje full-tekst indeksa) biti terminirana.', 'settings_contentDir' => 'Mapa sadržaja', 'settings_contentDir_desc' => 'Gdje se spremaju učitane datoteke (najbolje da odaberete mapu koja nije dostupna kroz vaš web-server)', 'settings_contentOffsetDir' => 'Offset mapa sadržaja', @@ -929,8 +944,8 @@ Internet poveznica: [url]', 'settings_cookieLifetime_desc' => 'Životni vijek kolačića u sekundama. Ako je postavljeno na 0, kolačić će biti uklonjen kada se zatvori pretraživač.', 'settings_coreDir' => 'Mapa jezgre Core ProsperaDMS-a', 'settings_coreDir_desc' => 'Putanja do ProsperaDMS_Core (opcija). Ovo ostavite prazno ako imate instaliran ProsperaDMS_Core na mjestu gdje se može pronaći s PHP-om, npr. Extra PHP Include-Path', -'settings_createCheckOutDir' => '', -'settings_createCheckOutDir_desc' => '', +'settings_createCheckOutDir' => 'Mapa za odjavu', +'settings_createCheckOutDir_desc' => 'Verzija dokumenta će se kopirati u ovu mapa prilikom odjave dokumenta.', 'settings_createdatabase' => 'Izradi tablice baze podataka', 'settings_createdirectory' => 'Izradi mapu', 'settings_currentvalue' => 'Trenutna vrijednost', @@ -954,8 +969,8 @@ Internet poveznica: [url]', 'settings_dropFolderDir' => 'Mapa za zonu ispuštanja', 'settings_dropFolderDir_desc' => 'Ova mapa može se koristiti za ispuštanje datoteka na datotečni sustav poslužitelja i uvoz istih od tamo umjesto učitavanja preko internet preglednika. Mapa mora sadržavati pod mapu za svakog korisnika koji ima dozvolu za uvoz datoteka na ovaj način.', 'settings_Edition' => 'Postavke izdanja', -'settings_enableAcknowledgeWorkflow' => '', -'settings_enableAcknowledgeWorkflow_desc' => '', +'settings_enableAcknowledgeWorkflow' => 'Omogućavanje potvrđivanja prijema dokumenta', +'settings_enableAcknowledgeWorkflow_desc' => 'Omogućite kako bi omogućili tok rada za potvrđivajne prijema dokumenta.', 'settings_enableAdminRevApp' => 'Dopusti pregled/ovjeru za administratore', 'settings_enableAdminRevApp_desc' => 'Omogući ovo ako želiš da administratori budu navedeni kao recezenti/validatori i za promjenu toka rada.', 'settings_enableCalendar' => 'Omogući Kalendar', @@ -980,8 +995,8 @@ Internet poveznica: [url]', 'settings_enableLanguageSelector_desc' => 'Prikaži izbornik za jezik korisničkog sučelja nakon prijave.', 'settings_enableLargeFileUpload' => 'Omogući učitavanje velikih datoteka', 'settings_enableLargeFileUpload_desc' => 'Ako je postavljeno, učitavanje datoteke je također dostupno kroz Java aplet naziva "jumploader" bez postavljenog ograničenja veličine datoteke od strane pretraživača. To također omogućuje učitavanje nekoliko datoteka u jednom koraku. Uključivanjem ovoga isključit će se samo http kolačići.', -'settings_enableMenuTasks' => '', -'settings_enableMenuTasks_desc' => '', +'settings_enableMenuTasks' => 'Omogućavanje liste zadataka u izborniku', +'settings_enableMenuTasks_desc' => 'Omogućavanje/onemogućavanje stavke izbornika koja sadrži sve zadatke za korisnika. Ovo sadrži dokumente koji trebaju biti revidirani, odobreni itd.', 'settings_enableNotificationAppRev' => 'Omogući bilježenje recezenta/validatora', 'settings_enableNotificationAppRev_desc' => 'Označi za slanje obavijesti recezentu/validatoru kada je dodana nova verzija dokumenta', 'settings_enableNotificationWorkflow' => 'Omogući obavijesti o zadanom toku rada', @@ -994,8 +1009,8 @@ Internet poveznica: [url]', 'settings_enablePasswordForgotten_desc' => 'Ako želite omogućiti korisniku da postavi novu lozinku i pošalje ju e-mailom, označite ovu opciju.', 'settings_enableRecursiveCount' => 'Omogući rekurzivno brojanje dokumenta/mape', 'settings_enableRecursiveCount_desc' => 'Ako je uključeno, broj dokumenata i mapa u pregledu mape će biti određen brojanjem svih objekata rekurzivnom obradom mapa i brojanjem tih dokumenata i mapa kojima je korisniku omogućen pristup.', -'settings_enableRevisionWorkflow' => '', -'settings_enableRevisionWorkflow_desc' => '', +'settings_enableRevisionWorkflow' => 'Omogućavanje revizije dokumenata', +'settings_enableRevisionWorkflow_desc' => 'Omogućite kako bi se mogao pokrenuti tok rada za revidiranje dokumenta nakon zadanog vremenskog perioda.', 'settings_enableSelfRevApp' => 'Omogući pregled/ovjeru za prijavljenog korisnika', 'settings_enableSelfRevApp_desc' => 'Omogući ovo ako želite da trenutno prijavljeni korisnik bude naveden kao recezent/validator i za promjenu toka rada.', 'settings_enableThemeSelector' => 'Odabir teme', @@ -1023,18 +1038,18 @@ Internet poveznica: [url]', 'settings_firstDayOfWeek_desc' => 'Prvi dan u tjednu', 'settings_footNote' => 'Fusnota', 'settings_footNote_desc' => 'Poruka koja se prikazuje na dnu svake stranice', -'settings_fullSearchEngine' => '', -'settings_fullSearchEngine_desc' => '', +'settings_fullSearchEngine' => 'Engine punog teksta', +'settings_fullSearchEngine_desc' => 'Postavite metodu koja će se koristiti za pretragu punog teksta', 'settings_fullSearchEngine_vallucene' => 'Zend Lucene', 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS', 'settings_guestID' => 'ID gosta', 'settings_guestID_desc' => 'ID gost korisnika koja se koristi kada je prijavljen kao gost (uglavnom se ne treba mijenjati)', 'settings_httpRoot' => 'Http korijen', 'settings_httpRoot_desc' => 'U URL-u, putanja na što se odnosi, nakon domene. Ne sadrži http:// prefiks ili naziv web hosta. Npr. ako je puni URL http://www.example.com/seeddms/, postavi \'/seeddms/\'. Ako je URL http://www.example.com/, postavi \'/\'', -'settings_initialDocumentStatus' => '', -'settings_initialDocumentStatus_desc' => '', -'settings_initialDocumentStatus_draft' => '', -'settings_initialDocumentStatus_released' => '', +'settings_initialDocumentStatus' => 'Početni status dokumenta', +'settings_initialDocumentStatus_desc' => 'Ovo je status koji će biti postavljen za dokument prilikom dodavanja.', +'settings_initialDocumentStatus_draft' => 'Nacrt', +'settings_initialDocumentStatus_released' => 'oslobođeno', 'settings_installADOdb' => 'Instaliraj ADOdb', 'settings_install_disabled' => 'Datoteka ENABLE_INSTALL_TOOL je izbrisana. Sada se možete prijaviti u ProsperaDMS i nastaviti konfiguraciju.', 'settings_install_pear_package_log' => 'Instaliraj Pear paket \'Log\'', @@ -1045,8 +1060,8 @@ Internet poveznica: [url]', 'settings_install_zendframework' => 'Instalirajte Zend Framework, ako namjeravate koristiti pogon za pretraživanje cijelog teksta', 'settings_language' => 'Zadani jezik', 'settings_language_desc' => 'Zadani jezik (jezik podmapa u mapi "jezici")', -'settings_libraryFolder' => '', -'settings_libraryFolder_desc' => '', +'settings_libraryFolder' => 'Mapa biblioteke', +'settings_libraryFolder_desc' => 'Mapa u koju se mogu kopirati dokumenti za kreiranje novih dokumenata', 'settings_logFileEnable' => 'Omogući log datoteku', 'settings_logFileEnable_desc' => 'Omogući/onemogući log datoteku', 'settings_logFileRotation' => 'Log File Rotation', @@ -1068,8 +1083,8 @@ Internet poveznica: [url]', 'settings_Notification' => 'Postavke bilježenja', 'settings_notwritable' => 'Konfiguracija se ne može pohraniti jer datoteka konfiguracije nema mogućnost upisivanja.', 'settings_no_content_dir' => 'Mapa sadržaja', -'settings_overrideMimeType' => '', -'settings_overrideMimeType_desc' => '', +'settings_overrideMimeType' => 'Premosti tip datoteke', +'settings_overrideMimeType_desc' => 'Premošćivanje tipa datoteke određenog od strane pretraživača ako je datoteka učitana. Novi tip datoteke se određuje od strane DMS sustava.', 'settings_partitionSize' => 'Veličina djelomične datoteke', 'settings_partitionSize_desc' => 'Veličine djelomičnih datoteka u bajtovima, učitane s jumploader-om. Ne postavljajte vrijednot veću od max. veličine učitavanja koju je postavio server.', 'settings_passwordExpiration' => 'Istek lozinke', @@ -1182,7 +1197,7 @@ Internet poveznica: [url]', 'splash_add_user' => 'Dodan novi korisnik', 'splash_cleared_clipboard' => 'Očišćen međuspremnik', 'splash_document_added' => 'Dokument dodan', -'splash_document_checkedout' => '', +'splash_document_checkedout' => 'Dokument odjavljen', 'splash_document_edited' => 'Dokument pohranjen', 'splash_document_locked' => 'Dokument zaključan', 'splash_document_unlocked' => 'Dokument otključan', @@ -1211,59 +1226,59 @@ Internet poveznica: [url]', 'status_approved' => 'Odobreno', 'status_approver_removed' => 'Validator uklonjen iz postupka', 'status_not_approved' => 'Nije odobreno', -'status_not_receipted' => '', +'status_not_receipted' => 'Još nije primljeno', 'status_not_reviewed' => 'Nije pregledano', -'status_not_revised' => '', -'status_receipted' => '', -'status_receipt_rejected' => '', -'status_recipient_removed' => '', +'status_not_revised' => 'nije revidirano', +'status_receipted' => 'Primljeno', +'status_receipt_rejected' => 'Odbijeno', +'status_recipient_removed' => 'Primatelj uklonjen s liste', 'status_reviewed' => 'Pregledano', 'status_reviewer_rejected' => 'Skica odbijena', 'status_reviewer_removed' => 'Recezent uklonjen iz postupka', -'status_revised' => '', -'status_revision_rejected' => '', -'status_revision_sleeping' => '', -'status_revisor_removed' => '', +'status_revised' => 'revidirano', +'status_revision_rejected' => 'odbijeno', +'status_revision_sleeping' => 'na čekanju', +'status_revisor_removed' => 'Revizor uklonjen s liste', 'status_unknown' => 'Nepoznato', 'storage_size' => 'Veličina pohrane', 'submit_approval' => 'Pošaljite odobrenje', 'submit_login' => 'PRIJAVI SE', 'submit_password' => 'Postavite novu lozinku', 'submit_password_forgotten' => 'Započnite postupak', -'submit_receipt' => '', +'submit_receipt' => 'Pošalji prijem', 'submit_review' => 'Pošaljite ovjeru', 'submit_userinfo' => 'Pošaljite info', -'substitute_to_user' => '', +'substitute_to_user' => 'Prebaci na \'[username]\'', 'substitute_user' => 'Zamjenski korisnik', 'sunday' => 'Nedjelja', 'sunday_abbr' => 'Ne', 'sv_SE' => 'Švedski', 'switched_to' => 'Promjenjeno u', -'takeOverGrpApprover' => '', -'takeOverGrpReviewer' => '', -'takeOverIndApprover' => '', -'takeOverIndReviewer' => '', -'tasks' => '', +'takeOverGrpApprover' => 'Preuzimanje grupe odobravatelja iz zadnje verzije.', +'takeOverGrpReviewer' => 'Preuzimanje grupe revizora iz zadnje verzije.', +'takeOverIndApprover' => 'Preuzimanje pojedinačnog odobravatelja iz zadnje verzije.', +'takeOverIndReviewer' => 'Preuzimanje pojedinačnog revizora iz zadnje verzije.', +'tasks' => 'Zadaci', 'testmail_body' => 'Ova poruka služi samo za testiranje konfiguracije ProsperaDMS-a', 'testmail_subject' => 'Testna poruka', 'theme' => 'Tema', 'thursday' => 'Četvrtak', 'thursday_abbr' => 'Če', -'timeline' => '', -'timeline_add_file' => '', -'timeline_add_version' => '', -'timeline_full_add_file' => '', -'timeline_full_add_version' => '', -'timeline_full_status_change' => '', -'timeline_selected_item' => '', -'timeline_skip_add_file' => '', -'timeline_skip_status_change_-1' => '', -'timeline_skip_status_change_-3' => '', -'timeline_skip_status_change_0' => '', -'timeline_skip_status_change_1' => '', -'timeline_skip_status_change_2' => '', -'timeline_skip_status_change_3' => '', -'timeline_status_change' => '', +'timeline' => 'Vremenska crta', +'timeline_add_file' => 'Novi prilog', +'timeline_add_version' => 'Nova verzija [version]', +'timeline_full_add_file' => '[document]
Novi prilog', +'timeline_full_add_version' => '[document]
Nova verzija [version]', +'timeline_full_status_change' => '[document]
Verzija [version]: [status]', +'timeline_selected_item' => 'Odabrani dokument', +'timeline_skip_add_file' => 'dodan prilog', +'timeline_skip_status_change_-1' => 'odbijeno', +'timeline_skip_status_change_-3' => 'isteklo', +'timeline_skip_status_change_0' => 'na čekanju za pregled', +'timeline_skip_status_change_1' => 'na čekanju za odobrenje', +'timeline_skip_status_change_2' => 'oslobođeno', +'timeline_skip_status_change_3' => 's tokom rada', +'timeline_status_change' => 'Verzija [version]: [status]', 'to' => 'Do', 'toggle_manager' => 'Zamjeni upravitelja', 'to_before_from' => 'Datum završetka ne može biti prije datuma početka', @@ -1279,13 +1294,13 @@ Glavna mapa: [folder_path] Korisnik: [username] Internet poveznica: [url]', 'transition_triggered_email_subject' => '[sitename]: [name] - Zatražena promjena toka rada', -'transmittal' => '', -'transmittalitem_removed' => '', -'transmittalitem_updated' => '', -'transmittal_comment' => '', -'transmittal_name' => '', -'transmittal_size' => '', -'tree_loading' => '', +'transmittal' => 'Proslijeđivanje', +'transmittalitem_removed' => 'Stavka za proslijeđivanje je uklonjena', +'transmittalitem_updated' => 'Dokument izmijenjen na zadnju verziju', +'transmittal_comment' => 'Komentar', +'transmittal_name' => 'Naziv', +'transmittal_size' => 'Veličina', +'tree_loading' => 'Molimo pričekajte dok se ne učita stablo dokumenta...', 'trigger_workflow' => 'Tok rada', 'tr_TR' => 'Turski', 'tuesday' => 'Utorak', @@ -1314,10 +1329,10 @@ Internet poveznica: [url]', 'update_fulltext_index' => 'Ažuriraj indeksiranje cijelog teksta', 'update_info' => 'Info ažuriranje', 'update_locked_msg' => 'Ovaj dokument je zaključan.', -'update_recipients' => '', +'update_recipients' => 'Izmjena liste primatelja', 'update_reviewers' => 'Ažuriraj popis recezenata', -'update_revisors' => '', -'update_transmittalitem' => '', +'update_revisors' => 'Izmjena liste ponovnih podnositelja', +'update_transmittalitem' => 'Izmjena na zadnju verziju dokumenta', 'uploaded_by' => 'Učitao', 'uploading_failed' => 'Neuspješno učitavanje jedne od vaših datoteka. Molimo provjerite maksimalnu veličinu datoteke za učitavanje.', 'uploading_maxsize' => 'Učitana datoteke premašuje maksimalnu veličinu datoteke za učitavanje.', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index ed99f6538..638908eef 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/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), gijsbertush (7), pepijn (45), reinoutdijkstra@hotmail.com (270) +// Translators: Admin (711), gijsbertush (7), pepijn (45), reinoutdijkstra@hotmail.com (270) $text = array( 'accept' => 'Accept', @@ -780,7 +780,7 @@ URL: [url]', 'review_deletion_email' => 'Controle verzoek gewijzigd', 'review_deletion_email_body' => '', 'review_deletion_email_subject' => '', -'review_file' => '', +'review_file' => 'Bestand', 'review_group' => '[Controle] Groep', 'review_log' => 'Reviseer overzicht', 'review_request_email' => 'Controle verzoek', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 26ce89c69..519764d45 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (719), netixw (84), romi (93), uGn (112) +// Translators: Admin (721), netixw (84), romi (93), uGn (112) $text = array( 'accept' => 'Akceptuj', @@ -844,8 +844,8 @@ URL: [url]', 'search_query' => 'Wyszukaj', 'search_report' => 'Znaleziono [doccount] dokumentów i [foldercount] katalogów w [searchtime] sec.', 'search_report_fulltext' => 'Znaleziono [doccount] dokumentów', -'search_resultmode' => '', -'search_resultmode_both' => '', +'search_resultmode' => 'Wyniki wyszukiwania', +'search_resultmode_both' => 'Dokumenty i Foldery', 'search_results' => 'Wyniki wyszukiwania', 'search_results_access_filtered' => 'Wyniki wyszukiwania mogą zawierać treści, do których dostęp jest zabroniony.', 'search_time' => 'Upływający czas: [time] sec.', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 004943fe0..90db81dee 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 (902), flaviove (627), lfcristofoli (352) +// Translators: Admin (903), flaviove (627), lfcristofoli (352) $text = array( 'accept' => 'Aceitar', @@ -1080,7 +1080,7 @@ URL: [url]', 'settings_php_gd2' => 'Extensão PHP : php_gd2', 'settings_php_mbstring' => 'Extensão PHP : php_mbstring', 'settings_php_version' => 'Versão PHP', -'settings_presetExpirationDate' => '', +'settings_presetExpirationDate' => 'Data de Expiração Pré-Definida', 'settings_presetExpirationDate_desc' => '', 'settings_previewWidthDetail' => 'Largura de imagens de visualização (detalhe)', 'settings_previewWidthDetail_desc' => 'Largura imagem de visualização mostrados na página de detalhes', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index e6e51513c..26cece9f5 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/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 (1274) +// Translators: Admin (1278) $text = array( 'accept' => 'Принять', @@ -125,12 +125,12 @@ URL: [url]', 'attrdef_objtype' => 'Тип объекта', 'attrdef_regex' => 'Регулярное выражение', 'attrdef_type' => 'Тип', -'attrdef_type_boolean' => '', +'attrdef_type_boolean' => 'Булево', 'attrdef_type_date' => 'Дата', 'attrdef_type_email' => '', -'attrdef_type_float' => '', -'attrdef_type_int' => '', -'attrdef_type_string' => '', +'attrdef_type_float' => 'Вещественное', +'attrdef_type_int' => 'Целое', +'attrdef_type_string' => 'Строка', 'attrdef_type_url' => '', 'attrdef_valueset' => 'Набор значений', 'attributes' => 'Атрибуты', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index a0e169cb9..621ad8af5 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/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 (489) +// Translators: Admin (492) $text = array( 'accept' => 'Prijať', @@ -141,7 +141,7 @@ $text = array( 'automatic_status_update' => 'Automaticka zmena stavu', 'back' => 'Prejsť späť', 'backup_list' => 'Zoznam záloh', -'backup_log_management' => '', +'backup_log_management' => 'Zálohovanie/Log-y', 'backup_remove' => 'Odstrániť zálohu', 'backup_tools' => 'Zálohovacie nástroje', 'between' => 'medzi', @@ -578,7 +578,7 @@ $text = array( 'no_version_check' => '', 'no_version_modification' => 'Žiadne zmeny', 'no_workflow_available' => '', -'objectcheck' => '', +'objectcheck' => 'Kontrola Adresárov/Dokumentov', 'obsolete' => 'Zastaralé', 'october' => 'Október', 'old' => 'Stare', @@ -1093,7 +1093,7 @@ $text = array( 'theme' => 'Vzhľad', 'thursday' => 'Štvrtok', 'thursday_abbr' => '', -'timeline' => '', +'timeline' => 'Časová os', 'timeline_add_file' => '', 'timeline_add_version' => '', 'timeline_full_add_file' => '', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 715f55500..182b5a19a 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (608), fengjohn (5) +// Translators: Admin (610), fengjohn (5) $text = array( 'accept' => '接受', @@ -312,7 +312,7 @@ URL: [url]', 'dump_creation_warning' => '通过此操作，您可以创建一个您数据库的转储文件，之后可以将转储数据保存到您服务器所在的数据文件夹中', 'dump_list' => '存在转储文件', 'dump_remove' => '删除转储文件', -'duplicate_content' => '', +'duplicate_content' => '重复的内容', 'edit' => '编辑', 'edit_attributes' => '编辑属性', 'edit_comment' => '编辑说明', @@ -784,7 +784,7 @@ URL: [url]', 'settings_createdatabase' => '', 'settings_createdirectory' => '', 'settings_currentvalue' => '', -'settings_Database' => '', +'settings_Database' => '数据库设置', 'settings_dbDatabase' => '', 'settings_dbDatabase_desc' => '', 'settings_dbDriver' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index ea2006daa..defe60082 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 (2345) +// Translators: Admin (2349) $text = array( 'accept' => '接受', @@ -177,13 +177,13 @@ URL: [url]', 'change_revisors' => '', 'change_status' => '變更狀態', 'charts' => '圖表', -'chart_docsaccumulated_title' => '', +'chart_docsaccumulated_title' => '每月文件數量', 'chart_docspercategory_title' => '', 'chart_docspermimetype_title' => '', -'chart_docspermonth_title' => '', +'chart_docspermonth_title' => '每月新增文件', 'chart_docsperstatus_title' => '', -'chart_docsperuser_title' => '', -'chart_selection' => '', +'chart_docsperuser_title' => '用戶文件比例圖表', +'chart_selection' => '選擇圖表', 'chart_sizeperuser_title' => '', 'checkedout_file_has_different_version' => '', 'checkedout_file_has_disappeared' => '', From ddac8ce1ce66034a1d72033a8e595167634bf073 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 3 Dec 2015 15:57:50 +0100 Subject: [PATCH 11/65] pass on timeout to execWithTimeout() --- SeedDMS_Lucene/Lucene/IndexedDocument.php | 2 +- SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SeedDMS_Lucene/Lucene/IndexedDocument.php b/SeedDMS_Lucene/Lucene/IndexedDocument.php index 8d24b3793..82e1df9b7 100644 --- a/SeedDMS_Lucene/Lucene/IndexedDocument.php +++ b/SeedDMS_Lucene/Lucene/IndexedDocument.php @@ -124,7 +124,7 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document { $mimetype = $version->getMimeType(); if(isset($_convcmd[$mimetype])) { $cmd = sprintf($_convcmd[$mimetype], $path); - $content = self::execWithTimeout($cmd); + $content = self::execWithTimeout($cmd, $timeout); /* $fp = popen($cmd, 'r'); if($fp) { diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php index 455b3dd77..3ad771513 100644 --- a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php +++ b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php @@ -129,7 +129,7 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document { $mimetype = $version->getMimeType(); if(isset($_convcmd[$mimetype])) { $cmd = sprintf($_convcmd[$mimetype], $path); - $content = self::execWithTimeout($cmd); + $content = self::execWithTimeout($cmd, $timeout); if($content) { $this->addField('content', $content, 'unstored'); } From e47d84071d273cfab40a4f319a6ee107cedc5b9e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 4 Dec 2015 08:02:02 +0100 Subject: [PATCH 12/65] attributes of type checkbox can be reset added a hidden field in printAttributeEditField() to set the value of a checkbox to 0 if it not set. --- views/bootstrap/class.Bootstrap.php | 1 + 1 file changed, 1 insertion(+) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 0037fc6cb..b50d5cbd5 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1008,6 +1008,7 @@ function folderSelected(id, name) { function printAttributeEditField($attrdef, $objvalue, $fieldname='attributes') { /* {{{ */ switch($attrdef->getType()) { case SeedDMS_Core_AttributeDefinition::type_boolean: + echo "getId()."]\" value=\"0\" />"; echo "getId()."]\" value=\"1\" ".($objvalue ? 'checked' : '')." />"; break; case SeedDMS_Core_AttributeDefinition::type_date: From ff267948e98f254f25623211937a42a2c7e4d178 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 4 Dec 2015 08:03:37 +0100 Subject: [PATCH 13/65] add entry for 4.3.23 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index fd9fe0ee1..097c1736d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Changes in version 4.3.23 -------------------------------------------------------------------------------- - send notification if document is delete to those users watching the folder +- fix editing of customer attributes of type checkbox -------------------------------------------------------------------------------- Changes in version 4.3.22 From 666fc944fff746704cb2947be9b6a7dd4d4a5e0e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 9 Dec 2015 18:01:27 +0100 Subject: [PATCH 14/65] getReadAccess() returns right list of users doesn't return users anymore which have no read access because the group has no read access --- SeedDMS_Core/Core/inc.ClassDocument.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 2f7191408..8b89fb87c 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -1955,7 +1955,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ (strlen($userIDs) == 0 ? "" : " OR (`tblUsers`.`id` IN (". $userIDs ."))"). ") ORDER BY `login`"; } - /* If default access is equal or greate then read, $userIDs and + /* If default access is equal or greater then M_READ, $userIDs and * $groupIDs contains a list of user without read access */ else { @@ -1965,16 +1965,22 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ "WHERE `tblGroupMembers`.`groupID` NOT IN (". $groupIDs .")". "AND `tblUsers`.`role` != ".SeedDMS_Core_User::role_guest." ". (strlen($userIDs) == 0 ? "" : " AND (`tblUsers`.`id` NOT IN (". $userIDs ."))")." UNION "; + } else { + $queryStr .= + "SELECT `tblUsers`.* FROM `tblUsers` ". + "WHERE `tblUsers`.`role` != ".SeedDMS_Core_User::role_guest." ". + (strlen($userIDs) == 0 ? "" : " AND (`tblUsers`.`id` NOT IN (". $userIDs ."))")." UNION "; } $queryStr .= "SELECT `tblUsers`.* FROM `tblUsers` ". "WHERE (`tblUsers`.`id` = ". $this->_ownerID . ") ". "OR (`tblUsers`.`role` = ".SeedDMS_Core_User::role_admin.") ". - "UNION ". - "SELECT `tblUsers`.* FROM `tblUsers` ". - "WHERE `tblUsers`.`role` != ".SeedDMS_Core_User::role_guest." ". - (strlen($userIDs) == 0 ? "" : " AND (`tblUsers`.`id` NOT IN (". $userIDs ."))"). +// "UNION ". +// "SELECT `tblUsers`.* FROM `tblUsers` ". +// "WHERE `tblUsers`.`role` != ".SeedDMS_Core_User::role_guest." ". +// (strlen($userIDs) == 0 ? "" : " AND (`tblUsers`.`id` NOT IN (". $userIDs ."))"). " ORDER BY `login`"; + echo $queryStr; } $resArr = $db->getResultArray($queryStr); if (!is_bool($resArr)) { From 6ad953005dae9d29fd9b9b292ae3c799167437f7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 9 Dec 2015 18:06:23 +0100 Subject: [PATCH 15/65] take out echo of sql statement --- SeedDMS_Core/Core/inc.ClassDocument.php | 1 - 1 file changed, 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 8b89fb87c..e19ec8313 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -1980,7 +1980,6 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ // "WHERE `tblUsers`.`role` != ".SeedDMS_Core_User::role_guest." ". // (strlen($userIDs) == 0 ? "" : " AND (`tblUsers`.`id` NOT IN (". $userIDs ."))"). " ORDER BY `login`"; - echo $queryStr; } $resArr = $db->getResultArray($queryStr); if (!is_bool($resArr)) { From 56683a61048efb2322169c62152c3e41985f6995 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 9 Dec 2015 18:10:35 +0100 Subject: [PATCH 16/65] remove ancient file --- op/op.CreateStatusIndex.php | 88 ------------------------------------- 1 file changed, 88 deletions(-) delete mode 100644 op/op.CreateStatusIndex.php diff --git a/op/op.CreateStatusIndex.php b/op/op.CreateStatusIndex.php deleted file mode 100644 index 0baefdff0..000000000 --- a/op/op.CreateStatusIndex.php +++ /dev/null @@ -1,88 +0,0 @@ -isAdmin()) { - print "

Error: User must have administrative privileges to create the status index.

"; - UI::contentContainerEnd(); - UI::htmlEndPage(); - exit; -} - -if (!isset($_GET["genIndex"]) || $_GET["genIndex"]!=1) { - print "
"; - print ""; - print "

"; - print "
"; - UI::contentContainerEnd(); - UI::htmlEndPage(); - exit; -} - -$queryStr = "SELECT `tblDocumentContent`.`document`, `tblDocumentContent`.`version` FROM `tblDocumentContent`"; -$resArr = $db->getResultArray($queryStr); -if (is_bool($resArr)) { - print "

Error: unable to retrieve document content listing.

"; - UI::contentContainerEnd(); - UI::htmlEndPage(); - exit; -} - -print "
    "; -foreach ($resArr as $row) { - echo "
  • Creating status log for: '".$row["document"]."', version: '".$row["version"]."'"; - $queryStr = "INSERT INTO `tblDocumentStatus` (`documentID`, `version`) ". - "VALUES ('".$row["document"]."', '".$row["version"]."')"; - if (!$db->getResult($queryStr)) { - print "

    Error: unable to insert status row.

    "; - echo "
    • "; - UI::contentContainerEnd(); - UI::htmlEndPage(); - exit; - } - $statusID = $db->getInsertID(); - $queryStr = "INSERT INTO `tblDocumentStatusLog` (`statusID`, `status`, `comment`, `date`, `userID`) ". - "VALUES ('".$statusID."', '2', '-', NOW(), '".$user->getID()."')"; - if (!$db->getResult($queryStr)) { - print "

    Error: unable to insert status log entry.

    "; - echo ""; - UI::contentContainerEnd(); - UI::htmlEndPage(); - exit; - } - echo ""; -} -print "
      "; -print "

      Status Index Generation is complete.

      "; -UI::contentContainerEnd(); -UI::htmlEndPage(); -?> From d105fa5155c0e8a897b1cfff754c93fa11f67877 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 9 Dec 2015 18:24:31 +0100 Subject: [PATCH 17/65] add new method createDump() --- SeedDMS_Core/Core/inc.ClassDMS.php | 34 ++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index d091296d5..90d09888f 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -2269,5 +2269,39 @@ class SeedDMS_Core_DMS { $this->callbacks[$name] = array($func, $params); } /* }}} */ + /** + * Create an sql dump of the complete database + * + * @param string $filename name of dump file + */ + function createDump($filename) { /* {{{ */ + $h = fopen($filename, "w"); + if(!$h) + return false; + + $tables = $this->db->TableList('TABLES'); + foreach($tables as $table) { + $query = "SELECT * FROM `".$table."`"; + $records = $this->db->getResultArray($query); + fwrite($h,"\n-- TABLE: ".$table."--\n\n"); + foreach($records as $record) { + $values=""; + $i = 1; + foreach ($record as $column) { + if (is_numeric($column)) $values .= $column; + else $values .= $this->db->qstr($column); + + if ($i<(count($record))) $values .= ","; + $i++; + } + + fwrite($h, "INSERT INTO `".$table."` VALUES (".$values.");\n"); + } + } + + fclose($h); + return true; + } /* }}} */ + } ?> From 656bd7482f8e452058636e60d7def747d2a996ae Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 9 Dec 2015 18:24:51 +0100 Subject: [PATCH 18/65] move code into SeedDMS_Core_DMS --- op/op.CreateDump.php | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/op/op.CreateDump.php b/op/op.CreateDump.php index c2de3e316..ad4fc6a77 100644 --- a/op/op.CreateDump.php +++ b/op/op.CreateDump.php @@ -28,39 +28,9 @@ if (!$user->isAdmin()) { } $dump_name = $settings->_contentDir.time().".sql"; - -$h=fopen($dump_name,"w"); - -if (is_bool($h)&&!$h) +if(!$dms->createDump($dump_name)) UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); -$tables = $db->TableList('TABLES'); - -foreach ($tables as $table){ - - $query = "SELECT * FROM ".$table; - $records = $db->getResultArray($query); - - fwrite($h,"\n-- TABLE: ".$table."--\n\n"); - - foreach ($records as $record){ - - $values=""; - $i = 1; - foreach ($record as $column) { - if (is_numeric($column)) $values .= $column; - else $values .= "'".$column."'"; - - if ($i<(count($record))) $values .= ","; - $i++; - } - - fwrite($h, "INSERT INTO " . $table . " VALUES (" . $values . ");\n"); - } -} - -fclose($h); - if (SeedDMS_Core_File::gzcompressfile($dump_name,9)) unlink($dump_name); else UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); From da52cea6c9b9d497f5c99ff00d67f4bb68c86b2d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 9 Dec 2015 21:20:43 +0100 Subject: [PATCH 19/65] use readable time and version in file name --- op/op.CreateDump.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/op/op.CreateDump.php b/op/op.CreateDump.php index ad4fc6a77..c06f96b56 100644 --- a/op/op.CreateDump.php +++ b/op/op.CreateDump.php @@ -16,6 +16,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +include("../inc/inc.Version.php"); include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); include("../inc/inc.DBInit.php"); @@ -27,7 +28,8 @@ if (!$user->isAdmin()) { UI::exitError(getMLText("admin_tools"),getMLText("access_denied")); } -$dump_name = $settings->_contentDir.time().".sql"; +$v = new SeedDMS_Version; +$dump_name = $settings->_contentDir.date('Y-m-d\TH:i:s')."_".$v->_number.".sql"; if(!$dms->createDump($dump_name)) UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); From b0e19324db4e76bbc06d996fd79c58fd24325d70 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 9 Dec 2015 21:32:57 +0100 Subject: [PATCH 20/65] new entries for 4.3.23 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 097c1736d..b50687aca 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,9 @@ -------------------------------------------------------------------------------- - send notification if document is delete to those users watching the folder - fix editing of customer attributes of type checkbox +- disallow read access for group didn't prevent the users from being selected + as a reviewer/approver +- move the last bits of plain sql code into the core -------------------------------------------------------------------------------- Changes in version 4.3.22 From 12b5d910183032f70be1797b9562f6e0d3d57cf4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 9 Dec 2015 21:34:30 +0100 Subject: [PATCH 21/65] minor change of entry in 4.3.23 --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index b50687aca..1e1552d84 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,7 +5,7 @@ - fix editing of customer attributes of type checkbox - disallow read access for group didn't prevent the users from being selected as a reviewer/approver -- move the last bits of plain sql code into the core +- move the last bits of plain sql code from op/*.php into the core -------------------------------------------------------------------------------- Changes in version 4.3.22 From 1475847dbbcf2486ec06d6391b0d6a7f27b8e927 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 9 Dec 2015 21:39:25 +0100 Subject: [PATCH 22/65] initialize $emailGroupList --- op/op.RemoveVersion.php | 1 + 1 file changed, 1 insertion(+) diff --git a/op/op.RemoveVersion.php b/op/op.RemoveVersion.php index c3136f11d..f297ac074 100644 --- a/op/op.RemoveVersion.php +++ b/op/op.RemoveVersion.php @@ -111,6 +111,7 @@ else { */ $emailUserList = array(); $emailUserList[] = $version->_userID; + $emailGroupList = array(); $status = $version->getReviewStatus(); foreach ($status as $st) { if ($st["status"]==0 && !in_array($st["required"], $emailUserList)) { From 450c545f6646009eb7c5e65db39ad45d32dbe7cb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 10 Dec 2015 07:56:29 +0100 Subject: [PATCH 23/65] add new phrases for selecting members of a group --- languages/ar_EG/lang.inc | 4 ++++ languages/bg_BG/lang.inc | 4 ++++ languages/ca_ES/lang.inc | 4 ++++ languages/cs_CZ/lang.inc | 4 ++++ languages/de_DE/lang.inc | 6 +++++- languages/en_GB/lang.inc | 6 +++++- languages/es_ES/lang.inc | 4 ++++ languages/fr_FR/lang.inc | 10 +++++++--- languages/hr_HR/lang.inc | 4 ++++ languages/hu_HU/lang.inc | 4 ++++ languages/it_IT/lang.inc | 4 ++++ languages/ko_KR/lang.inc | 4 ++++ languages/nl_NL/lang.inc | 4 ++++ languages/pl_PL/lang.inc | 4 ++++ languages/pt_BR/lang.inc | 4 ++++ languages/ro_RO/lang.inc | 4 ++++ languages/ru_RU/lang.inc | 4 ++++ languages/sk_SK/lang.inc | 4 ++++ languages/sv_SE/lang.inc | 4 ++++ languages/tr_TR/lang.inc | 4 ++++ languages/uk_UA/lang.inc | 4 ++++ languages/zh_CN/lang.inc | 20 ++++++++++++-------- languages/zh_TW/lang.inc | 4 ++++ 23 files changed, 105 insertions(+), 13 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 823bd9b36..d1e3b5762 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -481,6 +481,7 @@ URL: [url]', 'index_converters' => 'فهرس تحويل المستند', 'index_folder' => 'ﻒﻫﺮﺳﺓ ﺎﻠﻤﺠﻟﺩ', 'individuals' => 'افراد', +'indivіduals_in_groups' => '', 'inherited' => 'موروث', 'inherits_access_copy_msg' => 'نسخ قائمة صلاحيات موروثة.', 'inherits_access_empty_msg' => 'ابدأ بقائمة صلاحيات فارغة', @@ -860,6 +861,9 @@ URL: [url]', 'select_category' => 'اضغط لاختيار قسم', 'select_groups' => 'اضغط لاختيار مجموعة', 'select_grp_approvers' => 'اضغط لاختيار مجموعة الموافقون', +'select_grp_ind_approvers' => '', +'select_grp_ind_notification' => '', +'select_grp_ind_reviewers' => '', 'select_grp_notification' => 'ﺎﻨﻗﺭ ﻼﺨﺘﻳﺍﺭ ﺍﻼﺸﻋﺍﺭ ﻞﻤﺠﻣﻮﻋﺓ', 'select_grp_recipients' => '', 'select_grp_reviewers' => 'اضغط لاختيار مجموعة المراجعون', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 820119b27..0b0ca60a1 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -412,6 +412,7 @@ $text = array( 'index_converters' => 'Index document conversion', 'index_folder' => '', 'individuals' => 'Личности', +'indivіduals_in_groups' => '', 'inherited' => 'наследен', 'inherits_access_copy_msg' => 'Изкопирай наследения список', 'inherits_access_empty_msg' => 'Започни с празен списък за достъп', @@ -725,6 +726,9 @@ $text = array( 'select_category' => '', 'select_groups' => 'Кликни да избереш групи', 'select_grp_approvers' => 'Кликни да избереш група утвърждаващи', +'select_grp_ind_approvers' => '', +'select_grp_ind_notification' => '', +'select_grp_ind_reviewers' => '', 'select_grp_notification' => '', 'select_grp_recipients' => '', 'select_grp_reviewers' => 'Кликни да избереш група рецензенти', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 5397b5c20..d873feaad 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -417,6 +417,7 @@ URL: [url]', 'index_converters' => '', 'index_folder' => '', 'individuals' => 'Individuals', +'indivіduals_in_groups' => '', 'inherited' => '', 'inherits_access_copy_msg' => 'Copiar llista d\'accés heretat', 'inherits_access_empty_msg' => 'Començar amb una llista d\'accés buida', @@ -730,6 +731,9 @@ URL: [url]', 'select_category' => '', 'select_groups' => '', 'select_grp_approvers' => '', +'select_grp_ind_approvers' => '', +'select_grp_ind_notification' => '', +'select_grp_ind_reviewers' => '', 'select_grp_notification' => '', 'select_grp_recipients' => '', 'select_grp_reviewers' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 9f8b3c707..9b3e5d4c2 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -488,6 +488,7 @@ URL: [url]', 'index_converters' => 'Index konverze dokumentu', 'index_folder' => 'Složka indexu', 'individuals' => 'Jednotlivci', +'indivіduals_in_groups' => '', 'inherited' => 'Zděděno', 'inherits_access_copy_msg' => 'Zkopírovat zděděný seznam řízení přístupu', 'inherits_access_empty_msg' => 'Založit nový seznam řízení přístupu', @@ -869,6 +870,9 @@ URL: [url]', 'select_category' => 'Kliknutím vyberte kategorii', 'select_groups' => 'Kliknutím vyberte skupiny', 'select_grp_approvers' => 'Kliknutím vyberte skupinu schvalovatele', +'select_grp_ind_approvers' => '', +'select_grp_ind_notification' => '', +'select_grp_ind_reviewers' => '', 'select_grp_notification' => 'Klikněte pro výběr skupinového oznámení', 'select_grp_recipients' => '', 'select_grp_reviewers' => 'Kliknutím vyberte skupinu posuzovatele', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 4c5ef06dc..e976f57dc 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 (2141), dgrutsch (18) +// Translators: Admin (2145), dgrutsch (18) $text = array( 'accept' => 'Übernehmen', @@ -493,6 +493,7 @@ URL: [url]', 'index_converters' => 'Index Dokumentenumwandlung', 'index_folder' => 'Indiziere Ordner', 'individuals' => 'Einzelpersonen', +'indivіduals_in_groups' => 'Mitglieder einer Gruppe', 'inherited' => 'geerbt', 'inherits_access_copy_msg' => 'Berechtigungen kopieren', 'inherits_access_empty_msg' => 'Leere Zugriffsliste', @@ -889,6 +890,9 @@ URL: [url]', 'select_category' => 'Klicken zur Auswahl einer Kategorie', 'select_groups' => 'Klicken zur Auswahl einer Gruppe', 'select_grp_approvers' => 'Klicken zur Auswahl einer Freigabegruppe', +'select_grp_ind_approvers' => 'Klicken zur Auswahl einer Gruppe', +'select_grp_ind_notification' => 'Klicken zur Auswahl einer Gruppe', +'select_grp_ind_reviewers' => 'Klicken zur Auswahl einer Gruppe', 'select_grp_notification' => 'Klicken zur Auswahl einer Beobachtergruppe', 'select_grp_recipients' => 'Klicken zur Auswahl einer Empfängergruppe', 'select_grp_reviewers' => 'Klicken zur Auswahl einer Prüfgruppe', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index bd72e9acb..52d29fd2b 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 (1276), dgrutsch (3), netixw (14) +// Translators: Admin (1280), dgrutsch (3), netixw (14) $text = array( 'accept' => 'Accept', @@ -493,6 +493,7 @@ URL: [url]', 'index_converters' => 'Index document conversion', 'index_folder' => 'Index folder', 'individuals' => 'Individuals', +'indivіduals_in_groups' => 'Members of a group', 'inherited' => 'inherited', 'inherits_access_copy_msg' => 'Copy inherited access list', 'inherits_access_empty_msg' => 'Start with empty access list', @@ -896,6 +897,9 @@ URL: [url]', 'select_category' => 'Click to select category', 'select_groups' => 'Click to select groups', 'select_grp_approvers' => 'Click to select group approver', +'select_grp_ind_approvers' => 'Click to select group', +'select_grp_ind_notification' => 'Click to select group', +'select_grp_ind_reviewers' => 'Click to select group', 'select_grp_notification' => 'Click to select group notification', 'select_grp_recipients' => 'Click to select group of recipients', 'select_grp_reviewers' => 'Click to select group reviewer', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 0f50ac5cd..f1980e480 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -488,6 +488,7 @@ URL: [url]', 'index_converters' => 'Conversión de índice de documentos', 'index_folder' => 'Índice de carpetas', 'individuals' => 'Individuales', +'indivіduals_in_groups' => '', 'inherited' => 'heredado', 'inherits_access_copy_msg' => 'Copiar lista de acceso heredado', 'inherits_access_empty_msg' => 'Empezar con una lista de acceso vacía', @@ -875,6 +876,9 @@ URL: [url]', 'select_category' => 'Haga Click para seleccionar categoría', 'select_groups' => 'Haga Click para seleccionar grupos', 'select_grp_approvers' => 'Haga Click para seleccionar grupo de aprobadores', +'select_grp_ind_approvers' => '', +'select_grp_ind_notification' => '', +'select_grp_ind_reviewers' => '', 'select_grp_notification' => 'Clic para seleccionar la notificación grupal', 'select_grp_recipients' => '', 'select_grp_reviewers' => 'Haga Click para seleccionar grupo de revisores', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index cf1bd0b8f..8f3ba9ab7 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 (1003), jeromerobert (50), lonnnew (9) +// Translators: Admin (1005), jeromerobert (50), lonnnew (9) $text = array( 'accept' => 'Accepter', @@ -488,6 +488,7 @@ URL: [url]', 'index_converters' => 'Conversion de document Index', 'index_folder' => 'Dossier Index', 'individuals' => 'Individuels', +'indivіduals_in_groups' => '', 'inherited' => 'hérité', 'inherits_access_copy_msg' => 'Copier la liste des accès hérités', 'inherits_access_empty_msg' => 'Commencer avec une liste d\'accès vide', @@ -851,6 +852,9 @@ URL: [url]', 'select_category' => 'Cliquer pour choisir une catégorie', 'select_groups' => 'Cliquer pour choisir un groupe', 'select_grp_approvers' => 'Cliquer pour choisir un groupe d\'approbateur', +'select_grp_ind_approvers' => '', +'select_grp_ind_notification' => '', +'select_grp_ind_reviewers' => '', 'select_grp_notification' => 'Cliquer pour sélectionner une notification de groupe', 'select_grp_recipients' => '', 'select_grp_reviewers' => 'Cliquer pour choisir un groupe de correcteur', @@ -1038,7 +1042,7 @@ URL: [url]', 'settings_Notification' => 'Notifications', 'settings_notwritable' => 'La configuration ne peut pas être enregistré car le fichier de configuration n\'est pas accessible en écriture.', 'settings_no_content_dir' => 'Répertoire de contenu', -'settings_overrideMimeType' => '', +'settings_overrideMimeType' => 'Passer outre le type MIME', 'settings_overrideMimeType_desc' => '', 'settings_partitionSize' => 'Taille des fichiers partiels téléchargées par jumploader', 'settings_partitionSize_desc' => 'Taille des fichiers partiels en octets, téléchargées par jumploader. Ne pas fixer une valeur plus grande que la taille de transfert maximale définie par le serveur.', @@ -1132,7 +1136,7 @@ URL: [url]', 'settings_workflowMode_desc' => 'Le workflow avancé permet de définir son propre workflow de parution pour les versions de documents.', 'settings_workflowMode_valadvanced' => 'avancé', 'settings_workflowMode_valtraditional' => 'traditionnel', -'settings_workflowMode_valtraditional_only_approval' => '', +'settings_workflowMode_valtraditional_only_approval' => 'traditionnel (sans revue)', 'settings_zendframework' => 'Zend Framework', 'set_expiry' => 'Modifier la date d\'expiration', 'set_owner' => 'Sélection du propriétaire', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 817e5aeea..2c9954958 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -493,6 +493,7 @@ Internet poveznica: [url]', 'index_converters' => 'Pretvorba indeksa dokumenta', 'index_folder' => 'Mapa indeksa', 'individuals' => 'Pojedinci', +'indivіduals_in_groups' => '', 'inherited' => 'naslijeđeno', 'inherits_access_copy_msg' => 'Kopiraj listu naslijeđenih prava pristupa', 'inherits_access_empty_msg' => 'Započnite s praznim popisom pristupa', @@ -896,6 +897,9 @@ Internet poveznica: [url]', 'select_category' => 'Kliknite za odabir kategorije', 'select_groups' => 'Kliknite za odabir grupa', 'select_grp_approvers' => 'Kliknite za odabir validatora grupe', +'select_grp_ind_approvers' => '', +'select_grp_ind_notification' => '', +'select_grp_ind_reviewers' => '', 'select_grp_notification' => 'Kliknite za odabir grupnog obavještavanja', 'select_grp_recipients' => 'Kliknite za odabir grupe primatelja', 'select_grp_reviewers' => 'Kliknite za odabir recezenta grupe', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 9ce024e42..2c4f8ba56 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -488,6 +488,7 @@ URL: [url]', 'index_converters' => 'Index dokumentum konverzió', 'index_folder' => 'Mappa indexelése', 'individuals' => 'Egyedek', +'indivіduals_in_groups' => '', 'inherited' => 'örökölt', 'inherits_access_copy_msg' => 'Örökített hozzáférési lista másolása', 'inherits_access_empty_msg' => 'Indulás üres hozzáférési listával', @@ -874,6 +875,9 @@ URL: [url]', 'select_category' => 'Kattintson a kategória kiválasztásához', 'select_groups' => 'Kattintson a csoportok kijelöléséhez', 'select_grp_approvers' => 'Kattintson a csoport jóváhagyó kijelöléséhez', +'select_grp_ind_approvers' => '', +'select_grp_ind_notification' => '', +'select_grp_ind_reviewers' => '', 'select_grp_notification' => 'Kattintson a csoport értesítés kiválasztásához', 'select_grp_recipients' => '', 'select_grp_reviewers' => 'Kattintson a csoport felülvizsgáló kijelöléséhez', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 41ad92077..68c5b4e37 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -494,6 +494,7 @@ URL: [url]', 'index_converters' => 'Indice di conversione documenti', 'index_folder' => 'Indicizza cartella', 'individuals' => 'Singoli', +'indivіduals_in_groups' => '', 'inherited' => 'ereditato', 'inherits_access_copy_msg' => 'Copia la lista degli accessi ereditati', 'inherits_access_empty_msg' => 'Reimposta una lista di permessi vuota', @@ -898,6 +899,9 @@ URL: [url]', 'select_category' => 'Clicca per selezionare la categoria', 'select_groups' => 'Clicca per selezionare i gruppi', 'select_grp_approvers' => 'Seleziona gruppo approvatore', +'select_grp_ind_approvers' => '', +'select_grp_ind_notification' => '', +'select_grp_ind_reviewers' => '', 'select_grp_notification' => 'Seleziona Gruppo', 'select_grp_recipients' => 'Seleziona gruppo cartelle', 'select_grp_reviewers' => 'Seleziona gruppo revisore', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 8f5fde14a..ab08a4550 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -493,6 +493,7 @@ URL: [url]', 'index_converters' => '인덱스 문서 변환', 'index_folder' => '인덱스 폴더', 'individuals' => '개인', +'indivіduals_in_groups' => '', 'inherited' => '상속', 'inherits_access_copy_msg' => '상속 액세스 목록 복사', 'inherits_access_empty_msg' => '빈 액세스 목록으로 시작', @@ -889,6 +890,9 @@ URL : [url]', 'select_category' => '범주를 선택합니다', 'select_groups' => '그룹을 선택합니다', 'select_grp_approvers' => '그룹 승인을 선택합니다', +'select_grp_ind_approvers' => '', +'select_grp_ind_notification' => '', +'select_grp_ind_reviewers' => '', 'select_grp_notification' => '그룹 통지를 선택합니다', 'select_grp_recipients' => '받는 사람 그룹을 클릭하시오', 'select_grp_reviewers' => '그룹 검토를 선택합니다', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 638908eef..350698054 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -486,6 +486,7 @@ URL: [url]', 'index_converters' => 'Index document conversie', 'index_folder' => 'Inhoud', 'individuals' => 'Individuen', +'indivіduals_in_groups' => '', 'inherited' => 'overgeerfd', 'inherits_access_copy_msg' => 'Kopie lijst overerfde toegang', 'inherits_access_empty_msg' => 'Begin met lege toegangslijst', @@ -871,6 +872,9 @@ URL: [url]', 'select_category' => 'klik om categorie te selecteren', 'select_groups' => 'Klik om groep te selecteren', 'select_grp_approvers' => 'Klik om groep beoordelaar te selecteren', +'select_grp_ind_approvers' => '', +'select_grp_ind_notification' => '', +'select_grp_ind_reviewers' => '', 'select_grp_notification' => '', 'select_grp_recipients' => '', 'select_grp_reviewers' => 'Klik om groep beoordelaar te selecteren', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 519764d45..e13022e53 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -481,6 +481,7 @@ URL: [url]', 'index_converters' => 'Konwersja indeksu dokumentów', 'index_folder' => 'Indeksuj folder', 'individuals' => 'Indywidualni', +'indivіduals_in_groups' => '', 'inherited' => 'dziedziczony', 'inherits_access_copy_msg' => 'Kopiuj odziedziczoną listę dostępu', 'inherits_access_empty_msg' => 'Rozpocznij z pustą listą dostępu', @@ -854,6 +855,9 @@ URL: [url]', 'select_category' => 'Kliknij by wybrać kategorię', 'select_groups' => 'Kliknij by wybrać grupy', 'select_grp_approvers' => 'Kliknij by wybrać grupę zatwierdzającą', +'select_grp_ind_approvers' => '', +'select_grp_ind_notification' => '', +'select_grp_ind_reviewers' => '', 'select_grp_notification' => '', 'select_grp_recipients' => '', 'select_grp_reviewers' => 'Kliknij by wybrać grupę recenzentów', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 90db81dee..dd7bb4ff6 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -487,6 +487,7 @@ URL: [url]', 'index_converters' => 'Índice de conversão de documentos', 'index_folder' => 'Pasta Raiz', 'individuals' => 'Individuals', +'indivіduals_in_groups' => '', 'inherited' => 'herdado', 'inherits_access_copy_msg' => 'Copy inherited access list', 'inherits_access_empty_msg' => 'Inicie com a lista de acesso vazia', @@ -872,6 +873,9 @@ URL: [url]', 'select_category' => 'Clique para selecionar a categoria', 'select_groups' => 'Clique para selecionar os grupos', 'select_grp_approvers' => 'Clique para selecionar o grupo aprovador', +'select_grp_ind_approvers' => '', +'select_grp_ind_notification' => '', +'select_grp_ind_reviewers' => '', 'select_grp_notification' => 'Click para selecionar um grupo a ser notificado', 'select_grp_recipients' => '', 'select_grp_reviewers' => 'Clique para selecionar o grupo revisor', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 6c40cd2e8..43f97a135 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -493,6 +493,7 @@ URL: [url]', 'index_converters' => 'Indexare conversie documente', 'index_folder' => 'Index folder', 'individuals' => 'Individuals', +'indivіduals_in_groups' => '', 'inherited' => 'moștenit', 'inherits_access_copy_msg' => 'Copie lista de acces moștenită', 'inherits_access_empty_msg' => 'Începeți cu lista de acces goală', @@ -897,6 +898,9 @@ URL: [url]', 'select_category' => 'Click pentru a selecta categoria', 'select_groups' => 'Click pentru a selecta grupuri', 'select_grp_approvers' => 'Click pentru a selecta grupul de aprobatori', +'select_grp_ind_approvers' => '', +'select_grp_ind_notification' => '', +'select_grp_ind_reviewers' => '', 'select_grp_notification' => 'Faceti click pentru a selecta o notificare de grup', 'select_grp_recipients' => 'Faceti click pentru a selecta un grup de destinatari', 'select_grp_reviewers' => 'Click pentru a selecta grupul de revizuitori', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 26cece9f5..2632520b7 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -481,6 +481,7 @@ URL: [url]', 'index_converters' => 'Индексирование документов', 'index_folder' => 'Каталог индекса', 'individuals' => 'Пользователи', +'indivіduals_in_groups' => '', 'inherited' => 'унаследованный', 'inherits_access_copy_msg' => 'Скопировать наследованный список', 'inherits_access_empty_msg' => 'Начать с пустого списка доступа', @@ -865,6 +866,9 @@ URL: [url]', 'select_category' => 'Выберите категорию', 'select_groups' => 'Выберите группы', 'select_grp_approvers' => 'Выберите утверждающую группу', +'select_grp_ind_approvers' => '', +'select_grp_ind_notification' => '', +'select_grp_ind_reviewers' => '', 'select_grp_notification' => '', 'select_grp_recipients' => '', 'select_grp_reviewers' => 'Выберите рецензирующую группу', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 621ad8af5..424f6bdf8 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -412,6 +412,7 @@ $text = array( 'index_converters' => '', 'index_folder' => 'Indexovať zložku', 'individuals' => 'Jednotlivci', +'indivіduals_in_groups' => '', 'inherited' => 'zdedené', 'inherits_access_copy_msg' => 'Skopírovať zdedený zoznam riadenia prístupu', 'inherits_access_empty_msg' => 'Založiť nový zoznam riadenia prístupu', @@ -725,6 +726,9 @@ $text = array( 'select_category' => 'Vyber kategóriu', 'select_groups' => '', 'select_grp_approvers' => '', +'select_grp_ind_approvers' => '', +'select_grp_ind_notification' => '', +'select_grp_ind_reviewers' => '', 'select_grp_notification' => '', 'select_grp_recipients' => '', 'select_grp_reviewers' => '', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 84812f325..5cf7bfc65 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -481,6 +481,7 @@ URL: [url]', 'index_converters' => 'Omvandling av indexdokument', 'index_folder' => 'Index mapp', 'individuals' => 'Personer', +'indivіduals_in_groups' => '', 'inherited' => 'ärvd', 'inherits_access_copy_msg' => 'Kopiera behörighetsarvslista', 'inherits_access_empty_msg' => 'Börja med tom behörighetslista', @@ -860,6 +861,9 @@ URL: [url]', 'select_category' => 'Klicka för att välja en kategori', 'select_groups' => 'Välj grupper', 'select_grp_approvers' => 'Välj en grupp som ska godkänna', +'select_grp_ind_approvers' => '', +'select_grp_ind_notification' => '', +'select_grp_ind_reviewers' => '', 'select_grp_notification' => '', 'select_grp_recipients' => '', 'select_grp_reviewers' => 'Välj en grupp som ska granska', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index debe80794..8d1d1a840 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -487,6 +487,7 @@ URL: [url]', 'index_converters' => 'Doküman dönüştürmeyi indeksle', 'index_folder' => 'Klasörü indeksle', 'individuals' => 'Bireysel', +'indivіduals_in_groups' => '', 'inherited' => 'devralındı', 'inherits_access_copy_msg' => 'Devralınan erişim listesini kopyala', 'inherits_access_empty_msg' => 'Boş erişim listesiyle başla', @@ -876,6 +877,9 @@ URL: [url]', 'select_category' => 'Kategori seçmek için tıklayın', 'select_groups' => 'Grup seçmek için tıklayın', 'select_grp_approvers' => 'Grup onaylayıcı seçmek için tıklayın', +'select_grp_ind_approvers' => '', +'select_grp_ind_notification' => '', +'select_grp_ind_reviewers' => '', 'select_grp_notification' => '', 'select_grp_recipients' => '', 'select_grp_reviewers' => 'Grup kontrol edeni seçmek için tıklayın', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index ab323ba41..f2388799b 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -493,6 +493,7 @@ URL: [url]', 'index_converters' => 'Індексування документів', 'index_folder' => 'Каталог індексу', 'individuals' => 'Користувачі', +'indivіduals_in_groups' => '', 'inherited' => 'успадкований', 'inherits_access_copy_msg' => 'Скопіювати успадкований список', 'inherits_access_empty_msg' => 'Почати з порожнього списку доступу', @@ -887,6 +888,9 @@ URL: [url]', 'select_category' => 'Виберіть категорію', 'select_groups' => 'Виберіть групи', 'select_grp_approvers' => 'Виберіть групу затверджувачів', +'select_grp_ind_approvers' => '', +'select_grp_ind_notification' => '', +'select_grp_ind_reviewers' => '', 'select_grp_notification' => 'Виберіть групу сповіщення', 'select_grp_recipients' => 'Виберіть групу отримувачів', 'select_grp_reviewers' => 'Виберіть групу рецензентів', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 182b5a19a..bda71f780 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (610), fengjohn (5) +// Translators: Admin (617), fengjohn (5) $text = array( 'accept' => '接受', @@ -51,7 +51,7 @@ URL: [url]', 'add_approval' => '提交审核', 'add_document' => '添加文档', 'add_document_link' => '添加链接', -'add_document_notify' => '', +'add_document_notify' => '派发通知', 'add_doc_reviewer_approver_warning' => '备注:如果没有指派校对人或审核人那么文档将被自动标注为发布', 'add_doc_workflow_warning' => '', 'add_event' => '添加事件', @@ -305,7 +305,7 @@ URL: [url]', 'draft_pending_approval' => '待审核', 'draft_pending_review' => '待校对', 'drag_icon_here' => '拖动图标到这里', -'dropfolder_file' => '', +'dropfolder_file' => '所选文件夹的文件', 'dropupload' => '快速上传', 'drop_files_here' => '拖入这里', 'dump_creation' => '转储数据', @@ -358,7 +358,7 @@ URL: [url]', 'files' => '文件', 'files_deletion' => '删除文件', 'files_deletion_warning' => '通过此操作，您可以删除整个DMS(文档管理系统)文件夹里的所有文件.但版本信息将被保留', -'files_loading' => '', +'files_loading' => '等待中，正在整理文件列表', 'file_size' => '文件大小', 'filter_for_documents' => '文档新增过滤', 'filter_for_folders' => '文件夹新增过滤', @@ -418,6 +418,7 @@ URL: [url]', 'index_converters' => '索引文件转换', 'index_folder' => '索引目录', 'individuals' => '个人', +'indivіduals_in_groups' => '', 'inherited' => '继承', 'inherits_access_copy_msg' => '复制继承访问权限列表', 'inherits_access_empty_msg' => '从访问权限空列表开始', @@ -471,7 +472,7 @@ URL: [url]', 'keep' => '', 'keep_doc_status' => '', 'keywords' => '关键字', -'keywords_loading' => '', +'keywords_loading' => '等待中，正在整理关键词列表', 'keyword_exists' => '关键字已存在', 'ko_KR' => '韩国人', 'language' => '语言', @@ -731,12 +732,15 @@ URL: [url]', 'select_category' => '选中分类', 'select_groups' => '点击选择组', 'select_grp_approvers' => '', -'select_grp_notification' => '', +'select_grp_ind_approvers' => '', +'select_grp_ind_notification' => '', +'select_grp_ind_reviewers' => '', +'select_grp_notification' => '点击选择被通知组', 'select_grp_recipients' => '', 'select_grp_reviewers' => '点击选择审核群组', 'select_grp_revisors' => '', 'select_ind_approvers' => '', -'select_ind_notification' => '', +'select_ind_notification' => '点击选择被通知人', 'select_ind_recipients' => '', 'select_ind_reviewers' => '点击选择审核人', 'select_ind_revisors' => '', @@ -1176,7 +1180,7 @@ URL: [url]', 'user_login' => '用户ID', 'user_management' => '用户管理', 'user_name' => '全名', -'use_comment_of_document' => '', +'use_comment_of_document' => '文档注释', 'use_default_categories' => '默认分类', 'use_default_keywords' => '使用预定义关键字', 'version' => '版本', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index defe60082..a51fa9a6c 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -416,6 +416,7 @@ URL: [url]', 'index_converters' => '索引檔轉換', 'index_folder' => '索引目錄', 'individuals' => '個人', +'indivіduals_in_groups' => '', 'inherited' => '繼承', 'inherits_access_copy_msg' => '複製繼承存取權限列表', 'inherits_access_empty_msg' => '從存取權限空列表開始', @@ -729,6 +730,9 @@ URL: [url]', 'select_category' => '選中分類', 'select_groups' => '點擊選擇組', 'select_grp_approvers' => '', +'select_grp_ind_approvers' => '', +'select_grp_ind_notification' => '', +'select_grp_ind_reviewers' => '', 'select_grp_notification' => '', 'select_grp_recipients' => '', 'select_grp_reviewers' => '', From d493715ae84107cd756b3df0856abba67c538658 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 10 Dec 2015 12:43:19 +0100 Subject: [PATCH 24/65] simplify some old javascript code --- views/bootstrap/class.UsrMgr.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php index c0d49370a..5e0a95547 100644 --- a/views/bootstrap/class.UsrMgr.php +++ b/views/bootstrap/class.UsrMgr.php @@ -97,7 +97,7 @@ class SeedDMS_View_UsrMgr extends SeedDMS_Bootstrap_Style { ?> - +
    \n"; - echo " "; + echo " "; if ($folder!=null && is_object($folder) && !strcasecmp(get_class($folder), "SeedDMS_Core_Folder")) { echo " getID()."\" />"; } @@ -954,8 +954,8 @@ function folderSelected(id, name) { printFolderChooserHtml($formName); + function printFolderChooser($formName, $accessMode, $exclude = -1, $default = false) { /* {{{ */ + $this->printFolderChooserHtml($formName, $accessMode, $exclude, $default); ?> + +$(document).ready( function() { + $('body').on('submit', '#fileupload', function(ev){ + if(checkForm()) return; + event.preventDefault(); + }); +}); params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $document = $this->params['document']; + $strictformcheck = $this->params['strictformcheck']; + $enablelargefileupload = $this->params['enablelargefileupload']; + + $this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName())))); + $this->globalNavigation($folder); + $this->contentStart(); + $this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document); + $this->contentHeading(getMLText("linked_files")); ?>
    @@ -89,7 +97,7 @@ function checkForm() $this->contentContainerStart(); ?> - + @@ -102,11 +110,11 @@ function checkForm() - + - + diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 98ec4b820..bc61def43 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -43,7 +43,7 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common { } /* }}} */ function htmlStartPage($title="", $bodyClass="") { /* {{{ */ - if(method_exists($this, 'js')) { + if(1||method_exists($this, 'js')) { /* We still need unsafe-eval, because printDocumentChooserHtml and * printFolderChooserHtml will include a javascript file with ajax * which is evaled by jquery @@ -1016,7 +1016,7 @@ function folderSelected(id, name) {
    @@ -1032,12 +1032,31 @@ function folderSelected(id, name) {
    - +
    +$('#acceptkeywords').click(function(ev) { + acceptKeywords(); +}); +printKeywordChooserHtml($formName, $keywords, $fieldname); +?> + +getType()) { case SeedDMS_Core_AttributeDefinition::type_boolean: @@ -1086,10 +1105,10 @@ function folderSelected(id, name) { } } /* }}} */ - function printDropFolderChooser($formName, $dropfolderfile="") { /* {{{ */ + function printDropFolderChooserHtml($formName, $dropfolderfile="") { /* {{{ */ print "
    \n"; print ""; - print ""; + print ""; print "".getMLText("choose_target_file")."…\n"; print "
    \n"; ?> @@ -1106,7 +1125,11 @@ function folderSelected(id, name) { - +$('#clearfilename').click(function(ev) { + $('#dropfolderfile').val(''); +}); +printDropFolderChooserHtml($formName, $dropfolderfile); +?> + +$('#fileselect').click(function(ev) { + attr_filename = $(ev.currentTarget).attr('filename'); + fileSelected(attr_filename); +}); +params['dms']; $user = $this->params['user']; @@ -75,12 +84,13 @@ var targetName = document..dropfolderfile; if($previewer->hasRawPreview($dir.'/'.$entry, 'dropfolder/')) { echo ""; } - echo "\n"; + echo "\n"; } } } echo "\n"; echo "
    :
    :
    ".$entry."".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry))."".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."
    ".$entry."".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry))."".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."
    \n"; + echo ''."\n"; } } diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php index ab2f4fd69..e2fc89c1c 100644 --- a/views/bootstrap/class.EditDocument.php +++ b/views/bootstrap/class.EditDocument.php @@ -31,31 +31,19 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_EditDocument extends SeedDMS_Bootstrap_Style { - function show() { /* {{{ */ - $dms = $this->params['dms']; - $user = $this->params['user']; - $folder = $this->params['folder']; - $document = $this->params['document']; - $attrdefs = $this->params['attrdefs']; + function js() { /* {{{ */ $strictformcheck = $this->params['strictformcheck']; - $orderby = $this->params['orderby']; - - $this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName())))); - $this->globalNavigation($folder); - $this->contentStart(); - $this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document); - + $this->printKeywordChooserJs(); ?> - +$(document).ready( function() { + $('body').on('submit', '#form1', function(ev){ + if(checkForm()) return; + event.preventDefault(); + }); +}); params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $document = $this->params['document']; + $attrdefs = $this->params['attrdefs']; + $strictformcheck = $this->params['strictformcheck']; + $orderby = $this->params['orderby']; + + $this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName())))); + $this->globalNavigation($folder); + $this->contentStart(); + $this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document); + $this->contentHeading(getMLText("edit_document_props")); $this->contentContainerStart(); @@ -85,22 +94,22 @@ function checkForm() else $expdate = ''; ?> - + - + - + diff --git a/views/bootstrap/class.KeywordChooser.php b/views/bootstrap/class.KeywordChooser.php index b6c5d94ad..c7d586d37 100644 --- a/views/bootstrap/class.KeywordChooser.php +++ b/views/bootstrap/class.KeywordChooser.php @@ -31,15 +31,10 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_KeywordChooser extends SeedDMS_Bootstrap_Style { - function show() { /* {{{ */ - $dms = $this->params['dms']; - $user = $this->params['user']; - $categories = $this->params['categories']; + function js() { /* {{{ */ $form = $this->params['form']; - -// $this->htmlStartPage(getMLText("use_default_keywords")); + header('Content-Type: application/json'); ?> - + +$('#categories0').change(function(ev) { + showKeywords(0); +}); + +$('#categories1').change(function(ev) { + showKeywords(1); +}); + +$('.insertkeyword').click(function(ev) { + attr_keyword = $(ev.currentTarget).attr('keyword'); + insertKeywords(attr_keyword); +}); + +myTA = document.getElementById("keywordta"); +myTA.value = targetObj.value; +myTA.focus(); +params['dms']; + $user = $this->params['user']; + $categories = $this->params['categories']; + $form = $this->params['form']; + +// $this->htmlStartPage(getMLText("use_default_keywords")); +?>
    "; } echo "
    :
    :
    : printKeywordChooser('form1', $document->getKeywords()); + $this->printKeywordChooserHtml('form1', $document->getKeywords()); ?>
    : -
    : -
    ".$key."".$LANG['en_GB'][$key]."
    Submit
    "; -?> - -There are missing translations on this page!
    Please check the bottom of the page.
    \n"; } } /* }}} */ From 1dff2762172bd3bec8b093001f636bb9e698b94b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 16 Dec 2015 06:35:46 +0100 Subject: [PATCH 55/65] div.splash can have a timeout attribute --- styles/bootstrap/application.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index 0b68d7bc8..c6ce33cef 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -666,6 +666,7 @@ $(document).ready(function() { $('div.splash').each(function(index) { var element = $(this); var msgtype = element.data('type'); + var timeout = element.data('timeout'); var msg = element.text(); noty({ text: msg, @@ -673,7 +674,7 @@ $(document).ready(function() { dismissQueue: true, layout: 'topRight', theme: 'defaultTheme', - timeout: 1500, + timeout: (timeout == 'undefined' ? 1500 : timeout), }); }); }); From 07f5512c9a6c8bbb686837352d0ab3114ae0a491 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 16 Dec 2015 07:16:16 +0100 Subject: [PATCH 56/65] add csp header only if view->js() is defined --- views/bootstrap/class.Bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 3fe81307a..d902a330e 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -43,7 +43,7 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common { } /* }}} */ function htmlStartPage($title="", $bodyClass="") { /* {{{ */ - if(1||method_exists($this, 'js')) { + if(method_exists($this, 'js')) { /* We still need unsafe-eval, because printDocumentChooserHtml and * printFolderChooserHtml will include a javascript file with ajax * which is evaled by jquery From 62cd6e060202631e1fe7d3750702f4c96389e91c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Sun, 10 Jan 2016 14:25:31 +0100 Subject: [PATCH 57/65] check if index exists before removing it --- SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php index 8a311cd50..a6eb09aa6 100644 --- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php +++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php @@ -55,7 +55,8 @@ class SeedDMS_SQLiteFTS_Indexer { * @param string $indexerDir directory on disk containing the index */ static function create($indexerDir) { /* {{{ */ - unlink($indexerDir.'/index.db'); + if(file_exists($indexerDir.'/index.db')) + unlink($indexerDir.'/index.db'); $index = new SeedDMS_SQLiteFTS_Indexer($indexerDir); /* Make sure the sequence of fields is identical to the field list * in SeedDMS_SQLiteFTS_Term From 1635cb92bac75d7041f8724eda781508f51ecdb8 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Sun, 10 Jan 2016 14:25:46 +0100 Subject: [PATCH 58/65] new version 1.0.2 --- SeedDMS_SQLiteFTS/package.xml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml index 67e694d9c..1a8b927ca 100644 --- a/SeedDMS_SQLiteFTS/package.xml +++ b/SeedDMS_SQLiteFTS/package.xml @@ -11,10 +11,10 @@ uwe@steinmann.cx yes - 2015-11-16 + 2016-01-10 - 1.0.1 + 1.0.2 1.0.1 @@ -23,7 +23,7 @@ GPL License -add __get() to SQLiteFTS_Document because class.IndexInfo.php access class variable title which doesn't exists +check if index exists before removing it when creating a new one @@ -82,5 +82,21 @@ add __get() to SQLiteFTS_Document because class.IndexInfo.php access class varia initial release + + 2015-11-16 + + + 1.0.1 + 1.0.1 + + + stable + stable + + GPL License + +add __get() to SQLiteFTS_Document because class.IndexInfo.php access class variable title which doesn't exists + + From 60ba9577decd96e168e49d8ae0df4fa5bdb11fa2 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 14 Jan 2016 20:04:18 +0100 Subject: [PATCH 59/65] new version which fixes a security hole --- styles/bootstrap/chosen/css/chosen.css | 19 ++++++-- styles/bootstrap/chosen/css/chosen.min.css | 4 +- styles/bootstrap/chosen/js/chosen.jquery.js | 44 ++++++++++++------ .../bootstrap/chosen/js/chosen.jquery.min.js | 4 +- styles/bootstrap/chosen/js/chosen.proto.js | 45 +++++++++++++------ .../bootstrap/chosen/js/chosen.proto.min.js | 4 +- 6 files changed, 84 insertions(+), 36 deletions(-) diff --git a/styles/bootstrap/chosen/css/chosen.css b/styles/bootstrap/chosen/css/chosen.css index fe43ff49d..e7ea09225 100644 --- a/styles/bootstrap/chosen/css/chosen.css +++ b/styles/bootstrap/chosen/css/chosen.css @@ -2,9 +2,9 @@ Chosen, a Select Box Enhancer for jQuery and Prototype by Patrick Filler for Harvest, http://getharvest.com -Version 1.3.0 +Version 1.4.2 Full source at https://github.com/harvesthq/chosen -Copyright (c) 2011-2014 Harvest http://getharvest.com +Copyright (c) 2011-2015 Harvest http://getharvest.com MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md This file is generated by `grunt build`, do not edit it by hand. @@ -44,6 +44,19 @@ This file is generated by `grunt build`, do not edit it by hand. .chosen-container a { cursor: pointer; } +.chosen-container .search-choice .group-name, .chosen-container .chosen-single .group-name { + margin-right: 4px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + font-weight: normal; + color: #999999; +} +.chosen-container .search-choice .group-name:after, .chosen-container .chosen-single .group-name:after { + content: ":"; + padding-left: 2px; + vertical-align: top; +} /* @end */ /* @group Single Chosen */ @@ -421,7 +434,7 @@ This file is generated by `grunt build`, do not edit it by hand. /* @end */ /* @group Retina compatibility */ -@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-resolution: 144dpi) { +@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi), only screen and (min-resolution: 1.5dppx) { .chosen-rtl .chosen-search input[type="text"], .chosen-container-single .chosen-single abbr, .chosen-container-single .chosen-single div b, diff --git a/styles/bootstrap/chosen/css/chosen.min.css b/styles/bootstrap/chosen/css/chosen.min.css index 13553b2ed..5ca6159cf 100644 --- a/styles/bootstrap/chosen/css/chosen.min.css +++ b/styles/bootstrap/chosen/css/chosen.min.css @@ -1,3 +1,3 @@ -/* Chosen v1.3.0 | (c) 2011-2014 by Harvest | MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md */ +/* Chosen v1.4.2 | (c) 2011-2015 by Harvest | MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md */ -.chosen-container{position:relative;display:inline-block;vertical-align:middle;font-size:13px;zoom:1;*display:inline;-webkit-user-select:none;-moz-user-select:none;user-select:none}.chosen-container *{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.chosen-container .chosen-drop{position:absolute;top:100%;left:-9999px;z-index:1010;width:100%;border:1px solid #aaa;border-top:0;background:#fff;box-shadow:0 4px 5px rgba(0,0,0,.15)}.chosen-container.chosen-with-drop .chosen-drop{left:0}.chosen-container a{cursor:pointer}.chosen-container-single .chosen-single{position:relative;display:block;overflow:hidden;padding:0 0 0 8px;height:25px;border:1px solid #aaa;border-radius:5px;background-color:#fff;background:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#fff),color-stop(50%,#f6f6f6),color-stop(52%,#eee),color-stop(100%,#f4f4f4));background:-webkit-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-moz-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-o-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background-clip:padding-box;box-shadow:0 0 3px #fff inset,0 1px 1px rgba(0,0,0,.1);color:#444;text-decoration:none;white-space:nowrap;line-height:24px}.chosen-container-single .chosen-default{color:#999}.chosen-container-single .chosen-single span{display:block;overflow:hidden;margin-right:26px;text-overflow:ellipsis;white-space:nowrap}.chosen-container-single .chosen-single-with-deselect span{margin-right:38px}.chosen-container-single .chosen-single abbr{position:absolute;top:6px;right:26px;display:block;width:12px;height:12px;background:url(chosen-sprite.png) -42px 1px no-repeat;font-size:1px}.chosen-container-single .chosen-single abbr:hover{background-position:-42px -10px}.chosen-container-single.chosen-disabled .chosen-single abbr:hover{background-position:-42px -10px}.chosen-container-single .chosen-single div{position:absolute;top:0;right:0;display:block;width:18px;height:100%}.chosen-container-single .chosen-single div b{display:block;width:100%;height:100%;background:url(chosen-sprite.png) no-repeat 0 2px}.chosen-container-single .chosen-search{position:relative;z-index:1010;margin:0;padding:3px 4px;white-space:nowrap}.chosen-container-single .chosen-search input[type=text]{margin:1px 0;padding:4px 20px 4px 5px;width:100%;height:auto;outline:0;border:1px solid #aaa;background:#fff url(chosen-sprite.png) no-repeat 100% -20px;background:url(chosen-sprite.png) no-repeat 100% -20px;font-size:1em;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-single .chosen-drop{margin-top:-1px;border-radius:0 0 4px 4px;background-clip:padding-box}.chosen-container-single.chosen-container-single-nosearch .chosen-search{position:absolute;left:-9999px}.chosen-container .chosen-results{color:#444;position:relative;overflow-x:hidden;overflow-y:auto;margin:0 4px 4px 0;padding:0 0 0 4px;max-height:240px;-webkit-overflow-scrolling:touch}.chosen-container .chosen-results li{display:none;margin:0;padding:5px 6px;list-style:none;line-height:15px;word-wrap:break-word;-webkit-touch-callout:none}.chosen-container .chosen-results li.active-result{display:list-item;cursor:pointer}.chosen-container .chosen-results li.disabled-result{display:list-item;color:#ccc;cursor:default}.chosen-container .chosen-results li.highlighted{background-color:#3875d7;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#3875d7),color-stop(90%,#2a62bc));background-image:-webkit-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:-moz-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:-o-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:linear-gradient(#3875d7 20%,#2a62bc 90%);color:#fff}.chosen-container .chosen-results li.no-results{color:#777;display:list-item;background:#f4f4f4}.chosen-container .chosen-results li.group-result{display:list-item;font-weight:700;cursor:default}.chosen-container .chosen-results li.group-option{padding-left:15px}.chosen-container .chosen-results li em{font-style:normal;text-decoration:underline}.chosen-container-multi .chosen-choices{position:relative;overflow:hidden;margin:0;padding:0 5px;width:100%;height:auto!important;height:1%;border:1px solid #aaa;background-color:#fff;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(1%,#eee),color-stop(15%,#fff));background-image:-webkit-linear-gradient(#eee 1%,#fff 15%);background-image:-moz-linear-gradient(#eee 1%,#fff 15%);background-image:-o-linear-gradient(#eee 1%,#fff 15%);background-image:linear-gradient(#eee 1%,#fff 15%);cursor:text}.chosen-container-multi .chosen-choices li{float:left;list-style:none}.chosen-container-multi .chosen-choices li.search-field{margin:0;padding:0;white-space:nowrap}.chosen-container-multi .chosen-choices li.search-field input[type=text]{margin:1px 0;padding:0;height:25px;outline:0;border:0!important;background:transparent!important;box-shadow:none;color:#999;font-size:100%;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-multi .chosen-choices li.search-choice{position:relative;margin:3px 5px 3px 0;padding:3px 20px 3px 5px;border:1px solid #aaa;max-width:100%;border-radius:3px;background-color:#eee;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#f4f4f4),color-stop(50%,#f0f0f0),color-stop(52%,#e8e8e8),color-stop(100%,#eee));background-image:-webkit-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-moz-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-o-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-size:100% 19px;background-repeat:repeat-x;background-clip:padding-box;box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);color:#333;line-height:13px;cursor:default}.chosen-container-multi .chosen-choices li.search-choice span{word-wrap:break-word}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{position:absolute;top:4px;right:3px;display:block;width:12px;height:12px;background:url(chosen-sprite.png) -42px 1px no-repeat;font-size:1px}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover{background-position:-42px -10px}.chosen-container-multi .chosen-choices li.search-choice-disabled{padding-right:5px;border:1px solid #ccc;background-color:#e4e4e4;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#f4f4f4),color-stop(50%,#f0f0f0),color-stop(52%,#e8e8e8),color-stop(100%,#eee));background-image:-webkit-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-moz-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-o-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);color:#666}.chosen-container-multi .chosen-choices li.search-choice-focus{background:#d4d4d4}.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close{background-position:-42px -10px}.chosen-container-multi .chosen-results{margin:0;padding:0}.chosen-container-multi .chosen-drop .result-selected{display:list-item;color:#ccc;cursor:default}.chosen-container-active .chosen-single{border:1px solid #5897fb;box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active.chosen-with-drop .chosen-single{border:1px solid #aaa;-moz-border-radius-bottomright:0;border-bottom-right-radius:0;-moz-border-radius-bottomleft:0;border-bottom-left-radius:0;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#eee),color-stop(80%,#fff));background-image:-webkit-linear-gradient(#eee 20%,#fff 80%);background-image:-moz-linear-gradient(#eee 20%,#fff 80%);background-image:-o-linear-gradient(#eee 20%,#fff 80%);background-image:linear-gradient(#eee 20%,#fff 80%);box-shadow:0 1px 0 #fff inset}.chosen-container-active.chosen-with-drop .chosen-single div{border-left:0;background:transparent}.chosen-container-active.chosen-with-drop .chosen-single div b{background-position:-18px 2px}.chosen-container-active .chosen-choices{border:1px solid #5897fb;box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active .chosen-choices li.search-field input[type=text]{color:#222!important}.chosen-disabled{opacity:.5!important;cursor:default}.chosen-disabled .chosen-single{cursor:default}.chosen-disabled .chosen-choices .search-choice .search-choice-close{cursor:default}.chosen-rtl{text-align:right}.chosen-rtl .chosen-single{overflow:visible;padding:0 8px 0 0}.chosen-rtl .chosen-single span{margin-right:0;margin-left:26px;direction:rtl}.chosen-rtl .chosen-single-with-deselect span{margin-left:38px}.chosen-rtl .chosen-single div{right:auto;left:3px}.chosen-rtl .chosen-single abbr{right:auto;left:26px}.chosen-rtl .chosen-choices li{float:right}.chosen-rtl .chosen-choices li.search-field input[type=text]{direction:rtl}.chosen-rtl .chosen-choices li.search-choice{margin:3px 5px 3px 0;padding:3px 5px 3px 19px}.chosen-rtl .chosen-choices li.search-choice .search-choice-close{right:auto;left:4px}.chosen-rtl.chosen-container-single-nosearch .chosen-search,.chosen-rtl .chosen-drop{left:9999px}.chosen-rtl.chosen-container-single .chosen-results{margin:0 0 4px 4px;padding:0 4px 0 0}.chosen-rtl .chosen-results li.group-option{padding-right:15px;padding-left:0}.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div{border-right:0}.chosen-rtl .chosen-search input[type=text]{padding:4px 5px 4px 20px;background:#fff url(chosen-sprite.png) no-repeat -30px -20px;background:url(chosen-sprite.png) no-repeat -30px -20px;direction:rtl}.chosen-rtl.chosen-container-single .chosen-single div b{background-position:6px 2px}.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b{background-position:-12px 2px}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min-resolution:144dpi){.chosen-rtl .chosen-search input[type=text],.chosen-container-single .chosen-single abbr,.chosen-container-single .chosen-single div b,.chosen-container-single .chosen-search input[type=text],.chosen-container-multi .chosen-choices .search-choice .search-choice-close,.chosen-container .chosen-results-scroll-down span,.chosen-container .chosen-results-scroll-up span{background-image:url(chosen-sprite@2x.png)!important;background-size:52px 37px!important;background-repeat:no-repeat!important}} \ No newline at end of file +.chosen-container{position:relative;display:inline-block;vertical-align:middle;font-size:13px;zoom:1;*display:inline;-webkit-user-select:none;-moz-user-select:none;user-select:none}.chosen-container *{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.chosen-container .chosen-drop{position:absolute;top:100%;left:-9999px;z-index:1010;width:100%;border:1px solid #aaa;border-top:0;background:#fff;box-shadow:0 4px 5px rgba(0,0,0,.15)}.chosen-container.chosen-with-drop .chosen-drop{left:0}.chosen-container a{cursor:pointer}.chosen-container .search-choice .group-name,.chosen-container .chosen-single .group-name{margin-right:4px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;font-weight:400;color:#999}.chosen-container .search-choice .group-name:after,.chosen-container .chosen-single .group-name:after{content:":";padding-left:2px;vertical-align:top}.chosen-container-single .chosen-single{position:relative;display:block;overflow:hidden;padding:0 0 0 8px;height:25px;border:1px solid #aaa;border-radius:5px;background-color:#fff;background:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#fff),color-stop(50%,#f6f6f6),color-stop(52%,#eee),color-stop(100%,#f4f4f4));background:-webkit-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-moz-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-o-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background-clip:padding-box;box-shadow:0 0 3px #fff inset,0 1px 1px rgba(0,0,0,.1);color:#444;text-decoration:none;white-space:nowrap;line-height:24px}.chosen-container-single .chosen-default{color:#999}.chosen-container-single .chosen-single span{display:block;overflow:hidden;margin-right:26px;text-overflow:ellipsis;white-space:nowrap}.chosen-container-single .chosen-single-with-deselect span{margin-right:38px}.chosen-container-single .chosen-single abbr{position:absolute;top:6px;right:26px;display:block;width:12px;height:12px;background:url(chosen-sprite.png) -42px 1px no-repeat;font-size:1px}.chosen-container-single .chosen-single abbr:hover{background-position:-42px -10px}.chosen-container-single.chosen-disabled .chosen-single abbr:hover{background-position:-42px -10px}.chosen-container-single .chosen-single div{position:absolute;top:0;right:0;display:block;width:18px;height:100%}.chosen-container-single .chosen-single div b{display:block;width:100%;height:100%;background:url(chosen-sprite.png) no-repeat 0 2px}.chosen-container-single .chosen-search{position:relative;z-index:1010;margin:0;padding:3px 4px;white-space:nowrap}.chosen-container-single .chosen-search input[type=text]{margin:1px 0;padding:4px 20px 4px 5px;width:100%;height:auto;outline:0;border:1px solid #aaa;background:#fff url(chosen-sprite.png) no-repeat 100% -20px;background:url(chosen-sprite.png) no-repeat 100% -20px;font-size:1em;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-single .chosen-drop{margin-top:-1px;border-radius:0 0 4px 4px;background-clip:padding-box}.chosen-container-single.chosen-container-single-nosearch .chosen-search{position:absolute;left:-9999px}.chosen-container .chosen-results{color:#444;position:relative;overflow-x:hidden;overflow-y:auto;margin:0 4px 4px 0;padding:0 0 0 4px;max-height:240px;-webkit-overflow-scrolling:touch}.chosen-container .chosen-results li{display:none;margin:0;padding:5px 6px;list-style:none;line-height:15px;word-wrap:break-word;-webkit-touch-callout:none}.chosen-container .chosen-results li.active-result{display:list-item;cursor:pointer}.chosen-container .chosen-results li.disabled-result{display:list-item;color:#ccc;cursor:default}.chosen-container .chosen-results li.highlighted{background-color:#3875d7;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#3875d7),color-stop(90%,#2a62bc));background-image:-webkit-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:-moz-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:-o-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:linear-gradient(#3875d7 20%,#2a62bc 90%);color:#fff}.chosen-container .chosen-results li.no-results{color:#777;display:list-item;background:#f4f4f4}.chosen-container .chosen-results li.group-result{display:list-item;font-weight:700;cursor:default}.chosen-container .chosen-results li.group-option{padding-left:15px}.chosen-container .chosen-results li em{font-style:normal;text-decoration:underline}.chosen-container-multi .chosen-choices{position:relative;overflow:hidden;margin:0;padding:0 5px;width:100%;height:auto!important;height:1%;border:1px solid #aaa;background-color:#fff;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(1%,#eee),color-stop(15%,#fff));background-image:-webkit-linear-gradient(#eee 1%,#fff 15%);background-image:-moz-linear-gradient(#eee 1%,#fff 15%);background-image:-o-linear-gradient(#eee 1%,#fff 15%);background-image:linear-gradient(#eee 1%,#fff 15%);cursor:text}.chosen-container-multi .chosen-choices li{float:left;list-style:none}.chosen-container-multi .chosen-choices li.search-field{margin:0;padding:0;white-space:nowrap}.chosen-container-multi .chosen-choices li.search-field input[type=text]{margin:1px 0;padding:0;height:25px;outline:0;border:0!important;background:transparent!important;box-shadow:none;color:#999;font-size:100%;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-multi .chosen-choices li.search-choice{position:relative;margin:3px 5px 3px 0;padding:3px 20px 3px 5px;border:1px solid #aaa;max-width:100%;border-radius:3px;background-color:#eee;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#f4f4f4),color-stop(50%,#f0f0f0),color-stop(52%,#e8e8e8),color-stop(100%,#eee));background-image:-webkit-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-moz-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-o-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-size:100% 19px;background-repeat:repeat-x;background-clip:padding-box;box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);color:#333;line-height:13px;cursor:default}.chosen-container-multi .chosen-choices li.search-choice span{word-wrap:break-word}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{position:absolute;top:4px;right:3px;display:block;width:12px;height:12px;background:url(chosen-sprite.png) -42px 1px no-repeat;font-size:1px}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover{background-position:-42px -10px}.chosen-container-multi .chosen-choices li.search-choice-disabled{padding-right:5px;border:1px solid #ccc;background-color:#e4e4e4;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#f4f4f4),color-stop(50%,#f0f0f0),color-stop(52%,#e8e8e8),color-stop(100%,#eee));background-image:-webkit-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-moz-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-o-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);color:#666}.chosen-container-multi .chosen-choices li.search-choice-focus{background:#d4d4d4}.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close{background-position:-42px -10px}.chosen-container-multi .chosen-results{margin:0;padding:0}.chosen-container-multi .chosen-drop .result-selected{display:list-item;color:#ccc;cursor:default}.chosen-container-active .chosen-single{border:1px solid #5897fb;box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active.chosen-with-drop .chosen-single{border:1px solid #aaa;-moz-border-radius-bottomright:0;border-bottom-right-radius:0;-moz-border-radius-bottomleft:0;border-bottom-left-radius:0;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#eee),color-stop(80%,#fff));background-image:-webkit-linear-gradient(#eee 20%,#fff 80%);background-image:-moz-linear-gradient(#eee 20%,#fff 80%);background-image:-o-linear-gradient(#eee 20%,#fff 80%);background-image:linear-gradient(#eee 20%,#fff 80%);box-shadow:0 1px 0 #fff inset}.chosen-container-active.chosen-with-drop .chosen-single div{border-left:0;background:transparent}.chosen-container-active.chosen-with-drop .chosen-single div b{background-position:-18px 2px}.chosen-container-active .chosen-choices{border:1px solid #5897fb;box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active .chosen-choices li.search-field input[type=text]{color:#222!important}.chosen-disabled{opacity:.5!important;cursor:default}.chosen-disabled .chosen-single{cursor:default}.chosen-disabled .chosen-choices .search-choice .search-choice-close{cursor:default}.chosen-rtl{text-align:right}.chosen-rtl .chosen-single{overflow:visible;padding:0 8px 0 0}.chosen-rtl .chosen-single span{margin-right:0;margin-left:26px;direction:rtl}.chosen-rtl .chosen-single-with-deselect span{margin-left:38px}.chosen-rtl .chosen-single div{right:auto;left:3px}.chosen-rtl .chosen-single abbr{right:auto;left:26px}.chosen-rtl .chosen-choices li{float:right}.chosen-rtl .chosen-choices li.search-field input[type=text]{direction:rtl}.chosen-rtl .chosen-choices li.search-choice{margin:3px 5px 3px 0;padding:3px 5px 3px 19px}.chosen-rtl .chosen-choices li.search-choice .search-choice-close{right:auto;left:4px}.chosen-rtl.chosen-container-single-nosearch .chosen-search,.chosen-rtl .chosen-drop{left:9999px}.chosen-rtl.chosen-container-single .chosen-results{margin:0 0 4px 4px;padding:0 4px 0 0}.chosen-rtl .chosen-results li.group-option{padding-right:15px;padding-left:0}.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div{border-right:0}.chosen-rtl .chosen-search input[type=text]{padding:4px 5px 4px 20px;background:#fff url(chosen-sprite.png) no-repeat -30px -20px;background:url(chosen-sprite.png) no-repeat -30px -20px;direction:rtl}.chosen-rtl.chosen-container-single .chosen-single div b{background-position:6px 2px}.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b{background-position:-12px 2px}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-resolution:144dpi),only screen and (min-resolution:1.5dppx){.chosen-rtl .chosen-search input[type=text],.chosen-container-single .chosen-single abbr,.chosen-container-single .chosen-single div b,.chosen-container-single .chosen-search input[type=text],.chosen-container-multi .chosen-choices .search-choice .search-choice-close,.chosen-container .chosen-results-scroll-down span,.chosen-container .chosen-results-scroll-up span{background-image:url(chosen-sprite@2x.png)!important;background-size:52px 37px!important;background-repeat:no-repeat!important}} \ No newline at end of file diff --git a/styles/bootstrap/chosen/js/chosen.jquery.js b/styles/bootstrap/chosen/js/chosen.jquery.js index 7a90b4dd7..929a9ca21 100644 --- a/styles/bootstrap/chosen/js/chosen.jquery.js +++ b/styles/bootstrap/chosen/js/chosen.jquery.js @@ -2,9 +2,9 @@ Chosen, a Select Box Enhancer for jQuery and Prototype by Patrick Filler for Harvest, http://getharvest.com -Version 1.3.0 +Version 1.4.2 Full source at https://github.com/harvesthq/chosen -Copyright (c) 2011-2014 Harvest http://getharvest.com +Copyright (c) 2011-2015 Harvest http://getharvest.com MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md This file is generated by `grunt build`, do not edit it by hand. @@ -36,6 +36,7 @@ This file is generated by `grunt build`, do not edit it by hand. array_index: group_position, group: true, label: this.escapeExpression(group.label), + title: group.title ? group.title : void 0, children: 0, disabled: group.disabled, classes: group.className @@ -61,9 +62,11 @@ This file is generated by `grunt build`, do not edit it by hand. value: option.value, text: option.text, html: option.innerHTML, + title: option.title ? option.title : void 0, selected: option.selected, disabled: group_disabled === true ? group_disabled : option.disabled, group_array_index: group_position, + group_label: group_position != null ? this.parsed[group_position].label : null, classes: option.className, style: option.style.cssText }); @@ -152,7 +155,8 @@ This file is generated by `grunt build`, do not edit it by hand. this.max_selected_options = this.options.max_selected_options || Infinity; this.inherit_select_classes = this.options.inherit_select_classes || false; this.display_selected_options = this.options.display_selected_options != null ? this.options.display_selected_options : true; - return this.display_disabled_options = this.options.display_disabled_options != null ? this.options.display_disabled_options : true; + this.display_disabled_options = this.options.display_disabled_options != null ? this.options.display_disabled_options : true; + return this.include_group_label_in_selected = this.options.include_group_label_in_selected || false; }; AbstractChosen.prototype.set_default_text = function() { @@ -166,6 +170,14 @@ This file is generated by `grunt build`, do not edit it by hand. return this.results_none_found = this.form_field.getAttribute("data-no_results_text") || this.options.no_results_text || AbstractChosen.default_no_result_text; }; + AbstractChosen.prototype.choice_label = function(item) { + if (this.include_group_label_in_selected && (item.group_label != null)) { + return "" + item.group_label + "" + item.html; + } else { + return item.html; + } + }; + AbstractChosen.prototype.mouse_enter = function() { return this.mouse_on_container = true; }; @@ -214,7 +226,7 @@ This file is generated by `grunt build`, do not edit it by hand. if (data.selected && this.is_multiple) { this.choice_build(data); } else if (data.selected && !this.is_multiple) { - this.single_set_selected_text(data.text); + this.single_set_selected_text(this.choice_label(data)); } } } @@ -250,6 +262,9 @@ This file is generated by `grunt build`, do not edit it by hand. option_el.style.cssText = option.style; option_el.setAttribute("data-option-array-index", option.array_index); option_el.innerHTML = option.search_text; + if (option.title) { + option_el.title = option.title; + } return this.outerHTML(option_el); }; @@ -269,6 +284,9 @@ This file is generated by `grunt build`, do not edit it by hand. group_el = document.createElement("li"); group_el.className = classes.join(" "); group_el.innerHTML = group.search_text; + if (group.title) { + group_el.title = group.title; + } return this.outerHTML(group_el); }; @@ -340,8 +358,8 @@ This file is generated by `grunt build`, do not edit it by hand. } results_group.active_options += 1; } + option.search_text = option.group ? option.label : option.html; if (!(option.group && !this.group_search)) { - option.search_text = option.group ? option.label : option.text; option.search_match = this.search_string_match(option.search_text, regex); if (option.search_match && !option.group) { results += 1; @@ -618,9 +636,11 @@ This file is generated by `grunt build`, do not edit it by hand. var _this = this; this.container.bind('touchstart.chosen', function(evt) { _this.container_mousedown(evt); + return evt.preventDefault(); }); this.container.bind('touchend.chosen', function(evt) { _this.container_mouseup(evt); + return evt.preventDefault(); }); this.container.bind('mousedown.chosen', function(evt) { _this.container_mousedown(evt); @@ -946,7 +966,7 @@ This file is generated by `grunt build`, do not edit it by hand. _this = this; choice = $('
  • ', { "class": "search-choice" - }).html("" + item.html + ""); + }).html("" + (this.choice_label(item)) + ""); if (item.disabled) { choice.addClass('search-choice-disabled'); } else { @@ -1014,6 +1034,7 @@ This file is generated by `grunt build`, do not edit it by hand. } else { this.reset_single_select_options(); } + high.addClass("result-selected"); item = this.results_data[high[0].getAttribute("data-option-array-index")]; item.selected = true; this.form_field.options[item.options_index].selected = true; @@ -1021,7 +1042,7 @@ This file is generated by `grunt build`, do not edit it by hand. if (this.is_multiple) { this.choice_build(item); } else { - this.single_set_selected_text(item.text); + this.single_set_selected_text(this.choice_label(item)); } if (!((evt.metaKey || evt.ctrlKey) && this.is_multiple)) { this.results_hide(); @@ -1033,6 +1054,7 @@ This file is generated by `grunt build`, do not edit it by hand. }); } this.current_selectedIndex = this.form_field.selectedIndex; + evt.preventDefault(); return this.search_field_scale(); } }; @@ -1047,7 +1069,7 @@ This file is generated by `grunt build`, do not edit it by hand. this.single_deselect_control_build(); this.selected_item.removeClass("chosen-default"); } - return this.selected_item.find("span").text(text); + return this.selected_item.find("span").html(text); }; Chosen.prototype.result_deselect = function(pos) { @@ -1082,11 +1104,7 @@ This file is generated by `grunt build`, do not edit it by hand. }; Chosen.prototype.get_search_text = function() { - if (this.search_field.val() === this.default_text) { - return ""; - } else { - return $('
    ').text($.trim(this.search_field.val())).html(); - } + return $('
    ').text($.trim(this.search_field.val())).html(); }; Chosen.prototype.winnow_results_set_highlight = function() { diff --git a/styles/bootstrap/chosen/js/chosen.jquery.min.js b/styles/bootstrap/chosen/js/chosen.jquery.min.js index 3197538cd..22e386584 100644 --- a/styles/bootstrap/chosen/js/chosen.jquery.min.js +++ b/styles/bootstrap/chosen/js/chosen.jquery.min.js @@ -1,2 +1,2 @@ -/* Chosen v1.3.0 | (c) 2011-2014 by Harvest | MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md */ -!function(){var a,AbstractChosen,Chosen,SelectParser,b,c={}.hasOwnProperty,d=function(a,b){function d(){this.constructor=a}for(var e in b)c.call(b,e)&&(a[e]=b[e]);return d.prototype=b.prototype,a.prototype=new d,a.__super__=b.prototype,a};SelectParser=function(){function SelectParser(){this.options_index=0,this.parsed=[]}return SelectParser.prototype.add_node=function(a){return"OPTGROUP"===a.nodeName.toUpperCase()?this.add_group(a):this.add_option(a)},SelectParser.prototype.add_group=function(a){var b,c,d,e,f,g;for(b=this.parsed.length,this.parsed.push({array_index:b,group:!0,label:this.escapeExpression(a.label),children:0,disabled:a.disabled,classes:a.className}),f=a.childNodes,g=[],d=0,e=f.length;e>d;d++)c=f[d],g.push(this.add_option(c,b,a.disabled));return g},SelectParser.prototype.add_option=function(a,b,c){return"OPTION"===a.nodeName.toUpperCase()?(""!==a.text?(null!=b&&(this.parsed[b].children+=1),this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,value:a.value,text:a.text,html:a.innerHTML,selected:a.selected,disabled:c===!0?c:a.disabled,group_array_index:b,classes:a.className,style:a.style.cssText})):this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,empty:!0}),this.options_index+=1):void 0},SelectParser.prototype.escapeExpression=function(a){var b,c;return null==a||a===!1?"":/[\&\<\>\"\'\`]/.test(a)?(b={"<":"<",">":">",'"':""","'":"'","`":"`"},c=/&(?!\w+;)|[\<\>\"\'\`]/g,a.replace(c,function(a){return b[a]||"&"})):a},SelectParser}(),SelectParser.select_to_array=function(a){var b,c,d,e,f;for(c=new SelectParser,f=a.childNodes,d=0,e=f.length;e>d;d++)b=f[d],c.add_node(b);return c.parsed},AbstractChosen=function(){function AbstractChosen(a,b){this.form_field=a,this.options=null!=b?b:{},AbstractChosen.browser_is_supported()&&(this.is_multiple=this.form_field.multiple,this.set_default_text(),this.set_default_values(),this.setup(),this.set_up_html(),this.register_observers(),this.on_ready())}return AbstractChosen.prototype.set_default_values=function(){var a=this;return this.click_test_action=function(b){return a.test_active_click(b)},this.activate_action=function(b){return a.activate_field(b)},this.active_field=!1,this.mouse_on_container=!1,this.results_showing=!1,this.result_highlighted=null,this.allow_single_deselect=null!=this.options.allow_single_deselect&&null!=this.form_field.options[0]&&""===this.form_field.options[0].text?this.options.allow_single_deselect:!1,this.disable_search_threshold=this.options.disable_search_threshold||0,this.disable_search=this.options.disable_search||!1,this.enable_split_word_search=null!=this.options.enable_split_word_search?this.options.enable_split_word_search:!0,this.group_search=null!=this.options.group_search?this.options.group_search:!0,this.search_contains=this.options.search_contains||!1,this.single_backstroke_delete=null!=this.options.single_backstroke_delete?this.options.single_backstroke_delete:!0,this.max_selected_options=this.options.max_selected_options||1/0,this.inherit_select_classes=this.options.inherit_select_classes||!1,this.display_selected_options=null!=this.options.display_selected_options?this.options.display_selected_options:!0,this.display_disabled_options=null!=this.options.display_disabled_options?this.options.display_disabled_options:!0},AbstractChosen.prototype.set_default_text=function(){return this.default_text=this.form_field.getAttribute("data-placeholder")?this.form_field.getAttribute("data-placeholder"):this.is_multiple?this.options.placeholder_text_multiple||this.options.placeholder_text||AbstractChosen.default_multiple_text:this.options.placeholder_text_single||this.options.placeholder_text||AbstractChosen.default_single_text,this.results_none_found=this.form_field.getAttribute("data-no_results_text")||this.options.no_results_text||AbstractChosen.default_no_result_text},AbstractChosen.prototype.mouse_enter=function(){return this.mouse_on_container=!0},AbstractChosen.prototype.mouse_leave=function(){return this.mouse_on_container=!1},AbstractChosen.prototype.input_focus=function(){var a=this;if(this.is_multiple){if(!this.active_field)return setTimeout(function(){return a.container_mousedown()},50)}else if(!this.active_field)return this.activate_field()},AbstractChosen.prototype.input_blur=function(){var a=this;return this.mouse_on_container?void 0:(this.active_field=!1,setTimeout(function(){return a.blur_test()},100))},AbstractChosen.prototype.results_option_build=function(a){var b,c,d,e,f;for(b="",f=this.results_data,d=0,e=f.length;e>d;d++)c=f[d],b+=c.group?this.result_add_group(c):this.result_add_option(c),(null!=a?a.first:void 0)&&(c.selected&&this.is_multiple?this.choice_build(c):c.selected&&!this.is_multiple&&this.single_set_selected_text(c.text));return b},AbstractChosen.prototype.result_add_option=function(a){var b,c;return a.search_match?this.include_option_in_results(a)?(b=[],a.disabled||a.selected&&this.is_multiple||b.push("active-result"),!a.disabled||a.selected&&this.is_multiple||b.push("disabled-result"),a.selected&&b.push("result-selected"),null!=a.group_array_index&&b.push("group-option"),""!==a.classes&&b.push(a.classes),c=document.createElement("li"),c.className=b.join(" "),c.style.cssText=a.style,c.setAttribute("data-option-array-index",a.array_index),c.innerHTML=a.search_text,this.outerHTML(c)):"":""},AbstractChosen.prototype.result_add_group=function(a){var b,c;return a.search_match||a.group_match?a.active_options>0?(b=[],b.push("group-result"),a.classes&&b.push(a.classes),c=document.createElement("li"),c.className=b.join(" "),c.innerHTML=a.search_text,this.outerHTML(c)):"":""},AbstractChosen.prototype.results_update_field=function(){return this.set_default_text(),this.is_multiple||this.results_reset_cleanup(),this.result_clear_highlight(),this.results_build(),this.results_showing?this.winnow_results():void 0},AbstractChosen.prototype.reset_single_select_options=function(){var a,b,c,d,e;for(d=this.results_data,e=[],b=0,c=d.length;c>b;b++)a=d[b],a.selected?e.push(a.selected=!1):e.push(void 0);return e},AbstractChosen.prototype.results_toggle=function(){return this.results_showing?this.results_hide():this.results_show()},AbstractChosen.prototype.results_search=function(){return this.results_showing?this.winnow_results():this.results_show()},AbstractChosen.prototype.winnow_results=function(){var a,b,c,d,e,f,g,h,i,j,k,l;for(this.no_results_clear(),d=0,f=this.get_search_text(),a=f.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),i=new RegExp(a,"i"),c=this.get_search_regex(a),l=this.results_data,j=0,k=l.length;k>j;j++)b=l[j],b.search_match=!1,e=null,this.include_option_in_results(b)&&(b.group&&(b.group_match=!1,b.active_options=0),null!=b.group_array_index&&this.results_data[b.group_array_index]&&(e=this.results_data[b.group_array_index],0===e.active_options&&e.search_match&&(d+=1),e.active_options+=1),(!b.group||this.group_search)&&(b.search_text=b.group?b.label:b.text,b.search_match=this.search_string_match(b.search_text,c),b.search_match&&!b.group&&(d+=1),b.search_match?(f.length&&(g=b.search_text.search(i),h=b.search_text.substr(0,g+f.length)+""+b.search_text.substr(g+f.length),b.search_text=h.substr(0,g)+""+h.substr(g)),null!=e&&(e.group_match=!0)):null!=b.group_array_index&&this.results_data[b.group_array_index].search_match&&(b.search_match=!0)));return this.result_clear_highlight(),1>d&&f.length?(this.update_results_content(""),this.no_results(f)):(this.update_results_content(this.results_option_build()),this.winnow_results_set_highlight())},AbstractChosen.prototype.get_search_regex=function(a){var b;return b=this.search_contains?"":"^",new RegExp(b+a,"i")},AbstractChosen.prototype.search_string_match=function(a,b){var c,d,e,f;if(b.test(a))return!0;if(this.enable_split_word_search&&(a.indexOf(" ")>=0||0===a.indexOf("["))&&(d=a.replace(/\[|\]/g,"").split(" "),d.length))for(e=0,f=d.length;f>e;e++)if(c=d[e],b.test(c))return!0},AbstractChosen.prototype.choices_count=function(){var a,b,c,d;if(null!=this.selected_option_count)return this.selected_option_count;for(this.selected_option_count=0,d=this.form_field.options,b=0,c=d.length;c>b;b++)a=d[b],a.selected&&(this.selected_option_count+=1);return this.selected_option_count},AbstractChosen.prototype.choices_click=function(a){return a.preventDefault(),this.results_showing||this.is_disabled?void 0:this.results_show()},AbstractChosen.prototype.keyup_checker=function(a){var b,c;switch(b=null!=(c=a.which)?c:a.keyCode,this.search_field_scale(),b){case 8:if(this.is_multiple&&this.backstroke_length<1&&this.choices_count()>0)return this.keydown_backstroke();if(!this.pending_backstroke)return this.result_clear_highlight(),this.results_search();break;case 13:if(a.preventDefault(),this.results_showing)return this.result_select(a);break;case 27:return this.results_showing&&this.results_hide(),!0;case 9:case 38:case 40:case 16:case 91:case 17:break;default:return this.results_search()}},AbstractChosen.prototype.clipboard_event_checker=function(){var a=this;return setTimeout(function(){return a.results_search()},50)},AbstractChosen.prototype.container_width=function(){return null!=this.options.width?this.options.width:""+this.form_field.offsetWidth+"px"},AbstractChosen.prototype.include_option_in_results=function(a){return this.is_multiple&&!this.display_selected_options&&a.selected?!1:!this.display_disabled_options&&a.disabled?!1:a.empty?!1:!0},AbstractChosen.prototype.search_results_touchstart=function(a){return this.touch_started=!0,this.search_results_mouseover(a)},AbstractChosen.prototype.search_results_touchmove=function(a){return this.touch_started=!1,this.search_results_mouseout(a)},AbstractChosen.prototype.search_results_touchend=function(a){return this.touch_started?this.search_results_mouseup(a):void 0},AbstractChosen.prototype.outerHTML=function(a){var b;return a.outerHTML?a.outerHTML:(b=document.createElement("div"),b.appendChild(a),b.innerHTML)},AbstractChosen.browser_is_supported=function(){return"Microsoft Internet Explorer"===window.navigator.appName?document.documentMode>=8:/iP(od|hone)/i.test(window.navigator.userAgent)?!1:/Android/i.test(window.navigator.userAgent)&&/Mobile/i.test(window.navigator.userAgent)?!1:!0},AbstractChosen.default_multiple_text="Select Some Options",AbstractChosen.default_single_text="Select an Option",AbstractChosen.default_no_result_text="No results match",AbstractChosen}(),a=jQuery,a.fn.extend({chosen:function(b){return AbstractChosen.browser_is_supported()?this.each(function(){var c,d;c=a(this),d=c.data("chosen"),"destroy"===b&&d instanceof Chosen?d.destroy():d instanceof Chosen||c.data("chosen",new Chosen(this,b))}):this}}),Chosen=function(c){function Chosen(){return b=Chosen.__super__.constructor.apply(this,arguments)}return d(Chosen,c),Chosen.prototype.setup=function(){return this.form_field_jq=a(this.form_field),this.current_selectedIndex=this.form_field.selectedIndex,this.is_rtl=this.form_field_jq.hasClass("chosen-rtl")},Chosen.prototype.set_up_html=function(){var b,c;return b=["chosen-container"],b.push("chosen-container-"+(this.is_multiple?"multi":"single")),this.inherit_select_classes&&this.form_field.className&&b.push(this.form_field.className),this.is_rtl&&b.push("chosen-rtl"),c={"class":b.join(" "),style:"width: "+this.container_width()+";",title:this.form_field.title},this.form_field.id.length&&(c.id=this.form_field.id.replace(/[^\w]/g,"_")+"_chosen"),this.container=a("
    ",c),this.is_multiple?this.container.html('
      '):this.container.html(''+this.default_text+'
        '),this.form_field_jq.hide().after(this.container),this.dropdown=this.container.find("div.chosen-drop").first(),this.search_field=this.container.find("input").first(),this.search_results=this.container.find("ul.chosen-results").first(),this.search_field_scale(),this.search_no_results=this.container.find("li.no-results").first(),this.is_multiple?(this.search_choices=this.container.find("ul.chosen-choices").first(),this.search_container=this.container.find("li.search-field").first()):(this.search_container=this.container.find("div.chosen-search").first(),this.selected_item=this.container.find(".chosen-single").first()),this.results_build(),this.set_tab_index(),this.set_label_behavior()},Chosen.prototype.on_ready=function(){return this.form_field_jq.trigger("chosen:ready",{chosen:this})},Chosen.prototype.register_observers=function(){var a=this;return this.container.bind("touchstart.chosen",function(b){a.container_mousedown(b)}),this.container.bind("touchend.chosen",function(b){a.container_mouseup(b)}),this.container.bind("mousedown.chosen",function(b){a.container_mousedown(b)}),this.container.bind("mouseup.chosen",function(b){a.container_mouseup(b)}),this.container.bind("mouseenter.chosen",function(b){a.mouse_enter(b)}),this.container.bind("mouseleave.chosen",function(b){a.mouse_leave(b)}),this.search_results.bind("mouseup.chosen",function(b){a.search_results_mouseup(b)}),this.search_results.bind("mouseover.chosen",function(b){a.search_results_mouseover(b)}),this.search_results.bind("mouseout.chosen",function(b){a.search_results_mouseout(b)}),this.search_results.bind("mousewheel.chosen DOMMouseScroll.chosen",function(b){a.search_results_mousewheel(b)}),this.search_results.bind("touchstart.chosen",function(b){a.search_results_touchstart(b)}),this.search_results.bind("touchmove.chosen",function(b){a.search_results_touchmove(b)}),this.search_results.bind("touchend.chosen",function(b){a.search_results_touchend(b)}),this.form_field_jq.bind("chosen:updated.chosen",function(b){a.results_update_field(b)}),this.form_field_jq.bind("chosen:activate.chosen",function(b){a.activate_field(b)}),this.form_field_jq.bind("chosen:open.chosen",function(b){a.container_mousedown(b)}),this.form_field_jq.bind("chosen:close.chosen",function(b){a.input_blur(b)}),this.search_field.bind("blur.chosen",function(b){a.input_blur(b)}),this.search_field.bind("keyup.chosen",function(b){a.keyup_checker(b)}),this.search_field.bind("keydown.chosen",function(b){a.keydown_checker(b)}),this.search_field.bind("focus.chosen",function(b){a.input_focus(b)}),this.search_field.bind("cut.chosen",function(b){a.clipboard_event_checker(b)}),this.search_field.bind("paste.chosen",function(b){a.clipboard_event_checker(b)}),this.is_multiple?this.search_choices.bind("click.chosen",function(b){a.choices_click(b)}):this.container.bind("click.chosen",function(a){a.preventDefault()})},Chosen.prototype.destroy=function(){return a(this.container[0].ownerDocument).unbind("click.chosen",this.click_test_action),this.search_field[0].tabIndex&&(this.form_field_jq[0].tabIndex=this.search_field[0].tabIndex),this.container.remove(),this.form_field_jq.removeData("chosen"),this.form_field_jq.show()},Chosen.prototype.search_field_disabled=function(){return this.is_disabled=this.form_field_jq[0].disabled,this.is_disabled?(this.container.addClass("chosen-disabled"),this.search_field[0].disabled=!0,this.is_multiple||this.selected_item.unbind("focus.chosen",this.activate_action),this.close_field()):(this.container.removeClass("chosen-disabled"),this.search_field[0].disabled=!1,this.is_multiple?void 0:this.selected_item.bind("focus.chosen",this.activate_action))},Chosen.prototype.container_mousedown=function(b){return this.is_disabled||(b&&"mousedown"===b.type&&!this.results_showing&&b.preventDefault(),null!=b&&a(b.target).hasClass("search-choice-close"))?void 0:(this.active_field?this.is_multiple||!b||a(b.target)[0]!==this.selected_item[0]&&!a(b.target).parents("a.chosen-single").length||(b.preventDefault(),this.results_toggle()):(this.is_multiple&&this.search_field.val(""),a(this.container[0].ownerDocument).bind("click.chosen",this.click_test_action),this.results_show()),this.activate_field())},Chosen.prototype.container_mouseup=function(a){return"ABBR"!==a.target.nodeName||this.is_disabled?void 0:this.results_reset(a)},Chosen.prototype.search_results_mousewheel=function(a){var b;return a.originalEvent&&(b=a.originalEvent.deltaY||-a.originalEvent.wheelDelta||a.originalEvent.detail),null!=b?(a.preventDefault(),"DOMMouseScroll"===a.type&&(b=40*b),this.search_results.scrollTop(b+this.search_results.scrollTop())):void 0},Chosen.prototype.blur_test=function(){return!this.active_field&&this.container.hasClass("chosen-container-active")?this.close_field():void 0},Chosen.prototype.close_field=function(){return a(this.container[0].ownerDocument).unbind("click.chosen",this.click_test_action),this.active_field=!1,this.results_hide(),this.container.removeClass("chosen-container-active"),this.clear_backstroke(),this.show_search_field_default(),this.search_field_scale()},Chosen.prototype.activate_field=function(){return this.container.addClass("chosen-container-active"),this.active_field=!0,this.search_field.val(this.search_field.val()),this.search_field.focus()},Chosen.prototype.test_active_click=function(b){var c;return c=a(b.target).closest(".chosen-container"),c.length&&this.container[0]===c[0]?this.active_field=!0:this.close_field()},Chosen.prototype.results_build=function(){return this.parsing=!0,this.selected_option_count=null,this.results_data=SelectParser.select_to_array(this.form_field),this.is_multiple?this.search_choices.find("li.search-choice").remove():this.is_multiple||(this.single_set_selected_text(),this.disable_search||this.form_field.options.length<=this.disable_search_threshold?(this.search_field[0].readOnly=!0,this.container.addClass("chosen-container-single-nosearch")):(this.search_field[0].readOnly=!1,this.container.removeClass("chosen-container-single-nosearch"))),this.update_results_content(this.results_option_build({first:!0})),this.search_field_disabled(),this.show_search_field_default(),this.search_field_scale(),this.parsing=!1},Chosen.prototype.result_do_highlight=function(a){var b,c,d,e,f;if(a.length){if(this.result_clear_highlight(),this.result_highlight=a,this.result_highlight.addClass("highlighted"),d=parseInt(this.search_results.css("maxHeight"),10),f=this.search_results.scrollTop(),e=d+f,c=this.result_highlight.position().top+this.search_results.scrollTop(),b=c+this.result_highlight.outerHeight(),b>=e)return this.search_results.scrollTop(b-d>0?b-d:0);if(f>c)return this.search_results.scrollTop(c)}},Chosen.prototype.result_clear_highlight=function(){return this.result_highlight&&this.result_highlight.removeClass("highlighted"),this.result_highlight=null},Chosen.prototype.results_show=function(){return this.is_multiple&&this.max_selected_options<=this.choices_count()?(this.form_field_jq.trigger("chosen:maxselected",{chosen:this}),!1):(this.container.addClass("chosen-with-drop"),this.results_showing=!0,this.search_field.focus(),this.search_field.val(this.search_field.val()),this.winnow_results(),this.form_field_jq.trigger("chosen:showing_dropdown",{chosen:this}))},Chosen.prototype.update_results_content=function(a){return this.search_results.html(a)},Chosen.prototype.results_hide=function(){return this.results_showing&&(this.result_clear_highlight(),this.container.removeClass("chosen-with-drop"),this.form_field_jq.trigger("chosen:hiding_dropdown",{chosen:this})),this.results_showing=!1},Chosen.prototype.set_tab_index=function(){var a;return this.form_field.tabIndex?(a=this.form_field.tabIndex,this.form_field.tabIndex=-1,this.search_field[0].tabIndex=a):void 0},Chosen.prototype.set_label_behavior=function(){var b=this;return this.form_field_label=this.form_field_jq.parents("label"),!this.form_field_label.length&&this.form_field.id.length&&(this.form_field_label=a("label[for='"+this.form_field.id+"']")),this.form_field_label.length>0?this.form_field_label.bind("click.chosen",function(a){return b.is_multiple?b.container_mousedown(a):b.activate_field()}):void 0},Chosen.prototype.show_search_field_default=function(){return this.is_multiple&&this.choices_count()<1&&!this.active_field?(this.search_field.val(this.default_text),this.search_field.addClass("default")):(this.search_field.val(""),this.search_field.removeClass("default"))},Chosen.prototype.search_results_mouseup=function(b){var c;return c=a(b.target).hasClass("active-result")?a(b.target):a(b.target).parents(".active-result").first(),c.length?(this.result_highlight=c,this.result_select(b),this.search_field.focus()):void 0},Chosen.prototype.search_results_mouseover=function(b){var c;return c=a(b.target).hasClass("active-result")?a(b.target):a(b.target).parents(".active-result").first(),c?this.result_do_highlight(c):void 0},Chosen.prototype.search_results_mouseout=function(b){return a(b.target).hasClass("active-result")?this.result_clear_highlight():void 0},Chosen.prototype.choice_build=function(b){var c,d,e=this;return c=a("
      • ",{"class":"search-choice"}).html(""+b.html+""),b.disabled?c.addClass("search-choice-disabled"):(d=a("",{"class":"search-choice-close","data-option-array-index":b.array_index}),d.bind("click.chosen",function(a){return e.choice_destroy_link_click(a)}),c.append(d)),this.search_container.before(c)},Chosen.prototype.choice_destroy_link_click=function(b){return b.preventDefault(),b.stopPropagation(),this.is_disabled?void 0:this.choice_destroy(a(b.target))},Chosen.prototype.choice_destroy=function(a){return this.result_deselect(a[0].getAttribute("data-option-array-index"))?(this.show_search_field_default(),this.is_multiple&&this.choices_count()>0&&this.search_field.val().length<1&&this.results_hide(),a.parents("li").first().remove(),this.search_field_scale()):void 0},Chosen.prototype.results_reset=function(){return this.reset_single_select_options(),this.form_field.options[0].selected=!0,this.single_set_selected_text(),this.show_search_field_default(),this.results_reset_cleanup(),this.form_field_jq.trigger("change"),this.active_field?this.results_hide():void 0},Chosen.prototype.results_reset_cleanup=function(){return this.current_selectedIndex=this.form_field.selectedIndex,this.selected_item.find("abbr").remove()},Chosen.prototype.result_select=function(a){var b,c;return this.result_highlight?(b=this.result_highlight,this.result_clear_highlight(),this.is_multiple&&this.max_selected_options<=this.choices_count()?(this.form_field_jq.trigger("chosen:maxselected",{chosen:this}),!1):(this.is_multiple?b.removeClass("active-result"):this.reset_single_select_options(),c=this.results_data[b[0].getAttribute("data-option-array-index")],c.selected=!0,this.form_field.options[c.options_index].selected=!0,this.selected_option_count=null,this.is_multiple?this.choice_build(c):this.single_set_selected_text(c.text),(a.metaKey||a.ctrlKey)&&this.is_multiple||this.results_hide(),this.search_field.val(""),(this.is_multiple||this.form_field.selectedIndex!==this.current_selectedIndex)&&this.form_field_jq.trigger("change",{selected:this.form_field.options[c.options_index].value}),this.current_selectedIndex=this.form_field.selectedIndex,this.search_field_scale())):void 0},Chosen.prototype.single_set_selected_text=function(a){return null==a&&(a=this.default_text),a===this.default_text?this.selected_item.addClass("chosen-default"):(this.single_deselect_control_build(),this.selected_item.removeClass("chosen-default")),this.selected_item.find("span").text(a)},Chosen.prototype.result_deselect=function(a){var b;return b=this.results_data[a],this.form_field.options[b.options_index].disabled?!1:(b.selected=!1,this.form_field.options[b.options_index].selected=!1,this.selected_option_count=null,this.result_clear_highlight(),this.results_showing&&this.winnow_results(),this.form_field_jq.trigger("change",{deselected:this.form_field.options[b.options_index].value}),this.search_field_scale(),!0)},Chosen.prototype.single_deselect_control_build=function(){return this.allow_single_deselect?(this.selected_item.find("abbr").length||this.selected_item.find("span").first().after(''),this.selected_item.addClass("chosen-single-with-deselect")):void 0},Chosen.prototype.get_search_text=function(){return this.search_field.val()===this.default_text?"":a("
        ").text(a.trim(this.search_field.val())).html()},Chosen.prototype.winnow_results_set_highlight=function(){var a,b;return b=this.is_multiple?[]:this.search_results.find(".result-selected.active-result"),a=b.length?b.first():this.search_results.find(".active-result").first(),null!=a?this.result_do_highlight(a):void 0},Chosen.prototype.no_results=function(b){var c;return c=a('
      • '+this.results_none_found+' ""
        • '),c.find("span").first().html(b),this.search_results.append(c),this.form_field_jq.trigger("chosen:no_results",{chosen:this})},Chosen.prototype.no_results_clear=function(){return this.search_results.find(".no-results").remove()},Chosen.prototype.keydown_arrow=function(){var a;return this.results_showing&&this.result_highlight?(a=this.result_highlight.nextAll("li.active-result").first())?this.result_do_highlight(a):void 0:this.results_show()},Chosen.prototype.keyup_arrow=function(){var a;return this.results_showing||this.is_multiple?this.result_highlight?(a=this.result_highlight.prevAll("li.active-result"),a.length?this.result_do_highlight(a.first()):(this.choices_count()>0&&this.results_hide(),this.result_clear_highlight())):void 0:this.results_show()},Chosen.prototype.keydown_backstroke=function(){var a;return this.pending_backstroke?(this.choice_destroy(this.pending_backstroke.find("a").first()),this.clear_backstroke()):(a=this.search_container.siblings("li.search-choice").last(),a.length&&!a.hasClass("search-choice-disabled")?(this.pending_backstroke=a,this.single_backstroke_delete?this.keydown_backstroke():this.pending_backstroke.addClass("search-choice-focus")):void 0)},Chosen.prototype.clear_backstroke=function(){return this.pending_backstroke&&this.pending_backstroke.removeClass("search-choice-focus"),this.pending_backstroke=null},Chosen.prototype.keydown_checker=function(a){var b,c;switch(b=null!=(c=a.which)?c:a.keyCode,this.search_field_scale(),8!==b&&this.pending_backstroke&&this.clear_backstroke(),b){case 8:this.backstroke_length=this.search_field.val().length;break;case 9:this.results_showing&&!this.is_multiple&&this.result_select(a),this.mouse_on_container=!1;break;case 13:this.results_showing&&a.preventDefault();break;case 32:this.disable_search&&a.preventDefault();break;case 38:a.preventDefault(),this.keyup_arrow();break;case 40:a.preventDefault(),this.keydown_arrow()}},Chosen.prototype.search_field_scale=function(){var b,c,d,e,f,g,h,i,j;if(this.is_multiple){for(d=0,h=0,f="position:absolute; left: -1000px; top: -1000px; display:none;",g=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"],i=0,j=g.length;j>i;i++)e=g[i],f+=e+":"+this.search_field.css(e)+";";return b=a("
        ",{style:f}),b.text(this.search_field.val()),a("body").append(b),h=b.width()+25,b.remove(),c=this.container.outerWidth(),h>c-10&&(h=c-10),this.search_field.css({width:h+"px"})}},Chosen}(AbstractChosen)}.call(this); \ No newline at end of file +/* Chosen v1.4.2 | (c) 2011-2015 by Harvest | MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md */ +(function(){var a,AbstractChosen,Chosen,SelectParser,b,c={}.hasOwnProperty,d=function(a,b){function d(){this.constructor=a}for(var e in b)c.call(b,e)&&(a[e]=b[e]);return d.prototype=b.prototype,a.prototype=new d,a.__super__=b.prototype,a};SelectParser=function(){function SelectParser(){this.options_index=0,this.parsed=[]}return SelectParser.prototype.add_node=function(a){return"OPTGROUP"===a.nodeName.toUpperCase()?this.add_group(a):this.add_option(a)},SelectParser.prototype.add_group=function(a){var b,c,d,e,f,g;for(b=this.parsed.length,this.parsed.push({array_index:b,group:!0,label:this.escapeExpression(a.label),title:a.title?a.title:void 0,children:0,disabled:a.disabled,classes:a.className}),f=a.childNodes,g=[],d=0,e=f.length;e>d;d++)c=f[d],g.push(this.add_option(c,b,a.disabled));return g},SelectParser.prototype.add_option=function(a,b,c){return"OPTION"===a.nodeName.toUpperCase()?(""!==a.text?(null!=b&&(this.parsed[b].children+=1),this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,value:a.value,text:a.text,html:a.innerHTML,title:a.title?a.title:void 0,selected:a.selected,disabled:c===!0?c:a.disabled,group_array_index:b,group_label:null!=b?this.parsed[b].label:null,classes:a.className,style:a.style.cssText})):this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,empty:!0}),this.options_index+=1):void 0},SelectParser.prototype.escapeExpression=function(a){var b,c;return null==a||a===!1?"":/[\&\<\>\"\'\`]/.test(a)?(b={"<":"<",">":">",'"':""","'":"'","`":"`"},c=/&(?!\w+;)|[\<\>\"\'\`]/g,a.replace(c,function(a){return b[a]||"&"})):a},SelectParser}(),SelectParser.select_to_array=function(a){var b,c,d,e,f;for(c=new SelectParser,f=a.childNodes,d=0,e=f.length;e>d;d++)b=f[d],c.add_node(b);return c.parsed},AbstractChosen=function(){function AbstractChosen(a,b){this.form_field=a,this.options=null!=b?b:{},AbstractChosen.browser_is_supported()&&(this.is_multiple=this.form_field.multiple,this.set_default_text(),this.set_default_values(),this.setup(),this.set_up_html(),this.register_observers(),this.on_ready())}return AbstractChosen.prototype.set_default_values=function(){var a=this;return this.click_test_action=function(b){return a.test_active_click(b)},this.activate_action=function(b){return a.activate_field(b)},this.active_field=!1,this.mouse_on_container=!1,this.results_showing=!1,this.result_highlighted=null,this.allow_single_deselect=null!=this.options.allow_single_deselect&&null!=this.form_field.options[0]&&""===this.form_field.options[0].text?this.options.allow_single_deselect:!1,this.disable_search_threshold=this.options.disable_search_threshold||0,this.disable_search=this.options.disable_search||!1,this.enable_split_word_search=null!=this.options.enable_split_word_search?this.options.enable_split_word_search:!0,this.group_search=null!=this.options.group_search?this.options.group_search:!0,this.search_contains=this.options.search_contains||!1,this.single_backstroke_delete=null!=this.options.single_backstroke_delete?this.options.single_backstroke_delete:!0,this.max_selected_options=this.options.max_selected_options||1/0,this.inherit_select_classes=this.options.inherit_select_classes||!1,this.display_selected_options=null!=this.options.display_selected_options?this.options.display_selected_options:!0,this.display_disabled_options=null!=this.options.display_disabled_options?this.options.display_disabled_options:!0,this.include_group_label_in_selected=this.options.include_group_label_in_selected||!1},AbstractChosen.prototype.set_default_text=function(){return this.default_text=this.form_field.getAttribute("data-placeholder")?this.form_field.getAttribute("data-placeholder"):this.is_multiple?this.options.placeholder_text_multiple||this.options.placeholder_text||AbstractChosen.default_multiple_text:this.options.placeholder_text_single||this.options.placeholder_text||AbstractChosen.default_single_text,this.results_none_found=this.form_field.getAttribute("data-no_results_text")||this.options.no_results_text||AbstractChosen.default_no_result_text},AbstractChosen.prototype.choice_label=function(a){return this.include_group_label_in_selected&&null!=a.group_label?""+a.group_label+""+a.html:a.html},AbstractChosen.prototype.mouse_enter=function(){return this.mouse_on_container=!0},AbstractChosen.prototype.mouse_leave=function(){return this.mouse_on_container=!1},AbstractChosen.prototype.input_focus=function(){var a=this;if(this.is_multiple){if(!this.active_field)return setTimeout(function(){return a.container_mousedown()},50)}else if(!this.active_field)return this.activate_field()},AbstractChosen.prototype.input_blur=function(){var a=this;return this.mouse_on_container?void 0:(this.active_field=!1,setTimeout(function(){return a.blur_test()},100))},AbstractChosen.prototype.results_option_build=function(a){var b,c,d,e,f;for(b="",f=this.results_data,d=0,e=f.length;e>d;d++)c=f[d],b+=c.group?this.result_add_group(c):this.result_add_option(c),(null!=a?a.first:void 0)&&(c.selected&&this.is_multiple?this.choice_build(c):c.selected&&!this.is_multiple&&this.single_set_selected_text(this.choice_label(c)));return b},AbstractChosen.prototype.result_add_option=function(a){var b,c;return a.search_match?this.include_option_in_results(a)?(b=[],a.disabled||a.selected&&this.is_multiple||b.push("active-result"),!a.disabled||a.selected&&this.is_multiple||b.push("disabled-result"),a.selected&&b.push("result-selected"),null!=a.group_array_index&&b.push("group-option"),""!==a.classes&&b.push(a.classes),c=document.createElement("li"),c.className=b.join(" "),c.style.cssText=a.style,c.setAttribute("data-option-array-index",a.array_index),c.innerHTML=a.search_text,a.title&&(c.title=a.title),this.outerHTML(c)):"":""},AbstractChosen.prototype.result_add_group=function(a){var b,c;return a.search_match||a.group_match?a.active_options>0?(b=[],b.push("group-result"),a.classes&&b.push(a.classes),c=document.createElement("li"),c.className=b.join(" "),c.innerHTML=a.search_text,a.title&&(c.title=a.title),this.outerHTML(c)):"":""},AbstractChosen.prototype.results_update_field=function(){return this.set_default_text(),this.is_multiple||this.results_reset_cleanup(),this.result_clear_highlight(),this.results_build(),this.results_showing?this.winnow_results():void 0},AbstractChosen.prototype.reset_single_select_options=function(){var a,b,c,d,e;for(d=this.results_data,e=[],b=0,c=d.length;c>b;b++)a=d[b],a.selected?e.push(a.selected=!1):e.push(void 0);return e},AbstractChosen.prototype.results_toggle=function(){return this.results_showing?this.results_hide():this.results_show()},AbstractChosen.prototype.results_search=function(){return this.results_showing?this.winnow_results():this.results_show()},AbstractChosen.prototype.winnow_results=function(){var a,b,c,d,e,f,g,h,i,j,k,l;for(this.no_results_clear(),d=0,f=this.get_search_text(),a=f.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),i=new RegExp(a,"i"),c=this.get_search_regex(a),l=this.results_data,j=0,k=l.length;k>j;j++)b=l[j],b.search_match=!1,e=null,this.include_option_in_results(b)&&(b.group&&(b.group_match=!1,b.active_options=0),null!=b.group_array_index&&this.results_data[b.group_array_index]&&(e=this.results_data[b.group_array_index],0===e.active_options&&e.search_match&&(d+=1),e.active_options+=1),b.search_text=b.group?b.label:b.html,(!b.group||this.group_search)&&(b.search_match=this.search_string_match(b.search_text,c),b.search_match&&!b.group&&(d+=1),b.search_match?(f.length&&(g=b.search_text.search(i),h=b.search_text.substr(0,g+f.length)+""+b.search_text.substr(g+f.length),b.search_text=h.substr(0,g)+""+h.substr(g)),null!=e&&(e.group_match=!0)):null!=b.group_array_index&&this.results_data[b.group_array_index].search_match&&(b.search_match=!0)));return this.result_clear_highlight(),1>d&&f.length?(this.update_results_content(""),this.no_results(f)):(this.update_results_content(this.results_option_build()),this.winnow_results_set_highlight())},AbstractChosen.prototype.get_search_regex=function(a){var b;return b=this.search_contains?"":"^",new RegExp(b+a,"i")},AbstractChosen.prototype.search_string_match=function(a,b){var c,d,e,f;if(b.test(a))return!0;if(this.enable_split_word_search&&(a.indexOf(" ")>=0||0===a.indexOf("["))&&(d=a.replace(/\[|\]/g,"").split(" "),d.length))for(e=0,f=d.length;f>e;e++)if(c=d[e],b.test(c))return!0},AbstractChosen.prototype.choices_count=function(){var a,b,c,d;if(null!=this.selected_option_count)return this.selected_option_count;for(this.selected_option_count=0,d=this.form_field.options,b=0,c=d.length;c>b;b++)a=d[b],a.selected&&(this.selected_option_count+=1);return this.selected_option_count},AbstractChosen.prototype.choices_click=function(a){return a.preventDefault(),this.results_showing||this.is_disabled?void 0:this.results_show()},AbstractChosen.prototype.keyup_checker=function(a){var b,c;switch(b=null!=(c=a.which)?c:a.keyCode,this.search_field_scale(),b){case 8:if(this.is_multiple&&this.backstroke_length<1&&this.choices_count()>0)return this.keydown_backstroke();if(!this.pending_backstroke)return this.result_clear_highlight(),this.results_search();break;case 13:if(a.preventDefault(),this.results_showing)return this.result_select(a);break;case 27:return this.results_showing&&this.results_hide(),!0;case 9:case 38:case 40:case 16:case 91:case 17:break;default:return this.results_search()}},AbstractChosen.prototype.clipboard_event_checker=function(){var a=this;return setTimeout(function(){return a.results_search()},50)},AbstractChosen.prototype.container_width=function(){return null!=this.options.width?this.options.width:""+this.form_field.offsetWidth+"px"},AbstractChosen.prototype.include_option_in_results=function(a){return this.is_multiple&&!this.display_selected_options&&a.selected?!1:!this.display_disabled_options&&a.disabled?!1:a.empty?!1:!0},AbstractChosen.prototype.search_results_touchstart=function(a){return this.touch_started=!0,this.search_results_mouseover(a)},AbstractChosen.prototype.search_results_touchmove=function(a){return this.touch_started=!1,this.search_results_mouseout(a)},AbstractChosen.prototype.search_results_touchend=function(a){return this.touch_started?this.search_results_mouseup(a):void 0},AbstractChosen.prototype.outerHTML=function(a){var b;return a.outerHTML?a.outerHTML:(b=document.createElement("div"),b.appendChild(a),b.innerHTML)},AbstractChosen.browser_is_supported=function(){return"Microsoft Internet Explorer"===window.navigator.appName?document.documentMode>=8:/iP(od|hone)/i.test(window.navigator.userAgent)?!1:/Android/i.test(window.navigator.userAgent)&&/Mobile/i.test(window.navigator.userAgent)?!1:!0},AbstractChosen.default_multiple_text="Select Some Options",AbstractChosen.default_single_text="Select an Option",AbstractChosen.default_no_result_text="No results match",AbstractChosen}(),a=jQuery,a.fn.extend({chosen:function(b){return AbstractChosen.browser_is_supported()?this.each(function(){var c,d;c=a(this),d=c.data("chosen"),"destroy"===b&&d instanceof Chosen?d.destroy():d instanceof Chosen||c.data("chosen",new Chosen(this,b))}):this}}),Chosen=function(c){function Chosen(){return b=Chosen.__super__.constructor.apply(this,arguments)}return d(Chosen,c),Chosen.prototype.setup=function(){return this.form_field_jq=a(this.form_field),this.current_selectedIndex=this.form_field.selectedIndex,this.is_rtl=this.form_field_jq.hasClass("chosen-rtl")},Chosen.prototype.set_up_html=function(){var b,c;return b=["chosen-container"],b.push("chosen-container-"+(this.is_multiple?"multi":"single")),this.inherit_select_classes&&this.form_field.className&&b.push(this.form_field.className),this.is_rtl&&b.push("chosen-rtl"),c={"class":b.join(" "),style:"width: "+this.container_width()+";",title:this.form_field.title},this.form_field.id.length&&(c.id=this.form_field.id.replace(/[^\w]/g,"_")+"_chosen"),this.container=a("
        ",c),this.is_multiple?this.container.html('
          '):this.container.html('          '+this.default_text+'
            '),this.form_field_jq.hide().after(this.container),this.dropdown=this.container.find("div.chosen-drop").first(),this.search_field=this.container.find("input").first(),this.search_results=this.container.find("ul.chosen-results").first(),this.search_field_scale(),this.search_no_results=this.container.find("li.no-results").first(),this.is_multiple?(this.search_choices=this.container.find("ul.chosen-choices").first(),this.search_container=this.container.find("li.search-field").first()):(this.search_container=this.container.find("div.chosen-search").first(),this.selected_item=this.container.find(".chosen-single").first()),this.results_build(),this.set_tab_index(),this.set_label_behavior()},Chosen.prototype.on_ready=function(){return this.form_field_jq.trigger("chosen:ready",{chosen:this})},Chosen.prototype.register_observers=function(){var a=this;return this.container.bind("touchstart.chosen",function(b){return a.container_mousedown(b),b.preventDefault()}),this.container.bind("touchend.chosen",function(b){return a.container_mouseup(b),b.preventDefault()}),this.container.bind("mousedown.chosen",function(b){a.container_mousedown(b)}),this.container.bind("mouseup.chosen",function(b){a.container_mouseup(b)}),this.container.bind("mouseenter.chosen",function(b){a.mouse_enter(b)}),this.container.bind("mouseleave.chosen",function(b){a.mouse_leave(b)}),this.search_results.bind("mouseup.chosen",function(b){a.search_results_mouseup(b)}),this.search_results.bind("mouseover.chosen",function(b){a.search_results_mouseover(b)}),this.search_results.bind("mouseout.chosen",function(b){a.search_results_mouseout(b)}),this.search_results.bind("mousewheel.chosen DOMMouseScroll.chosen",function(b){a.search_results_mousewheel(b)}),this.search_results.bind("touchstart.chosen",function(b){a.search_results_touchstart(b)}),this.search_results.bind("touchmove.chosen",function(b){a.search_results_touchmove(b)}),this.search_results.bind("touchend.chosen",function(b){a.search_results_touchend(b)}),this.form_field_jq.bind("chosen:updated.chosen",function(b){a.results_update_field(b)}),this.form_field_jq.bind("chosen:activate.chosen",function(b){a.activate_field(b)}),this.form_field_jq.bind("chosen:open.chosen",function(b){a.container_mousedown(b)}),this.form_field_jq.bind("chosen:close.chosen",function(b){a.input_blur(b)}),this.search_field.bind("blur.chosen",function(b){a.input_blur(b)}),this.search_field.bind("keyup.chosen",function(b){a.keyup_checker(b)}),this.search_field.bind("keydown.chosen",function(b){a.keydown_checker(b)}),this.search_field.bind("focus.chosen",function(b){a.input_focus(b)}),this.search_field.bind("cut.chosen",function(b){a.clipboard_event_checker(b)}),this.search_field.bind("paste.chosen",function(b){a.clipboard_event_checker(b)}),this.is_multiple?this.search_choices.bind("click.chosen",function(b){a.choices_click(b)}):this.container.bind("click.chosen",function(a){a.preventDefault()})},Chosen.prototype.destroy=function(){return a(this.container[0].ownerDocument).unbind("click.chosen",this.click_test_action),this.search_field[0].tabIndex&&(this.form_field_jq[0].tabIndex=this.search_field[0].tabIndex),this.container.remove(),this.form_field_jq.removeData("chosen"),this.form_field_jq.show()},Chosen.prototype.search_field_disabled=function(){return this.is_disabled=this.form_field_jq[0].disabled,this.is_disabled?(this.container.addClass("chosen-disabled"),this.search_field[0].disabled=!0,this.is_multiple||this.selected_item.unbind("focus.chosen",this.activate_action),this.close_field()):(this.container.removeClass("chosen-disabled"),this.search_field[0].disabled=!1,this.is_multiple?void 0:this.selected_item.bind("focus.chosen",this.activate_action))},Chosen.prototype.container_mousedown=function(b){return this.is_disabled||(b&&"mousedown"===b.type&&!this.results_showing&&b.preventDefault(),null!=b&&a(b.target).hasClass("search-choice-close"))?void 0:(this.active_field?this.is_multiple||!b||a(b.target)[0]!==this.selected_item[0]&&!a(b.target).parents("a.chosen-single").length||(b.preventDefault(),this.results_toggle()):(this.is_multiple&&this.search_field.val(""),a(this.container[0].ownerDocument).bind("click.chosen",this.click_test_action),this.results_show()),this.activate_field())},Chosen.prototype.container_mouseup=function(a){return"ABBR"!==a.target.nodeName||this.is_disabled?void 0:this.results_reset(a)},Chosen.prototype.search_results_mousewheel=function(a){var b;return a.originalEvent&&(b=a.originalEvent.deltaY||-a.originalEvent.wheelDelta||a.originalEvent.detail),null!=b?(a.preventDefault(),"DOMMouseScroll"===a.type&&(b=40*b),this.search_results.scrollTop(b+this.search_results.scrollTop())):void 0},Chosen.prototype.blur_test=function(){return!this.active_field&&this.container.hasClass("chosen-container-active")?this.close_field():void 0},Chosen.prototype.close_field=function(){return a(this.container[0].ownerDocument).unbind("click.chosen",this.click_test_action),this.active_field=!1,this.results_hide(),this.container.removeClass("chosen-container-active"),this.clear_backstroke(),this.show_search_field_default(),this.search_field_scale()},Chosen.prototype.activate_field=function(){return this.container.addClass("chosen-container-active"),this.active_field=!0,this.search_field.val(this.search_field.val()),this.search_field.focus()},Chosen.prototype.test_active_click=function(b){var c;return c=a(b.target).closest(".chosen-container"),c.length&&this.container[0]===c[0]?this.active_field=!0:this.close_field()},Chosen.prototype.results_build=function(){return this.parsing=!0,this.selected_option_count=null,this.results_data=SelectParser.select_to_array(this.form_field),this.is_multiple?this.search_choices.find("li.search-choice").remove():this.is_multiple||(this.single_set_selected_text(),this.disable_search||this.form_field.options.length<=this.disable_search_threshold?(this.search_field[0].readOnly=!0,this.container.addClass("chosen-container-single-nosearch")):(this.search_field[0].readOnly=!1,this.container.removeClass("chosen-container-single-nosearch"))),this.update_results_content(this.results_option_build({first:!0})),this.search_field_disabled(),this.show_search_field_default(),this.search_field_scale(),this.parsing=!1},Chosen.prototype.result_do_highlight=function(a){var b,c,d,e,f;if(a.length){if(this.result_clear_highlight(),this.result_highlight=a,this.result_highlight.addClass("highlighted"),d=parseInt(this.search_results.css("maxHeight"),10),f=this.search_results.scrollTop(),e=d+f,c=this.result_highlight.position().top+this.search_results.scrollTop(),b=c+this.result_highlight.outerHeight(),b>=e)return this.search_results.scrollTop(b-d>0?b-d:0);if(f>c)return this.search_results.scrollTop(c)}},Chosen.prototype.result_clear_highlight=function(){return this.result_highlight&&this.result_highlight.removeClass("highlighted"),this.result_highlight=null},Chosen.prototype.results_show=function(){return this.is_multiple&&this.max_selected_options<=this.choices_count()?(this.form_field_jq.trigger("chosen:maxselected",{chosen:this}),!1):(this.container.addClass("chosen-with-drop"),this.results_showing=!0,this.search_field.focus(),this.search_field.val(this.search_field.val()),this.winnow_results(),this.form_field_jq.trigger("chosen:showing_dropdown",{chosen:this}))},Chosen.prototype.update_results_content=function(a){return this.search_results.html(a)},Chosen.prototype.results_hide=function(){return this.results_showing&&(this.result_clear_highlight(),this.container.removeClass("chosen-with-drop"),this.form_field_jq.trigger("chosen:hiding_dropdown",{chosen:this})),this.results_showing=!1},Chosen.prototype.set_tab_index=function(){var a;return this.form_field.tabIndex?(a=this.form_field.tabIndex,this.form_field.tabIndex=-1,this.search_field[0].tabIndex=a):void 0},Chosen.prototype.set_label_behavior=function(){var b=this;return this.form_field_label=this.form_field_jq.parents("label"),!this.form_field_label.length&&this.form_field.id.length&&(this.form_field_label=a("label[for='"+this.form_field.id+"']")),this.form_field_label.length>0?this.form_field_label.bind("click.chosen",function(a){return b.is_multiple?b.container_mousedown(a):b.activate_field()}):void 0},Chosen.prototype.show_search_field_default=function(){return this.is_multiple&&this.choices_count()<1&&!this.active_field?(this.search_field.val(this.default_text),this.search_field.addClass("default")):(this.search_field.val(""),this.search_field.removeClass("default"))},Chosen.prototype.search_results_mouseup=function(b){var c;return c=a(b.target).hasClass("active-result")?a(b.target):a(b.target).parents(".active-result").first(),c.length?(this.result_highlight=c,this.result_select(b),this.search_field.focus()):void 0},Chosen.prototype.search_results_mouseover=function(b){var c;return c=a(b.target).hasClass("active-result")?a(b.target):a(b.target).parents(".active-result").first(),c?this.result_do_highlight(c):void 0},Chosen.prototype.search_results_mouseout=function(b){return a(b.target).hasClass("active-result")?this.result_clear_highlight():void 0},Chosen.prototype.choice_build=function(b){var c,d,e=this;return c=a("
          • ",{"class":"search-choice"}).html(""+this.choice_label(b)+""),b.disabled?c.addClass("search-choice-disabled"):(d=a("",{"class":"search-choice-close","data-option-array-index":b.array_index}),d.bind("click.chosen",function(a){return e.choice_destroy_link_click(a)}),c.append(d)),this.search_container.before(c)},Chosen.prototype.choice_destroy_link_click=function(b){return b.preventDefault(),b.stopPropagation(),this.is_disabled?void 0:this.choice_destroy(a(b.target))},Chosen.prototype.choice_destroy=function(a){return this.result_deselect(a[0].getAttribute("data-option-array-index"))?(this.show_search_field_default(),this.is_multiple&&this.choices_count()>0&&this.search_field.val().length<1&&this.results_hide(),a.parents("li").first().remove(),this.search_field_scale()):void 0},Chosen.prototype.results_reset=function(){return this.reset_single_select_options(),this.form_field.options[0].selected=!0,this.single_set_selected_text(),this.show_search_field_default(),this.results_reset_cleanup(),this.form_field_jq.trigger("change"),this.active_field?this.results_hide():void 0},Chosen.prototype.results_reset_cleanup=function(){return this.current_selectedIndex=this.form_field.selectedIndex,this.selected_item.find("abbr").remove()},Chosen.prototype.result_select=function(a){var b,c;return this.result_highlight?(b=this.result_highlight,this.result_clear_highlight(),this.is_multiple&&this.max_selected_options<=this.choices_count()?(this.form_field_jq.trigger("chosen:maxselected",{chosen:this}),!1):(this.is_multiple?b.removeClass("active-result"):this.reset_single_select_options(),b.addClass("result-selected"),c=this.results_data[b[0].getAttribute("data-option-array-index")],c.selected=!0,this.form_field.options[c.options_index].selected=!0,this.selected_option_count=null,this.is_multiple?this.choice_build(c):this.single_set_selected_text(this.choice_label(c)),(a.metaKey||a.ctrlKey)&&this.is_multiple||this.results_hide(),this.search_field.val(""),(this.is_multiple||this.form_field.selectedIndex!==this.current_selectedIndex)&&this.form_field_jq.trigger("change",{selected:this.form_field.options[c.options_index].value}),this.current_selectedIndex=this.form_field.selectedIndex,a.preventDefault(),this.search_field_scale())):void 0},Chosen.prototype.single_set_selected_text=function(a){return null==a&&(a=this.default_text),a===this.default_text?this.selected_item.addClass("chosen-default"):(this.single_deselect_control_build(),this.selected_item.removeClass("chosen-default")),this.selected_item.find("span").html(a)},Chosen.prototype.result_deselect=function(a){var b;return b=this.results_data[a],this.form_field.options[b.options_index].disabled?!1:(b.selected=!1,this.form_field.options[b.options_index].selected=!1,this.selected_option_count=null,this.result_clear_highlight(),this.results_showing&&this.winnow_results(),this.form_field_jq.trigger("change",{deselected:this.form_field.options[b.options_index].value}),this.search_field_scale(),!0)},Chosen.prototype.single_deselect_control_build=function(){return this.allow_single_deselect?(this.selected_item.find("abbr").length||this.selected_item.find("span").first().after(''),this.selected_item.addClass("chosen-single-with-deselect")):void 0},Chosen.prototype.get_search_text=function(){return a("
            ").text(a.trim(this.search_field.val())).html()},Chosen.prototype.winnow_results_set_highlight=function(){var a,b;return b=this.is_multiple?[]:this.search_results.find(".result-selected.active-result"),a=b.length?b.first():this.search_results.find(".active-result").first(),null!=a?this.result_do_highlight(a):void 0},Chosen.prototype.no_results=function(b){var c;return c=a('
          • '+this.results_none_found+' ""
            • '),c.find("span").first().html(b),this.search_results.append(c),this.form_field_jq.trigger("chosen:no_results",{chosen:this})},Chosen.prototype.no_results_clear=function(){return this.search_results.find(".no-results").remove()},Chosen.prototype.keydown_arrow=function(){var a;return this.results_showing&&this.result_highlight?(a=this.result_highlight.nextAll("li.active-result").first())?this.result_do_highlight(a):void 0:this.results_show()},Chosen.prototype.keyup_arrow=function(){var a;return this.results_showing||this.is_multiple?this.result_highlight?(a=this.result_highlight.prevAll("li.active-result"),a.length?this.result_do_highlight(a.first()):(this.choices_count()>0&&this.results_hide(),this.result_clear_highlight())):void 0:this.results_show()},Chosen.prototype.keydown_backstroke=function(){var a;return this.pending_backstroke?(this.choice_destroy(this.pending_backstroke.find("a").first()),this.clear_backstroke()):(a=this.search_container.siblings("li.search-choice").last(),a.length&&!a.hasClass("search-choice-disabled")?(this.pending_backstroke=a,this.single_backstroke_delete?this.keydown_backstroke():this.pending_backstroke.addClass("search-choice-focus")):void 0)},Chosen.prototype.clear_backstroke=function(){return this.pending_backstroke&&this.pending_backstroke.removeClass("search-choice-focus"),this.pending_backstroke=null},Chosen.prototype.keydown_checker=function(a){var b,c;switch(b=null!=(c=a.which)?c:a.keyCode,this.search_field_scale(),8!==b&&this.pending_backstroke&&this.clear_backstroke(),b){case 8:this.backstroke_length=this.search_field.val().length;break;case 9:this.results_showing&&!this.is_multiple&&this.result_select(a),this.mouse_on_container=!1;break;case 13:this.results_showing&&a.preventDefault();break;case 32:this.disable_search&&a.preventDefault();break;case 38:a.preventDefault(),this.keyup_arrow();break;case 40:a.preventDefault(),this.keydown_arrow()}},Chosen.prototype.search_field_scale=function(){var b,c,d,e,f,g,h,i,j;if(this.is_multiple){for(d=0,h=0,f="position:absolute; left: -1000px; top: -1000px; display:none;",g=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"],i=0,j=g.length;j>i;i++)e=g[i],f+=e+":"+this.search_field.css(e)+";";return b=a("
            ",{style:f}),b.text(this.search_field.val()),a("body").append(b),h=b.width()+25,b.remove(),c=this.container.outerWidth(),h>c-10&&(h=c-10),this.search_field.css({width:h+"px"})}},Chosen}(AbstractChosen)}).call(this); \ No newline at end of file diff --git a/styles/bootstrap/chosen/js/chosen.proto.js b/styles/bootstrap/chosen/js/chosen.proto.js index b394f7ba7..aabf08693 100644 --- a/styles/bootstrap/chosen/js/chosen.proto.js +++ b/styles/bootstrap/chosen/js/chosen.proto.js @@ -2,9 +2,9 @@ Chosen, a Select Box Enhancer for jQuery and Prototype by Patrick Filler for Harvest, http://getharvest.com -Version 1.3.0 +Version 1.4.2 Full source at https://github.com/harvesthq/chosen -Copyright (c) 2011-2014 Harvest http://getharvest.com +Copyright (c) 2011-2015 Harvest http://getharvest.com MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md This file is generated by `grunt build`, do not edit it by hand. @@ -36,6 +36,7 @@ This file is generated by `grunt build`, do not edit it by hand. array_index: group_position, group: true, label: this.escapeExpression(group.label), + title: group.title ? group.title : void 0, children: 0, disabled: group.disabled, classes: group.className @@ -61,9 +62,11 @@ This file is generated by `grunt build`, do not edit it by hand. value: option.value, text: option.text, html: option.innerHTML, + title: option.title ? option.title : void 0, selected: option.selected, disabled: group_disabled === true ? group_disabled : option.disabled, group_array_index: group_position, + group_label: group_position != null ? this.parsed[group_position].label : null, classes: option.className, style: option.style.cssText }); @@ -152,7 +155,8 @@ This file is generated by `grunt build`, do not edit it by hand. this.max_selected_options = this.options.max_selected_options || Infinity; this.inherit_select_classes = this.options.inherit_select_classes || false; this.display_selected_options = this.options.display_selected_options != null ? this.options.display_selected_options : true; - return this.display_disabled_options = this.options.display_disabled_options != null ? this.options.display_disabled_options : true; + this.display_disabled_options = this.options.display_disabled_options != null ? this.options.display_disabled_options : true; + return this.include_group_label_in_selected = this.options.include_group_label_in_selected || false; }; AbstractChosen.prototype.set_default_text = function() { @@ -166,6 +170,14 @@ This file is generated by `grunt build`, do not edit it by hand. return this.results_none_found = this.form_field.getAttribute("data-no_results_text") || this.options.no_results_text || AbstractChosen.default_no_result_text; }; + AbstractChosen.prototype.choice_label = function(item) { + if (this.include_group_label_in_selected && (item.group_label != null)) { + return "" + item.group_label + "" + item.html; + } else { + return item.html; + } + }; + AbstractChosen.prototype.mouse_enter = function() { return this.mouse_on_container = true; }; @@ -214,7 +226,7 @@ This file is generated by `grunt build`, do not edit it by hand. if (data.selected && this.is_multiple) { this.choice_build(data); } else if (data.selected && !this.is_multiple) { - this.single_set_selected_text(data.text); + this.single_set_selected_text(this.choice_label(data)); } } } @@ -250,6 +262,9 @@ This file is generated by `grunt build`, do not edit it by hand. option_el.style.cssText = option.style; option_el.setAttribute("data-option-array-index", option.array_index); option_el.innerHTML = option.search_text; + if (option.title) { + option_el.title = option.title; + } return this.outerHTML(option_el); }; @@ -269,6 +284,9 @@ This file is generated by `grunt build`, do not edit it by hand. group_el = document.createElement("li"); group_el.className = classes.join(" "); group_el.innerHTML = group.search_text; + if (group.title) { + group_el.title = group.title; + } return this.outerHTML(group_el); }; @@ -340,8 +358,8 @@ This file is generated by `grunt build`, do not edit it by hand. } results_group.active_options += 1; } + option.search_text = option.group ? option.label : option.html; if (!(option.group && !this.group_search)) { - option.search_text = option.group ? option.label : option.text; option.search_match = this.search_string_match(option.search_text, regex); if (option.search_match && !option.group) { results += 1; @@ -604,10 +622,12 @@ This file is generated by `grunt build`, do not edit it by hand. Chosen.prototype.register_observers = function() { var _this = this; this.container.observe("touchstart", function(evt) { - return _this.container_mousedown(evt); + _this.container_mousedown(evt); + return evt.preventDefault(); }); this.container.observe("touchend", function(evt) { - return _this.container_mouseup(evt); + _this.container_mouseup(evt); + return evt.preventDefault(); }); this.container.observe("mousedown", function(evt) { return _this.container_mousedown(evt); @@ -943,7 +963,7 @@ This file is generated by `grunt build`, do not edit it by hand. _this = this; choice = new Element('li', { "class": "search-choice" - }).update("" + item.html + ""); + }).update("" + (this.choice_label(item)) + ""); if (item.disabled) { choice.addClassName('search-choice-disabled'); } else { @@ -1028,7 +1048,7 @@ This file is generated by `grunt build`, do not edit it by hand. if (this.is_multiple) { this.choice_build(item); } else { - this.single_set_selected_text(item.text); + this.single_set_selected_text(this.choice_label(item)); } if (!((evt.metaKey || evt.ctrlKey) && this.is_multiple)) { this.results_hide(); @@ -1038,6 +1058,7 @@ This file is generated by `grunt build`, do not edit it by hand. this.form_field.simulate("change"); } this.current_selectedIndex = this.form_field.selectedIndex; + evt.preventDefault(); return this.search_field_scale(); } }; @@ -1089,11 +1110,7 @@ This file is generated by `grunt build`, do not edit it by hand. }; Chosen.prototype.get_search_text = function() { - if (this.search_field.value === this.default_text) { - return ""; - } else { - return this.search_field.value.strip().escapeHTML(); - } + return this.search_field.value.strip().escapeHTML(); }; Chosen.prototype.winnow_results_set_highlight = function() { diff --git a/styles/bootstrap/chosen/js/chosen.proto.min.js b/styles/bootstrap/chosen/js/chosen.proto.min.js index 316c59461..581b30932 100644 --- a/styles/bootstrap/chosen/js/chosen.proto.min.js +++ b/styles/bootstrap/chosen/js/chosen.proto.min.js @@ -1,2 +1,2 @@ -/* Chosen v1.3.0 | (c) 2011-2014 by Harvest | MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md */ -!function(){var AbstractChosen,SelectParser,a,b={}.hasOwnProperty,c=function(a,c){function d(){this.constructor=a}for(var e in c)b.call(c,e)&&(a[e]=c[e]);return d.prototype=c.prototype,a.prototype=new d,a.__super__=c.prototype,a};SelectParser=function(){function SelectParser(){this.options_index=0,this.parsed=[]}return SelectParser.prototype.add_node=function(a){return"OPTGROUP"===a.nodeName.toUpperCase()?this.add_group(a):this.add_option(a)},SelectParser.prototype.add_group=function(a){var b,c,d,e,f,g;for(b=this.parsed.length,this.parsed.push({array_index:b,group:!0,label:this.escapeExpression(a.label),children:0,disabled:a.disabled,classes:a.className}),f=a.childNodes,g=[],d=0,e=f.length;e>d;d++)c=f[d],g.push(this.add_option(c,b,a.disabled));return g},SelectParser.prototype.add_option=function(a,b,c){return"OPTION"===a.nodeName.toUpperCase()?(""!==a.text?(null!=b&&(this.parsed[b].children+=1),this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,value:a.value,text:a.text,html:a.innerHTML,selected:a.selected,disabled:c===!0?c:a.disabled,group_array_index:b,classes:a.className,style:a.style.cssText})):this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,empty:!0}),this.options_index+=1):void 0},SelectParser.prototype.escapeExpression=function(a){var b,c;return null==a||a===!1?"":/[\&\<\>\"\'\`]/.test(a)?(b={"<":"<",">":">",'"':""","'":"'","`":"`"},c=/&(?!\w+;)|[\<\>\"\'\`]/g,a.replace(c,function(a){return b[a]||"&"})):a},SelectParser}(),SelectParser.select_to_array=function(a){var b,c,d,e,f;for(c=new SelectParser,f=a.childNodes,d=0,e=f.length;e>d;d++)b=f[d],c.add_node(b);return c.parsed},AbstractChosen=function(){function AbstractChosen(a,b){this.form_field=a,this.options=null!=b?b:{},AbstractChosen.browser_is_supported()&&(this.is_multiple=this.form_field.multiple,this.set_default_text(),this.set_default_values(),this.setup(),this.set_up_html(),this.register_observers(),this.on_ready())}return AbstractChosen.prototype.set_default_values=function(){var a=this;return this.click_test_action=function(b){return a.test_active_click(b)},this.activate_action=function(b){return a.activate_field(b)},this.active_field=!1,this.mouse_on_container=!1,this.results_showing=!1,this.result_highlighted=null,this.allow_single_deselect=null!=this.options.allow_single_deselect&&null!=this.form_field.options[0]&&""===this.form_field.options[0].text?this.options.allow_single_deselect:!1,this.disable_search_threshold=this.options.disable_search_threshold||0,this.disable_search=this.options.disable_search||!1,this.enable_split_word_search=null!=this.options.enable_split_word_search?this.options.enable_split_word_search:!0,this.group_search=null!=this.options.group_search?this.options.group_search:!0,this.search_contains=this.options.search_contains||!1,this.single_backstroke_delete=null!=this.options.single_backstroke_delete?this.options.single_backstroke_delete:!0,this.max_selected_options=this.options.max_selected_options||1/0,this.inherit_select_classes=this.options.inherit_select_classes||!1,this.display_selected_options=null!=this.options.display_selected_options?this.options.display_selected_options:!0,this.display_disabled_options=null!=this.options.display_disabled_options?this.options.display_disabled_options:!0},AbstractChosen.prototype.set_default_text=function(){return this.default_text=this.form_field.getAttribute("data-placeholder")?this.form_field.getAttribute("data-placeholder"):this.is_multiple?this.options.placeholder_text_multiple||this.options.placeholder_text||AbstractChosen.default_multiple_text:this.options.placeholder_text_single||this.options.placeholder_text||AbstractChosen.default_single_text,this.results_none_found=this.form_field.getAttribute("data-no_results_text")||this.options.no_results_text||AbstractChosen.default_no_result_text},AbstractChosen.prototype.mouse_enter=function(){return this.mouse_on_container=!0},AbstractChosen.prototype.mouse_leave=function(){return this.mouse_on_container=!1},AbstractChosen.prototype.input_focus=function(){var a=this;if(this.is_multiple){if(!this.active_field)return setTimeout(function(){return a.container_mousedown()},50)}else if(!this.active_field)return this.activate_field()},AbstractChosen.prototype.input_blur=function(){var a=this;return this.mouse_on_container?void 0:(this.active_field=!1,setTimeout(function(){return a.blur_test()},100))},AbstractChosen.prototype.results_option_build=function(a){var b,c,d,e,f;for(b="",f=this.results_data,d=0,e=f.length;e>d;d++)c=f[d],b+=c.group?this.result_add_group(c):this.result_add_option(c),(null!=a?a.first:void 0)&&(c.selected&&this.is_multiple?this.choice_build(c):c.selected&&!this.is_multiple&&this.single_set_selected_text(c.text));return b},AbstractChosen.prototype.result_add_option=function(a){var b,c;return a.search_match?this.include_option_in_results(a)?(b=[],a.disabled||a.selected&&this.is_multiple||b.push("active-result"),!a.disabled||a.selected&&this.is_multiple||b.push("disabled-result"),a.selected&&b.push("result-selected"),null!=a.group_array_index&&b.push("group-option"),""!==a.classes&&b.push(a.classes),c=document.createElement("li"),c.className=b.join(" "),c.style.cssText=a.style,c.setAttribute("data-option-array-index",a.array_index),c.innerHTML=a.search_text,this.outerHTML(c)):"":""},AbstractChosen.prototype.result_add_group=function(a){var b,c;return a.search_match||a.group_match?a.active_options>0?(b=[],b.push("group-result"),a.classes&&b.push(a.classes),c=document.createElement("li"),c.className=b.join(" "),c.innerHTML=a.search_text,this.outerHTML(c)):"":""},AbstractChosen.prototype.results_update_field=function(){return this.set_default_text(),this.is_multiple||this.results_reset_cleanup(),this.result_clear_highlight(),this.results_build(),this.results_showing?this.winnow_results():void 0},AbstractChosen.prototype.reset_single_select_options=function(){var a,b,c,d,e;for(d=this.results_data,e=[],b=0,c=d.length;c>b;b++)a=d[b],a.selected?e.push(a.selected=!1):e.push(void 0);return e},AbstractChosen.prototype.results_toggle=function(){return this.results_showing?this.results_hide():this.results_show()},AbstractChosen.prototype.results_search=function(){return this.results_showing?this.winnow_results():this.results_show()},AbstractChosen.prototype.winnow_results=function(){var a,b,c,d,e,f,g,h,i,j,k,l;for(this.no_results_clear(),d=0,f=this.get_search_text(),a=f.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),i=new RegExp(a,"i"),c=this.get_search_regex(a),l=this.results_data,j=0,k=l.length;k>j;j++)b=l[j],b.search_match=!1,e=null,this.include_option_in_results(b)&&(b.group&&(b.group_match=!1,b.active_options=0),null!=b.group_array_index&&this.results_data[b.group_array_index]&&(e=this.results_data[b.group_array_index],0===e.active_options&&e.search_match&&(d+=1),e.active_options+=1),(!b.group||this.group_search)&&(b.search_text=b.group?b.label:b.text,b.search_match=this.search_string_match(b.search_text,c),b.search_match&&!b.group&&(d+=1),b.search_match?(f.length&&(g=b.search_text.search(i),h=b.search_text.substr(0,g+f.length)+""+b.search_text.substr(g+f.length),b.search_text=h.substr(0,g)+""+h.substr(g)),null!=e&&(e.group_match=!0)):null!=b.group_array_index&&this.results_data[b.group_array_index].search_match&&(b.search_match=!0)));return this.result_clear_highlight(),1>d&&f.length?(this.update_results_content(""),this.no_results(f)):(this.update_results_content(this.results_option_build()),this.winnow_results_set_highlight())},AbstractChosen.prototype.get_search_regex=function(a){var b;return b=this.search_contains?"":"^",new RegExp(b+a,"i")},AbstractChosen.prototype.search_string_match=function(a,b){var c,d,e,f;if(b.test(a))return!0;if(this.enable_split_word_search&&(a.indexOf(" ")>=0||0===a.indexOf("["))&&(d=a.replace(/\[|\]/g,"").split(" "),d.length))for(e=0,f=d.length;f>e;e++)if(c=d[e],b.test(c))return!0},AbstractChosen.prototype.choices_count=function(){var a,b,c,d;if(null!=this.selected_option_count)return this.selected_option_count;for(this.selected_option_count=0,d=this.form_field.options,b=0,c=d.length;c>b;b++)a=d[b],a.selected&&(this.selected_option_count+=1);return this.selected_option_count},AbstractChosen.prototype.choices_click=function(a){return a.preventDefault(),this.results_showing||this.is_disabled?void 0:this.results_show()},AbstractChosen.prototype.keyup_checker=function(a){var b,c;switch(b=null!=(c=a.which)?c:a.keyCode,this.search_field_scale(),b){case 8:if(this.is_multiple&&this.backstroke_length<1&&this.choices_count()>0)return this.keydown_backstroke();if(!this.pending_backstroke)return this.result_clear_highlight(),this.results_search();break;case 13:if(a.preventDefault(),this.results_showing)return this.result_select(a);break;case 27:return this.results_showing&&this.results_hide(),!0;case 9:case 38:case 40:case 16:case 91:case 17:break;default:return this.results_search()}},AbstractChosen.prototype.clipboard_event_checker=function(){var a=this;return setTimeout(function(){return a.results_search()},50)},AbstractChosen.prototype.container_width=function(){return null!=this.options.width?this.options.width:""+this.form_field.offsetWidth+"px"},AbstractChosen.prototype.include_option_in_results=function(a){return this.is_multiple&&!this.display_selected_options&&a.selected?!1:!this.display_disabled_options&&a.disabled?!1:a.empty?!1:!0},AbstractChosen.prototype.search_results_touchstart=function(a){return this.touch_started=!0,this.search_results_mouseover(a)},AbstractChosen.prototype.search_results_touchmove=function(a){return this.touch_started=!1,this.search_results_mouseout(a)},AbstractChosen.prototype.search_results_touchend=function(a){return this.touch_started?this.search_results_mouseup(a):void 0},AbstractChosen.prototype.outerHTML=function(a){var b;return a.outerHTML?a.outerHTML:(b=document.createElement("div"),b.appendChild(a),b.innerHTML)},AbstractChosen.browser_is_supported=function(){return"Microsoft Internet Explorer"===window.navigator.appName?document.documentMode>=8:/iP(od|hone)/i.test(window.navigator.userAgent)?!1:/Android/i.test(window.navigator.userAgent)&&/Mobile/i.test(window.navigator.userAgent)?!1:!0},AbstractChosen.default_multiple_text="Select Some Options",AbstractChosen.default_single_text="Select an Option",AbstractChosen.default_no_result_text="No results match",AbstractChosen}(),this.Chosen=function(b){function Chosen(){return a=Chosen.__super__.constructor.apply(this,arguments)}return c(Chosen,b),Chosen.prototype.setup=function(){return this.current_selectedIndex=this.form_field.selectedIndex,this.is_rtl=this.form_field.hasClassName("chosen-rtl")},Chosen.prototype.set_default_values=function(){return Chosen.__super__.set_default_values.call(this),this.single_temp=new Template('#{default}
              '),this.multi_temp=new Template('
                '),this.no_results_temp=new Template('
              • '+this.results_none_found+' "#{terms}"
                • ')},Chosen.prototype.set_up_html=function(){var a,b;return a=["chosen-container"],a.push("chosen-container-"+(this.is_multiple?"multi":"single")),this.inherit_select_classes&&this.form_field.className&&a.push(this.form_field.className),this.is_rtl&&a.push("chosen-rtl"),b={"class":a.join(" "),style:"width: "+this.container_width()+";",title:this.form_field.title},this.form_field.id.length&&(b.id=this.form_field.id.replace(/[^\w]/g,"_")+"_chosen"),this.container=this.is_multiple?new Element("div",b).update(this.multi_temp.evaluate({"default":this.default_text})):new Element("div",b).update(this.single_temp.evaluate({"default":this.default_text})),this.form_field.hide().insert({after:this.container}),this.dropdown=this.container.down("div.chosen-drop"),this.search_field=this.container.down("input"),this.search_results=this.container.down("ul.chosen-results"),this.search_field_scale(),this.search_no_results=this.container.down("li.no-results"),this.is_multiple?(this.search_choices=this.container.down("ul.chosen-choices"),this.search_container=this.container.down("li.search-field")):(this.search_container=this.container.down("div.chosen-search"),this.selected_item=this.container.down(".chosen-single")),this.results_build(),this.set_tab_index(),this.set_label_behavior()},Chosen.prototype.on_ready=function(){return this.form_field.fire("chosen:ready",{chosen:this})},Chosen.prototype.register_observers=function(){var a=this;return this.container.observe("touchstart",function(b){return a.container_mousedown(b)}),this.container.observe("touchend",function(b){return a.container_mouseup(b)}),this.container.observe("mousedown",function(b){return a.container_mousedown(b)}),this.container.observe("mouseup",function(b){return a.container_mouseup(b)}),this.container.observe("mouseenter",function(b){return a.mouse_enter(b)}),this.container.observe("mouseleave",function(b){return a.mouse_leave(b)}),this.search_results.observe("mouseup",function(b){return a.search_results_mouseup(b)}),this.search_results.observe("mouseover",function(b){return a.search_results_mouseover(b)}),this.search_results.observe("mouseout",function(b){return a.search_results_mouseout(b)}),this.search_results.observe("mousewheel",function(b){return a.search_results_mousewheel(b)}),this.search_results.observe("DOMMouseScroll",function(b){return a.search_results_mousewheel(b)}),this.search_results.observe("touchstart",function(b){return a.search_results_touchstart(b)}),this.search_results.observe("touchmove",function(b){return a.search_results_touchmove(b)}),this.search_results.observe("touchend",function(b){return a.search_results_touchend(b)}),this.form_field.observe("chosen:updated",function(b){return a.results_update_field(b)}),this.form_field.observe("chosen:activate",function(b){return a.activate_field(b)}),this.form_field.observe("chosen:open",function(b){return a.container_mousedown(b)}),this.form_field.observe("chosen:close",function(b){return a.input_blur(b)}),this.search_field.observe("blur",function(b){return a.input_blur(b)}),this.search_field.observe("keyup",function(b){return a.keyup_checker(b)}),this.search_field.observe("keydown",function(b){return a.keydown_checker(b)}),this.search_field.observe("focus",function(b){return a.input_focus(b)}),this.search_field.observe("cut",function(b){return a.clipboard_event_checker(b)}),this.search_field.observe("paste",function(b){return a.clipboard_event_checker(b)}),this.is_multiple?this.search_choices.observe("click",function(b){return a.choices_click(b)}):this.container.observe("click",function(a){return a.preventDefault()})},Chosen.prototype.destroy=function(){return this.container.ownerDocument.stopObserving("click",this.click_test_action),this.form_field.stopObserving(),this.container.stopObserving(),this.search_results.stopObserving(),this.search_field.stopObserving(),null!=this.form_field_label&&this.form_field_label.stopObserving(),this.is_multiple?(this.search_choices.stopObserving(),this.container.select(".search-choice-close").each(function(a){return a.stopObserving()})):this.selected_item.stopObserving(),this.search_field.tabIndex&&(this.form_field.tabIndex=this.search_field.tabIndex),this.container.remove(),this.form_field.show()},Chosen.prototype.search_field_disabled=function(){return this.is_disabled=this.form_field.disabled,this.is_disabled?(this.container.addClassName("chosen-disabled"),this.search_field.disabled=!0,this.is_multiple||this.selected_item.stopObserving("focus",this.activate_action),this.close_field()):(this.container.removeClassName("chosen-disabled"),this.search_field.disabled=!1,this.is_multiple?void 0:this.selected_item.observe("focus",this.activate_action))},Chosen.prototype.container_mousedown=function(a){return this.is_disabled||(a&&"mousedown"===a.type&&!this.results_showing&&a.stop(),null!=a&&a.target.hasClassName("search-choice-close"))?void 0:(this.active_field?this.is_multiple||!a||a.target!==this.selected_item&&!a.target.up("a.chosen-single")||this.results_toggle():(this.is_multiple&&this.search_field.clear(),this.container.ownerDocument.observe("click",this.click_test_action),this.results_show()),this.activate_field())},Chosen.prototype.container_mouseup=function(a){return"ABBR"!==a.target.nodeName||this.is_disabled?void 0:this.results_reset(a)},Chosen.prototype.search_results_mousewheel=function(a){var b;return b=a.deltaY||-a.wheelDelta||a.detail,null!=b?(a.preventDefault(),"DOMMouseScroll"===a.type&&(b=40*b),this.search_results.scrollTop=b+this.search_results.scrollTop):void 0},Chosen.prototype.blur_test=function(){return!this.active_field&&this.container.hasClassName("chosen-container-active")?this.close_field():void 0},Chosen.prototype.close_field=function(){return this.container.ownerDocument.stopObserving("click",this.click_test_action),this.active_field=!1,this.results_hide(),this.container.removeClassName("chosen-container-active"),this.clear_backstroke(),this.show_search_field_default(),this.search_field_scale()},Chosen.prototype.activate_field=function(){return this.container.addClassName("chosen-container-active"),this.active_field=!0,this.search_field.value=this.search_field.value,this.search_field.focus()},Chosen.prototype.test_active_click=function(a){return a.target.up(".chosen-container")===this.container?this.active_field=!0:this.close_field()},Chosen.prototype.results_build=function(){return this.parsing=!0,this.selected_option_count=null,this.results_data=SelectParser.select_to_array(this.form_field),this.is_multiple?this.search_choices.select("li.search-choice").invoke("remove"):this.is_multiple||(this.single_set_selected_text(),this.disable_search||this.form_field.options.length<=this.disable_search_threshold?(this.search_field.readOnly=!0,this.container.addClassName("chosen-container-single-nosearch")):(this.search_field.readOnly=!1,this.container.removeClassName("chosen-container-single-nosearch"))),this.update_results_content(this.results_option_build({first:!0})),this.search_field_disabled(),this.show_search_field_default(),this.search_field_scale(),this.parsing=!1},Chosen.prototype.result_do_highlight=function(a){var b,c,d,e,f;return this.result_clear_highlight(),this.result_highlight=a,this.result_highlight.addClassName("highlighted"),d=parseInt(this.search_results.getStyle("maxHeight"),10),f=this.search_results.scrollTop,e=d+f,c=this.result_highlight.positionedOffset().top,b=c+this.result_highlight.getHeight(),b>=e?this.search_results.scrollTop=b-d>0?b-d:0:f>c?this.search_results.scrollTop=c:void 0},Chosen.prototype.result_clear_highlight=function(){return this.result_highlight&&this.result_highlight.removeClassName("highlighted"),this.result_highlight=null},Chosen.prototype.results_show=function(){return this.is_multiple&&this.max_selected_options<=this.choices_count()?(this.form_field.fire("chosen:maxselected",{chosen:this}),!1):(this.container.addClassName("chosen-with-drop"),this.results_showing=!0,this.search_field.focus(),this.search_field.value=this.search_field.value,this.winnow_results(),this.form_field.fire("chosen:showing_dropdown",{chosen:this}))},Chosen.prototype.update_results_content=function(a){return this.search_results.update(a)},Chosen.prototype.results_hide=function(){return this.results_showing&&(this.result_clear_highlight(),this.container.removeClassName("chosen-with-drop"),this.form_field.fire("chosen:hiding_dropdown",{chosen:this})),this.results_showing=!1},Chosen.prototype.set_tab_index=function(){var a;return this.form_field.tabIndex?(a=this.form_field.tabIndex,this.form_field.tabIndex=-1,this.search_field.tabIndex=a):void 0},Chosen.prototype.set_label_behavior=function(){var a=this;return this.form_field_label=this.form_field.up("label"),null==this.form_field_label&&(this.form_field_label=$$("label[for='"+this.form_field.id+"']").first()),null!=this.form_field_label?this.form_field_label.observe("click",function(b){return a.is_multiple?a.container_mousedown(b):a.activate_field()}):void 0},Chosen.prototype.show_search_field_default=function(){return this.is_multiple&&this.choices_count()<1&&!this.active_field?(this.search_field.value=this.default_text,this.search_field.addClassName("default")):(this.search_field.value="",this.search_field.removeClassName("default"))},Chosen.prototype.search_results_mouseup=function(a){var b;return b=a.target.hasClassName("active-result")?a.target:a.target.up(".active-result"),b?(this.result_highlight=b,this.result_select(a),this.search_field.focus()):void 0},Chosen.prototype.search_results_mouseover=function(a){var b;return b=a.target.hasClassName("active-result")?a.target:a.target.up(".active-result"),b?this.result_do_highlight(b):void 0},Chosen.prototype.search_results_mouseout=function(a){return a.target.hasClassName("active-result")||a.target.up(".active-result")?this.result_clear_highlight():void 0},Chosen.prototype.choice_build=function(a){var b,c,d=this;return b=new Element("li",{"class":"search-choice"}).update(""+a.html+""),a.disabled?b.addClassName("search-choice-disabled"):(c=new Element("a",{href:"#","class":"search-choice-close",rel:a.array_index}),c.observe("click",function(a){return d.choice_destroy_link_click(a)}),b.insert(c)),this.search_container.insert({before:b})},Chosen.prototype.choice_destroy_link_click=function(a){return a.preventDefault(),a.stopPropagation(),this.is_disabled?void 0:this.choice_destroy(a.target)},Chosen.prototype.choice_destroy=function(a){return this.result_deselect(a.readAttribute("rel"))?(this.show_search_field_default(),this.is_multiple&&this.choices_count()>0&&this.search_field.value.length<1&&this.results_hide(),a.up("li").remove(),this.search_field_scale()):void 0},Chosen.prototype.results_reset=function(){return this.reset_single_select_options(),this.form_field.options[0].selected=!0,this.single_set_selected_text(),this.show_search_field_default(),this.results_reset_cleanup(),"function"==typeof Event.simulate&&this.form_field.simulate("change"),this.active_field?this.results_hide():void 0},Chosen.prototype.results_reset_cleanup=function(){var a;return this.current_selectedIndex=this.form_field.selectedIndex,a=this.selected_item.down("abbr"),a?a.remove():void 0},Chosen.prototype.result_select=function(a){var b,c;return this.result_highlight?(b=this.result_highlight,this.result_clear_highlight(),this.is_multiple&&this.max_selected_options<=this.choices_count()?(this.form_field.fire("chosen:maxselected",{chosen:this}),!1):(this.is_multiple?b.removeClassName("active-result"):this.reset_single_select_options(),b.addClassName("result-selected"),c=this.results_data[b.getAttribute("data-option-array-index")],c.selected=!0,this.form_field.options[c.options_index].selected=!0,this.selected_option_count=null,this.is_multiple?this.choice_build(c):this.single_set_selected_text(c.text),(a.metaKey||a.ctrlKey)&&this.is_multiple||this.results_hide(),this.search_field.value="","function"!=typeof Event.simulate||!this.is_multiple&&this.form_field.selectedIndex===this.current_selectedIndex||this.form_field.simulate("change"),this.current_selectedIndex=this.form_field.selectedIndex,this.search_field_scale())):void 0},Chosen.prototype.single_set_selected_text=function(a){return null==a&&(a=this.default_text),a===this.default_text?this.selected_item.addClassName("chosen-default"):(this.single_deselect_control_build(),this.selected_item.removeClassName("chosen-default")),this.selected_item.down("span").update(a)},Chosen.prototype.result_deselect=function(a){var b;return b=this.results_data[a],this.form_field.options[b.options_index].disabled?!1:(b.selected=!1,this.form_field.options[b.options_index].selected=!1,this.selected_option_count=null,this.result_clear_highlight(),this.results_showing&&this.winnow_results(),"function"==typeof Event.simulate&&this.form_field.simulate("change"),this.search_field_scale(),!0)},Chosen.prototype.single_deselect_control_build=function(){return this.allow_single_deselect?(this.selected_item.down("abbr")||this.selected_item.down("span").insert({after:''}),this.selected_item.addClassName("chosen-single-with-deselect")):void 0},Chosen.prototype.get_search_text=function(){return this.search_field.value===this.default_text?"":this.search_field.value.strip().escapeHTML()},Chosen.prototype.winnow_results_set_highlight=function(){var a;return this.is_multiple||(a=this.search_results.down(".result-selected.active-result")),null==a&&(a=this.search_results.down(".active-result")),null!=a?this.result_do_highlight(a):void 0},Chosen.prototype.no_results=function(a){return this.search_results.insert(this.no_results_temp.evaluate({terms:a})),this.form_field.fire("chosen:no_results",{chosen:this})},Chosen.prototype.no_results_clear=function(){var a,b;for(a=null,b=[];a=this.search_results.down(".no-results");)b.push(a.remove());return b},Chosen.prototype.keydown_arrow=function(){var a;return this.results_showing&&this.result_highlight?(a=this.result_highlight.next(".active-result"))?this.result_do_highlight(a):void 0:this.results_show()},Chosen.prototype.keyup_arrow=function(){var a,b,c;return this.results_showing||this.is_multiple?this.result_highlight?(c=this.result_highlight.previousSiblings(),a=this.search_results.select("li.active-result"),b=c.intersect(a),b.length?this.result_do_highlight(b.first()):(this.choices_count()>0&&this.results_hide(),this.result_clear_highlight())):void 0:this.results_show()},Chosen.prototype.keydown_backstroke=function(){var a;return this.pending_backstroke?(this.choice_destroy(this.pending_backstroke.down("a")),this.clear_backstroke()):(a=this.search_container.siblings().last(),a&&a.hasClassName("search-choice")&&!a.hasClassName("search-choice-disabled")?(this.pending_backstroke=a,this.pending_backstroke&&this.pending_backstroke.addClassName("search-choice-focus"),this.single_backstroke_delete?this.keydown_backstroke():this.pending_backstroke.addClassName("search-choice-focus")):void 0)},Chosen.prototype.clear_backstroke=function(){return this.pending_backstroke&&this.pending_backstroke.removeClassName("search-choice-focus"),this.pending_backstroke=null},Chosen.prototype.keydown_checker=function(a){var b,c;switch(b=null!=(c=a.which)?c:a.keyCode,this.search_field_scale(),8!==b&&this.pending_backstroke&&this.clear_backstroke(),b){case 8:this.backstroke_length=this.search_field.value.length;break;case 9:this.results_showing&&!this.is_multiple&&this.result_select(a),this.mouse_on_container=!1;break;case 13:this.results_showing&&a.preventDefault();break;case 32:this.disable_search&&a.preventDefault();break;case 38:a.preventDefault(),this.keyup_arrow();break;case 40:a.preventDefault(),this.keydown_arrow()}},Chosen.prototype.search_field_scale=function(){var a,b,c,d,e,f,g,h,i;if(this.is_multiple){for(c=0,g=0,e="position:absolute; left: -1000px; top: -1000px; display:none;",f=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"],h=0,i=f.length;i>h;h++)d=f[h],e+=d+":"+this.search_field.getStyle(d)+";";return a=new Element("div",{style:e}).update(this.search_field.value.escapeHTML()),document.body.appendChild(a),g=Element.measure(a,"width")+25,a.remove(),b=this.container.getWidth(),g>b-10&&(g=b-10),this.search_field.setStyle({width:g+"px"})}},Chosen}(AbstractChosen)}.call(this); \ No newline at end of file +/* Chosen v1.4.2 | (c) 2011-2015 by Harvest | MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md */ +(function(){var AbstractChosen,SelectParser,a,b={}.hasOwnProperty,c=function(a,c){function d(){this.constructor=a}for(var e in c)b.call(c,e)&&(a[e]=c[e]);return d.prototype=c.prototype,a.prototype=new d,a.__super__=c.prototype,a};SelectParser=function(){function SelectParser(){this.options_index=0,this.parsed=[]}return SelectParser.prototype.add_node=function(a){return"OPTGROUP"===a.nodeName.toUpperCase()?this.add_group(a):this.add_option(a)},SelectParser.prototype.add_group=function(a){var b,c,d,e,f,g;for(b=this.parsed.length,this.parsed.push({array_index:b,group:!0,label:this.escapeExpression(a.label),title:a.title?a.title:void 0,children:0,disabled:a.disabled,classes:a.className}),f=a.childNodes,g=[],d=0,e=f.length;e>d;d++)c=f[d],g.push(this.add_option(c,b,a.disabled));return g},SelectParser.prototype.add_option=function(a,b,c){return"OPTION"===a.nodeName.toUpperCase()?(""!==a.text?(null!=b&&(this.parsed[b].children+=1),this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,value:a.value,text:a.text,html:a.innerHTML,title:a.title?a.title:void 0,selected:a.selected,disabled:c===!0?c:a.disabled,group_array_index:b,group_label:null!=b?this.parsed[b].label:null,classes:a.className,style:a.style.cssText})):this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,empty:!0}),this.options_index+=1):void 0},SelectParser.prototype.escapeExpression=function(a){var b,c;return null==a||a===!1?"":/[\&\<\>\"\'\`]/.test(a)?(b={"<":"<",">":">",'"':""","'":"'","`":"`"},c=/&(?!\w+;)|[\<\>\"\'\`]/g,a.replace(c,function(a){return b[a]||"&"})):a},SelectParser}(),SelectParser.select_to_array=function(a){var b,c,d,e,f;for(c=new SelectParser,f=a.childNodes,d=0,e=f.length;e>d;d++)b=f[d],c.add_node(b);return c.parsed},AbstractChosen=function(){function AbstractChosen(a,b){this.form_field=a,this.options=null!=b?b:{},AbstractChosen.browser_is_supported()&&(this.is_multiple=this.form_field.multiple,this.set_default_text(),this.set_default_values(),this.setup(),this.set_up_html(),this.register_observers(),this.on_ready())}return AbstractChosen.prototype.set_default_values=function(){var a=this;return this.click_test_action=function(b){return a.test_active_click(b)},this.activate_action=function(b){return a.activate_field(b)},this.active_field=!1,this.mouse_on_container=!1,this.results_showing=!1,this.result_highlighted=null,this.allow_single_deselect=null!=this.options.allow_single_deselect&&null!=this.form_field.options[0]&&""===this.form_field.options[0].text?this.options.allow_single_deselect:!1,this.disable_search_threshold=this.options.disable_search_threshold||0,this.disable_search=this.options.disable_search||!1,this.enable_split_word_search=null!=this.options.enable_split_word_search?this.options.enable_split_word_search:!0,this.group_search=null!=this.options.group_search?this.options.group_search:!0,this.search_contains=this.options.search_contains||!1,this.single_backstroke_delete=null!=this.options.single_backstroke_delete?this.options.single_backstroke_delete:!0,this.max_selected_options=this.options.max_selected_options||1/0,this.inherit_select_classes=this.options.inherit_select_classes||!1,this.display_selected_options=null!=this.options.display_selected_options?this.options.display_selected_options:!0,this.display_disabled_options=null!=this.options.display_disabled_options?this.options.display_disabled_options:!0,this.include_group_label_in_selected=this.options.include_group_label_in_selected||!1},AbstractChosen.prototype.set_default_text=function(){return this.default_text=this.form_field.getAttribute("data-placeholder")?this.form_field.getAttribute("data-placeholder"):this.is_multiple?this.options.placeholder_text_multiple||this.options.placeholder_text||AbstractChosen.default_multiple_text:this.options.placeholder_text_single||this.options.placeholder_text||AbstractChosen.default_single_text,this.results_none_found=this.form_field.getAttribute("data-no_results_text")||this.options.no_results_text||AbstractChosen.default_no_result_text},AbstractChosen.prototype.choice_label=function(a){return this.include_group_label_in_selected&&null!=a.group_label?""+a.group_label+""+a.html:a.html},AbstractChosen.prototype.mouse_enter=function(){return this.mouse_on_container=!0},AbstractChosen.prototype.mouse_leave=function(){return this.mouse_on_container=!1},AbstractChosen.prototype.input_focus=function(){var a=this;if(this.is_multiple){if(!this.active_field)return setTimeout(function(){return a.container_mousedown()},50)}else if(!this.active_field)return this.activate_field()},AbstractChosen.prototype.input_blur=function(){var a=this;return this.mouse_on_container?void 0:(this.active_field=!1,setTimeout(function(){return a.blur_test()},100))},AbstractChosen.prototype.results_option_build=function(a){var b,c,d,e,f;for(b="",f=this.results_data,d=0,e=f.length;e>d;d++)c=f[d],b+=c.group?this.result_add_group(c):this.result_add_option(c),(null!=a?a.first:void 0)&&(c.selected&&this.is_multiple?this.choice_build(c):c.selected&&!this.is_multiple&&this.single_set_selected_text(this.choice_label(c)));return b},AbstractChosen.prototype.result_add_option=function(a){var b,c;return a.search_match?this.include_option_in_results(a)?(b=[],a.disabled||a.selected&&this.is_multiple||b.push("active-result"),!a.disabled||a.selected&&this.is_multiple||b.push("disabled-result"),a.selected&&b.push("result-selected"),null!=a.group_array_index&&b.push("group-option"),""!==a.classes&&b.push(a.classes),c=document.createElement("li"),c.className=b.join(" "),c.style.cssText=a.style,c.setAttribute("data-option-array-index",a.array_index),c.innerHTML=a.search_text,a.title&&(c.title=a.title),this.outerHTML(c)):"":""},AbstractChosen.prototype.result_add_group=function(a){var b,c;return a.search_match||a.group_match?a.active_options>0?(b=[],b.push("group-result"),a.classes&&b.push(a.classes),c=document.createElement("li"),c.className=b.join(" "),c.innerHTML=a.search_text,a.title&&(c.title=a.title),this.outerHTML(c)):"":""},AbstractChosen.prototype.results_update_field=function(){return this.set_default_text(),this.is_multiple||this.results_reset_cleanup(),this.result_clear_highlight(),this.results_build(),this.results_showing?this.winnow_results():void 0},AbstractChosen.prototype.reset_single_select_options=function(){var a,b,c,d,e;for(d=this.results_data,e=[],b=0,c=d.length;c>b;b++)a=d[b],a.selected?e.push(a.selected=!1):e.push(void 0);return e},AbstractChosen.prototype.results_toggle=function(){return this.results_showing?this.results_hide():this.results_show()},AbstractChosen.prototype.results_search=function(){return this.results_showing?this.winnow_results():this.results_show()},AbstractChosen.prototype.winnow_results=function(){var a,b,c,d,e,f,g,h,i,j,k,l;for(this.no_results_clear(),d=0,f=this.get_search_text(),a=f.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),i=new RegExp(a,"i"),c=this.get_search_regex(a),l=this.results_data,j=0,k=l.length;k>j;j++)b=l[j],b.search_match=!1,e=null,this.include_option_in_results(b)&&(b.group&&(b.group_match=!1,b.active_options=0),null!=b.group_array_index&&this.results_data[b.group_array_index]&&(e=this.results_data[b.group_array_index],0===e.active_options&&e.search_match&&(d+=1),e.active_options+=1),b.search_text=b.group?b.label:b.html,(!b.group||this.group_search)&&(b.search_match=this.search_string_match(b.search_text,c),b.search_match&&!b.group&&(d+=1),b.search_match?(f.length&&(g=b.search_text.search(i),h=b.search_text.substr(0,g+f.length)+"                "+b.search_text.substr(g+f.length),b.search_text=h.substr(0,g)+""+h.substr(g)),null!=e&&(e.group_match=!0)):null!=b.group_array_index&&this.results_data[b.group_array_index].search_match&&(b.search_match=!0)));return this.result_clear_highlight(),1>d&&f.length?(this.update_results_content(""),this.no_results(f)):(this.update_results_content(this.results_option_build()),this.winnow_results_set_highlight())},AbstractChosen.prototype.get_search_regex=function(a){var b;return b=this.search_contains?"":"^",new RegExp(b+a,"i")},AbstractChosen.prototype.search_string_match=function(a,b){var c,d,e,f;if(b.test(a))return!0;if(this.enable_split_word_search&&(a.indexOf(" ")>=0||0===a.indexOf("["))&&(d=a.replace(/\[|\]/g,"").split(" "),d.length))for(e=0,f=d.length;f>e;e++)if(c=d[e],b.test(c))return!0},AbstractChosen.prototype.choices_count=function(){var a,b,c,d;if(null!=this.selected_option_count)return this.selected_option_count;for(this.selected_option_count=0,d=this.form_field.options,b=0,c=d.length;c>b;b++)a=d[b],a.selected&&(this.selected_option_count+=1);return this.selected_option_count},AbstractChosen.prototype.choices_click=function(a){return a.preventDefault(),this.results_showing||this.is_disabled?void 0:this.results_show()},AbstractChosen.prototype.keyup_checker=function(a){var b,c;switch(b=null!=(c=a.which)?c:a.keyCode,this.search_field_scale(),b){case 8:if(this.is_multiple&&this.backstroke_length<1&&this.choices_count()>0)return this.keydown_backstroke();if(!this.pending_backstroke)return this.result_clear_highlight(),this.results_search();break;case 13:if(a.preventDefault(),this.results_showing)return this.result_select(a);break;case 27:return this.results_showing&&this.results_hide(),!0;case 9:case 38:case 40:case 16:case 91:case 17:break;default:return this.results_search()}},AbstractChosen.prototype.clipboard_event_checker=function(){var a=this;return setTimeout(function(){return a.results_search()},50)},AbstractChosen.prototype.container_width=function(){return null!=this.options.width?this.options.width:""+this.form_field.offsetWidth+"px"},AbstractChosen.prototype.include_option_in_results=function(a){return this.is_multiple&&!this.display_selected_options&&a.selected?!1:!this.display_disabled_options&&a.disabled?!1:a.empty?!1:!0},AbstractChosen.prototype.search_results_touchstart=function(a){return this.touch_started=!0,this.search_results_mouseover(a)},AbstractChosen.prototype.search_results_touchmove=function(a){return this.touch_started=!1,this.search_results_mouseout(a)},AbstractChosen.prototype.search_results_touchend=function(a){return this.touch_started?this.search_results_mouseup(a):void 0},AbstractChosen.prototype.outerHTML=function(a){var b;return a.outerHTML?a.outerHTML:(b=document.createElement("div"),b.appendChild(a),b.innerHTML)},AbstractChosen.browser_is_supported=function(){return"Microsoft Internet Explorer"===window.navigator.appName?document.documentMode>=8:/iP(od|hone)/i.test(window.navigator.userAgent)?!1:/Android/i.test(window.navigator.userAgent)&&/Mobile/i.test(window.navigator.userAgent)?!1:!0},AbstractChosen.default_multiple_text="Select Some Options",AbstractChosen.default_single_text="Select an Option",AbstractChosen.default_no_result_text="No results match",AbstractChosen}(),this.Chosen=function(b){function Chosen(){return a=Chosen.__super__.constructor.apply(this,arguments)}return c(Chosen,b),Chosen.prototype.setup=function(){return this.current_selectedIndex=this.form_field.selectedIndex,this.is_rtl=this.form_field.hasClassName("chosen-rtl")},Chosen.prototype.set_default_values=function(){return Chosen.__super__.set_default_values.call(this),this.single_temp=new Template('#{default}
                  '),this.multi_temp=new Template('
                    '),this.no_results_temp=new Template('
                  • '+this.results_none_found+' "#{terms}"
                    • ')},Chosen.prototype.set_up_html=function(){var a,b;return a=["chosen-container"],a.push("chosen-container-"+(this.is_multiple?"multi":"single")),this.inherit_select_classes&&this.form_field.className&&a.push(this.form_field.className),this.is_rtl&&a.push("chosen-rtl"),b={"class":a.join(" "),style:"width: "+this.container_width()+";",title:this.form_field.title},this.form_field.id.length&&(b.id=this.form_field.id.replace(/[^\w]/g,"_")+"_chosen"),this.container=this.is_multiple?new Element("div",b).update(this.multi_temp.evaluate({"default":this.default_text})):new Element("div",b).update(this.single_temp.evaluate({"default":this.default_text})),this.form_field.hide().insert({after:this.container}),this.dropdown=this.container.down("div.chosen-drop"),this.search_field=this.container.down("input"),this.search_results=this.container.down("ul.chosen-results"),this.search_field_scale(),this.search_no_results=this.container.down("li.no-results"),this.is_multiple?(this.search_choices=this.container.down("ul.chosen-choices"),this.search_container=this.container.down("li.search-field")):(this.search_container=this.container.down("div.chosen-search"),this.selected_item=this.container.down(".chosen-single")),this.results_build(),this.set_tab_index(),this.set_label_behavior()},Chosen.prototype.on_ready=function(){return this.form_field.fire("chosen:ready",{chosen:this})},Chosen.prototype.register_observers=function(){var a=this;return this.container.observe("touchstart",function(b){return a.container_mousedown(b),b.preventDefault()}),this.container.observe("touchend",function(b){return a.container_mouseup(b),b.preventDefault()}),this.container.observe("mousedown",function(b){return a.container_mousedown(b)}),this.container.observe("mouseup",function(b){return a.container_mouseup(b)}),this.container.observe("mouseenter",function(b){return a.mouse_enter(b)}),this.container.observe("mouseleave",function(b){return a.mouse_leave(b)}),this.search_results.observe("mouseup",function(b){return a.search_results_mouseup(b)}),this.search_results.observe("mouseover",function(b){return a.search_results_mouseover(b)}),this.search_results.observe("mouseout",function(b){return a.search_results_mouseout(b)}),this.search_results.observe("mousewheel",function(b){return a.search_results_mousewheel(b)}),this.search_results.observe("DOMMouseScroll",function(b){return a.search_results_mousewheel(b)}),this.search_results.observe("touchstart",function(b){return a.search_results_touchstart(b)}),this.search_results.observe("touchmove",function(b){return a.search_results_touchmove(b)}),this.search_results.observe("touchend",function(b){return a.search_results_touchend(b)}),this.form_field.observe("chosen:updated",function(b){return a.results_update_field(b)}),this.form_field.observe("chosen:activate",function(b){return a.activate_field(b)}),this.form_field.observe("chosen:open",function(b){return a.container_mousedown(b)}),this.form_field.observe("chosen:close",function(b){return a.input_blur(b)}),this.search_field.observe("blur",function(b){return a.input_blur(b)}),this.search_field.observe("keyup",function(b){return a.keyup_checker(b)}),this.search_field.observe("keydown",function(b){return a.keydown_checker(b)}),this.search_field.observe("focus",function(b){return a.input_focus(b)}),this.search_field.observe("cut",function(b){return a.clipboard_event_checker(b)}),this.search_field.observe("paste",function(b){return a.clipboard_event_checker(b)}),this.is_multiple?this.search_choices.observe("click",function(b){return a.choices_click(b)}):this.container.observe("click",function(a){return a.preventDefault()})},Chosen.prototype.destroy=function(){return this.container.ownerDocument.stopObserving("click",this.click_test_action),this.form_field.stopObserving(),this.container.stopObserving(),this.search_results.stopObserving(),this.search_field.stopObserving(),null!=this.form_field_label&&this.form_field_label.stopObserving(),this.is_multiple?(this.search_choices.stopObserving(),this.container.select(".search-choice-close").each(function(a){return a.stopObserving()})):this.selected_item.stopObserving(),this.search_field.tabIndex&&(this.form_field.tabIndex=this.search_field.tabIndex),this.container.remove(),this.form_field.show()},Chosen.prototype.search_field_disabled=function(){return this.is_disabled=this.form_field.disabled,this.is_disabled?(this.container.addClassName("chosen-disabled"),this.search_field.disabled=!0,this.is_multiple||this.selected_item.stopObserving("focus",this.activate_action),this.close_field()):(this.container.removeClassName("chosen-disabled"),this.search_field.disabled=!1,this.is_multiple?void 0:this.selected_item.observe("focus",this.activate_action))},Chosen.prototype.container_mousedown=function(a){return this.is_disabled||(a&&"mousedown"===a.type&&!this.results_showing&&a.stop(),null!=a&&a.target.hasClassName("search-choice-close"))?void 0:(this.active_field?this.is_multiple||!a||a.target!==this.selected_item&&!a.target.up("a.chosen-single")||this.results_toggle():(this.is_multiple&&this.search_field.clear(),this.container.ownerDocument.observe("click",this.click_test_action),this.results_show()),this.activate_field())},Chosen.prototype.container_mouseup=function(a){return"ABBR"!==a.target.nodeName||this.is_disabled?void 0:this.results_reset(a)},Chosen.prototype.search_results_mousewheel=function(a){var b;return b=a.deltaY||-a.wheelDelta||a.detail,null!=b?(a.preventDefault(),"DOMMouseScroll"===a.type&&(b=40*b),this.search_results.scrollTop=b+this.search_results.scrollTop):void 0},Chosen.prototype.blur_test=function(){return!this.active_field&&this.container.hasClassName("chosen-container-active")?this.close_field():void 0},Chosen.prototype.close_field=function(){return this.container.ownerDocument.stopObserving("click",this.click_test_action),this.active_field=!1,this.results_hide(),this.container.removeClassName("chosen-container-active"),this.clear_backstroke(),this.show_search_field_default(),this.search_field_scale()},Chosen.prototype.activate_field=function(){return this.container.addClassName("chosen-container-active"),this.active_field=!0,this.search_field.value=this.search_field.value,this.search_field.focus()},Chosen.prototype.test_active_click=function(a){return a.target.up(".chosen-container")===this.container?this.active_field=!0:this.close_field()},Chosen.prototype.results_build=function(){return this.parsing=!0,this.selected_option_count=null,this.results_data=SelectParser.select_to_array(this.form_field),this.is_multiple?this.search_choices.select("li.search-choice").invoke("remove"):this.is_multiple||(this.single_set_selected_text(),this.disable_search||this.form_field.options.length<=this.disable_search_threshold?(this.search_field.readOnly=!0,this.container.addClassName("chosen-container-single-nosearch")):(this.search_field.readOnly=!1,this.container.removeClassName("chosen-container-single-nosearch"))),this.update_results_content(this.results_option_build({first:!0})),this.search_field_disabled(),this.show_search_field_default(),this.search_field_scale(),this.parsing=!1},Chosen.prototype.result_do_highlight=function(a){var b,c,d,e,f;return this.result_clear_highlight(),this.result_highlight=a,this.result_highlight.addClassName("highlighted"),d=parseInt(this.search_results.getStyle("maxHeight"),10),f=this.search_results.scrollTop,e=d+f,c=this.result_highlight.positionedOffset().top,b=c+this.result_highlight.getHeight(),b>=e?this.search_results.scrollTop=b-d>0?b-d:0:f>c?this.search_results.scrollTop=c:void 0},Chosen.prototype.result_clear_highlight=function(){return this.result_highlight&&this.result_highlight.removeClassName("highlighted"),this.result_highlight=null},Chosen.prototype.results_show=function(){return this.is_multiple&&this.max_selected_options<=this.choices_count()?(this.form_field.fire("chosen:maxselected",{chosen:this}),!1):(this.container.addClassName("chosen-with-drop"),this.results_showing=!0,this.search_field.focus(),this.search_field.value=this.search_field.value,this.winnow_results(),this.form_field.fire("chosen:showing_dropdown",{chosen:this}))},Chosen.prototype.update_results_content=function(a){return this.search_results.update(a)},Chosen.prototype.results_hide=function(){return this.results_showing&&(this.result_clear_highlight(),this.container.removeClassName("chosen-with-drop"),this.form_field.fire("chosen:hiding_dropdown",{chosen:this})),this.results_showing=!1},Chosen.prototype.set_tab_index=function(){var a;return this.form_field.tabIndex?(a=this.form_field.tabIndex,this.form_field.tabIndex=-1,this.search_field.tabIndex=a):void 0},Chosen.prototype.set_label_behavior=function(){var a=this;return this.form_field_label=this.form_field.up("label"),null==this.form_field_label&&(this.form_field_label=$$("label[for='"+this.form_field.id+"']").first()),null!=this.form_field_label?this.form_field_label.observe("click",function(b){return a.is_multiple?a.container_mousedown(b):a.activate_field()}):void 0},Chosen.prototype.show_search_field_default=function(){return this.is_multiple&&this.choices_count()<1&&!this.active_field?(this.search_field.value=this.default_text,this.search_field.addClassName("default")):(this.search_field.value="",this.search_field.removeClassName("default"))},Chosen.prototype.search_results_mouseup=function(a){var b;return b=a.target.hasClassName("active-result")?a.target:a.target.up(".active-result"),b?(this.result_highlight=b,this.result_select(a),this.search_field.focus()):void 0},Chosen.prototype.search_results_mouseover=function(a){var b;return b=a.target.hasClassName("active-result")?a.target:a.target.up(".active-result"),b?this.result_do_highlight(b):void 0},Chosen.prototype.search_results_mouseout=function(a){return a.target.hasClassName("active-result")||a.target.up(".active-result")?this.result_clear_highlight():void 0},Chosen.prototype.choice_build=function(a){var b,c,d=this;return b=new Element("li",{"class":"search-choice"}).update(""+this.choice_label(a)+""),a.disabled?b.addClassName("search-choice-disabled"):(c=new Element("a",{href:"#","class":"search-choice-close",rel:a.array_index}),c.observe("click",function(a){return d.choice_destroy_link_click(a)}),b.insert(c)),this.search_container.insert({before:b})},Chosen.prototype.choice_destroy_link_click=function(a){return a.preventDefault(),a.stopPropagation(),this.is_disabled?void 0:this.choice_destroy(a.target)},Chosen.prototype.choice_destroy=function(a){return this.result_deselect(a.readAttribute("rel"))?(this.show_search_field_default(),this.is_multiple&&this.choices_count()>0&&this.search_field.value.length<1&&this.results_hide(),a.up("li").remove(),this.search_field_scale()):void 0},Chosen.prototype.results_reset=function(){return this.reset_single_select_options(),this.form_field.options[0].selected=!0,this.single_set_selected_text(),this.show_search_field_default(),this.results_reset_cleanup(),"function"==typeof Event.simulate&&this.form_field.simulate("change"),this.active_field?this.results_hide():void 0},Chosen.prototype.results_reset_cleanup=function(){var a;return this.current_selectedIndex=this.form_field.selectedIndex,a=this.selected_item.down("abbr"),a?a.remove():void 0},Chosen.prototype.result_select=function(a){var b,c;return this.result_highlight?(b=this.result_highlight,this.result_clear_highlight(),this.is_multiple&&this.max_selected_options<=this.choices_count()?(this.form_field.fire("chosen:maxselected",{chosen:this}),!1):(this.is_multiple?b.removeClassName("active-result"):this.reset_single_select_options(),b.addClassName("result-selected"),c=this.results_data[b.getAttribute("data-option-array-index")],c.selected=!0,this.form_field.options[c.options_index].selected=!0,this.selected_option_count=null,this.is_multiple?this.choice_build(c):this.single_set_selected_text(this.choice_label(c)),(a.metaKey||a.ctrlKey)&&this.is_multiple||this.results_hide(),this.search_field.value="","function"!=typeof Event.simulate||!this.is_multiple&&this.form_field.selectedIndex===this.current_selectedIndex||this.form_field.simulate("change"),this.current_selectedIndex=this.form_field.selectedIndex,a.preventDefault(),this.search_field_scale())):void 0},Chosen.prototype.single_set_selected_text=function(a){return null==a&&(a=this.default_text),a===this.default_text?this.selected_item.addClassName("chosen-default"):(this.single_deselect_control_build(),this.selected_item.removeClassName("chosen-default")),this.selected_item.down("span").update(a)},Chosen.prototype.result_deselect=function(a){var b;return b=this.results_data[a],this.form_field.options[b.options_index].disabled?!1:(b.selected=!1,this.form_field.options[b.options_index].selected=!1,this.selected_option_count=null,this.result_clear_highlight(),this.results_showing&&this.winnow_results(),"function"==typeof Event.simulate&&this.form_field.simulate("change"),this.search_field_scale(),!0)},Chosen.prototype.single_deselect_control_build=function(){return this.allow_single_deselect?(this.selected_item.down("abbr")||this.selected_item.down("span").insert({after:''}),this.selected_item.addClassName("chosen-single-with-deselect")):void 0},Chosen.prototype.get_search_text=function(){return this.search_field.value.strip().escapeHTML()},Chosen.prototype.winnow_results_set_highlight=function(){var a;return this.is_multiple||(a=this.search_results.down(".result-selected.active-result")),null==a&&(a=this.search_results.down(".active-result")),null!=a?this.result_do_highlight(a):void 0},Chosen.prototype.no_results=function(a){return this.search_results.insert(this.no_results_temp.evaluate({terms:a})),this.form_field.fire("chosen:no_results",{chosen:this})},Chosen.prototype.no_results_clear=function(){var a,b;for(a=null,b=[];a=this.search_results.down(".no-results");)b.push(a.remove());return b},Chosen.prototype.keydown_arrow=function(){var a;return this.results_showing&&this.result_highlight?(a=this.result_highlight.next(".active-result"))?this.result_do_highlight(a):void 0:this.results_show()},Chosen.prototype.keyup_arrow=function(){var a,b,c;return this.results_showing||this.is_multiple?this.result_highlight?(c=this.result_highlight.previousSiblings(),a=this.search_results.select("li.active-result"),b=c.intersect(a),b.length?this.result_do_highlight(b.first()):(this.choices_count()>0&&this.results_hide(),this.result_clear_highlight())):void 0:this.results_show()},Chosen.prototype.keydown_backstroke=function(){var a;return this.pending_backstroke?(this.choice_destroy(this.pending_backstroke.down("a")),this.clear_backstroke()):(a=this.search_container.siblings().last(),a&&a.hasClassName("search-choice")&&!a.hasClassName("search-choice-disabled")?(this.pending_backstroke=a,this.pending_backstroke&&this.pending_backstroke.addClassName("search-choice-focus"),this.single_backstroke_delete?this.keydown_backstroke():this.pending_backstroke.addClassName("search-choice-focus")):void 0)},Chosen.prototype.clear_backstroke=function(){return this.pending_backstroke&&this.pending_backstroke.removeClassName("search-choice-focus"),this.pending_backstroke=null},Chosen.prototype.keydown_checker=function(a){var b,c;switch(b=null!=(c=a.which)?c:a.keyCode,this.search_field_scale(),8!==b&&this.pending_backstroke&&this.clear_backstroke(),b){case 8:this.backstroke_length=this.search_field.value.length;break;case 9:this.results_showing&&!this.is_multiple&&this.result_select(a),this.mouse_on_container=!1;break;case 13:this.results_showing&&a.preventDefault();break;case 32:this.disable_search&&a.preventDefault();break;case 38:a.preventDefault(),this.keyup_arrow();break;case 40:a.preventDefault(),this.keydown_arrow()}},Chosen.prototype.search_field_scale=function(){var a,b,c,d,e,f,g,h,i;if(this.is_multiple){for(c=0,g=0,e="position:absolute; left: -1000px; top: -1000px; display:none;",f=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"],h=0,i=f.length;i>h;h++)d=f[h],e+=d+":"+this.search_field.getStyle(d)+";";return a=new Element("div",{style:e}).update(this.search_field.value.escapeHTML()),document.body.appendChild(a),g=Element.measure(a,"width")+25,a.remove(),b=this.container.getWidth(),g>b-10&&(g=b-10),this.search_field.setStyle({width:g+"px"})}},Chosen}(AbstractChosen)}).call(this); \ No newline at end of file From 5e0c19c32ef8f050b0e49ae03d730122ff7ba32c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 14 Jan 2016 20:04:41 +0100 Subject: [PATCH 60/65] add entry for 4.3.23 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index e1c704bed..58aad5000 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,7 @@ - move the last bits of plain sql code from op/*.php into the core - group manager uses ajax like user manager - start to enforce content security policy +- fixed possible XSS attack in user manager -------------------------------------------------------------------------------- Changes in version 4.3.22 From 77ee1546d56dac5391547c31aea6da7a6203f6ff Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 18 Jan 2016 12:57:20 +0100 Subject: [PATCH 61/65] various updates from users --- languages/ar_EG/lang.inc | 6 ++-- languages/ca_ES/lang.inc | 6 ++-- languages/cs_CZ/lang.inc | 4 +-- languages/de_DE/lang.inc | 15 +++++++--- languages/en_GB/lang.inc | 22 +++++++-------- languages/fr_FR/lang.inc | 10 +++---- languages/hu_HU/lang.inc | 10 +++---- languages/ko_KR/lang.inc | 44 ++++++++++++++--------------- languages/nl_NL/lang.inc | 60 ++++++++++++++++++++-------------------- languages/pl_PL/lang.inc | 4 +-- languages/ru_RU/lang.inc | 8 +++--- languages/sv_SE/lang.inc | 34 +++++++++++------------ languages/tr_TR/lang.inc | 14 +++++----- languages/uk_UA/lang.inc | 4 +-- languages/zh_CN/lang.inc | 30 ++++++++++---------- languages/zh_TW/lang.inc | 6 ++-- 16 files changed, 142 insertions(+), 135 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index f0840b1c1..aecaecb28 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/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 (1254) +// Translators: Admin (1256) $text = array( 'accept' => 'وافق', @@ -471,7 +471,7 @@ URL: [url]', 'home_folder' => '', 'hourly' => 'بالساعة', 'hours' => 'ساعات', -'hr_HR' => '', +'hr_HR' => 'ﺎﻠﻛﺭﻭﺎﺘﻳﺓ', 'human_readable' => 'ارشيف مقروء', 'hu_HU' => 'مجرية', 'id' => 'معرف', @@ -538,7 +538,7 @@ URL: [url]', 'keywords' => 'كلمات البحث', 'keywords_loading' => '', 'keyword_exists' => 'كلمات البحث بالفعل موجودة', -'ko_KR' => '', +'ko_KR' => 'ﺎﻠﻛﻭﺮﻳﺓ', 'language' => 'اللغة', 'lastaccess' => '', 'last_update' => 'اخر تحديث', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 0a0af05ae..5ec8765b1 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 (660) +// Translators: Admin (662) $text = array( 'accept' => 'Acceptar', @@ -1109,7 +1109,7 @@ URL: [url]', 'theme' => 'Tema gràfic', 'thursday' => 'Dijous', 'thursday_abbr' => '', -'timeline' => '', +'timeline' => 'Linea de temps', 'timeline_add_file' => '', 'timeline_add_version' => '', 'timeline_full_add_file' => '', @@ -1136,7 +1136,7 @@ URL: [url]', 'transmittal_comment' => '', 'transmittal_name' => '', 'transmittal_size' => '', -'tree_loading' => '', +'tree_loading' => 'Espereu mentre l\'arbre de documents es carrega...', 'trigger_workflow' => '', 'tr_TR' => '', 'tuesday' => 'Dimarts', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 2bf6b3417..4433d5cad 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 (702), kreml (455) +// Translators: Admin (703), kreml (455) $text = array( 'accept' => 'Přijmout', @@ -1262,7 +1262,7 @@ URL: [url]', 'timeline_skip_status_change_1' => '', 'timeline_skip_status_change_2' => '', 'timeline_skip_status_change_3' => '', -'timeline_status_change' => '', +'timeline_status_change' => 'Verze [version]: [status]', 'to' => 'Do', 'toggle_manager' => 'Přepnout správce', 'to_before_from' => 'Datum ukončení nesmí být před datem zahájení', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 23b6b1e9c..1f2c7ed29 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 (2154), dgrutsch (18) +// Translators: Admin (2154), dgrutsch (21) $text = array( 'accept' => 'Übernehmen', @@ -683,7 +683,7 @@ URL: [url]', 'no_user_image' => 'Kein Bild vorhanden', 'no_version_check' => 'Ein Check auf neuere Versionen von SeedDMS ist fehlgeschlagen. Dies könnte daran liegen, dass allow_url_fopen in der PHP-Konfiguration auf 0 gesetzt ist.', 'no_version_modification' => 'Keine Modifikationen an einer Version', -'no_workflow_available' => '', +'no_workflow_available' => 'Kein Workflow verfügbar', 'objectcheck' => 'Ordner- und Dokumentenprüfung', 'obsolete' => 'veraltet', 'october' => 'Oktober', @@ -777,8 +777,15 @@ URL: [url]', 'remove_marked_files' => 'Markierte Dateien löschen', 'repaired' => 'repariert', 'repairing_objects' => 'Repariere Dokumente und Ordner.', -'request_workflow_action_email_body' => '', -'request_workflow_action_email_subject' => '', +'request_workflow_action_email_body' => 'Der Workflow hat einen Status erreicht welcher Ihre Aktion benötigt. +Dokument: [name] +Version: [version] +Workflow: [workflow] +Aktueller Status: [current_state] +Übergeordneter Ordner: [folder_path] +Benutzer: [username] +URL: [url]', +'request_workflow_action_email_subject' => 'Workflow-Aktion benötigt', 'reset_checkout' => 'Auschecken beenden', 'results_page' => 'Ergebnis-Seite', 'return_from_subworkflow' => 'Rückkehr aus Sub-Workflow', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 64b1436e4..73e4e9068 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 (1287), dgrutsch (3), netixw (14) +// Translators: Admin (1287), dgrutsch (7), netixw (14) $text = array( 'accept' => 'Accept', @@ -475,7 +475,7 @@ URL: [url]', 'group_info' => 'Group information', 'group_management' => 'Groups management', 'group_members' => 'Group members', -'group_receipt_summary' => '', +'group_receipt_summary' => 'Group receipt confirmations overview.', 'group_review_summary' => 'Group review summary', 'guest_login' => 'Login as guest', 'guest_login_disabled' => 'Guest login is disabled.', @@ -675,7 +675,7 @@ URL: [url]', 'no_group_members' => 'This group has no members', 'no_linked_files' => 'No linked files', 'no_previous_versions' => 'No other versions found', -'no_receipt_needed' => '', +'no_receipt_needed' => 'There are currently no documents requiring a receipt confirmation.', 'no_review_needed' => 'No review pending.', 'no_revision_needed' => 'No revision pending.', 'no_revision_planed' => 'No revision of document scheduled', @@ -683,7 +683,7 @@ URL: [url]', 'no_user_image' => 'No image found', 'no_version_check' => 'Checking for a new version of SeedDMS has failed! This could be caused by allow_url_fopen being set to 0 in your php configuration.', 'no_version_modification' => 'No version modification', -'no_workflow_available' => '', +'no_workflow_available' => 'No workflow available', 'objectcheck' => 'Folder/Document check', 'obsolete' => 'Obsolete', 'october' => 'October', @@ -777,13 +777,13 @@ URL: [url]', 'remove_marked_files' => 'Remove marked files', 'repaired' => 'repaired', 'repairing_objects' => 'Repairing documents and folders.', -'request_workflow_action_email_body' => 'The workflow has reached a state which requires your action. -Document: [name] -Version: [version] -Workflow: [workflow] -Current state: [current_state] -Parent folder: [folder_path] -User: [username] +'request_workflow_action_email_body' => 'The workflow has reached a state which requires your action. +Document: [name] +Version: [version] +Workflow: [workflow] +Current state: [current_state] +Parent folder: [folder_path] +User: [username] URL: [url]', 'request_workflow_action_email_subject' => 'Workflow action required', 'reset_checkout' => 'Finish Check out', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 4b81ca1ac..ce1186487 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 (1005), jeromerobert (50), lonnnew (9) +// Translators: Admin (1009), jeromerobert (50), lonnnew (9) $text = array( 'accept' => 'Accepter', @@ -132,12 +132,12 @@ URL : [url]', 'attrdef_objtype' => 'Type objet', 'attrdef_regex' => 'Expression régulière', 'attrdef_type' => 'Type', -'attrdef_type_boolean' => '', +'attrdef_type_boolean' => 'Valeur booléenne', 'attrdef_type_date' => '', 'attrdef_type_email' => '', -'attrdef_type_float' => '', -'attrdef_type_int' => '', -'attrdef_type_string' => '', +'attrdef_type_float' => 'Décimal', +'attrdef_type_int' => 'Entier', +'attrdef_type_string' => 'Chaîne', 'attrdef_type_url' => '', 'attrdef_valueset' => 'Ensemble de valeurs', 'attributes' => 'Attributs', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index f29a1794a..29fbab3af 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 (577), ribaz (1019) +// Translators: Admin (581), ribaz (1019) $text = array( 'accept' => 'Elfogad', @@ -132,12 +132,12 @@ URL: [url]', 'attrdef_objtype' => 'Objektum típus', 'attrdef_regex' => 'Szabályos kifejezés', 'attrdef_type' => 'Típus', -'attrdef_type_boolean' => '', +'attrdef_type_boolean' => 'Logikai', 'attrdef_type_date' => 'Dátum', 'attrdef_type_email' => '', -'attrdef_type_float' => '', -'attrdef_type_int' => '', -'attrdef_type_string' => '', +'attrdef_type_float' => 'Szám tizedesjeggyel', +'attrdef_type_int' => 'Egész szám', +'attrdef_type_string' => 'Szöveg', 'attrdef_type_url' => '', 'attrdef_valueset' => 'Értékek beállítása', 'attributes' => 'Jellemzők', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 5973ddcc8..111b10f53 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/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 (936), daivoc (379) +// Translators: Admin (936), daivoc (400) $text = array( 'accept' => '동의', @@ -231,7 +231,7 @@ URL: [url]', 'clipboard' => '클립보드', 'close' => '닫기', 'comment' => '코멘트', -'comment_changed_email' => '', +'comment_changed_email' => '변경된 이메일 코멘트', 'comment_for_current_version' => '코맨트', 'confirm_create_fulltext_index' => '예, 전체 텍스트 인덱스를 다시 만들고 싶습니다!', 'confirm_pwd' => '비밀번호 확인', @@ -472,10 +472,10 @@ URL: [url]', 'groups' => '그룹', 'group_approval_summary' => '그룹의 승인 요약', 'group_exists' => '그룹이 이미 존재합니다.', -'group_info' => '', +'group_info' => '그룹 정보', 'group_management' => '그룹 관리', 'group_members' => '카페 회원', -'group_receipt_summary' => '', +'group_receipt_summary' => '그룹 접수 요약', 'group_review_summary' => '그룹 검토 요약', 'guest_login' => '게스트로 로그인', 'guest_login_disabled' => '고객 로그인을 사용할 수 없습니다.', @@ -494,7 +494,7 @@ URL: [url]', 'index_converters' => '인덱스 문서 변환', 'index_folder' => '인덱스 폴더', 'individuals' => '개인', -'indivіduals_in_groups' => '', +'indivіduals_in_groups' => '개별 그룹', 'inherited' => '상속', 'inherits_access_copy_msg' => '상속 액세스 목록 복사', 'inherits_access_empty_msg' => '빈 액세스 목록으로 시작', @@ -507,8 +507,8 @@ URL: [url]', 'invalid_create_date_end' => '작성 날짜 범위에 대한 잘못된 종료 날짜.', 'invalid_create_date_start' => '작성 날짜 범위에 대한 잘못된 시작 날짜.', 'invalid_doc_id' => '잘못된 문서 ID', -'invalid_expiration_date_end' => '', -'invalid_expiration_date_start' => '', +'invalid_expiration_date_end' => '잘못된 유효 기간 종료', +'invalid_expiration_date_start' => '잘못된 유효 기간 시작', 'invalid_file_id' => '잘못된 파일 ID', 'invalid_folder_id' => '잘못된 폴더 ID', 'invalid_group_id' => '잘못된 그룹 ID', @@ -676,7 +676,7 @@ URL : [url]', 'no_group_members' => '그룹 회원 이 없습니다.', 'no_linked_files' => '링크되지 않은 파일', 'no_previous_versions' => '다른 버전을 찾을 수 없습니다', -'no_receipt_needed' => '', +'no_receipt_needed' => '접수가 필요하지 않습니다', 'no_review_needed' => '검토중인 자료가 없습니다.', 'no_revision_needed' => '보류된 개정은 없습니다.', 'no_revision_planed' => '문서의 개정 예약이 없습니다.', @@ -684,7 +684,7 @@ URL : [url]', 'no_user_image' => '이미지를 찾을 수 없습니다', 'no_version_check' => 'SeedDMS의 새 버전 확인을 실패 했습니다! 이것은 PHP 설정에서 allow_url_fopen 값이 0으로 설정 되면 발생할 수 있습니다.', 'no_version_modification' => '버전의 변동사항이 없습니다.', -'no_workflow_available' => '', +'no_workflow_available' => '사용 가능한 워크 플로우 없습니다.', 'objectcheck' => '폴더 / 문서 확인', 'obsolete' => '폐기', 'october' => '10월', @@ -720,15 +720,15 @@ URL : [url]', 'password_strength' => '강력한 비밀번호', 'password_strength_insuffient' => '부족한 비밀번호 강도', 'password_wrong' => '잘못된 비밀번호', -'pending_approvals' => '', -'pending_reviews' => '', +'pending_approvals' => '승인 보류', +'pending_reviews' => '미리보기 보류', 'personal_default_keywords' => '개인 키워드 목록', 'pl_PL' => '폴란드어', 'possible_substitutes' => '대체', -'preview' => '', +'preview' => '미리보기', 'preview_converters' => '문서 변환 미리보기', -'preview_markdown' => '', -'preview_plain' => '', +'preview_markdown' => '마크다운 미리보기', +'preview_plain' => '미리보기', 'previous_state' => '이전 상태', 'previous_versions' => '이전 버전', 'pt_BR' => '포르투갈어 (BR)', @@ -737,8 +737,8 @@ URL : [url]', 'quota_is_disabled' => '할당량 지원이 설정에서 비활성화되어 있습니다. 다시 활성화 될 때까지 사용자의 할당량 설정은 적용되지 않습니다.', 'quota_warning' => '당신의 최대 디스크 사용량 [bytes] 초과됩니다. 문서 또는 이전 버전을 제거하십시오.', 'receipt_log' => '로그 수신', -'receipt_request_email_body' => '', -'receipt_request_email_subject' => '', +'receipt_request_email_body' => '이메일 내용 확인 요청', +'receipt_request_email_subject' => '이메일 제목 확인 요청', 'receipt_summary' => '접수증 요약', 'recipients' => '받는 사람', 'refresh' => '새로 고침', @@ -826,8 +826,8 @@ URL: [url]', 'revise_document_on' => '문서 버전의 다음 개정 [날짜]', 'revision_date' => '개정 일자', 'revision_log' => '개정 로그', -'revision_request_email_body' => '', -'revision_request_email_subject' => '', +'revision_request_email_body' => '수정 요청 메일 내용', +'revision_request_email_subject' => '수정 요청 이메일 제목', 'revisors' => '감사', 'revisor_already_assigned' => '이미 감사가 선임이 된 사용자.', 'revisor_already_removed' => '감사는 문서의 개정을 과정에서 삭제했거나 이미 개정을 완료 했습니다.', @@ -897,9 +897,9 @@ URL : [url]', 'select_category' => '범주를 선택합니다', 'select_groups' => '그룹을 선택합니다', 'select_grp_approvers' => '그룹 승인을 선택합니다', -'select_grp_ind_approvers' => '', -'select_grp_ind_notification' => '', -'select_grp_ind_reviewers' => '', +'select_grp_ind_approvers' => '그룹 승인 선택', +'select_grp_ind_notification' => '알림 그룹 선택', +'select_grp_ind_reviewers' => '그룹 검토자 선택', 'select_grp_notification' => '그룹 통지를 선택합니다', 'select_grp_recipients' => '받는 사람 그룹을 클릭하시오', 'select_grp_reviewers' => '그룹 검토를 선택합니다', @@ -1274,7 +1274,7 @@ URL : [url]', 'timeline_full_add_file' => '[document]
                    새로운 첨부', 'timeline_full_add_version' => '[document]
                    새버전 [version]', 'timeline_full_status_change' => '[document]
                    버전[version]: [status]', -'timeline_selected_item' => '', +'timeline_selected_item' => '선택된 타임라인 항목', 'timeline_skip_add_file' => '첨부 파일 이 추가 되었습니다', 'timeline_skip_status_change_-1' => '거부', 'timeline_skip_status_change_-3' => '만료', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 8af238b32..9854b15a0 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/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 (711), gijsbertush (7), pepijn (45), reinoutdijkstra@hotmail.com (270) +// Translators: Admin (713), gijsbertush (35), pepijn (45), reinoutdijkstra@hotmail.com (270) $text = array( 'accept' => 'Accept', @@ -89,7 +89,7 @@ Map: [folder_path] Gebruiker: [username] URL: [url]', 'approval_deletion_email_subject' => '[sitename]: [name] - Verzoek om goedkeuring verwijderd', -'approval_file' => '', +'approval_file' => 'Goedkeuring bestand', 'approval_group' => 'Goedkeuring Groep', 'approval_log' => 'Goedkeuring overzicht', 'approval_request_email' => 'Goedkeuring verzoek', @@ -102,13 +102,13 @@ URL: [url]', 'approval_request_email_subject' => '[Naam site]: [naam] - Toestemming vereist', 'approval_status' => 'Goedkeuring Status', 'approval_submit_email' => '', -'approval_submit_email_body' => '', +'approval_submit_email_body' => 'Goedkeuringings-email versturen', 'approval_submit_email_subject' => '[sitename]: [name] - Uitgevoerde [Goedkeuring]', 'approval_summary' => 'Goedkeuring Samenvatting', 'approval_update_failed' => 'Fout bij bijwerken Goedkeuring status. Bijwerken mislukt.', 'approvers' => 'Autoriseerders', -'approver_already_assigned' => '', -'approver_already_removed' => '', +'approver_already_assigned' => 'autoriseerder al aangewezen', +'approver_already_removed' => 'autoriseerder reeds verwijderd', 'april' => 'april', 'archive_creation' => 'Archief aanmaken', 'archive_creation_warning' => 'Met deze handeling maakt U een Archief aan van alle bestanden in het DMS. Na het aanmaken van het Archief, wordt deze opgeslagen in de data-map van uw server.
                    Waarschuwing: een leesbaar Archief kan niet worden gebruikt voor server back-up doeleinde.', @@ -131,11 +131,11 @@ URL: [url]', 'attrdef_regex' => 'Veelgebruikte uitdrukking', 'attrdef_type' => 'Type', 'attrdef_type_boolean' => '', -'attrdef_type_date' => '', -'attrdef_type_email' => '', -'attrdef_type_float' => '', +'attrdef_type_date' => 'attribuut: datum', +'attrdef_type_email' => 'attribuut: email', +'attrdef_type_float' => 'attribuut: decimaal getaal', 'attrdef_type_int' => '', -'attrdef_type_string' => '', +'attrdef_type_string' => 'attribuut: string', 'attrdef_type_url' => '', 'attrdef_valueset' => 'Verzameling waarden', 'attributes' => 'Attributen', @@ -149,14 +149,14 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Attribuut gewijzigd', 'attribute_count' => 'Aantal maal gebruikt', 'attribute_value' => 'Waarde van het attribuut', -'attr_malformed_email' => '', +'attr_malformed_email' => 'Foute vormgeving email', 'attr_malformed_url' => '', -'attr_max_values' => '', +'attr_max_values' => 'attribuut: maximale waarde', 'attr_min_values' => '', 'attr_no_regex_match' => 'De waarde van het attribuut komt niet overeen met de veelgebruikte uitdrukking (regular expression)', 'at_least_n_users_of_group' => 'Minimaal [number_of_users] gebruikers van [group]', 'august' => 'augustus', -'authentication' => '', +'authentication' => 'Authentificatie', 'author' => '', 'automatic_status_update' => 'Automatische Status wijziging', 'back' => 'Terug', @@ -179,7 +179,7 @@ URL: [url]', 'cannot_retrieve_review_snapshot' => 'Niet mogelijk om [Controle] status voor de huidige versie van dit document te verkrijgen.', 'cannot_rm_root' => 'Foutmelding: U kunt de basis map niet verwijderen.', 'categories' => 'Categorieen', -'categories_loading' => '', +'categories_loading' => 'Categorieën worden geladen', 'category' => 'Categorie', 'category_exists' => 'Categorie bestaat al.', 'category_filter' => 'Alleen categorieen', @@ -190,7 +190,7 @@ URL: [url]', 'change_password' => 'Wijzig wachtwoord', 'change_password_message' => 'Wachtwoord is gewijzigd.', 'change_recipients' => '', -'change_revisors' => '', +'change_revisors' => 'wijzig redacteur', 'change_status' => 'Wijzig Status', 'charts' => 'Grafieken', 'chart_docsaccumulated_title' => 'Aantal documenten', @@ -202,11 +202,11 @@ URL: [url]', 'chart_selection' => 'Kies grafiek', 'chart_sizeperuser_title' => 'Schijfruimte per gebruiker', 'checkedout_file_has_different_version' => '', -'checkedout_file_has_disappeared' => '', +'checkedout_file_has_disappeared' => 'File is onvindbaar', 'checkedout_file_is_unchanged' => '', -'checkin_document' => '', -'checkout_document' => '', -'checkout_is_disabled' => '', +'checkin_document' => 'Veranderd document', +'checkout_document' => 'Checkout-document', +'checkout_is_disabled' => 'Checkout is niet mogelijk', 'choose_attrdef' => 'Selecteer een kenmerk definitie', 'choose_category' => 'Selecteer a.u.b.', 'choose_group' => 'Selecteer Groep', @@ -235,15 +235,15 @@ URL: [url]', 'confirm_rm_folder_files' => 'Weet U zeker dat U alle bestanden en submappen van de map "[foldername]" wilt verwijderen?
                    Let op: deze actie kan niet ongedaan worden gemaakt.', 'confirm_rm_group' => 'Weet U zeker dat U de Groep "[groupname]" wilt verwijderen?
                    Let op: deze handeling kan niet ongedaan worden gemaakt.', 'confirm_rm_log' => 'Weet U zeker dat U het logbestand "[logname]" wilt verwijderen?
                    Let op: deze handeling kan niet ongedaan worden gemaakt.', -'confirm_rm_transmittalitem' => '', +'confirm_rm_transmittalitem' => 'Bevestig te verzenden item', 'confirm_rm_user' => 'Weet U zeker dat U de Gebruiker "[username]" wilt verwijderen?
                    Let op: deze handeling kan niet ongedaan worden gemaakt.', 'confirm_rm_version' => 'Weet U zeker dat U deze versie van het document "[documentname]" wilt verwijderen?
                    Pas op: deze handeling kan niet ongedaan worden gemaakt.', 'confirm_update_transmittalitem' => '', 'content' => 'Welkomstpagina', 'continue' => 'Doorgaan', -'converter_new_cmd' => '', +'converter_new_cmd' => 'Wijziging: nieuw commando', 'converter_new_mimetype' => '', -'copied_to_checkout_as' => '', +'copied_to_checkout_as' => 'Gekopieerd naar checkout als:', 'create_fulltext_index' => 'Creeer volledige tekst index', 'create_fulltext_index_warning' => 'U staat op het punt de volledigetekst opnieuw te indexeren. Dit kan behoorlijk veel tijd en snelheid vergen van het systeem. Als u zeker bent om opnieuw te indexeren, bevestig deze actie.', 'creation_date' => 'Aangemaakt', @@ -265,7 +265,7 @@ URL: [url]', 'details_version' => 'Details voor versie: [version]', 'de_DE' => 'Duits', 'disclaimer' => 'Dit is een beveiligde omgeving. Gebruik is alleen toegestaan voor geautoriseerde leden. Ongeautoriseerde toegang kan worden bestraft overeenkomstig (inter)nationale wetgeving.', -'discspace' => '', +'discspace' => 'Schijfruimte', 'document' => 'Document', 'documents' => 'Documenten', 'documents_checked_out_by_you' => '', @@ -273,10 +273,10 @@ URL: [url]', 'documents_locked_by_you' => 'Documenten door U geblokkeerd', 'documents_only' => 'Alleen documenten', 'documents_to_approve' => 'Documenten die wachten op uw goedkeuring', -'documents_to_receipt' => '', +'documents_to_receipt' => 'documenten te ontvangen', 'documents_to_review' => 'Documenten die wachten op uw controle', 'documents_to_revise' => '', -'documents_user_rejected' => '', +'documents_user_rejected' => 'documenten niet geaccepteerd door gebruiker', 'documents_user_requiring_attention' => 'Eigen documenten die (nog) aandacht behoeven', 'document_already_checkedout' => '', 'document_already_locked' => 'Dit document is al geblokkeerd', @@ -299,7 +299,7 @@ Gebruiker: [username]', 'document_duplicate_name' => 'Dupliceer documentnaam', 'document_has_no_workflow' => 'Document bevat geen workflow', 'document_infos' => 'Document Informatie', -'document_is_checked_out' => '', +'document_is_checked_out' => 'Document is uitgecheckt.', 'document_is_not_locked' => 'Dit document is niet geblokkeerd', 'document_link_by' => 'Gekoppeld met', 'document_link_public' => 'Publiek', @@ -371,7 +371,7 @@ URL: [url]', 'edit_folder_notify' => 'Map Notificatie Lijst', 'edit_folder_props' => 'Wijzig Map eigenschappen', 'edit_group' => 'Wijzig Groep', -'edit_transmittal_props' => '', +'edit_transmittal_props' => 'Opmerkingen bij verzending', 'edit_user' => 'Wijzig gebruiker', 'edit_user_details' => 'Wijzig gebruiker Details', 'email' => 'E-mail', @@ -399,7 +399,7 @@ Bovenliggende map: [folder_path] Gebruiker: [username] URL: [url]', 'expiry_changed_email_subject' => '[sitename]: [name] - Vervaldatum gewijzigd', -'export' => '', +'export' => 'export', 'extension_manager' => 'Beheer uitbreidingen', 'february' => 'februari', 'file' => 'Bestand', @@ -468,7 +468,7 @@ URL: [url]', 'group_info' => '', 'group_management' => 'Groepen beheer', 'group_members' => 'Groepsleden', -'group_receipt_summary' => '', +'group_receipt_summary' => 'Overzicht van ontvangst per groep', 'group_review_summary' => 'Groep [Controle] samenvatting', 'guest_login' => 'Login als Gast', 'guest_login_disabled' => 'Gast login is uitgeschakeld.', @@ -481,7 +481,7 @@ URL: [url]', 'hu_HU' => 'Hongaars', 'id' => 'ID', 'identical_version' => 'Nieuwe versie is identiek aan de huidige versie', -'include_content' => '', +'include_content' => 'inclusief inhoud', 'include_documents' => 'Inclusief documenten', 'include_subdirectories' => 'Inclusief submappen', 'index_converters' => 'Index document conversie', @@ -545,7 +545,7 @@ URL: [url]', 'keyword_exists' => 'Sleutelwoord bestaat al', 'ko_KR' => 'Koreaans', 'language' => 'Talen', -'lastaccess' => '', +'lastaccess' => 'laatste toegang', 'last_update' => 'Laatste Update', 'legend' => 'Legenda', 'librarydoc' => '', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 982210171..46f66b9be 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (721), netixw (84), romi (93), uGn (112) +// Translators: Admin (722), netixw (84), romi (93), uGn (112) $text = array( 'accept' => 'Akceptuj', @@ -1234,7 +1234,7 @@ URL: [url]', 'thursday' => 'Czwartek', 'thursday_abbr' => 'Cz', 'timeline' => 'Zakres czasowy', -'timeline_add_file' => '', +'timeline_add_file' => 'Nowy załącznik', 'timeline_add_version' => '', 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 1e323b27f..727872c98 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/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 (1278) +// Translators: Admin (1281) $text = array( 'accept' => 'Принять', @@ -670,7 +670,7 @@ URL: [url]', 'no_update_cause_locked' => 'Вы не можете обновить документ. Свяжитесь с заблокировавшим его пользователем.', 'no_user_image' => 'Изображение не найдено', 'no_version_check' => '', -'no_version_modification' => '', +'no_version_modification' => 'Отсутвует версия модификации', 'no_workflow_available' => '', 'objectcheck' => 'Проверка каталога или документа', 'obsolete' => 'Устарел', @@ -772,7 +772,7 @@ URL: [url]', Пользователь: [username] URL: [url]', 'return_from_subworkflow_email_subject' => '[sitename]: выход из подпроцесса «[name]»', -'reverse_links' => '', +'reverse_links' => 'Документы, в которых есть ссылки на текущий документ', 'reviewers' => 'Рецензирующие', 'reviewer_already_assigned' => 'уже назначен на рецензирование', 'reviewer_already_removed' => 'уже удалён из списка рецензирующих или уже оставил рецензию', @@ -960,7 +960,7 @@ URL: [url]', 'settings_enableConverting' => 'Включить преобразование', 'settings_enableConverting_desc' => 'Включить/отключить преобразование файлов.', 'settings_enableDropUpload' => 'Включить быструю загрузку', -'settings_enableDropUpload_desc' => 'Вкл/выкл область в ""Просмотр папки"" для загрузки при помощи Drag&Drop.', +'settings_enableDropUpload_desc' => 'Вкл/выкл область в "Просмотр папки" для загрузки при помощи Drag&Drop.', 'settings_enableDuplicateDocNames' => 'Разрешить документы
                    с одинаковым названием', 'settings_enableDuplicateDocNames_desc' => 'Разрешить документы с одинаковым названием в каталоге.', 'settings_enableEmail' => 'Включить e-mail', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index ca53ba95c..b5332c924 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/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 (1098), tmichelfelder (106) +// Translators: Admin (1115), tmichelfelder (106) $text = array( 'accept' => 'Godkänn', @@ -125,12 +125,12 @@ URL: [url]', 'attrdef_objtype' => 'Objekttyp', 'attrdef_regex' => 'Regulär uttryck', 'attrdef_type' => 'Typ', -'attrdef_type_boolean' => '', -'attrdef_type_date' => '', +'attrdef_type_boolean' => 'Logisk', +'attrdef_type_date' => 'Datum', 'attrdef_type_email' => '', -'attrdef_type_float' => '', -'attrdef_type_int' => '', -'attrdef_type_string' => '', +'attrdef_type_float' => 'Flyttal', +'attrdef_type_int' => 'Heltal', +'attrdef_type_string' => 'Textsträng', 'attrdef_type_url' => '', 'attrdef_valueset' => 'Värden', 'attributes' => 'Attribut', @@ -909,8 +909,8 @@ URL: [url]', 'settings_cannot_disable' => 'Filen ENABLE_INSTALL_TOOL kunde inte tas bort', 'settings_checkOutDir' => '', 'settings_checkOutDir_desc' => '', -'settings_cmdTimeout' => '', -'settings_cmdTimeout_desc' => '', +'settings_cmdTimeout' => 'Tidsgräns för externa kommandon', +'settings_cmdTimeout_desc' => 'Denna tid i sekunder bestämmer när ett externt kommando (t.ex. för att skapa den fullständiga texten till index) kommer att avslutas.', 'settings_contentDir' => 'Mapp för innehållet', 'settings_contentDir_desc' => 'Mappen där alla uppladdade filer kommer att sparas. (Det bästa är att välja en mapp som inte är tillgänglig från webbservern)', 'settings_contentOffsetDir' => 'Innehåll offset-mapp', @@ -954,8 +954,8 @@ URL: [url]', 'settings_enableClipboard_desc' => 'Aktivera/Inaktivera urklipp funktionen.', 'settings_enableConverting' => 'Aktivera filkonvertering', 'settings_enableConverting_desc' => 'Aktivera/Inaktivera konvertering av filer', -'settings_enableDropUpload' => '', -'settings_enableDropUpload_desc' => '', +'settings_enableDropUpload' => 'Aktivera snabb uppladdning', +'settings_enableDropUpload_desc' => 'Aktivera / avaktivera droppområdet på "Visa mapp" sidan för att ladda upp filer genom att dra och släppa.', 'settings_enableDuplicateDocNames' => 'Tillåter samma dokumentnamn', 'settings_enableDuplicateDocNames_desc' => 'Tillåter att det finns dokument med samma namn i en mapp.', 'settings_enableEmail' => 'Använd e-postmeddelanden', @@ -1013,8 +1013,8 @@ URL: [url]', 'settings_firstDayOfWeek_desc' => 'Första dagen i veckan', 'settings_footNote' => 'Fotnot', 'settings_footNote_desc' => 'Meddelande som visas på slutet av varje sida', -'settings_fullSearchEngine' => '', -'settings_fullSearchEngine_desc' => '', +'settings_fullSearchEngine' => 'Sökmotor för fulltextsökning', +'settings_fullSearchEngine_desc' => 'Se metoder som används för fulltextsökning.', 'settings_fullSearchEngine_vallucene' => 'Zend Lucene', 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS', 'settings_guestID' => 'Gäst-ID', @@ -1058,8 +1058,8 @@ URL: [url]', 'settings_Notification' => 'Meddelandeinställningar', 'settings_notwritable' => 'Konfigurationen kunde inte sparas, eftersom konfigurationsfilen inte är skrivbar.', 'settings_no_content_dir' => 'Mapp för innehåll', -'settings_overrideMimeType' => '', -'settings_overrideMimeType_desc' => '', +'settings_overrideMimeType' => 'Åsido Mediatyp (Mime)', +'settings_overrideMimeType_desc' => 'Åsidosätta MimeType levererad av webbläsaren, om en fil överförs. Den nya Mediatyp bestäms av SeedDMS själv.', 'settings_partitionSize' => 'Uppdelad filstorlek', 'settings_partitionSize_desc' => 'Storlek hos uppdelade filer i bytes som laddades upp med jumploader. Sätt inte ett värde som är större än den högsta tillåtna storleken på servern.', 'settings_passwordExpiration' => 'Lösenord utgångsdatum', @@ -1079,8 +1079,8 @@ URL: [url]', 'settings_php_gd2' => 'PHP-extension : php_gd2', 'settings_php_mbstring' => 'PHP-extension : php_mbstring', 'settings_php_version' => 'PHP Version', -'settings_presetExpirationDate' => '', -'settings_presetExpirationDate_desc' => '', +'settings_presetExpirationDate' => 'Förinställda utgångsdatum', +'settings_presetExpirationDate_desc' => 'Alla nya dokument som uppladdas kommer att ha ett utgångsdatum satt till detta värde. Det datum som har angetts kan anges som förstås av PHP strtotime () funktion, t.ex. +5 Veckor.', 'settings_previewWidthDetail' => 'Bredd av bild förhandsvisning av (detalj)', 'settings_previewWidthDetail_desc' => 'Bredd av bild förhandsvisning på detaljsidan', 'settings_previewWidthList' => 'Bredd av bild förhandsvisning (lista)', @@ -1152,7 +1152,7 @@ URL: [url]', 'settings_workflowMode_desc' => 'Det avancerade arbetsflödet gör det möjligt att lägga upp ett eget definerat gransknings- och godkännandeflöde för dokumentversioner.', 'settings_workflowMode_valadvanced' => 'avancerat', 'settings_workflowMode_valtraditional' => 'traditionellt', -'settings_workflowMode_valtraditional_only_approval' => '', +'settings_workflowMode_valtraditional_only_approval' => 'traditionell (utan omdöme)', 'settings_zendframework' => 'Zend Framework', 'set_expiry' => 'Sätt utgångstid', 'set_owner' => 'Ange dokumentägare', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index c840bbab8..7f182a21d 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 (1024), aydin (83) +// Translators: Admin (1030), aydin (83) $text = array( 'accept' => 'Kabul', @@ -131,11 +131,11 @@ URL: [url]', 'attrdef_objtype' => 'Nesne türü', 'attrdef_regex' => 'Düzenli ifade (Regular expression)', 'attrdef_type' => 'Tür', -'attrdef_type_boolean' => '', +'attrdef_type_boolean' => 'Mantık', 'attrdef_type_date' => 'Tarih', 'attrdef_type_email' => '', 'attrdef_type_float' => '', -'attrdef_type_int' => '', +'attrdef_type_int' => 'TamSayı', 'attrdef_type_string' => '', 'attrdef_type_url' => '', 'attrdef_valueset' => 'Değer', @@ -867,15 +867,15 @@ URL: [url]', 'search_fulltext' => 'Tam metinde ara', 'search_in' => 'Şurada ara', 'search_mode_and' => 'tüm sözcükler', -'search_mode_documents' => '', -'search_mode_folders' => '', +'search_mode_documents' => 'Sadece Belgeler', +'search_mode_folders' => 'Sadece Klasörler', 'search_mode_or' => 'en az bir sözcük', 'search_no_results' => 'Arama kriterinize uyan bir doküman bulunamadı', 'search_query' => 'Arama sorgusu', 'search_report' => '[doccount] adet dosya ve [foldercount] adet klasör [searchtime] saniye içinde bulundu', 'search_report_fulltext' => '[doccount] adet doküman bulundu', -'search_resultmode' => '', -'search_resultmode_both' => '', +'search_resultmode' => 'Arama Sonuçları', +'search_resultmode_both' => 'Dökümanlar ve Klasörler', 'search_results' => 'Arama sonucu', 'search_results_access_filtered' => 'Arama sonuçları içerisinde erişimin kısıtlandığı içerik bulunabilir.', 'search_time' => 'Arama süresi: [time] sn.', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 7c0f0ca63..aca72f6ed 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/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 (1132) +// Translators: Admin (1133) $text = array( 'accept' => 'Прийняти', @@ -982,7 +982,7 @@ URL: [url]', 'settings_enableConverting' => 'Увімкнути перетворення', 'settings_enableConverting_desc' => 'Увімкнути/вимкнути перетворення файлів.', 'settings_enableDropUpload' => 'Увімкнути швидке завантаження', -'settings_enableDropUpload_desc' => 'Увімкнути/вимкнути область в ""Перегляді каталогу"" для завантаження за допомогою Drag&Drop.', +'settings_enableDropUpload_desc' => 'Увімкнути/вимкнути область в "Перегляді каталогу" для завантаження за допомогою Drag&Drop.', 'settings_enableDuplicateDocNames' => 'Дозволити документи
                    з однаковою назвою', 'settings_enableDuplicateDocNames_desc' => 'Дозволити документи з однаковими назвами в каталозі.', 'settings_enableEmail' => 'Увімкнути e-mail', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 8de46bcb9..38ff3be5b 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (617), fengjohn (5) +// Translators: Admin (628), fengjohn (5) $text = array( 'accept' => '接受', @@ -42,8 +42,8 @@ URL: [url]', 'actions' => '动作', 'action_approve' => '', 'action_complete' => '', -'action_is_complete' => '', -'action_is_not_complete' => '', +'action_is_complete' => '完成', +'action_is_not_complete' => '未完成', 'action_reject' => '拒绝', 'action_review' => '检查', 'action_revise' => '', @@ -80,7 +80,7 @@ URL: [url]', 'all_users' => '所有用户', 'already_subscribed' => '已经订阅', 'and' => 'and', -'apply' => '', +'apply' => '应用', 'approval_deletion_email' => '审核请求已被删除', 'approval_deletion_email_body' => '', 'approval_deletion_email_subject' => '', @@ -120,12 +120,12 @@ URL: [url]', 'attrdef_objtype' => '类别', 'attrdef_regex' => '正则表达式', 'attrdef_type' => '类型', -'attrdef_type_boolean' => '', +'attrdef_type_boolean' => '布尔', 'attrdef_type_date' => '日期', 'attrdef_type_email' => '', -'attrdef_type_float' => '', -'attrdef_type_int' => '', -'attrdef_type_string' => '', +'attrdef_type_float' => '浮点', +'attrdef_type_int' => '整数', +'attrdef_type_string' => '字符串', 'attrdef_type_url' => '', 'attrdef_valueset' => '属性值', 'attributes' => '属性', @@ -140,7 +140,7 @@ URL: [url]', 'attr_no_regex_match' => '', 'at_least_n_users_of_group' => '', 'august' => '八 月', -'authentication' => '', +'authentication' => '认证', 'author' => '', 'automatic_status_update' => '自动状态变化', 'back' => '返回', @@ -251,7 +251,7 @@ URL: [url]', 'details_version' => '版本详情:[version]', 'de_DE' => '德国语', 'disclaimer' => '警告：这是机密区.只有授权用户才被允许访问.任何违反行为将受到法律制裁', -'discspace' => '', +'discspace' => '磁盘空间', 'document' => '文档', 'documents' => '文档', 'documents_checked_out_by_you' => '', @@ -473,11 +473,11 @@ URL: [url]', 'keep' => '', 'keep_doc_status' => '', 'keywords' => '关键字', -'keywords_loading' => '等待中，正在整理关键词列表', +'keywords_loading' => '请稍等，直到关键字列表载入', 'keyword_exists' => '关键字已存在', 'ko_KR' => '韩国人', 'language' => '语言', -'lastaccess' => '', +'lastaccess' => '最后登录', 'last_update' => '上次更新', 'legend' => '', 'librarydoc' => '', @@ -1111,15 +1111,15 @@ URL: [url]', 'thursday' => 'Thursday', 'thursday_abbr' => '', 'timeline' => '时间轴', -'timeline_add_file' => '', +'timeline_add_file' => '新附件', 'timeline_add_version' => '', 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '', 'timeline_selected_item' => '', 'timeline_skip_add_file' => '', -'timeline_skip_status_change_-1' => '', -'timeline_skip_status_change_-3' => '', +'timeline_skip_status_change_-1' => '拒绝', +'timeline_skip_status_change_-3' => '过期', 'timeline_skip_status_change_0' => '', 'timeline_skip_status_change_1' => '', 'timeline_skip_status_change_2' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index ea96ddbcb..b853aa096 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 (2349) +// Translators: Admin (2351) $text = array( 'accept' => '接受', @@ -1122,7 +1122,7 @@ URL: [url]', 'timeline_skip_status_change_1' => '', 'timeline_skip_status_change_2' => '', 'timeline_skip_status_change_3' => '', -'timeline_status_change' => '', +'timeline_status_change' => '版本 [版本號]:[狀態]', 'to' => '到', 'toggle_manager' => '角色切換', 'to_before_from' => '', @@ -1135,7 +1135,7 @@ URL: [url]', 'transmittal_comment' => '', 'transmittal_name' => '', 'transmittal_size' => '', -'tree_loading' => '', +'tree_loading' => '請稍待，直到文件樹狀結構載入完畢...', 'trigger_workflow' => '', 'tr_TR' => '土耳其語', 'tuesday' => 'Tuesday', From e0ae06441e3a53b9224552f4264554dcc15354c9 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 19 Jan 2016 15:24:23 +0100 Subject: [PATCH 62/65] check for env variabel SEEDDMS_HOME --- utils/seeddms-adddoc | 6 +++++- utils/seeddms-createfolder | 6 +++++- utils/seeddms-indexer | 6 +++++- utils/seeddms-xmldump | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/utils/seeddms-adddoc b/utils/seeddms-adddoc index 3f7d16b0b..b091f179e 100755 --- a/utils/seeddms-adddoc +++ b/utils/seeddms-adddoc @@ -1,2 +1,6 @@ #!/bin/sh -/usr/bin/php -f /usr/share/seeddms/utils/adddoc.php -- $* +if [ -z ${SEEDDMS_HOME+x} ]; then + echo "Please set SEEDDMS_HOME before running this script"; + exit 1; +fi +php -f ${SEEDDMS_HOME}/utils/adddoc.php -- $* diff --git a/utils/seeddms-createfolder b/utils/seeddms-createfolder index e1aca29ea..b7f96d9da 100755 --- a/utils/seeddms-createfolder +++ b/utils/seeddms-createfolder @@ -1,2 +1,6 @@ #!/bin/sh -/usr/bin/php -f /usr/share/seeddms/utils/createfolder.php -- $* +if [ -z ${SEEDDMS_HOME+x} ]; then + echo "Please set SEEDDMS_HOME before running this script"; + exit 1; +fi +php -f ${SEEDDMS_HOME}/utils/createfolder.php -- $* diff --git a/utils/seeddms-indexer b/utils/seeddms-indexer index 59190069e..51719c94f 100755 --- a/utils/seeddms-indexer +++ b/utils/seeddms-indexer @@ -1,2 +1,6 @@ #!/bin/sh -/usr/bin/php -f /usr/share/seeddms/utils/indexer.php -- $* +if [ -z ${SEEDDMS_HOME+x} ]; then + echo "Please set SEEDDMS_HOME before running this script"; + exit 1; +fi +php -f ${SEEDDMS_HOME}/utils/indexer.php -- $* diff --git a/utils/seeddms-xmldump b/utils/seeddms-xmldump index 62acd34e1..9ce43235c 100755 --- a/utils/seeddms-xmldump +++ b/utils/seeddms-xmldump @@ -1,2 +1,6 @@ #!/bin/sh -/usr/bin/php -f /usr/share/seeddms/utils/xmldump -- $* +if [ -z ${SEEDDMS_HOME+x} ]; then + echo "Please set SEEDDMS_HOME before running this script"; + exit 1; +fi +php -f ${SEEDDMS_HOME}/utils/xmldump -- $* From c43c5e64eb088ad8b6691a1190604354b68f979f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 19 Jan 2016 15:30:54 +0100 Subject: [PATCH 63/65] ldap search can be filtered --- conf/settings.xml.template | 2 ++ inc/inc.ClassSettings.php | 3 +++ install/settings.xml.template_install | 2 ++ op/op.Login.php | 26 +++++++++++++++++--------- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/conf/settings.xml.template b/conf/settings.xml.template index 11e30dcd4..e8c0f56ae 100644 --- a/conf/settings.xml.template +++ b/conf/settings.xml.template @@ -111,6 +111,7 @@ - URIs are supported, e.g.: ldaps://ldap.host.com - port: port of the authentification server - baseDN: top level of the LDAP directory tree + - filter: Additional filters which are to be checked -->