ActiveDirectory: additional allow accountExpires=0 for never expires

(beside attribute is not set or has value 9223372036854775807)
This commit is contained in:
Ralf Becker 2018-03-09 19:50:27 +01:00
parent 81a79f0da8
commit e578e64926

View File

@ -494,7 +494,8 @@ class Ads
'account_fullname' => $data['displayname'][0],
'account_phone' => $data['telephonenumber'][0],
'account_status' => $data['useraccountcontrol'][0] & 2 ? false : 'A',
'account_expires' => !isset($data['accountexpires']) || $data['accountexpires'][0] == self::EXPIRES_NEVER ? -1 :
'account_expires' => !isset($data['accountexpires']) || !$data['accountexpires'][0] ||
$data['accountexpires'][0] == self::EXPIRES_NEVER ? -1 :
$this->adldap->utilities()->convertWindowsTimeToUnixTime($data['accountexpires'][0]),
'account_lastpwd_change' => !isset($data['pwdlastset']) ? null : (!$data['pwdlastset'][0] ? 0 :
$this->adldap->utilities()->convertWindowsTimeToUnixTime($data['pwdlastset'][0])),