.github/FUNDING.yml

+# These are supported funding model platforms
+
+ko_fi: fusiondirectory
+liberapay: fusiondirectory
+open_collective: fusiondirectory
+community_bridge: fusiondirectory
+github: fusiondirectory

.github/ISSUE_TEMPLATE/bug_report.md

+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - PHP: [ php 5.6 ]
+ - PHP provenance: [original Debian] 
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Plugin with the defect
+
+ - Plugin: [eg: mail, supann..]
+ - Template: [are template used]
+
+**Additional context**
+Add any other context about the problem here.
+

.gitlab-ci.yml

-# Specify docker image
-image: debian:stretch
-
-# Define variable to disable SSL verification of GIT
-variables:
-  GIT_SSL_NO_VERIFY: "true"
-
 stages:
   - lint
   - codestyle
-  - manpages
   - transifex
   - tarballs
+  - trigger
 
 ## Stage lint
 
-# PHP lint (stretch)
-create_php_lint_rapport_stretch:
-  image: php:cli-stretch
+# PHP lint
+create_php_lint_rapport:
+  image: registry.fusiondirectory.org/fusiondirectory/fd/phpcodesniffer-cli:buster
   stage: lint
   only:
     - branches
@@ -27,90 +20,94 @@ create_php_lint_rapport_stretch:
 
 # PHP codesniffer
 create_php_code_sniffer_rapport:
-  image: phpcodesniffer-cli:stretch
+  image: registry.fusiondirectory.org/fusiondirectory/fd/phpcodesniffer-cli:buster
   stage: codestyle
   only:
     - branches
   script:
+    - test -d ../dev-tools/ && rm -Rf ../dev-tools/
     - git clone --depth 1 https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git ../dev-tools
     - find . -type f -name '*.php' -o -name '*.inc' > ./filelist
-    - phpcs --ignore=class_sieve.inc --standard=../dev-tools/php-codesniffer-rules/FDStandard/ruleset.xml --file-list=./filelist
+    - /root/.composer/vendor/bin/phpcs --ignore=class_sieve.inc --standard=../dev-tools/php-codesniffer-rules/FDStandard/ruleset.xml --file-list=./filelist
+    - /root/.composer/vendor/bin/phpcs --config-set installed_paths /PHPCompatibility,/PHPCSUtils
+    - /root/.composer/vendor/bin/phpcs --standard=PHPCompatibility --runtime-set testVersion $PHP_COMPATIBILITY --file-list=./filelist
 
-# Sonar publishing
-sonar_publish:
-  image: sonar-cli:3.1.0.1141
+# phpstan
+create_phpstan_rapport:
+  image: registry.fusiondirectory.org/fusiondirectory/fd/phpstan-cli:buster
   stage: codestyle
   only:
-    - 1.4-dev
-  script:
-    - /home/sonar/*/bin/sonar-scanner
-      -D sonar.projectKey=fusiondirectory-plugins-1.4-dev
-      -D sonar.projectName=FusionDirectory-Plugins-1.4-Dev
-      -D sonar.projectVersion=1.4
-      -D sonar.sourceEncoding=UTF-8
-      -D sonar.exclusions='mail/personal/mail/class_sieve.inc'
-      -D sonar.gitlab.project_id="$CI_PROJECT_PATH"
-      -D sonar.gitlab.commit_sha="$CI_COMMIT_SHA"
-      -D sonar.gitlab.ref_name="$CI_COMMIT_REF_NAME"
-
-# Sonar preview
-sonar_preview:
-  image: sonar-cli:3.1.0.1141
-  stage: codestyle
-  except:
-    - 1.4-dev
+    - branches
   script:
-    - /home/sonar/*/bin/sonar-scanner
-      -D sonar.projectKey=fusiondirectory-plugins-1.4-dev
-      -D sonar.projectName=FusionDirectory-Plugins-1.4-Dev
-      -D sonar.projectVersion=1.4
-      -D sonar.sourceEncoding=UTF-8
-      -D sonar.exclusions='mail/personal/mail/class_sieve.inc'
-      -D sonar.gitlab.project_id="$CI_PROJECT_PATH"
-      -D sonar.gitlab.commit_sha="$CI_COMMIT_SHA"
-      -D sonar.gitlab.ref_name="$CI_COMMIT_REF_NAME"
-      -D sonar.analysis.mode=preview
+    - test -d ../dev-tools/ && rm -Rf ../dev-tools/
+    - git clone --depth 1 https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git ../dev-tools
+    - test -d ../fusiondirectory/ && rm -Rf ../fusiondirectory/
+    - git clone --depth 1 https://gitlab.fusiondirectory.org/fusiondirectory/fd.git ../fusiondirectory
+    - composer global require phpstan/phpstan=0.12.94
+    - cp ../dev-tools/phpstan/fusiondirectory/1.5/*.neon .
+    - /root/.composer/vendor/bin/phpstan analyse -c phpstan-plugins.neon
 
 # fusiondirectory-update-locale
 fusiondirectory-update-locale:
-  image: transifex-cli:stretch
+  image: registry.fusiondirectory.org/fusiondirectory/fd/transifex-cli:buster
   stage: transifex
   only:
-    - branches
+    - dev
   script:
+    - test -d ../dev-tools/ && rm -Rf ../dev-tools/
     - git clone --depth 1 https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git ../dev-tools
     - ../dev-tools/locale-scripts/fusiondirectory-update-locale-plugins
 
 # Update transifex
 update-transifex:
-  image: transifex-cli:stretch
+  image: registry.fusiondirectory.org/fusiondirectory/fd/transifex-cli:buster
   stage: transifex
   only:
-    - /^1.*$/
+    - dev
   script:
+    - test -d ../dev-tools/ && rm -Rf ../dev-tools/
     - git clone --depth 1 https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git ../dev-tools
-    - echo $'[https://www.transifex.com]\nhostname = https://www.transifex.com\nusername = '"$TRANSIFEX_USER"$'\npassword = '"$TRANSIFEX_PASSWORD"$'\ntoken = '"$TRANSIFEX_API_TOKEN"$'\n' > ~/.transifexrc
+    - echo $'[https://www.transifex.com]\nrest_hostname = '"$TRANSIFEX_REST_HOSTNAME"$'\nusername = '"$TRANSIFEX_USER"$'\ntoken = '"$TRANSIFEX_TOKEN"$'\n' > ~/.transifexrc
     - tx pull -a -f
     - ../dev-tools/locale-scripts/fusiondirectory-update-locale-plugins
-    - tx push -f -s -t --skip --no-interactive
+    - tx push -s -t --skip
 
 build-tarballs:
   stage: tarballs
   only:
-    - tags
+    - dev
   script:
-    - tar -cvzf fusiondirectory-plugins.tar.gz *
+    - mkdir ../fusiondirectory-plugins-$VERSION/
+    - mv ./* ../fusiondirectory-plugins-$VERSION/
+    - mv  ../fusiondirectory-plugins-$VERSION/ ./
+    - tar -cvzf fusiondirectory-plugins-$VERSION.tar.gz *
   artifacts:
     paths:
-    - fusiondirectory-plugins.tar.gz
-    expire_in: 1h
+      - fusiondirectory-plugins-$VERSION.tar.gz
+    expire_in: 30d
 
 build-release:
   stage: tarballs
   only:
     - tags
   script:
-    - tar -cvzf fusiondirectory-plugins-$(grep '%' Changelog.md | head -n1 | cut -d ' ' -f3 | tr -d '"').tar.gz *
+    - VERSION=$(grep '%' Changelog.md | head -n1 | cut -d ' ' -f3 | tr -d '"')
+    - mkdir ../fusiondirectory-$VERSION/
+    - mv ./* ../fusiondirectory-$VERSION/
+    - mv  ../fusiondirectory-$VERSION/ ./
+    - tar -cvzf fusiondirectory-$VERSION.tar.gz *
   artifacts:
     paths:
-      - fusiondirectory-plugins-$(grep '%' Changelog.md | head -n1 | cut -d ' ' -f3 | tr -d '"').tar.gz
+      - ./*.tar.gz
+
+trigger-ci-debian-bullseye:
+  stage: trigger
+  only:
+    - dev
+  variables:
+    GROUP: "$GROUP"
+    BRANCH_CORE: "$CI_COMMIT_REF_NAME"
+    BRANCH_PLUGIN: "$CI_COMMIT_REF_NAME"
+  trigger:
+    project: debian/bullseye-fusiondirectory-dev
+

.tx/config

 [main]
 host = https://www.transifex.com
-type = PO
 
-[FusionDirectory-14.alias]
+[o:fusiondirectory:p:FusionDirectory-14:r:alias]
 file_filter = alias/locale/<lang>/fusiondirectory.po
 source_file = alias/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.applications]
+[o:fusiondirectory:p:FusionDirectory-14:r:applications]
 file_filter = applications/locale/<lang>/fusiondirectory.po
 source_file = applications/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.argonaut]
+[o:fusiondirectory:p:FusionDirectory-14:r:argonaut]
 file_filter = argonaut/locale/<lang>/fusiondirectory.po
 source_file = argonaut/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.audit]
+[o:fusiondirectory:p:FusionDirectory-14:r:audit]
 file_filter = audit/locale/<lang>/fusiondirectory.po
 source_file = audit/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.autofs]
+[o:fusiondirectory:p:FusionDirectory-14:r:autofs]
 file_filter = autofs/locale/<lang>/fusiondirectory.po
 source_file = autofs/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.certificates]
+[o:fusiondirectory:p:FusionDirectory-14:r:autofs5]
+file_filter = autofs5/locale/<lang>/fusiondirectory.po
+source_file = autofs5/locale/en/fusiondirectory.po
+source_lang = en
+
+[o:fusiondirectory:p:FusionDirectory-14:r:certificates]
 file_filter = certificates/locale/<lang>/fusiondirectory.po
 source_file = certificates/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.community]
+[o:fusiondirectory:p:FusionDirectory-14:r:community]
 file_filter = community/locale/<lang>/fusiondirectory.po
 source_file = community/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.cyrus]
+[o:fusiondirectory:p:FusionDirectory-14:r:cyrus]
 file_filter = cyrus/locale/<lang>/fusiondirectory.po
 source_file = cyrus/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.debconf]
+[o:fusiondirectory:p:FusionDirectory-14:r:debconf]
 file_filter = debconf/locale/<lang>/fusiondirectory.po
 source_file = debconf/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.developers]
+[o:fusiondirectory:p:FusionDirectory-14:r:developers]
 file_filter = developers/locale/<lang>/fusiondirectory.po
 source_file = developers/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.dhcp]
+[o:fusiondirectory:p:FusionDirectory-14:r:dhcp]
 file_filter = dhcp/locale/<lang>/fusiondirectory.po
 source_file = dhcp/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.dns]
+[o:fusiondirectory:p:FusionDirectory-14:r:dns]
 file_filter = dns/locale/<lang>/fusiondirectory.po
 source_file = dns/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.dovecot]
+[o:fusiondirectory:p:FusionDirectory-14:r:dovecot]
 file_filter = dovecot/locale/<lang>/fusiondirectory.po
 source_file = dovecot/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.dsa]
+[o:fusiondirectory:p:FusionDirectory-14:r:dsa]
 file_filter = dsa/locale/<lang>/fusiondirectory.po
 source_file = dsa/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.ejbca]
+[o:fusiondirectory:p:FusionDirectory-14:r:dyngroups]
+file_filter = dyngroups/locale/<lang>/fusiondirectory.po
+source_file = dyngroups/locale/en/fusiondirectory.po
+source_lang = en
+
+[o:fusiondirectory:p:FusionDirectory-14:r:ejbca]
 file_filter = ejbca/locale/<lang>/fusiondirectory.po
 source_file = ejbca/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.fai]
+[o:fusiondirectory:p:FusionDirectory-14:r:fai]
 file_filter = fai/locale/<lang>/fusiondirectory.po
 source_file = fai/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.freeradius]
+[o:fusiondirectory:p:FusionDirectory-14:r:freeradius]
 file_filter = freeradius/locale/<lang>/fusiondirectory.po
 source_file = freeradius/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.fusioninventory]
+[o:fusiondirectory:p:FusionDirectory-14:r:fusioninventory]
 file_filter = fusioninventory/locale/<lang>/fusiondirectory.po
 source_file = fusioninventory/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.gpg]
+[o:fusiondirectory:p:FusionDirectory-14:r:gpg]
 file_filter = gpg/locale/<lang>/fusiondirectory.po
 source_file = gpg/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.invitations]
+[o:fusiondirectory:p:FusionDirectory-14:r:invitations]
 file_filter = invitations/locale/<lang>/fusiondirectory.po
 source_file = invitations/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.ipmi]
+[o:fusiondirectory:p:FusionDirectory-14:r:ipmi]
 file_filter = ipmi/locale/<lang>/fusiondirectory.po
 source_file = ipmi/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.ldapdump]
+[o:fusiondirectory:p:FusionDirectory-14:r:ldapdump]
 file_filter = ldapdump/locale/<lang>/fusiondirectory.po
 source_file = ldapdump/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.ldapmanager]
+[o:fusiondirectory:p:FusionDirectory-14:r:ldapmanager]
 file_filter = ldapmanager/locale/<lang>/fusiondirectory.po
 source_file = ldapmanager/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.mail]
+[o:fusiondirectory:p:FusionDirectory-14:r:mail]
 file_filter = mail/locale/<lang>/fusiondirectory.po
 source_file = mail/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.mixedgroups]
+[o:fusiondirectory:p:FusionDirectory-14:r:mailinblack]
+file_filter = mailinblack/locale/<lang>/fusiondirectory.po
+source_file = mailinblack/locale/en/fusiondirectory.po
+source_lang = en
+
+[o:fusiondirectory:p:FusionDirectory-14:r:migration-mailrouting]
+file_filter = migration-mailrouting/locale/<lang>/fusiondirectory.po
+source_file = migration-mailrouting/locale/en/fusiondirectory.po
+source_lang = en
+
+[o:fusiondirectory:p:FusionDirectory-14:r:mixedgroups]
 file_filter = mixedgroups/locale/<lang>/fusiondirectory.po
 source_file = mixedgroups/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.netgroups]
+[o:fusiondirectory:p:FusionDirectory-14:r:netgroups]
 file_filter = netgroups/locale/<lang>/fusiondirectory.po
 source_file = netgroups/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.newsletter]
+[o:fusiondirectory:p:FusionDirectory-14:r:newsletter]
 file_filter = newsletter/locale/<lang>/fusiondirectory.po
 source_file = newsletter/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.opsi]
+[o:fusiondirectory:p:FusionDirectory-14:r:opsi]
 file_filter = opsi/locale/<lang>/fusiondirectory.po
 source_file = opsi/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.personal]
+[o:fusiondirectory:p:FusionDirectory-14:r:personal]
 file_filter = personal/locale/<lang>/fusiondirectory.po
 source_file = personal/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.postfix]
-file_filter = postfix/locale/<lang>/fusiondirectory.po
-source_file = postfix/locale/en/fusiondirectory.po
-source_lang = en
-
-[FusionDirectory-14.posix]
+[o:fusiondirectory:p:FusionDirectory-14:r:posix]
 file_filter = posix/locale/<lang>/fusiondirectory.po
 source_file = posix/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.ppolicy]
+[o:fusiondirectory:p:FusionDirectory-14:r:postfix]
+file_filter = postfix/locale/<lang>/fusiondirectory.po
+source_file = postfix/locale/en/fusiondirectory.po
+source_lang = en
+
+[o:fusiondirectory:p:FusionDirectory-14:r:ppolicy]
 file_filter = ppolicy/locale/<lang>/fusiondirectory.po
 source_file = ppolicy/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.public-forms]
+[o:fusiondirectory:p:FusionDirectory-14:r:public-forms]
 file_filter = public-forms/locale/<lang>/fusiondirectory.po
 source_file = public-forms/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.pureftpd]
+[o:fusiondirectory:p:FusionDirectory-14:r:pureftpd]
 file_filter = pureftpd/locale/<lang>/fusiondirectory.po
 source_file = pureftpd/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.quota]
+[o:fusiondirectory:p:FusionDirectory-14:r:quota]
 file_filter = quota/locale/<lang>/fusiondirectory.po
 source_file = quota/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.repository]
-file_filter = repository/locale/<lang>/fusiondirectory.po
-source_file = repository/locale/en/fusiondirectory.po
-source_lang = en
-
-
-[FusionDirectory-14.renater-partage]
+[o:fusiondirectory:p:FusionDirectory-14:r:renater-partage]
 file_filter = renater-partage/locale/<lang>/fusiondirectory.po
 source_file = renater-partage/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.samba]
+[o:fusiondirectory:p:FusionDirectory-14:r:repository]
+file_filter = repository/locale/<lang>/fusiondirectory.po
+source_file = repository/locale/en/fusiondirectory.po
+source_lang = en
+
+[o:fusiondirectory:p:FusionDirectory-14:r:samba]
 file_filter = samba/locale/<lang>/fusiondirectory.po
 source_file = samba/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.sinaps]
+[o:fusiondirectory:p:FusionDirectory-14:r:schac]
+file_filter = schac/locale/<lang>/fusiondirectory.po
+source_file = schac/locale/en/fusiondirectory.po
+source_lang = en
+
+[o:fusiondirectory:p:FusionDirectory-14:r:sinaps]
 file_filter = sinaps/locale/<lang>/fusiondirectory.po
 source_file = sinaps/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.sogo]
+[o:fusiondirectory:p:FusionDirectory-14:r:sogo]
 file_filter = sogo/locale/<lang>/fusiondirectory.po
 source_file = sogo/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.spamassassin]
+[o:fusiondirectory:p:FusionDirectory-14:r:spamassassin]
 file_filter = spamassassin/locale/<lang>/fusiondirectory.po
 source_file = spamassassin/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.ssh]
+[o:fusiondirectory:p:FusionDirectory-14:r:ssh]
 file_filter = ssh/locale/<lang>/fusiondirectory.po
 source_file = ssh/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.subcontracting]
+[o:fusiondirectory:p:FusionDirectory-14:r:subcontracting]
 file_filter = subcontracting/locale/<lang>/fusiondirectory.po
 source_file = subcontracting/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.sudo]
+[o:fusiondirectory:p:FusionDirectory-14:r:subscriptions]
+file_filter = subscriptions/locale/<lang>/fusiondirectory.po
+source_file = subscriptions/locale/en/fusiondirectory.po
+source_lang = en
+
+[o:fusiondirectory:p:FusionDirectory-14:r:sudo]
 file_filter = sudo/locale/<lang>/fusiondirectory.po
 source_file = sudo/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.supann]
+[o:fusiondirectory:p:FusionDirectory-14:r:supann]
 file_filter = supann/locale/<lang>/fusiondirectory.po
 source_file = supann/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.sympa]
+[o:fusiondirectory:p:FusionDirectory-14:r:sympa]
 file_filter = sympa/locale/<lang>/fusiondirectory.po
 source_file = sympa/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.systems]
+[o:fusiondirectory:p:FusionDirectory-14:r:systems]
 file_filter = systems/locale/<lang>/fusiondirectory.po
 source_file = systems/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.user-reminder]
+[o:fusiondirectory:p:FusionDirectory-14:r:user-reminder]
 file_filter = user-reminder/locale/<lang>/fusiondirectory.po
 source_file = user-reminder/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.weblink]
+[o:fusiondirectory:p:FusionDirectory-14:r:webauthn]
+file_filter = weblink/locale/<lang>/fusiondirectory.po
+source_file = weblink/locale/en/fusiondirectory.po
+source_lang = en
+
+[o:fusiondirectory:p:FusionDirectory-14:r:weblink]
 file_filter = weblink/locale/<lang>/fusiondirectory.po
 source_file = weblink/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-14.webservice]
+[o:fusiondirectory:p:FusionDirectory-14:r:webservice]
 file_filter = webservice/locale/<lang>/fusiondirectory.po
 source_file = webservice/locale/en/fusiondirectory.po
 source_lang = en
 
+[o:fusiondirectory:p:FusionDirectory-14:r:zimbra]
+file_filter = zimbra/locale/<lang>/fusiondirectory.po
+source_file = zimbra/locale/en/fusiondirectory.po
+source_lang = en
+

AUTHORS.md

+FusionDirectory AUTHORS
+=======================
+
+This is the alphabetical list of all people that have
+contributed to the FusionDirectory project, beeing code, translations,
+documentation and additional help.
+
+* Markus Amersdorfer <der.plusch@subnet.at>
+  Wiki setup, Testing, hints, proposals
+
+* Alessandro Amici <a.amici@bopen.it>
+  Italian translation
+
+* Holger Burbach <burbach@gonicus.de>
+  Kerberos PHP module
+
+* Craig Chang <craig0310@gmail.com>
+  Fixes for magic_quotes_qpc
+
+* Guillaume Delecourt <guillaume.delecourt@opensides.be>
+  Setup fixes, nagios tab plugin, xls addons ldapmanager
+  pptp connectivity option, phpscheduleit connectivity option
+
+* Dan Ellis <danellis@rushmore.com>
+  Sieve lib is taken from him
+
+* Alejandro Escanero Blanco <aescanero@chaosdimension.org>
+  Fixes, improvements, translation, netgroup plugin, Guide and some extensions
+
+* Fabian Hickert <hickert@gonicus.de>
+  Improvements for setup, various fixes and plugins
+
+* Eric Kilfoil <eric@ipass.net>
+  ldap.inc is taken from him
+
+* Niels Klomp <nk@careworks.nl>
+  Dutch translation
+
+* Steve Moitozo <god at zilla dot us>
+  Password checker
+
+* Benoit Mortier <benoit.mortier@fusiondirectory.org>
+  Butracking, QA, French translation
+
+* Igor Muratov <migor@altlinux.org>
+  Various fixes and speed enhancements
+
+* Michael Pasdziernik <mp@secio.de>
+  Documentation for GOsa and safe-mode, fixes
+
+* Cajus Pollmeier <pollmeier@gonicus.de>
+  Virtually everyting which is GOsa related
+
+* Piotr Rybicki <meritus@innervision.pl>
+  Polish translation
+
+* Henning Schmiedehausen <hps@intermeta.de>
+  Various fixes, support for user defined people/group base
+
+* Alfred Schröder <schroeder@gonicus.de>
+  German translation
+
+* Thomas Schüßler <tulpe@atomar.de>
+  debuglib.inc is taken from him
+
+* Jan Wenzel <jan.wenzel@gonicus.de>
+  Implementation and research for samba munged dial support,
+  fixing of "Fiptehlers"(TM) in the german translations.
+
+* Leila El Hitori <leila.elhitori@opensides.be>
+  French online documentation
+  English online documentation
+
+* Vincent Seynhaeve <vincent.seynhaeve@opensides.be>
+  Xls export plugin 
+
+* Wouter Verhelst <wouter@debian.org>
+  accept-to-gettext code that helps for language conversation
+
+* Antoine Gallavardin <antoine.gallavardin@free.fr>
+  Add support for social network ORCID in personal
+  Dhcp plugin patch to manage key and update zone in dhcp for dyndns
+  First version of the quota plugin
+  First version of the supann plugin
+  First version of the board plugin
+  Plugin Manager
+
+* Leonid Bogdanov <leonid_bogdanov@mail.ru>
+  patch for the manager fonctionnality in the General user tab
+
+* Olivier BONHOMME <obonhomme@nerim.net>
+  Fedora and Centos Packager, selinux policy creator
+
+* Benjamin Carpentier <carpentierbenjamin@gmail.com>
+  Tested FusionDirectory, corrected copyright issues and locales
+  Written fusiondirectory-setup
+
+* Giuliano Di Vito <guiliano@opensides.be>
+  Italian Translator and bug finder
+
+* Roman Widmann <archme.mail@gmail.com>
+  Arch linux packager
+
+* Bernigaud Côme <come.bernigaud@laposte.net>
+  New daemon code class_supportDaemon.inc, and all the new deployment stuff :)
+  Simple plugin framework developper
+
+* Alexis Michon <alexis.michon@ibcp.fr>
+  Testing, First version of Password reset
+  Support for two or more MAC address for a system
+
+* Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+  Various patches from debian-edu
+  Apache 2.4 support
+  Mcrypt decrypt enhancement
+  Browsing inactive tab 
+
+* Jeremy Williame <williamejeremy@hotmail.com>
+  Cleanup and writer of the FusionDirectory doxygen api documentation
+
+* Rudy Hardeman <zarya@gigafreak.net>
+  Option to remove sambaLMpassword storage
+
+* Gaston Tjebbes
+  Feth Arezki <feth@majerti.fr>
+  First version of the autofs plugin
+
+* Daniel B <daniel@firewall-services.com>
+  Cleanup of the sambaPwdMustChange, sambaPwdCanChange
+
+* Regis patronix <regis.patroix@thecosmocompany.com>
+  Allow special characters in passwords
+
+* Sergio Talens-Oliag <sto@iti.es>
+  Configuration setting to force the use of a hash when setting or changing passwords
+  Add support for crypt/sha-256 and crypt/sha-512
+  Use the passwordDefaultHash for new users
+  Fix for icons in core plugins
+  Provide a way to show hook execution results to the user via web
+  Hide userPassword on change_password postmodfy hook error message
+
+* Stefan Krüger <shadow_7@gmx.net>
+  Add support for various database to the rsyslog plugin
+
+* Guillaume Chéramy <guillaume@cheramy.name>
+  Patches for the template system
+
+* Mathias Friman mathias.friman@knorca.se
+  Translation to swedish
+
+* Alexandre Magnat <alexandre.magnat@mecaprotec.fr>
+  Snapshot bug reporter
+
+* Guillaume RODRIGUEZ <rodriguez.guillaume@icloud.com>
+  asterisk plugin error reporter
+
+* Guillard Olivier <fd@guillard.nom.fr>
+  SSH plugin key storage problem reporter
+
+* Fabien Brachere <fabien.brachere@e-tera.com>
+  Fix support for special caracters in password
+
+* Arnaud Patard <apatard@hupstream.com>
+  Fix for Invalid uri in the password recovery mail
+  Fix for start tls on fusiondirectory setup and gnutls
+
+* Adrian Reyer <are+fd@lihas.de>
+  Modifier for templates to convert german umlauts to 7-bit ASCII
+
+* Samuel Bosquin <samuel.bosquin@ibcp.fr>
+  Plugin FAI - LVM partitions
+
+* IOhannes umlaeute <noc@iem.at>
+  generateLdif() fails with bind-passwords containg '$' patch
+  
+* Karsten Becker <karsten.becker@ecologic.eu>
+  Suse install from tarballs Documentation
+
+* Felix Weissbeck <contact-fusiondirectory@w7k.de>
+  Method to add a change password dialog on sasl+kerberos
+  
+* Tobias Göbel
+  Fixes for PHP7 compatibility
+
+* Christian Kreidl <christian.kreidl@ziti.uni-heidelberg.de>
+  ppolicy improvement
+  
+* Martin Hamant <mh@ow2.org>
+  Coded the LockUser fonction for the webservice
+  
+* Jonathan Swaelens <jonathan.swaelens@fusiondirectory.org>
+  QA on FusionDirectory
+  RPM packaging maintener and ArchLinux Packager
+  
+* Timothée Giet <timo@timotheegiet.com>
+  New breezy icon Theme
+
+* Clement Oudot <clem.oudot@gmail.com>
+  HTTP header authentication
+  Password expiration date in dashboard
+
+* Thomas Niercke <thomas@niercke.de>
+  Code and ideas for making Argonaut Events Extensible
+  
+* Paola Penati <paola.penati@fusiondirectory.org>
+  Italian translation of FusionDirectory and the website
+
+* Martin Hamant <mh@ow2.org>
+  Adding DSA accounts into groups
+  
+* Mathias Soupault <mathias.soupault@inalco.fr>
+  Making supannAliasLogin usage possible in password recovery
+
+* Patzke Thomas <thomas.patzke2@thyssenkrupp.com>
+  Security and vulnerabitity testing
+
+* Janne Heß
+  Enhance the login and password reset theme
+
+* Peter Linss
+  Added catchall table to postfix plugin
+
+* Renato Ramonda
+  Support for SSH ed25519 keys
+
+* Judicael Courant <judicael.courant@orange.com>
+  Weak random generator use in fusiondirectory-setup
+
+* Sinan Sekerci - Dreamlab
+  Security Audit of FusionDirectory
+  Full Path Disclosure
+  Cross-Site Scripting (XSS)
+  Arbitrary File Access (PNG files only)
+
+* Manuel Pellegrinet <manuel.pellegrinet@yoroi.company>
+  Security Audit of FusionDirectory
+  Cross-Site Scripting (XSS)
+  Improper session handling
+
+* Froger Soisik <soisik.froger@gmail.com>
+  Dynamic group tab support
+
+* Clement Oudot <clement.oudot@worteks.com>
+  Plugin NextCloud
+
+* Matthew Newton <matthew.newton@networkradius.com>
+  EpochDays attributes as human readable    
+
+* Cass Rebbelin <Rebbelin@hisolutions.com>
+  PNG traversal path vulnerability
+
+*  Milan Stute <mstute@seemoo.tu-darmstadt.de>
+   Contributed Social Handlers for google scholar, Github, Matrix

CONTRIBUTING.md

@@ -34,7 +34,7 @@ All projects and everyone participating in it is governed by [FusionDirectory Co
 
 We have an various channel of communications
 
-*  [#fusiondirectory, the irc channel of FusionDirectory on freenode](https://webchat.freenode.net/), channel #fusiondirectory
+*  [#fusiondirectory, the irc channel of FusionDirectory on Libera](https://web.libera.chat/), channel #fusiondirectory
 *  [FusionDirectory Users mailing list](https://lists.fusiondirectory.org/wws/info/users)
 *  [FusionDirectory dev mailing list](https://lists.fusiondirectory.org/wws/info/developpers)
 
@@ -114,8 +114,8 @@ Fill out the **Contribution** template to create thoses issues, the information
 * **Provide a step-by-step description of the contribution** in as many details as possible.
 * **Include screenshots and animated GIFs** which help you demonstrate what this contribution is about. You can use [this tool](http://www.cockos.com/licecap/) to record GIFs on macOS and Windows, and [this tool](https://github.com/colinkeenan/silentcast) or [this tool](https://github.com/GNOME/byzanz) on Linux.
 * **Explain why this contribution would be useful** to most FusionDirectory users.
-* **Follow the** [Coding style](https://fusiondirectory-developer-documentation.readthedocs.io/en/latest/coding/codingstandards.html)
-* **Use our** `PHP CodeSniffer <http://pear.php.net/package/PHP_CodeSniffer>`_ rules to check code compliance [CodeSniffer](https://fusiondirectory-developer-documentation.readthedocs.io/en/latest/coding/codingstandards.html#checking-standards)
+* **Follow the** [Coding style](https://fusiondirectory-developer-documentation.readthedocs.io/en/1.4/fusiondirectory/coding/codingstandards.html)
+* **Use our** `PHP CodeSniffer <http://pear.php.net/package/PHP_CodeSniffer>`_ rules to check code compliance [CodeSniffer](https://fusiondirectory-developer-documentation.readthedocs.io/en/1.4/fusiondirectory/coding/codingstandards.html)
 
 ## Coding with style
 
@@ -174,7 +174,7 @@ close #5685
 
 ### PHP style Guide
 
-To be sure to respect our guidelines, read [Coding standards](https://fusiondirectory-developer-documentation.readthedocs.io/en/latest/coding/index.html)
+To be sure to respect our guidelines, read [Coding standards](https://fusiondirectory-developer-documentation.readthedocs.io/en/1.4/fusiondirectory/coding/codingstandards.html)
 
 ## Licensing
 

Changelog

+See Changelog.md
+

LICENSE

@@ -290,8 +290,7 @@ to attach them to the start of each source file to most effectively
 convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    fusiondirectory-plugins
-    Copyright (C) 2017  fusiondirectory
+    Copyright (C) 2018  fusiondirectory
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

README.md

@@ -39,26 +39,59 @@ This question can be solved by creating:
 * A plugin for its management in FusionDirectory with the simple plugin api
 * An Argonaut module for the client installed on the server
 
+## Installation and upgrade of FusionDirectory
+
+The installation and upgrade information is available on [Install FusionDirectory][fusiondirectory-install]
+
+## Migration to FusionDirectory
+
+To migrate an existing LDAP tree, you've to do all steps [Install FusionDirectory][fusiondirectory-install],
+plus some modifications:
+
+* FusionDirectory only shows users that have the objectClass inetOrgPerson
+
+* FusionDirectory only recognizes subtrees (or departments in FusionDirectory's view of things) that have the objectClass gosaDepartment.
+  You can hide subtrees from FusionDirectory by not putting this objectClass inside.
+
+The FusionDirectory setup may be used to do these migrations, but it is not meant
+to work in every possible circumstance. Please be carefull when using it on
+productive system.
+
+That should be all. Entries should be visible in FusionDirectory now.
+Be aware that if your naming policy of user cn's differs from the way FusionDirectory handles it, the entries get rewritten to a FusionDirectory style dn.
+
 ## Get help
 
-There are a couple ways you can try [to get help][get help].You can also join the `#fusiondirectory` IRC channel at freenode.net.
+### Community support
+
+There are a couple of ways you can try [to get help][get help].
+
+### Professional support
+
+Professional support is provided through of subscription.
 
-You can [register on our system][register] and enter issues [FusionDirectory][issues-core] for the core program, and 
-[FusionDirectory Plugins][issues-plugins] for plugins.
+* [FusionDirectory Subscription][subscription-fusiondirectory] : Global subscription for FusionDirectory 
 
-## IRC Etiquette
+The subscription provides access to FusionDirectory's enterprise repository, tested and pre-packaged versions with patches between versions, 
+providing reliable software updates and security enhancements, as well as technical help and support.
 
-* If we don't answer right away then just hang out in the channel.  Someone will
-  eventually write back to you as it just means we are away from keyboard,
-  working on something else, or in a different timezone than you.
+Choose the plan that's right for you. Our subscriptions are flexible and scalable according to your needs
 
-* You should treat IRC as what it is: asynchronous chat.  Sure the messages can
-  be instant but in most channels people are in different time zones.  At times
-  chat replies can be in excess of 24hrs.
+The subscription period is one year from the date of purchase and provides you with access to the extensive infrastructure of enterprise-class software and services.
+
+### Best practice badge
+
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/351/badge)](https://bestpractices.coreinfrastructure.org/projects/351)
   
-## Donate
+## Crowfunding
+
+If you like us and want to send us a small contribution, you can use the following crowdfunding services
+
+* [donate-liberapay]
+
+* [donate-kofi]
 
-If you like [FusionDirectory][FusionDirectory] and would like to [donate][donate-liberapay] even a small amount you can go to our Liberapay account
+* [donate-github]
   
 ## License
 
@@ -66,12 +99,17 @@ If you like [FusionDirectory][FusionDirectory] and would like to [donate][donate
 
 [FusionDirectory]: https://www.fusiondirectory.org/
 
-[get help]: https://www.fusiondirectory.org/contact-us/
+[fusiondirectory-install]: https://fusiondirectory-user-manual.readthedocs.io/en/latest/fusiondirectory/install/index.html
 
-[register]: https://register.fusiondirectory.org
+[get help]: https://fusiondirectory-user-manual.readthedocs.io/en/latest/support/index.html
 
-[issues-core]: https://gitlab.fusiondirectory.org/fusiondirectory/fd/issues
+[subscription-fusiondirectory]: https://www.fusiondirectory.org/en/iam-tool-service-subscriptions/
 
-[issues-plugins]: https://gitlab.fusiondirectory.org/fusiondirectory/fd-plugins/issues
+[register]: https://register.fusiondirectory.org
 
 [donate-liberapay]: https://liberapay.com/fusiondirectory/donate
+
+[donate-kofi]: https://ko-fi.com/fusiondirectory
+
+[donate-github]: https://github.com/fusiondirectory
+

SECURITY.md

+### Reporting Security Vulnerabilities
+
+Although we try to be proactive in preventing security concerns, it is unfortunately inevitable that security breaches will be discovered in all software, including our own.
+
+It is common practice in open source to disclose a security concern to the vendor in a responsible and private manner prior to publication, so that a patch can be prepared, and so that we can take proactive measures to protect FusionDirectory users.
+
+### What is a “security” issue ?
+
+A security issue is a type of bug that can affect the security of FusionDirectory installations.
+
+Specifically, it is a report of a bug that you have found in the code for FusionDirectory and that you have determined can be used to gain some level of access to a site running FusionDirectory that you should not have.
+
+### Where do I report security issues ?
+
+If you would like to contact us with a security vulnerability or possible vulnerability, please contact us via email [security@fusiondirectory.org](mailto:security@fusiondirectory.org).
+
+Your email can be signed with the following public gpg key :
+
+Benoit Mortier : **32BA 180F 6E14 7B5F 52BE 6322 EF2F F1E4 8638 EAD1**
+
+**In any case, you should not share details with anyone else until the bug fix has been officially released.**
+

alias/config/alias/class_aliasConfig.inc → alias/backend/alias/class_aliasConfig.inc

@@ -18,7 +18,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-class aliasConfig extends simplePlugin
+class aliasConfig extends multiPluginSection
 {
   static function plInfo (): array
   {
@@ -36,7 +36,7 @@ class aliasConfig extends simplePlugin
   static function getAttributesInfo (): array
   {
     return [
-      'main' => [
+      'alias' => [
         'name'  => _('Alias'),
         'attrs' => [
           new StringAttribute(

alias/contrib/yaml/description.yaml

+information:
+  authors:
+  - FusionDirectory
+  description: Alias plugin for FusionDirectory
+  license: GPLv2
+  logoUrl: https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/alias/html/themes/breezy/icons/48/apps/alias.png
+  name: alias
+  origin: package
+  screenshotUrl:
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/alias/contrib/screenshots/alias-create-mail-redirection-filled.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/alias/contrib/screenshots/alias-redirection-filled.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/alias/contrib/screenshots/alias-list.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/alias/contrib/screenshots/alias-mail-redirection-end.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/alias/contrib/screenshots/alias-create-mail-distribution.png
+  status: Stable
+  tags:
+  - user
+  version: '1.5'
+requirement:
+  fdVersion: 1.5
+  phpVersion: 7.4
+support:
+  contractUrl: https://www.fusiondirectory.org/abonnements-fusiondirectory/
+  documentationUrl: https://fusiondirectory-user-manual.readthedocs.io/en/latest/fusiondirectory/plugins/alias/index.html
+  homeUrl: https://gitlab.fusiondirectory.org/fusiondirectory/fd-plugins
+  provider: fusiondirectory
+  schemaUrl: https://schemas.fusiondirectory.org/
+  ticketUrl: https://gitlab.fusiondirectory.org/fusiondirectory/fd-plugins/-/issues

alias/locale/af_ZA/fusiondirectory.po

@@ -8,145 +8,145 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2019-03-21 14:04+0000\n"
+"POT-Creation-Date: 2025-02-11 10:47+0000\n"
 "PO-Revision-Date: 2018-08-13 19:49+0000\n"
-"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"Language-Team: Afrikaans (South Africa) (https://app.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:26
-#: admin/alias/class_mailAliasDistribution.inc:27
-#: admin/alias/class_mailAliasDistribution.inc:30
+#: backend/alias/class_aliasConfig.inc:26
+msgid "Alias configuration"
+msgstr ""
+
+#: backend/alias/class_aliasConfig.inc:27
+msgid "FusionDirectory alias plugin configuration"
+msgstr ""
+
+#: backend/alias/class_aliasConfig.inc:40
+msgid "Alias"
+msgstr ""
+
+#: backend/alias/class_aliasConfig.inc:43
+msgid "Alias RDN"
+msgstr ""
+
+#: backend/alias/class_aliasConfig.inc:43
+msgid "Branch in which aliases will be stored"
+msgstr ""
+
+#: management/alias/class_mailAliasDistribution.inc:26
+#: management/alias/class_mailAliasDistribution.inc:27
+#: management/alias/class_mailAliasDistribution.inc:30
 msgid "Temporary mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:45
+#: management/alias/class_mailAliasDistribution.inc:52
 msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:48
-#: admin/alias/class_mailAliasRedirection.inc:49
+#: management/alias/class_mailAliasDistribution.inc:55
+#: management/alias/class_mailAliasRedirection.inc:56
 msgid "Name"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:48
+#: management/alias/class_mailAliasDistribution.inc:55
 msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:50
-#: admin/alias/class_mailAliasRedirection.inc:51
+#: management/alias/class_mailAliasDistribution.inc:57
+#: management/alias/class_mailAliasRedirection.inc:58
 msgid "Description"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:50
+#: management/alias/class_mailAliasDistribution.inc:57
 msgid "Description of this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:54
+#: management/alias/class_mailAliasDistribution.inc:61
 msgid "Email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:59
+#: management/alias/class_mailAliasDistribution.inc:66
 msgid "Email aliases"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:59
+#: management/alias/class_mailAliasDistribution.inc:66
 msgid "Aliases for this email address"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:64
+#: management/alias/class_mailAliasDistribution.inc:71
 msgid "Mail server"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:64
+#: management/alias/class_mailAliasDistribution.inc:71
 msgid "Mail server for this alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:69
-#: admin/alias/class_mailAliasRedirection.inc:67
+#: management/alias/class_mailAliasDistribution.inc:76
+#: management/alias/class_mailAliasRedirection.inc:74
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:69
+#: management/alias/class_mailAliasDistribution.inc:76
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:26
-#: admin/alias/class_mailAliasRedirection.inc:27
-#: admin/alias/class_mailAliasRedirection.inc:30
+#: management/alias/class_mailAliasRedirection.inc:26
+#: management/alias/class_mailAliasRedirection.inc:27
+#: management/alias/class_mailAliasRedirection.inc:30
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:46
+#: management/alias/class_mailAliasRedirection.inc:53
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:49
+#: management/alias/class_mailAliasRedirection.inc:56
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:51
+#: management/alias/class_mailAliasRedirection.inc:58
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:56
+#: management/alias/class_mailAliasRedirection.inc:63
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:56
+#: management/alias/class_mailAliasRedirection.inc:63
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: management/alias/class_mailAliasRedirection.inc:69
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:62
+#: management/alias/class_mailAliasRedirection.inc:69
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:67
+#: management/alias/class_mailAliasRedirection.inc:74
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:37
+#: management/alias/class_aliasManagement.inc:39
 msgid "Aliases"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:38
+#: management/alias/class_aliasManagement.inc:40
 msgid "Alias management"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:39
+#: management/alias/class_aliasManagement.inc:41
 msgid "Manage aliases"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:43
+#: management/alias/class_aliasManagement.inc:45
 msgid "Mail aliases"
 msgstr ""
-
-#: config/alias/class_aliasConfig.inc:26
-msgid "Alias configuration"
-msgstr ""
-
-#: config/alias/class_aliasConfig.inc:27
-msgid "FusionDirectory alias plugin configuration"
-msgstr ""
-
-#: config/alias/class_aliasConfig.inc:40
-msgid "Alias"
-msgstr ""
-
-#: config/alias/class_aliasConfig.inc:43
-msgid "Alias RDN"
-msgstr ""
-
-#: config/alias/class_aliasConfig.inc:43
-msgid "Branch in which aliases will be stored"
-msgstr ""