gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 08:55:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.5' into develop

Browse Source 
Conflicts:
	languages/en_GB/lang.inc
	views/bootstrap/class.Bootstrap.php
This commit is contained in:
Uwe Steinmann 2014-03-04 11:20:02 +01:00
commit 0a070eef1f
27 changed files with 291 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG
View File

@ -1,3 +1,11 @@
--------------------------------------------------------------------------------
Changes in version 4.3.5
--------------------------------------------------------------------------------
- fix setting of order by sequence in configuration (Bug #127)
- fix ordering by sequence in folder listing
- list mandatory approvers/reviewers without access on document
- login failures will actually increment the failure counter of the user
--------------------------------------------------------------------------------
Changes in version 4.3.4
--------------------------------------------------------------------------------

21
languages/ar_EG/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (875)
// Translators: Admin (877)
$text = array(
'accept' => 'وافق',
@ -329,15 +329,14 @@ URL: [url]',
'folders' => 'مجلدات',
'folders_and_documents_statistic' => 'رؤية عامة للمحتوى',
'folder_comment_changed_email' => 'تم تعديل التعليق',
'folder_comment_changed_email_body' => 'تم تعديل التعليق
الملجلد: [name]
الإصدرا: [version]
التعليق القديم: [old_comment]
التعليق الجديد: [new_comment]
Parent folder: [folder_path]
المستخدم: [username]
'folder_comment_changed_email_body' => 'تم تعديل التعليق
الملجلد: [name]
التعليق القديم: [old_comment]
التعليق الجديد: [new_comment]
Parent folder: [folder_path]
المستخدم: [username]
URL: [url]',
'folder_comment_changed_email_subject' => '[sitename]: [folder] - تم تعديل التعليق',
'folder_comment_changed_email_subject' => '[sitename]: [name] - تم تعديل التعليق',
'folder_contents' => 'محتوى المجلدات',
'folder_deleted_email' => 'تم مسح المجلد',
'folder_deleted_email_body' => 'تم مسح المجلد
@ -468,6 +467,10 @@ URL: [url]',
'logout' => 'خروج',
'log_management' => 'ادارة ملفات السجلات',
'manager' => 'مدير',
'mandatory_approvergroup_no_access' => '',
'mandatory_approver_no_access' => '',
'mandatory_reviewergroup_no_access' => '',
'mandatory_reviewer_no_access' => '',
'march' => 'مارس',
'max_upload_size' => 'الحجم الاقصى للملف',
'may' => 'مايو',

4
languages/ca_ES/lang.inc
View File

@ -400,6 +400,10 @@ $text = array(
'logout' => 'Desconnectar',
'log_management' => 'Gestió de fitxers de registre',
'manager' => 'Manager',
'mandatory_approvergroup_no_access' => '',
'mandatory_approver_no_access' => '',
'mandatory_reviewergroup_no_access' => '',
'mandatory_reviewer_no_access' => '',
'march' => 'Març',
'max_upload_size' => 'Mida màxima de pujada de cada fitxer',
'may' => 'Maig',

39
languages/cs_CZ/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (608), kreml (370)
// Translators: Admin (610), kreml (379)
$text = array(
'accept' => 'Přijmout',
@ -318,7 +318,7 @@ Nadřazená složka: [folder_path]
Uživatel: [username]
URL: [url]',
'expiry_changed_email_subject' => '[sitename]: [name] - Datum ukončení platnosti změněn',
'extension_manager' => '',
'extension_manager' => 'Správa rozšíření',
'february' => 'Únor',
'file' => 'Soubor',
'files' => 'Soubory',
@ -329,15 +329,14 @@ URL: [url]',
'folders' => 'Složky',
'folders_and_documents_statistic' => 'Přehled složek a dokumentů',
'folder_comment_changed_email' => 'Změna komentáře',
'folder_comment_changed_email_body' => 'Změna komentáře
Složka: [name]
Verze: [version]
Starý komentář: [old_comment]
Komentář: [new_comment]
Nadřazená složka: [folder_path]
Uživatel: [username]
'folder_comment_changed_email_body' => 'Změna komentáře
Složka: [name]
Starý komentář: [old_comment]
Komentář: [new_comment]
Nadřazená složka: [folder_path]
Uživatel: [username]
URL: [url]',
'folder_comment_changed_email_subject' => '[sitename]: [folder] - Změna komentáře',
'folder_comment_changed_email_subject' => '[sitename]: [name] - Změna komentáře',
'folder_contents' => 'Obsah složky',
'folder_deleted_email' => 'Složka odstraněna',
'folder_deleted_email_body' => 'Složka smazána
@ -468,6 +467,10 @@ URL: [url]',
'logout' => 'Odhlášení',
'log_management' => 'Správa LOG souborů',
'manager' => 'Správce',
'mandatory_approvergroup_no_access' => '',
'mandatory_approver_no_access' => '',
'mandatory_reviewergroup_no_access' => '',
'mandatory_reviewer_no_access' => '',
'march' => 'Březen',
'max_upload_size' => 'Max. délka pro nahrání jednoho souboru',
'may' => 'Květen',
@ -799,8 +802,8 @@ URL: [url]',
'settings_enableRecursiveCount_desc' => 'Při zapnutí je počet dokumentů a složek v zobrazení složek určen počítáním všech objektů při rekurzivním zpracování složek a počítáním těch dokumentů a složek, ke kterým má uživatel přístup.',
'settings_enableSelfRevApp' => 'Povolit posouzení/schválení pro přihlášeného uživatele',
'settings_enableSelfRevApp_desc' => 'Povolte, pokud chcete aktuálně přihlášeného uvést jako posuzovatele/schvalovatele a pro přechody pracovního postupu',
'settings_enableThemeSelector' => '',
'settings_enableThemeSelector_desc' => '',
'settings_enableThemeSelector' => 'Volba tématu',
'settings_enableThemeSelector_desc' => 'Volba témat na přihlašovací stránce.',
'settings_enableUserImage' => 'Enable User Image',
'settings_enableUserImage_desc' => 'Enable users images',
'settings_enableUsersView' => 'Enable Users View',
@ -817,7 +820,7 @@ URL: [url]',
'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_Extensions' => '',
'settings_Extensions' => 'Rozšíření',
'settings_extraPath' => 'Extra PHP include Path',
'settings_extraPath_desc' => 'Cesta pro další software. To je adresář obsahující např. "adodb" adresář nebo další "pear" balíčky.',
'settings_firstDayOfWeek' => 'First day of the week',
@ -906,11 +909,11 @@ URL: [url]',
'settings_smtpServer_desc' => 'SMTP Server hostname',
'settings_smtpUser' => 'Uživatel SMTP serveru',
'settings_smtpUser_desc' => 'Uživatel SMTP serveru',
'settings_sortFoldersDefault' => '',
'settings_sortFoldersDefault_desc' => '',
'settings_sortFoldersDefault_val_name' => '',
'settings_sortFoldersDefault_val_sequence' => '',
'settings_sortFoldersDefault_val_unsorted' => '',
'settings_sortFoldersDefault' => 'Výchozí metoda řazení',
'settings_sortFoldersDefault_desc' => 'Toto nastaví metodu třídění pro složky a dokumenty v zobrazení složek.',
'settings_sortFoldersDefault_val_name' => 'podle jména',
'settings_sortFoldersDefault_val_sequence' => 'podle posloupnosti',
'settings_sortFoldersDefault_val_unsorted' => 'netříděno',
'settings_sortUsersInList' => 'Seřadit uživatele v seznamu',
'settings_sortUsersInList_desc' => 'Nastavuje, zda budou uživatelé v nabídce seřazeni podle "login-u" nebo podle celého jména',
'settings_sortUsersInList_val_fullname' => 'Řadit podle celého jména',

9
languages/de_DE/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (1819)
// Translators: Admin (1826)
$text = array(
'accept' => 'Übernehmen',
@ -331,13 +331,12 @@ URL: [url]',
'folder_comment_changed_email' => 'Kommentar geändert',
'folder_comment_changed_email_body' => 'Comment changed
Ordner: [name]
Version: [version]
Old comment: [old_comment]
Comment: [new_comment]
Elternordner: [folder_path]
Benutzer: [username]
URL: [url]',
'folder_comment_changed_email_subject' => '[sitename]: [folder] - Comment changed',
'folder_comment_changed_email_subject' => '[sitename]: [name] - Comment changed',
'folder_contents' => 'Ordner enthält',
'folder_deleted_email' => 'Ordner gelöscht',
'folder_deleted_email_body' => 'Ordner gelöscht
@ -468,6 +467,10 @@ URL: [url]',
'logout' => 'Abmelden',
'log_management' => 'Management der Log-Dateien',
'manager' => 'Manager',
'mandatory_approvergroup_no_access' => 'Zwingende Gruppe von Freigebern \'[group]\' hat unzureichende Zugriffsrechte.',
'mandatory_approver_no_access' => 'Zwingender Freigeber \'[user]\' hat unzureichende Zugriffsrechte.',
'mandatory_reviewergroup_no_access' => 'Zwingende Gruppe von Prüfern \'[group]\' hat unzureichende Zugriffsrechte.',
'mandatory_reviewer_no_access' => 'Zwingender Prüfer \'[user]\' hat nicht ausreichende Zugriffsrechte.',
'march' => 'März',
'max_upload_size' => 'Maximale Dateigröße',
'may' => 'Mai',

21
languages/en_GB/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (967), netixw (14)
// Translators: Admin (981), netixw (14)
$text = array(
'accept' => 'Accept',
@ -329,15 +329,14 @@ URL: [url]',
'folders' => 'Folders',
'folders_and_documents_statistic' => 'Contents overview',
'folder_comment_changed_email' => 'Comment changed',
'folder_comment_changed_email_body' => 'Comment changed
Folder: [name]
Version: [version]
Old comment: [old_comment]
Comment: [new_comment]
Parent folder: [folder_path]
User: [username]
'folder_comment_changed_email_body' => 'Comment changed
Folder: [name]
Old comment: [old_comment]
Comment: [new_comment]
Parent folder: [folder_path]
User: [username]
URL: [url]',
'folder_comment_changed_email_subject' => '[sitename]: [folder] - Comment changed',
'folder_comment_changed_email_subject' => '[sitename]: [name] - Comment changed',
'folder_contents' => 'Folder Contents',
'folder_deleted_email' => 'Folder deleted',
'folder_deleted_email_body' => 'Folder deleted
@ -468,6 +467,10 @@ URL: [url]',
'logout' => 'Logout',
'log_management' => 'Log files management',
'manager' => 'Manager',
'mandatory_approvergroup_no_access' => 'Mandatory group of approvers \'[group]\' has insufficient access rights.',
'mandatory_approver_no_access' => 'Mandatory approver \'[user]\' has insufficient access rights.',
'mandatory_reviewergroup_no_access' => 'Mandatory group of reviewers \'[group]\' has insufficient access rights.',
'mandatory_reviewer_no_access' => 'Mandatory reviewer \'[user]\' has insufficient access rights.',
'march' => 'March',
'max_upload_size' => 'Maximum upload size',
'may' => 'May',

9
languages/es_ES/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (907), francisco (2)
// Translators: Admin (909), francisco (2)
$text = array(
'accept' => 'Aceptar',
@ -331,13 +331,12 @@ URL: [url]',
'folder_comment_changed_email' => 'Comentario modificado',
'folder_comment_changed_email_body' => 'Comentario modificado
Carpeta: [name]
Versión: [version]
Comentario antiguo: [old_comment]
Comentario: [new_comment]
Carpeta principal: [folder_path]
Usuario: [username]
URL: [url]',
'folder_comment_changed_email_subject' => '[sitename]: [folder] - Comentario modificado',
'folder_comment_changed_email_subject' => '[sitename]: [name] - Comentario modificado',
'folder_contents' => 'Contenido de Carpetas',
'folder_deleted_email' => 'Carpeta eliminada',
'folder_deleted_email_body' => 'Carpeta eliminada
@ -468,6 +467,10 @@ URL: [url]',
'logout' => 'Desconectar',
'log_management' => 'Gestión de ficheros de registro',
'manager' => 'Manager',
'mandatory_approvergroup_no_access' => '',
'mandatory_approver_no_access' => '',
'mandatory_reviewergroup_no_access' => '',
'mandatory_reviewer_no_access' => '',
'march' => 'Marzo',
'max_upload_size' => 'Tamaño máximo de subida para cada fichero',
'may' => 'Mayo',

9
languages/fr_FR/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (879), jeromerobert (50), lonnnew (9)
// Translators: Admin (881), jeromerobert (50), lonnnew (9)
$text = array(
'accept' => 'Accepter',
@ -331,13 +331,12 @@ URL: [url]',
'folder_comment_changed_email' => 'Commentaire changé',
'folder_comment_changed_email_body' => 'Commentaire changé
Dossier: [name]
Version: [version]
Ancien commentaire: [old_comment]
Commentaire: [new_comment]
Dossier parent: [folder_path]
Utilisateur: [username]
URL: [url]',
'folder_comment_changed_email_subject' => '[sitename]: [folder] - Commentaire changé',
'folder_comment_changed_email_subject' => '[sitename]: [name] - Commentaire changé',
'folder_contents' => 'Dossiers',
'folder_deleted_email' => 'Dossier supprimé',
'folder_deleted_email_body' => 'Dossier supprimé
@ -468,6 +467,10 @@ URL: [url]',
'logout' => 'Déconnexion',
'log_management' => 'Gestion des fichiers Log',
'manager' => 'Responsable',
'mandatory_approvergroup_no_access' => '',
'mandatory_approver_no_access' => '',
'mandatory_reviewergroup_no_access' => '',
'mandatory_reviewer_no_access' => '',
'march' => 'Mars',
'max_upload_size' => 'Taille maximum de fichier déposé',
'may' => 'Mai',

21
languages/hu_HU/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (535), ribaz (956)
// Translators: Admin (537), ribaz (956)
$text = array(
'accept' => 'Elfogad',
@ -329,15 +329,14 @@ URL: [url]',
'folders' => 'Mappák',
'folders_and_documents_statistic' => 'Tartalmak áttekintése',
'folder_comment_changed_email' => 'Megjegyzés módosult',
'folder_comment_changed_email_body' => 'Megjegyzés módosult
Mappa: [name]
Verzió: [version]
Régi megjegyzés: [old_comment]
Megjegyzés: [new_comment]
Szülő mappa: [folder_path]
Felhasználó: [username]
'folder_comment_changed_email_body' => 'Megjegyzés módosult
Mappa: [name]
Régi megjegyzés: [old_comment]
Megjegyzés: [new_comment]
Szülő mappa: [folder_path]
Felhasználó: [username]
URL: [url]',
'folder_comment_changed_email_subject' => '[sitename]: [folder] - Megjegyzés módosult',
'folder_comment_changed_email_subject' => '[sitename]: [name] - Megjegyzés módosult',
'folder_contents' => 'Mappa tartalom',
'folder_deleted_email' => 'Mappa törölve',
'folder_deleted_email_body' => 'Mappa törölve
@ -468,6 +467,10 @@ URL: [url]',
'logout' => 'Kijelentkezés',
'log_management' => 'Napló állományok kezelése',
'manager' => 'Kezelő',
'mandatory_approvergroup_no_access' => '',
'mandatory_approver_no_access' => '',
'mandatory_reviewergroup_no_access' => '',
'mandatory_reviewer_no_access' => '',
'march' => 'Március',
'max_upload_size' => 'Legnagyobb feltölthető méret',
'may' => 'Május',

4
languages/it_IT/lang.inc
View File

@ -400,6 +400,10 @@ $text = array(
'logout' => 'Logout',
'log_management' => 'Amministrazione log file',
'manager' => 'Manager',
'mandatory_approvergroup_no_access' => '',
'mandatory_approver_no_access' => '',
'mandatory_reviewergroup_no_access' => '',
'mandatory_reviewer_no_access' => '',
'march' => 'Marzo',
'max_upload_size' => 'Dimensione massima caricabile per ogni file',
'may' => 'Maggio',

21
languages/nl_NL/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (669), reinoutdijkstra@hotmail.com (270)
// Translators: Admin (671), reinoutdijkstra@hotmail.com (270)
$text = array(
'accept' => 'Accept',
@ -329,15 +329,14 @@ URL: [url]',
'folders' => 'Mappen',
'folders_and_documents_statistic' => 'Inhoudsopgave',
'folder_comment_changed_email' => 'Commentaar gewijzigd',
'folder_comment_changed_email_body' => 'Commentaar gewijzigd
Map: [name]
Versie: [version]
Oude commentaar: [old_comment]
Commentaar: [new_comment]
Bovenliggende map: [folder_path]
Gebruiker: [username]
'folder_comment_changed_email_body' => 'Commentaar gewijzigd
Map: [name]
Oude commentaar: [old_comment]
Commentaar: [new_comment]
Bovenliggende map: [folder_path]
Gebruiker: [username]
URL: [url]',
'folder_comment_changed_email_subject' => '[sitename]: [folder] - Commentaar gewijzigd',
'folder_comment_changed_email_subject' => '[sitename]: [name] - Commentaar gewijzigd',
'folder_contents' => 'Map Inhoud',
'folder_deleted_email' => 'Map verwijderd',
'folder_deleted_email_body' => 'Map verwijderd
@ -468,6 +467,10 @@ URL: [url]',
'logout' => 'Log uit',
'log_management' => 'Logbestanden beheer',
'manager' => 'Beheerder',
'mandatory_approvergroup_no_access' => '',
'mandatory_approver_no_access' => '',
'mandatory_reviewergroup_no_access' => '',
'mandatory_reviewer_no_access' => '',
'march' => 'maart',
'max_upload_size' => 'Maximale upload omvang voor ieder bestand',
'may' => 'mei',

21
languages/pl_PL/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (667), netixw (84), romi (93), uGn (112)
// Translators: Admin (669), netixw (84), romi (93), uGn (112)
$text = array(
'accept' => 'Akceptuj',
@ -329,15 +329,14 @@ URL: [url]',
'folders' => 'Foldery',
'folders_and_documents_statistic' => 'Podsumowanie zawartości',
'folder_comment_changed_email' => 'Zmiana komentarza',
'folder_comment_changed_email_body' => 'Komentarz uległ zmianie
Folder: [name]
Wersja: [version]
Poprzedni komentarz: [old_comment]
Komentarz: [new_comment]
Parent folder: [folder_path]
Użytkownik: [username]
'folder_comment_changed_email_body' => 'Komentarz uległ zmianie
Folder: [name]
Poprzedni komentarz: [old_comment]
Komentarz: [new_comment]
Parent folder: [folder_path]
Użytkownik: [username]
URL: [url]',
'folder_comment_changed_email_subject' => '[sitename]: [folder] - Zmiana komentarza',
'folder_comment_changed_email_subject' => '[sitename]: [name] - Zmiana komentarza',
'folder_contents' => 'Zawartość folderu',
'folder_deleted_email' => 'Folder został usunięty',
'folder_deleted_email_body' => 'Folder usunięto
@ -468,6 +467,10 @@ URL: [url]',
'logout' => 'Wyloguj',
'log_management' => 'Zarządzanie plikami dziennika',
'manager' => 'Zarządca',
'mandatory_approvergroup_no_access' => '',
'mandatory_approver_no_access' => '',
'mandatory_reviewergroup_no_access' => '',
'mandatory_reviewer_no_access' => '',
'march' => 'Marzec',
'max_upload_size' => 'Maksymalny rozmiar pliku',
'may' => 'Maj',

21
languages/pt_BR/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (537), flaviove (585)
// Translators: Admin (539), flaviove (585)
$text = array(
'accept' => 'Aceitar',
@ -328,15 +328,14 @@ URL: [url]',
'folders' => 'Folders',
'folders_and_documents_statistic' => 'Overview de pastas e documentos',
'folder_comment_changed_email' => 'Comentário mudou',
'folder_comment_changed_email_body' => 'Comentário mudou
Pasta: [name]
Version: [version]
Antigo comentário: [old_comment]
Comentário: [New_Comment]
Pasta mãe: [folder_path]
Usuário: [username]
'folder_comment_changed_email_body' => 'Comentário mudou
Pasta: [name]
Antigo comentário: [old_comment]
Comentário: [New_Comment]
Pasta mãe: [folder_path]
Usuário: [username]
URL: [url]',
'folder_comment_changed_email_subject' => '[sitename]: [folder] - Comentário mudou',
'folder_comment_changed_email_subject' => '[sitename]: [name] - Comentário mudou',
'folder_contents' => 'Folders',
'folder_deleted_email' => 'Pasta eliminada',
'folder_deleted_email_body' => 'Pasta eliminada
@ -467,6 +466,10 @@ URL: [url]',
'logout' => 'Sair',
'log_management' => 'Log files management',
'manager' => 'Manager',
'mandatory_approvergroup_no_access' => '',
'mandatory_approver_no_access' => '',
'mandatory_reviewergroup_no_access' => '',
'mandatory_reviewer_no_access' => '',
'march' => 'March',
'max_upload_size' => 'Maximum upload size for each file',
'may' => 'May',

4
languages/ru_RU/lang.inc
View File

@ -400,6 +400,10 @@ $text = array(
'logout' => 'Выход',
'log_management' => 'Управление логами',
'manager' => 'Менеджер',
'mandatory_approvergroup_no_access' => '',
'mandatory_approver_no_access' => '',
'mandatory_reviewergroup_no_access' => '',
'mandatory_reviewer_no_access' => '',
'march' => 'Март',
'max_upload_size' => 'Максимальный размер файла для загрузки',
'may' => 'Май',

4
languages/sk_SK/lang.inc
View File

@ -400,6 +400,10 @@ $text = array(
'logout' => 'Odhlásenie',
'log_management' => 'Správa protokolov',
'manager' => 'Manager',
'mandatory_approvergroup_no_access' => '',
'mandatory_approver_no_access' => '',
'mandatory_reviewergroup_no_access' => '',
'mandatory_reviewer_no_access' => '',
'march' => 'Marec',
'max_upload_size' => 'Maximálna veľkosť každého súboru',
'may' => 'Máj',

9
languages/sv_SE/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (1072), tmichelfelder (56)
// Translators: Admin (1074), tmichelfelder (56)
$text = array(
'accept' => 'Godkänn',
@ -331,13 +331,12 @@ URL: [url]',
'folder_comment_changed_email' => 'Kommentar har ändrats',
'folder_comment_changed_email_body' => 'Kommentar har ändrats
Katalog: [name]
Version: [version]
Gamla kommentaret: [old_comment]
Kommentar: [new_comment]
Överordnade katalog: [folder_path]
Användare: [username]
URL: [url]',
'folder_comment_changed_email_subject' => '[sitename]: [folder] - Kommentar har ändrats',
'folder_comment_changed_email_subject' => '[sitename]: [name] - Kommentar har ändrats',
'folder_contents' => 'Kataloginnehåll',
'folder_deleted_email' => 'Katalog har tagits bort',
'folder_deleted_email_body' => 'Katalog har tagits bort
@ -468,6 +467,10 @@ URL: [url]',
'logout' => 'Logga ut',
'log_management' => 'Loggfilshantering',
'manager' => 'Manager',
'mandatory_approvergroup_no_access' => '',
'mandatory_approver_no_access' => '',
'mandatory_reviewergroup_no_access' => '',
'mandatory_reviewer_no_access' => '',
'march' => 'mars',
'max_upload_size' => 'Maximal storlek för uppladdning',
'may' => 'maj',

4
languages/zh_CN/lang.inc
View File

@ -400,6 +400,10 @@ $text = array(
'logout' => '登出',
'log_management' => '日志管理',
'manager' => '管理员',
'mandatory_approvergroup_no_access' => '',
'mandatory_approver_no_access' => '',
'mandatory_reviewergroup_no_access' => '',
'mandatory_reviewer_no_access' => '',
'march' => '三 月',
'max_upload_size' => '最大上传文件大小',
'may' => '五 月',

4
languages/zh_TW/lang.inc
View File

@ -400,6 +400,10 @@ $text = array(
'logout' => '',
'log_management' => '',
'manager' => '',
'mandatory_approvergroup_no_access' => '',
'mandatory_approver_no_access' => '',
'mandatory_reviewergroup_no_access' => '',
'mandatory_reviewer_no_access' => '',
'march' => '',
'max_upload_size' => '',
'may' => '',

1
op/op.AddDocument.php
View File

@ -92,6 +92,7 @@ $reqversion = (int)$_POST["reqversion"];
if ($reqversion<1) $reqversion=1;
$sequence = $_POST["sequence"];
$sequence = str_replace(',', '.', $_POST["sequence"]);
if (!is_numeric($sequence)) {
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("invalid_sequence"));
}

1
op/op.AddSubFolder.php
View File

@ -49,6 +49,7 @@ if ($folder->getAccessMode($user) < M_READWRITE) {
}
$sequence = $_POST["sequence"];
$sequence = str_replace(',', '.', $_POST["sequence"]);
if (!is_numeric($sequence)) {
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("invalid_sequence"));

1
op/op.EditDocument.php
View File

@ -55,6 +55,7 @@ if(isset($_POST['categoryidform1'])) {
$categories = array();
}
$sequence = $_POST["sequence"];
$sequence = str_replace(',', '.', $_POST["sequence"]);
if (!is_numeric($sequence)) {
$sequence="keep";
}

2
op/op.EditFolder.php
View File

@ -46,7 +46,7 @@ if ($folder->getAccessMode($user) < M_READWRITE) {
$name = $_POST["name"];
$comment = $_POST["comment"];
if(isset($_POST["sequence"])) {
$sequence = $_POST["sequence"];
$sequence = str_replace(',', '.', $_POST["sequence"]);
if (!is_numeric($sequence)) {
$sequence = "keep";
}

10
op/op.Login.php
View File

@ -32,13 +32,9 @@ include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc";
function _printMessage($heading, $message) {
UI::exitError($heading, $message);
exit;
UI::htmlStartPage($heading, "login");
UI::globalBanner();
UI::pageNavigation($heading);
UI::contentContainer($message);
UI::htmlEndPage();
global $theme;
$view = UI::factory($theme, 'ErrorDlg');
$view->exitError($heading, $message, true);
return;
}

64
views/bootstrap/class.AddDocument.php
View File

@ -272,6 +272,22 @@ function addFiles()
}
?>
</select>
<?php
/* Check for mandatory reviewer without access */
foreach($res as $r) {
if($r['reviewerUserID']) {
$hasAccess = false;
foreach ($docAccess["users"] as $usr) {
if ($r['reviewerUserID']==$usr->getID())
$hasAccess = true;
}
if(!$hasAccess) {
$noAccessUser = $dms->getUser($r['reviewerUserID']);
echo "<div class=\"alert alert-warning\">".getMLText("mandatory_reviewer_no_access", array('user'=>htmlspecialchars($noAccessUser->getFullName()." (".$noAccessUser->getLogin().")")))."</div>";
}
}
}
?>
</td>
</tr>
<tr>
@ -291,6 +307,22 @@ function addFiles()
}
?>
</select>
<?php
/* Check for mandatory reviewer group without access */
foreach($res as $r) {
if ($r['reviewerGroupID']) {
$hasAccess = false;
foreach ($docAccess["groups"] as $grp) {
if ($r['reviewerGroupID']==$grp->getID())
$hasAccess = true;
}
if(!$hasAccess) {
$noAccessGroup = $dms->getGroup($r['reviewerGroupID']);
echo "<div class=\"alert alert-warning\">".getMLText("mandatory_reviewergroup_no_access", array('group'=>htmlspecialchars($noAccessGroup->getName())))."</div>";
}
}
}
?>
</td>
</tr>
@ -319,6 +351,22 @@ function addFiles()
}
?>
</select>
<?php
/* Check for mandatory approvers without access */
foreach($res as $r) {
if($r['approverUserID']) {
$hasAccess = false;
foreach ($docAccess["users"] as $usr) {
if ($r['approverUserID']==$usr->getID())
$hasAccess = true;
}
if(!$hasAccess) {
$noAccessUser = $dms->getUser($r['approverUserID']);
echo "<div class=\"alert alert-warning\">".getMLText("mandatory_approver_no_access", array('user'=>htmlspecialchars($noAccessUser->getFullName()." (".$noAccessUser->getLogin().")")))."</div>";
}
}
}
?>
</td>
</tr>
<tr>
@ -339,6 +387,22 @@ function addFiles()
}
?>
</select>
<?php
/* Check for mandatory approver groups without access */
foreach($res as $r) {
if ($r['approverGroupID']) {
$hasAccess = false;
foreach ($docAccess["groups"] as $grp) {
if ($r['approverGroupID']==$grp->getID())
$hasAccess = true;
}
if(!$hasAccess) {
$noAccessGroup = $dms->getGroup($r['approverGroupID']);
echo "<div class=\"alert alert-warning\">".getMLText("mandatory_approvergroup_no_access", array('group'=>htmlspecialchars($noAccessGroup->getName())))."</div>";
}
}
}
?>
</td>
</tr>
<tr>

7
views/bootstrap/class.Bootstrap.php
View File

@ -966,7 +966,7 @@ function clearFilename<?php print $formName ?>() {
echo "</div>\n";
} /* }}} */
function exitError($pagetitle,$error) { /* {{{ */
function exitError($pagetitle, $error, $noexit=false) { /* {{{ */
$this->htmlStartPage($pagetitle);
$this->globalNavigation();
@ -981,7 +981,10 @@ function clearFilename<?php print $formName ?>() {
$this->htmlEndPage();
add_log_line(" UI::exitError error=".$error." pagetitle=".$pagetitle, PEAR_LOG_ERR);
if($noexit)
return;
exit;
} /* }}} */

2
views/bootstrap/class.Settings.php
View File

@ -194,7 +194,7 @@ if(!is_writeable($settings->_configFilePath)) {
<td>
<SELECT name="sortFoldersDefault">
<OPTION VALUE="u" <?php if ($settings->_sortFoldersDefault=='') echo "SELECTED" ?> ><?php printMLText("settings_sortFoldersDefault_val_unsorted");?></OPTION>
<OPTION VALUE="n" <?php if ($settings->_sortFoldersDefault=='s') echo "SELECTED" ?> ><?php printMLText("settings_sortFoldersDefault_val_sequence");?></OPTION>
<OPTION VALUE="s" <?php if ($settings->_sortFoldersDefault=='s') echo "SELECTED" ?> ><?php printMLText("settings_sortFoldersDefault_val_sequence");?></OPTION>
<OPTION VALUE="n" <?php if ($settings->_sortFoldersDefault=='n') echo "SELECTED" ?> ><?php printMLText("settings_sortFoldersDefault_val_name");?></OPTION>
</SELECT>
</tr>

65
views/bootstrap/class.UpdateDocument.php
View File

@ -198,6 +198,22 @@ function checkForm()
}
?>
</select>
<?php
/* Check for mandatory reviewer without access */
foreach($res as $r) {
if($r['reviewerUserID']) {
$hasAccess = false;
foreach ($docAccess["users"] as $usr) {
if ($r['reviewerUserID']==$usr->getID())
$hasAccess = true;
}
if(!$hasAccess) {
$noAccessUser = $dms->getUser($r['reviewerUserID']);
echo "<div class=\"alert alert-warning\">".getMLText("mandatory_reviewer_no_access", array('user'=>htmlspecialchars($noAccessUser->getFullName()." (".$noAccessUser->getLogin().")")))."</div>";
}
}
}
?>
</td>
</tr>
<tr>
@ -215,6 +231,23 @@ function checkForm()
if ($mandatory) print "<option value=\"".$grp->getID()."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
else print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
}
?>
</select>
<?php
/* Check for mandatory reviewer group without access */
foreach($res as $r) {
if ($r['reviewerGroupID']) {
$hasAccess = false;
foreach ($docAccess["groups"] as $grp) {
if ($r['reviewerGroupID']==$grp->getID())
$hasAccess = true;
}
if(!$hasAccess) {
$noAccessGroup = $dms->getGroup($r['reviewerGroupID']);
echo "<div class=\"alert alert-warning\">".getMLText("mandatory_reviewergroup_no_access", array('group'=>htmlspecialchars($noAccessGroup->getName())))."</div>";
}
}
}
?>
</td>
</tr>
@ -242,6 +275,22 @@ function checkForm()
}
?>
</select>
<?php
/* Check for mandatory approvers without access */
foreach($res as $r) {
if($r['approverUserID']) {
$hasAccess = false;
foreach ($docAccess["users"] as $usr) {
if ($r['approverUserID']==$usr->getID())
$hasAccess = true;
}
if(!$hasAccess) {
$noAccessUser = $dms->getUser($r['approverUserID']);
echo "<div class=\"alert alert-warning\">".getMLText("mandatory_approver_no_access", array('user'=>htmlspecialchars($noAccessUser->getFullName()." (".$noAccessUser->getLogin().")")))."</div>";
}
}
}
?>
</td>
</tr>
<td>
@ -261,6 +310,22 @@ function checkForm()
}
?>
</select>
<?php
/* Check for mandatory approver groups without access */
foreach($res as $r) {
if ($r['approverGroupID']) {
$hasAccess = false;
foreach ($docAccess["groups"] as $grp) {
if ($r['approverGroupID']==$grp->getID())
$hasAccess = true;
}
if(!$hasAccess) {
$noAccessGroup = $dms->getGroup($r['approverGroupID']);
echo "<div class=\"alert alert-warning\">".getMLText("mandatory_approvergroup_no_access", array('group'=>htmlspecialchars($noAccessGroup->getName())))."</div>";
}
}
}
?>
</td>
</tr>
<tr>