Merge branch '1.3-dev' into HEAD

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>

.gitlab-ci.yml

@@ -32,7 +32,55 @@ create_php_lint_rapport_stretch:
   script:
     - find . -type f -name '*.php' -o -name '*.inc' -print0 | xargs -0 -n1 php -l
 
-## Stage transifex
+## Stage codestyle
+
+# PHP codesniffer
+create_php_code_sniffer_rapport_13:
+  stage: codestyle
+  only:
+    - branches
+  before_script:
+    - apt-get update -qq
+    - apt-get install -y -qq  git php-cli php-codesniffer
+  script:
+    - git clone https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git -b 1.3 ../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
+
+# Sonar publishing
+sonar_publish:
+  image: sonar-cli:3.1.0.1141
+  stage: codestyle
+  only:
+    - 1.3-dev
+  script:
+    - /home/sonar/*/bin/sonar-scanner
+      -D sonar.projectKey=fusiondirectory-plugins-dev
+      -D sonar.projectName=FusionDirectory-Plugins-Dev
+      -D sonar.projectVersion=1.3
+      -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.3-dev
+  script:
+    - /home/sonar/*/bin/sonar-scanner
+      -D sonar.projectKey=fusiondirectory-plugins-dev
+      -D sonar.projectName=FusionDirectory-Plugins-Dev
+      -D sonar.projectVersion=1.3
+      -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
 
 # fusiondirectory-update-locale
 fusiondirectory-update-locale:

.gitlab/issue_templates/Backporting.md

+### Description
+
+<!-- Required -->
+<!-- Description of the issue -->
+
+### Source FusionDirectory Version
+
+<!-- Required -->
+<!-- FusionDirectory version where the code come from -->
+
+### Destination FusionDirectory Version
+
+<!-- Required -->
+<!-- FusionDirectory version where the code sould go -->
+
+### Plugin with the new code
+
+<!-- Required -->
+<!-- Name of the plugin -->
+
+### Reason of Backporting code
+
+<!-- Required -->
+
+### What defect does it correct
+
+<!-- Required -->
+<!-- Why do we backport this code -->
+
+### Additional Information
+<!-- optional -->
+<!-- Any additional information, configuration or data that might be necessary to reproduce the issue. -->

.gitlab/issue_templates/Bugs.md

+### Description
+
+<!-- Required -->
+<!-- Description of the issue -->
+
+### Distribution Name and Version
+
+<!-- Required -->
+<!-- Debian, Centos -->
+
+### FusionDirectory Version
+
+<!-- Required -->
+
+### Plugin with the defect
+
+<!-- Required -->
+<!-- Name of the plugin -->
+
+### PHP version used
+
+<!-- Required -->
+
+### Origin of php packages
+
+<!-- Required -->
+<!-- Distribution packages, Out of distribution -->
+
+### Steps to Reproduce
+
+<!-- Required -->
+1. [First Step]
+2. [Second Step]
+3. [and so on...]
+
+**Expected behavior:**
+
+<!-- What you expect to happen-->
+
+**Actual behavior:**
+
+<!-- What actually happens -->
+
+**Reproduces how often:**
+<!-- What percentage of the time does it reproduce?-->
+
+### Additional Information
+<!-- optional -->
+<!-- Any additional information, configuration or data that might be necessary to reproduce the issue. -->

.gitlab/issue_templates/Contribution.md

+### Requirements
+
+* Filling out the template is required. Any Enhancement request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
+* All new code requires tests to ensure against regressions
+
+## Descriptive title for this contribution
+
+<!-- required -->
+
+### Step by step description of this contribution
+
+<!-- Required -->
+1. [First Step]
+2. [Second Step]
+3. [and so on...]
+
+### Schemas needed by this contribution
+
+<!-- Describe if schema changes are needed by this contribution -->
+<!-- Describe if new schemas are need for this contribution -->
+
+### Benefits
+
+<!-- Required -->
+<!-- What benefits will be realized with this contribution ? -->
+
+### Possible Drawbacks
+
+<!-- optional -->
+<!-- What are the possible side-effects or negative impacts of this contribution ? -->
+
+### Actual use cases
+
+<!-- optional -->
+<!-- Enter any applicable Issues here -->

.gitlab/issue_templates/Enhancement.md

+### Requirements
+
+* Filling out the template is required. Any Enhancement request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
+* All new code requires tests to ensure against regressions
+
+## Descriptive title for this enhancement
+
+<!-- required -->
+
+### Actual behavior
+
+<!-- What actually happens -->
+
+### Expected behavior
+
+<!-- What you expect to happen-->
+
+### Step by step description of new behaviour
+
+<!-- Required -->
+1. [First Step]
+2. [Second Step]
+3. [and so on...]
+
+### Benefits
+
+<!-- optional -->
+<!-- What benefits will be realized by the code change? -->
+
+### Possible Drawbacks
+
+<!-- optional -->
+<!-- What are the possible side-effects or negative impacts of the code change? -->
+
+### Applicable Issues
+
+<!-- optional -->
+<!-- Enter any applicable Issues here -->

.gitlab/merge_request_templates/Merge.md

+### Requirements
+
+* Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
+* All new code requires tests to ensure against regressions
+
+## Title of the Pull Requests 
+
+<!-- required -->
+
+
+### Description of the Change
+
+<!-- required -->
+<!-- can be an aglomeration of commits bodies -->
+
+### Benefits
+
+<!-- optional -->
+<!-- What benefits will be realized by the code change? -->
+
+### Possible Drawbacks
+
+<!-- optional -->
+<!-- What are the possible side-effects or negative impacts of the code change? -->
+
+### Applicable Issues
+
+<!-- optional -->
+<!-- Enter any applicable Issues here -->
\ No newline at end of file

.tx/config

@@ -2,252 +2,258 @@
 host = https://www.transifex.com
 type = PO
 
-[fusiondirectory-12.alias]
+[FusionDirectory-13.alias]
 file_filter = alias/locale/<lang>/fusiondirectory.po
 source_file = alias/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.applications]
+[FusionDirectory-13.applications]
 file_filter = applications/locale/<lang>/fusiondirectory.po
 source_file = applications/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.argonaut]
+[FusionDirectory-13.argonaut]
 file_filter = argonaut/locale/<lang>/fusiondirectory.po
 source_file = argonaut/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.audit]
+[FusionDirectory-13.audit]
 file_filter = audit/locale/<lang>/fusiondirectory.po
 source_file = audit/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.autofs]
+[FusionDirectory-13.autofs]
 file_filter = autofs/locale/<lang>/fusiondirectory.po
 source_file = autofs/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.certificates]
+[FusionDirectory-13.certificates]
 file_filter = certificates/locale/<lang>/fusiondirectory.po
 source_file = certificates/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.community]
+[FusionDirectory-13.community]
 file_filter = community/locale/<lang>/fusiondirectory.po
 source_file = community/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.cyrus]
+[FusionDirectory-13.cyrus]
 file_filter = cyrus/locale/<lang>/fusiondirectory.po
 source_file = cyrus/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.debconf]
+[FusionDirectory-13.debconf]
 file_filter = debconf/locale/<lang>/fusiondirectory.po
 source_file = debconf/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.developers]
+[FusionDirectory-13.developers]
 file_filter = developers/locale/<lang>/fusiondirectory.po
 source_file = developers/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.dhcp]
+[FusionDirectory-13.dhcp]
 file_filter = dhcp/locale/<lang>/fusiondirectory.po
 source_file = dhcp/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.dns]
+[FusionDirectory-13.dns]
 file_filter = dns/locale/<lang>/fusiondirectory.po
 source_file = dns/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.dovecot]
+[FusionDirectory-13.dovecot]
 file_filter = dovecot/locale/<lang>/fusiondirectory.po
 source_file = dovecot/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.dsa]
+[FusionDirectory-13.dsa]
 file_filter = dsa/locale/<lang>/fusiondirectory.po
 source_file = dsa/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.ejbca]
+[FusionDirectory-13.ejbca]
 file_filter = ejbca/locale/<lang>/fusiondirectory.po
 source_file = ejbca/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.fai]
+[FusionDirectory-13.fai]
 file_filter = fai/locale/<lang>/fusiondirectory.po
 source_file = fai/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.freeradius]
+[FusionDirectory-13.freeradius]
 file_filter = freeradius/locale/<lang>/fusiondirectory.po
 source_file = freeradius/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.fusioninventory]
+[FusionDirectory-13.fusioninventory]
 file_filter = fusioninventory/locale/<lang>/fusiondirectory.po
 source_file = fusioninventory/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.gpg]
+[FusionDirectory-13.gpg]
 file_filter = gpg/locale/<lang>/fusiondirectory.po
 source_file = gpg/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.ipmi]
+[FusionDirectory-13.ipmi]
 file_filter = ipmi/locale/<lang>/fusiondirectory.po
 source_file = ipmi/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.ldapdump]
+[FusionDirectory-13.ldapdump]
 file_filter = ldapdump/locale/<lang>/fusiondirectory.po
 source_file = ldapdump/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.ldapmanager]
+[FusionDirectory-13.ldapmanager]
 file_filter = ldapmanager/locale/<lang>/fusiondirectory.po
 source_file = ldapmanager/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.mail]
+[FusionDirectory-13.mail]
 file_filter = mail/locale/<lang>/fusiondirectory.po
 source_file = mail/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.mixedgroups]
+[FusionDirectory-13.mixedgroups]
 file_filter = mixedgroups/locale/<lang>/fusiondirectory.po
 source_file = mixedgroups/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.nagios]
+[FusionDirectory-13.nagios]
 file_filter = nagios/locale/<lang>/fusiondirectory.po
 source_file = nagios/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.netgroups]
+[FusionDirectory-13.netgroups]
 file_filter = netgroups/locale/<lang>/fusiondirectory.po
 source_file = netgroups/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.newsletter]
+[FusionDirectory-13.newsletter]
 file_filter = newsletter/locale/<lang>/fusiondirectory.po
 source_file = newsletter/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.opsi]
+[FusionDirectory-13.opsi]
 file_filter = opsi/locale/<lang>/fusiondirectory.po
 source_file = opsi/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.personal]
+[FusionDirectory-13.personal]
 file_filter = personal/locale/<lang>/fusiondirectory.po
 source_file = personal/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.posix]
-file_filter = posix/locale/<lang>/fusiondirectory.po
-source_file = posix/locale/en/fusiondirectory.po
-source_lang = en
-
-[fusiondirectory-12.postfix]
+[FusionDirectory-13.postfix]
 file_filter = postfix/locale/<lang>/fusiondirectory.po
 source_file = postfix/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.ppolicy]
+[FusionDirectory-13.posix]
+file_filter = posix/locale/<lang>/fusiondirectory.po
+source_file = posix/locale/en/fusiondirectory.po
+source_lang = en
+
+[FusionDirectory-13.ppolicy]
 file_filter = ppolicy/locale/<lang>/fusiondirectory.po
 source_file = ppolicy/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.puppet]
+[FusionDirectory-13.puppet]
 file_filter = puppet/locale/<lang>/fusiondirectory.po
 source_file = puppet/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.pureftpd]
+[FusionDirectory-13.pureftpd]
 file_filter = pureftpd/locale/<lang>/fusiondirectory.po
 source_file = pureftpd/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.quota]
+[FusionDirectory-13.quota]
 file_filter = quota/locale/<lang>/fusiondirectory.po
 source_file = quota/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.renater-partage]
-file_filter = renater-partage/locale/<lang>/fusiondirectory.po
-source_file = renater-partage/locale/en/fusiondirectory.po
-source_lang = en
-
-[fusiondirectory-12.repository]
+[FusionDirectory-13.repository]
 file_filter = repository/locale/<lang>/fusiondirectory.po
 source_file = repository/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.samba]
+
+[FusionDirectory-13.renater-partage]
+file_filter = renater-partage/locale/<lang>/fusiondirectory.po
+source_file = renater-partage/locale/en/fusiondirectory.po
+source_lang = en
+
+[FusionDirectory-13.samba]
 file_filter = samba/locale/<lang>/fusiondirectory.po
 source_file = samba/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.sogo]
+[FusionDirectory-13.sinaps]
+file_filter = sinaps/locale/<lang>/fusiondirectory.po
+source_file = sinaps/locale/en/fusiondirectory.po
+source_lang = en
+
+[FusionDirectory-13.sogo]
 file_filter = sogo/locale/<lang>/fusiondirectory.po
 source_file = sogo/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.spamassassin]
+[FusionDirectory-13.spamassassin]
 file_filter = spamassassin/locale/<lang>/fusiondirectory.po
 source_file = spamassassin/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.squid]
+[FusionDirectory-13.squid]
 file_filter = squid/locale/<lang>/fusiondirectory.po
 source_file = squid/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.ssh]
+[FusionDirectory-13.ssh]
 file_filter = ssh/locale/<lang>/fusiondirectory.po
 source_file = ssh/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.subcontracting]
+[FusionDirectory-13.subcontracting]
 file_filter = subcontracting/locale/<lang>/fusiondirectory.po
 source_file = subcontracting/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.sudo]
+[FusionDirectory-13.sudo]
 file_filter = sudo/locale/<lang>/fusiondirectory.po
 source_file = sudo/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.supann]
+[FusionDirectory-13.supann]
 file_filter = supann/locale/<lang>/fusiondirectory.po
 source_file = supann/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.sympa]
+[FusionDirectory-13.sympa]
 file_filter = sympa/locale/<lang>/fusiondirectory.po
 source_file = sympa/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.systems]
+[FusionDirectory-13.systems]
 file_filter = systems/locale/<lang>/fusiondirectory.po
 source_file = systems/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.user-reminder]
+[FusionDirectory-13.user-reminder]
 file_filter = user-reminder/locale/<lang>/fusiondirectory.po
 source_file = user-reminder/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.weblink]
+[FusionDirectory-13.weblink]
 file_filter = weblink/locale/<lang>/fusiondirectory.po
 source_file = weblink/locale/en/fusiondirectory.po
 source_lang = en
 
-[fusiondirectory-12.webservice]
+[FusionDirectory-13.webservice]
 file_filter = webservice/locale/<lang>/fusiondirectory.po
 source_file = webservice/locale/en/fusiondirectory.po
 source_lang = en

CONTRIBUTING.md

 # Contributing to FusionDirectory projects
 
-:tada: First off, thanks for taking the time to contribute!
-
-> «Here's a list of our guidelines, If you want to share a best practice, or think one of these guidelines should be removed, feel free to share it with us.»
-
 ## Table Of Contents
 
-1. [TL;DR](#tldr)
+1. [Welcome](#Welcome)
 2. [Code of Conduct](#code-of-conduct)
 3. [I just have a question!](#i-just-have-a-question)
 4. [How Can I Contribute?](#how-can-i-contribute)
+    * [Translate FusionDirectory in your language](#translate-fusiondirectory)
     * [Finding Wonderful Bugs](#finding-wonderful-bugs)
     * [Any Feedback To Enhance Our Apps](#any-feedback-to-enhance-our-apps)
     * [Your Awesome And Mighty Codes Contributions](#your-awesome-and-mighty-codes-contributions)
 5. [Coding with style](#coding-with-style)
     * [Git Commit Messages](#git-commit-messages)
-    * [PHP Style Guide](#php-style-guide
+    * [PHP Style Guide](#php-style-guide)
 6. [Licensing](#licensing)
 
 ---
-## TL;DR
-
-You're so excited to contribute that you do not have time to read the entire document. Here you will find some keys to quickly and safety contribute. :wink:
-
-1. [Our communication Channels](https://www.fusiondirectory.org/contact-us/). Feel free to discuss with us.
-2. Just be cool and respectful with others
-3. create an FusionDirectory project account at [FusionDirectory Sign UP](https://register.fusiondirectory.org)
-4. 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/codingstandards.html#checking-standards)
-5. Your code should be tested
-6. Respect this simple commit message template
-
-```
-<emoji> <type>(<scope>): <subject>
-<BLANK LINE>
-<body>
-<BLANK LINE>
-<footer>
-```
+## Welcome
 
-The **header** is mandatory and the **scope** of the header is optional.
+> «Here's a list of our guidelines, If you want to share a best practice, or think one of these guidelines should be removed, feel free to share it with us.»
 
-Where type can be :
-  * **feat**:  A new feature
-  * **fix**: A bug fix
-  * **core**: Code for the Core
-  * **docs**: Documenting the code or writing new documentation
-  * **style**: Cosmetics purpose
-  * **test**: Adding missing or correcting tests
-7. For the subject, use the present tense ("Add feature" not "Added feature")
-8. Should be submitted through [FusionDirectory gitlab](https://gitlab.fusiondirectory.org) via a pull request on the 1.x-dev branch.
+:tada: First off, thanks for taking the time to contribute!
 
-Now, if you want to go further, sit comfortably at the fireplace, grab your glasses and immerse yourself in our documentation.
+Now, sit comfortably at the fireplace, grab your glasses and immerse yourself in our documentation.
 
 ## Code Of Conduct
 
@@ -68,7 +40,15 @@ We have an various channel of communications
 
 ## How Can I Contribute?
 
-So, you've developed a new cool feature? Fixed an annoying bug? Found a mistake? We'd be happy to hear from you! :+1:
+So, you've developed a new cool feature? Fixed an annoying bug? Found a mistake? Want to help translate FusionDirectory in your own language. We'd be happy to hear from you! :+1:
+
+### Translate FusionDirectory
+
+We are using [Transifex](https://www.transifex.com/fusiondirectory/FusionDirectory-1x/) to translate FusionDirectory.
+
+* Create a transifex account
+* Ask to be added to the language group you want to translate