From 0a24f3bad435ad7a8322ee17ca2ada1adac2053e Mon Sep 17 00:00:00 2001 From: Adarnof Date: Sun, 15 Nov 2015 20:12:26 +0000 Subject: [PATCH 1/6] Enabled forum avatar images in phpbb set by main character id --- services/managers/phpbb3_manager.py | 17 ++++++++++++++--- services/views.py | 4 ++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/services/managers/phpbb3_manager.py b/services/managers/phpbb3_manager.py index ce9dc62f..7d6177c0 100755 --- a/services/managers/phpbb3_manager.py +++ b/services/managers/phpbb3_manager.py @@ -32,9 +32,18 @@ class Phpbb3Manager: SQL_GET_USER_GROUPS = r"SELECT phpbb_groups.group_name FROM phpbb_groups , phpbb_user_group WHERE " \ r"phpbb_user_group.group_id = phpbb_groups.group_id AND user_id=%s" + SQL_ADD_USER_AVATAR = r"UPDATE phpbb_users SET (user_avatar_type, user_avatar_width, user_avatar_height, user_avatar) = (2,128,128,%s) WHERE user_id = %s" + def __init__(self): pass + @staticmethod + def __add_avatar(username, characterid): + avatar_url = "http://image.eveonline.com/Character/" + characterid + "_64.jpg" + cursor = connections['phpbb3'].cursor() + userid = Phpbb3Manager__get_user_id(username) + cursor.execute(Phpbb3Manager.SQL_ADD_USER_AVATAR, [avatar_url, userid]) + @staticmethod def __generate_random_pass(): return os.urandom(8).encode('hex') @@ -113,7 +122,7 @@ class Phpbb3Manager: pass @staticmethod - def add_user(username, email, groups): + def add_user(username, email, groups, characterid): cursor = connections['phpbb3'].cursor() username_clean = Phpbb3Manager.__santatize_username(username) @@ -130,6 +139,7 @@ class Phpbb3Manager: email, 2, Phpbb3Manager.__get_current_utc_date(), "", ""]) Phpbb3Manager.update_groups(username_clean, groups) + Phpbb3Manager.__add_avatar(username_clean, characterid) except: pass @@ -203,12 +213,13 @@ class Phpbb3Manager: return False @staticmethod - def update_user_password(username): + def update_user_password(username, characterid): cursor = connections['phpbb3'].cursor() password = Phpbb3Manager.__generate_random_pass() if Phpbb3Manager.check_user(username): pwhash = Phpbb3Manager.__gen_hash(password) cursor.execute(Phpbb3Manager.SQL_UPDATE_USER_PASSWORD, [pwhash, username]) + Phpbb3Manager.__add_avater(username, characterid) return password return "" @@ -219,4 +230,4 @@ class Phpbb3Manager: try: cursor.execute(Phpbb3Manager.SQL_DIS_USER, [email, password, username]) except: - pass \ No newline at end of file + pass diff --git a/services/views.py b/services/views.py index 7b09d8c6..869e48c7 100755 --- a/services/views.py +++ b/services/views.py @@ -100,7 +100,7 @@ def activate_forum(request): authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) # Valid now we get the main characters character = EveManager.get_character_by_id(authinfo.main_char_id) - result = Phpbb3Manager.add_user(character.character_name, request.user.email, ['REGISTERED']) + result = Phpbb3Manager.add_user(character.character_name, request.user.email, ['REGISTERED'], authinfo.main_char_id) # if empty we failed if result[0] != "": AuthServicesInfoManager.update_user_forum_info(result[0], result[1], request.user) @@ -126,7 +126,7 @@ def deactivate_forum(request): @user_passes_test(service_blue_alliance_test) def reset_forum_password(request): authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) - result = Phpbb3Manager.update_user_password(authinfo.forum_username) + result = Phpbb3Manager.update_user_password(authinfo.forum_username, authonfo.main_char_id) # false we failed if result != "": AuthServicesInfoManager.update_user_forum_info(authinfo.forum_username, result, request.user) From df487aa61ed7dd2890a196ce1ba1561cc401267f Mon Sep 17 00:00:00 2001 From: Adarnof Date: Sun, 15 Nov 2015 20:15:20 +0000 Subject: [PATCH 2/6] Corrected mismatched avatar sizes --- services/managers/phpbb3_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/managers/phpbb3_manager.py b/services/managers/phpbb3_manager.py index 7d6177c0..a0f55d2d 100755 --- a/services/managers/phpbb3_manager.py +++ b/services/managers/phpbb3_manager.py @@ -32,7 +32,7 @@ class Phpbb3Manager: SQL_GET_USER_GROUPS = r"SELECT phpbb_groups.group_name FROM phpbb_groups , phpbb_user_group WHERE " \ r"phpbb_user_group.group_id = phpbb_groups.group_id AND user_id=%s" - SQL_ADD_USER_AVATAR = r"UPDATE phpbb_users SET (user_avatar_type, user_avatar_width, user_avatar_height, user_avatar) = (2,128,128,%s) WHERE user_id = %s" + SQL_ADD_USER_AVATAR = r"UPDATE phpbb_users SET (user_avatar_type, user_avatar_width, user_avatar_height, user_avatar) = (2,64,64,%s) WHERE user_id = %s" def __init__(self): pass From 1285fb6dfc1dac791332215df573c553d7fa3272 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Sun, 15 Nov 2015 20:19:52 +0000 Subject: [PATCH 3/6] Corrected SQL syntax --- services/managers/phpbb3_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/managers/phpbb3_manager.py b/services/managers/phpbb3_manager.py index a0f55d2d..5054be42 100755 --- a/services/managers/phpbb3_manager.py +++ b/services/managers/phpbb3_manager.py @@ -32,7 +32,7 @@ class Phpbb3Manager: SQL_GET_USER_GROUPS = r"SELECT phpbb_groups.group_name FROM phpbb_groups , phpbb_user_group WHERE " \ r"phpbb_user_group.group_id = phpbb_groups.group_id AND user_id=%s" - SQL_ADD_USER_AVATAR = r"UPDATE phpbb_users SET (user_avatar_type, user_avatar_width, user_avatar_height, user_avatar) = (2,64,64,%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" def __init__(self): pass From ff46c1d4e9d821d2320ec0a161d86ee220236d69 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Sun, 15 Nov 2015 20:20:49 +0000 Subject: [PATCH 4/6] Fixed broken function reference --- services/managers/phpbb3_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/managers/phpbb3_manager.py b/services/managers/phpbb3_manager.py index 5054be42..86490e6c 100755 --- a/services/managers/phpbb3_manager.py +++ b/services/managers/phpbb3_manager.py @@ -41,7 +41,7 @@ class Phpbb3Manager: def __add_avatar(username, characterid): avatar_url = "http://image.eveonline.com/Character/" + characterid + "_64.jpg" cursor = connections['phpbb3'].cursor() - userid = Phpbb3Manager__get_user_id(username) + userid = Phpbb3Manager.__get_user_id(username) cursor.execute(Phpbb3Manager.SQL_ADD_USER_AVATAR, [avatar_url, userid]) @staticmethod From 5ab4ce286946e894485046721fccb19a3b055edd Mon Sep 17 00:00:00 2001 From: Adarnof Date: Sun, 15 Nov 2015 20:22:22 +0000 Subject: [PATCH 5/6] Yet another typo --- services/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/views.py b/services/views.py index 869e48c7..f0ba185b 100755 --- a/services/views.py +++ b/services/views.py @@ -126,7 +126,7 @@ def deactivate_forum(request): @user_passes_test(service_blue_alliance_test) def reset_forum_password(request): authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) - result = Phpbb3Manager.update_user_password(authinfo.forum_username, authonfo.main_char_id) + result = Phpbb3Manager.update_user_password(authinfo.forum_username, authinfo.main_char_id) # false we failed if result != "": AuthServicesInfoManager.update_user_forum_info(authinfo.forum_username, result, request.user) From 810b6260051ac2c7a573a0cf2b450ca427a502bd Mon Sep 17 00:00:00 2001 From: Adarnof Date: Sun, 8 Nov 2015 10:14:44 +0000 Subject: [PATCH 6/6] Corrected one last typo, I promise --- services/managers/phpbb3_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/managers/phpbb3_manager.py b/services/managers/phpbb3_manager.py index 86490e6c..26ffea4d 100755 --- a/services/managers/phpbb3_manager.py +++ b/services/managers/phpbb3_manager.py @@ -219,7 +219,7 @@ class Phpbb3Manager: if Phpbb3Manager.check_user(username): pwhash = Phpbb3Manager.__gen_hash(password) cursor.execute(Phpbb3Manager.SQL_UPDATE_USER_PASSWORD, [pwhash, username]) - Phpbb3Manager.__add_avater(username, characterid) + Phpbb3Manager.__add_avatar(username, characterid) return password return ""