Merge branch 'main' into feature/pot-hook-filter

CHANGELOG-1.x.md

@@ -1,30 +1,5 @@
 # Changelog
 
-## [1.8.7 - 04.01.2026]
-
-### Fixed
-* Fixed [player/guild/house] bb code in forum (https://github.com/slawkens/myaac/commit/8ec9bf10682c73f1fe40967a106ccda2a5073ed0)
-
-### Changed
-* Settings: better responsiveness on mobile (https://github.com/slawkens/myaac/commit/c65d4e4b62ef26fb4e24ecb1d2bcc4556d746adf)
-* Signatures: Return 404 when the signature player is not found (https://github.com/slawkens/myaac/commit/7e6480b380799add7a2b1b7ce1d3c1f2b6819ff1)
-
-### Removed
-* Remove setting: outfit_images_wrong_looktypes - is obsolete, the bug doesn't exist in the latest outfit images (https://github.com/slawkens/myaac/commit/cc220bedc1f01535eaac23f6961135e2e7a6e310)
-
-## [1.8.6 - 14.12.2025]
-
-### Added
-* Added hook for adding custom rules to validate new character name (https://github.com/slawkens/myaac/commit/8e6749c59984631288e8e9803819b2f0ff389761)
-
-### Fixed
-* Highscores: Fix ordering by different skills (Adjust order by desc: skill_tries, manaspent, experience) - More exact results (https://github.com/slawkens/myaac/commit/c86257e6dacbad773aa09c0958eeaa106a967f2d)
-* Fix exception shown on first install, when there is no vendor - Before it displayed 500 white page, now it display the exception (https://github.com/slawkens/myaac/commit/18a1178e4b93607a350259679e0366cb83fb4126)
-* Fix typo $up -> $down, in migration nr 7, was failing due that (https://github.com/slawkens/myaac/commit/fd74f01291d0e9cdb92ee1b95021c9d7b591ad7c)
-
-### Changed
-* Ini set html_errors = 0, to show html code in exceptions (https://github.com/slawkens/myaac/commit/9ed06782e67772826d927ad847a077b99df5060d)
-
 ## [1.8.5 - 21.11.2025]
 
 ### Added

common.php

@@ -26,7 +26,7 @@
 if (version_compare(phpversion(), '8.1', '<')) die('PHP version 8.1 or higher is required.');
 
 const MYAAC = true;
-const MYAAC_VERSION = '1.8.7';
+const MYAAC_VERSION = '1.8.6-dev';
 const DATABASE_VERSION = 46;
 const TABLE_PREFIX = 'myaac_';
 define('START_TIME', microtime(true));

system/compat/config.php

@@ -21,6 +21,7 @@ $deprecatedConfig = [
 	'visitors_counter_ttl',
 	'views_counter',
 	'outfit_images_url',
+	'outfit_images_wrong_looktypes',
 	'item_images_url',
 	'account_country',
 	'towns',
@@ -51,7 +52,6 @@ $deprecatedConfig = [
 	'online_skulls',
 	'online_outfit',
 	'online_afk',
-	'team_style',
 	'team_display_outfit' => 'team_outfit',
 	'team_display_status' => 'team_status',
 	'team_display_world' => 'team_world',

system/libs/pot/OTS.php

@@ -311,9 +311,18 @@ class POT
  */
 	public function loadClass($class)
 	{
-		if( preg_match('/^(I|E_)?OTS_/', $class) > 0)
-		{
-			include_once($this->path . $class . '.php');
+		if( preg_match('/^(I|E_)?OTS_/', $class) > 0) {
+			global $hooks;
+			$include = $this->path . $class . '.php';
+
+			if (isset($hooks)) {
+				$args = ['include' => $include, 'class' => $class];
+				$hooks->triggerFilter(HOOK_FILTER_POT, $args);
+
+				$include = $args['include'];
+			}
+
+			include_once($include);
 		}
 	}
 

system/pages/account/change-password.php

@@ -22,7 +22,7 @@ csrfProtect();
 $new_password = $_POST['new_password'] ?? null;
 $new_password_confirm = $_POST['new_password_confirm'] ?? null;
 $old_password = $_POST['old_password'] ?? null;
-if(is_null($new_password) && is_null($new_password_confirm) && is_null($old_password)) {
+if(empty($new_password) && empty($new_password_confirm) && empty($old_password)) {
 	$twig->display('account.change-password.html.twig');
 }
 else {

system/pages/account/register-new.php

@@ -48,7 +48,7 @@ else
 					$account_logged->setCustomField('key', $new_rec_key);
 					$account_logged->setCustomField(setting('core.donate_column'), $account_logged->getCustomField(setting('core.donate_column')) - setting('core.account_generate_new_reckey_price'));
 					$account_logged->logAction('Generated new recovery key for ' . setting('core.account_generate_new_reckey_price') . ' premium points.');
-					$message = '<br />Your recovery key was sent on email address <b>'.$account_logged->getEMail().'</b> for '.setting('core.account_generate_new_reckey_price').' premium points.';
+					$message = '<br />Your recovery key were send on email address <b>'.$account_logged->getEMail().'</b> for '.setting('core.account_generate_new_reckey_price').' premium points.';
 				}
 				else
 					$message = '<br /><p class="error">An error occurred while sending email ( <b>'.$account_logged->getEMail().'</b> ) with recovery key! Recovery key not changed. Try again later. For Admin: More info can be found in system/logs/mailer-error.log</p>';

system/pages/highscores.php

@@ -249,7 +249,7 @@ foreach($highscores as $id => &$player)
 
 		$player['link'] = getPlayerLink($player['name'], false);
 		$player['flag'] = getFlagImage($player['country']);
-		$player['outfit'] = '<img style="position:absolute;margin-top:-50px;margin-left:-30px" src="' . $player['outfit_url'] . '" alt="" />';
+		$player['outfit'] = '<img style="position:absolute;margin-top:' . (in_array($player['looktype'], setting('core.outfit_images_wrong_looktypes')) ? '-15px;margin-left:5px' : '-45px;margin-left:-25px') . ';" src="' . $player['outfit_url'] . '" alt="" />';
 
 		if ($skill != POT::SKILL__LEVEL) {
 			if (isset($lastValue) && $lastValue == $player['value']) {

system/settings.php

@@ -1482,6 +1482,17 @@ Sent by MyAAC,<br/>
 			'desc' => 'Set to animoutfit.php for animated outfit',
 			'default' => 'https://outfit-images.ots.me/latest/outfit.php',
 		],
+		'outfit_images_wrong_looktypes' => [
+			'name' => 'Outfit Images Wrong Looktypes',
+			'type' => 'text',
+			'desc' => 'This looktypes needs to have different margin-top and margin-left because they are wrong positioned',
+			'default' => '75, 126, 127, 266, 302',
+			'callbacks' => [
+				'get' => function ($value) {
+					return array_map('trim', explode(',', $value));
+				},
+			],
+		],
 		[
 			'type' => 'section',
 			'title' => 'Monster Images'

system/src/Forum.php

@@ -231,7 +231,6 @@ class Forum
 			if(!is_int($rows / 2)) { $bgcolor = 'ABED25'; } else { $bgcolor = '23ED25'; } $rows++;
 			$text = str_ireplace('[code]'.$code.'[/code]', '<i>Code:</i><br /><table cellpadding="0" style="background-color: #'.$bgcolor.'; width: 480px; border-style: dotted; border-color: #CCCCCC; border-width: 2px"><tr><td>'.$code.'</td></tr></table>', $text);
 		}
-
 		$rows = 0;
 		while(stripos($text, '[quote]') !== false && stripos($text, '[/quote]') !== false )
 		{
@@ -239,31 +238,11 @@ class Forum
 			if(!is_int($rows / 2)) { $bgcolor = 'AAAAAA'; } else { $bgcolor = 'CCCCCC'; } $rows++;
 			$text = str_ireplace('[quote]'.$quote.'[/quote]', '<table cellpadding="0" style="background-color: #'.$bgcolor.'; width: 480px; border-style: dotted; border-color: #007900; border-width: 2px"><tr><td>'.$quote.'</td></tr></table>', $text);
 		}
-
-		$tagsToParse = [
-			'url' => function ($str) {
-				return '<a href="'.$str.'" target="_blank">'.$str.'</a>';
-			},
-			'player' => function ($str) {
-				return generateLink(getPlayerLink($str, false), $str, true);
-			},
-			'guild' => function ($str) {
-				return generateLink(getGuildLink($str, false), $str, true);
-			},
-			'house' => function ($str) {
-				return generateLink(getHouseLink($str, false), $str, true);
-			}
-		];
-
-		foreach ($tagsToParse as $tag => $callback) {
-			while(stripos($text, "[$tag]") !== false && stripos($text, "[/$tag]") !== false
-				&& stripos($text, "[$tag]") < stripos($text, "[/$tag]"))
-			{
-				$length = strlen("[$tag]");
-				$substr = substr($text, stripos($text, "[$tag]") + $length, stripos($text, "[/$tag]") - stripos($text, "[$tag]") - $length);
-
-				$text = str_ireplace('[' . $tag . ']' . $substr . '[/' . $tag . ']', $callback($substr), $text);
-			}
+		$rows = 0;
+		while(stripos($text, '[url]') !== false && stripos($text, '[/url]') !== false )
+		{
+			$url = substr($text, stripos($text, '[url]')+5, stripos($text, '[/url]') - stripos($text, '[url]') - 5);
+			$text = str_ireplace('[url]'.$url.'[/url]', '<a href="'.$url.'" target="_blank">'.$url.'</a>', $text);
 		}
 
 		$xhtml = false;
@@ -273,6 +252,9 @@ class Forum
 			'#\[u\](.*?)\[/u\]#si' => ($xhtml ? '<span style="text-decoration: underline;">\\1</span>' : '<u>\\1</u>'),
 			'#\[s\](.*?)\[/s\]#si' => ($xhtml ? '<strike>\\1</strike>' : '<s>\\1</s>'),
 
+			'#\[guild\](.*?)\[/guild\]#si' => urldecode(generateLink(getGuildLink('$1', false), '$1', true)),
+			'#\[house\](.*?)\[/house\]#si' => urldecode(generateLink(getHouseLink('$1', false), '$1', true)),
+			'#\[player\](.*?)\[/player\]#si' => urldecode(generateLink(getPlayerLink('$1', false), '$1', true)),
 			// TODO: [poll] tag
 
 			'#\[color=(.*?)\](.*?)\[/color\]#si' => ($xhtml ? '<span style="color: \\1;">\\2</span>' : '<span style="color: \\1">\\2</span>'),

system/src/Settings.php

@@ -184,11 +184,11 @@ class Settings implements \ArrayAccess
 					}
 					?>
 					<h3 id="row_<?= $key ?>" style="text-align: center"><strong><?= $setting['title']; ?></strong></h3>
-					<table class="table table-bordered table-striped table-responsive d-md-table">
+					<table class="table table-bordered table-striped">
 						<thead>
 							<tr>
 								<th style="width: 13%">Name</th>
-								<th style="width: 30%; min-width: 200px">Value</th>
+								<th style="width: 30%">Value</th>
 								<th>Description</th>
 							</tr>
 						</thead>

system/src/global.php

@@ -108,6 +108,7 @@ define('HOOK_FILTER_ROUTES', ++$i);
 define('HOOK_FILTER_TWIG_DISPLAY', ++$i);
 define('HOOK_FILTER_TWIG_RENDER', ++$i);
 define('HOOK_FILTER_THEME_FOOTER', ++$i);
+define('HOOK_FILTER_POT', ++$i);
 define('HOOK_FILTER_VALIDATE_CHARACTER_NEW_NAME', ++$i);
 
 const HOOK_FIRST = HOOK_INIT;

system/templates/account.change-email.html.twig

@@ -5,18 +5,18 @@ Please enter your password and the new email address. Make sure that you enter a
 	<table style="width:100%;">
 		<tr>
 			<td class="LabelV" >
-				<label for="new_email">New Email Address:</label>
+				<span>New Email Address:</span>
 			</td>
 			<td style="width:90%;">
-				<input form="form" id="new_email" name="new_email" value="{% if new_email is defined %}{{ new_email }}{% endif %}" size="30" maxlength="50" autofocus/>
+				<input form="form" name="new_email" value="{% if new_email is defined %}{{ new_email }}{% endif %}" size="30" maxlength="50" autofocus/>
 			</td>
 		</tr>
 		<tr>
 			<td class="LabelV">
-				<label for="password">Password:</label>
+				<span >Password:</span>
 			</td>
 			<td>
-				<input form="form" type="password" id="password" name="password" size="30" maxlength="29">
+				<input form="form" type="password" name="password" size="30" maxlength="29">
 			</td>
 		</tr>
 	</table>

system/templates/account.change-info.html.twig

@@ -4,26 +4,20 @@ Here you can tell other players about yourself. This information will be display
 {% set content %}
 <table style="width: 100%;" >
 	<tr>
-		<td class="LabelV">
-			<label for="info_rlname">Real Name:</label>
-		</td>
+		<td class="LabelV">Real Name:</td>
 		<td style="width:90%;" >
-			<input form="form" id="info_rlname" name="info_rlname" value="{{ account_rlname }}" size="30" maxlength="50" >
+			<input form="form" name="info_rlname" value="{{ account_rlname }}" size="30" maxlength="50" >
 		</td>
 	</tr>
 	<tr>
-		<td class="LabelV">
-			<label for="info_location">Location:</label>
-		</td>
+		<td class="LabelV" >Location:</td>
 		<td>
-			<input form="form" id="info_location" name="info_location" value="{{ account_location }}" size="30" maxlength="50" >
+			<input form="form" name="info_location" value="{{ account_location }}" size="30" maxlength="50" >
 		</td>
 	</tr>
 	{% if setting('core.account_country') %}
 	<tr>
-		<td class="LabelV">
-			<label for="account_country">Country:</label>
-		</td>
+		<td class="LabelV">Country:</td>
 		<td>
 			<select form="form" name="info_country" id="account_country">
 				{% for code, country in countries %}

system/templates/account.change-password.html.twig

@@ -6,7 +6,7 @@ Please enter your current password and a new password. For your security, please
 <table style="width:100%;">
 	<tr>
 		<td class="LabelV">
-			<label for="old_password">Current Password:</label>
+			<span>Current Password:</span>
 		</td>
 		<td>
 			<input form="form" type="password" id="old_password" name="old_password" size="30" maxlength="29">
@@ -17,7 +17,7 @@ Please enter your current password and a new password. For your security, please
 
 	<tr>
 		<td class="LabelV">
-			<label for="new_password">New Password:</label>
+			<span>New Password:</span>
 		</td>
 		<td style="width:90%;">
 			<input form="form" type="password" id="new_password" name="new_password" size="30" maxlength="29">
@@ -28,7 +28,7 @@ Please enter your current password and a new password. For your security, please
 
 	<tr>
 		<td class="LabelV">
-			<label for="new_password_confirm">New Password Again:</label>
+			<span>New Password Again:</span>
 		</td>
 		<td>
 			<input form="form" type="password" id="new_password_confirm" name="new_password_confirm" size="30" maxlength="29">

system/templates/account.characters.change-name.html.twig

@@ -1,4 +1,4 @@
-To change the name of a character, select a player and choose a new name.<br/>
+To change a name of character select player and choose a new name.<br/>
 <span style="color: red">Change name cost {{ setting('core.account_change_character_name_price') }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}. You have {{ points }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}.</span><br/><br/>
 
 {% set title = 'Change Name' %}
@@ -6,11 +6,9 @@ To change the name of a character, select a player and choose a new name.<br/>
 {% set content %}
 <table style="width:100%;" >
 	<tr>
-		<td class="LabelV">
-			<label for="player_id">Character:</label>
-		</td>
+		<td class="LabelV" ><span>Character:</span></td>
 		<td style="width:90%;" >
-			<select form="form" id="player_id" name="player_id">
+			<select form="form" name="player_id">
 				{% for player in account_logged.getPlayersList(false) %}
 				<option value="{{ player.getId() }}">{{ player.getName() }}</option>
 				{% endfor %}
@@ -18,9 +16,7 @@ To change the name of a character, select a player and choose a new name.<br/>
 		</td>
 	</tr>
 	<tr>
-		<td class="LabelV">
-			<label for="character_name">New Name:</label>
-		</td>
+		<td class="LabelV" ><span>New Name:</span></td>
 		<td>
 			<input form="form" type="text" name="name" id="character_name" size="25" maxlength="25" >
 			<img id="character_indicator" src="images/global/general/{% if not save or errors|length > 0 %}n{% endif %}ok.gif" />

system/templates/account.characters.change-sex.html.twig

@@ -6,11 +6,9 @@ To change a sex of character select player and choose a new sex.<br/>
 {% set content %}
 <table style="width:100%;" >
 	<tr>
-		<td class="LabelV">
-			<label for="player_id">Character:</label>
-		</td>
+		<td class="LabelV" ><span>Character:</span></td>
 		<td style="width:90%;" >
-			<select form="form" id="player_id" name="player_id">
+			<select form="form" name="player_id">
 				{% for player in players %}
 				<option value="{{ player.getId() }}">{{ player.getName() }}</option>
 				{% endfor %}
@@ -18,11 +16,9 @@ To change a sex of character select player and choose a new sex.<br/>
 		</td>
 	</tr>
 	<tr>
-		<td class="LabelV">
-			<label for="new_sex">New Sex:</label>
-		</td>
+		<td class="LabelV" ><span>New Sex:</span></td>
 		<td>
-			<select form="form" id="new_sex" name="new_sex">
+			<select form="form" name="new_sex">
 				{% for id, gender in config.genders %}
 				<option value="{{ id }}"{% if player_sex == id %} selected{% endif %}>{{ gender }}</option>
 				{% endfor %}

system/templates/account.characters.delete.html.twig

@@ -4,19 +4,15 @@ To delete a character enter the name of the character and your password.<br/><br
 {% set content %}
 <table style="width:100%;">
 	<tr>
-		<td class="LabelV">
-			<label for="delete_name">Character Name:</label>
-		</td>
+		<td class="LabelV" ><span>Character Name:</span></td>
 		<td style="width:90%;">
-			<input form="form" id="delete_name" name="delete_name" value="" size="30" maxlength="29"/>
+			<input form="form" name="delete_name" value="" size="30" maxlength="29"/>
 		</td>
 	</tr>
 	<tr>
-		<td class="LabelV">
-			<label for="delete_password">Password:</label>
-		</td>
+		<td class="LabelV" ><span>Password:</span></td>
 		<td>
-			<input form="form" type="password" id="delete_password" name="delete_password" size="30" maxlength="29"/>
+			<input form="form" type="password" name="delete_password" size="30" maxlength="29"/>
 		</td>
 	</tr>
 </table>

system/templates/account.create.html.twig

@@ -48,7 +48,7 @@
 								</tr>
 
 								{% if setting('core.mail_enabled') and setting('core.account_mail_verify') %}
-									<tr><td></td><td><span><strong>Please use a real address!<br/>We will send a link to validate your Email.</strong></span></td></tr>
+									<tr><td></td><td><span><strong>Please use real address!<br/>We will send a link to validate your Email.</strong></span></td></tr>
 								{% endif %}
 
 								{{ hook('HOOK_ACCOUNT_CREATE_AFTER_EMAIL') }}

system/templates/account.generate_new_recovery_key.html.twig

@@ -1,15 +1,13 @@
-To generate a new recovery key for your account, please enter your password.<br/>
-<span style="color: red"><b>New recovery key cost {{ setting('core.account_change_character_name_price') }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}. You have {{ points }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}. You will receive an e-mail with this recovery key.
+To generate new recovery key for your account please enter your password.<br/>
+<span style="color: red"><b>New recovery key cost {{ setting('core.account_generate_new_reckey_price') }} Premium Points</b>.</span> You have {{ points }} premium points. You will receive e-mail with this recovery key.
 <br/>
 {% set title = 'Generate recovery key' %}
 {% set background = config('darkborder') %}
 {% set content %}
 <table style="width:100%;">
 	<tr>
-		<td class="LabelV">
-			<label for="reg_password">Password:</label>
-		</td>
-		<td><input form="form" type="password" id="reg_password" name="reg_password" size="30" maxlength="29" ></td>
+		<td class="LabelV"><span>Password:</span></td>
+		<td><input form="form" type="password" name="reg_password" size="30" maxlength="29" ></td>
 	</tr>
 </table>
 {% endset %}
@@ -20,7 +18,7 @@ To generate a new recovery key for your account, please enter your password.<br/
 		<td>
 			<table border="0" cellspacing="0" cellpadding="0">
 				<tr>
-					<td style="border:0;">
+					<td style="border:0px;">
 						<form id="form" action="{{ getLink('account/register-new') }}" method="post">
 							{{ csrf() }}
 							<input type="hidden" name="registeraccountsave" value="1">
@@ -33,7 +31,7 @@ To generate a new recovery key for your account, please enter your password.<br/
 		<td>
 			<table border="0" cellspacing="0" cellpadding="0">
 				<tr>
-					<td style="border:0;">
+					<td style="border:0px;">
 						<form action="{{ getLink('account/manage') }}" method="post">
 							{{ csrf() }}
 							{{ include('buttons.back.html.twig') }}

system/templates/account.generate_recovery_key.html.twig

@@ -5,10 +5,10 @@ To generate recovery key for your account please enter your password.<br/><br/>
 <table style="width:100%;" >
 	<tr>
 		<td class="LabelV">
-			<label for="reg_password">Password:</label>
+			<span>Password:</span>
 		</td>
 		<td>
-			<input form="form" type="password" id="reg_password" name="reg_password" size="30" maxlength="29" autofocus/>
+			<input form="form" type="password" name="reg_password" size="30" maxlength="29" autofocus/>
 		</td>
 	</tr>
 </table>
@@ -20,7 +20,7 @@ To generate recovery key for your account please enter your password.<br/><br/>
 		<td>
 			<table border="0" cellspacing="0" cellpadding="0" >
 				<tr>
-					<td style="border:0;">
+					<td style="border:0px;">
 						<form id="form" action="{{ getLink('account/register') }}" method="post">
 							{{ csrf() }}
 							<input type="hidden" name="registeraccountsave" value="1"/>

system/templates/account.management.html.twig

@@ -179,7 +179,7 @@
 				{% set i = i + 1 %}
 				<tr bgcolor="{{ getStyle(i) }}">
 					<td>
-						<a href="{{ getLink('characters/' ~ player.getName()|urlencode) }}">{{ player.getName() }}</a>{% if player.isDeleted() %}<span style="color: red"><b> [ DELETED ] </b></span>{% endif %}
+						<a href="{{ getLink('characters/' ~ player.getName()|urlencode) }}">{{ player.getName() }}</a>
 					</td>
 					<td>{{ player.getLevel() }}</td>
 					<td>{{ player.getVocationName() }}</td>

system/templates/admin.changelog.html.twig

@@ -1,6 +1,6 @@
 <div class="card card-info card-outline">
 	<div class="card-header">
-		<h5 class="m-0">Changelogs:
+		<h5 class="m-0">News:
 			<form method="post" class="float-right">
 				{{ csrf() }}
 				<input type="hidden" name="action" value="new" />

system/templates/characters.html.twig

@@ -17,7 +17,7 @@
 		{% endif %}
 		<table border="0" cellspacing="1" cellpadding="4" width="100%">
 			{% if config.characters.outfit %}
-			<div style="width:64px;height:64px;border:2px solid #F1E0C6; border-radius:50px; padding:13px; margin-top:38px;margin-left:376px;position:absolute;"><img style="margin-left:-60px;margin-top:-60px;width:128px;height:128px;" src="{{ outfit }}" alt="player outfit"/></div>
+			<div style="width:64px;height:64px;border:2px solid #F1E0C6; border-radius:50px; padding:13px; margin-top:38px;margin-left:376px;position:absolute;"><img style="margin-left:{% if player.getLookType() in setting('core.outfit_images_wrong_looktypes') %}-0px;margin-top:-0px;width:64px;height:64px;{% else %}-60px;margin-top:-60px;width:128px;height:128px;{% endif %}" src="{{ outfit }}" alt="player outfit"/></div>
 			{% endif %}
 
 			<tr bgcolor="{{ config.vdarkborder }}">

system/templates/forum.new_post.html.twig

@@ -1,7 +1,7 @@
 <form action="?" method="post">
 	{{ csrf() }}
 	<input type="hidden" name="action" value="new_post" />
-	<input type="hidden" name="thread_id" value="{{ thread_id }}" />
+	<input type="hidden" name="thread_id" value=" {{ thread_id }}" />
 	<input type="hidden" name="subtopic" value="forum" />
 	<input type="hidden" name="save" value="save" />
 	<table width="100%">
@@ -43,8 +43,7 @@
 		</tr>
 	</table>
 	<div style="text-align:center">
-		{% set button_name = 'Post Reply' %}
-		{{ include('buttons.base.html.twig') }}
+		<input type="submit" value="Post Reply" />
 	</div>
 </form>
 

system/templates/forum.new_thread.html.twig

@@ -44,7 +44,6 @@
 		</tr>
 	</table>
 	<div style="text-align:center">
-		{% set button_name = 'Post Thread' %}
-		{{ include('buttons.base.html.twig') }}
+		<input type="submit" value="Post Thread" />
 	</div>
 </form>

system/templates/forum.show_thread.html.twig

@@ -24,7 +24,7 @@ Page: {{ links_to_pages|raw }}<br/>
 		{% set i = i + 1 %}
 		<td valign="top">{{ post.player_link|raw }}<br/>
 			{% if post.outfit is defined %}
-			<img style="margin-left:-60px;margin-top:-60px;width:128px;height:128px;" src="{{ post.outfit }}" alt="player outfit"/>
+			<img style="margin-left:{% if post.player.getLookType() in setting('core.outfit_images_wrong_looktypes') %}-0px;margin-top:-0px;width:64px;height:64px;{% else %}-60px;margin-top:-60px;width:128px;height:128px;{% endif %}" src="{{ post.outfit }}" alt="player outfit"/>
 			<br />
 			{% endif %}
 			<span style="font-size: 10px">

system/templates/guilds.leave_guild.html.twig

@@ -6,7 +6,7 @@
 		<td class="white"><b>Leave guild</b></td></tr>
 	{% if players|length > 0 %}
 	<tr bgcolor="{{ config.lightborder }}">
-		<td width="100%">Select a character to leave the guild:</td>
+		<td width="100%">Select character to leave guild:</td>
 	</tr>
 	<tr bgcolor="{{ config.darkborder }}">
 		<td>

system/templates/guilds.manager.html.twig

@@ -105,8 +105,7 @@ Here you can change names of ranks, delete and add ranks, pass leadership to oth
 				<form action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=delete_rank" method="post" style="display: inline;">
 					{{ csrf() }}
 					<input type="hidden" name="rankid" value="{{ rank.getId() }}" />
-
-					<input type="submit" value="Delete" />
+					<input type="image" src="/images/news/delete.png" border="0" alt="Delete" />
 				</form>
 			</td>
 			<td>

system/templates/online.html.twig

@@ -4,35 +4,24 @@
 <br/>
 {% endif %}
 
-<br/>
-
 {# vocation statistics #}
 {% if setting('core.online_vocations') %}
-
-	{% set title = 'Vocation statistics' %}
-	{% set tableClass = 'Table3' %}
-	{% set background = config('darkborder') %}
-	{% set content %}
-
+<br/>
 	{% if setting('core.online_vocations_images') %}
-	<table width="200" cellspacing="1" cellpadding="0" border="0" align="center" class="myaac-table">
-		<thead>
-		<tr>
-			<td class="white" style="text-align: center;"><strong>Sorcerers</strong></td>
-			<td class="white" style="text-align: center;"><strong>Druids</strong></td>
-			<td class="white" style="text-align: center;"><strong>Paladins</strong></td>
-			<td class="white" style="text-align: center;"><strong>Knights</strong></td>
-		</tr>
-		</thead>
-
-		<tr>
+	<table width="200" cellspacing="1" cellpadding="0" border="0" align="center">
+		<tr bgcolor="{{ config.darkborder }}">
 			<td><img src="images/sorcerer.png" /></td>
 			<td><img src="images/druid.png" /></td>
 			<td><img src="images/paladin.png" /></td>
 			<td><img src="images/knight.png" /></td>
 		</tr>
-
-		<tr>
+		<tr bgcolor="{{ config.vdarkborder }}">
+			<td class="white" style="text-align: center;"><strong>Sorcerers</strong></td>
+			<td class="white" style="text-align: center;"><strong>Druids</strong></td>
+			<td class="white" style="text-align: center;"><strong>Paladins</strong></td>
+			<td class="white" style="text-align: center;"><strong>Knights</strong></td>
+		</tr>
+		<tr bgcolor="{{ config.lightborder }}">
 			<td style="text-align: center;">{{ vocs[1] }}</td>
 			<td style="text-align: center;">{{ vocs[2] }}</td>
 			<td style="text-align: center;">{{ vocs[3] }}</td>
@@ -40,30 +29,30 @@
 		</tr>
 	</table>
 	<div style="text-align: center;">&nbsp;</div>
-	{% else %}
-	<table border="0" cellspacing="1" cellpadding="4" width="100%" class="myaac-table">
+		{% else %}
+	<table border="0" cellspacing="1" cellpadding="4" width="100%">
+		<tr bgcolor="{{ config.vdarkborder }}">
+			<td class="white" colspan="2"><b>Vocation statistics</b></td>
+		</tr>
+
 		{% for i in 1..config.vocations_amount %}
-		<tr>
+		<tr bgcolor="{{ getStyle(i) }}">
 			<td width="25%">{{ config.vocations[i] }}</td>
 			<td width="75%">{{ vocs[i] }}</td>
 		</tr>
 		{% endfor %}
 	</table>
-	<br/>
+<br/>
 	{% endif %}
-
-{% endset %}
-{% include 'tables.headline.html.twig' %}
-
 {% endif %}
 
 <br/>
 
 {# show skulls #}
 {% if setting('core.online_skulls') %}
-<table width="100%" cellspacing="1" class="myaac-table">
+<table width="100%" cellspacing="1">
 	<tr>
-		<td align="center">
+		<td style="background: {{ config.darkborder }};" align="center">
 			<img src="images/white_skull.gif"/> - 1 - 6 Frags<br/>
 			<img src="images/red_skull.gif"/> - 6+ Frags or Red Skull<br/>
 			<img src="images/black_skull.gif"/> - 10+ Frags or Black Skull
@@ -136,24 +125,23 @@
 {% set title = 'Players Online' %}
 {% set tableClass = 'Table2' %}
 {% set content %}
-<table width="100%" class="myaac-table">
-
-	<tr class="LabelH" style="z-index: 20;">
+<table width="100%">
+	<tr class="LabelH" style="position: relative; z-index: 20;">
 		{% if setting('core.account_country') %}
-			<td style="width: 6px;"><a href="{{ getLink('online')}}?order=country_{{ order == 'country_asc' ? 'desc' : 'asc' }}">#&#160;&#160;</a>
+			<td width="11px"><a href="{{ getLink('online')}}?order=country_{{ order == 'country_asc' ? 'desc' : 'asc' }}">#&#160;&#160;</a>
 			</td>
 		{% endif %}
 		{% if setting('core.online_outfit') %}
-			<td style="width: 32px;"><b>Outfit</b></td>
+			<td><b>Outfit</b></td>
 		{% endif %}
-		<td style="text-align:left;">Name&#160;&#160;
+		<td style="text-align:left; width:50%">Name&#160;&#160;
 			<small style="font-weight:normal">[<a href="{{ getLink('online')}}?order=name_{{ order == 'name_asc' ? 'desc' : 'asc' }}">sort</a>]</small>
 			<img class="sortarrow" src="images/{{ order == 'name_asc' ? 'order_desc' : (order == 'name_desc' ? 'order_asc' : 'news/blank') }}.gif"/></td>
-		<td style="text-align:left;width:10%">Level&#160;&#160;
+		<td style="text-align:left;width:30%">Level&#160;&#160;
 			<small style="font-weight:normal">[<a href="{{ getLink('online')}}?order=level_{{ order == 'level_asc' ? 'desc' : 'asc' }}">sort</a>]</small>
 			<img class="sortarrow" src="images/{{ order == 'level_asc' ? 'order_desc' : (order == 'level_desc' ? 'order_asc' : 'news/blank') }}.gif"/>
 		</td>
-		<td style="text-align:left;width:20%">Vocation&#160;&#160;
+		<td style="text-align:left;width:50%">Vocation&#160;&#160;
 			<small style="font-weight:normal">[<a href="{{ getLink('online')}}?order=vocation_{{ order == 'vocation_asc' ? 'desc' : 'asc' }}">sort</a>]</small>
 			<img class="sortarrow" src="images/{{ order == 'vocation_asc' ? 'order_desc' : (order == 'vocation_desc' ? 'order_asc' : 'news/blank') }}.gif"/>
 		</td>
@@ -163,20 +151,20 @@
 	{% for player in players %}
 		{% set i = i + 1 %}
 
-		<tr style="text-align: right; height: 40px;">
+		<tr style="background: {{ getStyle(i) }}; text-align: right; height: 40px;">
 			{% if setting('core.account_country') %}
 				<td>{{ player.country_image|raw }}</td>
 			{% endif %}
 
 			{% if setting('core.online_outfit') %}
-				<td><img style="position:absolute;margin-top:-48px;margin-left:-70px;" src="{{ player.outfit }}" alt="player outfit"/></td>
+				<td width="5%"><img style="position:absolute;margin-top:-48px;margin-left:-70px;" src="{{ player.outfit }}" alt="player outfit"/></td>
 			{% endif %}
 
-			<td style="text-align:left">
+			<td style="width:70%; text-align:left">
 				{{ player.name|raw }}{{ player.skull|raw }}
 			</td>
-			<td>{{ player.level }}</td>
-			<td>{{ player.vocation }}</td>
+			<td style="width:10%">{{ player.level }}</td>
+			<td style="width:20%">{{ player.vocation }}</td>
 		</tr>
 	{% endfor %}
 </table>

system/templates/team.html.twig

@@ -47,7 +47,7 @@
 
 					{% if setting('core.team_outfit') %}
 					<td>
-						<img style="position: absolute; margin-top: -50px; margin-left: -30px;" src="{{ member.outfit }}" alt="player outfit"/>
+						<img style="position: absolute; margin-top: {% if member.player.looktype in setting('core.outfit_images_wrong_looktypes') %}-16px;margin-left:-0px;{% else %} -45px; margin-left: -30px;{%  endif %}" src="{{ member.outfit }}" alt="player outfit"/>
 					</td>
 					{% endif %}
 
@@ -127,7 +127,7 @@
 				<tr bgcolor="{{ getStyle(i) }}" style="height: 32px;">
 				{% if setting('core.team_outfit') %}
 				<td>
-					<img style="position: absolute; margin-top: -50px; margin-left: -30px;" src="{{ member.outfit }}" alt="player outfit"/>
+					<img style="position: absolute; margin-top: {% if member.player.looktype in setting('core.outfit_images_wrong_looktypes') %}-16px;margin-left:-0px;{% else %} -45px; margin-left: -30px;{%  endif %}" src="{{ member.outfit }}" alt="player outfit"/>
 				</td>
 				{% endif %}
 

templates/tibiacom/boxes/templates/highscores.html.twig

@@ -46,7 +46,7 @@
     {% for player in topPlayers %}
 	    <div style="text-align:left"><a href="{{ getPlayerLink(player['name'], false) }} " class="topfont {% if player['online'] %}online{% else %}offline{% endif %}">
 			{% if setting('core.online_outfit') %}
-				<img style="position:absolute;margin-top:-45px;margin-left:-25px;" src="{{ player.outfit }}" alt="player outfit"/>
+				<img style="position:absolute;margin-top:{% if player.looktype in setting('core.outfit_images_wrong_looktypes') %}-20px;margin-left:-0px;{% else %}-45px;margin-left:-25px;{%  endif %}" src="{{ player.outfit }}" alt="player outfit"/>
 			{% endif %}
 				<span style="color: #CCC; margin-left: 40px">{{ player['rank'] }} - </span>
 				{{ player['name'] }}

tools/signature/index.php

@@ -35,14 +35,14 @@
 	if(!isset($_REQUEST['name']))
 		die('Please enter name as get or post parameter.');
 
+	$name = stripslashes(ucwords(strtolower(trim($_REQUEST['name']))));
 	$player = new OTS_Player();
-	$player->find($_REQUEST['name']);
+	$player->find($name);
 
 	if(!$player->isLoaded())
 	{
-		//header('Content-type: image/png');
-		//readfile(SIGNATURES_IMAGES.'nocharacter.png');
-		http_response_code(404);
+		header('Content-type: image/png');
+		readfile(SIGNATURES_IMAGES.'nocharacter.png');
 		exit;
 	}