From ac10236154d48b4b7e3426c645ecdab507a4451e Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Mon, 13 Jan 2025 21:40:09 +0100
Subject: [PATCH] Update twig dependency to ^3.11 (disable dependabot alert)

---
 composer.json                          |  2 +-
 system/templates/guilds.view.html.twig | 88 +++++++++++++-------------
 system/templates/houses.html.twig      | 22 ++++---
 3 files changed, 58 insertions(+), 54 deletions(-)

diff --git a/composer.json b/composer.json
index f36588c7..a150c7a3 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
         "ext-dom": "*",
         "phpmailer/phpmailer": "^6.1",
         "composer/semver": "^3.2",
-        "twig/twig": "^2.0",
+        "twig/twig": "^3.11",
         "erusev/parsedown": "^1.7",
         "nikic/fast-route": "^1.3",
         "matomo/device-detector": "^6.0",
diff --git a/system/templates/guilds.view.html.twig b/system/templates/guilds.view.html.twig
index 5ff6f82a..695d7464 100644
--- a/system/templates/guilds.view.html.twig
+++ b/system/templates/guilds.view.html.twig
@@ -79,57 +79,59 @@
 									</tr>
 
 									{% set showedRank, i = false, 0 %}
-									{% for rank in guild_members if rank.members|length > 0 %}
-										{% set rankStyle, i = getStyle(i), i + 1  %}
+									{% for rank in guild_members %}
+										{% if rank.members|length > 0 %}
+											{% set rankStyle, i = getStyle(i), i + 1  %}
 
-										{% for player in rank.members %}
-											<tr bgcolor="{{ rankStyle }}">
-												<td>
-													{% if not showedRank %}{{ rank.rank_name }}{% endif %}
-													{% set showedRank = true %}
-												</td>
+											{% for player in rank.members %}
+												<tr bgcolor="{{ rankStyle }}">
+													<td>
+														{% if not showedRank %}{{ rank.rank_name }}{% endif %}
+														{% set showedRank = true %}
+													</td>
 
-												<td>
-													{% set playerName = player.getName() %}
-													<form action="{{ getLink('guilds') }}?action=change_nick&name={{ playerName }}&guild={{ guild_name }}" method="post">
-														{{ csrf() }}
-														{{ getPlayerLink(playerName, true)|raw }}
+													<td>
+														{% set playerName = player.getName() %}
+														<form action="{{ getLink('guilds') }}?action=change_nick&name={{ playerName }}&guild={{ guild_name }}" method="post">
+															{{ csrf() }}
+															{{ getPlayerLink(playerName, true)|raw }}
 
-														{% set showGuildNick = false %}
-														{% if player.getGuildNick() is not empty %}
-															{% set showGuildNick = true %}
-															{% set guildNickRaw = player.getGuildNick()|raw %}
-														{% endif %}
+															{% set showGuildNick = false %}
+															{% if player.getGuildNick() is not empty %}
+																{% set showGuildNick = true %}
+																{% set guildNickRaw = player.getGuildNick()|raw %}
+															{% endif %}
 
-														{% if logged %}
-															{% if player.getId() in players_from_account_ids %}
-																(<input type="text" name="nick" value="{{ guildNickRaw }}"><input type="submit" value="Change">)
+															{% if logged %}
+																{% if player.getId() in players_from_account_ids %}
+																	(<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 %}
 																{% if showGuildNick %} ({{ guildNickRaw }}){% endif %}
 															{% endif %}
+														</form>
+													</td>
 
-															{% 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 %}
-															{% if showGuildNick %} ({{ guildNickRaw }}){% endif %}
-														{% endif %}
-													</form>
-												</td>
+													<td>{{ player.getVocationName() }}</td>
+													<td>{{ player.getLevel() }}</td>
+													<td>
+														<span style="color: {% if player.isOnline() %} green;"><b>Online{% else %} red;"><b>Offline{% endif %}</b></span>
+													</td>
+												</tr>
+											{% endfor %}
 
-												<td>{{ player.getVocationName() }}</td>
-												<td>{{ player.getLevel() }}</td>
-												<td>
-													<span style="color: {% if player.isOnline() %} green;"><b>Online{% else %} red;"><b>Offline{% endif %}</b></span>
-												</td>
-											</tr>
-										{% endfor %}
-
-										{% set showedRank = false %}
+											{% set showedRank = false %}
+										{% endif %}
 									{% else %}
 										<tr bgcolor="{{ getStyle(i) }}">
 											<td colspan="5">No guild members found.</td>
@@ -162,7 +164,7 @@
 								</tr>
 
 								{% set i = 0 %}
-								{% for invited_player in invited_list if invited_list|length > 0 %}
+								{% for invited_player in invited_list %}
 									{% if invited_player.isLoaded() %}
 										<tr bgcolor="{{ getStyle(i) }}">
 											{% set i = i + 1 %}
diff --git a/system/templates/houses.html.twig b/system/templates/houses.html.twig
index 7575a4d3..19c7d9d5 100644
--- a/system/templates/houses.html.twig
+++ b/system/templates/houses.html.twig
@@ -85,17 +85,19 @@ the search criteria and start a new search.
 			<tr bgcolor="{{ config.darkborder }}">
 				<td valign="top" rowspan="2">
 					{% set checked = false %}
-					{% for id, name in config.towns if id > 0 %}
-						{% if ((townId is empty and name is not empty) or id == townId) and not checked %}
-							{% set variable = "checked" %}
-							{% set checked = true %}
-						{% else %}
-							{% set variable = "" %}
-						{% endif %}
+					{% for id, name in config.towns %}
+						{% if id > 0 %}
+							{% if ((townId is empty and name is not empty) or id == townId) and not checked %}
+								{% set variable = "checked" %}
+								{% set checked = true %}
+							{% else %}
+								{% set variable = "" %}
+							{% endif %}
 
-						<input type="radio" name="town" id="town_{{ id }}" value="{{ id }}"{% if variable is defined %} {{ variable }}{% endif %}>
-						<label for="town_{{ id }}"> {{ name }}</label>
-						<br>
+							<input type="radio" name="town" id="town_{{ id }}" value="{{ id }}"{% if variable is defined %} {{ variable }}{% endif %}>
+							<label for="town_{{ id }}"> {{ name }}</label>
+							<br>
+						{% endif %}
 					{% endfor %}
 				</td>