Merge branch 'master' into debian
This commit is contained in:
commit
12bfea97b0
|
@ -3,7 +3,7 @@ name: default
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: build debian package
|
- name: build debian package
|
||||||
image: vlaborie/gbp:latest
|
image: evolix/gbp:latest
|
||||||
branches:
|
branches:
|
||||||
- debian
|
- debian
|
||||||
commands:
|
commands:
|
||||||
|
|
|
@ -28,11 +28,13 @@ class LdapAlias extends LdapDomain {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function update($active=false,$mailaccept=array(),$maildrop=array()) {
|
public function update($active=false,$mailaccept=array(),$maildrop=array()) {
|
||||||
$info["isActive"] = ($active) ? 'TRUE' : 'FALSE';
|
$info["isactive"] = ($active) ? 'TRUE' : 'FALSE';
|
||||||
$info["mailacceptinggeneralid"] = $mailaccept;
|
$info["mailacceptinggeneralid"] = array_values(array_filter($mailaccept, function($value) {
|
||||||
$info["maildrop"] = array_filter($maildrop, function($value) {
|
|
||||||
return filter_var($value, FILTER_VALIDATE_EMAIL);
|
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)) {
|
if (!@ldap_mod_replace($this->conn, self::getBaseDN($this), $info)) {
|
||||||
$error = ldap_error($this->conn);
|
$error = ldap_error($this->conn);
|
||||||
|
|
Loading…
Reference in a new issue