Merge branch 'master' into debian

This commit is contained in:
Victor LABORIE 2019-10-10 15:16:32 +02:00
commit 12bfea97b0
2 changed files with 7 additions and 5 deletions

View File

@ -3,7 +3,7 @@ name: default
steps:
- name: build debian package
image: vlaborie/gbp:latest
image: evolix/gbp:latest
branches:
- debian
commands:

View File

@ -28,11 +28,13 @@ class LdapAlias extends LdapDomain {
}
public function update($active=false,$mailaccept=array(),$maildrop=array()) {
$info["isActive"] = ($active) ? 'TRUE' : 'FALSE';
$info["mailacceptinggeneralid"] = $mailaccept;
$info["maildrop"] = array_filter($maildrop, function($value) {
$info["isactive"] = ($active) ? 'TRUE' : 'FALSE';
$info["mailacceptinggeneralid"] = array_values(array_filter($mailaccept, function($value) {
return filter_var($value, FILTER_VALIDATE_EMAIL);
});
}));
$info["maildrop"] = array_values(array_filter($maildrop, function($value) {
return filter_var($value, FILTER_VALIDATE_EMAIL);
}));
if (!@ldap_mod_replace($this->conn, self::getBaseDN($this), $info)) {
$error = ldap_error($this->conn);