From 2c57e28cf84d129090a6cbb7a286255e018fbda7 Mon Sep 17 00:00:00 2001 From: Raynaldo Rivera Date: Sun, 23 Nov 2014 14:06:10 -0700 Subject: [PATCH] Added teamspeak3 fix --- services/managers/teamspeak3_manager.py | 28 +++++++++++++------------ 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/services/managers/teamspeak3_manager.py b/services/managers/teamspeak3_manager.py index 642b160c..2e809ed9 100755 --- a/services/managers/teamspeak3_manager.py +++ b/services/managers/teamspeak3_manager.py @@ -91,7 +91,7 @@ class Teamspeak3Manager: else: print '1024 error' - print outlist + return outlist @staticmethod def _add_user_to_group(uid, groupname): @@ -125,21 +125,23 @@ class Teamspeak3Manager: token = "" server_groups = Teamspeak3Manager._group_list() - if not settings.DEFAULT_ALLIANCE_GROUP in server_groups: - Teamspeak3Manager._create_group(settings.DEFAULT_ALLIANCE_GROUP) - alliange_group_id = Teamspeak3Manager._group_id_by_name(settings.DEFAULT_ALLIANCE_GROUP) + if server_groups: + if not settings.DEFAULT_ALLIANCE_GROUP in server_groups: + Teamspeak3Manager._create_group(settings.DEFAULT_ALLIANCE_GROUP) - ret = server.send_command('tokenadd', {'tokentype': 0, 'tokenid1': alliange_group_id, 'tokenid2': 0, - 'tokendescription': username_clean, - 'tokencustomset': "ident=sso_uid value=%s" % username_clean}) + alliange_group_id = Teamspeak3Manager._group_id_by_name(settings.DEFAULT_ALLIANCE_GROUP) - try: - if 'keys' in ret: - if 'token' in ret['keys']: - token = ret['keys']['token'] - except: - pass + ret = server.send_command('tokenadd', {'tokentype': 0, 'tokenid1': alliange_group_id, 'tokenid2': 0, + 'tokendescription': username_clean, + 'tokencustomset': "ident=sso_uid value=%s" % username_clean}) + + try: + if 'keys' in ret: + if 'token' in ret['keys']: + token = ret['keys']['token'] + except: + pass return username_clean, token