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

CHANGELOG-1.x.md

@@ -1,18 +1,5 @@
 # Changelog
 
-## [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

CHANGELOG-2.x.md

@@ -1,4 +0,0 @@
-## [2.0-dev - x.x.2025]
-
-### Changed
-* Reworked account action logs to use single IP column as varchar(45) for both ipv4 and ipv6 (https://github.com/slawkens/myaac/pull/289)

admin/pages/accounts.php

@@ -9,7 +9,6 @@
  */
 
 use MyAAC\Models\Account as AccountModel;
-use MyAAC\Models\AccountAction;
 use MyAAC\Models\Player;
 
 defined('MYAAC') or die('Direct access not allowed!');
@@ -482,8 +481,9 @@ else if (isset($_REQUEST['search'])) {
 									</thead>
 									<tbody>
 										<?php
-											$accountActions = AccountAction::where('account_id', $account->getId())->orderByDesc('date')->get();
+											$accountActions = \MyAAC\Models\AccountAction::where('account_id', $account->getId())->orderByDesc('date')->get();
 											foreach ($accountActions as $i => $log):
+												$log->ip = ($log->ip != 0 ? long2ip($log->ip) : inet_ntop($log->ipv6));
 												?>
 											<tr>
 												<td><?php echo $i + 1; ?></td>

common.php

@@ -26,8 +26,8 @@
 if (version_compare(phpversion(), '8.1', '<')) die('PHP version 8.1 or higher is required.');
 
 const MYAAC = true;
-const MYAAC_VERSION = '2.0-dev';
-const DATABASE_VERSION = 47;
+const MYAAC_VERSION = '1.8.6-dev';
+const DATABASE_VERSION = 46;
 const TABLE_PREFIX = 'myaac_';
 define('START_TIME', microtime(true));
 define('MYAAC_OS', stripos(PHP_OS, 'WIN') === 0 ? 'WINDOWS' : (strtoupper(PHP_OS) === 'DARWIN' ? 'MAC' : 'LINUX'));

install/includes/schema.sql

@@ -1,11 +1,11 @@
 CREATE TABLE IF NOT EXISTS `myaac_account_actions`
 (
-	`id` int NOT NULL AUTO_INCREMENT,
 	`account_id` int NOT NULL,
-	`ip` varchar(45) NOT NULL DEFAULT '',
+	`ip` int unsigned NOT NULL DEFAULT 0,
+	`ipv6` binary(16) NOT NULL DEFAULT 0,
 	`date` int NOT NULL DEFAULT 0,
 	`action` varchar(255) NOT NULL DEFAULT '',
-	PRIMARY KEY (`id`)
+	KEY (`account_id`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `myaac_account_emails_verify`

system/compat/config.php

@@ -5,6 +5,8 @@ $deprecatedConfig = [
 	'genders',
 	'template',
 	'template_allow_change',
+	'vocations_amount',
+	'vocations',
 	'client',
 	'session_prefix',
 	'friendly_urls',

system/init.php

@@ -14,7 +14,6 @@ use MyAAC\CsrfToken;
 use MyAAC\Hooks;
 use MyAAC\Plugins;
 use MyAAC\Models\Town;
-use MyAAC\Server\XML\Vocations;
 use MyAAC\Settings;
 
 defined('MYAAC') or die('Direct access not allowed!');
@@ -215,5 +214,3 @@ if (count($towns) <= 0) {
 
 config(['towns', $towns]);
 unset($towns);
-
-new Vocations();

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/libs/pot/OTS_Account.php

@@ -12,8 +12,6 @@
  * @license http://www.gnu.org/licenses/lgpl-3.0.txt GNU Lesser General Public License, Version 3
  */
 
-use MyAAC\Models\AccountAction;
-
 /**
  * OTServ account abstraction.
  *
@@ -1009,16 +1007,26 @@ class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable
 
 	public function logAction($action)
 	{
-		AccountAction::create([
-			'account_id' => $this->getId(),
-			'ip' => get_browser_real_ip(),
-			'date' => time(),
-			'action' => $action,
-		]);
+		$ip = get_browser_real_ip();
+		if(!str_contains($ip, ":")) {
+			$ipv6 = '0';
+		}
+		else {
+			$ipv6 = $ip;
+			$ip = '';
+		}
+
+		return $this->db->exec('INSERT INTO `' . TABLE_PREFIX . 'account_actions` (`account_id`, `ip`, `ipv6`, `date`, `action`) VALUES (' . $this->db->quote($this->getId()).', ' . ($ip == '' ? '0' : $this->db->quote(ip2long($ip))) . ', (' . ($ipv6 == '0' ? $this->db->quote('') : $this->db->quote(inet_pton($ipv6))) . '), UNIX_TIMESTAMP(NOW()), ' . $this->db->quote($action).')');
 	}
 
-	public function getActionsLog($limit) {
-		return AccountAction::where('account_id', $this->data['id'])->orderByDesc('date')->limit($limit)->get()->toArray();
+	public function getActionsLog($limit1, $limit2)
+	{
+		$actions = array();
+
+		foreach($this->db->query('SELECT `ip`, `ipv6`, `date`, `action` FROM `' . TABLE_PREFIX . 'account_actions` WHERE `account_id` = ' . $this->data['id'] . ' ORDER by `date` DESC LIMIT ' . $limit1 . ', ' . $limit2 . '')->fetchAll() as $a)
+			$actions[] = array('ip' => $a['ip'], 'ipv6' => $a['ipv6'], 'date' => $a['date'], 'action' => $a['action']);
+
+		return $actions;
 	}
 /**
  * Returns players iterator.

system/libs/pot/OTS_DB_MySQL.php

@@ -26,7 +26,6 @@ use MyAAC\Cache\Cache;
  */
 class OTS_DB_MySQL extends OTS_Base_DB
 {
-	private bool $hasCacheChanged = false;
 	private array $has_table_cache = [];
 	private array $has_column_cache = [];
 	private array $get_column_info_cache = [];
@@ -165,7 +164,7 @@ class OTS_DB_MySQL extends OTS_Base_DB
 				$cache->delete('database_columns_info');
 				$cache->delete('database_checksum');
 			}
-			else if ($this->hasCacheChanged) {
+			else {
 				$cache->set('database_tables', serialize($this->has_table_cache), 3600);
 				$cache->set('database_columns', serialize($this->has_column_cache), 3600);
 				$cache->set('database_columns_info', serialize($this->get_column_info_cache), 3600);
@@ -229,8 +228,6 @@ class OTS_DB_MySQL extends OTS_Base_DB
 
 	private function hasTableInternal($name): bool
 	{
-		$this->hasCacheChanged = true;
-
 		return ($this->has_table_cache[$name] = $this->query('SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `TABLE_SCHEMA` = ' . $this->quote(config('database_name')) . ' AND `TABLE_NAME` = ' . $this->quote($name) . ' LIMIT 1;')->rowCount() > 0);
 	}
 
@@ -244,8 +241,6 @@ class OTS_DB_MySQL extends OTS_Base_DB
 	}
 
 	private function hasColumnInternal($table, $column): bool {
-		$this->hasCacheChanged = true;
-
 		return $this->hasTable($table) && ($this->has_column_cache[$table . '.' . $column] = count($this->query('SHOW COLUMNS FROM `' . $table . "` LIKE " . $this->quote($column))->fetchAll()) > 0);
 	}
 
@@ -277,14 +272,11 @@ class OTS_DB_MySQL extends OTS_Base_DB
 			return false;
 		}
 
-		$this->hasCacheChanged = true;
-
 		$formatResult = function ($result) {
 			return [
 				'field' => $result['Field'],
 				'type' => $result['Type'],
 				'null' => strtolower($result['Null']),
-				'key' => strtolower($result['Key'] ?? ''),
 				'default' => $result['Default'],
 				'extra' => $result['Extra'],
 			];

system/libs/pot/OTS_Player.php

@@ -852,7 +852,13 @@ class OTS_Player extends OTS_Row_DAO
 			throw new E_OTS_NotLoaded();
 		}
 
-		return \OTS_Toolbox::getVocationFromPromotion($this->data['vocation'], $this->data['promotion'] ?? 0);
+		if(isset($this->data['promotion'])) {
+			global $config;
+			if((int)$this->data['promotion'] > 0)
+				return ($this->data['vocation'] + ($this->data['promotion'] * $config['vocations_amount']));
+		}
+
+		return $this->data['vocation'];
 	}
 
 

system/libs/pot/OTS_Toolbox.php

@@ -13,8 +13,6 @@
  * @license http://www.gnu.org/licenses/lgpl-3.0.txt GNU Lesser General Public License, Version 3
  */
 
-use MyAAC\Server\XML\Vocations;
-
 /**
  * Toolbox for common operations.
  *
@@ -112,21 +110,14 @@ class OTS_Toolbox
 		$list->setFilter($filter);
 		return $list;
 	}
-	public static function getVocationFromPromotion($id, $promotion = 0): int
+
+	public static function getVocationName($id, $promotion = 0): string
 	{
 		if($promotion > 0) {
-			for ($i = 0; $i < $promotion; $i++) {
-				if ($_id = Vocations::getPromoted($id)) {
-					$id = $_id;
-				}
-			}
+			$id = ($id + ($promotion * config('vocations_amount')));
 		}
 
-		return $id;
-	}
-
-	public static function getVocationName($id, $promotion = 0): string {
-		return config('vocations')[self::getVocationFromPromotion($id, $promotion)] ?? 'Unknown';
+		return config('vocations')[$id] ?? 'Unknown';
 	}
 }
 

system/migrations/47.php

@@ -1,42 +0,0 @@
-<?php
-/**
- * @var OTS_DB_MySQL $db
- */
-
-// 2025-02-27
-// remove ipv6, change to ip (for both ipv4 + ipv6) as VARCHAR(45)
-$up = function () use ($db) {
-	$accountActionsInfo = $db->getColumnInfo(TABLE_PREFIX . 'account_actions', 'account_id');
-	if ($accountActionsInfo && is_array($accountActionsInfo) && $accountActionsInfo['key'] == 'pri') {
-		$db->query("ALTER TABLE `myaac_account_actions` DROP KEY `account_id`;");
-	}
-
-	if (!$db->hasColumn(TABLE_PREFIX . 'account_actions', 'id')) {
-		$db->addColumn(TABLE_PREFIX . 'account_actions', 'id', 'INT NOT NULL AUTO_INCREMENT FIRST, ADD PRIMARY KEY (`id`)');
-	}
-
-	$db->modifyColumn(TABLE_PREFIX . 'account_actions', 'ip', "VARCHAR(45) NOT NULL DEFAULT ''");
-	$db->query("UPDATE `" . TABLE_PREFIX . "account_actions` SET `ip` = INET_NTOA(`ip`) WHERE `ip` != '0';");
-	$db->query("UPDATE `" . TABLE_PREFIX . "account_actions` SET `ip` = INET6_NTOA(`ipv6`) WHERE `ip` = '0';");
-
-	if ($db->hasColumn(TABLE_PREFIX . 'account_actions', 'ipv6')) {
-		$db->dropColumn(TABLE_PREFIX . 'account_actions', 'ipv6');
-	}
-};
-
-$down = function () use ($db) {
-	if ($db->hasColumn(TABLE_PREFIX . 'account_actions', 'id')) {
-		$db->query("ALTER TABLE `" . TABLE_PREFIX . "account_actions` DROP `id`;");
-	}
-
-	$db->query("ALTER TABLE  `" . TABLE_PREFIX . "account_actions` ADD KEY (`account_id`);");
-
-	if (!$db->hasColumn(TABLE_PREFIX . 'account_actions', 'ipv6')) {
-		$db->addColumn(TABLE_PREFIX . 'account_actions', 'ipv6', "BINARY(16) NOT NULL DEFAULT 0x00000000000000000000000000000000 AFTER ip");
-	}
-
-	$db->query("UPDATE `" . TABLE_PREFIX . "account_actions` SET `ipv6` = INET6_ATON(ip) WHERE NOT IS_IPV4(`ip`);");
-	$db->query("UPDATE `" . TABLE_PREFIX . "account_actions` SET `ip` = INET_ATON(`ip`) WHERE IS_IPV4(`ip`);");
-	$db->query("UPDATE `" . TABLE_PREFIX . "account_actions` SET `ip` = 0 WHERE `ipv6` != 0x00000000000000000000000000000000;");
-	$db->modifyColumn(TABLE_PREFIX . 'account_actions', 'ip', "INT(11) UNSIGNED NOT NULL DEFAULT 0;");
-};

system/pages/account/manage.php

@@ -96,8 +96,12 @@ if($email_new_time > 1)
 	}
 }
 
-$actions = $account_logged->getActionsLog(1000);
+$actions = array();
+foreach($account_logged->getActionsLog(0, 1000) as $action) {
+	$actions[] = array('action' => $action['action'], 'date' => $action['date'], 'ip' => $action['ip'] != 0 ? long2ip($action['ip']) : inet_ntop($action['ipv6']));
+}
 
+$players = array();
 /** @var OTS_Players_List $account_players */
 $account_players = $account_logged->getPlayersList();
 $account_players->orderBy('id');

system/pages/characters.php

@@ -452,8 +452,10 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil
 	if($query->rowCount() > 0) {
 		echo 'Did you mean:<ul>';
 		foreach($query as $player) {
-			$player['vocation'] = OTS_Toolbox::getVocationFromPromotion($player['vocation'], $player['promotion'] ?? 0);
-
+			if(isset($player['promotion'])) {
+				if((int)$player['promotion'] > 0)
+					$player['vocation'] += ($player['promotion'] * $config['vocations_amount']);
+			}
 			echo '<li>' . getPlayerLink($player['name']) . ' (<small><strong>level ' . $player['level'] . ', ' . $config['vocations'][$player['vocation']] . '</strong></small>)</li>';
 		}
 		echo '</ul>';

system/pages/highscores.php

@@ -13,7 +13,6 @@ use MyAAC\Cache\Cache;
 use MyAAC\Models\Player;
 use MyAAC\Models\PlayerDeath;
 use MyAAC\Models\PlayerKillers;
-use MyAAC\Server\XML\Vocations;
 
 defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Highscores';
@@ -36,20 +35,24 @@ if(!is_numeric($page) || $page < 1 || $page > PHP_INT_MAX) {
 $query = Player::query();
 
 $configVocations = config('vocations');
+$configVocationsAmount = config('vocations_amount');
 
 $vocationId = null;
 if($vocation !== 'all') {
 	foreach($configVocations as $id => $name) {
 		if(strtolower($name) == $vocation) {
 			$vocationId = $id;
-			$filterVocations = [$id];
+			$add_vocs = [$id];
 
-			while($tmpVoc = Vocations::getPromoted($id)) {
-				$id = $tmpVoc;
-				$filterVocations[] = $tmpVoc;
+			if ($id !== 0) {
+				$i = $id + $configVocationsAmount;
+				while (isset($configVocations[$i])) {
+					$add_vocs[] = $i;
+					$i += $configVocationsAmount;
+				}
 			}
 
-			$query->whereIn('players.vocation', $filterVocations);
+			$query->whereIn('players.vocation', $add_vocs);
 			break;
 		}
 	}
@@ -322,5 +325,4 @@ $twig->display('highscores.html.twig', [
 	'page' => $page,
 	'baseLink' => $baseLink,
 	'updatedAt' => $updatedAt,
-	'baseVocations' => Vocations::getBase(true),
 ]);

system/pages/online.php

@@ -12,7 +12,6 @@
 use MyAAC\Cache\Cache;
 use MyAAC\Models\ServerConfig;
 use MyAAC\Models\ServerRecord;
-use MyAAC\Server\XML\Vocations;
 
 defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Who is online?';
@@ -57,14 +56,15 @@ $cached = Cache::remember("online_$order", setting('core.online_cache_ttl') * 60
 
 	$vocations = array_map(function ($name) {
 		return 0;
-	}, config('vocations'));
+	}, setting('core.vocations'));
 
 	if($db->hasTable('players_online')) // tfs 1.0
 		$playersOnline = $db->query('SELECT `accounts`.`country`, `players`.`name`, `players`.`level`, `players`.`vocation`' . $outfit . ', `' . $skull_time . '` as `skulltime`, `' . $skull_type . '` as `skull` FROM `accounts`, `players`, `players_online` WHERE `players`.`id` = `players_online`.`player_id` AND `accounts`.`id` = `players`.`account_id`  ORDER BY ' . $orderSql);
 	else
 		$playersOnline = $db->query('SELECT `accounts`.`country`, `players`.`name`, `players`.`level`, `players`.`vocation`' . $outfit . ', ' . $promotion . ' `' . $skull_time . '` as `skulltime`, `' . $skull_type . '` as `skull` FROM `accounts`, `players` WHERE `players`.`online` > 0 AND `accounts`.`id` = `players`.`account_id`  ORDER BY ' . $orderSql);
 
-	$configVocations = config('vocations');
+	$settingVocations = setting('core.vocations');
+	$settingVocationsAmount = setting('core.vocations_amount');
 
 	$players = [];
 	foreach($playersOnline as $player) {
@@ -81,19 +81,22 @@ $cached = Cache::remember("online_$order", setting('core.online_cache_ttl') * 60
 			}
 		}
 
-		$player['vocation'] = OTS_Toolbox::getVocationFromPromotion($player['vocation'], $player['promotion'] ?? 0);
+		if(isset($player['promotion'])) {
+			if((int)$player['promotion'] > 0)
+				$player['vocation'] += ($player['promotion'] * $settingVocationsAmount);
+		}
 
 		$players[] = array(
 			'name' => getPlayerLink($player['name']),
 			'player' => $player,
 			'level' => $player['level'],
-			'vocation' => $configVocations[$player['vocation']],
+			'vocation' => $settingVocations[$player['vocation']],
 			'skull' => $skull,
 			'country_image' => getFlagImage($player['country']),
 			'outfit' => setting('core.outfit_images_url') . '?id=' . $player['looktype'] . ($outfit_addons ? '&addons=' . $player['lookaddons'] : '') . '&head=' . $player['lookhead'] . '&body=' . $player['lookbody'] . '&legs=' . $player['looklegs'] . '&feet=' . $player['lookfeet'],
 		);
 
-		$vocations[Vocations::getOriginal($player['vocation'])]++;
+		$vocations[($player['vocation'] > $settingVocationsAmount ? $player['vocation'] - $settingVocationsAmount : $player['vocation'])]++;
 	}
 
 	$record = '';
@@ -139,7 +142,6 @@ $twig->display('online.html.twig', array(
 	'vocations' => $cached['vocations'],
 	'vocs' => $cached['vocations'], // deprecated, to be removed
 	'order' => $order,
-	'baseVocations' => Vocations::getBase(false),
 ));
 
 // search bar

system/settings.php

@@ -219,14 +219,7 @@ return [
 		'cache_engine' => [
 			'name' => 'Cache Engine',
 			'type' => 'options',
-			'options' => [
-				'auto' => 'Auto',
-				'file' => 'Files',
-				'apc' => 'APC',
-				'apcu' => 'APCu',
-				'php' => 'PHP',
-				'disable' => 'Disable',
-			],
+			'options' => ['auto' => 'Auto', 'file' => 'Files', 'apc' => 'APC', 'apcu' => 'APCu', 'disable' => 'Disable'],
 			'desc' => 'Auto is most reasonable. It will detect the best cache engine',
 			'default' => 'auto',
 			'is_config' => true,
@@ -319,6 +312,23 @@ return [
 				},
 			],
 		],
+		'vocations_amount' => [
+			'name' => 'Vocations Amount',
+			'type' => 'number',
+			'desc' => 'How much basic vocations your server got (without promotion)',
+			'default' => 4,
+		],
+		'vocations' => [
+			'name' => 'Vocation Names',
+			'type' => 'textarea',
+			'desc' => 'Separated by comma. Must be in the same order as in vocations.xml, starting with id: 0.',
+			'default' => 'None, Sorcerer, Druid, Paladin, Knight, Master Sorcerer, Elder Druid,Royal Paladin, Elite Knight',
+			'callbacks' => [
+				'get' => function ($value) {
+					return array_map('trim', explode(',', $value));
+				},
+			],
+		],
 		[
 			'type' => 'category',
 			'title' => 'Database',

system/src/Cache/APC.php

@@ -13,8 +13,8 @@ namespace MyAAC\Cache;
 
 class APC
 {
-	private string $prefix;
-	private bool $enabled;
+	private $prefix;
+	private $enabled;
 
 	public function __construct($prefix = '')
 	{
@@ -22,14 +22,14 @@ class APC
 		$this->enabled = function_exists('apc_fetch');
 	}
 
-	public function set($key, $var, $ttl = 0): void
+	public function set($key, $var, $ttl = 0)
 	{
 		$key = $this->prefix . $key;
 		apc_delete($key);
 		apc_store($key, $var, $ttl);
 	}
 
-	public function get($key): string
+	public function get($key)
 	{
 		$tmp = '';
 		if ($this->fetch($this->prefix . $key, $tmp)) {
@@ -39,15 +39,18 @@ class APC
 		return '';
 	}
 
-	public function fetch($key, &$var): bool {
+	public function fetch($key, &$var)
+	{
 		return ($var = apc_fetch($this->prefix . $key)) !== false;
 	}
 
-	public function delete($key): void {
+	public function delete($key)
+	{
 		apc_delete($this->prefix . $key);
 	}
 
-	public function enabled(): bool {
+	public function enabled()
+	{
 		return $this->enabled;
 	}
 }

system/src/Cache/APCu.php

@@ -13,8 +13,8 @@ namespace MyAAC\Cache;
 
 class APCu
 {
-	private string $prefix;
-	private bool $enabled;
+	private $prefix;
+	private $enabled;
 
 	public function __construct($prefix = '')
 	{
@@ -22,14 +22,14 @@ class APCu
 		$this->enabled = function_exists('apcu_fetch');
 	}
 
-	public function set($key, $var, $ttl = 0): void
+	public function set($key, $var, $ttl = 0)
 	{
 		$key = $this->prefix . $key;
 		apcu_delete($key);
 		apcu_store($key, $var, $ttl);
 	}
 
-	public function get($key): string
+	public function get($key)
 	{
 		$tmp = '';
 		if ($this->fetch($this->prefix . $key, $tmp)) {
@@ -39,15 +39,18 @@ class APCu
 		return '';
 	}
 
-	public function fetch($key, &$var): bool {
+	public function fetch($key, &$var)
+	{
 		return ($var = apcu_fetch($this->prefix . $key)) !== false;
 	}
 
-	public function delete($key): void {
+	public function delete($key)
+	{
 		apcu_delete($this->prefix . $key);
 	}
 
-	public function enabled(): bool {
+	public function enabled()
+	{
 		return $this->enabled;
 	}
 }

system/src/Cache/Cache.php

@@ -83,7 +83,7 @@ class Cache
 	/**
 	 * @return string
 	 */
-	public static function detect(): string
+	public static function detect()
 	{
 		if (function_exists('apc_fetch'))
 			return 'apc';
@@ -98,7 +98,8 @@ class Cache
 	/**
 	 * @return bool
 	 */
-	public function enabled(): bool {
+	public function enabled()
+	{
 		return false;
 	}
 

system/src/Cache/File.php

@@ -12,22 +12,18 @@ namespace MyAAC\Cache;
 
 class File
 {
-	private string $prefix;
-	private string $dir;
-	private bool $enabled;
+	private $prefix;
+	private $dir;
+	private $enabled;
 
 	public function __construct($prefix = '', $dir = '')
 	{
 		$this->prefix = $prefix;
 		$this->dir = $dir;
-
-		ensureFolderExists($this->dir);
-		ensureIndexExists($this->dir);
-
 		$this->enabled = (file_exists($this->dir) && is_dir($this->dir) && is_writable($this->dir));
 	}
 
-	public function set($key, $var, $ttl = 0): void
+	public function set($key, $var, $ttl = 0)
 	{
 		$file = $this->_name($key);
 		file_put_contents($file, $var);
@@ -39,7 +35,7 @@ class File
 		touch($file, time() + $ttl);
 	}
 
-	public function get($key): string
+	public function get($key)
 	{
 		$tmp = '';
 		if ($this->fetch($key, $tmp)) {
@@ -49,7 +45,7 @@ class File
 		return '';
 	}
 
-	public function fetch($key, &$var): bool
+	public function fetch($key, &$var)
 	{
 		$file = $this->_name($key);
 		if (!file_exists($file) || filemtime($file) < time()) {
@@ -60,7 +56,7 @@ class File
 		return true;
 	}
 
-	public function delete($key): void
+	public function delete($key)
 	{
 		$file = $this->_name($key);
 		if (file_exists($file)) {
@@ -68,11 +64,13 @@ class File
 		}
 	}
 
-	public function enabled(): bool {
+	public function enabled()
+	{
 		return $this->enabled;
 	}
 
-	private function _name($key): string {
+	private function _name($key)
+	{
 		return sprintf('%s%s%s', $this->dir, $this->prefix, sha1($key));
 	}
 }

system/src/Cache/PHP.php

@@ -12,40 +12,39 @@ namespace MyAAC\Cache;
 
 class PHP
 {
-	private string $prefix;
-	private string $dir;
-	private bool $enabled;
+	private $prefix;
+	private $dir;
+	private $enabled;
 
 	public function __construct($prefix = '', $dir = '')
 	{
 		$this->prefix = $prefix;
 		$this->dir = $dir;
+		$this->enabled = (file_exists($this->dir) && is_dir($this->dir) && is_writable($this->dir));
+	}
+
+	public function set($key, $var, $ttl = 0)
+	{
+		$var = var_export($var, true);
 
 		ensureFolderExists($this->dir);
 		ensureIndexExists($this->dir);
 
-		$this->enabled = (file_exists($this->dir) && is_dir($this->dir) && is_writable($this->dir));
-	}
+		// Write to temp file first to ensure atomicity
+		$tmp = $this->dir . "tmp_$key." . uniqid('', true) . '.tmp';
+		file_put_contents($tmp, '<?php $var = ' . $var . ';', LOCK_EX);
 
-	public function set($key, $var, $ttl = 0): void
-	{
-		$var = var_export($var, true);
+		$file = $this->_name($key);
+		rename($tmp, $file);
 
 		if ($ttl === 0) {
 			$ttl = 365 * 24 * 60 * 60; // 365 days
 		}
 
-		$expires = time() + $ttl;
-
-		// Write to temp file first to ensure atomicity
-		$tmp = $this->dir . "tmp_$key." . uniqid('', true) . '.tmp';
-		file_put_contents($tmp, "<?php return ['expires' => $expires, 'var' => $var];", LOCK_EX);
-
-		$file = $this->_name($key);
-		rename($tmp, $file);
+		touch($file, time() + $ttl);
 	}
 
-	public function get($key): string
+	public function get($key)
 	{
 		$tmp = '';
 		if ($this->fetch($key, $tmp)) {
@@ -55,23 +54,19 @@ class PHP
 		return '';
 	}
 
-	public function fetch($key, &$var): bool
+	public function fetch($key, &$var)
 	{
 		$file = $this->_name($key);
-		if (!file_exists($file)) {
+		if (!file_exists($file) || filemtime($file) < time()) {
 			return false;
 		}
 
-		$content = include $file;
-		if (!isset($content) || $content['expires'] < time()) {
-			return false;
-		}
-
-		$var = $content['var'];
+		@include $file;
+		$var = isset($var) ? $var : null;
 		return true;
 	}
 
-	public function delete($key): void
+	public function delete($key)
 	{
 		$file = $this->_name($key);
 		if (file_exists($file)) {
@@ -79,11 +74,13 @@ class PHP
 		}
 	}
 
-	public function enabled(): bool {
+	public function enabled()
+	{
 		return $this->enabled;
 	}
 
-	private function _name($key): string {
+	private function _name($key)
+	{
 		return sprintf('%s%s%s', $this->dir, $this->prefix, sha1($key) . '.php');
 	}
 }

system/src/Cache/XCache.php

@@ -13,8 +13,8 @@ namespace MyAAC\Cache;
 
 class XCache
 {
-	private string $prefix;
-	private bool $enabled;
+	private $prefix;
+	private $enabled;
 
 	public function __construct($prefix = '')
 	{
@@ -22,14 +22,14 @@ class XCache
 		$this->enabled = function_exists('xcache_get') && ini_get('xcache.var_size');
 	}
 
-	public function set($key, $var, $ttl = 0): void
+	public function set($key, $var, $ttl = 0)
 	{
 		$key = $this->prefix . $key;
 		xcache_unset($key);
 		xcache_set($key, $var, $ttl);
 	}
 
-	public function get($key): string
+	public function get($key)
 	{
 		$tmp = '';
 		if ($this->fetch($this->prefix . $key, $tmp)) {
@@ -39,7 +39,7 @@ class XCache
 		return '';
 	}
 
-	public function fetch($key, &$var): bool
+	public function fetch($key, &$var)
 	{
 		$key = $this->prefix . $key;
 		if (!xcache_isset($key)) {
@@ -50,11 +50,13 @@ class XCache
 		return true;
 	}
 
-	public function delete($key): void {
+	public function delete($key)
+	{
 		xcache_unset($this->prefix . $key);
 	}
 
-	public function enabled(): bool {
+	public function enabled()
+	{
 		return $this->enabled;
 	}
 }

system/src/Models/AccountAction.php

@@ -9,6 +9,6 @@ class AccountAction extends Model {
 
 	public $timestamps = false;
 
-	protected $fillable = ['account_id', 'ip', 'date', 'action'];
+	protected $fillable = ['account_id', 'ip', 'ipv6', 'date', 'action'];
 
 }

system/src/Models/Player.php

@@ -46,8 +46,14 @@ class Player extends Model {
 		});
 	}
 
-	public function getVocationNameAttribute() {
-		return \OTS_Toolbox::getVocationName($this->vocation, $this->promotion ?? 0);
+	public function getVocationNameAttribute()
+	{
+		$vocation = $this->vocation;
+		if (isset($this->promotion) && $this->promotion > 0) {
+			$vocation += ($this->promotion * setting('core.vocations_amount'));
+		}
+
+		return config('vocations')[$vocation] ?? 'Unknown';
 	}
 
 	public function getIsDeletedAttribute()

system/src/Server/XML/Vocations.php

@@ -1,93 +0,0 @@
-<?php
-
-namespace MyAAC\Server\XML;
-
-use MyAAC\Cache\Cache;
-
-class Vocations
-{
-	private static array $vocations;
-	private static array $vocationsFrom;
-
-	public function __construct()
-	{
-		$cached = Cache::remember('vocations', 10 * 60, function () {
-			$this->load();
-			$from = $this->getFrom();
-
-			$amount = 0;
-			foreach ($from as $vocId => $fromVocation) {
-				if ($vocId != 0 && $vocId == $fromVocation) {
-					$amount++;
-				}
-			}
-
-			return ['vocations' => $this->get(), 'vocationsFrom' => $from, 'amount' => $amount];
-		});
-
-		self::$vocations = $cached['vocations'];
-		self::$vocationsFrom = $cached['vocationsFrom'];
-
-		config(['vocations', self::$vocations]);
-		config(['vocations_amount', $cached['amount']]);
-	}
-
-	public function load(): void
-	{
-		if(!class_exists('DOMDocument')) {
-			throw new \RuntimeException('Please install PHP xml extension. MyAAC will not work without it.');
-		}
-
-		$vocationsXML = new \DOMDocument();
-		$file = config('data_path') . 'XML/vocations.xml';
-		if(!@file_exists($file)) {
-			$file = config('data_path') . 'vocations.xml';
-		}
-
-		if(!$vocationsXML->load($file)) {
-			throw new \RuntimeException('ERROR: Cannot load <i>vocations.xml</i> - the file is malformed. Check the file with xml syntax validator.');
-		}
-
-		foreach($vocationsXML->getElementsByTagName('vocation') as $vocation) {
-			$id = $vocation->getAttribute('id');
-
-			self::$vocations[$id] = $vocation->getAttribute('name');
-
-			$fromVocation = (int) $vocation->getAttribute('fromvoc');
-			self::$vocationsFrom[$id] = $fromVocation;
-		}
-	}
-
-	public static function get(): array {
-		return self::$vocations;
-	}
-
-	public static function getFrom(): array {
-		return self::$vocationsFrom;
-	}
-
-	public static function getPromoted(int $id): ?int {
-		foreach (self::$vocationsFrom as $vocId => $fromVocation) {
-			if ($id == $fromVocation && $vocId != $id) {
-				return $vocId;
-			}
-		}
-
-		return null;
-	}
-
-	public static function getOriginal(int $id): ?int {
-		return self::$vocationsFrom[$id] ?? null;
-	}
-
-	public static function getBase($includingRook = true): array {
-		$vocations = [];
-		foreach (self::$vocationsFrom as $vocId => $fromVoc) {
-			if ($vocId == $fromVoc && ($vocId != 0 || $includingRook)) {
-				$vocations[] = $vocId;
-			}
-		}
-
-		return $vocations;
-	}
-}

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/highscores.html.twig

@@ -18,7 +18,7 @@
 						<label for="vocationFilter">Choose a vocation</label>
 						<select onchange="location = this.value;" id="vocationFilter">
 							<option value="{{ getLink('highscores') }}/{{ list|urlencode }}" class="size_xs">[ALL]</option>
-							{% for i in baseVocations %}
+							{% for i in 0..config.vocations_amount %}
 								<option value="{{ getLink('highscores') }}/{{ list|urlencode }}/{{ config.vocations[i]|lower|urlencode }}" class="size_xs" {% if vocationId is not null and vocationId == i %}selected{% endif %}>{{ config.vocations[i]}}</option>
 							{% endfor %}
 						</select>
@@ -120,7 +120,7 @@
 				<tr bgcolor="{{ config.lightborder }}">
 					<td>
 						<a href="{{ getLink('highscores') }}/{{ list|urlencode }}" class="size_xs">[ALL]</a><br/>
-						{% for i in baseVocations %}
+						{% for i in 0..config.vocations_amount %}
 							<a href="{{ getLink('highscores') }}/{{ list|urlencode }}/{{ config.vocations[i]|lower|urlencode }}" class="size_xs">{{ config.vocations[i]}}</a><br/>
 						{% endfor %}
 					</td>

system/templates/online.html.twig

@@ -10,19 +10,22 @@
 	{% if setting('core.online_vocations_images') %}
 	<table width="200" cellspacing="1" cellpadding="0" border="0" align="center">
 		<tr bgcolor="{{ config.darkborder }}">
-			{% for vocationId in baseVocations %}
-				<td><img src="images/{{ config('vocations')[vocationId]|lower }}.png" width="150" height="200"/></td>
-			{% endfor %}
+			<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 bgcolor="{{ config.vdarkborder }}">
-			{% for vocationId in baseVocations %}
-				<td class="white" style="text-align: center;"><strong>{{ config('vocations')[vocationId] }}s</strong></td>
-			{% endfor %}
+			<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 }}">
-			{% for vocationId in baseVocations %}
-				<td style="text-align: center;">{{ vocs[vocationId] }}</td>
-			{% endfor %}
+			<td style="text-align: center;">{{ vocs[1] }}</td>
+			<td style="text-align: center;">{{ vocs[2] }}</td>
+			<td style="text-align: center;">{{ vocs[3] }}</td>
+			<td style="text-align: center;">{{ vocs[4] }}</td>
 		</tr>
 	</table>
 	<div style="text-align: center;">&nbsp;</div>
@@ -32,14 +35,11 @@
 			<td class="white" colspan="2"><b>Vocation statistics</b></td>
 		</tr>
 
-		{% set i = 0 %}
-		{% for vocationId in baseVocations %}
-			<tr bgcolor="{{ getStyle(i) }}">
-				<td width="25%">{{ config.vocations[vocationId] }}</td>
-				<td width="75%">{{ vocs[vocationId] }}</td>
-			</tr>
-
-			{% set i = i + 1 %}
+		{% for i in 1..config.vocations_amount %}
+		<tr bgcolor="{{ getStyle(i) }}">
+			<td width="25%">{{ config.vocations[i] }}</td>
+			<td width="75%">{{ vocs[i] }}</td>
+		</tr>
 		{% endfor %}
 	</table>
 <br/>