Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-13 06:20:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from R4stl1n/master

Browse Source 
update for services managers
This commit is contained in:
orbitroom 2015-01-01 03:11:13 -05:00
commit f56abac54f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
services/managers/mumble_manager.py
View File

@ -124,7 +124,7 @@ class MumbleManager:
@staticmethod
def create_user(corp_ticker, username):
dbcursor = connections['mumble'].cursor()
username_clean = MumbleManager.__generate_username(MumbleManager.__santatize_username(username), corp_ticker)
username_clean = MumbleManager.__santatize_username(MumbleManager.__generate_username(username, corp_ticker))
password = MumbleManager.__generate_random_pass()
pwhash = MumbleManager._gen_pwhash(password)
@ -146,8 +146,8 @@ class MumbleManager:
@staticmethod
def create_blue_user(corp_ticker, username):
dbcursor = connections['mumble'].cursor()
username_clean = MumbleManager.__generate_username_blue(MumbleManager.__santatize_username(username),
corp_ticker)
username_clean = MumbleManager.__santatize_username(MumbleManager.__generate_username_blue(username,
corp_ticker))
password = MumbleManager.__generate_random_pass()
pwhash = MumbleManager._gen_pwhash(password)

8
services/managers/teamspeak3_manager.py
View File

@ -120,8 +120,8 @@ class Teamspeak3Manager:
@staticmethod
def add_user(username, corp_ticker):
username_clean = Teamspeak3Manager.__generate_username(Teamspeak3Manager.__santatize_username(username),
corp_ticker)
username_clean = Teamspeak3Manager.__santatize_username(Teamspeak3Manager.__generate_username(username,
corp_ticker))
server = Teamspeak3Manager.__get_created_server()
token = ""
@ -147,8 +147,8 @@ class Teamspeak3Manager:
@staticmethod
def add_blue_user(username, corp_ticker):
username_clean = Teamspeak3Manager.__generate_username_blue(Teamspeak3Manager.__santatize_username(username),
corp_ticker)
username_clean = Teamspeak3Manager.__santatize_username(Teamspeak3Manager.__generate_username_blue(username,
corp_ticker))
server = Teamspeak3Manager.__get_created_server()
token = ""