* forgot to commit twig templates in last commit

* added some validation in guilds actions if guild has been set to
prevent php notices

system/pages/guilds/accept_invite.php

@@ -11,14 +11,16 @@
 defined('MYAAC') or die('Direct access not allowed!');
 
 //set rights in guild
-$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : NULL;
+$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
-$name = isset($_REQUEST['name']) ? stripslashes($_REQUEST['name']) : NULL;
+$name = isset($_REQUEST['name']) ? stripslashes($_REQUEST['name']) : null;
 if(!$logged) {
 	$errors[] = 'You are not logged in. You can\'t accept invitations.';
 }
+
 if(!Validator::guildName($guild_name)) {
 	$errors[] = Validator::getLastError();
 }
+
 if(empty($errors)) {
 	$guild = $ots->createObject('Guild');
 	$guild->find($guild_name);

system/pages/guilds/add_rank.php

@@ -10,24 +10,25 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-$guild_name = urldecode($_REQUEST['guild']);
+$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
-$ranknew = $_REQUEST['rank_name'];
+$new_rank = isset($_REQUEST['rank_name']) ? $_REQUEST['rank_name'] : null;
 if(!Validator::guildName($guild_name)) {
-	$guild_errors[] = Validator::getLastError();
+	$errors[] = Validator::getLastError();
 }
-if(empty($guild_errors)) {
+
-	if(!Validator::rankName($ranknew)) {
+if(empty($errors)) {
-		$guild_errors[] = 'Invalid rank name format.';
+	if(!Validator::rankName($new_rank)) {
+		$errors[] = 'Invalid rank name format.';
 	}
 	if(!$logged) {
-		$guild_errors[] = 'You are not logged.';
+		$errors[] = 'You are not logged.';
 	}
 	$guild = $ots->createObject('Guild');
 	$guild->find($guild_name);
 	if(!$guild->isLoaded()) {
-		$guild_errors[] = 'Guild with name <b>'.$guild_name.'</b> doesn\'t exist.';
+		$errors[] = 'Guild with name <b>'.$guild_name.'</b> doesn\'t exist.';
 	}
-	if(empty($guild_errors)) {
+	if(empty($errors)) {
 		$guild_leader_char = $guild->getOwner();
 		$rank_list = $guild->getGuildRanksList();
 		$rank_list->orderBy('level', POT::ORDER_DESC);
@@ -44,17 +45,17 @@ if(empty($guild_errors)) {
 			$new_rank = new OTS_GuildRank();
 			$new_rank->setGuild($guild);
 			$new_rank->setLevel(1);
-			$new_rank->setName($ranknew);
+			$new_rank->setName($new_rank);
 			$new_rank->save();
 			header("Location: ?subtopic=guilds&guild=".$guild->getName()."&action=manager");
 			echo 'New rank added. Redirecting...';
 		}
-		else  {
+		else {
-			$guild_errors[] = 'You are not a leader of guild!';
+			$errors[] = 'You are not a leader of guild!';
 		}
 	}
-	if(!empty($guild_errors)) {
+	if(!empty($errors)) {
-		echo $twig->render('error_box.html.twig', array('errors' => $guild_errors));
+		echo $twig->render('error_box.html.twig', array('errors' => $errors));
 		
 		echo $twig->render('guilds.back_button.html.twig', array(
 			'new_line' => true,
@@ -64,8 +65,8 @@ if(empty($guild_errors)) {
 }
 else
 {
-	if(!empty($guild_errors)) {
+	if(!empty($errors)) {
-		echo $twig->render('error_box.html.twig', array('errors' => $guild_errors));
+		echo $twig->render('error_box.html.twig', array('errors' => $errors));
 		
 		echo $twig->render('guilds.back_button.html.twig', array(
 			'new_line' => true

system/pages/guilds/change_description.php

@@ -10,7 +10,7 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-$guild_name = urldecode($_REQUEST['guild']);
+$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
 if(!Validator::guildName($guild_name)) {
 	$errors[] = Validator::getLastError();
 }

system/pages/guilds/change_logo.php

@@ -10,7 +10,7 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-$guild_name = urldecode($_REQUEST['guild']);
+$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
 if(!Validator::guildName($guild_name)) {
 	$errors[] = Validator::getLastError();
 }

system/pages/guilds/change_motd.php

@@ -13,7 +13,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 if(!MOTD_EXISTS)
 	return;
 
-$guild_name = urldecode($_REQUEST['guild']);
+$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
 if(!Validator::guildName($guild_name)) {
 	$errors[] = Validator::getLastError();
 }

system/pages/guilds/change_nick.php

@@ -10,45 +10,57 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-if($logged)
+if(!$logged) {
+	echo 'You are not logged.';
+	echo $twig->render('guilds.back_button.html.twig');
+	return;
+}
+
+$new_rank = isset($_REQUEST['name']) ? stripslashes($_REQUEST['name']) : null;
+$new_nick = isset($_REQUEST['nick']) ? stripslashes($_REQUEST['nick']) : null;
+
+if(!$new_rank) {
+	echo 'Please enter new rank.';
+	return;
+}
+
+if(!$new_nick) {
+	echo 'Please enter new nick.';
+	return;
+}
+
+$player = new OTS_Player();
+$player->find($name);
+$player_from_account = false;
+if(strlen($new_nick) <= 40)
 {
-	$name = stripslashes($_REQUEST['name']);
+	if($player->isLoaded())
-	$new_nick = stripslashes($_REQUEST['nick']);
-	$player = new OTS_Player();
-	$player->find($name);
-	$player_from_account = false;
-	if(strlen($new_nick) <= 40)
 	{
-		if($player->isLoaded())
+		$account_players = $account_logged->getPlayersList();
+		if(count($account_players))
 		{
-			$account_players = $account_logged->getPlayersList();
+			foreach($account_players as $acc_player)
-			if(count($account_players))
 			{
-				foreach($account_players as $acc_player)
+				if($acc_player->getId() == $player->getId())
-				{
+					$player_from_account = true;
-					if($acc_player->getId() == $player->getId())
+			}
-						$player_from_account = true;
+			if($player_from_account)
-				}
+			{
-				if($player_from_account)
+				$player->setGuildNick($new_nick);
-				{
+				echo 'Guild nick of player <b>'.$player->getName().'</b> changed to <b>'.htmlentities($new_nick).'</b>.';
-					$player->setGuildNick($new_nick);
+				$addtolink = '&action=show&guild='.$player->getRank()->getGuild()->getName();
-					echo 'Guild nick of player <b>'.$player->getName().'</b> changed to <b>'.htmlentities($new_nick).'</b>.';
-					$addtolink = '&action=show&guild='.$player->getRank()->getGuild()->getName();
-				}
-				else
-					echo 'This player is not from your account.';
 			}
 			else
 				echo 'This player is not from your account.';
 		}
 		else
-			echo 'Unknow error occured.';
+			echo 'This player is not from your account.';
 	}
 	else
-		echo 'Too long guild nick. Max. 40 chars, your length: '.strlen($new_nick);
+		echo 'Unknow error occured.';
 }
 else
-	echo 'You are not logged.';
+	echo 'Too long guild nick. Max. 40 chars, your length: '.strlen($new_nick);
-echo '<center><h3><a href="?subtopic=guilds'.$addtolink.'">BACK</a></h3></center>';
 
+echo $twig->render('guilds.back_button.html.twig');
 ?>

system/pages/guilds/change_rank.php

@@ -10,11 +10,15 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-$guild_name = urldecode($_REQUEST['guild']);
+if(!$logged) {
-if(!Validator::guildName($guild_name))
-	$errors[] = Validator::getLastError();
-if(!$logged)
 	$errors[] = 'You are not logged in. You can\'t change rank.';
+}
+else {
+	$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
+	if(!Validator::guildName($guild_name))
+		$errors[] = Validator::getLastError();
+}
+
 if(empty($errors))
 {
 	$guild = $ots->createObject('Guild');
@@ -22,6 +26,7 @@ if(empty($errors))
 	if(!$guild->isLoaded())
 		$errors[] = 'Guild with name <b>' . $guild_name . '</b> doesn\'t exist.';
 }
+
 if(!empty($errors))
 {
 	echo $twig->render('error_box.html.twig', array('errors' => $errors));
@@ -136,6 +141,7 @@ if($guild_vice)
 			if(!$player_has_lower_rank)
 				$change_errors[] = 'This player has higher rank in guild than you. You can\'t change his/her rank.';
 		}
+		
 		if(empty($change_errors))
 		{
 			$player_to_change->setRank($rank);

system/pages/guilds/cleanup_guilds.php

@@ -10,30 +10,32 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-if($logged)
+if(!$logged)
 {
-	$guilds_list = new OTS_Guilds_List();
+	echo "You are not logged in.";
-	$guilds_list->init();
+	echo $twig->render('guilds.back_button.html.twig');
-	if(count($guilds_list) > 0)
+	return;
+}
+
+$guilds_list = new OTS_Guilds_List();
+$guilds_list->init();
+if(count($guilds_list) > 0)
+{
+	foreach($guilds_list as $guild)
 	{
-		foreach($guilds_list as $guild)
+		$error = 0;
+		$leader = $guild->getOwner();
+		if($leader->isLoaded())
 		{
-			$error = 0;
+			$leader_rank = $leader->getRank();
-			$leader = $guild->getOwner();
+			if($leader_rank->isLoaded())
-			if($leader->isLoaded())
 			{
-				$leader_rank = $leader->getRank();
 				if($leader_rank->isLoaded())
 				{
-					if($leader_rank->isLoaded())
+					$leader_guild = $leader_rank->getGuild();
+					if($leader_guild->isLoaded())
 					{
-						$leader_guild = $leader_rank->getGuild();
+						if($leader_guild->getId() != $guild->getId())
-						if($leader_guild->isLoaded())
-						{
-							if($leader_guild->getId() != $guild->getId())
-								$error = 1;
-						}
-						else
 							$error = 1;
 					}
 					else
@@ -44,22 +46,22 @@ if($logged)
 			}
 			else
 				$error = 1;
-			if($error == 1)
-			{
-				$deleted_guilds[] = $guild->getName();
-				$status = delete_guild($guild->getId());
-			}
 		}
-		echo "<b>Deleted guilds (leaders of this guilds are not members of this guild [fix bugged guilds]):</b>";
+		else
-		if(!empty($deleted_guilds))
+			$error = 1;
-			foreach($deleted_guilds as $guild)
+		if($error == 1)
-				echo "<li>".$guild;
+		{
+			$deleted_guilds[] = $guild->getName();
+			$status = delete_guild($guild->getId());
+		}
 	}
-	else
+	echo "<b>Deleted guilds (leaders of this guilds are not members of this guild [fix bugged guilds]):</b>";
-		echo "0 guilds found.";
+	if(!empty($deleted_guilds))
+		foreach($deleted_guilds as $guild)
+			echo "<li>".$guild;
 }
 else
-	echo "You are not logged in.";
+	echo "0 guilds found.";
 
 echo $twig->render('guilds.back_button.html.twig');
 ?>

system/pages/guilds/cleanup_players.php

@@ -10,58 +10,60 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-if($logged)
+if(!$logged)
 {
-	if(admin())
+	echo "You are not logged in.";
-	{
+	echo $twig->render('guilds.back_button.html.twig');
-		$players_list = new OTS_Players_List();
+	return;
-		$players_list->init();
+}
-	}
+
-	else
+if(admin())
-		$players_list = $account_logged->getPlayersList();
+{
-	
+	$players_list = new OTS_Players_List();
-	if(count($players_list) > 0)
+	$players_list->init();
-	{
-		foreach($players_list as $player)
-		{
-			$player_rank = $player->getRank();
-			if($player_rank->isLoaded())
-			{
-				if($player_rank->isLoaded())
-				{
-					$rank_guild = $player_rank->getGuild();
-					if(!$rank_guild->isLoaded())
-					{
-						$player->setRank();
-						$player->setGuildNick();
-						$changed_ranks_of[] = $player->getName();
-						$deleted_ranks[] = 'ID: '.$player_rank->getId().' - '.$player_rank->getName();
-						$player_rank->delete();
-					}
-				}
-				else
-				{
-					$player->setRank();
-					$player->setGuildNick('');
-					$changed_ranks_of[] = $player->getName();
-				}
-				
-			}
-		}
-		echo "<b>Deleted ranks (this ranks guilds doesn't exist [bug fix]):</b>";
-		if(!empty($deleted_ranks))
-			foreach($deleted_ranks as $rank)
-				echo "<li>".$rank;
-		echo "<BR /><BR /><b>Changed ranks of players (rank or guild of rank doesn't exist [bug fix]):</b>";
-		if(!empty($changed_ranks_of))
-			foreach($changed_ranks_of as $name)
-				echo "<li>".$name;
-	}
-	else
-		echo "0 players found.";
 }
 else
-	echo "You are not logged in.";
+	$players_list = $account_logged->getPlayersList();
 
+if(count($players_list) > 0)
+{
+	foreach($players_list as $player)
+	{
+		$player_rank = $player->getRank();
+		if($player_rank->isLoaded())
+		{
+			if($player_rank->isLoaded())
+			{
+				$rank_guild = $player_rank->getGuild();
+				if(!$rank_guild->isLoaded())
+				{
+					$player->setRank();
+					$player->setGuildNick();
+					$changed_ranks_of[] = $player->getName();
+					$deleted_ranks[] = 'ID: '.$player_rank->getId().' - '.$player_rank->getName();
+					$player_rank->delete();
+				}
+			}
+			else
+			{
+				$player->setRank();
+				$player->setGuildNick('');
+				$changed_ranks_of[] = $player->getName();
+			}
+			
+		}
+	}
+	echo "<b>Deleted ranks (this ranks guilds doesn't exist [bug fix]):</b>";
+	if(!empty($deleted_ranks))
+		foreach($deleted_ranks as $rank)
+			echo "<li>".$rank;
+	echo "<BR /><BR /><b>Changed ranks of players (rank or guild of rank doesn't exist [bug fix]):</b>";
+	if(!empty($changed_ranks_of))
+		foreach($changed_ranks_of as $name)
+			echo "<li>".$name;
+}
+else
+	echo "0 players found.";
+	
 echo $twig->render('guilds.back_button.html.twig');
 ?>

system/pages/guilds/delete_by_admin.php

@@ -10,7 +10,7 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-$guild_name = urldecode($_REQUEST['guild']);
+$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
 if(!Validator::guildName($guild_name)) {
 	$errors[] = Validator::getLastError();
 }

system/pages/guilds/delete_guild.php

@@ -10,7 +10,7 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-$guild_name = urldecode($_REQUEST['guild']);
+$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
 if(!Validator::guildName($guild_name)) {
 	$errors[] = Validator::getLastError();
 }

system/pages/guilds/delete_invite.php

@@ -10,23 +10,27 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-//set rights in guild
+$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
-$guild_name = urldecode($_REQUEST['guild']);
 $name = stripslashes($_REQUEST['name']);
+
 if(!$logged)
-	$guild_errors[] = 'You are not logged in. You can\'t delete invitations.';
+	$errors[] = 'You are not logged in. You can\'t delete invitations.';
+
 if(!Validator::guildName($guild_name))
-	$guild_errors[] = Validator::getLastError();
+	$errors[] = Validator::getLastError();
+
 if(!Validator::characterName($name))
-	$guild_errors[] = 'Invalid name format.';
+	$errors[] = 'Invalid name format.';
-if(empty($guild_errors))
+
+if(empty($errors))
 {
-	$guild = $ots->createObject('Guild');
+	$guild = new OTS_Guild();
 	$guild->find($guild_name);
 	if(!$guild->isLoaded())
-		$guild_errors[] = 'Guild with name <b>'.$guild_name.'</b> doesn\'t exist.';
+		$errors[] = "Guild with name <b>" . $guild_name . "</b> doesn't exist.";
 }
-if(empty($guild_errors))
+
+if(empty($errors))
 {
 	$rank_list = $guild->getGuildRanksList();
 	$rank_list->orderBy('level', POT::ORDER_DESC);
@@ -58,16 +62,17 @@ if(empty($guild_errors))
 		}
 	}
 }
-if(empty($guild_errors))
+if(empty($errors))
 {
 	$player = new OTS_Player();
 	$player->find($name);
 	if(!$player->isLoaded())
-		$guild_errors[] = 'Player with name <b>'.$name.'</b> doesn\'t exist.';
+		$errors[] = 'Player with name <b>' . $name . '</b> doesn\'t exist.';
 }
 if(!$guild_vice)
-	$guild_errors[] = 'You are not a leader or vice leader of guild <b>'.$guild_name.'</b>.';
+	$errors[] = 'You are not a leader or vice leader of guild <b>' . $guild_name . '</b>.';
-if(empty($guild_errors))
+
+if(empty($errors))
 {
 	include(SYSTEM . 'libs/pot/InvitesDriver.php');
 	new InvitesDriver($guild);
@@ -79,14 +84,14 @@ if(empty($guild_errors))
 			if($invited->getName() == $player->getName())
 				$is_invited = true;
 		if(!$is_invited)
-			$guild_errors[] = '<b>'.$player->getName().'</b> isn\'t invited to your guild.';
+			$errors[] = '<b>'.$player->getName().'</b> isn\'t invited to your guild.';
 	}
 	else
-		$guild_errors[] = 'No one is invited to your guild.';
+		$errors[] = 'No one is invited to your guild.';
 }
-if(!empty($guild_errors))
+if(!empty($errors))
 {
-	echo $twig->render('error_box.html.twig', array('errors' => $guild_errors));
+	echo $twig->render('error_box.html.twig', array('errors' => $errors));
 	
 	echo $twig->render('guilds.back_button.html.twig', array('action' => '?subtopic=guilds&action=show&guild=' . $guild_name));
 }

system/pages/guilds/delete_rank.php

@@ -10,8 +10,9 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-$guild_name = urldecode($_REQUEST['guild']);
+$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
-$rank_to_delete = (int) $_REQUEST['rankid'];
+$rank_to_delete = isset($_REQUEST['rankid']) ? (int) $_REQUEST['rankid'] : null;
+
 if(!Validator::guildName($guild_name)) {
 	$guild_errors[] = Validator::getLastError();
 }

system/pages/guilds/kick_player.php

@@ -11,8 +11,9 @@
 defined('MYAAC') or die('Direct access not allowed!');
 
 //set rights in guild
-$guild_name = urldecode($_REQUEST['guild']);
+$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
-$name = stripslashes($_REQUEST['name']);
+$name = isset($_REQUEST['name']) ? stripslashes($_REQUEST['name']) : null;
+
 if(!$logged) {
 	$errors[] = 'You are not logged in. You can\'t kick characters.';
 }

system/pages/guilds/manager.php

@@ -10,20 +10,20 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-$guild_name = urldecode($_REQUEST['guild']);
+$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
 if(!Validator::guildName($guild_name)) {
-	$guild_errors[] = Validator::getLastError();
+	$errors[] = Validator::getLastError();
 }
 
-if(empty($guild_errors)) {
+if(empty($errors)) {
 	$guild = new OTS_Guild();
 	$guild->find($guild_name);
 	if(!$guild->isLoaded()) {
-		$guild_errors[] = 'Guild with name <b>'.$guild_name.'</b> doesn\'t exist.';
+		$errors[] = 'Guild with name <b>'.$guild_name.'</b> doesn\'t exist.';
 	}
 }
 
-if(empty($guild_errors)) {
+if(empty($errors)) {
 	if($logged) {
 		$guild_leader_char = $guild->getOwner();
 		$rank_list = $guild->getGuildRanksList();
@@ -45,16 +45,16 @@ if(empty($guild_errors)) {
 		}
 		else
 		{
-			$guild_errors[] = 'You are not a leader of guild!';
+			$errors[] = 'You are not a leader of guild!';
 		}
 	}
 	else
 	{
-		$guild_errors[] = 'You are not logged. You can\'t manage guild.';
+		$errors[] = 'You are not logged. You can\'t manage guild.';
 	}
 }
-if(!empty($guild_errors)) {
+if(!empty($errors)) {
-	echo $twig->render('error_box.html.twig', array('errors' => $guild_errors));
+	echo $twig->render('error_box.html.twig', array('errors' => $errors));
 }
 
 ?>

system/templates/account.management.html.twig

@@ -150,7 +150,7 @@
 			{% for player in players %}
 				{% set i = i + 1 %}
 				<tr bgcolor="{{ getStyle(i) }}">
-					<td><a href="{{ getLink('characters/' ~ player.getName()|url_encode) }}">{{ player.getName() }}</a></td><td>{{ player.getLevel() }}</td><td>{{ config.vocations[player.getVocation()] }}</td><td>{{ config.towns[player.getTownId()] }}</td><td>{% if player.getLastLogin() > 0 %}{{ player.getLastLogin|date('d F Y (H:i)') }}{% else %}Never.{% endif %}</td><td>{%  if player.isOnline() %}<font color="green">ONLINE</font>{% else %}<font color="red">Offline</font>{% endif %}</td><td>{% if player.isHidden() %}Hidden{% else %}Visible{% endif %}</td><td>[<a href="{{ getLink('account/character/comment/' ~ player.getName|url_encode) }}" >Edit</a>]</td>
+					<td><a href="{{ getLink('characters/' ~ player.getName()|urlencode) }}">{{ player.getName() }}</a></td><td>{{ player.getLevel() }}</td><td>{{ config.vocations[player.getVocation()] }}</td><td>{{ config.towns[player.getTownId()] }}</td><td>{% if player.getLastLogin() > 0 %}{{ player.getLastLogin|date('d F Y (H:i)') }}{% else %}Never.{% endif %}</td><td>{%  if player.isOnline() %}<font color="green">ONLINE</font>{% else %}<font color="red">Offline</font>{% endif %}</td><td>{% if player.isHidden() %}Hidden{% else %}Visible{% endif %}</td><td>[<a href="{{ getLink('account/character/comment/' ~ player.getName|urlencode) }}" >Edit</a>]</td>
 				</tr>
 			{% endfor %}
 		</table>

system/templates/spells.html.twig

@@ -35,25 +35,25 @@
 <table border="0" cellspacing="1" cellpadding="4" width="100%">
 	<tr bgcolor="{{ config.vdarkborder }}">
 		<td class="white">
-			<b><a href="{{ getLink('spells') ~ '/' ~ post_vocation|url_encode ~ '/spell' }}"><font class="white">Name</font></a></b>
+			<b><a href="{{ getLink('spells') ~ '/' ~ post_vocation|urlencode ~ '/spell' }}"><font class="white">Name</font></a></b>
 		</td>
 		<td class="white">
-			<b><a href="{{ getLink('spells') ~ '/' ~ post_vocation|url_encode ~ '/words' }}"><font class="white">Words</font></a></b>
+			<b><a href="{{ getLink('spells') ~ '/' ~ post_vocation|urlencode ~ '/words' }}"><font class="white">Words</font></a></b>
 		</td>
 		<td class="white">
-			<b><a href="{{ getLink('spells') ~ '/' ~ post_vocation|url_encode ~ '/type' }}"><font class="white">Type<br/>(count)</font></a></b>
+			<b><a href="{{ getLink('spells') ~ '/' ~ post_vocation|urlencode ~ '/type' }}"><font class="white">Type<br/>(count)</font></a></b>
 		</td>
 		<td class="white">
-			<b><a href="{{ getLink('spells') ~ '/' ~ post_vocation|url_encode ~ '/mana' }}"><font class="white">Mana</font></a></b>
+			<b><a href="{{ getLink('spells') ~ '/' ~ post_vocation|urlencode ~ '/mana' }}"><font class="white">Mana</font></a></b>
 		</td>
 		<td class="white">
-			<b><a href="{{ getLink('spells') ~ '/' ~ post_vocation|url_encode ~ '/level' }}"><font class="white">Level</font></a></b>
+			<b><a href="{{ getLink('spells') ~ '/' ~ post_vocation|urlencode ~ '/level' }}"><font class="white">Level</font></a></b>
 		</td>
 		<td class="white">
-			<b><a href="{{ getLink('spells') ~ '/' ~ post_vocation|url_encode ~ '/maglevel' }}"><font class="white">Magic<br/>Level</font></a></b>
+			<b><a href="{{ getLink('spells') ~ '/' ~ post_vocation|urlencode ~ '/maglevel' }}"><font class="white">Magic<br/>Level</font></a></b>
 		</td>
 		<td class="white">
-			<b><a href="{{ getLink('spells') ~ '/' ~ post_vocation|url_encode ~ '/soul' }}"><font class="white">Soul</font></a></b>
+			<b><a href="{{ getLink('spells') ~ '/' ~ post_vocation|urlencode ~ '/soul' }}"><font class="white">Soul</font></a></b>
 		</td>
 		<td class="white">
 			<b>Premium</b>

templates/tibiacom/account.management.html.twig

@@ -440,7 +440,7 @@
 												{% else %}
 												<td><font color="red"><b>Offline</b></font></td>
 												{% endif %}
-												<td>[<a href="{{ getLink('account/character/comment/' ~ player.getName|url_encode) }}" >Edit</a>]</td>
+												<td>[<a href="{{ getLink('account/character/comment/' ~ player.getName|urlencode) }}" >Edit</a>]</td>
 											</tr>
 											{% endfor %}
 										</table>