From ca7aaf9c05d4d4d3166aecbd55b1e3e4c4882cdb Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Sun, 4 Apr 2010 00:30:30 +0100 Subject: [PATCH] Now passes email to mediawiki db, also lets options stay as none. --- sso/services/wiki/__init__.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sso/services/wiki/__init__.py b/sso/services/wiki/__init__.py index e65ce7a..8f58cb2 100644 --- a/sso/services/wiki/__init__.py +++ b/sso/services/wiki/__init__.py @@ -14,8 +14,7 @@ class MediawikiService(BaseService): 'require_password': False, 'provide_login': False } - - SQL_ADD_USER = r"INSERT INTO user (user_name, user_password, user_newpassword, user_options, user_email) VALUES (%s, %s, '', '', '')" + SQL_ADD_USER = r"INSERT INTO user (user_name, user_password, user_newpassword, user_email) VALUES (%s, %s, '', %s)" SQL_DIS_USER = r"UPDATE user SET user_password = '', user_email = '' WHERE user_name = %s" SQL_ENABLE_USER = r"UPDATE user SET user_password = %s WHERE user_name = %s" SQL_CHECK_USER = r"SELECT user_name from user WHERE user_name = %s" @@ -57,8 +56,12 @@ class MediawikiService(BaseService): def add_user(self, username, password, **kwargs): """ Add a user """ + if 'user' in kwargs: + email = kwargs['user'].email + else: + email = '' pwhash = self._gen_mw_hash(password) - self._dbcursor.execute(self.SQL_ADD_USER, [self._clean_username(username), pwhash]) + self._dbcursor.execute(self.SQL_ADD_USER, [self._clean_username(username), pwhash, email]) self._db.connection.commit() return self._clean_username(username)