Merge branch 'main' into feature/2fa

This commit is contained in:
slawkens
2025-09-14 09:53:34 +02:00
19 changed files with 293 additions and 114 deletions

View File

@@ -235,14 +235,16 @@
{% endif %}
{% if isVice %}
<form action="{{ getLink('guilds') }}?action=invite&guild={{ guild_name|url_encode }}" method="post">
{{ csrf() }}
<td>
{% set button_name = 'Invite Character' %}
{% set button_image = '_sbutton_invitecharacter' %}
{% include('buttons.base.html.twig') %}
</td>
</form>
{% if db.hasTableAndColumns('guild_invites', ['player_id']) %}
<form action="{{ getLink('guilds') }}?action=invite&guild={{ guild_name|url_encode }}" method="post">
{{ csrf() }}
<td>
{% set button_name = 'Invite Character' %}
{% set button_image = '_sbutton_invitecharacter' %}
{% include('buttons.base.html.twig') %}
</td>
</form>
{% endif %}
<form action="{{ getLink('guilds') }}?action=change_rank&guild={{ guild_name|url_encode }}" method="post">
{{ csrf() }}

View File

@@ -161,7 +161,7 @@
{% endif %}
<td style="width:70%; text-align:left">
{{ player.name|raw }}{{ player.skull }}
{{ player.name|raw }}{{ player.skull|raw }}
</td>
<td style="width:10%">{{ player.level }}</td>
<td style="width:20%">{{ player.vocation }}</td>