working on ldap check

seafile-ldap.py

@@ -213,24 +213,17 @@ for ldapUser in ldapUsers:
     else:
         logger.error("There was an error setting user {0} name to {1}".format(ldapUser.mail, ldapUser.displayName))
 
-cnx = mysql.connector.connect(**dbconfig)
-cursor = cnx.cursor()
-# Starting query for sql ldap users
-logger.debug("Starting SQL query for LDAPUsers")
-query = ("SELECT * FROM LDAPUsers")
-logger.debug("Query: {0}".format(query))
-cursor.execute(query)
-sqlLDAPusers = cursor.fetchall()
-logger.debug("Found {0} SQL LDAP users".format(cursor.rowcount))
-for user in sqlLDAPusers:
-    logger.debug("User: {0} - Active: {1}".format(user[1], bool(user[4])))
-logger.debug("Finished SQL query for LDAPUsers")
-cnx.close()
-
 # Loop through the sql ldap users and disable those not in the ldap list
 for sqlLDAPuser in sqlLDAPusers:
-    if [item for item in ldapUsers if sqlLDAPuser[1] in item]:
-        logger.debug("Found {0} in sql table".format(sqlLDAPuser[1]))
+    logger.debug("Searching for user {0} that has an email address, are enabled, and in the {} group.".format(sqlLDAPuser[1], ldapFilter))
+    ldap.search(ldapBase, '(&(mail={0})(!(userAccountControl:1.2.840.113556.1.4.803:=2))({1}))'.format(sqlLDAPuser[1], ldapFilter), attributes=['*'])
+    logger.debug("Found {0} LDAP users.".format(len(ldap.entries)))
+    ldapUsers = ldap.entries
+    for user in ldapUsers:
+        logger.debug("User: {0} - Email: {1} - UserDN: {2}".format(user.name, user.mail, user.distinguishedName))
+            
+    #if [item for item in ldapUsers if sqlLDAPuser[1] in item]:
+        #logger.debug("Found {0} in sql table".format(sqlLDAPuser[1]))
 
 #seafileUsers = request('admin/search-user/?query=@johnhgaunt.com', seafileURL, seafileToken)['response']['user_list']
 #for user in seafileUsers: