From 8aaa8172ca40b92f63b12ab079d16faa0a684137 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Tue, 31 Oct 2023 08:58:30 +0100 Subject: [PATCH 01/20] [CHANGE] Only show username when there is a username --- allianceauth/services/templates/services/services_ctrl.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/allianceauth/services/templates/services/services_ctrl.html b/allianceauth/services/templates/services/services_ctrl.html index 6a841f99..78af2131 100644 --- a/allianceauth/services/templates/services/services_ctrl.html +++ b/allianceauth/services/templates/services/services_ctrl.html @@ -14,7 +14,9 @@ {% endblock %} {% block user %} - Username: {{ username }} + {% if username %} + Username: {{ username }} + {% endif %} {% endblock %} {% block controls %} From 5dd286bbe737affa2cb948bbea7d3ab278a3f62e Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Tue, 31 Oct 2023 09:47:22 +0100 Subject: [PATCH 02/20] [CHANGE] Set a default via status template --- .../services/templates/services/service_status.html | 9 +++++++++ .../services/templates/services/services_ctrl_base.html | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 allianceauth/services/templates/services/service_status.html diff --git a/allianceauth/services/templates/services/service_status.html b/allianceauth/services/templates/services/service_status.html new file mode 100644 index 00000000..9a817823 --- /dev/null +++ b/allianceauth/services/templates/services/service_status.html @@ -0,0 +1,9 @@ +{% load i18n %} + + + {% if username != '' %} + {% translate "Enabled" %} + {% else %} + {% translate "Disabled" %} + {% endif %} + diff --git a/allianceauth/services/templates/services/services_ctrl_base.html b/allianceauth/services/templates/services/services_ctrl_base.html index fa32e37e..0004f0ab 100644 --- a/allianceauth/services/templates/services/services_ctrl_base.html +++ b/allianceauth/services/templates/services/services_ctrl_base.html @@ -5,7 +5,7 @@

{% block url %}{% endblock url %}

{% block active %} - Active + {% include "services/service_status.html" with username=username %} {% endblock active %}

{% block user %}{% endblock user %}

From 63afb13d25681e39665e33f88db654db74fa555f Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Tue, 31 Oct 2023 09:48:07 +0100 Subject: [PATCH 03/20] [CHANGE] Mumble service template --- .../services/mumble/mumble_service_ctrl.html | 81 +++++++++++-------- 1 file changed, 49 insertions(+), 32 deletions(-) diff --git a/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html b/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html index bea25d80..e2e26379 100644 --- a/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html +++ b/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html @@ -1,34 +1,51 @@ -{% load i18n %} -
-
-
{{ service_name }}
-

{{ service_url }}

-

{% if username != '' %}Active{% else %}Disabled{% endif %}

-

Username: {{ username }}

-
+{% extends "services/services_ctrl_base.html" %} -
- {% if username == "" %} -
- - - -
- {% else %} -
- - - - - - - - - - - - -
+{% load i18n %} + +{% block title %} + {{ service_name }} +{% endblock %} + +{% block url %} + {{ service_url }} +{% endblock %} + +{% block user %} + {% if username %} + {% translate "Username" %}: {{ username }} + {% endif %} +{% endblock %} + +{% block controls %} + {% if username == "" %} + {% if urls.auth_activate %} + + + {% endif %} -
-
+ {% else %} + {% if urls.auth_set_password %} + + + + {% endif %} + + {% if urls.auth_reset_password %} + + + + {% endif %} + + {% if urls.auth_deactivate %} + + + + {% endif %} + + {% if connect_url %} + + + + {% endif %} + {% endif %} +{% endblock %} From 773288072ae52650f6f05a5389c541af8e90e44c Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Tue, 31 Oct 2023 09:48:29 +0100 Subject: [PATCH 04/20] [CHANGE] Discord service --- .../services/modules/discord/auth_hooks.py | 17 +++-- .../discord/discord_service_ctrl.html | 67 ++++++++++++------- 2 files changed, 49 insertions(+), 35 deletions(-) diff --git a/allianceauth/services/modules/discord/auth_hooks.py b/allianceauth/services/modules/discord/auth_hooks.py index 2d6bd204..8688105e 100644 --- a/allianceauth/services/modules/discord/auth_hooks.py +++ b/allianceauth/services/modules/discord/auth_hooks.py @@ -70,22 +70,21 @@ class DiscordService(ServicesHook): discord_username = self.get_discord_username( username=username, discriminator=discriminator ) - - # if username and discriminator: - # discord_username = f'{username}#{discriminator}' - # - # # New Discord user name format - # if discriminator == '0': - # discord_username = f'@{username}' - # else: - # discord_username = '' else: discord_username = '' user_has_account = False + urls = self.Urls() + urls.auth_activate = 'discord:activate' + urls.auth_deactivate = 'discord:deactivate' + urls.auth_reset = 'discord:reset' + urls.auth_add_bot = 'discord:add_bot' + return render_to_string( self.service_ctrl_template, { + 'service_name': self.title, + 'urls': urls, 'server_name': server_name(), 'user_has_account': user_has_account, 'discord_username': discord_username diff --git a/allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html b/allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html index 55aae356..ae1cb0f9 100644 --- a/allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html +++ b/allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html @@ -1,34 +1,49 @@ +{% extends "services/services_ctrl_base.html" %} + {% load i18n %} -
-
-
{% translate "Discord" %}
-

{% if server_name %}{{ server_name }}{% else %}{% translate "Unlinked Server" %}{% endif %}

-

-

- {% if not user_has_account %} - {% translate "(not activated)" %} - {% else %} - {{ discord_username }} - {% endif %} -

-
-
- {% if not user_has_account %} - + +{% block title %} + {{ service_name }} +{% endblock %} + +{% block url %} + {{ server_name }} +{% endblock %} + +{% block active %} + {% include "services/service_status.html" with username=discord_username %} +{% endblock %} + +{% block user %} + {% if discord_username %} + {{ discord_username }} + {% endif %} +{% endblock %} + +{% block controls %} + {% if username == "" %} + {% if urls.auth_activate %} + - {% else %} - + {% endif %} + {% else %} + {% if urls.auth_reset %} + - + {% endif %} + + {% if urls.auth_deactivate %} + {% endif %} - {% if request.user.is_superuser %} - - - - {% endif %} -
-
+ {% endif %} + + {% if request.user.is_superuser %} + + + + {% endif %} +{% endblock %} From ba22685eb8a41e9ecdba2c6e73bb54542e771770 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Tue, 31 Oct 2023 09:53:09 +0100 Subject: [PATCH 05/20] [CHANGE] Discourse service template --- .../services/discourse/discourse_service_ctrl.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html b/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html index 840c9e22..596727c2 100644 --- a/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html +++ b/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html @@ -10,11 +10,15 @@ {% endblock %} {% block user %} - Username: {{ char.character_name }} + {% translate "Username" %}: {{ char.character_name }} +{% endblock %} + +{% block active %} + {% include "services/service_status.html" with username=char.character_name %} {% endblock %} {% block controls %} - + {% endblock %} From df003c8ec594a6054c0add88bf38a174aaa93f68 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Tue, 31 Oct 2023 09:57:54 +0100 Subject: [PATCH 06/20] =?UTF-8?q?[CHANGE]=20TS=C2=B3=20service=20template?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/services/teamspeak3/teamspeak3_service_ctrl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html index 3a163867..2eca785a 100644 --- a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html +++ b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html @@ -10,7 +10,7 @@ {% endblock %} {% block active %} - {% if authinfo.teamspeak3_uid != '' %}Active{% else %}Disabled{% endif %} + {% include "services/service_status.html" with username=authinfo.teamspeak3_uid %} {% endblock %} {% block user %} From 257fbdef36742562fa2a148d7fe55c82d1b8e6bc Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Tue, 31 Oct 2023 10:03:06 +0100 Subject: [PATCH 07/20] [FIX] Capitalization of Jabber service name --- .../services/modules/openfire/views.py | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/allianceauth/services/modules/openfire/views.py b/allianceauth/services/modules/openfire/views.py index b24f94f9..b07e12fa 100644 --- a/allianceauth/services/modules/openfire/views.py +++ b/allianceauth/services/modules/openfire/views.py @@ -24,23 +24,23 @@ ACCESS_PERM = 'openfire.access_openfire' def activate_jabber(request): logger.debug("activate_jabber called by user %s" % request.user) character = request.user.profile.main_character - logger.debug(f"Adding jabber user for user {request.user} with main character {character}") + logger.debug(f"Adding Jabber user for user {request.user} with main character {character}") info = OpenfireManager.add_user(OpenfireTasks.get_username(request.user)) # If our username is blank means we already had a user if info[0] != "": OpenfireUser.objects.update_or_create(user=request.user, defaults={'username': info[0]}) - 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) OpenfireTasks.update_groups.delay(request.user.pk) - logger.info("Successfully activated jabber for user %s" % request.user) - messages.success(request, _('Activated jabber account.')) + logger.info("Successfully activated Jabber for user %s" % request.user) + messages.success(request, _('Activated Jabber account.')) credentials = { 'username': info[0], 'password': info[1], } return render(request, 'services/service_credentials.html', context={'credentials': credentials, 'service': 'Jabber'}) else: - logger.error("Unsuccessful attempt to activate jabber for user %s" % request.user) - messages.error(request, _('An error occurred while processing your jabber account.')) + logger.error("Unsuccessful attempt to activate Jabber for user %s" % request.user) + messages.error(request, _('An error occurred while processing your Jabber account.')) return redirect("services:services") @@ -49,11 +49,11 @@ def activate_jabber(request): def deactivate_jabber(request): logger.debug("deactivate_jabber called by user %s" % request.user) if OpenfireTasks.has_account(request.user) and OpenfireTasks.delete_user(request.user): - logger.info("Successfully deactivated jabber for user %s" % request.user) - messages.success(request, 'Deactivated jabber account.') + logger.info("Successfully deactivated Jabber for user %s" % request.user) + messages.success(request, 'Deactivated Jabber account.') else: - logger.error("Unsuccessful attempt to deactivate jabber for user %s" % request.user) - messages.error(request, _('An error occurred while processing your jabber account.')) + logger.error("Unsuccessful attempt to deactivate Jabber for user %s" % request.user) + messages.error(request, _('An error occurred while processing your Jabber account.')) return redirect("services:services") @@ -65,15 +65,15 @@ def reset_jabber_password(request): result = OpenfireManager.update_user_pass(request.user.openfire.username) # If our username is blank means we failed if result != "": - logger.info("Successfully reset jabber password for user %s" % request.user) - messages.success(request, _('Reset jabber password.')) + logger.info("Successfully reset Jabber password for user %s" % request.user) + messages.success(request, _('Reset Jabber password.')) credentials = { 'username': request.user.openfire.username, 'password': result, } return render(request, 'services/service_credentials.html', context={'credentials': credentials, 'service': 'Jabber'}) - logger.error("Unsuccessful attempt to reset jabber for user %s" % request.user) - messages.error(request, _('An error occurred while processing your jabber account.')) + logger.error("Unsuccessful attempt to reset Jabber for user %s" % request.user) + messages.error(request, _('An error occurred while processing your Jabber account.')) return redirect("services:services") @@ -95,7 +95,7 @@ def jabber_broadcast_view(request): logger.debug("Received POST request containing form, valid: %s" % form.is_valid()) if form.is_valid(): main_char = request.user.profile.main_character - logger.debug(f"Processing jabber broadcast for user {request.user} with main character {main_char}") + logger.debug(f"Processing Jabber broadcast for user {request.user} with main character {main_char}") try: if main_char is not None: message_to_send = form.cleaned_data['message'] + "\n##### SENT BY: " + "[" + main_char.corporation_ticker + "]" + \ @@ -112,8 +112,8 @@ def jabber_broadcast_view(request): OpenfireManager.send_broadcast_message(group_to_send, message_to_send) - messages.success(request, _('Sent jabber broadcast to %s' % group_to_send)) - logger.info("Sent jabber broadcast on behalf of user %s" % request.user) + messages.success(request, _('Sent Jabber broadcast to %s' % group_to_send)) + logger.info("Sent Jabber broadcast on behalf of user %s" % request.user) except PingBotException as e: messages.error(request, e) @@ -140,11 +140,11 @@ def set_jabber_password(request): logger.debug("Form contains password of length %s" % len(password)) result = OpenfireManager.update_user_pass(request.user.openfire.username, password=password) if result != "": - logger.info("Successfully set jabber password for user %s" % request.user) + logger.info("Successfully set Jabber password for user %s" % request.user) messages.success(request, _('Set jabber password.')) else: - logger.error("Failed to install custom jabber password for user %s" % request.user) - messages.error(request, _('An error occurred while processing your jabber account.')) + logger.error("Failed to install custom Jabber password for user %s" % request.user) + messages.error(request, _('An error occurred while processing your Jabber account.')) return redirect("services:services") else: logger.debug("Request is not type POST - providing empty form.") From 9e639a0eeb29f94961426519432d4ef88b2e4544 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Tue, 31 Oct 2023 10:04:55 +0100 Subject: [PATCH 08/20] [FIX] Capitalization of SMF service name --- allianceauth/services/modules/smf/views.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/allianceauth/services/modules/smf/views.py b/allianceauth/services/modules/smf/views.py index 33bd2148..7302b936 100644 --- a/allianceauth/services/modules/smf/views.py +++ b/allianceauth/services/modules/smf/views.py @@ -24,7 +24,7 @@ def activate_smf(request): main_character = request.user.profile.main_character logger.debug( - f"Adding smf user for user {request.user} with main character {main_character}" + f"Adding SMF user for user {request.user} with main character {main_character}" ) result = SmfManager.add_user( @@ -42,12 +42,12 @@ def activate_smf(request): logger.debug( f"Updated authserviceinfo for user {request.user} " - f"with smf credentials. Updating groups." + f"with SMF credentials. Updating groups." ) SmfTasks.update_groups.delay(request.user.pk) - logger.info(f"Successfully activated smf for user {request.user}") + logger.info(f"Successfully activated SMF for user {request.user}") messages.success(request, _('Activated SMF account.')) credentials = { @@ -61,7 +61,7 @@ def activate_smf(request): context={'credentials': credentials, 'service': 'SMF'}, ) - logger.error(f"Unsuccessful attempt to activate smf for user {request.user}") + logger.error(f"Unsuccessful attempt to activate SMF for user {request.user}") messages.error(request, _('An error occurred while processing your SMF account.')) return redirect("services:services") @@ -74,10 +74,10 @@ def deactivate_smf(request): result = SmfTasks.delete_user(request.user) # false we failed if result: - logger.info("Successfully deactivated smf for user %s" % request.user) + logger.info("Successfully deactivated SMF for user %s" % request.user) messages.success(request, _('Deactivated SMF account.')) else: - logger.error("Unsuccessful attempt to activate smf for user %s" % request.user) + logger.error("Unsuccessful attempt to activate SMF for user %s" % request.user) messages.error(request, _('An error occurred while processing your SMF account.')) return redirect("services:services") @@ -91,14 +91,14 @@ def reset_smf_password(request): result = SmfManager.update_user_password(request.user.smf.username, character.character_id) # false we failed if result != "": - logger.info("Successfully reset smf password for user %s" % request.user) + logger.info("Successfully reset SMF password for user %s" % request.user) messages.success(request, _('Reset SMF password.')) credentials = { 'username': request.user.smf.username, 'password': result, } return render(request, 'services/service_credentials.html', context={'credentials': credentials, 'service': 'SMF'}) - logger.error("Unsuccessful attempt to reset smf password for user %s" % request.user) + logger.error("Unsuccessful attempt to reset SMF password for user %s" % request.user) messages.error(request, _('An error occurred while processing your SMF account.')) return redirect("services:services") @@ -117,10 +117,10 @@ def set_smf_password(request): logger.debug("Form contains password of length %s" % len(password)) result = SmfManager.update_user_password(request.user.smf.username, character.character_id, password=password) if result != "": - logger.info("Successfully set smf password for user %s" % request.user) + logger.info("Successfully set SMF password for user %s" % request.user) messages.success(request, _('Set SMF password.')) else: - logger.error("Failed to install custom smf password for user %s" % request.user) + logger.error("Failed to install custom SMF password for user %s" % request.user) messages.error(request, _('An error occurred while processing your SMF account.')) return redirect("services:services") else: From 6e25361d5e66f97343bbc7f545220eb126b8c43e Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Tue, 31 Oct 2023 10:06:36 +0100 Subject: [PATCH 09/20] [FIX] Capitalization of XenForo service name --- allianceauth/services/modules/xenforo/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/allianceauth/services/modules/xenforo/views.py b/allianceauth/services/modules/xenforo/views.py index 349b335c..ac121108 100644 --- a/allianceauth/services/modules/xenforo/views.py +++ b/allianceauth/services/modules/xenforo/views.py @@ -36,7 +36,7 @@ def activate_xenforo_forum(request): context={'credentials': credentials, 'service': 'XenForo'}) else: - logger.error("Unsuccessful attempt to activate xenforo for user %s" % request.user) + logger.error("Unsuccessful attempt to activate XenForo for user %s" % request.user) messages.error(request, _('An error occurred while processing your XenForo account.')) return redirect("services:services") From 15042f5e779f004fa8967ace2c7e942f36d54b72 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Tue, 31 Oct 2023 10:07:47 +0100 Subject: [PATCH 10/20] [FIX] Capitalization of Discord service name --- allianceauth/services/modules/discord/views.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/allianceauth/services/modules/discord/views.py b/allianceauth/services/modules/discord/views.py index 65b2e4ec..8cc5fcdd 100644 --- a/allianceauth/services/modules/discord/views.py +++ b/allianceauth/services/modules/discord/views.py @@ -26,11 +26,11 @@ def deactivate_discord(request): if request.user.discord.delete_user( is_rate_limited=False, handle_api_exceptions=True ): - logger.info("Successfully deactivated discord for user %s", request.user) + logger.info("Successfully deactivated Discord for user %s", request.user) messages.success(request, _('Deactivated Discord account.')) else: logger.error( - "Unsuccessful attempt to deactivate discord for user %s", request.user + "Unsuccessful attempt to deactivate Discord for user %s", request.user ) messages.error( request, _('An error occurred while processing your Discord account.') @@ -46,14 +46,14 @@ def reset_discord(request): is_rate_limited=False, handle_api_exceptions=True ): logger.info( - "Successfully deleted discord user for user %s - " - "forwarding to discord activation.", + "Successfully deleted Discord user for user %s - " + "forwarding to Discord activation.", request.user ) return redirect("discord:activate") logger.error( - "Unsuccessful attempt to reset discord for user %s", request.user + "Unsuccessful attempt to reset Discord for user %s", request.user ) messages.error( request, _('An error occurred while processing your Discord account.') From a04e6ae3d048702784b025bf37478219d5dbd8c3 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Tue, 31 Oct 2023 10:09:43 +0100 Subject: [PATCH 11/20] [FIX] Normalization of IPSuite4 service name --- allianceauth/services/modules/ips4/views.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/allianceauth/services/modules/ips4/views.py b/allianceauth/services/modules/ips4/views.py index a1cc1b1c..9e806430 100644 --- a/allianceauth/services/modules/ips4/views.py +++ b/allianceauth/services/modules/ips4/views.py @@ -25,9 +25,9 @@ def activate_ips4(request): # if empty we failed if result[0] != "" and not Ips4Tasks.has_account(request.user): ips_user = Ips4User.objects.create(user=request.user, id=result[2], username=result[0]) - logger.debug("Updated authserviceinfo for user %s with IPS4 credentials." % request.user) + logger.debug("Updated authserviceinfo for user %s with IPSuite4 credentials." % request.user) # update_ips4_groups.delay(request.user.pk) - logger.info("Successfully activated IPS4 for user %s" % request.user) + logger.info("Successfully activated IPSuite4 for user %s" % request.user) messages.success(request, _('Activated IPSuite4 account.')) credentials = { 'username': result[0], @@ -35,7 +35,7 @@ def activate_ips4(request): } return render(request, 'services/service_credentials.html', context={'credentials': credentials, 'service': 'IPSuite4'}) else: - logger.error("Unsuccessful attempt to activate IPS4 for user %s" % request.user) + logger.error("Unsuccessful attempt to activate IPSuite4 for user %s" % request.user) messages.error(request, _('An error occurred while processing your IPSuite4 account.')) return redirect("services:services") @@ -48,7 +48,7 @@ def reset_ips4_password(request): result = Ips4Manager.update_user_password(request.user.ips4.username) # false we failed if result != "": - logger.info("Successfully reset IPS4 password for user %s" % request.user) + logger.info("Successfully reset IPSuite4 password for user %s" % request.user) messages.success(request, _('Reset IPSuite4 password.')) credentials = { 'username': request.user.ips4.username, @@ -56,7 +56,7 @@ def reset_ips4_password(request): } return render(request, 'services/service_credentials.html', context={'credentials': credentials, 'service': 'IPSuite4'}) - logger.error("Unsuccessful attempt to reset IPS4 password for user %s" % request.user) + logger.error("Unsuccessful attempt to reset IPSuite4 password for user %s" % request.user) messages.error(request, _('An error occurred while processing your IPSuite4 account.')) return redirect("services:services") @@ -74,10 +74,10 @@ def set_ips4_password(request): logger.debug("Form contains password of length %s" % len(password)) result = Ips4Manager.update_custom_password(request.user.ips4.username, plain_password=password) if result != "": - logger.info("Successfully set IPS4 password for user %s" % request.user) + logger.info("Successfully set IPSuite4 password for user %s" % request.user) messages.success(request, _('Set IPSuite4 password.')) else: - logger.error("Failed to install custom IPS4 password for user %s" % request.user) + logger.error("Failed to install custom IPSuite4 password for user %s" % request.user) messages.error(request, _('An error occurred while processing your IPSuite4 account.')) return redirect('services:services') else: @@ -94,9 +94,9 @@ def set_ips4_password(request): def deactivate_ips4(request): logger.debug("deactivate_ips4 called by user %s" % request.user) if Ips4Tasks.delete_user(request.user): - logger.info("Successfully deactivated IPS4 for user %s" % request.user) + logger.info("Successfully deactivated IPSuite4 for user %s" % request.user) messages.success(request, _('Deactivated IPSuite4 account.')) else: - logger.error("Unsuccessful attempt to deactivate IPS4 for user %s" % request.user) + logger.error("Unsuccessful attempt to deactivate IPSuite4 for user %s" % request.user) messages.error(request, _('An error occurred while processing your IPSuite4 account.')) return redirect("services:services") From f87d7dbdf81d8e14ee0d75579f6ea64091fd9a42 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Tue, 31 Oct 2023 10:12:02 +0100 Subject: [PATCH 12/20] [FIX] Normalization of TeamSpeak3 service name --- .../admin/teamspeak3/authts/change_list.html | 2 +- .../services/teamspeak3/teamspeakjoin.html | 4 ++-- .../services/modules/teamspeak3/views.py | 22 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html b/allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html index 2e157736..49df399f 100644 --- a/allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html +++ b/allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html @@ -5,7 +5,7 @@ {{ block.super }}
  • - {% translate "Update TS3 groups" %} + {% translate "Update TeamSpeak3 groups" %}
    • {% endblock %} diff --git a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html index c77fcc23..dbe61c28 100644 --- a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html +++ b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html @@ -2,12 +2,12 @@ {% load bootstrap %} {% load i18n %} -{% block page_title %}{% translate "Verify Teamspeak" %}{% endblock page_title %} +{% block page_title %}{% translate "Verify TeamSpeak3" %}{% endblock page_title %} {% block extra_css %}{% endblock extra_css %} {% block content %}
    -

    {% translate "Verify Teamspeak Identity" %}

    +

    {% translate "Verify TeamSpeak3 Identity" %}

    {% translate "Join Server" %} diff --git a/allianceauth/services/modules/teamspeak3/views.py b/allianceauth/services/modules/teamspeak3/views.py index e54bd84b..be6d7cd3 100644 --- a/allianceauth/services/modules/teamspeak3/views.py +++ b/allianceauth/services/modules/teamspeak3/views.py @@ -24,17 +24,17 @@ def activate_teamspeak3(request): character = request.user.profile.main_character with Teamspeak3Manager() as ts3man: - logger.debug(f"Adding TS3 user for user {request.user} with main character {character}") + logger.debug(f"Adding TeamSpeak3 user for user {request.user} with main character {character}") result = ts3man.add_user(request.user, Teamspeak3Tasks.get_username(request.user)) # if its empty we failed if result[0] != "": Teamspeak3User.objects.update_or_create(user=request.user, defaults={'uid': result[0], 'perm_key': result[1]}) - logger.debug("Updated authserviceinfo for user %s with TS3 credentials. Updating groups." % request.user) - logger.info("Successfully activated TS3 for user %s" % request.user) + logger.debug("Updated authserviceinfo for user %s with TeamSpeak3 credentials. Updating groups." % request.user) + logger.info("Successfully activated TeamSpeak3 for user %s" % request.user) messages.success(request, _('Activated TeamSpeak3 account.')) return redirect("teamspeak3:verify") - logger.error("Unsuccessful attempt to activate TS3 for user %s" % request.user) + logger.error("Unsuccessful attempt to activate TeamSpeak3 for user %s" % request.user) messages.error(request, _('An error occurred while processing your TeamSpeak3 account.')) return redirect("services:services") @@ -67,10 +67,10 @@ def verify_teamspeak3(request): def deactivate_teamspeak3(request): logger.debug("deactivate_teamspeak3 called by user %s" % request.user) if Teamspeak3Tasks.has_account(request.user) and Teamspeak3Tasks.delete_user(request.user): - logger.info("Successfully deactivated TS3 for user %s" % request.user) + logger.info("Successfully deactivated TeamSpeak3 for user %s" % request.user) messages.success(request, _('Deactivated TeamSpeak3 account.')) else: - logger.error("Unsuccessful attempt to deactivate TS3 for user %s" % request.user) + logger.error("Unsuccessful attempt to deactivate TeamSpeak3 for user %s" % request.user) messages.error(request, _('An error occurred while processing your TeamSpeak3 account.')) return redirect("services:services") @@ -81,7 +81,7 @@ def reset_teamspeak3_perm(request): logger.debug("reset_teamspeak3_perm called by user %s" % request.user) if not Teamspeak3Tasks.has_account(request.user): return redirect("services:services") - logger.debug("Deleting TS3 user for user %s" % request.user) + logger.debug("Deleting TeamSpeak3 user for user %s" % request.user) with Teamspeak3Manager() as ts3man: ts3man.delete_user(request.user.teamspeak3.uid) @@ -91,12 +91,12 @@ def reset_teamspeak3_perm(request): # if blank we failed if result[0] != "": Teamspeak3User.objects.update_or_create(user=request.user, defaults={'uid': result[0], 'perm_key': result[1]}) - logger.debug("Updated authserviceinfo for user %s with TS3 credentials. Updating groups." % request.user) + logger.debug("Updated authserviceinfo for user %s with TeamSpeak3 credentials. Updating groups." % request.user) Teamspeak3Tasks.update_groups.delay(request.user.pk) - logger.info("Successfully reset TS3 permission key for user %s" % request.user) + logger.info("Successfully reset TeamSpeak3 permission key for user %s" % request.user) messages.success(request, _('Reset TeamSpeak3 permission key.')) else: - logger.error("Unsuccessful attempt to reset TS3 permission key for user %s" % request.user) + logger.error("Unsuccessful attempt to reset TeamSpeak3 permission key for user %s" % request.user) messages.error(request, _('An error occurred while processing your TeamSpeak3 account.')) return redirect("services:services") @@ -105,5 +105,5 @@ def reset_teamspeak3_perm(request): @staff_member_required def admin_update_ts3_groups(request): Teamspeak3Tasks.run_ts3_group_update.delay() - messages.info(request, "Started updating TS3 server groups...") + messages.info(request, "Started updating TeamSpeak3 server groups...") return redirect("admin:teamspeak3_authts_changelist") From e3b151f2fbdb0d9278b73887e2527418b23b75d8 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Tue, 31 Oct 2023 10:25:04 +0100 Subject: [PATCH 13/20] [CHANGE] Use BS5 forms --- .../templates/services/openfire/broadcast.html | 4 ++-- .../services/teamspeak3/teamspeakjoin.html | 6 +++--- .../templates/services/fleetformattertool.html | 4 ++-- .../templates/services/service_password.html | 13 ++++++------- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html b/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html index 2f6791bd..f99e1781 100644 --- a/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html +++ b/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html @@ -1,5 +1,5 @@ {% extends "allianceauth/base.html" %} -{% load bootstrap %} +{% load django_bootstrap5 %} {% load i18n %} {% block page_title %}{% translate "Jabber Broadcast" %}{% endblock page_title %} @@ -17,7 +17,7 @@ {% endif %} diff --git a/allianceauth/services/templates/services/fleetformattertool.html b/allianceauth/services/templates/services/fleetformattertool.html index b176fd1f..c5535b6f 100644 --- a/allianceauth/services/templates/services/fleetformattertool.html +++ b/allianceauth/services/templates/services/fleetformattertool.html @@ -1,5 +1,5 @@ {% extends "allianceauth/base-bs5.html" %} -{% load bootstrap %} +{% load django_bootstrap5 %} {% load i18n %} {% block page_title %}{% translate "Fleet Formatter Tool" %}{% endblock page_title %} @@ -18,7 +18,7 @@ {% endif %}