X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=UDLdap.py;h=9e2d2ee7e3b24408f10a588c77464860fddf03f5;hb=d4a11fa21251926c13b92a9859907b18d0e09d1c;hp=447368df5a0912172cf23e39ba72694dac38f408;hpb=d2d6818e697a6e286375e6f2279abaab6dff555a;p=mirror%2Fuserdir-ldap.git

diff --git a/UDLdap.py b/UDLdap.py
index 447368d..9e2d2ee 100644
--- a/UDLdap.py
+++ b/UDLdap.py
@@ -1,5 +1,6 @@
 import ldap
 import time
+import userdir_ldap
 
 class Account:
     array_values = ['keyFingerPrint']
@@ -30,7 +31,10 @@ class Account:
             if key in self.array_values:
                 return self.attributes[key]
             elif key in self.int_values:
-                return int(self.attributes[key][0])
+                if len(self.attributes[key]) == 1:
+                    return int(self.attributes[key][0])
+                else:
+                    raise ValueError, 'non-array value has not exactly one value'
             else:
                 return self.attributes[key][0]
         elif key in self.defaults:
@@ -50,6 +54,8 @@ class Account:
     def pw_active(self):
         if self['userPassword'] == '{crypt}*LK*':
             return False
+        if self['userPassword'].startswith("!"):
+            return False
         return True
 
     # not expired
@@ -62,6 +68,14 @@ class Account:
     def numkeys(self):
         return len(self['keyFingerPrint'])
 
+    def is_active_user(self):
+        return self['accountStatus'] == 'active' and self.numkeys() != 0
+
+    def latitude_dec(self, anonymized=False):
+        return userdir_ldap.DecDegree(self['latitude'], anonymized)
+    def longitude_dec(self, anonymized=False):
+        return userdir_ldap.DecDegree(self['longitude'], anonymized)
+
     def verbose_status(self):
         status = []
         status.append('mail: %s'  %(['disabled', 'active'][ self.has_mail() ]))