diff --git a/lam/lib/types/user.inc b/lam/lib/types/user.inc index 9d09f9b8..34f7b023 100644 --- a/lam/lib/types/user.inc +++ b/lam/lib/types/user.inc @@ -3,7 +3,7 @@ $Id$ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2005 - 2015 Roland Gruber + Copyright (C) 2005 - 2016 Roland Gruber This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -808,6 +808,7 @@ class lamUserList extends lamList { $attrs[] = 'sambaAcctFlags'; $attrs[] = 'userPassword'; $attrs[] = 'userAccountControl'; + $attrs[] = 'nsAccountLock'; $attrs[] = 'objectClass'; } return $attrs; @@ -866,15 +867,13 @@ class lamUserList extends lamList { $sambaAvailable = self::isSambaAvailable($attrs); $ppolicyAvailable = self::isPPolicyAvailable($attrs); $windowsAvailable = self::isWindowsAvailable($attrs); - if (!$unixAvailable && !$sambaAvailable && !$ppolicyAvailable && !$windowsAvailable) { - return; - } $unixLocked = self::isUnixLocked($attrs); $sambaLocked = self::isSambaLocked($attrs); $ppolicyLocked = self::isPPolicyLocked($attrs); $windowsLocked = self::isWindowsLocked($attrs); - $partiallyLocked = $unixLocked || $sambaLocked || $ppolicyLocked || $windowsLocked; - $fullyLocked = ($unixAvailable || $sambaAvailable || $ppolicyAvailable || $windowsAvailable) + $is389dsDeactivated = self::is389dsDeactivated($attrs); + $partiallyLocked = $unixLocked || $sambaLocked || $ppolicyLocked || $windowsLocked || $is389dsDeactivated; + $fullyLocked = ($unixAvailable || $sambaAvailable || $ppolicyAvailable || $windowsAvailable || $is389dsDeactivated) && (!$unixAvailable || $unixLocked) && (!$sambaAvailable || $sambaLocked) && (!$ppolicyAvailable || $ppolicyLocked) @@ -887,7 +886,7 @@ class lamUserList extends lamList { $icon = 'partiallyLocked.png'; } // print icon and detail tooltips - if ($unixAvailable || $sambaAvailable || $ppolicyAvailable || $windowsAvailable) { + if ($unixAvailable || $sambaAvailable || $ppolicyAvailable || $windowsAvailable || $is389dsDeactivated) { $tipContent = '
' . _('Windows') . ' | |
' . _('Deactivated') . ' |