backend: fixed

japsu · japsu · commit a0afda684052 · 2010-03-31T01:01:50.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 *~
 *.pyc
+examples/hammertime/settings.py
diff --git a/phpbb/auth/backends.py b/phpbb/auth/backends.py
@@ -18,10 +18,23 @@
 #
 
 from django.contrib.auth.models import User
+from django.conf import settings
 
 from phpbb.auth.auth_db import login_db
+from phpbb.auth.sql import setup, is_setup
+
+def connect_to_database():
+    if is_setup():
+        return
+
+    db_module = __import__(settings.PHPBB_AUTH_DB_MODULE, globals(), locals(), [], -1)
+    conn = db_module.connect(**settings.PHPBB_AUTH_DB_PARAMS)
+    setup(conn)
+
+class PhpbbBackend(object):
+    def __init__(self):
+        connect_to_database()
 
-class PhpbbBackend:
     def authenticate(self, username=None, password=None):
         if username is None or password is None:
             return None
@@ -31,9 +44,14 @@ def authenticate(self, username=None, password=None):
             return None
 
         user, created = User.objects.get_or_create(
-            username=user_row["username_clean"],
+            username=user_row["username"],
             email=user_row.get("user_email", None)
         )
 
         return user
 
+    def get_user(self, user_id):
+        try:
+            return User.objects.get(pk=user_id)
+        except User.DoesDotExist:
+            return None
diff --git a/phpbb/auth/sql.py b/phpbb/auth/sql.py
@@ -38,13 +38,19 @@
 
 class GetUserRow(object):
     def __init__(self, *args, **kwargs):
+        self.conn = None
+        self.sql = None
+
         if args or kwargs:
             self.setup(*args, **kwargs)
 
     def setup(self, conn, param_style=DEFAULT_PARAM_STYLE, users_table=DEFAULT_USERS_TABLE):
         self.conn = conn
         self.sql = GET_USER_ROW_SQL.format(", ".join(USER_ROW_FIELDS), users_table, param_style)
 
+    def is_setup(self):
+        return self.conn is not None
+
     def __call__(self, username_clean):
         c = self.conn.cursor()
         c.execute(self.sql, [username_clean,])
@@ -53,3 +59,4 @@ def __call__(self, username_clean):
 
 get_user_row = GetUserRow()
 setup = get_user_row.setup
+is_setup = get_user_row.is_setup

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`*~`
`2`	`2`	`*.pyc`
	`3`	`+examples/hammertime/settings.py`