From 04a11b113aa5b0950400008cd142b1022547b5c2 Mon Sep 17 00:00:00 2001
From: Adarnof <adarnof@gmail.com>
Date: Fri, 21 Oct 2016 13:03:38 +0000
Subject: [PATCH] Correct missing request arg for messages. Correct
 disable_service tasks to remove password check. Addresses #557

---
 services/tasks.py | 29 +++++++++++++----------------
 services/views.py |  2 +-
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/services/tasks.py b/services/tasks.py
index a40f289f..f66c600e 100644
--- a/services/tasks.py
+++ b/services/tasks.py
@@ -71,10 +71,6 @@ def disable_forum():
             logger.info("Clearing %s forum username" % auth.user)
             auth.forum_username = ''
             auth.save()
-        if auth.forum_password:
-            logger.info("Clearing %s forum password" % auth.user)
-            auth.forum_password = ''
-            auth.save()
 
 
 def disable_jabber():
@@ -87,10 +83,6 @@ def disable_jabber():
             logger.info("Clearing %s jabber username" % auth.user)
             auth.jabber_username = ''
             auth.save()
-        if auth.jabber_password:
-            logger.info("Clearing %s jabber password" % auth.user)
-            auth.jabber_password = ''
-            auth.save()
 
 
 def disable_mumble():
@@ -103,10 +95,6 @@ def disable_mumble():
             logger.info("Clearing %s mumble username" % auth.user)
             auth.mumble_username = ''
             auth.save()
-        if auth.mumble_password:
-            logger.info("Clearing %s mumble password" % auth.user)
-            auth.mumble_password = ''
-            auth.save()
     logger.info("Deleting all MumbleUser models")
     MumbleUser.objects.all().delete()
 
@@ -123,10 +111,6 @@ def disable_ipboard():
             logger.info("Clearing %s ipboard username" % auth.user)
             auth.ipboard_username = ''
             auth.save()
-        if auth.ipboard_password:
-            logger.info("Clearing %s ipboard password" % auth.user)
-            auth.ipboard_password = ''
-            auth.save()
 
 
 def disable_discord():
@@ -141,6 +125,19 @@ def disable_discord():
             auth.save()
 
 
+def disable_market():
+    if settings.ENABLE_AUTH_MARKET:
+        logger.warn("ENABLE_AUTH_MARKET still True, after disabling users will still be able to activate Market accounts")
+    if settings.ENABLE_BLUE_DISCORD:
+        logger.warn("ENABLE_BLUE_MARKET still True, after disabling blues will still be able to activate Market accounts")
+    for auth in AuthServicesInfo.objects.all():
+        if auth.market_username:
+            logger.info("Clearing %s market username" % auth.user)
+            marketManager.disable_user(auth.market_username)
+            auth.market_username = ''
+            auth.save()
+
+
 def deactivate_services(user):
     change = False
     logger.debug("Deactivating services for user %s" % user)
diff --git a/services/views.py b/services/views.py
index 84f6a394..ecf352dd 100755
--- a/services/views.py
+++ b/services/views.py
@@ -714,7 +714,7 @@ def set_forum_password(request):
                                                         password=password)
             if result != "":
                 logger.info("Successfully set forum password for user %s" % request.user)
-                messages.success('Set forum password.')
+                messages.success(request, 'Set forum password.')
             else:
                 logger.error("Failed to install custom forum password for user %s" % request.user)
                 messages.error(request, 'An error occurred while processing your forum account.')