Merge branch 'adexpirywarn'

* adexpirywarn:
  make sure AD pass expiry message is never shown twice
  do not hardcode profile link in AD pass expire message
  translatable AD expiry warning and link to update profile page
  Don't return any data for non-existant users
  do not query AD for empty user name
  always check expire time when configured
  Check password expiry times in Active Directory backend

1 files changed, 20 insertions, 0 deletions

diff --git a/inc/adLDAP.php b/inc/adLDAP.php
index a64096b85..24be6e475 100644
--- a/inc/adLDAP.php
+++ b/inc/adLDAP.php
@@ -1021,6 +1021,26 @@ class adLDAP {
     }
 
     /**
+     * Return info about the domain itself
+     *
+     * @authot Andreas Gohr <gohr@cosmocode.de>
+     * @param array $fields The fields to query
+     * @return array
+     */
+    public function domain_info($fields){
+        if (!$this->_bind){ return (false); }
+
+        $sr = ldap_read($this->_conn, $this->_base_dn, 'objectclass=*', $fields);
+        if (!$sr) {
+            return false;
+        }
+        $info = ldap_get_entries($this->_conn, $sr);
+        if(count($info)) return $info[0];
+
+        return false;
+    }
+
+    /**
     * Determine a user's password expiry date
     *
     * @param string $username The username to query