Added in clearing of user permissions on assigning groups

This commit is contained in:
Joeeigel 2016-01-08 01:20:15 +00:00
parent 0ea7afd646
commit 25eed75717

View File

@ -39,6 +39,8 @@ class Phpbb3Manager:
SQL_ADD_USER_AVATAR = r"UPDATE phpbb_users SET user_avatar_type=2, user_avatar_width=64, user_avatar_height=64, user_avatar=%s WHERE user_id = %s" SQL_ADD_USER_AVATAR = r"UPDATE phpbb_users SET user_avatar_type=2, user_avatar_width=64, user_avatar_height=64, user_avatar=%s WHERE user_id = %s"
SQL_CLEAR_USER_PERMISSIONS = r"UPDATE php_users SET user_permissions = '' WHERE User_Id = %s"
def __init__(self): def __init__(self):
pass pass
@ -127,6 +129,7 @@ class Phpbb3Manager:
try: try:
cursor = connections['phpbb3'].cursor() cursor = connections['phpbb3'].cursor()
cursor.execute(Phpbb3Manager.SQL_ADD_USER_GROUP, [groupid, userid, 0]) cursor.execute(Phpbb3Manager.SQL_ADD_USER_GROUP, [groupid, userid, 0])
cursor.execute(Phpbb3Manager.SQL_CLEAR_USER_PERMISSIONS, [userid])
logger.info("Added phpbb user id %s to group id %s" % (userid, groupid)) logger.info("Added phpbb user id %s to group id %s" % (userid, groupid))
except: except:
logger.exception("Unable to add phpbb user id %s to group id %s" % (userid, groupid), exc_info=True) logger.exception("Unable to add phpbb user id %s to group id %s" % (userid, groupid), exc_info=True)
@ -135,9 +138,10 @@ class Phpbb3Manager:
@staticmethod @staticmethod
def __remove_user_from_group(userid, groupid): def __remove_user_from_group(userid, groupid):
logger.debug("Removing phpbb3 user id %s from group id %s" % (userid, groupid)) logger.debug("Removing phpbb3 user id %s from group id %s" % (userid, groupid))
cursor = connections['phpbb3'].cursor()
try: try:
cursor = connections['phpbb3'].cursor()
cursor.execute(Phpbb3Manager.SQL_REMOVE_USER_GROUP, [userid, groupid]) cursor.execute(Phpbb3Manager.SQL_REMOVE_USER_GROUP, [userid, groupid])
cursor.execute(Phpbb3Manager.SQL_CLEAR_USER_PERMISSIONS, [userid])
logger.info("Removed phpbb user id %s from group id %s" % (userid, groupid)) logger.info("Removed phpbb user id %s from group id %s" % (userid, groupid))
except: except:
logger.exception("Unable to remove phpbb user id %s from group id %s" % (userid, groupid), exc_info=True) logger.exception("Unable to remove phpbb user id %s from group id %s" % (userid, groupid), exc_info=True)