Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-11 21:40:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed missing function reference

Browse Source
This commit is contained in:
Adarnof 2016-03-23 00:04:07 +00:00
parent 48a01972df
commit a55a53239d
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
services/views.py
View File

@ -16,7 +16,6 @@ from managers.teamspeak3_manager import Teamspeak3Manager
from managers.discord_manager import DiscordManager from managers.discord_manager import DiscordManager
from authentication.managers import AuthServicesInfoManager from authentication.managers import AuthServicesInfoManager
from eveonline.managers import EveManager from eveonline.managers import EveManager
from celerytask.tasks import remove_all_syncgroups_for_service
from celerytask.tasks import update_jabber_groups from celerytask.tasks import update_jabber_groups
from celerytask.tasks import update_mumble_groups from celerytask.tasks import update_mumble_groups
from celerytask.tasks import update_forum_groups from celerytask.tasks import update_forum_groups
@ -135,7 +134,7 @@ def activate_forum(request):
if result[0] != "": if result[0] != "":
AuthServicesInfoManager.update_user_forum_info(result[0], result[1], request.user) AuthServicesInfoManager.update_user_forum_info(result[0], result[1], request.user)
logger.debug("Updated authserviceinfo for user %s with forum credentials. Updating groups." % request.user) logger.debug("Updated authserviceinfo for user %s with forum credentials. Updating groups." % request.user)
update_forum_groups(request.user) update_forum_groups.delay(request.user)
logger.info("Succesfully activated forum for user %s" % request.user) logger.info("Succesfully activated forum for user %s" % request.user)
return HttpResponseRedirect("/services/") return HttpResponseRedirect("/services/")
logger.error("Unsuccesful attempt to activate forum for user %s" % request.user) logger.error("Unsuccesful attempt to activate forum for user %s" % request.user)
@ -148,7 +147,6 @@ def deactivate_forum(request):
logger.debug("deactivate_forum called by user %s" % request.user) logger.debug("deactivate_forum called by user %s" % request.user)
authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
result = Phpbb3Manager.disable_user(authinfo.forum_username) result = Phpbb3Manager.disable_user(authinfo.forum_username)
remove_all_syncgroups_for_service(request.user, "phpbb")
# false we failed # false we failed
if result: if result:
AuthServicesInfoManager.update_user_forum_info("", "", request.user) AuthServicesInfoManager.update_user_forum_info("", "", request.user)
@ -185,7 +183,7 @@ def activate_ipboard_forum(request):
if result[0] != "": if result[0] != "":
AuthServicesInfoManager.update_user_ipboard_info(result[0], result[1], request.user) AuthServicesInfoManager.update_user_ipboard_info(result[0], result[1], request.user)
logger.debug("Updated authserviceinfo for user %s with ipboard credentials. Updating groups." % request.user) logger.debug("Updated authserviceinfo for user %s with ipboard credentials. Updating groups." % request.user)
update_ipboard_groups(request.user) update_ipboard_groups.delay(request.user)
logger.info("Succesfully activated ipboard for user %s" % request.user) logger.info("Succesfully activated ipboard for user %s" % request.user)
return HttpResponseRedirect("/services/") return HttpResponseRedirect("/services/")
logger.error("Unsuccesful attempt to activate ipboard for user %s" % request.user) logger.error("Unsuccesful attempt to activate ipboard for user %s" % request.user)
@ -198,7 +196,6 @@ def deactivate_ipboard_forum(request):
logger.debug("deactivate_ipboard_forum called by user %s" % request.user) logger.debug("deactivate_ipboard_forum called by user %s" % request.user)
authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
result = IPBoardManager.disable_user(authinfo.ipboard_username) result = IPBoardManager.disable_user(authinfo.ipboard_username)
remove_all_syncgroups_for_service(request.user, "ipboard")
# false we failed # false we failed
if result: if result:
AuthServicesInfoManager.update_user_ipboard_info("", "", request.user) AuthServicesInfoManager.update_user_ipboard_info("", "", request.user)
@ -234,7 +231,7 @@ def activate_jabber(request):
if info[0] is not "": if info[0] is not "":
AuthServicesInfoManager.update_user_jabber_info(info[0], info[1], request.user) AuthServicesInfoManager.update_user_jabber_info(info[0], info[1], request.user)
logger.debug("Updated authserviceinfo for user %s with jabber credentials. Updating groups." % request.user) logger.debug("Updated authserviceinfo for user %s with jabber credentials. Updating groups." % request.user)
update_jabber_groups(request.user) update_jabber_groups.delay(request.user)
logger.info("Succesfully activated jabber for user %s" % request.user) logger.info("Succesfully activated jabber for user %s" % request.user)
return HttpResponseRedirect("/services/") return HttpResponseRedirect("/services/")
logger.error("Unsuccesful attempt to activate jabber for user %s" % request.user) logger.error("Unsuccesful attempt to activate jabber for user %s" % request.user)
@ -247,7 +244,6 @@ def deactivate_jabber(request):
logger.debug("deactivate_jabber called by user %s" % request.user) logger.debug("deactivate_jabber called by user %s" % request.user)
authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
result = OpenfireManager.delete_user(authinfo.jabber_username) result = OpenfireManager.delete_user(authinfo.jabber_username)
remove_all_syncgroups_for_service(request.user, "openfire")
# If our username is blank means we failed # If our username is blank means we failed
if result: if result:
AuthServicesInfoManager.update_user_jabber_info("", "", request.user) AuthServicesInfoManager.update_user_jabber_info("", "", request.user)
@ -288,7 +284,7 @@ def activate_mumble(request):
if result[0] is not "": if result[0] is not "":
AuthServicesInfoManager.update_user_mumble_info(result[0], result[1], request.user) AuthServicesInfoManager.update_user_mumble_info(result[0], result[1], request.user)
logger.debug("Updated authserviceinfo for user %s with mumble credentials. Updating groups." % request.user) logger.debug("Updated authserviceinfo for user %s with mumble credentials. Updating groups." % request.user)
update_mumble_groups(request.user) update_mumble_groups.delay(request.user)
logger.info("Succesfully activated mumble for user %s" % request.user) logger.info("Succesfully activated mumble for user %s" % request.user)
return HttpResponseRedirect("/services/") return HttpResponseRedirect("/services/")
logger.error("Unsuccessful attempt to activate mumble for user %s" % request.user) logger.error("Unsuccessful attempt to activate mumble for user %s" % request.user)
@ -301,7 +297,6 @@ def deactivate_mumble(request):
logger.debug("deactivate_mumble called by user %s" % request.user) logger.debug("deactivate_mumble called by user %s" % request.user)
authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
result = MumbleManager.delete_user(authinfo.mumble_username) result = MumbleManager.delete_user(authinfo.mumble_username)
remove_all_syncgroups_for_service(request.user, "mumble")
# if false we failed # if false we failed
if result: if result:
AuthServicesInfoManager.update_user_mumble_info("", "", request.user) AuthServicesInfoManager.update_user_mumble_info("", "", request.user)
@ -344,7 +339,7 @@ def activate_teamspeak3(request):
if result[0] is not "": if result[0] is not "":
AuthServicesInfoManager.update_user_teamspeak3_info(result[0], result[1], request.user) AuthServicesInfoManager.update_user_teamspeak3_info(result[0], result[1], request.user)
logger.debug("Updated authserviceinfo for user %s with TS3 credentials. Updating groups." % request.user) logger.debug("Updated authserviceinfo for user %s with TS3 credentials. Updating groups." % request.user)
update_teamspeak3_groups(request.user) update_teamspeak3_groups.delay(request.user)
logger.info("Succesfully activated TS3 for user %s" % request.user) logger.info("Succesfully activated TS3 for user %s" % request.user)
return HttpResponseRedirect("/services/") return HttpResponseRedirect("/services/")
logger.error("Unsuccessful attempt to activate TS3 for user %s" % request.user) logger.error("Unsuccessful attempt to activate TS3 for user %s" % request.user)
@ -358,8 +353,6 @@ def deactivate_teamspeak3(request):
authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
result = Teamspeak3Manager.delete_user(authinfo.teamspeak3_uid) result = Teamspeak3Manager.delete_user(authinfo.teamspeak3_uid)
remove_all_syncgroups_for_service(request.user, "teamspeak3")
# if false we failed # if false we failed
if result: if result:
AuthServicesInfoManager.update_user_teamspeak3_info("", "", request.user) AuthServicesInfoManager.update_user_teamspeak3_info("", "", request.user)
@ -378,8 +371,6 @@ def reset_teamspeak3_perm(request):
logger.debug("Deleting TS3 user for user %s" % request.user) logger.debug("Deleting TS3 user for user %s" % request.user)
Teamspeak3Manager.delete_user(authinfo.teamspeak3_uid) Teamspeak3Manager.delete_user(authinfo.teamspeak3_uid)
remove_all_syncgroups_for_service(request.user, "teamspeak3")
if check_if_user_has_permission(request.user, "blue_member"): if check_if_user_has_permission(request.user, "blue_member"):
logger.debug("Generating new permission key for blue user %s with main character %s" % (request.user, character)) logger.debug("Generating new permission key for blue user %s with main character %s" % (request.user, character))
result = Teamspeak3Manager.generate_new_blue_permissionkey(authinfo.teamspeak3_uid, character.character_name, result = Teamspeak3Manager.generate_new_blue_permissionkey(authinfo.teamspeak3_uid, character.character_name,
@ -393,7 +384,7 @@ def reset_teamspeak3_perm(request):
if result != "": if result != "":
AuthServicesInfoManager.update_user_teamspeak3_info(result[0], result[1], request.user) AuthServicesInfoManager.update_user_teamspeak3_info(result[0], result[1], request.user)
logger.debug("Updated authserviceinfo for user %s with TS3 credentials. Updating groups." % request.user) logger.debug("Updated authserviceinfo for user %s with TS3 credentials. Updating groups." % request.user)
update_teamspeak3_groups(request.user) update_teamspeak3_groups.delay(request.user)
logger.info("Successfully reset TS3 permission key for user %s" % request.user) logger.info("Successfully reset TS3 permission key for user %s" % request.user)
return HttpResponseRedirect("/services/") return HttpResponseRedirect("/services/")
logger.error("Unsuccessful attempt to reset TS3 permission key for user %s" % request.user) logger.error("Unsuccessful attempt to reset TS3 permission key for user %s" % request.user)
@ -413,7 +404,6 @@ def deactivate_discord(request):
authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
result = DiscordManager.delete_user(authinfo.discord_uid) result = DiscordManager.delete_user(authinfo.discord_uid)
if result: if result:
remove_all_syncgroups_for_service(request.user, "discord")
AuthServicesInfoManager.update_user_discord_info("", request.user) AuthServicesInfoManager.update_user_discord_info("", request.user)
logger.info("Succesfully deactivated discord for user %s" % request.user) logger.info("Succesfully deactivated discord for user %s" % request.user)
return HttpResponseRedirect("/services/") return HttpResponseRedirect("/services/")
@ -453,7 +443,7 @@ def activate_discord(request):
if user_id != "": if user_id != "":
AuthServicesInfoManager.update_user_discord_info(user_id, request.user) AuthServicesInfoManager.update_user_discord_info(user_id, request.user)
logger.debug("Updated discord id %s for user %s" % (user_id, request.user)) logger.debug("Updated discord id %s for user %s" % (user_id, request.user))
update_discord_groups(request.user) update_discord_groups.delay(request.user)
logger.debug("Updated discord groups for user %s." % request.user) logger.debug("Updated discord groups for user %s." % request.user)
success = True success = True
logger.info("Succesfully activated discord for user %s" % request.user) logger.info("Succesfully activated discord for user %s" % request.user)
@ -592,4 +582,3 @@ def set_ipboard_password(request):
logger.debug("Rendering form for user %s" % request.user) logger.debug("Rendering form for user %s" % request.user)
context = {'form': form, 'service': 'IPBoard', 'error': error} context = {'form': form, 'service': 'IPBoard', 'error': error}
return render_to_response('registered/service_password.html', context, context_instance=RequestContext(request)) return render_to_response('registered/service_password.html', context, context_instance=RequestContext(request))