Commit 62379a3a authored by bmanager bmanager's avatar bmanager bmanager
Browse files

Merge branch '1.2-fixes' into 'master'

merge 1.2 fixes into master

See merge request fusiondirectory/fd-plugins!231
parents d3030970 091ce102
# Specify docker image
image: debian:stretch
# Define variable to disable SSL verification of GIT
- lint
- codestyle
- manpages
- transifex
- tarballs
## Stage lint
# PHP lint (jessie)
image: php:5.6.33-cli-jessie
stage: lint
- branches
- find . -type f -name '*.php' -o -name '*.inc' -print0 | xargs -0 -n1 php -l
# PHP lint (stretch)
image: php:cli-stretch
stage: lint
- branches
- find . -type f -name '*.php' -o -name '*.inc' -print0 | xargs -0 -n1 php -l
## Stage transifex
# fusiondirectory-update-locale
image: php:cli-stretch
stage: transifex
- branches
- apt-get update -qq
- apt-get install -y -qq gettext git
- git clone ../dev-tools
- ../dev-tools/locale-scripts/fusiondirectory-update-locale-plugins
# Update transifex
image: php:cli-stretch
stage: transifex
- /^1.*$/
- apt-get update -qq
- apt-get install -y -qq gettext git transifex-client
- git clone ../dev-tools
- echo $'[]\nhostname =\nusername = '"$TRANSIFEX_USER"$'\npassword = '"$TRANSIFEX_PASSWORD"$'\ntoken = '"$TRANSIFEX_API_TOKEN"$'\n' > ~/.transifexrc
- tx pull -a -f
- ../dev-tools/locale-scripts/fusiondirectory-update-locale-plugins
- tx push -f -s -t --skip --no-interactive
stage: tarballs
- tar -cvzf fusiondirectory-plugins.tar.gz *
- fusiondirectory-plugins.tar.gz
expire_in: 1h
stage: tarballs
- tags
- tar -cvzf fusiondirectory-plugins-$(grep '%' | head -n1 | cut -d ' ' -f3 | tr -d '"').tar.gz *
- fusiondirectory-plugins-$(grep '%' | head -n1 | cut -d ' ' -f3 | tr -d '"').tar.gz
......@@ -2,253 +2,252 @@
host =
type = PO
file_filter = alias/locale/<lang>/fusiondirectory.po
source_file = alias/locale/en/fusiondirectory.po
source_lang = en
file_filter = applications/locale/<lang>/fusiondirectory.po
source_file = applications/locale/en/fusiondirectory.po
source_lang = en
file_filter = argonaut/locale/<lang>/fusiondirectory.po
source_file = argonaut/locale/en/fusiondirectory.po
source_lang = en
file_filter = audit/locale/<lang>/fusiondirectory.po
source_file = audit/locale/en/fusiondirectory.po
source_lang = en
file_filter = autofs/locale/<lang>/fusiondirectory.po
source_file = autofs/locale/en/fusiondirectory.po
source_lang = en
file_filter = certificates/locale/<lang>/fusiondirectory.po
source_file = certificates/locale/en/fusiondirectory.po
source_lang = en
file_filter = community/locale/<lang>/fusiondirectory.po
source_file = community/locale/en/fusiondirectory.po
source_lang = en
file_filter = cyrus/locale/<lang>/fusiondirectory.po
source_file = cyrus/locale/en/fusiondirectory.po
source_lang = en
file_filter = debconf/locale/<lang>/fusiondirectory.po
source_file = debconf/locale/en/fusiondirectory.po
source_lang = en
file_filter = developers/locale/<lang>/fusiondirectory.po
source_file = developers/locale/en/fusiondirectory.po
source_lang = en
file_filter = dhcp/locale/<lang>/fusiondirectory.po
source_file = dhcp/locale/en/fusiondirectory.po
source_lang = en
file_filter = dns/locale/<lang>/fusiondirectory.po
source_file = dns/locale/en/fusiondirectory.po
source_lang = en
file_filter = dovecot/locale/<lang>/fusiondirectory.po
source_file = dovecot/locale/en/fusiondirectory.po
source_lang = en
file_filter = dsa/locale/<lang>/fusiondirectory.po
source_file = dsa/locale/en/fusiondirectory.po
source_lang = en
file_filter = ejbca/locale/<lang>/fusiondirectory.po
source_file = ejbca/locale/en/fusiondirectory.po
source_lang = en
file_filter = fai/locale/<lang>/fusiondirectory.po
source_file = fai/locale/en/fusiondirectory.po
source_lang = en
file_filter = freeradius/locale/<lang>/fusiondirectory.po
source_file = freeradius/locale/en/fusiondirectory.po
source_lang = en
file_filter = fusioninventory/locale/<lang>/fusiondirectory.po
source_file = fusioninventory/locale/en/fusiondirectory.po
source_lang = en
file_filter = gpg/locale/<lang>/fusiondirectory.po
source_file = gpg/locale/en/fusiondirectory.po
source_lang = en
file_filter = ipmi/locale/<lang>/fusiondirectory.po
source_file = ipmi/locale/en/fusiondirectory.po
source_lang = en
file_filter = ldapdump/locale/<lang>/fusiondirectory.po
source_file = ldapdump/locale/en/fusiondirectory.po
source_lang = en
file_filter = ldapmanager/locale/<lang>/fusiondirectory.po
source_file = ldapmanager/locale/en/fusiondirectory.po
source_lang = en
file_filter = mail/locale/<lang>/fusiondirectory.po
source_file = mail/locale/en/fusiondirectory.po
source_lang = en
file_filter = mixedgroups/locale/<lang>/fusiondirectory.po
source_file = mixedgroups/locale/en/fusiondirectory.po
source_lang = en
file_filter = nagios/locale/<lang>/fusiondirectory.po
source_file = nagios/locale/en/fusiondirectory.po
source_lang = en
file_filter = netgroups/locale/<lang>/fusiondirectory.po
source_file = netgroups/locale/en/fusiondirectory.po
source_lang = en
file_filter = newsletter/locale/<lang>/fusiondirectory.po
source_file = newsletter/locale/en/fusiondirectory.po
source_lang = en
file_filter = opsi/locale/<lang>/fusiondirectory.po
source_file = opsi/locale/en/fusiondirectory.po
source_lang = en
file_filter = personal/locale/<lang>/fusiondirectory.po
source_file = personal/locale/en/fusiondirectory.po
source_lang = en
file_filter = postfix/locale/<lang>/fusiondirectory.po
source_file = postfix/locale/en/fusiondirectory.po
source_lang = en
file_filter = posix/locale/<lang>/fusiondirectory.po
source_file = posix/locale/en/fusiondirectory.po
source_lang = en
file_filter = postfix/locale/<lang>/fusiondirectory.po
source_file = postfix/locale/en/fusiondirectory.po
source_lang = en
file_filter = ppolicy/locale/<lang>/fusiondirectory.po
source_file = ppolicy/locale/en/fusiondirectory.po
source_lang = en
file_filter = puppet/locale/<lang>/fusiondirectory.po
source_file = puppet/locale/en/fusiondirectory.po
source_lang = en
file_filter = pureftpd/locale/<lang>/fusiondirectory.po
source_file = pureftpd/locale/en/fusiondirectory.po
source_lang = en
file_filter = quota/locale/<lang>/fusiondirectory.po
source_file = quota/locale/en/fusiondirectory.po
source_lang = en
file_filter = repository/locale/<lang>/fusiondirectory.po
source_file = repository/locale/en/fusiondirectory.po
source_lang = en
file_filter = renater-partage/locale/<lang>/fusiondirectory.po
source_file = renater-partage/locale/en/fusiondirectory.po
source_lang = en
file_filter = repository/locale/<lang>/fusiondirectory.po
source_file = repository/locale/en/fusiondirectory.po
source_lang = en
file_filter = samba/locale/<lang>/fusiondirectory.po
source_file = samba/locale/en/fusiondirectory.po
source_lang = en
file_filter = sogo/locale/<lang>/fusiondirectory.po
source_file = sogo/locale/en/fusiondirectory.po
source_lang = en
file_filter = spamassassin/locale/<lang>/fusiondirectory.po
source_file = spamassassin/locale/en/fusiondirectory.po
source_lang = en
file_filter = squid/locale/<lang>/fusiondirectory.po
source_file = squid/locale/en/fusiondirectory.po
source_lang = en
file_filter = ssh/locale/<lang>/fusiondirectory.po
source_file = ssh/locale/en/fusiondirectory.po
source_lang = en
file_filter = subcontracting/locale/<lang>/fusiondirectory.po
source_file = subcontracting/locale/en/fusiondirectory.po
source_lang = en
file_filter = sudo/locale/<lang>/fusiondirectory.po
source_file = sudo/locale/en/fusiondirectory.po
source_lang = en
file_filter = supann/locale/<lang>/fusiondirectory.po
source_file = supann/locale/en/fusiondirectory.po
source_lang = en
file_filter = sympa/locale/<lang>/fusiondirectory.po
source_file = sympa/locale/en/fusiondirectory.po
source_lang = en
file_filter = systems/locale/<lang>/fusiondirectory.po
source_file = systems/locale/en/fusiondirectory.po
source_lang = en
file_filter = user-reminder/locale/<lang>/fusiondirectory.po
source_file = user-reminder/locale/en/fusiondirectory.po
source_lang = en
file_filter = weblink/locale/<lang>/fusiondirectory.po
source_file = weblink/locale/en/fusiondirectory.po
source_lang = en
file_filter = webservice/locale/<lang>/fusiondirectory.po
source_file = webservice/locale/en/fusiondirectory.po
source_lang = en
# Contributor Covenant Code of Conduct
## Our Pledge
In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, gender identity and expression, level of experience,
nationality, personal appearance, race, religion, or sexual identity and
## Our Standards
Examples of behavior that contributes to creating a positive environment
* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
Examples of unacceptable behavior by participants include:
* The use of sexualized language or imagery and unwelcome sexual attention or
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
## Our Responsibilities
Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.
Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.
## Scope
This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.
## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at <>. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.
Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.
## Attribution
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at [][version]
# 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)
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)
* [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
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]( Feel free to discuss with us.
2. Just be cool and respectful with others
3. create an FusionDirectory project account at [FusionDirectory Sign UP](
4. Use our `PHP CodeSniffer <>`_ rules to check code compliance [CodeSniffer](
5. Your code should be tested
6. Respect this simple commit message template
<emoji> <type>(<scope>): <subject>
The **header** is mandatory and the **scope** of the header is optional.
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]( via a pull request on the 1.x-dev branch.
Now, if you want to go further, sit comfortably at the fireplace, grab your glasses and immerse yourself in our documentation.
## Code Of Conduct
All projects and everyone participating in it is governed by [FusionDirectory Code Of Conduct](./ By participating, you are expected to uphold this code. Please read this before.
## I just have a question!
> **Note:** Please don't file an issue to ask a question. You'll get faster results by using the resource below.
We have an various channel of communications
* [#fusiondirectory, the irc channel of FusionDirectory on freenode](, channel #fusiondirectory
* [FusionDirectory Users mailing list](
* [FusionDirectory dev mailing list](
## 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:
### Register for a FusionDirectory project account
To create a FusionDirectory project Account you must go to
* [FusionDirectory Sign UP](
### Put FusionDirectory in debug mode
* Go into FusionDirectory configuration
* Activate the displaying of PHP errors, and the TRACE debug level
### Finding Wonderful Bugs
>This section guides you through submitting a bug report. Following these guidelines helps maintainers and the community understand your report, reproduce the behavior, and find related reports.
When you are creating a bug report, please include as many details as possible. Fill out the required template, the information it asks for helps us resolve issues faster. We have a [template]( to create issues. Please use this template.
Explain the problem and include additional details to help maintainers reproduce the problem:
* **Use a clear and descriptive title** for the issue to identify the problem.
* **Describe the exact steps which reproduce the problem** in as many details as possible. For example, start by explaining wich brower and it's version. When listing steps, don't just say what you did, but explain how you did it. For example, if you moved the cursor to the end of an input, explain if you used the mouse, or a keyboard.
* **Describe the behavior** you observed after following the steps and point out what exactly is the problem with that behavior.
* **Explain which behavior** you expected to see instead and why.
* **Include screenshots and animated GIFs** which show you following the described steps and clearly demonstrate the problem. You can use [this tool]( to record GIFs on macOS and Windows, and this tool or [this tool]( on Linux.
* **Include the PHP errors and trace** collected at the debug step above
* **If the problem is linked to a specific LDAP entry** attach its LDAP dump.
### Any Feedback To Enhance FusionDirectory
>This section guides you through submitting an enhancement suggestion, including completely new features and minor improvements to existing functionality. Following these guidelines helps maintainers and the community understand your suggestion and find related suggestions.
Fill in [the template](, including the steps that you imagine you would take if the feature you're requesting existed.
Enhancement suggestions are tracked on [FusionDirectory]( for the core program, and
[FusionDirectory Plugins]( for plugins.
After you've determined which repository your enhancement suggestion is related to, create an issue on that repository and provide the following information:
* **Use a clear and descriptive title** for the issue to identify the suggestion.
* **Provide a step-by-step description of the suggested enhancement** in as many details as possible.
* **Describe the current behavior** and **explain which behavior you expected to see instead** and why.
* **Include screenshots and animated GIFs** which help you demonstrate the steps which the suggestion is related to. You can use [this tool]( to record GIFs on macOS and Windows, and [this tool]( or [this tool]( on Linux.
* **Explain why this enhancement would be useful** to most FusionDirectory users.
### Your awesome And Mighty Codes Contributions
>This section guides you through submitting an enhancement suggestion, including completely new features and minor improvements to existing functionality. Following these guidelines helps maintainers and the community understand your suggestion and find related suggestions.
* Fill in [the required template](
* Include screenshots and animated GIFs in your pull request whenever possible.
* Follow the [Coding standards](
* Use our `PHP CodeSniffer <>`_ rules to check code compliance [CodeSniffer](
* End all files with a newline
## Coding with style
### Git Commit Messages
>Having a good guideline for creating commits and sticking to it makes working with Git and collaborating with others a lot easier.
Here are some rules of thumb :
* Use the present tense ("Add feature" not "Added feature")
* If you have a body, separate the subject from the body with a newline
* Limit the subject line to 72 characters
* Do not end the subject line with a period
* Use imperative [mood]( in the subject line
* If the subject is not clear enough, use the body to explain what and why as opposed to how
* Consider starting the commit message with an applicable emoji, when you feel it's an important commit :
* :tada: When first / initial commit
* :sparkles: When introducing new features
* :ambulance: When fixing a bug
* :handshake: When merging files
* :tractor: When you changing file structure or refactoring
* :books: When writing docs
* :gem: When new Release
* :lipstick: For cosmetics purposes
#### Commit Message Format
Each commit message consists of a **header**, a **body** and a **footer**. The header has a special format that includes a **type**, a **scope** and a **subject**:
<emoji> <type>(<scope>): <subject>
The **header** is mandatory and the **scope** of the header is optional.
:sparkles: feat(supann): Make supannRefId multivaluated
supannRefId on Structure object is too small and mono valued
close #5685
### PHP style Guide
To be sure to respect our guidelines, read [Coding standards](