sql: now works

japsu · japsu · commit 758437caefac · 2010-03-30T23:59:11.000+03:00
diff --git a/phpbb/auth/__init__.py b/phpbb/auth/__init__.py
diff --git a/phpbb/auth/auth_db.py b/phpbb/auth/auth_db.py
@@ -23,6 +23,7 @@
 from phpbb.auth.sql import get_user_row
 from phpbb.utf.utf_tools import utf8_clean_string
 from phpbb.functions import phpbb_check_hash
+from phpbb.constants import USER_INACTIVE, USER_IGNORE
 
 def login_db(username=None, password=None):
     if not username:
diff --git a/phpbb/auth/sql.py b/phpbb/auth/sql.py
@@ -0,0 +1,55 @@
+# encoding: utf-8
+# vim: shiftwidth=4 expandtab
+#
+# phpbb-python © Copyright 2010 Santtu Pajukanta
+# http://pajukanta.fi
+# 
+# phpBB3 © Copyright 2000, 2002, 2005, 2007 phpBB Group
+# http://www.phpbb.com
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://opensource.org/licenses/gpl-license.php>.
+#
+
+DEFAULT_PARAM_STYLE = '%s'
+DEFAULT_USERS_TABLE = 'phpbb_users'
+
+USER_ROW_FIELDS = [
+    'user_id',
+    'username',
+    'user_password',
+    'user_passchg',
+    'user_pass_convert',
+    'user_email',
+    'user_type',
+    'user_login_attempts'
+]
+
+GET_USER_ROW_SQL = 'SELECT {0} FROM {1} WHERE username_clean = {2}'
+
+class GetUserRow(object):
+    def __init__(self, *args, **kwargs):
+        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 __call__(self, username_clean):
+        c = self.conn.cursor()
+        c.execute(self.sql, [username_clean,])
+
+        return dict(zip(USER_ROW_FIELDS, c.fetchone()))
+
+get_user_row = GetUserRow()
+setup = get_user_row.setup
diff --git a/phpbb/constants.py b/phpbb/constants.py
@@ -0,0 +1,24 @@
+# encoding: utf-8
+# vim: shiftwidth=4 expandtab
+#
+# phpbb-python © Copyright 2010 Santtu Pajukanta
+# http://pajukanta.fi
+#
+# phpBB3 © Copyright 2000, 2002, 2005, 2007 phpBB Group
+# http://www.phpbb.com
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://opensource.org/licenses/gpl-license.php>.
+#
+
+USER_INACTIVE = 1
+USER_IGNORE = 2
