From 54fe74e1204e74d0ff0bcb22934621413c801d81 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Sun, 31 Mar 2013 21:49:44 +0200 Subject: [PATCH 01/70] fix grammar and translation errors --- languages/ru_RU/lang.inc | 44 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 4c8e4fbc5..9d4f0aa53 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -37,7 +37,7 @@ $text = array( 'add_group' => "Добавить группу", 'add_member' => "Добавить члена", 'add_multiple_documents' => "Добавить несколько документов", -'add_multiple_files' => "Добавить несколько файлов (название файла будет использоана в качестве названия документа)", +'add_multiple_files' => "Добавить несколько файлов (название файла будет использоано в качестве названия документа)", 'add_subfolder' => "Добавить подкаталог", 'add_user' => "Добавить пользователя", 'add_user_to_group' => "Добавить пользователя в группу", @@ -56,7 +56,7 @@ $text = array( 'approval_status' => "Статус утверждения", 'approval_submit_email' => "Утверждено", 'approval_summary' => "Инфо об утверждении", -'approval_update_failed' => "Произошла ошибка при изменении статусаутверждения", +'approval_update_failed' => "Произошла ошибка при изменении статуса утверждения", 'approvers' => "Утверждающие", 'april' => "Апрель", 'archive_creation' => "Создание архива", @@ -66,7 +66,7 @@ $text = array( 'assign_user_property_to' => "Назначить свойства пользователя", 'assumed_released' => "Утвержден", 'august' => "Август", -'automatic_status_update' => "Автоматическое изменения статуса", +'automatic_status_update' => "Автоматическое изменение статуса", 'back' => "Назад", 'backup_list' => "Список бекапов", 'backup_remove' => "Удалить бекап", @@ -127,7 +127,7 @@ $text = array( 'delete' => "Удалить", 'details' => "Детали", 'details_version' => "Детали версии: [version]", -'disclaimer' => "Работаем аккуратно и вдумчиво. От этого зависит будущее нашей с вами страны и благополучие народа. Даешь пятилетку за три года!", +'disclaimer' => "Работник, помни! От тебя зависит успех фирмы и всей страны!", 'do_object_repair' => "Исправить все папки и документы", 'document_already_locked' => "Документ уже заблокирован", 'document_deleted' => "Документ удален", @@ -162,12 +162,12 @@ $text = array( 'edit_document_access' => "Редактировать доступ", 'edit_document_notify' => "Список уведомления документа", 'edit_document_props' => "Редактировать документ", -'edit' => "РЕдактировать", +'edit' => "Редактировать", 'edit_event' => "Редактировать событие", -'edit_existing_access' => "Редактироват список доступа", -'edit_existing_notify' => "Редактироват список уведомления", -'edit_folder_access' => "РЕдактировать доступ", -'edit_folder_notify' => "Список уведомления папки", +'edit_existing_access' => "Редактировать список доступа", +'edit_existing_notify' => "Редактировать список уведомлений", +'edit_folder_access' => "Редактировать доступ", +'edit_folder_notify' => "Список уведомлений папки", 'edit_folder_props' => "Редактировать папку", 'edit_group' => "Редактировать группу", 'edit_user_details' => "Редактировать данные пользователя", @@ -225,7 +225,7 @@ $text = array( 'individuals' => "Личности", 'inherits_access_msg' => "Доступ унаследован.", 'inherits_access_copy_msg' => "Скопировать наследованный список", -'inherits_access_empty_msg' => "Начать с пустова списка доступа", +'inherits_access_empty_msg' => "Начать с пустого списка доступа", 'internal_error_exit' => "Внутренняя ошибка. Невозможно выполнить запрос. Завершение.", 'internal_error' => "Внутренняя ошибка", 'invalid_access_mode' => "Неверный уровень доступа", @@ -287,7 +287,7 @@ $text = array( 'logout' => "Выход", 'manager' => "Менеджер", 'march' => "Март", -'max_upload_size' => "Лимит размера файла", +'max_upload_size' => "Максимальный размер файла для загрузки", 'may' => "Май", 'monday' => "Понедельник", 'month_view' => "Вид месяца", @@ -322,8 +322,8 @@ $text = array( 'no_previous_versions' => "Нет других версий", 'no_review_needed' => "Рецензия не требуется", 'notify_added_email' => "Вы добавлены в список уведомлений", -'notify_deleted_email' => "Выудалены из списка уведомлений", -'no_update_cause_locked' => "Вы не можете обновить документ. Свяжитесь с заблокировавшим пользователем.", +'notify_deleted_email' => "Вы удалены из списка уведомлений", +'no_update_cause_locked' => "Вы не можете обновить документ. Свяжитесь с заблокировавшим его пользователем.", 'no_user_image' => "Изображение не найдено", 'november' => "Ноябрь", 'objectcheck' => "Проверка Папки/Документа", @@ -337,9 +337,9 @@ $text = array( 'password_repeat' => "Повторите пароль", 'password_forgotten' => "Забыл пароль", 'password_forgotten_email_subject' => "Забыл пароль", -'password_forgotten_email_body' => "Уважаемый юзверь,\n\nмы получили запрос на изменение Вашего пароля.\n\nЧто бы это сделать, перейдите по ссылке:\n\n###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###\n\nЕсли вы и после этого не сможете войти, свяжитесь с админом.", +'password_forgotten_email_body' => "Уважаемый пользователь,\n\nмы получили запрос на изменение Вашего пароля.\n\nЧто бы это сделать, перейдите по ссылке:\n\n###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###\n\nЕсли вы и после этого не сможете войти, свяжитесь с администратором.", 'password_forgotten_send_hash' => "Инструкции высланы на email", -'password_forgotten_text' => "Заполниет форму и следуйте инструкциям в письме", +'password_forgotten_text' => "Заполните форму и следуйте инструкциям в письме", 'password_forgotten_title' => "Пароль выслан", 'personal_default_keywords' => "Личный список тегов", 'previous_versions' => "Предыдущие версии", @@ -351,8 +351,8 @@ $text = array( 'removed_reviewer' => "удален из списка рецензирующих", 'repairing_objects' => "Восстановление папок и документов", 'results_page' => "Страница результатов", -'review_deletion_email' => "ЗАпрос на рецензию удален", -'reviewer_already_assigned' => "уже назначет на рецензирование", +'review_deletion_email' => "Запрос на рецензию удален", +'reviewer_already_assigned' => "уже назначен на рецензирование", 'reviewer_already_removed' => "уже удален из списка рецензирующих или уже оставил рецензию", 'reviewers' => "Рецензирующие", 'review_group' => "Рецензирующая группа", @@ -398,8 +398,8 @@ $text = array( 'set_expiry' => "Установить истечение", 'set_owner_error' => "Ошибка при установке владельца", 'set_owner' => "Установить владельца", -'settings_install_welcome_title' => "Добро пожаловать в установку letoDMS", -'settings_install_welcome_text' => "

Прежде чем начать, убедитесь что вы создали файл 'ENABLE_INSTALL_TOOL' в каталоге конфигурации, иначе установка не будет работать. На NIX-подобных это можно сделать командой 'touch conf/ENABLE_INSTALL_TOOL'. После установки удалите файл.

letoDMS имеет минимальные требования. Нужна mysql БД и веб-сервер с php. Для того что бы работал полнотекстовый поиск lucene, также необходима Zend framework, установленая там где ее видит php. Начиная с версии 3.2.0 letoDMS, ADOdb не будет частью дистрибутива. Скачайте ее с http://adodb.sourceforge.net и установите. Путь к ней может быть указан позднее при установке.

Если Вы хотите создать БД до установки, тогда создайте ее ручками (тут так и было написано)))), опционально создайте юзера с правами на бд и импортируйте дамп из папки конфигурации. Установочный скрипт это может сделать и сам, но понадобится доступ к БД с правами для создания базы данных.

", +'settings_install_welcome_title' => "Добро пожаловать в установку SeedDMS", +'settings_install_welcome_text' => "

Прежде чем начать, убедитесь что вы создали файл 'ENABLE_INSTALL_TOOL' в каталоге конфигурации, иначе установка не будет работать. На NIX-подобных это можно сделать командой 'touch conf/ENABLE_INSTALL_TOOL'. После установки удалите файл.

SeedDMS имеет минимальные требования. Нужна mysql БД и веб-сервер с php. Для того что бы работал полнотекстовый поиск lucene, также необходима Zend framework, установленая там где ее видит php. Начиная с версии 3.2.0 letoDMS, ADOdb не будет частью дистрибутива. Скачайте ее с http://adodb.sourceforge.net и установите. Путь к ней может быть указан позднее при установке.

Если Вы хотите создать БД до установки, тогда создайте ее ручками (тут так и было написано)))), опционально создайте юзера с правами на бд и импортируйте дамп из папки конфигурации. Установочный скрипт это может сделать и сам, но понадобится доступ к БД с правами для создания базы данных.

", 'settings_start_install' => "Начать установку", 'settings_activate_module' => "Активировать модуль", 'settings_activate_php_extension' => "Активировать расширение PHP", @@ -460,9 +460,9 @@ $text = array( 'settings_enableFullSearch_desc' => "Включить полнотекстовый поиск", 'settings_enableGuestLogin_desc' => "Что бы разрешить гостевой вход, включите эту опцию. Гостевой вход должен использоваться только в довереной среде.", 'settings_enableGuestLogin' => "Включить гостевой вход", -'settings_enableLargeFileUpload_desc' => "Если включено, загрузка файлов дуступна так же через ява-апплет, называемый jumploader, без лимита на размер файла. Это так же позволит загружать несколько файлов за раз.", +'settings_enableLargeFileUpload_desc' => "Если включено, загрузка файлов доступна так же через ява-апплет, называемый jumploader, без лимита на размер файла. Это так же позволит загружать несколько файлов за раз.", 'settings_enableLargeFileUpload' => "Включить ява-загрузчик файлов", -'settings_enablePasswordForgotten_desc' => "Если включено, разрешает юзерам восстанавливать пароль на email.", +'settings_enablePasswordForgotten_desc' => "Если включено, разрешает пользователям восстанавливать пароль на email.", 'settings_enablePasswordForgotten' => "Включить восстановление пароля", 'settings_enableUserImage_desc' => "Включить аватары пользователей", 'settings_enableUserImage' => "Включить аватары", @@ -540,7 +540,7 @@ $text = array( 'settings_System' => "Система", 'settings_theme' => "Тема по-умолчанию", 'settings_theme_desc' => "Стиль по-умолчанию (подпапка в папке \"styles\")", -'settings_titleDisplayHack_desc' => "Костяль для заголовков длиннее двух строк", +'settings_titleDisplayHack_desc' => "Костыль для заголовков длиннее двух строк", 'settings_titleDisplayHack' => "Костыль для заголовков", 'settings_updateDatabase' => "Запустить обновление схемы БД", 'settings_updateNotifyTime_desc' => "Пользователи уведомляются об измененях в документах за последние 'Update Notify Time' секунд", From 291919c20e9e05cfae1b96c9e28b363eff61330b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 4 Apr 2013 18:54:04 +0200 Subject: [PATCH 02/70] major update of all new phrases in 4.1.0 --- languages/sv_SE/lang.inc | 114 +++++++++++++++++++++++++++++++++++---- 1 file changed, 104 insertions(+), 10 deletions(-) diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index b83930655..cf5e97cb3 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -28,6 +28,8 @@ $text = array( 'access_mode_read' => "Läsrättighet", 'access_mode_readwrite' => "Läs/Skriv-rättigheter", 'access_permission_changed_email' => "Ändrade rättigheter", +'access_permission_changed_email_subject' => "[sitename]: [name] - Ändrade rättigheter", +'access_permission_changed_email_body' => "Ändrade rättigheter\r\nDokument: [name]\r\nÖverordnade katalog: [folder_path]\r\nAnvändare: [username]\r\nURL: [url]", 'according_settings' => "enl. inställningarna", 'action' => "Åtgärd", 'action_approve' => "Godkänn", @@ -68,6 +70,8 @@ $text = array( 'approval_deletion_email' => "Begäran om godkännande har raderats", 'approval_group' => "Grupp av personer som godkänner", 'approval_request_email' => "Begäran om godkännande", +'approval_request_email_subject' => "[sitename]: [name] - Begäran om godkännande", +'approval_request_email_body' => "Begäran om godkännande\r\nDokument: [name]\r\nVersion: [version]\r\nÖverordnade katalog: [folder_path]\r\nAnvändare: [username]\r\nURL: [url]", 'approval_status' => "Status för godkännande", 'approval_submit_email' => "Skicka godkännande", 'approval_summary' => "Sammanfattning av godkännande", @@ -90,6 +94,8 @@ $text = array( 'attrdef_minvalues' => "Min tillåtna värde", 'attrdef_maxvalues' => "Max tillåtna värde", 'attrdef_valueset' => "Värden", +'attribute_changed_email_subject' => "[sitename]: [name] - Ändrad attribut", +'attribute_changed_email_body' => "Ändrad attribut\r\nDokument: [name]\r\nVersion: [version]\r\nAttribut: [attribute]\r\nÖverordnade katalog: [folder_path]\r\nAnvändare: [username]\r\nURL: [url]", 'attributes' => "Attribut", 'august' => "augusti", 'automatic_status_update' => "Automatisk ändring av status", @@ -129,7 +135,7 @@ $text = array( 'choose_workflow' => "Välj arbetsflöde", 'choose_workflow_state' => "Välj status för arbetsflödet", 'choose_workflow_action' => "Välj åtgärd för arbetsflödet", -'comment_changed_email' => "Ändrad kommentar", +'close' => "Sträng", 'comment' => "Kommentar", 'comment_for_current_version' => "Kommentar till versionen", 'confirm_create_fulltext_index' => "Ja, jag vill återskapa fulltext-sökindex !", @@ -166,9 +172,16 @@ $text = array( 'disclaimer' => "Detta är ett sekretessbelagt område. Bara auktoriserade personer äger tillträde. Vid överträdelse kommer åtal att väckas i enlighet med nationella och internationella lagar.", 'do_object_repair' => "Försök att laga kataloger och dokument.", 'do_object_setfilesize' => "Ange filstorlek", +'do_object_setchecksum' => "Lägg till checksumma", +'do_object_unlink' => "Ta bort dokument version", 'document_already_locked' => "Detta dokument är redan låst", +'document_comment_changed_email' => "Kommentar ändrat", +'document_comment_changed_email_subject' => "[sitename]: [name] - Kommentar ändrat", +'document_comment_changed_email_body' => "Kommentar ändrat\r\nDocument: [name]\r\nGamla kommentaret: [old_comment]\r\nKommentar: [new_comment]\r\nÖverordnade katalog: [folder_path]\r\nAnvändare: [username]\r\nURL: [url]", 'document_deleted' => "Dokumentet raderades", 'document_deleted_email' => "Dokument har raderats", +'document_deleted_email_subject' => "[sitename]: [name] - Dokument har raderats", +'document_deleted_email_body' => "Dokument har raderats\r\nDokument: [name]\r\nÖverordnade katalog: [folder_path]\r\nAnvändare: [username]", 'document_duplicate_name' => "Dubbelt dokumentnamn", 'document' => "Dokument", 'document_has_no_workflow' => "Dokumentet har inget arbetsflöde", @@ -177,20 +190,29 @@ $text = array( 'document_link_by' => "Länkat av", 'document_link_public' => "Offentlig länk", 'document_moved_email' => "Dokument har flyttats", +'document_moved_email_subject' => "[sitename]: [name] - Dokument har flyttats", +'document_moved_email_body' => "Dokument har flyttats\r\nDokument: [name]\r\nGamla katalog: [old_folder_path]\r\nNy katalog: [new_folder_path]\r\nAnvändare: [username]\r\nURL: [url]", 'document_renamed_email' => "Dokument har bytt namn", +'document_renamed_email_subject' => "[sitename]: [name] - Dokument har bytt namn", +'document_renamed_email_body' => "Dokument har bytt namn\r\nDokument: [name]\r\nÖverordnade katalog: [folder_path]\r\nGamla namnet: [old_name]\r\nAnvändare: [username]\r\nURL: [url]", 'documents' => "Dokument", 'documents_in_process' => "Dokument i bearbetning", 'documents_locked_by_you' => "Dokument som du har låst", 'documents_only' => "Bara dokument", 'document_status_changed_email' => "Dokumentstatus ändrad", +'document_status_changed_email_subject' => "[sitename]: [name] - Dokument status ändrad", +'document_status_changed_email_body' => "Dokument status ändrad\r\nDokument: [name]\r\nStatus: [status]\r\nÖverordnade katalog: [folder_path]\r\nAnvändare: [username]\r\nURL: [url]", 'documents_to_approve' => "Dokument som du behöver godkänna", 'documents_to_review' => "Dokument som du behöver granska", 'documents_user_requiring_attention' => "Dokument som du äger och som behöver din uppmärksamhet", 'document_title' => "Dokument '[documentname]'", 'document_updated_email' => "Dokument har uppdaterats", +'document_updated_email_subject' => "[sitename]: [name] - Dokument har uppdaterats", +'document_updated_email_body' => "Dokument har uppdaterats\r\nDokument: [name]\r\nÖverordnade katalog: [folder_path]\r\nAnvändare: [username]\r\nURL: [url]", 'does_not_expire' => "Löper aldrig ut", 'does_not_inherit_access_msg' => "Ärv behörighet", 'download' => "Ladda ner", +'drag_icon_here' => "Dra ikon av mappen eller dokument hit!", 'draft_pending_approval' => "Utkast: väntar på godkännande", 'draft_pending_review' => "Utkast: väntar på granskning", 'dropfolder_file' => "Fil från mellanlagrings-mappen", @@ -204,7 +226,7 @@ $text = array( 'edit_document_access' => "Ändra behörighet", 'edit_document_notify' => "Dokument-meddelandelista", 'edit_document_props' => "Ändra dokumentet", -'edit' => "Ändrat", +'edit' => "Ändra", 'edit_event' => "Ändra händelse", 'edit_existing_access' => "Ändra lista med behörigheter", 'edit_existing_notify' => "Ändra lista med meddelanden", @@ -230,22 +252,34 @@ $text = array( 'expired' => "Har gått ut", 'expires' => "Kommer att gå ut", 'expiry_changed_email' => "Utgångsdatum ändrat", +'expiry_changed_email_subject' => "[sitename]: [name] - Utgångsdatum ändrat", +'expiry_changed_email_body' => "Utgångsdatum ändrat\r\nDokument: [name]\r\nÖverordnade katalog: [folder_path]\r\nAnvändare: [username]\r\nURL: [url]", 'february' => "februari", 'file' => "Fil", 'files_deletion' => "Ta bort alla filer", 'files_deletion_warning' => "Med detta alternativ kan du ta bort alla filer i en dokumentkatalog. Versionsinformationen kommer fortfarande att visas.", 'files' => "Filer", 'file_size' => "Filstorlek", +'folder_comment_changed_email' => "Kommentar har ändrats", +'folder_comment_changed_email_subject' => "[sitename]: [folder] - Kommentar har ändrats", +'folder_comment_changed_email_body' => "Kommentar har ändrats\r\nKatalog: [name]\r\nVersion: [version]\r\nGamla kommentaret: [old_comment]\r\nKommentar: [new_comment]\r\nÖverordnade katalog: [folder_path]\r\nAnvändare: [username]\r\nURL: [url]", 'folder_contents' => "Kataloginnehåll", 'folder_deleted_email' => "Katalog har tagits bort", +'folder_deleted_email_subject' => "[sitename]: [name] - Katalog har tagits bort", +'folder_deleted_email_body' => "Katalog har tagits bort\r\nKatalog: [name]\r\nÖverordnade katalog: [folder_path]\r\nAnvändare: [username]\r\nURL: [url]", 'folder' => "Katalog", 'folder_infos' => "Kataloginformation", 'folder_moved_email' => "Katalog har flyttats", +'folder_moved_email_subject' => "[sitename]: [name] - Katalog har flyttats", +'folder_moved_email_body' => "Katalog har flyttats\r\nKatalog: [name]\r\nGamla katalognamn: [old_folder_path]\r\nNy katalognamn: [new_folder_path]\r\nAnvändare: [username]\r\nURL: [url]", 'folder_renamed_email' => "Katalog har bytt namn", +'folder_renamed_email_subject' => "[sitename]: [name] - Katalog har bytt namn", +'folder_renamed_email_body' => "Katalog har bytt namn\r\nKatalog: [name]\r\nÖverordnade katalog: [folder_path]\r\nOld name: [old_name]\r\nUser: [username]\r\nURL: [url]", 'folders_and_documents_statistic' => "Innehållsöversikt", 'folders' => "Kataloger", 'folder_title' => "Katalog '[foldername]'", 'friday' => "fredag", +'friday_abbr' => "fr", 'from' => "från", 'fullsearch' => "Fulltext-sökning", 'fullsearch_hint' => "Använd fulltext-index", @@ -350,10 +384,12 @@ $text = array( 'may' => "maj", 'mimetype' => "Mimetyp", 'misc' => "Diverse", +'missing_checksum' => "Checksumma saknas", 'missing_filesize' => "Filstorlek saknas", 'missing_transition_user_group' => "Användare/grupp saknas för övergång", 'minutes' => "minuter", 'monday' => "måndag", +'monday_abbr' => "må", 'month_view' => "månadsvisning", 'monthly' => "månadsvis", 'move_document' => "Flytta dokumentet", @@ -367,11 +403,17 @@ $text = array( 'new_default_keywords' => "Lägg till nyckelord", 'new_document_category' => "Lägg till kategori", 'new_document_email' => "Nytt dokument", +'new_document_email_subject' => "[sitename]: [folder_name] - Nytt dokument", +'new_document_email_body' => "Nytt dokument\r\nNamn: [name]\r\nÖverordnade katalog: [folder_path]\r\nKommentar: [comment]\r\nVersions kommentar: [version_comment]\r\nAnvändare: [username]\r\nURL: [url]", 'new_file_email' => "Ny bilaga", +'new_file_email_subject' => "[sitename]: [document] - Ny bilaga", +'new_file_email_body' => "Ny bilaga\r\nNamn: [name]\r\nDokument: [document]\r\nKommentar: [comment]\r\nAnvändare: [username]\r\nURL: [url]", 'new_folder' => "Ny katalog", 'new_password' => "Nytt lösenord", 'new' => "Ny", 'new_subfolder_email' => "Ny katalog", +'new_subfolder_email_subject' => "[sitename]: [name] - Ny katalog", +'new_subfolder_email_body' => "Ny katalog\r\nNamn: [name]\r\nÖverordnade katalog: [folder_path]\r\nKommentar: [comment]\r\nAnvändare: [username]\r\nURL: [url]", 'new_user_image' => "Ny användarbild", 'next_state' => "Ny status", 'no_action' => "Ingen åtgärd behövs.", @@ -390,7 +432,11 @@ $text = array( 'no_previous_versions' => "Inga andra versioner hittades.", 'no_review_needed' => "Det finns inga dokument som du behöver granska.", 'notify_added_email' => "Du har lagts till för att få meddelanden", +'notify_added_email_subject' => "[sitename]: [name] - Tillägg för att få meddelanden", +'notify_added_email_body' => "Tillägg för att få meddelanden\r\nNamn: [name]\r\nÖverordnade katalog: [folder_path]\r\nAnvändare: [username]\r\nURL: [url]", 'notify_deleted_email' => "Du har tagits bort från att få meddelanden", +'notify_deleted_email_subject' => "[sitename]: [name] - Borttagen från att få meddelanden", +'notify_deleted_email_body' => "Borttagen från att få meddelanden\r\nNamn: [name]\r\nÖverordnad katalog: [folder_path]\r\nAnvändare: [username]\r\nURL: [url]", 'no_update_cause_locked' => "Därför kan du inte uppdatera detta dokument. Ta kontakt med användaren som låst dokumentet.", 'no_user_image' => "Ingen bild hittades", 'november' => "november", @@ -403,6 +449,8 @@ $text = array( 'original_filename' => "Ursprungligt filnamn", 'owner' => "Ägare", 'ownership_changed_email' => "Ägare har ändrats", +'ownership_changed_email_subject' => "[sitename]: [name] - Ägare har ändrats", +'ownership_changed_email_body' => "Ägare har ändrats\r\nDokument: [name]\r\nÖverordnade katalog: [folder_path]\r\nGamla ägare: [old_owner]\r\nNya ägare: [new_owner]\r\nAnvändare: [username]\r\nURL: [url]", 'password' => "Lösenord", 'password_already_used' => "Lösenordet används redan", 'password_repeat' => "Upprepa lösenord", @@ -426,11 +474,18 @@ $text = array( 'refresh' => "Uppdatera", 'rejected' => "Avvisat", 'released' => "Klart för användning", +'removed_workflow_email_subject' => "[sitename]: [name] - Arbetsflöde borttagen från dokument version", +'removed_workflow_email_body' => "Arbetsflöde borttagen från dokument version\r\nDokument: [name]\r\nVersion: [version]\r\nArbetsflöde: [workflow]\r\nÖverordnade katalog: [folder_path]\r\nAnvändare: [username]\r\nURL: [url]", 'removed_approver' => "har tagits bort från listan med personer som ska godkänna dokumentet.", 'removed_file_email' => "Borttagen bilaga", +'removed_file_email_subject' => "[sitename]: [document] - Borttagen bilaga", +'removed_file_email_body' => "Borttagen bilaga\r\nDokument: [document]\r\nAnvändare: [username]\r\nURL: [url]", 'removed_reviewer' => "har tagits bort från listan med personer som ska granska dokumentet.", +'repaired' => "repaired", 'repairing_objects' => "Förbereder dokument och kataloger.", 'results_page' => "Resultatsida", +'return_from_subworkflow_email_subject' => "[sitename]: [name] - Tillbaka from underliggande arbetsflöde", +'return_from_subworkflow_email_body' => "Tillbaka från underliggande arbetsflöde\r\nDokument: [name]\r\nVersion: [version]\r\nArbetsflöde: [workflow]\r\nUnderliggande arbetsflöde: [subworkflow]\r\nOverordnade katalog: [folder_path]\r\nAnvändare: [username]\r\nURL: [url]", 'review_deletion_email' => "Förfrågan om granskning borttagen", 'reviewer_already_assigned' => "ska redan granska dokumentet", 'reviewer_already_removed' => "har redan tagits bort från granskningen eller har redan skickat en granskning", @@ -439,9 +494,13 @@ $text = array( 'review_request_email' => "Förfrågan om granskning", 'review_status' => "Status för granskningen", 'review_submit_email' => "Skickat granskning", +'review_submit_email_subject' => "[sitename]: [name] - Skickat granskning", +'review_submit_email_body' => "Skickat granskning\r\nDokument: [name]\r\nVersion: [version]\r\nStatus: [status]\r\nKommentar: [comment]\r\nÖverordnade katalog: [folder_path]\r\nAnvändare: [username]\r\nURL: [url]", 'review_summary' => "Sammanfattning av granskningen", 'review_update_failed' => "Fel vid uppdatering av granskningsstatus. Kunde inte uppdatera.", 'rewind_workflow' => "Återställ arbetsflödet", +'rewind_workflow_email_subject' => "[sitename]: [name] - Återställ arbetsflödet", +'rewind_workflow_email_body' => "Återställ arbetsflödet\r\nDokument: [name]\r\nVersion: [version]\r\nArbetsflöde: [workflow]\r\nÖverordnade katalog: [folder_path]\r\nAnvändare: [username]\r\nURL: [url]", 'rewind_workflow_warning' => "Om du återställer ett arbetsflöde till sin ursprungliga status, kommer hela loggboken för dokumentets arbetsflöde att raderas och kan då inte återställas.", 'rm_attrdef' => "Ta bort attributdefinition", 'rm_default_keyword_category' => "Ta bort kategori", @@ -463,7 +522,10 @@ $text = array( 'role' => "Roll", 'return_from_subworkflow' => "Tillbaka från under-arbetsflöde", 'run_subworkflow' => "Utför under-arbetsflöde", +'run_subworkflow_email_subject' => "[sitename]: [name] - Under-arbetsflöde utförs", +'run_subworkflow_email_body' => "Under-arbetsflöde utförs\r\nDokument: [name]\r\nVersion: [version]\r\nArbetsflöde: [workflow]\r\nUnderliggande arbetsflöde: [subworkflow]\r\nÖverordnade katalog: [folder_path]\r\nAnvändare: [username]\r\nURL: [url]", 'saturday' => "lördag", +'saturday_abbr' => "lö", 'save' => "Spara", 'search_fulltext' => "Fulltext-sökning", 'search_in' => "Sök i", @@ -479,6 +541,7 @@ $text = array( 'search_time' => "Förfluten tid: [time] sek", 'seconds' => "sekunder", 'selection' => "Urval", +'select_category' => "Klicka för att välja en kategori", 'select_groups' => "Välj grupper", 'select_ind_reviewers' => "Välj en person som ska granska", 'select_ind_approvers' => "Välj en person som ska godkänna", @@ -527,16 +590,16 @@ $text = array( '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", 'settings_contentOffsetDir_desc' => "För att undvika begränsningar i det underliggande filsystemet har en ny mappstruktur skapats inom innehållsmappen (Content Directory). Detta behöver en bas-mapp att utgå ifrån. Vanligtvis är default-inställningen 1048576 men det kan vara vilket nummer eller vilken sträng som helst som inte redan finns i mappen (Content Directory)", -'settings_coreDir' => "SeedDMS_Core-mapp", -'settings_coreDir_desc' => "Sökväg till SeedDMS_Core (valfritt)", +'settings_coreDir' => "LetoDMS_Core-mapp", +'settings_coreDir_desc' => "Sökväg till LetoDMS_Core (valfritt)", 'settings_loginFailure_desc' => "Inaktivera kontot efter n antal misslyckade inloggningar.", 'settings_loginFailure' => "Fel vid inloggning", -'settings_luceneClassDir' => "Lucene SeedDMS-mapp", -'settings_luceneClassDir_desc' => "Sökväg till SeedDMS_Lucene (valfritt)", +'settings_luceneClassDir' => "Lucene LetoDMS-mapp", +'settings_luceneClassDir_desc' => "Sökväg till LetoDMS_Lucene (valfritt)", 'settings_luceneDir' => "Lucene index-mapp", 'settings_luceneDir_desc' => "Sökväg till Lucene-index", 'settings_cannot_disable' => "Filen ENABLE_INSTALL_TOOL kunde inte tas bort", -'settings_install_disabled' => "Filen ENABLE_INSTALL_TOOL har tagits bort. Du kan nu logga in till SeedDMS och göra ytterligare inställningar.", +'settings_install_disabled' => "Filen ENABLE_INSTALL_TOOL har tagits bort. Du kan nu logga in till LetoDMS och göra ytterligare inställningar.", 'settings_createdatabase' => "Skapa databastabeller", 'settings_createdirectory' => "Skapa katalog", 'settings_currentvalue' => "Aktuellt värde", @@ -552,7 +615,7 @@ $text = array( 'settings_dbUser_desc' => "Användarnamnet för tillgång till databasen. Användarnamnet angavs under installationsprocessen.", 'settings_dbUser' => "Användarnamn", 'settings_dbVersion' => "Databasschemat för gammalt", -'settings_delete_install_folder' => "För att kunna använda SeedDMS måste du ta bort filen ENABLE_INSTALL_TOOL som finns i konfigurationsmappen.", +'settings_delete_install_folder' => "För att kunna använda LetoDMS måste du ta bort filen ENABLE_INSTALL_TOOL som finns i konfigurationsmappen.", 'settings_disable_install' => "Ta bort filen ENABLE_INSTALL_TOOL, om det är möjligt.", 'settings_disableSelfEdit_desc' => "Om utvald, kan användare inte ändra sin egen profil.", 'settings_disableSelfEdit' => "Inaktivera själveditering", @@ -570,14 +633,18 @@ $text = array( 'settings_enableDuplicateDocNames' => "Tillåter samma dokumentnamn", 'settings_enableNotificationAppRev_desc' => "Kryssa i, för att skicka ett meddelande till personer som granskar/godkänner när en ny version av dokumentet har lagts till", 'settings_enableNotificationAppRev' => "Aktivera meddelande till personer som granskar/godkänner", +'settings_enableOwnerRevApp_desc' => "Aktivera om du vill att en dokumentägare visas i listan för personer som granskar/godkänner dokumentet och i övergång på arbetsflöden.", +'settings_enableOwnerRevApp' => "Tillåt granskning/godkänning av dokumentägare", +'settings_enableSelfRevApp_desc' => "Aktivera om du vill att aktuell inloggad användare visas i listan för personer som granskar/godkänner dokument och i övergång på arbetsflöden.", +'settings_enableSelfRevApp' => "Tillåt granskning/godkänning av inloggad användare", 'settings_enableVersionModification_desc' => "Aktivera/Inaktivera modifiering av en dokumentversionen genom användare efter att en version har laddats upp. Administratören kan alltid ändra versionen efter att den har laddats upp.", 'settings_enableVersionModification' => "Aktivera modifiering av versionen", 'settings_enableVersionDeletion_desc' => "Aktivera/Inaktivera möjlighet att ta bort äldre dokumentversioner genom användare. Administratorn kan alltid ta bort äldre versioner.", 'settings_enableVersionDeletion' => "Aktivera möjligheten att ta bort äldre versioner", 'settings_enableEmail_desc' => "Aktivera/Inaktivera automatiska e-postmeddelanden", 'settings_enableEmail' => "Använd e-postmeddelanden", -'settings_enableFolderTree_desc' => "Av för att inte visa katalogernas trädstruktur", 'settings_enableFolderTree' => "Visa katalogers trädstruktur", +'settings_enableFolderTree_desc' => "Av för att inte visa katalogernas trädstruktur", 'settings_enableFullSearch' => "Aktivera fulltext-sökning", 'settings_enableFullSearch_desc' => "Aktivera fulltext-sökning", 'settings_enableGuestLogin' => "Tillåt gäst-inloggning", @@ -622,7 +689,7 @@ $text = array( 'settings_logFileRotation_desc' => "Loggfils-rotation", 'settings_logFileRotation' => "Loggfils-rotation", 'settings_luceneDir' => "Mapp för fulltext-index", -'settings_maxDirID_desc' => "Högsta antal undermappar per överliggande mapp. Standard: 32700.", +'settings_maxDirID_desc' => "Högsta antal undermappar per överordnade mapp. Standard: 32700.", 'settings_maxDirID' => "Max. mapp-ID", 'settings_maxExecutionTime_desc' => "Detta sätter hösta tillåtna tiden i sekunder som ett skript får på sig att utföras innan det avslutas.", 'settings_maxExecutionTime' => "Max. exekveringstid (s)", @@ -675,6 +742,7 @@ $text = array( 'settings_smtpServer' => "SMTP server-hostname", 'settings_SMTP' => "SMTP server-inställningar", 'settings_stagingDir' => "Mapp för i delar uppladdade filer", +'settings_stagingDir_desc' => "Mappen där Jumploader placerar delar av filer, som laddas upp, innan dessa delar kommer kopplas ihop igen.", 'settings_strictFormCheck_desc' => "Noggrann format-kontroll. Om ja, kontrolleras alla fält i ett formulär på att de innehåller ett värde. Om nej, blir de flesta kommentar- och nyckelordsfält frivilliga. Kommentarer måste alltid anges när en granskning skickas eller när dokumentstatus skrivs över.", 'settings_strictFormCheck' => "Noggrann format-kontroll", 'settings_suggestionvalue' => "Föreslå ett värde", @@ -717,13 +785,18 @@ $text = array( 'submit_review' => "Skicka granskning", 'submit_userinfo' => "Skicka info", 'sunday' => "söndag", +'sunday_abbr' => "sö", 'theme' => "Visningstema", 'thursday' => "torsdag", +'thursday_abbr' => "to", 'toggle_manager' => "Byt manager", 'to' => "till", 'transition_triggered_email' => "Arbetsflödesövergång utlöstes", +'transition_triggered_email_subject' => "[sitename]: [name] - Arbetsflödesövergång utlöstes", +'transition_triggered_email_body' => "Arbetsflödesövergång utlöstes\r\nDokument: [name]\r\nVersion: [version]\r\nKommentar: [comment]\r\nArbetsflöde: [workflow]\r\nFöregående tillstånd: [previous_state]\r\nAktuell status: [current_state]\r\nÖverordnade katalog: [folder_path]\r\nAnvändare: [username]\r\nURL: [url]", 'trigger_workflow' => "Arbetsflöde", 'tuesday' => "tisdag", +'tuesday_abbr' => "ti", 'type_to_search' => "Skriv för att söka", 'under_folder' => "I katalogen", 'unknown_command' => "Okänt kommando.", @@ -734,6 +807,7 @@ $text = array( 'unknown_owner' => "Okänt ägar-ID", 'unknown_user' => "Okänt användar-ID", 'unlinked_content' => "Olänkat innehåll", +'unlinking_objects' => "Olänkat objekt", 'unlock_cause_access_mode_all' => "Du kan fortfarande uppdatera, eftersom du har behörighetsnivå \"all\". Låsningen kommer automatiskt att tas bort.", 'unlock_cause_locking_user' => "Du kan fortfarande uppdatera, eftersom du är samma person som låste dokumentet. Låsningen kommer automatiskt att tas bort.", 'unlock_document' => "Lås upp", @@ -761,6 +835,8 @@ $text = array( 'users' => "Användare", 'user' => "Användare", 'version_deleted_email' => "Version borttagen", +'version_deleted_email_subject' => "[sitename]: [name] - Version borttagen", +'version_deleted_email_body' => "Version borttagen\r\nDokument: [name]\r\nVersion: [version]\r\nÖverordnade katalog: [folder_path]\r\nAnvändare: [username]\r\nURL: [url]", 'version_info' => "Versionsinformation", 'versioning_file_creation' => "Skapa versionsfil", 'versioning_file_creation_warning' => "Med denna funktion kan du skapa en fil som innehåller versionsinformationen för hela DMS-mappen. Efter skapandet kommer alla filer att sparas inom dokumentets mapp.", @@ -770,6 +846,7 @@ $text = array( 'view_online' => "Visa online", 'warning' => "Varning", 'wednesday' => "onsdag", +'wednesday_abbr' => "on", 'week_view' => "veckovy", 'weeks' => "veckor", 'workflow' => "Arbetsflöde", @@ -781,6 +858,7 @@ $text = array( 'workflow_in_use' => "Detta arbetsflöde används i ett dokument.", 'workflow_initstate' => "Ursprungsstatus", 'workflow_management' => "Arbetsflöden", +'workflow_no_states' => "Du måste först fastlägga ett antal status för arbetsflödet, innan du kan lägga till ett arbetsflöde.", 'workflow_states_management' => "Status för arbetsflöde", 'workflow_actions_management' => "Åtgärder för arbetsflöde", 'workflow_state_docstatus' => "Dokumentstatus", @@ -790,5 +868,21 @@ $text = array( 'workflow_user_summary' => "Sammanfattning användare", 'year_view' => "årsvy", 'yes' => "Ja", + +'ca_ES' => "katalonska", +'cs_CZ' => "tjeckiska", +'de_DE' => "tyska", +'en_GB' => "engelska (GB)", +'es_ES' => "spanska", +'fr_FR' => "franska", +'hu_HU' => "ungerska", +'it_IT' => "italienska", +'nl_NL' => "holländska", +'pt_BR' => "portugisiska (BR)", +'ru_RU' => "ryska", +'sk_SK' => "slovakiska", +'sv_SE' => "svenska", +'zh_CN' => "kinesiska (CN)", +'zh_TW' => "kinesiska (TW)", ); ?> From 639355b1cf9533d9bbef627cd5788051197e378e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 5 Apr 2013 13:07:50 +0200 Subject: [PATCH 03/70] add method countChildren() --- SeedDMS_Core/Core/inc.ClassFolder.php | 67 +++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php index deb7404de..cfa738b20 100644 --- a/SeedDMS_Core/Core/inc.ClassFolder.php +++ b/SeedDMS_Core/Core/inc.ClassFolder.php @@ -541,6 +541,73 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { return $this->_documents; } /* }}} */ + /** + * Count all documents and subfolders of the folder + * + * This function also counts documents and folders of subfolders, so + * basically it works like recursively counting children. + * + * This function does not check for access rights. Use + * {@link SeedDMS_Core_DMS::filterAccess} for checking each document against + * the currently logged in user and the access rights. + * + * FIXME: This function isn't complete! The idea is to return the documents + * and folders if a maximum number isn't exceeded. + * + * @param string $orderby if set to 'n' the list is ordered by name, otherwise + * it will be ordered by sequence + * @return array array with two elements 'documents' and 'folders' holding + * the counted number. + */ + function countChildren() { /* {{{ */ + $db = $this->_dms->getDB(); + + $pathPrefix=""; + $path = $this->getPath(); + foreach ($path as $f) { + $pathPrefix .= ":".$f->getID(); + } + if (strlen($pathPrefix)>1) { + $pathPrefix .= ":"; + } + + $queryStr = "SELECT count(id) as c FROM tblDocuments WHERE folderList like '".$pathPrefix. "%'"; + $resArr = $db->getResultArray($queryStr); + if (is_bool($resArr) && !$resArr) + return false; + + $cdocs = $resArr[0]['c']; + if($cdocs < 100) { + $queryStr = "SELECT id FROM tblDocuments WHERE folderList like '".$pathPrefix. "%'"; + $resArr = $db->getResultArray($queryStr); + if (is_bool($resArr) && !$resArr) + return false; + $documents = array(); + foreach ($resArr as $row) { + array_push($documents, $this->_dms->getDocument($row["id"])); + } + } + + $queryStr = "SELECT count(id) as c FROM tblFolders WHERE folderList like '".$pathPrefix. "%'"; + $resArr = $db->getResultArray($queryStr); + if (is_bool($resArr) && !$resArr) + return false; + + $cfolders = $resArr[0]['c']; + if($cfolders < 100) { + $queryStr = "SELECT id FROM tblFolders WHERE folderList like '".$pathPrefix. "%'"; + $resArr = $db->getResultArray($queryStr); + if (is_bool($resArr) && !$resArr) + return false; + $folders = array(); + foreach ($resArr as $row) { + array_push($folders, $this->_dms->getFolder($row["id"])); + } + } + + return array('document_count'=>$cdocs, 'folder_count'=>$cfolders); + } /* }}} */ + // $comment will be used for both document and version leaving empty the version_comment /** * Add a new document to the folder From 5d41aad78c1462027eb4cc5502627bee1c3f2753 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 5 Apr 2013 13:08:37 +0200 Subject: [PATCH 04/70] prepare for next version 4.2.0 --- Makefile | 2 +- SeedDMS_Core/package.xml | 22 +++++++++++++++++++--- inc/inc.Version.php | 2 +- install/install.php | 2 +- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 127aab2f2..cee6fb096 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=4.1.0 +VERSION=4.2.0 SRC=CHANGELOG inc conf utils index.php languages views op out README.md README.Notification README.Ubuntu drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install #restapi webapp diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index cc51b776a..d02223274 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,11 +12,11 @@ uwe@steinmann.cx yes - 2013-03-28 + 2013-04-05 - 4.1.0 - 4.1.0 + 4.2.0 + 4.2.0 beta @@ -430,6 +430,22 @@ New release GPL License +- minor bugfixes + + + + 2013-03-28 + + + 4.1.0 + 4.1.0 + + + beta + stable + + GPL License + - minor bugfixes diff --git a/inc/inc.Version.php b/inc/inc.Version.php index 9c3fe7f19..f48ec783e 100644 --- a/inc/inc.Version.php +++ b/inc/inc.Version.php @@ -20,7 +20,7 @@ class SeedDMS_Version { - var $_number = "4.0.0"; + var $_number = "4.2.0"; var $_string = "SeedDMS"; function SeedDMS_Version() { diff --git a/install/install.php b/install/install.php index 7c5655c46..3d823887f 100644 --- a/install/install.php +++ b/install/install.php @@ -116,7 +116,7 @@ function fileExistsInIncludePath($file) { /* {{{ */ * Load default settings + set */ define("SEEDDMS_INSTALL", "on"); -define("SEEDDMS_VERSION", "4.1.0"); +define("SEEDDMS_VERSION", "4.2.0"); require_once('../inc/inc.ClassSettings.php'); From 223daa97b1fd91df3f31151906f244a1cf0cf6cd Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 5 Apr 2013 13:09:08 +0200 Subject: [PATCH 05/70] set default theme to bootstrap --- conf/settings.xml.template | 2 +- install/settings.xml.template_install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/settings.xml.template b/conf/settings.xml.template index 383e93637..480478255 100644 --- a/conf/settings.xml.template +++ b/conf/settings.xml.template @@ -12,7 +12,7 @@ footNote = "SeedDMS free document management system - www.seeddms.org" printDisclaimer="true" language = "en_GB" - theme = "clean" + theme = "bootstrap" >
diff --git a/views/bootstrap/class.DocumentAccess.php b/views/bootstrap/class.DocumentAccess.php index a75a4679d..66e932b5e 100644 --- a/views/bootstrap/class.DocumentAccess.php +++ b/views/bootstrap/class.DocumentAccess.php @@ -99,7 +99,7 @@ function checkForm() } ?> - +
getId();?>"> printAccessModeSelection($document->getDefaultAccess()); ?> - + getId()."\">\n"; print "\n"; print "getID()."\">\n"; - print ""; + print ""; print "\n"; print "\n"; print "
\n"; @@ -208,7 +208,7 @@ function checkForm() print "getId()."\">"; print ""; print "getID()."\">"; - print ""; + print ""; print "\n"; print "
"; print "
\n"; diff --git a/views/bootstrap/class.EditFolder.php b/views/bootstrap/class.EditFolder.php index e1dc4e379..1dd9c4ba1 100644 --- a/views/bootstrap/class.EditFolder.php +++ b/views/bootstrap/class.EditFolder.php @@ -106,7 +106,7 @@ function checkForm() ?> - "> +
diff --git a/views/bootstrap/class.FolderAccess.php b/views/bootstrap/class.FolderAccess.php index 05ecdf8d2..86b31acf4 100644 --- a/views/bootstrap/class.FolderAccess.php +++ b/views/bootstrap/class.FolderAccess.php @@ -95,7 +95,7 @@ function checkForm() } ?> - + getID();?>"> printAccessModeSelection($folder->getDefaultAccess()); ?> - + printAccessModeSelection($userAccess->getMode()); print "\n"; print "\n"; - print ""; + print ""; print "\n"; print "\n"; print "
\n"; @@ -202,7 +202,7 @@ function checkForm() $this->printAccessModeSelection($groupAccess->getMode()); print "\n"; print "\n"; - print ""; + print ""; print "\n"; print "
"; print "
\n"; From 9885e26f96dd16f49996a4573e5e2c6f256a5d0b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 19 Apr 2013 15:22:25 +0200 Subject: [PATCH 61/70] put save icon on all save buttons --- views/bootstrap/class.AttributeMgr.php | 2 +- views/bootstrap/class.Bootstrap.php | 6 +++--- views/bootstrap/class.Categories.php | 2 +- views/bootstrap/class.DefaultKeywords.php | 2 +- views/bootstrap/class.EditAttributes.php | 2 +- views/bootstrap/class.EditComment.php | 2 +- views/bootstrap/class.EditDocument.php | 2 +- views/bootstrap/class.EditEvent.php | 2 +- views/bootstrap/class.EditUserData.php | 2 +- views/bootstrap/class.GroupMgr.php | 2 +- views/bootstrap/class.SetExpires.php | 2 +- views/bootstrap/class.Settings.php | 2 +- views/bootstrap/class.UserDefaultKeywords.php | 2 +- views/bootstrap/class.UsrMgr.php | 2 +- views/bootstrap/class.ViewDocument.php | 2 +- views/bootstrap/class.WorkflowActionsMgr.php | 2 +- views/bootstrap/class.WorkflowMgr.php | 2 +- views/bootstrap/class.WorkflowStatesMgr.php | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php index 972937d00..1498aac68 100644 --- a/views/bootstrap/class.AttributeMgr.php +++ b/views/bootstrap/class.AttributeMgr.php @@ -225,7 +225,7 @@ function showAttributeDefinitions(selectObj) { - "> + diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 19a16dd71..c38b74b66 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -779,7 +779,7 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
- +
- +
- +
  - "> + diff --git a/views/bootstrap/class.DefaultKeywords.php b/views/bootstrap/class.DefaultKeywords.php index 1a3c3bb3e..f49296d0d 100644 --- a/views/bootstrap/class.DefaultKeywords.php +++ b/views/bootstrap/class.DefaultKeywords.php @@ -126,7 +126,7 @@ function showKeywords(selectObj) { - "> + diff --git a/views/bootstrap/class.EditAttributes.php b/views/bootstrap/class.EditAttributes.php index e5c92adbf..1e06f8485 100644 --- a/views/bootstrap/class.EditAttributes.php +++ b/views/bootstrap/class.EditAttributes.php @@ -65,7 +65,7 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style { } ?> - "> + diff --git a/views/bootstrap/class.EditComment.php b/views/bootstrap/class.EditComment.php index 41ba901b3..1ce1f65c2 100644 --- a/views/bootstrap/class.EditComment.php +++ b/views/bootstrap/class.EditComment.php @@ -80,7 +80,7 @@ function checkForm() - "> + diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php index e6c944453..aaec2b129 100644 --- a/views/bootstrap/class.EditDocument.php +++ b/views/bootstrap/class.EditDocument.php @@ -128,7 +128,7 @@ function checkForm() ?> - "> + diff --git a/views/bootstrap/class.EditEvent.php b/views/bootstrap/class.EditEvent.php index aa06d49b8..f8c3ebe1c 100644 --- a/views/bootstrap/class.EditEvent.php +++ b/views/bootstrap/class.EditEvent.php @@ -101,7 +101,7 @@ function checkForm() - "> + diff --git a/views/bootstrap/class.EditUserData.php b/views/bootstrap/class.EditUserData.php index 033034780..83e550772 100644 --- a/views/bootstrap/class.EditUserData.php +++ b/views/bootstrap/class.EditUserData.php @@ -154,7 +154,7 @@ function checkForm() - "> + diff --git a/views/bootstrap/class.GroupMgr.php b/views/bootstrap/class.GroupMgr.php index bdaa5b3ab..d12a7defe 100644 --- a/views/bootstrap/class.GroupMgr.php +++ b/views/bootstrap/class.GroupMgr.php @@ -170,7 +170,7 @@ function showUser(selectObj) { - "> + diff --git a/views/bootstrap/class.SetExpires.php b/views/bootstrap/class.SetExpires.php index e2a3e22d9..4d98bed6b 100644 --- a/views/bootstrap/class.SetExpires.php +++ b/views/bootstrap/class.SetExpires.php @@ -68,7 +68,7 @@ class SeedDMS_View_SetExpires extends SeedDMS_Bootstrap_Style { - "> + diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index e349d4f02..5ddb82a9b 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -520,7 +520,7 @@ if(!is_writeable($settings->_configFilePath)) { _configFilePath)) { ?> - " /> + diff --git a/views/bootstrap/class.UserDefaultKeywords.php b/views/bootstrap/class.UserDefaultKeywords.php index a1d6433e2..e4a512953 100644 --- a/views/bootstrap/class.UserDefaultKeywords.php +++ b/views/bootstrap/class.UserDefaultKeywords.php @@ -120,7 +120,7 @@ function showKeywords(selectObj) { - "> + diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php index dc1e4dfc1..236f1b589 100644 --- a/views/bootstrap/class.UsrMgr.php +++ b/views/bootstrap/class.UsrMgr.php @@ -528,7 +528,7 @@ function showUser(selectObj) { ?> - "> + diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index bb7c2e32b..a9dee42e6 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -943,7 +943,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { ?> - "> + diff --git a/views/bootstrap/class.WorkflowActionsMgr.php b/views/bootstrap/class.WorkflowActionsMgr.php index 28f74d5d3..dd2fc9dcf 100644 --- a/views/bootstrap/class.WorkflowActionsMgr.php +++ b/views/bootstrap/class.WorkflowActionsMgr.php @@ -159,7 +159,7 @@ function showWorkflowAction(selectObj) { - "> + diff --git a/views/bootstrap/class.WorkflowMgr.php b/views/bootstrap/class.WorkflowMgr.php index b499c529c..400ac82b3 100644 --- a/views/bootstrap/class.WorkflowMgr.php +++ b/views/bootstrap/class.WorkflowMgr.php @@ -219,7 +219,7 @@ function showWorkflow(selectObj) { - "> + diff --git a/views/bootstrap/class.WorkflowStatesMgr.php b/views/bootstrap/class.WorkflowStatesMgr.php index b2200c99f..28b97e57e 100644 --- a/views/bootstrap/class.WorkflowStatesMgr.php +++ b/views/bootstrap/class.WorkflowStatesMgr.php @@ -176,7 +176,7 @@ function showWorkflowState(selectObj) { - "> + From 82a8acddfd00a6e07697b1547d055f02e91c6d5c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 19 Apr 2013 22:10:54 +0200 Subject: [PATCH 62/70] put all links onto a button with icon --- views/bootstrap/class.AdminTools.php | 57 ++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/views/bootstrap/class.AdminTools.php b/views/bootstrap/class.AdminTools.php index e33472c32..8f926129f 100644 --- a/views/bootstrap/class.AdminTools.php +++ b/views/bootstrap/class.AdminTools.php @@ -44,29 +44,56 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style { // $this->contentHeading(getMLText("admin_tools")); $this->contentContainerStart(); ?> - contentContainerEnd(); From 15f952b793dd1d2d7600dd0a136c60792912601c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 19 Apr 2013 22:27:56 +0200 Subject: [PATCH 63/70] major update --- languages/it_IT/lang.inc | 300 ++++++++++++++++++++++++++------------- 1 file changed, 204 insertions(+), 96 deletions(-) diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index da9d76392..10a227efc 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -28,6 +28,7 @@ $text = array( 'access_mode_read' => "Permesso di lettura", 'access_mode_readwrite' => "Permesso di lettura e scrittura", 'access_permission_changed_email' => "Permessi cambiati", +'according_settings' => "Settaggio accordi", 'actions' => "Azioni", 'add' => "Aggiungi", 'add_doc_reviewer_approver_warning' => "Nota: i documenti saranno automaticamente distinti come rilasciati se non esiste approvazione o revisione", @@ -36,19 +37,21 @@ $text = array( 'add_event' => "Aggiungi evento", 'add_group' => "Aggiungi nuovo gruppo", 'add_member' => "Aggiungi un membro", -'add_multiple_documents' => "Add multiple documents", +'add_multiple_documents' => "Aggiungi documenti multipli", 'add_multiple_files' => "Aggiungi documenti multipli (il nome del file verrà usato come nome del documento)", 'add_subfolder' => "Aggiungi sottocartella", 'add_user' => "Aggiungi nuovo utente", +'add_user_to_group' => "Aggiungi utente al gruppo", 'admin' => "Amministratore", 'admin_tools' => "Amministrazione", -'all_categories' => "All categories", +'all' => "Tutto", +'all_categories' => "Tutte le categorie", 'all_documents' => "Tutti i documenti", 'all_pages' => "Tutte", 'all_users' => "Tutti gli utenti", 'already_subscribed' => "L'oggetto è già stato sottoscritto", 'and' => "e", -'apply' => "Apply", +'apply' => "Applica", 'approval_deletion_email' => "Cancellata la richiesta di approvazione", 'approval_group' => "Gruppo approvazione", 'approval_request_email' => "Richiesta di approvazione", @@ -64,6 +67,17 @@ $text = array( 'assign_reviewers' => "Assegna Revisori", 'assign_user_property_to' => "Assegna le proprietà dell'utente a", 'assumed_released' => "Rilascio Acquisito", +'attrdef_management' => "Gestione Definizione Attributi", +'attrdef_exists' => "Definizione di Attributo esistente", +'attrdef_in_use' => "Definizione di Attributo ancora in uso", +'attrdef_name' => "Nome", +'attrdef_multiple' => "Permetti valori multipli", +'attrdef_objtype' => "Tipo oggetto", +'attrdef_type' => "Tipo", +'attrdef_minvalues' => "Numero di valori Min.", +'attrdef_maxvalues' => "Numero di valori Max.", +'attrdef_valueset' => "Set di valori", +'attributes' => "Attributi", 'august' => "Agosto", 'automatic_status_update' => "Modifica automatica dello stato", 'back' => "Ritorna", @@ -75,20 +89,25 @@ $text = array( 'cancel' => "Annulla", 'cannot_assign_invalid_state' => "Non è possibile modificare le assegnazioni di un documento già in stato finale", 'cannot_change_final_states' => "Attenzione: Non si può modificare lo stato dei documenti rifiutati, scaduti o in lavorazione", -//$text["cannot_delete_yourself"] = "Cannot delete yourself", +'cannot_delete_yourself' => "Non puoi cancellare la tua stessa utenza", 'cannot_move_root' => "Impossibile spostare la cartella di root", 'cannot_retrieve_approval_snapshot' => "Impossibile visualizzare lo stato di approvazione per questa versione di documento", 'cannot_retrieve_review_snapshot' => "Impossibile visualizzare lo stato di revisione per questa versione di documento", 'cannot_rm_root' => "Impossibile cancellare la cartella di root", -'category' => "Category", -'category_filter' => "Only categories", -'category_in_use' => "This category is currently used by documents.", -'categories' => "Categories", +'category' => "Categoria", +'category_exists' => "Categoria esistente.", +'category_filter' => "Solo categorie", +'category_in_use' => "Questa categoria è attualmente in uso in alcuni documenti.", +'category_noname' => "Non è stato attribuito un nome alla categoria.", +'categories' => "Categorie", 'change_assignments' => "Modifica le Assegnazioni", +'change_password' => "Cambia password", +'change_password_message' => "La tua password è stata cambiata.", 'change_status' => "Modifica lo Stato", +'choose_attrdef' => "Scegli attributo", 'choose_category' => "Seleziona", 'choose_group' => "--Seleziona gruppo--", -'choose_target_category' => "Choose category", +'choose_target_category' => "Selezione categoria", 'choose_target_document' => "Seleziona documento", 'choose_target_folder' => "Seleziona cartella", 'choose_user' => "--Seleziona utente--", @@ -110,12 +129,13 @@ $text = array( 'confirm_rm_version' => "Vuoi veramente eliminare la versione [version] del documento \"[documentname]\"?
Attenzione: L'operazione è irreversibile", 'content' => "Cartelle", 'continue' => "Continua", -'create_fulltext_index' => "Create fulltext index", -'create_fulltext_index_warning' => "You are 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.", +'create_fulltext_index' => "Crea indice fulltext", +'create_fulltext_index_warning' => "Stai creando un indice fulltext. Questo può occupare un tempo considerevole e ridurre le prestazioni del sistema. Sei sicuro di voler ricreare l'indice, prego conferma l'operazione.", 'creation_date' => "Data creazione", +'current_password' => "Password corrente", 'current_version' => "Ultima versione", -'daily' => "Daily", -'databasesearch' => "Database search", +'daily' => "Giornaliero", +'databasesearch' => "Ricerca nel Database", 'december' => "Dicembre", 'default_access' => "Permesso di default", 'default_keywords' => "Parole chiave disponibili", @@ -123,6 +143,7 @@ $text = array( 'details' => "Dettagli", 'details_version' => "Dettagli versione: [version]", 'disclaimer' => "Questa è un'area riservata. L'accesso è consentito solo al personale autorizzato. Qualunque violazione sarà perseguita a norma delle leggi italiane ed internazionali.", +'do_object_repair' => "Repaira tutte le cartelle e i documenti.", 'document_already_locked' => "Questo documento è già bloccato", 'document_deleted' => "Documento rimosso", 'document_deleted_email' => "Documento cancellato", @@ -136,6 +157,7 @@ $text = array( 'documents' => "Documenti", 'documents_in_process' => "Documenti in lavorazione", 'documents_locked_by_you' => "Documenti bloccati da te", +'documents_only' => "Solo documenti", 'document_status_changed_email' => "Modifica stato del documento", 'documents_to_approve' => "Documenti in attesa della tua approvazione", 'documents_to_review' => "Documenti in attesa della tua revisione", @@ -151,6 +173,7 @@ $text = array( 'dump_creation_warning' => "Con questa operazione è possibile creare un file di dump del contenuto del database. Dopo la creazione il file viene salvato nella cartella dati del server.", 'dump_list' => "List dei dump presenti", 'dump_remove' => "Cancella il dump file", +'edit_attributes' => "Edit attributi", 'edit_comment' => "Modifica il commento", 'edit_default_keywords' => "Modifica parole chiave", 'edit_document_access' => "Modifica permessi", @@ -167,11 +190,14 @@ $text = array( 'edit_user_details' => "Gestione dettagli utente", 'edit_user' => "Modifica utente", 'email' => "Email", +'email_error_title' => "Nessuna email immessa", 'email_footer' => "Puoi cambiare le tue preferenze utilizzando le funzioni del menu 'Account personale'", 'email_header' => "Questo è un messaggio automatico inviato dal server DMS", +'email_not_given' => "Devi inserire un indirizzo email valido.", 'empty_notify_list' => "Nessun record", -'error_no_document_selected' => "No document selected", -'error_no_folder_selected' => "No folder selected", +'error' => "Errore", +'error_no_document_selected' => "Nessun documento selezionato", +'error_no_folder_selected' => "Nessuna cartella selezionata", 'error_occured' => "Si verificato un errore", 'event_details' => "Dettagli evento", 'expired' => "Scaduto", @@ -194,11 +220,12 @@ $text = array( 'folder_title' => "Cartella '[foldername]'", 'friday' => "Venerdì", 'from' => "Da", -'fullsearch' => "Full text search", -'fullsearch_hint' => "Use fulltext index", -'fulltext_info' => "Fulltext index info", +'fullsearch' => "Ricerca Full text", +'fullsearch_hint' => "Usa l'indice fulltext", +'fulltext_info' => "Info indice Fulltext", +'global_attributedefinitions' => "Definizione attributi", 'global_default_keywords' => "Categorie parole chiave globali", -'global_document_categories' => "Categories", +'global_document_categories' => "Categorie", 'group_approval_summary' => "Dettaglio approvazioni di gruppo", 'group_exists' => "Il gruppo è già esistente", 'group' => "Gruppo", @@ -209,10 +236,11 @@ $text = array( 'guest_login_disabled' => "Login ospite è disabilitato", 'guest_login' => "Login come ospite", 'help' => "Aiuto", -'hourly' => "Hourly", +'hourly' => "Ogni ora", 'human_readable' => "Archivio per uso esterno", 'include_documents' => "Includi documenti", 'include_subdirectories' => "Includi sottocartelle", +'index_converters' => "Indice di conversione documenti", 'individuals' => "Singoli", 'inherits_access_msg' => "E' impostato il permesso ereditario.", 'inherits_access_copy_msg' => "Modifica la lista degli accessi ereditati", @@ -229,7 +257,7 @@ $text = array( 'invalid_folder_id' => "ID cartella non valido", 'invalid_group_id' => "ID gruppo non valido", 'invalid_link_id' => "ID di collegamento non valido", -'invalid_request_token' => "Invalid Request Token", +'invalid_request_token' => "Token di richiesta invalido", 'invalid_review_status' => "Stato revisione non valido", 'invalid_sequence' => "Valore di sequenza non valido", 'invalid_status' => "Stato del documento non valido", @@ -237,6 +265,7 @@ $text = array( 'invalid_target_folder' => "ID cartella selezionata non valido", 'invalid_user_id' => "ID utente non valido", 'invalid_version' => "Versione documento non valida", +'is_disabled' => "Disabilitato", 'is_hidden' => "Nascondi dalla lista utenti", 'january' => "Gennaio", 'js_no_approval_group' => "Si prega di selezionare un gruppo di approvazione", @@ -261,14 +290,17 @@ $text = array( 'keywords' => "Parole chiave", 'language' => "Lingua", 'last_update' => "Ultima modifica", -'link_alt_updatedocument' => "If you would like to upload files bigger than the current maximum upload size, please use the alternative upload page.", +'link_alt_updatedocument' => "Se vuoi caricare file più grandi del limite massimo attuale, usa la pagina alternativa di upload.", 'linked_documents' => "Documenti collegati", 'linked_files' => "File allegati", 'local_file' => "File locale", -'locked_by' => "Locked by", +'locked_by' => "Bloccato da", 'lock_document' => "Blocca", 'lock_message' => "Questo documento è bloccato da [username]. Solo gli utenti autorizzati possono sbloccare questo documento.", -'lock_status' => "Stato", +'lock_status' => "Stato bloccaggio", +'login' => "Login", +'login_disabled_text' => "Il tuo account è disabilitato, la causa probabile sono troppi login falliti.", +'login_disabled_title' => "L'Account è disabilitato", 'login_error_text' => "Errore nel login. ID utente o passord errati.", 'login_error_title' => "Errore di login", 'login_not_given' => "Non è stato inserito il nome utente", @@ -280,49 +312,66 @@ $text = array( 'max_upload_size' => "Dimensione massima caricabile per ogni file", 'may' => "Maggio", 'monday' => "Lunedì", -'month_view' => "Vista mese", -'monthly' => "Monthly", +'month_view' => "Vista mesile", +'monthly' => "Mensile", 'move_document' => "Sposta documento", 'move_folder' => "Sposta cartella", 'move' => "Sposta", 'my_account' => "Account personale", 'my_documents' => "Documenti personali", 'name' => "Nome", +'new_attrdef' => "Nuovo attributo", 'new_default_keyword_category' => "Aggiungi categoria", 'new_default_keywords' => "Aggiungi parole chiave", -'new_document_category' => "Add category", +'new_document_category' => "Aggiungi categoria", 'new_document_email' => "Nuovo documento", 'new_file_email' => "Nuovo file allegato", -//$text["new_folder"] = "New folder", +'new_folder' => "Nuova cartella", 'new' => "Nuovo", +'new_password' => "Nuova password", 'new_subfolder_email' => "Nuova sottocartella", 'new_user_image' => "Nuova immagine", 'no_action' => "Non è richiesto alcun intervento", 'no_approval_needed' => "No approval pending.", 'no_attached_files' => "No attached files", 'no_default_keywords' => "Nessuna parola chiave disponibile", -//$text["no_docs_locked"] = "No documents locked.", -//$text["no_docs_to_approve"] = "There are currently no documents that require approval.", -//$text["no_docs_to_look_at"] = "No documents that need attention.", -//$text["no_docs_to_review"] = "There are currently no documents that require review.", +'no_docs_locked' => "Nessun documento bloccato.", +'no_docs_to_approve' => "Non ci sono documenti che richiedano approvazione.", +'no_docs_to_look_at' => "Non ci sono documenti che richiedano attenzione.", +'no_docs_to_review' => "Non ci sono documenti che richiedano revisioni.", +'no_fulltextindex' => "Nessun indice fulltext disponibile", 'no_group_members' => "Questo gruppo non ha membri", 'no_groups' => "Nessun gruppo", 'no' => "No", -'no_linked_files' => "No linked files", +'no_linked_files' => "Nessun file collegato", 'no_previous_versions' => "Nessun'altra versione trovata", -'no_review_needed' => "No review pending.", +'no_review_needed' => "Nessuna revisione in sospeso.", 'notify_added_email' => "Sei stato aggiunto alla lista di notifica", 'notify_deleted_email' => "Sei stato eliminato dalla lista di notifica", 'no_update_cause_locked' => "Non è quindi possible aggiornarlo.", 'no_user_image' => "Nessuna immagine trovata", 'november' => "Novembre", +'now' => "Adesso", 'obsolete' => "Obsoleto", +'objectcheck' => "Controllo cartelle o documenti", 'october' => "Ottobre", 'old' => "Vecchio", 'only_jpg_user_images' => "Possono essere utilizzate solo immagini di tipo jpeg", 'owner' => "Proprietario", 'ownership_changed_email' => "Proprietario cambiato", 'password' => "Password", +'password_already_used' => "Password già in uso", +'password_repeat' => "Ripetere password", +'password_expiration' => "Password scaduta", +'password_expiration_text' => "La tua password è scaduta. Prego scegli una nuova password prima di continuare ad utilizzare OmecaDMS.", +'password_forgotten' => "Password dimenticata", +'password_forgotten_email_subject' => "Password dimenticata", +'password_forgotten_email_body' => "Caro utente di OmecaDMS,\n\nabbiamo ricevuto una richiesta di cambiamento della password.\n\nQuesto può farsi cliccando sul seguente link:\n\n###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###\n\nSe hai ancora problemi al login, allora contatta il tuo amministratore di sistema.", +'password_forgotten_send_hash' => "Le istruzioni su come procedere sono state inviate all'indirizzo e-mail dell'utente", +'password_forgotten_text' => "Compilare le informazioni seguenti e segui le istruzioni nell'e-mail che ti sarà inviata a breve.", +'password_forgotten_title' => "Password inviata", +'password_strength_insuffient' => "Efficacia della password insufficiente", +'password_wrong' => "Password errata", 'personal_default_keywords' => "Parole chiave personali", 'previous_versions' => "Versioni precedenti", 'refresh' => "Refresh", @@ -331,6 +380,7 @@ $text = array( 'removed_approver' => "Rimosso dalla lista degli approvatori.", 'removed_file_email' => "Rimosso file allegato", 'removed_reviewer' => "Rimosso dalla lista dei revisori.", +'repairing_objects' => "Riparazione documenti e cartelle in corso...", 'results_page' => "Pagina dei risultati", 'review_deletion_email' => "Cancellata la richiesta di revisione", 'reviewer_already_assigned' => "già è assegnato come revisore", @@ -342,6 +392,7 @@ $text = array( 'review_submit_email' => "Sottoposta revisione", 'review_summary' => "Dettaglio revisioni", 'review_update_failed' => "Errore nella variazione della revisione. Aggiornamento fallito.", +'rm_attrdef' => "Rimuovi definizione attributo", 'rm_default_keyword_category' => "Cancella categoria", 'rm_document' => "Rimuovi documento", 'rm_document_category' => "Delete category", @@ -350,22 +401,23 @@ $text = array( 'rm_group' => "Rimuovi questo gruppo", 'rm_user' => "Rimuovi questo utente", 'rm_version' => "Rimuovi versione", -//$text["role_admin"] = "Administrator", -//$text["role_guest"] = "Guest", -'role_user' => "User", -//$text["role"] = "Role", +'role_admin' => "Administrator", +'role_guest' => "Ospite", +'role_user' => "Utente", +'role' => "Ruolo", 'saturday' => "Sabato", 'save' => "Salva", -'search_fulltext' => "Search in fulltext", +'search_fulltext' => "Ricerca testo intero", 'search_in' => "Cerca in", 'search_mode_and' => "tutte le parole", 'search_mode_or' => "almeno una parola", 'search_no_results' => "Non ci sono documenti che contengano la vostra ricerca", 'search_query' => "Cerca per", -'search_report' => "Trovati [count] documenti", +'search_report' => "Trovati [doccount] documenti", +'search_report_fulltext' => "Trovati [doccount] documenti", 'search_results_access_filtered' => "La ricerca può produrre contenuti il cui accesso è negato.", 'search_results' => "Risultato ricerca", -//$text["search"] = "Search", +'search' => "Ricerca", 'search_time' => "Tempo trascorso: [time] sec.", 'selection' => "Selezione", 'select_one' => "Seleziona uno", @@ -376,82 +428,116 @@ $text = array( 'seq_start' => "Prima posizione", 'sequence' => "Posizione", 'set_expiry' => "Regola la scadenza", -//$text["set_owner_error"] = "Error setting owner", +'set_owner_error' => "Errore impostazione proprietario", 'set_owner' => "Conferma proprietario", -'settings_activate_module' => "Activate module", -'settings_activate_php_extension' => "Activate PHP extension", -'settings_adminIP' => "Admin IP", -'settings_adminIP_desc' => "If enabled admin can login only by specified IP addres, leave empty to avoid the control. NOTE: works only with local autentication (no LDAP)", +'set_password' => "Imposta Password", +'settings_install_welcome_title' => "Benvenuti nell'installazione di letoDMS", +'settings_install_welcome_text' => "

Per poter iniziare l'installazione di letoDMS è necessario creare un file 'ENABLE_INSTALL_TOOL' nella tua cartella di configurazione, altrimenti l'installazione non partir à. Con sistemi Unix-like questo può essere fatto rapidamente digitando da un terminale il comando 'touch conf/ENABLE_INSTALL_TOOL'. Dopo che l'installazione è stata completata cancellare il file per poter utilizzare letoDMS.

letoDMS ha requisiti di funzionamento minimi: è necessario unicamente un database mysql e un web server con php attivo. Per la funzione di ricerca fulltext di lucene, è necessario che sia installato anche il framework Zend e che sia visibile da php. A partire dalla versione 3.2.0 di letoDMS, la libreria ADOdb non sarà più parte della distribuzione. Per ottenere una copia fare riferimento al sito http://adodb.sourceforge.net, scaricare una copia ed installarla. Il path dell'installazione può essere impostato durante l'installazione.

Se preferisci creare il database prima dell'inizio dell'installazione, allora è necessario creare il database manualmente con il tuo tool di gestione preferito, opzionalmente creare un utente con l'accesso al database, e importare uno dei dump del database disponibili nella cartella di configurazione. Lo script di installazione può effettuare l'operazione in maniera automatica, ma necessita di un accesso al database con sufficienti diritti a creare database nuovi.

", +'settings_start_install' => "Inizio installazione", +'settings_sortUsersInList' => "Ordina gli utenti nella lista", +'settings_sortUsersInList_desc' => "Imposta se gli utenti nel menù di selezione sono ordinato secondo login o nome completo", +'settings_sortUsersInList_val_login' => "Ordina secondo login", +'settings_sortUsersInList_val_fullname' => "Ordina secondo nome completo", +'settings_stopWordsFile' => "Path del file con le parole proibite", +'settings_stopWordsFile_desc' => "Se la ricerca fulltext è abilitata, questo file conterrà le parole che verranno escluse nell'indicizzazione", +'settings_activate_module' => "Attivazione modulo", +'settings_activate_php_extension' => "Attivazione estensione PHP", +'settings_adminIP' => "IP Admin", +'settings_adminIP_desc' => "Se attivato l'admin si può loggare solo da un IP specifico, lasciare vuoto per evitare il controllo. NOTA: funzione solo con autenticazione locale (no LDAP)", 'settings_ADOdbPath' => "ADOdb Path", -'settings_ADOdbPath_desc' => "Path to adodb. This is the directory containing the adodb directory", -'settings_Advanced' => "Advanced", -'settings_apache_mod_rewrite' => "Apache - Module Rewrite", -'settings_Authentication' => "Authentication settings", -'settings_Calendar' => "Calendar settings", -'settings_calendarDefaultView' => "Calendar Default View", -'settings_calendarDefaultView_desc' => "Calendar default view", -'settings_contentDir' => "Content directory", -'settings_contentDir_desc' => "Where the uploaded files are stored (best to choose a directory that is not accessible through your web-server)", -'settings_contentOffsetDir' => "Content Offset Directory", +'settings_ADOdbPath_desc' => "Path di adodb. Questa è la cartella che contiene la cartella adodb", +'settings_Advanced' => "Avanzate", +'settings_apache_mod_rewrite' => "Apache - Mod Rewrite", +'settings_Authentication' => "Impostazioni di Autenticazione", +'settings_Calendar' => "Impostazioni Calendario", +'settings_calendarDefaultView' => "Vista di default del Calendario", +'settings_calendarDefaultView_desc' => "Vista di default del Calendario", +'settings_contentDir' => "Contenuto cartella", +'settings_contentDir_desc' => "Dove i file caricati sono immagazzinati (ideale scegliere una cartella che non è accessibile dal tuo web server)", +'settings_contentOffsetDir' => "Cartella con contenuti Offset", 'settings_contentOffsetDir_desc' => "To work around limitations in the underlying file system, a new directory structure has been devised that exists within the content directory (Content Directory). This requires a base directory from which to begin. Usually leave this to the default setting, 1048576, but can be any number or string that does not already exist within (Content Directory)", -'settings_coreDir' => "Core letoDMS directory", -'settings_coreDir_desc' => "Path to SeedDMS_Core (optional)", -'settings_luceneClassDir' => "Lucene SeedDMS directory", -'settings_luceneClassDir_desc' => "Path to SeedDMS_Lucene (optional)", -'settings_luceneDir' => "Lucene index directory", -'settings_luceneDir_desc' => "Path to Lucene index", +'settings_coreDir' => "Cartella di Core letoDMS", +'settings_coreDir_desc' => "Path per il pacchetto SeedDMS_Core (opzionale)", +'settings_loginFailure_desc' => "Account disabilitato dopo n tentativi di accesso falliti.", +'settings_loginFailure' => "Login fallita", +'settings_luceneClassDir' => "Cartella Lucene SeedDMS", +'settings_luceneClassDir_desc' => "Cartella del pacchetto SeedDMS_Lucene (opzionale)", +'settings_luceneDir' => "Cartella dell'indice Lucene", +'settings_luceneDir_desc' => "Cartella di memorizzazione dell'indice utilizzato da Lucene", +'settings_cannot_disable' => "Il file ENABLE_INSTALL_TOOL non può essere cancellato", +'settings_install_disabled' => "Il file ENABLE_INSTALL_TOOL è stato cancellato. Ora puoi effettuare il login in SeedDMS e fare ulteriori configurazioni.", 'settings_createdatabase' => "Create database", -'settings_createdirectory' => "Create directory", -'settings_currentvalue' => "Current value", -'settings_Database' => "Database settings", +'settings_createdirectory' => "Crea cartella", +'settings_currentvalue' => "Valore corrente", +'settings_Database' => "Impostazioni Database", 'settings_dbDatabase' => "Database", -'settings_dbDatabase_desc' => "The name for your database entered during the installation process. Do not edit field unless absolutely necessary, for example transfer of the database to a new Host.", -'settings_dbDriver' => "Database Type", -'settings_dbDriver_desc' => "The type of database in use entered during the installation process. Do not edit this field unless you are having to migrate to a different type of database perhaps due to changing hosts. Type of DB-Driver used by adodb (see adodb-readme)", -'settings_dbHostname_desc' => "The hostname for your database entered during the installation process. Do not edit field unless absolutely necessary, for example transfer of the database to a new Host.", -'settings_dbHostname' => "Server name", -'settings_dbPass_desc' => "The password for access to your database entered during the installation process.", +'settings_dbDatabase_desc' => "Il nome del tuo database da utilizzare durante il processo di installazione. Non modificare questo campo se non assolutamente necessario, ad esempio nel trasferimento del database su un nuovo Host.", +'settings_dbDriver' => "Tipo Database", +'settings_dbDriver_desc' => "Il tipo di database da utilizzare durante il processo di installazione. Non modificare questo campo a meno che non si debba migrare a un differente tipo di database forse a causa di un cambiamento di Host. Questo tipo è utilizzato da ADOdb per identificare il tipo del DB-Driver (consultare il file adodb-readme)", +'settings_dbHostname_desc' => "Nome del Server dove risiede il database da utilizzarsi durante il processo di installazione. Non modificare questo campo se non assolutamente necessario, per esempio nel caso di trasferimento del database su un nuovo Host.", +'settings_dbHostname' => "Nome del server o indirizzo IP del Server", +'settings_dbPass_desc' => "Password per l'accesso al tuo database da utilizzarsi durante il processo di installazione.", 'settings_dbPass' => "Password", -'settings_dbUser_desc' => "The username for access to your database entered during the installation process. Do not edit field unless absolutely necessary, for example transfer of the database to a new Host.", +'settings_dbUser_desc' => "Username per accedere al database da utilizzarsi durante il processo di installazione. Non modificare questo campo se non assolutamente necessario, per esempio nel caso di trasferimento del database su un nuovo Host.", 'settings_dbUser' => "Username", -'settings_delete_install_folder' => "To use SeedDMS, you must delete the install directory", -'settings_disableSelfEdit_desc' => "If checked user cannot edit his own profile", -'settings_disableSelfEdit' => "Disable Self Edit", -'settings_Display' => "Display settings", -'settings_Edition' => "Edition settings", +'settings_dbVersion' => "Schema del Database troppo vecchio", +'settings_delete_install_folder' => "Per poter usare SeedDMS, devi cancellare il file ENABLE_INSTALL_TOOL nella cartella di configurazione", +'settings_disable_install' => "Eliminare il ENABLE_INSTALL_TOOL se possibile", +'settings_disableSelfEdit_desc' => "L'utente selezionato non può modficare il proprio profilo", +'settings_disableSelfEdit' => "Disabilita Auto-Modifica", +'settings_Display' => "Impostazioni del display", +'settings_Edition' => "Impostazioni di edition", 'settings_enableAdminRevApp_desc' => "Uncheck to don't list administrator as reviewer/approver", 'settings_enableAdminRevApp' => "Enable Admin Rev App", -'settings_enableCalendar_desc' => "Enable/disable calendar", -'settings_enableCalendar' => "Enable Calendar", -'settings_enableConverting_desc' => "Enable/disable converting of files", -'settings_enableConverting' => "Enable Converting", +'settings_enableCalendar_desc' => "Abilita/disabilita la funzione calendario", +'settings_enableCalendar' => "Abilita calendario", +'settings_enableConverting_desc' => "Abilita/disabilita la conversione dei files", +'settings_enableConverting' => "Abilita conversione", +'settings_enableNotificationAppRev_desc' => "Check to send a notification to the reviewer/approver when a new document version is added", +'settings_enableNotificationAppRev' => "Enable reviewer/approver notification", +'settings_enableVersionModification_desc' => "Enable/disable modification of a document versions by regular users after a version was uploaded. Admin may always modify the version after upload.", +'settings_enableVersionModification' => "Enable modification of versions", +'settings_enableVersionDeletion_desc' => "Enable/disable deletion of previous document versions by regular users. Admin may always delete old versions.", +'settings_enableVersionDeletion' => "Enable deletion of previous versions", 'settings_enableEmail_desc' => "Enable/disable automatic email notification", 'settings_enableEmail' => "Enable E-mail", 'settings_enableFolderTree_desc' => "False to don't show the folder tree", 'settings_enableFolderTree' => "Enable Folder Tree", 'settings_enableFullSearch' => "Enable Full text search", +'settings_enableFullSearch_desc' => "Enable Full text search", 'settings_enableGuestLogin_desc' => "If you want anybody to login as guest, check this option. Note: guest login should be used only in a trusted environment", 'settings_enableGuestLogin' => "Enable Guest Login", +'settings_enableLargeFileUpload_desc' => "If set, file upload is also available through a java applet called jumploader without a file size limit set by the browser. It also allows to upload several files in one step.", +'settings_enableLargeFileUpload' => "Enable large file upload", +'settings_enableOwnerNotification_desc' => "Check for adding a notification for the owner if a document when it is added.", +'settings_enableOwnerNotification' => "Enable owner notification by default", +'settings_enablePasswordForgotten_desc' => "If you want to allow user to set a new password and send it by mail, check this option.", +'settings_enablePasswordForgotten' => "Enable Password forgotten", 'settings_enableUserImage_desc' => "Enable users images", 'settings_enableUserImage' => "Enable User Image", 'settings_enableUsersView_desc' => "Enable/disable group and user view for all users", 'settings_enableUsersView' => "Enable Users View", +'settings_encryptionKey' => "Encryption key", +'settings_encryptionKey_desc' => "This string is used for creating a unique identifier being added as a hidden field to a formular in order to prevent CSRF attacks.", 'settings_error' => "Error", -'settings_expandFolderTree_desc' => "Expand Folder Tree", -'settings_expandFolderTree' => "Expand Folder Tree", -'settings_expandFolderTree_val0' => "start with tree hidden", -'settings_expandFolderTree_val1' => "start with tree shown and first level expanded", -'settings_expandFolderTree_val2' => "start with tree shown fully expanded", -'settings_firstDayOfWeek_desc' => "First day of the week", -'settings_firstDayOfWeek' => "First day of the week", -'settings_footNote_desc' => "Message to display at the bottom of every page", -'settings_footNote' => "Foot Note", +'settings_expandFolderTree_desc' => "Espandi l'albero delle cartelle", +'settings_expandFolderTree' => "Espandi l'albero delle cartelle", +'settings_expandFolderTree_val0' => "Inizia con l'albero nascosto", +'settings_expandFolderTree_val1' => "Inizia con l'albero aperto e il primo livello espanso", +'settings_expandFolderTree_val2' => "Inizia con l'albero aperto e completamente espanso", +'settings_firstDayOfWeek_desc' => "Primo giorno della settimana", +'settings_firstDayOfWeek' => "Primo giorno della settimana", +'settings_footNote_desc' => "Messaggio da visualizzare alla fine di ogni pagina", +'settings_footNote' => "Pie di pagina", 'settings_guestID_desc' => "ID of guest-user used when logged in as guest (mostly no need to change)", 'settings_guestID' => "Guest ID", 'settings_httpRoot_desc' => "The relative path in the URL, after the domain part. Do not include the http:// prefix or the web host name. e.g. If the full URL is http://www.example.com/letodms/, set '/letodms/'. If the URL is http://www.example.com/, set '/'", 'settings_httpRoot' => "Http Root", 'settings_installADOdb' => "Install ADOdb", 'settings_install_success' => "The installation is completed successfully", +'settings_install_pear_package_log' => "Install Pear package 'Log'", +'settings_install_pear_package_webdav' => "Install Pear package 'HTTP_WebDAV_Server', if you intend to use the webdav interface", +'settings_install_zendframework' => "Install Zend Framework, if you intend to use the full text search engine", 'settings_language' => "Default language", 'settings_language_desc' => "Default language (name of a subfolder in folder \"languages\")", 'settings_logFileEnable_desc' => "Enable/disable log file", @@ -464,8 +550,25 @@ $text = array( 'settings_maxExecutionTime_desc' => "This sets the maximum time in seconds a script is allowed to run before it is terminated by the parse", 'settings_maxExecutionTime' => "Max Execution Time (s)", 'settings_more_settings' => "Configure more settings. Default login: admin/admin", -'settings_notfound' => "Not found", -'settings_partitionSize' => "Size of partial files uploaded by jumploader", +'settings_Notification' => "Impostazioni notifiche", +'settings_no_content_dir' => "Contenuto cartella", +'settings_notfound' => "Non trovato", +'settings_notwritable' => "La configurazione non può essere salvata perchè il file di configurazione può essere scritto.", +'settings_partitionSize' => "Partial filesize", +'settings_partitionSize_desc' => "Size of partial files in bytes, uploaded by jumploader. Do not set a value larger than the maximum upload size set by the server.", +'settings_passwordExpiration' => "Scadenza Password", +'settings_passwordExpiration_desc' => "The number of days after which a password expireѕ and must be reset. 0 turns password expiration off.", +'settings_passwordHistory' => "Password history", +'settings_passwordHistory_desc' => "The number of passwords a user must have been used before a password can be reused. 0 turns the password history off.", +'settings_passwordStrength' => "Min. password strength", +'settings_passwordЅtrength_desc' => "The minimum password strength is an integer value from 0 to 100. Setting it to 0 will turn off checking for the minimum password strength.", +'settings_passwordStrengthAlgorithm' => "Algorithm for password strength", +'settings_passwordStrengthAlgorithm_desc' => "The algorithm used for calculating the password strength. The 'simple' algorithm just checks for at least eight chars total, a lower case letter, an upper case letter, a number and a special char. If those conditions are met the returned score is 100 otherwise 0.", +'settings_passwordStrengthAlgorithm_valsimple' => "simple", +'settings_passwordStrengthAlgorithm_valadvanced' => "advanced", +'settings_perms' => "Permissions", +'settings_pear_log' => "Pear package : Log", +'settings_pear_webdav' => "Pear package : HTTP_WebDAV_Server", 'settings_php_dbDriver' => "PHP extension : php_'see current value'", 'settings_php_gd2' => "PHP extension : php_gd2", 'settings_php_mbstring' => "PHP extension : php_mbstring", @@ -492,7 +595,7 @@ $text = array( 'settings_smtpServer_desc' => "SMTP Server hostname", 'settings_smtpServer' => "SMTP Server hostname", 'settings_SMTP' => "SMTP Server settings", -'settings_stagingDir' => "Directory for partial uploads", +'settings_stagingDir' => "Cartella per upload parziali", 'settings_strictFormCheck_desc' => "Strict form checking. If set to true, then all fields in the form will be checked for a value. If set to false, then (most) comments and keyword fields become optional. Comments are always required when submitting a review or overriding document status", 'settings_strictFormCheck' => "Strict Form Check", 'settings_suggestionvalue' => "Suggestion value", @@ -501,12 +604,14 @@ $text = array( 'settings_theme_desc' => "Default style (name of a subfolder in folder \"styles\")", 'settings_titleDisplayHack_desc' => "Workaround for page titles that go over more than 2 lines.", 'settings_titleDisplayHack' => "Title Display Hack", +'settings_updateDatabase' => "Run schema update scripts on database", 'settings_updateNotifyTime_desc' => "Users are notified about document-changes that took place within the last 'Update Notify Time' seconds", 'settings_updateNotifyTime' => "Update Notify Time", 'settings_versioningFileName_desc' => "The name of the versioning info file created by the backup tool", 'settings_versioningFileName' => "Versioning FileName", 'settings_viewOnlineFileTypes_desc' => "Files with one of the following endings can be viewed online (USE ONLY LOWER CASE CHARACTERS)", 'settings_viewOnlineFileTypes' => "View Online File Types", +'settings_zendframework' => "Zend Framework", 'signed_in_as' => "Utente", 'sign_in' => "sign in", 'sign_out' => "Esci", @@ -524,7 +629,10 @@ $text = array( 'storage_size' => "Dimensione totale", 'submit_approval' => "Approvazione documento", 'submit_login' => "Login", -'submit_review' => "Revisione documento", +'submit_password' => "Impostazione nuova password", +'submit_password_forgotten' => "Inizio processo di recupero", +'submit_review' => "Invio revisione documento", +'submit_userinfo' => "Invio info utente", 'sunday' => "Domenica", 'theme' => "Tema", 'thursday' => "Giovedì", @@ -544,14 +652,14 @@ $text = array( 'unlock_document' => "Sblocca", 'update_approvers' => "Aggiornamento lista approvatori", 'update_document' => "Aggiorna", -'update_fulltext_index' => "Update fulltext index", +'update_fulltext_index' => "Aggiornamento indice fulltext", 'update_info' => "Aggiorna informazioni", 'update_locked_msg' => "Questo documento è bloccato.", 'update_reviewers' => "Aggiornamento lista revisori", 'update' => "Aggiorna", 'uploaded_by' => "Caricato da", 'uploading_failed' => "Upload fallito. Sei pregato di contattare l'amministratore.", -'use_default_categories' => "Use predefined categories", +'use_default_categories' => "Usare categoria predefinite", 'use_default_keywords' => "Usa le parole chiave predefinite", 'user_exists' => "Utente esistente", 'user_image' => "Immagine", From 03e76fe662888c37db3f297465b84d7eded1b14e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 19 Apr 2013 23:23:22 +0200 Subject: [PATCH 64/70] nicer button layout --- views/bootstrap/class.AdminTools.php | 37 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/views/bootstrap/class.AdminTools.php b/views/bootstrap/class.AdminTools.php index 8f926129f..848ce3165 100644 --- a/views/bootstrap/class.AdminTools.php +++ b/views/bootstrap/class.AdminTools.php @@ -44,32 +44,33 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style { // $this->contentHeading(getMLText("admin_tools")); $this->contentContainerStart(); ?> +
- - +
+

- +
".getMLText("log_management").""; + echo "
".getMLText("log_management").""; ?>

- - - +
+
+
params['workflowmode'] != 'traditional') { ?>

- - - +
+
+

- - - +
+
+

- - - +
+
+

- +
+
- contentContainerEnd(); $this->htmlEndPage(); From 9a6b4ffc341095de24149ccd5ff1c1919033a495 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 19 Apr 2013 23:23:49 +0200 Subject: [PATCH 65/70] add style for #admin-tools --- styles/bootstrap/application.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css index 46cea9938..f9675e25e 100644 --- a/styles/bootstrap/application.css +++ b/styles/bootstrap/application.css @@ -10,6 +10,12 @@ img.mimeicon { padding: 2px; } +#admin-tools i { + font-size: 300%; + line-height: 110%; + min-height: 100px; +} + @media (max-width: 480px) { .nav-tabs > li { float:none; From d4e6eb67842f011a0671512df0592d2eb6f817d8 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 22 Apr 2013 10:15:35 +0200 Subject: [PATCH 66/70] support for sqlite3 database update --- install/update-4.1.0/update-sqlite3.sql | 5 ++++ install/update-4.2.0/update-sqlite3.sql | 8 +++++++ install/update.php | 31 +++++++++++++++---------- 3 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 install/update-4.1.0/update-sqlite3.sql create mode 100644 install/update-4.2.0/update-sqlite3.sql diff --git a/install/update-4.1.0/update-sqlite3.sql b/install/update-4.1.0/update-sqlite3.sql new file mode 100644 index 000000000..6cc1c4ed1 --- /dev/null +++ b/install/update-4.1.0/update-sqlite3.sql @@ -0,0 +1,5 @@ +BEGIN; + +UPDATE tblVersion set major=4, minor=1, subminor=0; + +COMMIT; diff --git a/install/update-4.2.0/update-sqlite3.sql b/install/update-4.2.0/update-sqlite3.sql new file mode 100644 index 000000000..70ea78a65 --- /dev/null +++ b/install/update-4.2.0/update-sqlite3.sql @@ -0,0 +1,8 @@ +BEGIN; + +ALTER TABLE tblSessions ADD COLUMN `su` INTEGER DEFAULT NULL; + +UPDATE tblVersion set major=4, minor=2, subminor=0; + +COMMIT; + diff --git a/install/update.php b/install/update.php index 55905e5bd..afc7e3e46 100644 --- a/install/update.php +++ b/install/update.php @@ -41,6 +41,7 @@ UI::htmlStartPage('Database update'); UI::contentHeading("SeedDMS Installation for version ".$_GET['version']); UI::contentContainerStart(); +$sqlfile = "update.sql"; switch($settings->_dbDriver) { case 'mysql': case 'mysqli': @@ -49,6 +50,8 @@ switch($settings->_dbDriver) { break; case 'sqlite': $dsn = $settings->_dbDriver.":".$settings->_dbDatabase; + if(file_exists('update-'.$_GET['version'].'/update-sqlite3.sql')) + $sqlfile = "update-sqlite3.sql"; break; } $db = new PDO($dsn, $settings->_dbUser, $settings->_dbPass); @@ -61,22 +64,26 @@ $res = $db->query('select * from tblVersion'); if($rec = $res->fetch(PDO::FETCH_ASSOC)) { if($_GET['version'] > $rec['major'].'.'.$rec['minor'].'.'.$rec['subminor']) { - $queries = file_get_contents('update-'.$_GET['version'].'/update.sql'); - $queries = explode(";", $queries); + if(file_exists('update-'.$_GET['version'].'/'.$sqlfile)) { + $queries = file_get_contents('update-'.$_GET['version'].'/'.$sqlfile); + $queries = explode(";", $queries); - // execute queries - if($queries) { - echo "

Updating database schema

"; - foreach($queries as $query) { - $query = trim($query); - if (!empty($query)) { - echo $query."
"; - if(false === $db->exec($query)) { - $e = $db->ErrorInfo(); - $errorMsg .= $e[2] . "
"; + // execute queries + if($queries) { + echo "

Updating database schema

"; + foreach($queries as $query) { + $query = trim($query); + if (!empty($query)) { + echo $query."
"; + if(false === $db->exec($query)) { + $e = $db->ErrorInfo(); + $errorMsg .= $e[2] . "
"; + } } } } + } else { + echo "

SQL file for update missing!

"; } } else { echo "

Database schema already up to date.

"; From e8e58b6bae8c1f6370621c6d7f5cf4fb86bb1af1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 22 Apr 2013 10:26:48 +0200 Subject: [PATCH 67/70] fix sql statement to create session --- inc/inc.ClassSession.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/inc.ClassSession.php b/inc/inc.ClassSession.php index 32738b7ac..03542d798 100644 --- a/inc/inc.ClassSession.php +++ b/inc/inc.ClassSession.php @@ -97,7 +97,7 @@ class SeedDMS_Session { $id = md5($id); $lastaccess = time(); $queryStr = "INSERT INTO tblSessions (id, userID, lastAccess, theme, language, su) ". - "VALUES ('".$id."', ".$data['userid'].", ".$lastaccess.", '".$data['theme']."', '".$data['lang']."')"; + "VALUES ('".$id."', ".$data['userid'].", ".$lastaccess.", '".$data['theme']."', '".$data['lang']."', 0)"; if (!$this->db->getResult($queryStr)) { return false; } From 7bb38d555192e409bf2a02e8e54fbb578e9bef79 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 22 Apr 2013 10:30:24 +0200 Subject: [PATCH 68/70] update date and time --- SeedDMS_Core/package.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index b1abfc574..818489229 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,8 +12,8 @@ uwe@steinmann.cx yes - 2013-04-16 - + 2013-04-22 + 4.2.0 4.2.0 From 80387d9a1784d4fb8f0c53df82d88dda37ed2b2f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 22 Apr 2013 10:31:16 +0200 Subject: [PATCH 69/70] add entry for sqlite3 update --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 69a2e35f9..ca1a4d85d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ -------------------------------------------------------------------------------- Changes in version 4.2.0 -------------------------------------------------------------------------------- +- sqlite3 database can be updated - use awesome font for icons - currently logged in user can be changed temporarily if being admin - count documents/folders recursively for output in folder list (Bug #43) From da2562ce6d4bc46ff28e3f3be7c6e6acddf25df5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 22 Apr 2013 10:34:48 +0200 Subject: [PATCH 70/70] add missing update script --- install/update-4.2.0/update.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 install/update-4.2.0/update.sql diff --git a/install/update-4.2.0/update.sql b/install/update-4.2.0/update.sql new file mode 100644 index 000000000..6b45d5563 --- /dev/null +++ b/install/update-4.2.0/update.sql @@ -0,0 +1,8 @@ +START TRANSACTION; + +ALTER TABLE tblSessions ADD COLUMN `su` INTEGER DEFAULT NULL; + +UPDATE tblVersion set major=4, minor=2, subminor=0; + +COMMIT; +