Changeset 4041
- Timestamp:
- 07/20/08 01:08:46 (3 months ago)
- Files:
-
- phpbbauthplugin/0.11/phpbbauth/main.py (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
phpbbauthplugin/0.11/phpbbauth/main.py
r3560 r4041 47 47 'against') 48 48 49 table_prefix = Option('account-manager', 'phpbb_table_prefix', 'phpbb_', 50 'Prefix for phpBB table names. This should be ' 51 'everything before "user" including an underscore ' 52 'if present.') 53 49 54 def config_key(self): 50 55 """ Deprecated """ … … 55 60 cur = cnx.cursor() 56 61 cur.execute('SELECT username, user_email, user_lastvisit' 57 ' FROM phpbb_users '58 ' WHERE user_type <> 2' )62 ' FROM %susers ' 63 ' WHERE user_type <> 2' % self.table_prefix) 59 64 userinfo = [u for u in cur] 60 65 cnx.close() … … 67 72 cnx = PhpDatabaseManager(self.env).get_connection() 68 73 cur = cnx.cursor() 69 cur.execute('SELECT username FROM phpbb_users WHERE user_type <> 2'70 ' AND username = % s', (user,))74 cur.execute('SELECT username FROM %susers WHERE user_type <> 2' 75 ' AND username = %%s' % self.table_prefix, (user,)) 71 76 result = [u for u in cur] 72 77 cnx.close() … … 102 107 cur = cnx.cursor() 103 108 cur.execute('SELECT user_password' 104 ' FROM phpbb_users'109 ' FROM %susers' 105 110 ' WHERE user_type <> 2' 106 ' AND username = % s', (user,))111 ' AND username = %%s' % self.table_prefix, (user,)) 107 112 result = cur.fetchone() 108 113 pwhash = result and result[0] or None … … 115 120 cur = cnx.cursor() 116 121 cur.execute('SELECT username, user_email, user_lastvisit' 117 ' FROM phpbb_users '118 ' WHERE username = % s', (user,))122 ' FROM %susers ' 123 ' WHERE username = %%s' % self.table_prefix, (user,)) 119 124 userinfo = [u for u in cur] 120 125 cnx.close()
