Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-04-26 01:09:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update twig dependency to ^3.11 (disable dependabot alert)

Browse Source
This commit is contained in:
slawkens 2025-01-13 21:40:09 +01:00
parent dc95bc4bad
commit ac10236154
3 changed files with 58 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -8,7 +8,7 @@
"ext-dom": "*", "ext-dom": "*",
"phpmailer/phpmailer": "^6.1", "phpmailer/phpmailer": "^6.1",
"composer/semver": "^3.2", "composer/semver": "^3.2",
"twig/twig": "^2.0", "twig/twig": "^3.11",
"erusev/parsedown": "^1.7", "erusev/parsedown": "^1.7",
"nikic/fast-route": "^1.3", "nikic/fast-route": "^1.3",
"matomo/device-detector": "^6.0", "matomo/device-detector": "^6.0",

88
system/templates/guilds.view.html.twig
View File

@ -79,57 +79,59 @@
</tr> </tr>
{% set showedRank, i = false, 0 %} {% set showedRank, i = false, 0 %}
{% for rank in guild_members if rank.members|length > 0 %} {% for rank in guild_members %}
{% set rankStyle, i = getStyle(i), i + 1 %} {% if rank.members|length > 0 %}
{% set rankStyle, i = getStyle(i), i + 1 %}
{% for player in rank.members %} {% for player in rank.members %}
<tr bgcolor="{{ rankStyle }}"> <tr bgcolor="{{ rankStyle }}">
<td> <td>
{% if not showedRank %}{{ rank.rank_name }}{% endif %} {% if not showedRank %}{{ rank.rank_name }}{% endif %}
{% set showedRank = true %} {% set showedRank = true %}
</td> </td>
<td> <td>
{% set playerName = player.getName() %} {% set playerName = player.getName() %}
<form action="{{ getLink('guilds') }}?action=change_nick&name={{ playerName }}&guild={{ guild_name }}" method="post"> <form action="{{ getLink('guilds') }}?action=change_nick&name={{ playerName }}&guild={{ guild_name }}" method="post">
{{ csrf() }} {{ csrf() }}
{{ getPlayerLink(playerName, true)|raw }} {{ getPlayerLink(playerName, true)|raw }}
{% set showGuildNick = false %} {% set showGuildNick = false %}
{% if player.getGuildNick() is not empty %} {% if player.getGuildNick() is not empty %}
{% set showGuildNick = true %} {% set showGuildNick = true %}
{% set guildNickRaw = player.getGuildNick()|raw %} {% set guildNickRaw = player.getGuildNick()|raw %}
{% endif %} {% endif %}
{% if logged %} {% if logged %}
{% if player.getId() in players_from_account_ids %} {% if player.getId() in players_from_account_ids %}
(<input type="text" name="nick" value="{{ guildNickRaw }}"><input type="submit" value="Change">) (<input type="text" name="nick" value="{{ guildNickRaw }}"><input type="submit" value="Change">)
{% else %}
{% if showGuildNick %} ({{ guildNickRaw }}){% endif %}
{% endif %}
{% if level_in_guild > rank.rank_level or isLeader %}
{% if guildOwnerName != playerName %}
<span style="font-size: 10px; float: right">
{<a href="{{ getLink('guilds') }}?action=kick_player&guild={{ guild_name|url_encode }}&name={{ playerName|url_encode }}">KICK</a>}
</span>
{% endif %}
{% endif %}
{% else %} {% else %}
{% if showGuildNick %} ({{ guildNickRaw }}){% endif %} {% if showGuildNick %} ({{ guildNickRaw }}){% endif %}
{% endif %} {% endif %}
</form>
</td>
{% if level_in_guild > rank.rank_level or isLeader %} <td>{{ player.getVocationName() }}</td>
{% if guildOwnerName != playerName %} <td>{{ player.getLevel() }}</td>
<span style="font-size: 10px; float: right"> <td>
{<a href="{{ getLink('guilds') }}?action=kick_player&guild={{ guild_name|url_encode }}&name={{ playerName|url_encode }}">KICK</a>} <span style="color: {% if player.isOnline() %} green;"><b>Online{% else %} red;"><b>Offline{% endif %}</b></span>
</span> </td>
{% endif %} </tr>
{% endif %} {% endfor %}
{% else %}
{% if showGuildNick %} ({{ guildNickRaw }}){% endif %}
{% endif %}
</form>
</td>
<td>{{ player.getVocationName() }}</td> {% set showedRank = false %}
<td>{{ player.getLevel() }}</td> {% endif %}
<td>
<span style="color: {% if player.isOnline() %} green;"><b>Online{% else %} red;"><b>Offline{% endif %}</b></span>
</td>
</tr>
{% endfor %}
{% set showedRank = false %}
{% else %} {% else %}
<tr bgcolor="{{ getStyle(i) }}"> <tr bgcolor="{{ getStyle(i) }}">
<td colspan="5">No guild members found.</td> <td colspan="5">No guild members found.</td>
@ -162,7 +164,7 @@
</tr> </tr>
{% set i = 0 %} {% set i = 0 %}
{% for invited_player in invited_list if invited_list|length > 0 %} {% for invited_player in invited_list %}
{% if invited_player.isLoaded() %} {% if invited_player.isLoaded() %}
<tr bgcolor="{{ getStyle(i) }}"> <tr bgcolor="{{ getStyle(i) }}">
{% set i = i + 1 %} {% set i = i + 1 %}

22
system/templates/houses.html.twig
View File

@ -85,17 +85,19 @@ the search criteria and start a new search.
<tr bgcolor="{{ config.darkborder }}"> <tr bgcolor="{{ config.darkborder }}">
<td valign="top" rowspan="2"> <td valign="top" rowspan="2">
{% set checked = false %} {% set checked = false %}
{% for id, name in config.towns if id > 0 %} {% for id, name in config.towns %}
{% if ((townId is empty and name is not empty) or id == townId) and not checked %} {% if id > 0 %}
{% set variable = "checked" %} {% if ((townId is empty and name is not empty) or id == townId) and not checked %}
{% set checked = true %} {% set variable = "checked" %}
{% else %} {% set checked = true %}
{% set variable = "" %} {% else %}
{% endif %} {% set variable = "" %}
{% endif %}
<input type="radio" name="town" id="town_{{ id }}" value="{{ id }}"{% if variable is defined %} {{ variable }}{% endif %}> <input type="radio" name="town" id="town_{{ id }}" value="{{ id }}"{% if variable is defined %} {{ variable }}{% endif %}>
<label for="town_{{ id }}"> {{ name }}</label> <label for="town_{{ id }}"> {{ name }}</label>
<br> <br>
{% endif %}
{% endfor %} {% endfor %}
</td> </td>