Merge branch '1.2.1-fixes' into 'master'

merge 1.2.1 fixes into master

See merge request fusiondirectory/fd-plugins!315

Changelog.md

+## %"FusionDirectory 1.2.2" - 2018-08-16
+
+### Added
+
+#### fusiondirectory-plugins
+- fd-plugins#5821 Add LUKS section to FAI disk entry
+
+### Changed
+
+#### fusiondirectory-plugins
+- fd-plugins#5836 random_int should be used instead of mt_rand
+- fd-plugins#5840 Duplicated value in affiliation file
+
+### Fixed
+
+#### fusiondirectory
+- fd#5730 PHP error when I deactivate "opsi client" tab on a workstation
+- fd#5789 LDIF import can trigger PHP errors on empty file
+- fd#5816 Blacklist is not reset correctly for UserAttribute
+- fd#5824 LDIF generation does not respect STARTTLS setting
+- fd#5846 Samba groups are not showing in dashboard
+- fd#5850 Config insertion LDAP errors from setup are not shown
+- fd#5851 Creating a user from a template with a non-existing group crashes
+- fd#5864 Name field for countries should be limited to two characters
+- fd#5868 HTML is not escaped in departments descriptions
+
+#### fusiondirectory-plugins
+- fd-plugins#5719 Locale issues in the fai plugin
+- fd-plugins#5741 Reference tab on the OPSI profile is not showing objects reference
+- fd-plugins#5810 WebService should not return session cookie
+- fd-plugins#5827 Fatal error in opsiProfile when OPSI server is not found in the LDAP
+- fd-plugins#5828 supannCodeEntite should allow uppercase as well
+- fd-plugins#5832 Copy/pasting of Samba groups fails
+- fd-plugins#5833 Error in supann tab when we use a template
+
+### Security
+
+#### fusiondirectory
+- fd#5840 Security Vulnerability: Cross Site Request Forgery
+- fd#5842 Security: Missing Security Headers
+- fd#5843 Security: Insecure Generation of Random Tokens
+
 ## %"FusionDirectory 1.2.1" - 2018-05-09
 
 ### Added

alias/locale/af_ZA/fusiondirectory.po

+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/alias/class_mailAliasDistribution.inc:31
+#: admin/alias/class_mailAliasDistribution.inc:32
+#: admin/alias/class_mailAliasDistribution.inc:35
+msgid "Temporary mail distribution"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:51
+msgid "Mail distribution"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:54
+#: admin/alias/class_mailAliasRedirection.inc:55
+msgid "Name"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:54
+msgid "Name to identify this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:57
+msgid "Description"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Description of this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:60
+msgid "Email address"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:65
+msgid "Email aliases"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:65
+msgid "Aliases for this email address"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:70
+msgid "Mail server"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:70
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:75
+#: admin/alias/class_mailAliasRedirection.inc:73
+msgid "Expiration date"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:75
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:31
+#: admin/alias/class_mailAliasRedirection.inc:32
+#: admin/alias/class_mailAliasRedirection.inc:35
+msgid "Temporary mail redirection"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:52
+msgid "Mail redirection"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:55
+msgid "Name to identify this redirection"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:57
+msgid "Description of this redirection"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:62
+msgid "Redirect from"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:62
+msgid "Mail address from which you want to redirect"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:68
+msgid "Redirect to"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:68
+msgid "Destination of this redirection"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:73
+msgid ""
+"Date after which the redirection should be deleted. Leave empty for no "
+"deletion."
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:33
+msgid "Aliases"
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:34
+msgid "Alias management"
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:38
+msgid "Mail aliases"
+msgstr ""
+
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
+msgstr ""
+
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
+msgstr ""
+
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
+msgstr ""
+
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
+msgstr ""
+
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
+msgstr ""

alias/locale/ar/fusiondirectory.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"

alias/locale/ca/fusiondirectory.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"

alias/locale/cs_CZ/fusiondirectory.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/alias/class_mailAliasDistribution.inc:31
 #: admin/alias/class_mailAliasDistribution.inc:32

alias/locale/de/fusiondirectory.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"

alias/locale/el_GR/fusiondirectory.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"

alias/locale/es/fusiondirectory.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""