Merge branch 'master' of git.openslx.org:openslx-ng/slx-admin

# Conflicts:
#	modules-available/dozmod/page.inc.php

8 files changed, 35 insertions, 0 deletions

diff --git a/modules-available/dozmod/lang/de/messages.json b/modules-available/dozmod/lang/de/messages.json
index 85b8ca70..29d40619 100644
--- a/modules-available/dozmod/lang/de/messages.json
+++ b/modules-available/dozmod/lang/de/messages.json
@@ -3,6 +3,13 @@
     "delete-images": "L\u00f6schung: {{0}}",
     "dozmod-error": "Fehler bei der Kommunikation mit dem bwLehrpool-Suite server: {{0}}",
     "images-pending-delete-exist": "Zur L\u00f6schung markierte VM-Versionen: {{0}}",
+    "ldap-filter-created": "LDAP Filter wurde erfolgreich erstellt",
+    "ldap-filter-deleted": "LDAP Filter wurde erfolgreich gel\u00f6scht",
+    "ldap-invalid-filter-id": "Ung\u00fcltige LDAP Filter ID",
+    "ldap-filter-id-missing": "Fehlende LDAP Filter ID",
+    "ldap-filter-insert-failed": "LDAP filter konnte der Datenbank nicht hinzugef\u00fcgt werden",
+    "ldap-filter-save-missing-information": "Es fehlen LDAP Filter Informationen",
+    "ldap-filter-saved": "LDAP Filter wurde erfolgreich gespeichert",
     "mail-config-saved": "Mail-Konfiguration gespeichert",
     "networkshare-deleted": "Netzlaufwerk gel\u00f6scht",
     "networkshare-saved": "Netzlaufwerk gespeichert",
diff --git a/modules-available/dozmod/lang/de/module.json b/modules-available/dozmod/lang/de/module.json
index 7bd3e0c0..b2746b81 100644
--- a/modules-available/dozmod/lang/de/module.json
+++ b/modules-available/dozmod/lang/de/module.json
@@ -3,6 +3,7 @@
     "page_title": "Verwalten der bwLehrpool-Suite",
     "submenu_actionlog": "Aktions-Log",
     "submenu_expiredimages": "Abgelaufene VM-Versionen",
+    "submenu_ldapfilters": "LDAP Filter",
     "submenu_mailconfig": "Email-Konfiguration",
     "submenu_networkshares": "Netzlaufwerke",
     "submenu_runtimeconfig": "Limits und Standardwerte",
diff --git a/modules-available/dozmod/lang/de/permissions.json b/modules-available/dozmod/lang/de/permissions.json
index 53cbf1d8..845be3b9 100644
--- a/modules-available/dozmod/lang/de/permissions.json
+++ b/modules-available/dozmod/lang/de/permissions.json
@@ -1,6 +1,8 @@
 {
     "actionlog.view": "Aktions-Log einsehen.",
     "expiredimages.delete": "Zur L\u00f6schung vorgemerkete Abbilder l\u00f6schen.",
+    "ldapfilters.save": "LDAP Filter speichern.",
+    "ldapfilters.view": "LDAP Filter einsehen.",
     "mailconfig.save": "\u00c4nderungen an der SMTP-Konfiguration zum Versenden von Mails speichern.",
     "networkshares.save": "Netzlaufwerke einsehen.",
     "networkshares.view": "\u00c4nderungen an den Netzlaufwerken speichern.",
diff --git a/modules-available/dozmod/lang/de/template-tags.json b/modules-available/dozmod/lang/de/template-tags.json
index fa4b49f5..a7ee9833 100644
--- a/modules-available/dozmod/lang/de/template-tags.json
+++ b/modules-available/dozmod/lang/de/template-tags.json
@@ -39,6 +39,14 @@
     "lang_lastEditor": "Zuletzt bearbeitet von",
     "lang_lastLogin": "Letzte Anmeldung",
     "lang_latestVersion": "Neuste Version",
+    "lang_ldapFilterAdd": "LDAP Filter Hinzuf\u00fcgen",
+    "lang_ldapFilterAttribute": "Attribut",
+    "lang_ldapFilterDeleteConfirmation": "Willst du diesen LDAP Filter wirklich L\u00f6schen.",
+    "lang_ldapFilterDescription": "Dies sind die Filter, die ein Benutzer in der bwLehrpool-Suite Veranstaltungen hinzuf\u00fcgen kann.",
+    "lang_ldapFilterEdit": "LDAP Filter bearbeiten",
+    "lang_ldapFilterName": "Filtername",
+    "lang_ldapfilters": "LDAP Filter",
+    "lang_ldapFilterValue": "Wert",
     "lang_lecture": "Veranstaltung",
     "lang_lecturePermissionAdmin": "Administration",
     "lang_lecturePermissionEdit": "Bearbeiten",
diff --git a/modules-available/dozmod/lang/en/messages.json b/modules-available/dozmod/lang/en/messages.json
index 8d309d1d..a76fc67c 100644
--- a/modules-available/dozmod/lang/en/messages.json
+++ b/modules-available/dozmod/lang/en/messages.json
@@ -3,6 +3,12 @@
     "delete-images": "Delete: {{0}}",
     "dozmod-error": "Error communicating with the bwLehrpool-Suite server: {{0}}",
     "images-pending-delete-exist": "VMs marked for deletion: {{0}}",
+    "ldap-filter-created": "LDAP filter was successfully created",
+    "ldap-filter-deleted": "LDAP filter successfully deleted",
+    "ldap-invalid-filter-id": "Invalid LDAP filter id",
+    "ldap-filter-id-missing": "LDAP filter id was missing",
+    "ldap-filter-insert-failed": "LDAP filter could not be inserted into the database",
+    "ldap-filter-save-missing-information": "LDAP filter informations were missing",
     "mail-config-saved": "Mail config saved",
     "networkshare-deleted": "Network share deleted",
     "networkshare-saved": "Network share saved",
diff --git a/modules-available/dozmod/lang/en/module.json b/modules-available/dozmod/lang/en/module.json
index 91ebf304..4e3969ff 100644
--- a/modules-available/dozmod/lang/en/module.json
+++ b/modules-available/dozmod/lang/en/module.json
@@ -3,6 +3,7 @@
     "page_title": "Manage the bwLehrpool-Suite",
     "submenu_actionlog": "action log",
     "submenu_expiredimages": "Expired VM versions",
+    "submenu_ldapfilters": "LDAP filters",
     "submenu_mailconfig": "email configuration",
     "submenu_networkshares": "Network Shares",
     "submenu_runtimeconfig": "limits and defaults",
diff --git a/modules-available/dozmod/lang/en/permissions.json b/modules-available/dozmod/lang/en/permissions.json
index c1e44504..d45e5207 100644
--- a/modules-available/dozmod/lang/en/permissions.json
+++ b/modules-available/dozmod/lang/en/permissions.json
@@ -1,6 +1,8 @@
 {
     "actionlog.view": "View action log.",
     "expiredimages.delete": "Delete images marked for deletion.",
+    "ldapfilters.save": "Save LDAP filter.",
+    "ldapfilters.view": "View LDAP filters. ",
     "mailconfig.save": "Save SMTP configuration for sending mails.",
     "networkshares.save": "View network drives.",
     "networkshares.view": "Save network drives.",
diff --git a/modules-available/dozmod/lang/en/template-tags.json b/modules-available/dozmod/lang/en/template-tags.json
index 9cbc7378..2fd3e91b 100644
--- a/modules-available/dozmod/lang/en/template-tags.json
+++ b/modules-available/dozmod/lang/en/template-tags.json
@@ -39,6 +39,14 @@
     "lang_lastEditor": "Edited by",
     "lang_lastLogin": "Last login",
     "lang_latestVersion": "latest version",
+    "lang_ldapFilterAdd": "Add LDAP filter",
+    "lang_ldapFilterAttribute": "Attribute",
+    "lang_ldapFilterDeleteConfirmation": "Do you really want to delete this LDAP filter.",
+    "lang_ldapFilterDescription": "These are the LDAP filters that can be applied to lectures in the bwLehrpool-Suite.",
+    "lang_ldapFilterEdit": "Edit LDAP filter",
+    "lang_ldapFilterName": "Filter name",
+    "lang_ldapfilters": "LDAP filters",
+    "lang_ldapFilterValue": "Value",
     "lang_lecture": "Lecture",
     "lang_lecturePermissionAdmin": "Administrate",
     "lang_lecturePermissionEdit": "Edit",