1 files changed, 27 insertions, 29 deletions
diff --git a/module/database/UserDatabase.py b/module/database/UserDatabase.py
index 43fd93df3..6bfb02bbd 100644
--- a/module/database/UserDatabase.py
+++ b/module/database/UserDatabase.py
@@ -19,14 +19,13 @@
 from hashlib import sha1
 import random
 
-from DatabaseBackend import DatabaseBackend, queue, async
+from DatabaseBackend import DatabaseMethods, queue, async
 
-class UserMethods():
+class UserMethods(DatabaseMethods):
     @queue
-    def checkAuth(db, user, password):
-        c = db.c
-        c.execute('SELECT rowid, name, password, role, permission, template, email FROM "users" WHERE name=?', (user, ))
-        r = c.fetchone()
+    def checkAuth(self, user, password):
+        self.c.execute('SELECT rowid, name, password, role, permission, template, email FROM "users" WHERE name=?', (user, ))
+        r = self.c.fetchone()
         if not r:
             return {}
 
@@ -40,23 +39,22 @@ class UserMethods():
             return {}
 
     @queue
-    def addUser(db, user, password):
+    def addUser(self, user, password):
         salt = reduce(lambda x, y: x + y, [str(random.randint(0, 9)) for i in range(0, 5)])
         h = sha1(salt + password)
         password = salt + h.hexdigest()
 
-        c = db.c
-        c.execute('SELECT name FROM users WHERE name=?', (user, ))
-        if c.fetchone() is not None:
-            c.execute('UPDATE users SET password=? WHERE name=?', (password, user))
+        self.c.execute('SELECT name FROM users WHERE name=?', (user, ))
+        if self.c.fetchone() is not None:
+            self.c.execute('UPDATE users SET password=? WHERE name=?', (password, user))
         else:
-            c.execute('INSERT INTO users (name, password) VALUES (?, ?)', (user, password))
+            self.c.execute('INSERT INTO users (name, password) VALUES (?, ?)', (user, password))
 
 
     @queue
-    def changePassword(db, user, oldpw, newpw):
-        db.c.execute('SELECT rowid, name, password FROM users WHERE name=?', (user, ))
-        r = db.c.fetchone()
+    def changePassword(self, user, oldpw, newpw):
+        self.c.execute('SELECT rowid, name, password FROM users WHERE name=?', (user, ))
+        r = self.c.fetchone()
         if not r:
             return False
 
@@ -68,40 +66,40 @@ class UserMethods():
             h = sha1(salt + newpw)
             password = salt + h.hexdigest()
 
-            db.c.execute("UPDATE users SET password=? WHERE name=?", (password, user))
+            self.c.execute("UPDATE users SET password=? WHERE name=?", (password, user))
             return True
 
         return False
 
 
     @async
-    def setPermission(db, user, perms):
-        db.c.execute("UPDATE users SET permission=? WHERE name=?", (perms, user))
+    def setPermission(self, user, perms):
+        self.c.execute("UPDATE users SET permission=? WHERE name=?", (perms, user))
 
     @async
-    def setRole(db, user, role):
-        db.c.execute("UPDATE users SET role=? WHERE name=?", (role, user))
+    def setRole(self, user, role):
+        self.c.execute("UPDATE users SET role=? WHERE name=?", (role, user))
 
 
     @queue
-    def listUsers(db):
-        db.c.execute('SELECT name FROM users')
+    def listUsers(self):
+        self.c.execute('SELECT name FROM users')
         users = []
-        for row in db.c:
+        for row in self.c:
             users.append(row[0])
         return users
 
     @queue
-    def getAllUserData(db):
-        db.c.execute("SELECT name, permission, role, template, email FROM users")
+    def getAllUserData(self):
+        self.c.execute("SELECT name, permission, role, template, email FROM users")
         user = {}
-        for r in db.c:
+        for r in self.c:
             user[r[0]] = {"permission": r[1], "role": r[2], "template": r[3], "email": r[4]}
 
         return user
 
     @queue
-    def removeUser(db, user):
-        db.c.execute('DELETE FROM users WHERE name=?', (user, ))
+    def removeUser(self, user):
+        self.c.execute('DELETE FROM users WHERE name=?', (user, ))
 
-DatabaseBackend.registerSub(UserMethods)
+UserMethods.register()