refactor isPasswordExpired, getPasswordExpirationDate and isAccountValid (#214)

Author: David Coutadeur

htdocs/api/search-api.php

@@ -161,11 +161,11 @@
         foreach($entries as $entry_key => $entry) {
 
             # Get password policy configuration
-            $pwdPolicyConfiguration = $directory->getPwdPolicyConfiguration($ldap, $entry["dn"], $ldap_default_ppolicy);
+            $pwdPolicyConfiguration = $userPolicies[$entry['dn']];
             if (isset($ldap_lockout_duration) and $ldap_lockout_duration) { $pwdPolicyConfiguration['lockout_duration'] = $ldap_lockout_duration; }
             if (isset($ldap_password_max_age) and $ldap_password_max_age) { $pwdPolicyConfiguration['password_max_age'] = $ldap_password_max_age; }
 
-            $isExpired = $directory->isPasswordExpired($ldap, $entry["dn"], $pwdPolicyConfiguration);
+            $isExpired = $directory->isPasswordExpired($entry, $pwdPolicyConfiguration);
 
             if ( $isExpired === false ) {
                 unset($entries[$entry_key]);
@@ -197,12 +197,12 @@
         foreach($entries as $entry_key => $entry) {
 
             # Get password policy configuration
-            $pwdPolicyConfiguration = $directory->getPwdPolicyConfiguration($ldap, $entry["dn"], $ldap_default_ppolicy);
+            $pwdPolicyConfiguration = $userPolicies[$entry['dn']];
             if (isset($ldap_lockout_duration) and $ldap_lockout_duration) { $pwdPolicyConfiguration['lockout_duration'] = $ldap_lockout_duration; }
             if (isset($ldap_password_max_age) and $ldap_password_max_age) { $pwdPolicyConfiguration['password_max_age'] = $ldap_password_max_age; }
 
             $isWillExpire = false;
-            $expirationDate = $directory->getPasswordExpirationDate($ldap, $entry["dn"], $pwdPolicyConfiguration);
+            $expirationDate = $directory->getPasswordExpirationDate($entry, $pwdPolicyConfiguration);
 
             if ($expirationDate) {
                 $expirationDateClone = clone $expirationDate;

htdocs/display.php

@@ -198,8 +198,8 @@
         $isLocked = $directory->isLocked($entry, $pwdPolicyConfiguration);
         $canLockAccount = $pwdPolicyConfiguration["lockout_enabled"];
 
-        $expirationDate = $directory->getPasswordExpirationDate($ldap, $dn, $pwdPolicyConfiguration);
-        $isExpired = $directory->isPasswordExpired($ldap, $dn, $pwdPolicyConfiguration);
+        $expirationDate = $directory->getPasswordExpirationDate($entry, $pwdPolicyConfiguration);
+        $isExpired = $directory->isPasswordExpired($entry, $pwdPolicyConfiguration);
 
         $resetAtNextConnection = $directory->resetAtNextConnection($ldap, $dn);
 
@@ -208,9 +208,9 @@
         }
 
         if ($show_validitystatus) {
-            $isAccountValid = $directory->isAccountValid($ldap, $dn);
-            $startDate = $directory->getStartDate($ldap, $dn);
-            $endDate = $directory->getEndDate($ldap, $dn);
+            $isAccountValid = $directory->isAccountValid($entry, $pwdPolicyConfiguration);
+            $startDate = $directory->getStartDate($entry, $pwdPolicyConfiguration);
+            $endDate = $directory->getEndDate($entry, $pwdPolicyConfiguration);
         }
 
     }}}