From c2f55791c0e46b8beaaf0ead8844894ce6832c70 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Mon, 3 Mar 2025 20:07:54 +0100
Subject: [PATCH 01/55] Nothing important, just better code style

---
 system/functions.php | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/system/functions.php b/system/functions.php
index 7aa43935..947dd5bd 100644
--- a/system/functions.php
+++ b/system/functions.php
@@ -982,31 +982,29 @@ function load_config_lua($filename)
 				continue;
 			}
 			$tmp_exp = explode('=', $line, 2);
-			if(strpos($line, 'dofile') !== false)
-			{
+			if(str_contains($line, 'dofile')) {
 				$delimiter = '"';
-				if(strpos($line, $delimiter) === false)
+				if(!str_contains($line, $delimiter)) {
 					$delimiter = "'";
+				}
 
 				$tmp = explode($delimiter, $line);
 				$result = array_merge($result, load_config_lua($config['server_path'] . $tmp[1]));
 			}
-			else if(count($tmp_exp) >= 2)
-			{
+			else if(count($tmp_exp) >= 2) {
 				$key = trim($tmp_exp[0]);
-				if(0 !== strpos($key, '--'))
-				{
+				if(!str_starts_with($key, '--')) {
 					$value = trim($tmp_exp[1]);
-					if(strpos($value, '--') !== false) {// found some deep comment
+					if(str_contains($value, '--')) {// found some deep comment
 						$value = preg_replace('/--.*$/i', '', $value);
 					}
 
 					if(is_numeric($value))
 						$result[$key] = (float) $value;
 					elseif(in_array(@$value[0], array("'", '"')) && in_array(@$value[strlen($value) - 1], array("'", '"')))
-						$result[$key] = (string) substr(substr($value, 1), 0, -1);
+						$result[$key] = substr(substr($value, 1), 0, -1);
 					elseif(in_array($value, array('true', 'false')))
-						$result[$key] = ($value === 'true') ? true : false;
+						$result[$key] = $value === 'true';
 					elseif(@$value[0] === '{') {
 						// arrays are not supported yet
 						// just ignore the error
@@ -1014,7 +1012,7 @@ function load_config_lua($filename)
 					}
 					else
 					{
-						foreach($result as $tmp_key => $tmp_value) // load values definied by other keys, like: dailyFragsToBlackSkull = dailyFragsToRedSkull
+						foreach($result as $tmp_key => $tmp_value) // load values defined by other keys, like: dailyFragsToBlackSkull = dailyFragsToRedSkull
 							$value = str_replace($tmp_key, $tmp_value, $value);
 						$ret = @eval("return $value;");
 						if((string) $ret == '' && trim($value) !== '""') // = parser error
@@ -1028,8 +1026,7 @@ function load_config_lua($filename)
 		}
 	}
 
-	$result = array_merge($result, isset($config['lua']) ? $config['lua'] : array());
-	return $result;
+	return array_merge($result, $config['lua'] ?? []);
 }
 
 function str_replace_first($search,$replace, $subject) {

From 4adb0758c567d8c6c136d949d23fc1e68bd13813 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sun, 9 Mar 2025 21:26:24 +0100
Subject: [PATCH 02/55] Set version to 2.0-dev

---
 common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.php b/common.php
index 99593401..66f3135b 100644
--- a/common.php
+++ b/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.2';
+const MYAAC_VERSION = '2.0-dev';
 const DATABASE_VERSION = 44;
 const TABLE_PREFIX = 'myaac_';
 define('START_TIME', microtime(true));

From cb6e9a6a883c3dd08ea2d2adb47ee3138da8df46 Mon Sep 17 00:00:00 2001
From: Slawomir Boczek <slawkens@gmail.com>
Date: Sun, 9 Mar 2025 21:39:37 +0100
Subject: [PATCH 03/55] Feature/twig hooks filters (#258)

* feat: Hooks filters

* Cleanup
---
 system/functions.php                  | 22 ++++++++++++--------
 system/src/Hook.php                   |  5 +++++
 system/src/Hooks.php                  | 29 +++++++++++++++++++--------
 system/src/Twig/EnvironmentBridge.php | 28 ++++++++++++++++++++++++++
 system/src/global.php                 |  5 +++++
 system/twig.php                       |  5 ++---
 6 files changed, 75 insertions(+), 19 deletions(-)
 create mode 100644 system/src/Twig/EnvironmentBridge.php

diff --git a/system/functions.php b/system/functions.php
index 947dd5bd..5076b054 100644
--- a/system/functions.php
+++ b/system/functions.php
@@ -545,33 +545,39 @@ function template_header($is_admin = false): string
  */
 function template_footer(): string
 {
-	global $views_counter;
-	$ret = '';
+	$footer = [];
+
 	if(admin()) {
-		$ret .= generateLink(ADMIN_URL, 'Admin Panel', true);
+		$footer[] = generateLink(ADMIN_URL, 'Admin Panel', true);
 	}
 
 	if(setting('core.visitors_counter')) {
 		global $visitors;
 		$amount = $visitors->getAmountVisitors();
-		$ret .= '<br/>Currently there ' . ($amount > 1 ? 'are' : 'is') . ' ' . $amount . ' visitor' . ($amount > 1 ? 's' : '') . '.';
+		$footer[] = 'Currently there ' . ($amount > 1 ? 'are' : 'is') . ' ' . $amount . ' visitor' . ($amount > 1 ? 's' : '') . '.';
 	}
 
 	if(setting('core.views_counter')) {
-		$ret .= '<br/>Page has been viewed ' . $views_counter . ' times.';
+		global $views_counter;
+		$footer[] = 'Page has been viewed ' . $views_counter . ' times.';
 	}
 
 	if(setting('core.footer_load_time')) {
-		$ret .= '<br/>Load time: ' . round(microtime(true) - START_TIME, 4) . ' seconds.';
+		$footer[] = 'Load time: ' . round(microtime(true) - START_TIME, 4) . ' seconds.';
 	}
 
 	$settingFooter = setting('core.footer');
 	if(isset($settingFooter[0])) {
-		$ret .= '<br/>' . $settingFooter;
+		$footer[] = '' . $settingFooter;
 	}
 
 	// please respect my work and help spreading the word, thanks!
-	return $ret . '<br/>' . base64_decode('UG93ZXJlZCBieSA8YSBocmVmPSJodHRwOi8vbXktYWFjLm9yZyIgdGFyZ2V0PSJfYmxhbmsiPk15QUFDLjwvYT4=');
+	$footer[] = base64_decode('UG93ZXJlZCBieSA8YSBocmVmPSJodHRwOi8vbXktYWFjLm9yZyIgdGFyZ2V0PSJfYmxhbmsiPk15QUFDLjwvYT4=');
+
+	global $hooks;
+	$footer = $hooks->triggerFilter(HOOK_FILTER_THEME_FOOTER, $footer);
+
+	return implode('<br/>', $footer);
 }
 
 function template_ga_code()
diff --git a/system/src/Hook.php b/system/src/Hook.php
index 73e378fd..9f4b7978 100644
--- a/system/src/Hook.php
+++ b/system/src/Hook.php
@@ -37,6 +37,11 @@ class Hook
 		return !isset($ret) || $ret == 1 || $ret;
 	}
 
+	public function executeFilter(...$args) {
+		return include BASE . $this->_file;
+	}
+
 	public function name() {return $this->_name;}
 	public function type() {return $this->_type;}
+	public function file() {return $this->_file;}
 }
diff --git a/system/src/Hooks.php b/system/src/Hooks.php
index ee9f3b76..084d5e1a 100644
--- a/system/src/Hooks.php
+++ b/system/src/Hooks.php
@@ -4,22 +4,23 @@ namespace MyAAC;
 
 class Hooks
 {
-	private static $_hooks = array();
+	private static array $_hooks = [];
 
-	public function register($hook, $type = '', $file = null) {
+	public function register($hook, $type = '', $file = null): void
+	{
 		if(!($hook instanceof Hook))
 			$hook = new Hook($hook, $type, $file);
 
 		self::$_hooks[$hook->type()][] = $hook;
 	}
 
-	public function trigger($type, $params = array())
+	public function trigger($type, $params = []): bool
 	{
 		$ret = true;
-		if(isset(self::$_hooks[$type]))
-		{
+
+		if(isset(self::$_hooks[$type])) {
 			foreach(self::$_hooks[$type] as $name => $hook) {
-				/** @var $hook Hook */
+				/** @var Hook $hook */
 				if (!$hook->execute($params)) {
 					$ret = false;
 				}
@@ -29,11 +30,23 @@ class Hooks
 		return $ret;
 	}
 
-	public function exist($type) {
+	public function triggerFilter($type, $args = [])
+	{
+		if(isset(self::$_hooks[$type])) {
+			foreach(self::$_hooks[$type] as $hook) {
+				/** @var Hook $hook */
+				$args = $hook->executeFilter(...$args);
+			}
+		}
+
+		return $args;
+	}
+
+	public function exist($type): bool {
 		return isset(self::$_hooks[$type]);
 	}
 
-	public function load()
+	public function load(): void
 	{
 		foreach(Plugins::getHooks() as $hook) {
 			$this->register($hook['name'], $hook['type'], $hook['file']);
diff --git a/system/src/Twig/EnvironmentBridge.php b/system/src/Twig/EnvironmentBridge.php
new file mode 100644
index 00000000..ab54bd25
--- /dev/null
+++ b/system/src/Twig/EnvironmentBridge.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace MyAAC\Twig;
+
+use Twig\Environment;
+
+class EnvironmentBridge extends Environment
+{
+	public function display($name, array $context = []): void
+	{
+		global $hooks;
+
+		$context['viewName'] = $name;
+		$context = $hooks->triggerFilter(HOOK_FILTER_TWIG_DISPLAY, $context);
+
+		parent::display($name, $context);
+	}
+
+	public function render($name, array $context = []): string
+	{
+		global $hooks;
+
+		$context['viewName'] = $name;
+		$context = $hooks->triggerFilter(HOOK_FILTER_TWIG_RENDER, $context);
+
+		return parent::render($name, $context);
+	}
+}
diff --git a/system/src/global.php b/system/src/global.php
index 61b887b5..ed9df203 100644
--- a/system/src/global.php
+++ b/system/src/global.php
@@ -97,6 +97,11 @@ define('HOOK_CACHE_CLEAR', ++$i);
 define('HOOK_INSTALL_FINISH', ++$i);
 define('HOOK_INSTALL_FINISH_END', ++$i);
 
+// hook filters
+define('HOOK_FILTER_TWIG_DISPLAY', ++$i);
+define('HOOK_FILTER_TWIG_RENDER', ++$i);
+define('HOOK_FILTER_THEME_FOOTER', ++$i);
+
 const HOOK_FIRST = HOOK_INIT;
 define('HOOK_LAST', $i);
 
diff --git a/system/twig.php b/system/twig.php
index fc3125fe..f59230e3 100644
--- a/system/twig.php
+++ b/system/twig.php
@@ -9,8 +9,7 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-use MyAAC\CsrfToken;
-use Twig\Environment as Twig_Environment;
+use MyAAC\Twig\EnvironmentBridge as MyAAC_Twig_EnvironmentBridge;
 use Twig\Extension\DebugExtension as Twig_DebugExtension;
 use Twig\Loader\FilesystemLoader as Twig_FilesystemLoader;
 use Twig\TwigFilter;
@@ -20,7 +19,7 @@ global $twig, $twig_loader;
 
 $dev_mode = (config('env') === 'dev');
 $twig_loader = new Twig_FilesystemLoader(SYSTEM . 'templates');
-$twig = new Twig_Environment($twig_loader, array(
+$twig = new MyAAC_Twig_EnvironmentBridge($twig_loader, array(
 	'cache' => CACHE . 'twig/',
 	'auto_reload' => $dev_mode,
 	'debug' => $dev_mode

From 00fe1adc15ea7646596d755f6e6e1f7854ffc1d5 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Mon, 10 Mar 2025 10:48:12 +0100
Subject: [PATCH 04/55] Fix: add possibility to remove all menu items

---
 admin/pages/menus.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin/pages/menus.php b/admin/pages/menus.php
index e2608b0b..572be25e 100644
--- a/admin/pages/menus.php
+++ b/admin/pages/menus.php
@@ -27,11 +27,11 @@ $pluginThemes = Plugins::getThemes();
 if (isset($_POST['template'])) {
 	$template = $_POST['template'];
 
-	if (isset($_POST['menu'])) {
-		$post_menu = $_POST['menu'];
-		$post_menu_link = $_POST['menu_link'];
-		$post_menu_blank = $_POST['menu_blank'];
-		$post_menu_color = $_POST['menu_color'];
+	if (isset($_POST['save'])) {
+		$post_menu = $_POST['menu'] ?? [];
+		$post_menu_link = $_POST['menu_link'] ?? [];
+		$post_menu_blank = $_POST['menu_blank'] ?? [];
+		$post_menu_color = $_POST['menu_color'] ?? [];
 		if (count($post_menu) != count($post_menu_link)) {
 			echo 'Menu count is not equal menu links. Something went wrong when sending form.';
 			return;
@@ -135,7 +135,7 @@ if (isset($_POST['template'])) {
 	<form method="post" id="menus-form" action="?p=menus">
 		<?php csrf(); ?>
 		<input type="hidden" name="template" value="<?php echo $template ?>"/>
-		<button type="submit" class="btn btn-info">Save</button><br/><br/>
+		<button type="submit" name="save" class="btn btn-info">Save</button><br/><br/>
 		<div class="row">
 			<?php foreach ($config['menu_categories'] as $id => $cat): ?>
 				<div class="col-md-12 col-lg-6">

From cc26b5c74445076e13b886ed3b26ad62eac38418 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Mon, 10 Mar 2025 10:48:12 +0100
Subject: [PATCH 05/55] Fix: add possibility to remove all menu items

---
 admin/pages/menus.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin/pages/menus.php b/admin/pages/menus.php
index e2608b0b..572be25e 100644
--- a/admin/pages/menus.php
+++ b/admin/pages/menus.php
@@ -27,11 +27,11 @@ $pluginThemes = Plugins::getThemes();
 if (isset($_POST['template'])) {
 	$template = $_POST['template'];
 
-	if (isset($_POST['menu'])) {
-		$post_menu = $_POST['menu'];
-		$post_menu_link = $_POST['menu_link'];
-		$post_menu_blank = $_POST['menu_blank'];
-		$post_menu_color = $_POST['menu_color'];
+	if (isset($_POST['save'])) {
+		$post_menu = $_POST['menu'] ?? [];
+		$post_menu_link = $_POST['menu_link'] ?? [];
+		$post_menu_blank = $_POST['menu_blank'] ?? [];
+		$post_menu_color = $_POST['menu_color'] ?? [];
 		if (count($post_menu) != count($post_menu_link)) {
 			echo 'Menu count is not equal menu links. Something went wrong when sending form.';
 			return;
@@ -135,7 +135,7 @@ if (isset($_POST['template'])) {
 	<form method="post" id="menus-form" action="?p=menus">
 		<?php csrf(); ?>
 		<input type="hidden" name="template" value="<?php echo $template ?>"/>
-		<button type="submit" class="btn btn-info">Save</button><br/><br/>
+		<button type="submit" name="save" class="btn btn-info">Save</button><br/><br/>
 		<div class="row">
 			<?php foreach ($config['menu_categories'] as $id => $cat): ?>
 				<div class="col-md-12 col-lg-6">

From 9239a4f4198c3ad260802ac3b47e9c41b80b754e Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Mon, 10 Mar 2025 12:46:33 +0100
Subject: [PATCH 06/55] Fix the second "Save" button -> addition to previous
 commit

---
 admin/pages/menus.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/pages/menus.php b/admin/pages/menus.php
index 572be25e..19d7b486 100644
--- a/admin/pages/menus.php
+++ b/admin/pages/menus.php
@@ -168,7 +168,7 @@ if (isset($_POST['template'])) {
 		</div>
 		<div class="row pb-2">
 			<div class="col-md-12">
-				<button type="submit" class="btn btn-info">Save</button>
+				<button type="submit" name="save" class="btn btn-info">Save</button>
 				<?php
 				echo '<button type="button" class="btn btn-danger float-right" value="Cancel" onclick="window.location = \'' . ADMIN_URL . '?p=menus\';"><i class="fas fa-cancel"></i> Cancel</button>';
 				?>

From 08b8a716d451fe2338a46a83b4266727722bbe32 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Mon, 10 Mar 2025 12:46:33 +0100
Subject: [PATCH 07/55] Fix the second "Save" button -> addition to previous
 commit

---
 admin/pages/menus.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/pages/menus.php b/admin/pages/menus.php
index 572be25e..19d7b486 100644
--- a/admin/pages/menus.php
+++ b/admin/pages/menus.php
@@ -168,7 +168,7 @@ if (isset($_POST['template'])) {
 		</div>
 		<div class="row pb-2">
 			<div class="col-md-12">
-				<button type="submit" class="btn btn-info">Save</button>
+				<button type="submit" name="save" class="btn btn-info">Save</button>
 				<?php
 				echo '<button type="button" class="btn btn-danger float-right" value="Cancel" onclick="window.location = \'' . ADMIN_URL . '?p=menus\';"><i class="fas fa-cancel"></i> Cancel</button>';
 				?>

From 0852fba6f03b5da55d0177a3e3edd01cf0a93271 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Mon, 10 Mar 2025 20:26:25 +0100
Subject: [PATCH 08/55] Release v1.3

---
 CHANGELOG.md | 12 ++++++++++++
 common.php   |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b90ab4f..37a1b73d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.3 - 10.03.2025]
+
+### Changed
+* Use latest outfit-images host from @gesior (https://github.com/slawkens/myaac/commit/529bdcf016dd0f9dffbc34d81f99a046a9ddb70d)
+* Change monster link to $_GET ?name= (https://github.com/slawkens/myaac/commit/4c5cc8b573b2b3e7ec00a22b7ede30a68083a924)
+
+### Fixed
+* Fixed house links (https://github.com/slawkens/myaac/commit/887b5068ad11c4cdab614afd34525caba785ce13)
+* Fixed long title on headline.php (https://github.com/slawkens/myaac/commit/3e3f4bb5a514158ec8777684ca6c7f1c2a37bed5)
+* Fixed menu colors once again, plus add !important tag (https://github.com/slawkens/myaac/commit/aa52df6e2ec92cafc25b655ae907bf2e1746d9cc)
+* Fix: add possibility to remove all menu items in admin panel (https://github.com/slawkens/myaac/commit/00fe1adc15ea7646596d755f6e6e1f7854ffc1d5, https://github.com/slawkens/myaac/commit/9239a4f4198c3ad260802ac3b47e9c41b80b754e)
+
 ## [1.2 - 09.02.2025]
 
 ### Added
diff --git a/common.php b/common.php
index 0c390ac7..4b8a64f6 100644
--- a/common.php
+++ b/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.2';
+const MYAAC_VERSION = '1.3';
 const DATABASE_VERSION = 43;
 const TABLE_PREFIX = 'myaac_';
 define('START_TIME', microtime(true));

From 4a6896b4469968b9904292734cf6c14ba5eeef14 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sat, 15 Mar 2025 22:48:59 +0100
Subject: [PATCH 09/55] getPremDays: returns -1 if freePremium

---
 system/libs/pot/OTS_Account.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/libs/pot/OTS_Account.php b/system/libs/pot/OTS_Account.php
index 07f31c82..fe134a71 100644
--- a/system/libs/pot/OTS_Account.php
+++ b/system/libs/pot/OTS_Account.php
@@ -443,19 +443,19 @@ class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable
 			throw new E_OTS_NotLoaded();
 		}
 
+		$configFreePremium = configLua('freePremium');
+		if(isset($configFreePremium) && getBoolean($configFreePremium)) {return -1;}
+
 		if(isset($this->data['premium_ends_at']) || isset($this->data['premend'])) {
 			$col = isset($this->data['premium_ends_at']) ? 'premium_ends_at' : 'premend';
 			$ret = ceil(($this->data[$col] - time()) / (24 * 60 * 60));
-			return $ret > 0 ? $ret : 0;
+			return max($ret, 0);
 		}
 
 		if($this->data['premdays'] == 0) {
 			return 0;
 		}
 
-		global $config;
-		if(isset($config['lua']['freePremium']) && getBoolean($config['lua']['freePremium'])) return -1;
-
 		if($this->data['premdays'] == self::GRATIS_PREMIUM_DAYS){
 			return self::GRATIS_PREMIUM_DAYS;
 		}

From 6fac883659f581baac1361826d046410156f1e58 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sun, 16 Mar 2025 12:39:07 +0100
Subject: [PATCH 12/55] Replace links with from accountmanagement to
 account/manage

---
 system/pages/polls.php                 | 2 +-
 system/templates/guilds.list.html.twig | 2 +-
 system/templates/guilds.view.html.twig | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/pages/polls.php b/system/pages/polls.php
index 37372f25..1d334053 100644
--- a/system/pages/polls.php
+++ b/system/pages/polls.php
@@ -100,7 +100,7 @@ function getColorByPercent($percent)
 
 	if(!$logged)
 	{
-		echo  'You are not logged in. <a href="?subtopic=accountmanagement&redirect=' . BASE_URL . urlencode('?subtopic=polls') . '">Log in</a> to vote in polls.<br /><br />';
+		echo  'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . BASE_URL . urlencode('?subtopic=polls') . '">Log in</a> to vote in polls.<br /><br />';
 		return;
 	}
 
diff --git a/system/templates/guilds.list.html.twig b/system/templates/guilds.list.html.twig
index 80f170a0..7a4a7c86 100644
--- a/system/templates/guilds.list.html.twig
+++ b/system/templates/guilds.list.html.twig
@@ -114,7 +114,7 @@
 						{% else %}
 						<b>Before you can create a guild you must login.</b>
 						<br/>
-						<form action="?subtopic=accountmanagement&redirect={{ getLink('guilds') }}" method="post">
+						<form action="{{ getLink('account/manage') }}?redirect={{ getLink('guilds') }}" method="post">
 							{{ csrf() }}
 							{% include('buttons.login.html.twig') %}
 						</form>
diff --git a/system/templates/guilds.view.html.twig b/system/templates/guilds.view.html.twig
index 695d7464..a25d9570 100644
--- a/system/templates/guilds.view.html.twig
+++ b/system/templates/guilds.view.html.twig
@@ -215,7 +215,7 @@
 													<tbody>
 													<tr>
 														{% if not logged %}
-															<form action="?subtopic=accountmanagement&redirect={{ getGuildLink(guild_name|url_encode, false) }}" method="post">
+															<form action="{{ getLink('account/manage') }}?redirect={{ getGuildLink(guild_name|url_encode, false) }}" method="post">
 																{{ csrf() }}
 																<td>
 																	{{ include('buttons.login.html.twig') }}

From 1a5771ad51e595fe13368a0721b059c4ecefb17d Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sun, 16 Mar 2025 20:33:53 +0100
Subject: [PATCH 13/55] Fix migrate:run command

---
 system/src/Commands/MigrateRunCommand.php | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/system/src/Commands/MigrateRunCommand.php b/system/src/Commands/MigrateRunCommand.php
index edfa108d..3bdb1452 100644
--- a/system/src/Commands/MigrateRunCommand.php
+++ b/system/src/Commands/MigrateRunCommand.php
@@ -4,6 +4,7 @@ namespace MyAAC\Commands;
 
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
@@ -16,7 +17,8 @@ class MigrateRunCommand extends Command
 			->addArgument('id',
 				InputArgument::IS_ARRAY | InputArgument::REQUIRED,
 				'Id or ids of migration(s)'
-			);
+			)
+			->addOption('down', 'd', InputOption::VALUE_NONE, 'Down');;
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output): int
@@ -41,8 +43,10 @@ class MigrateRunCommand extends Command
 			}
 		}
 
+		$down = $input->getOption('down') ?? false;
+
 		foreach ($ids as $id) {
-			$this->executeMigration($id, $io);
+			$this->executeMigration($id, $io, !$down);
 		}
 
 		return Command::SUCCESS;
@@ -52,13 +56,24 @@ class MigrateRunCommand extends Command
 		return file_exists(SYSTEM . 'migrations/' . $id . '.php');
 	}
 
-	private function executeMigration($id, $io): void
+	private function executeMigration($id, $io, $_up = true): void
 	{
 		global $db;
 
 		$db->revalidateCache();
 
 		require SYSTEM . 'migrations/' . $id . '.php';
-		$io->success('Migration ' . $id . ' successfully executed');
+		if ($_up) {
+			if (isset($up)) {
+				$up();
+			}
+		}
+		else {
+			if (isset($down)) {
+				$down();
+			}
+		}
+
+		$io->success('Migration ' . $id . ' successfully executed' . ($_up ? '' : ' (downgrade)'));
 	}
 }

From ff1723b75617e9ec9d71a788526dd97e81cd66fd Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Wed, 19 Mar 2025 20:37:44 +0100
Subject: [PATCH 14/55] Release v1.3.1

---
 CHANGELOG.md | 8 ++++++++
 common.php   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37a1b73d..4442ddd2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.3.1 - 19.03.2025]
+
+### Fixed
+* Fixed migrate:run command (https://github.com/slawkens/myaac/commit/1a5771ad51e595fe13368a0721b059c4ecefb17d)
+
+### Changed
+* Small adjustments (https://github.com/slawkens/myaac/commit/6fac883659f581baac1361826d046410156f1e58, https://github.com/slawkens/myaac/commit/4a6896b4469968b9904292734cf6c14ba5eeef14)
+
 ## [1.3 - 10.03.2025]
 
 ### Changed
diff --git a/common.php b/common.php
index 4b8a64f6..ec72e965 100644
--- a/common.php
+++ b/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.3';
+const MYAAC_VERSION = '1.3.1';
 const DATABASE_VERSION = 43;
 const TABLE_PREFIX = 'myaac_';
 define('START_TIME', microtime(true));

From 7dcb5c4a1f67fa9de0b294d609b07001ce3be38b Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Wed, 26 Mar 2025 22:02:56 +0100
Subject: [PATCH 15/55] Update version to 1.x-dev

---
 common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.php b/common.php
index ec72e965..d491d94d 100644
--- a/common.php
+++ b/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.3.1';
+const MYAAC_VERSION = '1.x-dev';
 const DATABASE_VERSION = 43;
 const TABLE_PREFIX = 'myaac_';
 define('START_TIME', microtime(true));

From d25c71857f767834239bbffacd00fdc671adb157 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sun, 30 Mar 2025 07:10:05 +0200
Subject: [PATCH 16/55] Do not require init.php in cache:clear command

---
 system/src/Commands/CacheClearCommand.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/system/src/Commands/CacheClearCommand.php b/system/src/Commands/CacheClearCommand.php
index ff4d5d4a..3b052995 100644
--- a/system/src/Commands/CacheClearCommand.php
+++ b/system/src/Commands/CacheClearCommand.php
@@ -2,6 +2,7 @@
 
 namespace MyAAC\Commands;
 
+use MyAAC\Hooks;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
@@ -16,7 +17,10 @@ class CacheClearCommand extends Command
 
 	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
-		require SYSTEM . 'init.php';
+		global $hooks;
+		$hooks = new Hooks();
+		$hooks->load();
+		$hooks->trigger(HOOK_INIT);
 
 		$io = new SymfonyStyle($input, $output);
 

From 63410935782b6c647b139af878937aad7bc9dc24 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sun, 30 Mar 2025 07:10:16 +0200
Subject: [PATCH 17/55] Update version

---
 common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.php b/common.php
index d491d94d..ea8026aa 100644
--- a/common.php
+++ b/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.x-dev';
+const MYAAC_VERSION = '1.3.2-dev';
 const DATABASE_VERSION = 43;
 const TABLE_PREFIX = 'myaac_';
 define('START_TIME', microtime(true));

From 65696f63e3aac02ff952ea81279e7cb2fa7570fb Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Mon, 31 Mar 2025 18:13:45 +0200
Subject: [PATCH 18/55] Fix debugbar/admin panel menu when using custom
 base_dir

---
 admin/includes/debugbar.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/includes/debugbar.php b/admin/includes/debugbar.php
index 3a9ae893..eb98767a 100644
--- a/admin/includes/debugbar.php
+++ b/admin/includes/debugbar.php
@@ -7,7 +7,7 @@ $hooks->register('debugbar_admin_head_end', HOOK_ADMIN_HEAD_END, function ($para
 		return;
 	}
 
-	$debugBarRenderer = $debugBar->getJavascriptRenderer();
+	$debugBarRenderer = $debugBar->getJavascriptRenderer(BASE_URL . 'vendor/maximebf/debugbar/src/DebugBar/Resources/');
 	echo $debugBarRenderer->renderHead();
 });
 $hooks->register('debugbar_admin_body_end', HOOK_ADMIN_BODY_END, function ($params) {
@@ -17,6 +17,6 @@ $hooks->register('debugbar_admin_body_end', HOOK_ADMIN_BODY_END, function ($para
 		return;
 	}
 
-	$debugBarRenderer = $debugBar->getJavascriptRenderer();
+	$debugBarRenderer = $debugBar->getJavascriptRenderer(BASE_URL . 'vendor/maximebf/debugbar/src/DebugBar/Resources/');
 	echo $debugBarRenderer->render();
 });

From dbf73d0b61b45601ae95e51b23c051c2704169c5 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Mon, 31 Mar 2025 20:38:42 +0200
Subject: [PATCH 19/55] Show/hide IP Ban Protection options depending on the
 value (enabled/disabled)

---
 system/settings.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/system/settings.php b/system/settings.php
index dcd32ebc..d2c2745b 100644
--- a/system/settings.php
+++ b/system/settings.php
@@ -1622,14 +1622,20 @@ Sent by MyAAC,<br/>
 			'name' => 'Login Attempts Limit',
 			'type' => 'number',
 			'desc' => 'Number of incorrect login attempts before banning the IP',
-			'default' => 5, // Ajuste conforme necessário
+			'default' => 5,
+			'show_if' => [
+				'account_login_ipban_protection', '=', 'true'
+			]
 		],
 
 		'account_login_ban_time' => [
 			'name' => 'Ban Time (Minutes)',
 			'type' => 'number',
 			'desc' => 'Time in minutes the IP will be banned after exceeding login attempts',
-			'default' => 30, // Ajuste conforme necessário
+			'default' => 30,
+			'show_if' => [
+				'account_login_ipban_protection', '=', 'true'
+			]
 		],
 	],
 	'callbacks' => [

From a5b3940e592a705509e0a807390cba2940df27e7 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Tue, 1 Apr 2025 07:28:36 +0200
Subject: [PATCH 20/55] Prepare to release 1.3.2

---
 CHANGELOG.md | 9 +++++++++
 common.php   | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4442ddd2..c4f7765b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [1.3.2 - 01.04.2025]
+
+### Fixed
+* Fix debugBar/admin panel menu when using custom base_dir
+
+### Changed
+* Settings: Show/hide IP Ban Protection options depending on the value (enabled/disabled)
+* Do not require init.php in cache:clear command
+
 ## [1.3.1 - 19.03.2025]
 
 ### Fixed
diff --git a/common.php b/common.php
index ea8026aa..bdb4e61a 100644
--- a/common.php
+++ b/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.3.2-dev';
+const MYAAC_VERSION = '1.3.2';
 const DATABASE_VERSION = 43;
 const TABLE_PREFIX = 'myaac_';
 define('START_TIME', microtime(true));

From 6d156ae080d1640041245c56b0b0abb8696ffa86 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Tue, 1 Apr 2025 07:29:43 +0200
Subject: [PATCH 21/55] Update CHANGELOG-1.x.md

---
 CHANGELOG.md => CHANGELOG-1.x.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename CHANGELOG.md => CHANGELOG-1.x.md (100%)

diff --git a/CHANGELOG.md b/CHANGELOG-1.x.md
similarity index 100%
rename from CHANGELOG.md
rename to CHANGELOG-1.x.md

From 211b6ea698dbe29c14695d4fbf7d138f9fd72561 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Tue, 1 Apr 2025 07:37:43 +0200
Subject: [PATCH 22/55] Update CHANGELOG-1.x.md

---
 CHANGELOG-1.x.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG-1.x.md b/CHANGELOG-1.x.md
index c4f7765b..e77c30f1 100644
--- a/CHANGELOG-1.x.md
+++ b/CHANGELOG-1.x.md
@@ -3,11 +3,11 @@
 ## [1.3.2 - 01.04.2025]
 
 ### Fixed
-* Fix debugBar/admin panel menu when using custom base_dir
+* Fix debugBar/admin panel menu when using custom base_dir (https://github.com/slawkens/myaac/commit/65696f63e3aac02ff952ea81279e7cb2fa7570fb)
 
 ### Changed
-* Settings: Show/hide IP Ban Protection options depending on the value (enabled/disabled)
-* Do not require init.php in cache:clear command
+* Settings: Show/hide IP Ban Protection options depending on the value (enabled/disabled) (https://github.com/slawkens/myaac/commit/dbf73d0b61b45601ae95e51b23c051c2704169c5)
+* Do not require init.php in cache:clear command (https://github.com/slawkens/myaac/commit/d25c71857f767834239bbffacd00fdc671adb157)
 
 ## [1.3.1 - 19.03.2025]
 

From bbf923e1a6fe9662d7c77c0cbd44da94c2e99b33 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Tue, 1 Apr 2025 07:56:29 +0200
Subject: [PATCH 23/55] Update common.php

---
 common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.php b/common.php
index bdb4e61a..592ce964 100644
--- a/common.php
+++ b/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.3.2';
+const MYAAC_VERSION = '1.3.3-dev';
 const DATABASE_VERSION = 43;
 const TABLE_PREFIX = 'myaac_';
 define('START_TIME', microtime(true));

From 35e2483de86e295bdf089cceffa25842eeb2e34c Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Wed, 2 Apr 2025 19:48:23 +0200
Subject: [PATCH 24/55] Change root folder to /var/www/html, like in default
 config

---
 nginx-sample.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-sample.conf b/nginx-sample.conf
index d3cf8b6c..bb107f02 100644
--- a/nginx-sample.conf
+++ b/nginx-sample.conf
@@ -1,6 +1,6 @@
 server {
 	listen 80;
-	root /home/otserv/www/public;
+	root /var/www/html;
 	index index.php;
 	server_name your-domain.com;
 

From ae639d65b0bfa491e747e907e2ebc77f83f47981 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Thu, 3 Apr 2025 20:39:27 +0200
Subject: [PATCH 25/55] PHP 8 things

---
 index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.php b/index.php
index 0a42deed..4526e892 100644
--- a/index.php
+++ b/index.php
@@ -31,11 +31,11 @@ require_once 'common.php';
 require_once SYSTEM . 'functions.php';
 
 $uri = $_SERVER['REQUEST_URI'];
-if(false !== strpos($uri, 'index.php')) {
+if(str_contains($uri, 'index.php')) {
 	$uri = str_replace_first('/index.php', '', $uri);
 }
 
-if(0 === strpos($uri, '/')) {
+if(str_starts_with($uri, '/')) {
 	$uri = str_replace_first('/', '', $uri);
 }
 

From fa6b6aa153ffc131e0d1631a4dcd9012a5850c2e Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Fri, 4 Apr 2025 20:07:42 +0200
Subject: [PATCH 26/55] Display more info when error parsing config.lua value

---
 system/functions.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/system/functions.php b/system/functions.php
index 947dd5bd..e0ed8f61 100644
--- a/system/functions.php
+++ b/system/functions.php
@@ -1012,12 +1012,19 @@ function load_config_lua($filename)
 					}
 					else
 					{
-						foreach($result as $tmp_key => $tmp_value) // load values defined by other keys, like: dailyFragsToBlackSkull = dailyFragsToRedSkull
+						foreach($result as $tmp_key => $tmp_value) { // load values defined by other keys, like: dailyFragsToBlackSkull = dailyFragsToRedSkull
 							$value = str_replace($tmp_key, $tmp_value, $value);
-						$ret = @eval("return $value;");
-						if((string) $ret == '' && trim($value) !== '""') // = parser error
-						{
-							throw new RuntimeException('ERROR: Loading config.lua file. Line <b>' . ($ln + 1) . '</b> of LUA config file is not valid [key: <b>' . $key . '</b>]');
+						}
+
+						try {
+							$ret = eval("return $value;");
+						}
+						catch (Throwable $e) {
+							throw new RuntimeException('ERROR: Loading config.lua file. Line: ' . ($ln + 1) . ' - Unable to parse value "' . $value . '" - ' . $e->getMessage());
+						}
+
+						if((string) $ret == '' && trim($value) !== '""') {
+							throw new RuntimeException('ERROR: Loading config.lua file. Line ' . ($ln + 1) . ' is not valid [key: ' . $key . ']');
 						}
 						$result[$key] = $ret;
 					}

From 6c568fd36a271270684fc412ccd556b230273a6d Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Fri, 4 Apr 2025 21:08:49 +0200
Subject: [PATCH 27/55] Fix uninstall plugin when plugin is disabled

---
 system/src/Plugins.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/system/src/Plugins.php b/system/src/Plugins.php
index 243ced24..605d3e2a 100644
--- a/system/src/Plugins.php
+++ b/system/src/Plugins.php
@@ -675,26 +675,41 @@ class Plugins {
 
 	public static function uninstall($plugin_name): bool
 	{
+		$isDisabled = self::existDisabled($plugin_name);
+		if($isDisabled) {
+			self::enable($plugin_name);
+		}
+
+		$revertEnable = function() use ($isDisabled, $plugin_name) {
+			if($isDisabled) {
+				self::disable($plugin_name);
+			}
+		};
+
 		$filename = BASE . 'plugins/' . $plugin_name . '.json';
 		if(!file_exists($filename)) {
 			self::$error = 'Plugin ' . $plugin_name . ' does not exist.';
+			$revertEnable();
 			return false;
 		}
+
 		$string = file_get_contents($filename);
 		$plugin_info = json_decode($string, true);
 		if(!$plugin_info) {
 			self::$error = 'Cannot load plugin info ' . $plugin_name . '.json';
+			$revertEnable();
 			return false;
 		}
 
 		if(!isset($plugin_info['uninstall'])) {
 			self::$error = "Plugin doesn't have uninstall options defined. Skipping...";
+			$revertEnable();
 			return false;
 		}
 
 		$success = true;
 		foreach($plugin_info['uninstall'] as $file) {
-			if(strpos($file, '/') === 0) {
+			if(str_starts_with($file, '/')) {
 				$success = false;
 				self::$error = "You cannot use absolute paths (starting with slash - '/'): " . $file;
 				break;
@@ -726,6 +741,7 @@ class Plugins {
 			return true;
 		}
 
+		$revertEnable();
 		return false;
 	}
 

From 50d649dbde70ac20687dc6292573a9937756f830 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Fri, 4 Apr 2025 21:25:19 +0200
Subject: [PATCH 28/55] Release v1.3.3

---
 CHANGELOG-1.x.md | 11 +++++++++++
 common.php       |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG-1.x.md b/CHANGELOG-1.x.md
index e77c30f1..473bc51b 100644
--- a/CHANGELOG-1.x.md
+++ b/CHANGELOG-1.x.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## [1.3.3 - 04.04.2025]
+
+### Fixed
+* Fix uninstall plugin when plugin is disabled (https://github.com/slawkens/myaac/commit/6c568fd36a271270684fc412ccd556b230273a6d)
+
+### Changed
+* Display more useful info when error parsing config.lua (https://github.com/slawkens/myaac/commit/fa6b6aa153ffc131e0d1631a4dcd9012a5850c2e)
+
+### Other
+* Small adjustments (https://github.com/slawkens/myaac/commit/35e2483de86e295bdf089cceffa25842eeb2e34c, https://github.com/slawkens/myaac/commit/ae639d65b0bfa491e747e907e2ebc77f83f47981)
+
 ## [1.3.2 - 01.04.2025]
 
 ### Fixed
diff --git a/common.php b/common.php
index 592ce964..4c6346fe 100644
--- a/common.php
+++ b/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.3.3-dev';
+const MYAAC_VERSION = '1.3.3';
 const DATABASE_VERSION = 43;
 const TABLE_PREFIX = 'myaac_';
 define('START_TIME', microtime(true));

From 6a0356aa0f77645aec1572ee04734c15b17116a5 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Fri, 4 Apr 2025 21:31:17 +0200
Subject: [PATCH 29/55] Update version

---
 common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.php b/common.php
index 4c6346fe..33e31085 100644
--- a/common.php
+++ b/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.3.3';
+const MYAAC_VERSION = '1.3.4-dev';
 const DATABASE_VERSION = 43;
 const TABLE_PREFIX = 'myaac_';
 define('START_TIME', microtime(true));

From e6f05a2731c61d931be49e121c068e49c0ad5e01 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sun, 6 Apr 2025 16:41:28 +0200
Subject: [PATCH 30/55] Plugin name is required, version is optional

---
 system/src/Plugins.php | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/system/src/Plugins.php b/system/src/Plugins.php
index 605d3e2a..c1d9b360 100644
--- a/system/src/Plugins.php
+++ b/system/src/Plugins.php
@@ -411,20 +411,13 @@ class Plugins {
 			$continue = true;
 
 			if(!isset($plugin_json['name']) || empty(trim($plugin_json['name']))) {
-				self::$warnings[] = 'Plugin "name" tag is not set.';
-			}
-			if(!isset($plugin_json['description']) || empty(trim($plugin_json['description']))) {
-				self::$warnings[] = 'Plugin "description" tag is not set.';
+				self::$error = 'Plugin "name" tag is not set.';
+				return false;
 			}
+
 			if(!isset($plugin_json['version']) || empty(trim($plugin_json['version']))) {
 				self::$warnings[] = 'Plugin "version" tag is not set.';
 			}
-			if(!isset($plugin_json['author']) || empty(trim($plugin_json['author']))) {
-				self::$warnings[] = 'Plugin "author" tag is not set.';
-			}
-			if(!isset($plugin_json['contact']) || empty(trim($plugin_json['contact']))) {
-				self::$warnings[] = 'Plugin "contact" tag is not set.';
-			}
 
 			if(isset($plugin_json['require'])) {
 				$require = $plugin_json['require'];

From 64f6d3abcada3bf9fd7599f50d2fac0a1367f383 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sun, 6 Apr 2025 16:43:19 +0200
Subject: [PATCH 31/55] Add noSubmit option to buttons.base

---
 system/templates/buttons.base.html.twig   | 2 +-
 templates/tibiacom/buttons.base.html.twig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/templates/buttons.base.html.twig b/system/templates/buttons.base.html.twig
index d44bce10..075af1e1 100644
--- a/system/templates/buttons.base.html.twig
+++ b/system/templates/buttons.base.html.twig
@@ -1 +1 @@
-<input type="submit" name="{{ button_name }}" value="{{ button_name }}" />
\ No newline at end of file
+<input {% if noSubmit is not defined %}type="submit"{% endif %} name="{{ button_name }}" value="{{ button_name }}" />
diff --git a/templates/tibiacom/buttons.base.html.twig b/templates/tibiacom/buttons.base.html.twig
index a4ab47d5..713321aa 100644
--- a/templates/tibiacom/buttons.base.html.twig
+++ b/templates/tibiacom/buttons.base.html.twig
@@ -13,7 +13,7 @@
 	<div class="BigButton" style="background-image:url({{ template_path }}/images/global/buttons/{{ tmp_image }}.gif)">
 		<div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);">
 			<div class="BigButtonOver" style="background-image:url({{ template_path }}/images/global/buttons/{{ tmp_image }}_over.gif);" ></div>
-			<input class="BigButtonText" type="submit" value="{{ button_name }}">
+			<input class="BigButtonText" {% if noSubmit is not defined %}type="submit"{% endif %} value="{{ button_name }}">
 		</div>
 	</div>
 {% endapply %}

From 190697ce986d9068373188c9d3e69548e355c049 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sun, 6 Apr 2025 16:43:30 +0200
Subject: [PATCH 32/55] Update config.php

---
 templates/tibiacom/config.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/tibiacom/config.php b/templates/tibiacom/config.php
index 7ed168d9..a49f6f76 100644
--- a/templates/tibiacom/config.php
+++ b/templates/tibiacom/config.php
@@ -1,13 +1,13 @@
 <?php
 $config['menu_default_links_color'] = '#ffffff';
 
-$config['menu_categories'] = array(
-	MENU_CATEGORY_NEWS => array('id' => 'news', 'name' => 'Latest News'),
-	MENU_CATEGORY_ACCOUNT => array('id' => 'account', 'name' => 'Account'),
-	MENU_CATEGORY_COMMUNITY => array('id' => 'community', 'name' => 'Community'),
-	MENU_CATEGORY_FORUM => array('id' => 'forum', 'name' => 'Forum'),
-	MENU_CATEGORY_LIBRARY => array('id' => 'library', 'name' => 'Library'),
-	MENU_CATEGORY_SHOP => array('id' => 'shops', 'name' => 'Shop')
-);
+$config['menu_categories'] = [
+	MENU_CATEGORY_NEWS => ['id' => 'news', 'name' => 'Latest News'],
+	MENU_CATEGORY_ACCOUNT => ['id' => 'account', 'name' => 'Account'],
+	MENU_CATEGORY_COMMUNITY => ['id' => 'community', 'name' => 'Community'],
+	MENU_CATEGORY_FORUM => ['id' => 'forum', 'name' => 'Forum'],
+	MENU_CATEGORY_LIBRARY => ['id' => 'library', 'name' => 'Library'],
+	MENU_CATEGORY_SHOP => ['id' => 'shops', 'name' => 'Shop'],
+];
 
 $config['menus'] = require __DIR__ . '/menus.php';

From f40b986b59d4c8fa89ab4745731bf366f8619976 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sun, 6 Apr 2025 17:00:59 +0200
Subject: [PATCH 33/55] Small changes in account.login.html.twig

* change inputs width to 100%
* fix form closing
* formatting
---
 templates/tibiacom/account.login.html.twig | 89 +++++++++++++---------
 templates/tibiacom/basic.css               |  6 ++
 2 files changed, 58 insertions(+), 37 deletions(-)

diff --git a/templates/tibiacom/account.login.html.twig b/templates/tibiacom/account.login.html.twig
index 9e9b65c2..8aeba805 100644
--- a/templates/tibiacom/account.login.html.twig
+++ b/templates/tibiacom/account.login.html.twig
@@ -4,24 +4,25 @@
 		<input type="hidden" name="redirect" value="{{ redirect }}" />
 	{% endif %}
 	<div class="TableContainer" >
-		<table class="Table4" cellpadding="0" cellspacing="0" >
-			<div class="CaptionContainer" >
-				<div class="CaptionInnerContainer" >
-					<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/global/content/box-frame-edge.gif);" /></span>
-					<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/global/content/box-frame-edge.gif);" /></span>
-					<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/global/content/table-headline-border.gif);" ></span>
-					<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/global/content/box-frame-vertical.gif);" /></span>
-					<div class="Text" >Account Login</div>
-					<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/global/content/box-frame-vertical.gif);" /></span>
-					<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/global/content/table-headline-border.gif);" ></span>
-					<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/global/content/box-frame-edge.gif);" /></span>
-					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/global/content/box-frame-edge.gif);" /></span>
-				</div>
+		<div class="CaptionContainer" >
+			<div class="CaptionInnerContainer" >
+				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/global/content/box-frame-edge.gif);" ></span>
+				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/global/content/box-frame-edge.gif);" ></span>
+				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/global/content/table-headline-border.gif);" ></span>
+				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/global/content/box-frame-vertical.gif);" ></span>
+				<div class="Text" >Account Login</div>
+				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/global/content/box-frame-vertical.gif);" ></span>
+				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/global/content/table-headline-border.gif);" ></span>
+				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/global/content/box-frame-edge.gif);" ></span>
+				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/global/content/box-frame-edge.gif);" ></span>
 			</div>
+		</div>
+		<table class="Table4" cellpadding="0" cellspacing="0" >
 			<tr>
 				<td>
 					<div class="InnerTableContainer" >
 						<table style="width:100%;" >
+						<tbody>
 							<tr>
 								<td>
 									<div class="TableShadowContainerRightTop" >
@@ -30,20 +31,21 @@
 									<div class="TableContentAndRightShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-rm.gif);" >
 										<div class="TableContentContainer" >
 											<table class="TableContent" width="100%"  style="border:1px solid #faf0d7;" >
+											<tbody>
 												<tr>
 													<td>
-														<table style="float: left; width: 370px;" cellpadding="0" cellspacing="0" >
+														<table style="float: left; width: 100%;" cellpadding="0" cellspacing="0" >
 															{{ hook('HOOK_ACCOUNT_LOGIN_BEFORE_ACCOUNT') }}
 															<tr>
 																<td class="LabelV">
 																	<span{% if error is not null %} class="red"{% endif %}>{{ account_login_by }}:</span>
 																</td>
-																<td><input type="text" name="account_login" size="35" maxlength="{{ setting('core.account_login_by_email') ? '255' : '30' }}" autofocus /></td>
+																<td><input style="width: 100%;" type="text" name="account_login" size="35" maxlength="{{ setting('core.account_login_by_email') ? '255' : '30' }}" autofocus /></td>
 															</tr>
 															{{ hook('HOOK_ACCOUNT_LOGIN_AFTER_ACCOUNT') }}
 															<tr>
 																<td class="LabelV" ><span{% if error is not null %} class="red"{% endif %}>Password:</span></td>
-																<td><input type="password" name="password_login" size="35" maxlength="29" /></td>
+																<td><input style="width: 100%;"  type="password" name="password_login" size="35" maxlength="29" /></td>
 															</tr>
 															{{ hook('HOOK_ACCOUNT_LOGIN_AFTER_PASSWORD') }}
 															<tr>
@@ -53,17 +55,19 @@
 															</tr>
 															{{ hook('HOOK_ACCOUNT_LOGIN_AFTER_REMEMBER_ME') }}
 														</table>
-														<div style="float: right; font-size: 1px;" >
-															<input type="hidden" name="page" value="overview" >
+													</td>
+													<td id="LoginFormButtonCell">
+														<div style="float: right;" >
 															{{ include('buttons.login.html.twig') }}
-</form>
 															<div style="width: 2px; height: 2px;" ></div>
-																<form action="{{ getLink('account/lost') }}" method="post" style="padding:0px;margin:0px;" >
-																	{{ include('buttons.account_lost.html.twig') }}
-																</form>
-															</div>
+															<a href="{{ getLink('account/lost') }}" style="padding:0;margin:0;" >
+																{% set noSubmit = true %}
+																{{ include('buttons.account_lost.html.twig') }}
+															</a>
+														</div>
 													</td>
 												</tr>
+											</tbody>
 											</table>
 										</div>
 									</div>
@@ -75,35 +79,40 @@
 									</div>
 								</td>
 							</tr>
+						</tbody>
 						</table>
 					</div>
 				</td>
 			</tr>
 		</table>
 	</div>
+</form>
 <br/>
+
 <div style="text-align:center">
 	<h1>New to {{ config.lua.serverName }}?</h1>
 </div>
 <div class="TableContainer" >
-	<table class="Table4" cellpadding="0" cellspacing="0" >
-		<div class="CaptionContainer" >
-			<div class="CaptionInnerContainer" >
-				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/global/content/box-frame-edge.gif);" /></span>
-				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/global/content/box-frame-edge.gif);" /></span>
-				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/global/content/table-headline-border.gif);" ></span>
-				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/global/content/box-frame-vertical.gif);" /></span>
-				<div class="Text" >New Player</div>
-				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/global/content/box-frame-vertical.gif);" /></span>
-				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/global/content/table-headline-border.gif);" ></span>
-				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/global/content/box-frame-edge.gif);" /></span>
-				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/global/content/box-frame-edge.gif);" /></span>
-			</div>
+	<div class="CaptionContainer" >
+		<div class="CaptionInnerContainer" >
+			<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/global/content/box-frame-edge.gif);"></span>
+			<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/global/content/box-frame-edge.gif);"></span>
+			<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/global/content/table-headline-border.gif);" ></span>
+			<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/global/content/box-frame-vertical.gif);"></span>
+			<div class="Text" >New Player</div>
+			<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/global/content/box-frame-vertical.gif);"></span>
+			<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/global/content/table-headline-border.gif);" ></span>
+			<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/global/content/box-frame-edge.gif);"></span>
+			<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/global/content/box-frame-edge.gif);"></span>
 		</div>
+	</div>
+	<table class="Table3" cellpadding="0" cellspacing="0" >
+	<tbody>
 		<tr>
 			<td>
 				<div class="InnerTableContainer" >
 					<table style="width:100%;" >
+					<tbody>
 						<tr>
 							<td>
 								<div class="TableShadowContainerRightTop" >
@@ -112,6 +121,7 @@
 								<div class="TableContentAndRightShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-rm.gif);" >
 									<div class="TableContentContainer" >
 										<table class="TableContent" width="100%"  style="border:1px solid #faf0d7;" >
+										<tbody>
 											<tr>
 												<td >
 													<div style="float: right; margin-top: 20px;" >
@@ -129,9 +139,12 @@
 														<div style="margin-left: 10px;" >
 															<p>... where hardcore gaming meets fantasy.</p>
 															<p>... where friendships last a lifetime.</p>
-															<p>... unites adventurers since 2017!</p>
+															<p>... unites adventurers since 1997!</p>
 														</div>
 													</div>
+												</td>
+											</tr>
+										</tbody>
 										</table>
 									</div>
 								</div>
@@ -143,10 +156,12 @@
 								</div>
 							</td>
 						</tr>
+					</tbody>
 					</table>
 				</div>
 			</td>
 		</tr>
+	</tbody>
 	</table>
 </div>
 {{ hook('HOOK_ACCOUNT_LOGIN_AFTER_PAGE') }}
diff --git a/templates/tibiacom/basic.css b/templates/tibiacom/basic.css
index 3d260a97..4633c5ed 100644
--- a/templates/tibiacom/basic.css
+++ b/templates/tibiacom/basic.css
@@ -36,6 +36,12 @@ img {
   width: expression(document.body.clientWidth > 1200? "1200px": "100%" );
 }
 
+#LoginFormButtonCell {
+  width: 145px;
+  vertical-align: top;
+  padding-right: 10px;
+}
+
 #ContentRow {
   position: relative;
   top: 155px;

From 6d8f4718a1d349fba8f0ebc39cfd3a1a84d104b0 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sun, 6 Apr 2025 22:37:36 +0200
Subject: [PATCH 34/55] pages in theme folder have precedence over normal pages

---
 system/router.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/system/router.php b/system/router.php
index 5b103a90..ab9ea966 100644
--- a/system/router.php
+++ b/system/router.php
@@ -343,16 +343,16 @@ function getDatabasePages($withHidden = false): array
 
 function loadPageFromFileSystem($page, &$found): string
 {
-	$file = SYSTEM . 'pages/' . $page . '.php';
+	// feature: load pages from templates/ dir
+	global $template_path;
+	$file = $template_path . '/pages/' . $page . '.php';
 	if (!is_file($file)) {
-		// feature: convert camelCase to snake_case
-		// so instead of forum/move_thread
-		// we can write: forum/moveThread
-		$file = SYSTEM . 'pages/' . camelCaseToUnderscore($page) . '.php';
+		$file = SYSTEM . 'pages/' . $page . '.php';
 		if (!is_file($file)) {
-			// feature: load pages from templates/ dir
-			global $template_path;
-			$file = $template_path . '/pages/' . $page . '.php';
+			// feature: convert camelCase to snake_case
+			// so instead of forum/move_thread
+			// we can write: forum/moveThread
+			$file = SYSTEM . 'pages/' . camelCaseToUnderscore($page) . '.php';
 			if (!is_file($file)) {
 				$found = false;
 			}

From 6844f4392a1a09cfc8da4baa1448120900641aa3 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sun, 6 Apr 2025 23:46:52 +0200
Subject: [PATCH 35/55] Change logout button color

---
 templates/tibiacom/buttons.logout.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/tibiacom/buttons.logout.html.twig b/templates/tibiacom/buttons.logout.html.twig
index fccaf69d..6926617c 100644
--- a/templates/tibiacom/buttons.logout.html.twig
+++ b/templates/tibiacom/buttons.logout.html.twig
@@ -1,3 +1,3 @@
 {% set button_name = 'Logout' %}
-{% set button_image = '_sbutton_logout' %}
+{% set button_color = 'red' %}
 {% include('buttons.base.html.twig') %}
\ No newline at end of file

From ceaa0639e66d31e8177ff90791463470367aa45d Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Fri, 18 Apr 2025 13:57:53 +0200
Subject: [PATCH 36/55] feat: admin-pages (can add admin pages through plugins)

Also possibility to overwrite default myaac admin pages
---
 admin/index.php        | 26 ++++++++++-----
 plugins/example.json   |  4 ++-
 system/src/Plugins.php | 75 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 95 insertions(+), 10 deletions(-)

diff --git a/admin/index.php b/admin/index.php
index 15ab133c..86ebf3dc 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -1,6 +1,8 @@
 <?php
 
 // few things we'll need
+use MyAAC\Plugins;
+
 require '../common.php';
 
 const ADMIN_PANEL = true;
@@ -42,15 +44,21 @@ if(!$logged || !admin()) {
 	$page = 'login';
 }
 
-// include our page
-$file = __DIR__ . '/pages/' . $page . '.php';
-if(!@file_exists($file)) {
-	if (str_contains($page, 'plugins/')) {
-		$file = BASE . $page;
-	}
-	else {
-		$page = '404';
-		$file = SYSTEM . 'pages/404.php';
+$pluginsAdminPages = Plugins::getAdminPages();
+if(isset($pluginsAdminPages[$page]) && file_exists(BASE . $pluginsAdminPages[$page])) {
+	$file = BASE . $pluginsAdminPages[$page];
+}
+else {
+	// include our page
+	$file = __DIR__ . '/pages/' . $page . '.php';
+	if(!@file_exists($file)) {
+		if (str_contains($page, 'plugins/')) {
+			$file = BASE . $page;
+		}
+		else {
+			$page = '404';
+			$file = SYSTEM . 'pages/404.php';
+		}
 	}
 }
 
diff --git a/plugins/example.json b/plugins/example.json
index 68805cb9..681136fb 100644
--- a/plugins/example.json
+++ b/plugins/example.json
@@ -48,6 +48,8 @@
 		"pages": true,
 		"pagesSubFolders": false,
 		"commands": true,
-		"themes": true
+		"themes": true,
+		"admin-pages": true,
+		"admin-pages-sub-folders": true,
 	}
  }
diff --git a/system/src/Plugins.php b/system/src/Plugins.php
index c1d9b360..0ee7c36e 100644
--- a/system/src/Plugins.php
+++ b/system/src/Plugins.php
@@ -11,6 +11,81 @@ class Plugins {
 	private static $error = null;
 	private static $plugin_json = [];
 
+	public static function getAdminPages()
+	{
+		return Cache::remember('plugins_admin_pages', 10 * 60, function () {
+			$adminPages = [];
+			foreach(self::getAllPluginsJson() as $plugin) {
+				if (!self::getAutoLoadOption($plugin, 'admin-pages', true)) {
+					continue;
+				}
+
+				$adminPagesDefaultPriority = 1000;
+				if (isset($plugin['admin-pages-default-priority'])) {
+					$adminPagesDefaultPriority = $plugin['admin-pages-default-priority'];
+				}
+
+				//
+				// Get all plugins/*/admin-pages/*.php pages
+				//
+				$pluginAdminPages = glob(PLUGINS . $plugin['filename'] . '/admin-pages/*.php');
+				foreach ($pluginAdminPages as $file) {
+					$file = str_replace(PLUGINS, 'plugins/', $file);
+					$name = pathinfo($file, PATHINFO_FILENAME);
+
+					$adminPages[] = ['name' => $name, 'file' => $file, 'priority' => $adminPagesDefaultPriority];
+				}
+
+				if (self::getAutoLoadOption($plugin, 'admin-pages-sub-folders', true)) {
+					//
+					// Get all plugins/*/admin-pages/subFolder/*.php pages
+					//
+					$pluginAdminPagesSubFolders = glob(PLUGINS . $plugin['filename'] . '/admin-pages/*', GLOB_ONLYDIR);
+					foreach ($pluginAdminPagesSubFolders as $folder) {
+						$folderName = pathinfo($folder, PATHINFO_FILENAME);
+
+						$subFiles = glob(PLUGINS . $plugin['filename'] . '/admin-pages/' . $folderName . '/*.php');
+						foreach ($subFiles as $file) {
+							$file = str_replace(PLUGINS, 'plugins/', $file);
+							$name = $folderName . '/' . pathinfo($file, PATHINFO_FILENAME);
+
+							$adminPages[] = ['name' => $name, 'file' => $file, 'priority' => $adminPagesDefaultPriority];
+						}
+
+						$subFolders = glob(PLUGINS . $plugin['filename'] . '/admin-pages/' . $folderName . '/*', GLOB_ONLYDIR);
+						foreach ($subFolders as $subFolder) {
+							$subFolderName = pathinfo($subFolder, PATHINFO_FILENAME);
+							$subSubFiles = glob(PLUGINS . $plugin['filename'] . '/admin-pages/' . $folderName . '/' . $subFolderName . '/*.php');
+
+							foreach ($subSubFiles as $subSubFile) {
+								$subSubFile = str_replace(PLUGINS, 'plugins/', $subSubFile);
+								$name = $folderName . '/' . $subFolderName . '/' . pathinfo($subSubFile, PATHINFO_FILENAME);
+
+								$adminPages[] =  ['name' => $name, 'file' => $subSubFile, 'priority' => $adminPagesDefaultPriority];;
+							}
+						}
+					}
+				}
+			}
+
+			usort($adminPages, function ($a, $b)
+			{
+				if ($a['priority'] == $b['priority']) {
+					return 0;
+				}
+
+				return ($a['priority'] > $b['priority']) ? -1 : 1;
+			});
+
+			$ret = [];
+			foreach ($adminPages as $value) {
+				$ret[$value['name']] = $value['file'];
+			}
+
+			return $ret;
+		});
+	}
+
 	public static function getRoutes()
 	{
 		$cache = Cache::getInstance();

From 82a533d88c8a342076891d132b4b409ed9a1fe72 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Fri, 18 Apr 2025 18:12:56 +0200
Subject: [PATCH 37/55] Add $db->hasTableAndColumns($table, $columns), credits
 to @opentibiabr Team

---
 system/libs/pot/OTS_DB_MySQL.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/system/libs/pot/OTS_DB_MySQL.php b/system/libs/pot/OTS_DB_MySQL.php
index 89e8dd0d..baa38c76 100644
--- a/system/libs/pot/OTS_DB_MySQL.php
+++ b/system/libs/pot/OTS_DB_MySQL.php
@@ -234,6 +234,19 @@ class OTS_DB_MySQL extends OTS_Base_DB
 		return $this->hasTable($table) && ($this->has_column_cache[$table . '.' . $column] = count($this->query('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $column . "'")->fetchAll()) > 0);
 	}
 
+	public function hasTableAndColumns(string $table, array $columns = []): bool
+	{
+		if (!$this->hasTable($table)) return false;
+
+		foreach ($columns as $column) {
+			if (!$this->hasColumn($table, $column)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
 	public function revalidateCache() {
 		foreach($this->has_table_cache as $key => $value) {
 			$this->hasTableInternal($key);

From 86cb5821f61e42bb5bb7e849e2609d58ddde26eb Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Fri, 18 Apr 2025 19:42:33 +0200
Subject: [PATCH 38/55] README.md corrections

* Add links to docs & faq
* add info about 2.x dev version
* fix some grammar typos
---
 README.md | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 8fab33a5..767911d1 100644
--- a/README.md
+++ b/README.md
@@ -10,12 +10,19 @@ Official website: https://my-aac.org
 [![OpenTibia Discord](https://img.shields.io/discord/288399552581468162)](https://discord.gg/2J39Wus)
 [![Closed Issues](https://img.shields.io/github/issues-closed-raw/slawkens/myaac)](https://github.com/slawkens/myaac/issues?q=is%3Aissue+is%3Aclosed)
 
-| Version | Status                 | Branch | Requirements   |
-|:--------|:-----------------------|:-------|:---------------|
-| **1.x** | **Active development** | master | **PHP >= 8.1** |
-| 0.9.x   | Not developed anymore  | 0.9    | PHP >= 7.2.5   |
-| 0.8.x   | Active support         | 0.8    | PHP >= 7.2.5   |
-| 0.7.x   | End Of Life            | 0.7    | PHP >= 5.3.3   |
+| Version | Status                 | Branch  | Requirements   |
+|:--------|:-----------------------|:--------|:---------------|
+| 2.x     | Experimental features  | develop | PHP >= 8.1     |
+| **1.x** | **Active development** | main    | **PHP >= 8.1** |
+| 0.9.x   | Not developed anymore  | 0.9     | PHP >= 7.2.5   |
+| 0.8.x   | Active support         | 0.8     | PHP >= 7.2.5   |
+| 0.7.x   | End Of Life            | 0.7     | PHP >= 5.3.3   |
+
+The recommended version to install is 1.x, which can be found at releases page - [https://github.com/slawkens/myaac/releases](https://github.com/slawkens/myaac/releases).
+
+### Documentation
+* [docs.my-aac.org](https://docs.my-aac.org)
+* [my-aac.org - FAQ](https://my-aac.org/faqs/)
 
 ### Requirements
 
@@ -47,23 +54,23 @@ Official website: https://my-aac.org
 
 ### Configuration
 
-Check *config.php* to get more informations. (Notice: MyAAC 1.0+ doesn't use config.php anymore, it has been moved to Admin Panel - Settings page).
+Check *config.php* to get more information. (Notice: MyAAC 1.0+ doesn't use config.php anymore, it has been moved to Admin Panel - Settings page).
 
 Use *config.local.php* for your local configuration changes.
 
 ### Branches
 
 This repository follows the Git Flow Workflow.
-Cheatsheet: [Git-Flow-Cheetsheet](https://danielkummer.github.io/git-flow-cheatsheet)
+Cheatsheet: [Git-Flow-Cheatsheet](https://danielkummer.github.io/git-flow-cheatsheet)
 
 That means, we use:
-* master branch, for current stable release
+* main branch, for current stable release
 * develop branch, for development version (next release)
 * feature branches, for features etc.
 
 ### Known Problems
 
-- Some compatibility issues with some exotical distibutions.
+- Some compatibility issues with some exotic distributions.
 
 ### Contributing
 
@@ -77,7 +84,7 @@ Look: [Contributing](https://github.com/otsoft/myaac/wiki/Contributing) in our w
 
 ### Other Notes
 
-If you have a great idea or want contribute to the project - visit our website at https://www.my-aac.org
+If you have a great idea or want to contribute to the project - visit our website at https://www.my-aac.org
 
 ## Project supported by JetBrains
 

From e0043b13009900e5ba1f017bb290c61d31e5a541 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Fri, 18 Apr 2025 20:44:11 +0200
Subject: [PATCH 39/55] Fix warning

---
 install/includes/config.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/install/includes/config.php b/install/includes/config.php
index 5d9ae07a..bc6759b3 100644
--- a/install/includes/config.php
+++ b/install/includes/config.php
@@ -26,6 +26,9 @@ if(!isset($error) || !$error) {
 		$config['database_type'] = $config['lua']['database_type'];
 	else if(isset($config['lua']['sql_type'])) // otserv
 		$config['database_type'] = $config['lua']['sql_type'];
+	else {
+		$config['database_type'] = '';
+	}
 
 	$config['database_type'] = strtolower($config['database_type']);
 	if(empty($config['database_type'])) {

From 8cf340907797e2b9ed8279502345fbe4f7b0346c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o?=
 <107767789+JoaozinhoBrasil@users.noreply.github.com>
Date: Fri, 18 Apr 2025 18:17:35 -0300
Subject: [PATCH 40/55] SQL Syntax Standardization (#298)

* Update schema.sql

* Update schema.sql
---
 install/includes/schema.sql | 302 ++++++++++++++++++------------------
 1 file changed, 151 insertions(+), 151 deletions(-)

diff --git a/install/includes/schema.sql b/install/includes/schema.sql
index 21409c00..36f5eb31 100644
--- a/install/includes/schema.sql
+++ b/install/includes/schema.sql
@@ -2,34 +2,34 @@ SET @myaac_database_version = 43;
 
 CREATE TABLE `myaac_account_actions`
 (
-	`account_id` INT(11) NOT NULL,
-	`ip` INT(10) UNSIGNED NOT NULL DEFAULT 0,
-	`ipv6` BINARY(16) NOT NULL DEFAULT 0,
-	`date` INT(11) NOT NULL DEFAULT 0,
-	`action` VARCHAR(255) NOT NULL DEFAULT '',
+	`account_id` int NOT NULL,
+	`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 '',
 	KEY (`account_id`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
 
 CREATE TABLE `myaac_admin_menu`
 (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`page` VARCHAR(255) NOT NULL DEFAULT '',
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	`flags` INT(11) NOT NULL DEFAULT 0,
-	`enabled` INT(1) NOT NULL DEFAULT 1,
+	`id` int NOT NULL AUTO_INCREMENT,
+	`name` varchar(255) NOT NULL DEFAULT '',
+	`page` varchar(255) NOT NULL DEFAULT '',
+	`ordering` int NOT NULL DEFAULT 0,
+	`flags` int NOT NULL DEFAULT 0,
+	`enabled` int NOT NULL DEFAULT 1,
 	PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
 
 CREATE TABLE `myaac_changelog`
 (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`body` VARCHAR(500) NOT NULL DEFAULT '',
-	`type` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '1 - added, 2 - removed, 3 - changed, 4 - fixed',
-	`where` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '1 - server, 2 - site',
-	`date` INT(11) NOT NULL DEFAULT 0,
-	`player_id` INT(11) NOT NULL DEFAULT 0,
-	`hide` TINYINT(1) NOT NULL DEFAULT 0,
+	`id` int NOT NULL AUTO_INCREMENT,
+	`body` varchar(500) NOT NULL DEFAULT '',
+	`type` tinyint NOT NULL DEFAULT 0 COMMENT '1 - added, 2 - removed, 3 - changed, 4 - fixed',
+	`where` tinyint NOT NULL DEFAULT 0 COMMENT '1 - server, 2 - site',
+	`date` int NOT NULL DEFAULT 0,
+	`player_id` int NOT NULL DEFAULT 0,
+	`hide` tinyint NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
 
@@ -37,9 +37,9 @@ INSERT INTO `myaac_changelog` (`id`, `type`, `where`, `date`, `body`, `hide`) VA
 
 CREATE TABLE `myaac_config`
 (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`name` VARCHAR(30) NOT NULL,
-	`value` VARCHAR(1000) NOT NULL,
+	`id` int NOT NULL AUTO_INCREMENT,
+	`name` varchar(30) NOT NULL,
+	`value` varchar(1000) NOT NULL,
 	PRIMARY KEY (`id`),
 	UNIQUE (`name`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
@@ -48,24 +48,24 @@ INSERT INTO `myaac_config` (`name`, `value`) VALUES ('database_version', @myaac_
 
 CREATE TABLE `myaac_faq`
 (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`question` VARCHAR(255) NOT NULL DEFAULT '',
-	`answer` VARCHAR(1020) NOT NULL DEFAULT '',
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	`hide` TINYINT(1) NOT NULL DEFAULT 0,
+	`id` int NOT NULL AUTO_INCREMENT,
+	`question` varchar(255) NOT NULL DEFAULT '',
+	`answer` varchar(1020) NOT NULL DEFAULT '',
+	`ordering` int NOT NULL DEFAULT 0,
+	`hide` tinyint NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
 
 CREATE TABLE `myaac_forum_boards`
 (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`name` VARCHAR(32) NOT NULL,
-	`description` VARCHAR(255) NOT NULL DEFAULT '',
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	`guild` INT(11) NOT NULL DEFAULT 0,
-	`access` INT(11) NOT NULL DEFAULT 0,
-	`closed` TINYINT(1) NOT NULL DEFAULT 0,
-	`hide` TINYINT(1) NOT NULL DEFAULT 0,
+	`id` int NOT NULL AUTO_INCREMENT,
+	`name` varchar(32) NOT NULL,
+	`description` varchar(255) NOT NULL DEFAULT '',
+	`ordering` int NOT NULL DEFAULT 0,
+	`guild` int NOT NULL DEFAULT 0,
+	`access` int NOT NULL DEFAULT 0,
+	`closed` tinyint NOT NULL DEFAULT 0,
+	`hide` tinyint NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
 INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`, `closed`) VALUES (NULL, 'News', 'News commenting', 0, 1);
@@ -76,100 +76,100 @@ INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`) VALUE
 
 CREATE TABLE `myaac_forum`
 (
-	`id` int(11) NOT NULL AUTO_INCREMENT,
-	`first_post` int(11) NOT NULL default '0',
-	`last_post` int(11) NOT NULL default '0',
-	`section` int(3) NOT NULL default '0',
-	`replies` int(20) NOT NULL default '0',
-	`views` int(20) NOT NULL default '0',
-	`author_aid` int(20) NOT NULL default '0',
-	`author_guid` int(20) NOT NULL default '0',
+	`id` int NOT NULL AUTO_INCREMENT,
+	`first_post` int NOT NULL DEFAULT 0,
+	`last_post` int NOT NULL DEFAULT 0,
+	`section` int NOT NULL DEFAULT 0,
+	`replies` int NOT NULL DEFAULT 0,
+	`views` int NOT NULL DEFAULT 0,
+	`author_aid` int NOT NULL DEFAULT 0,
+	`author_guid` int NOT NULL DEFAULT 0,
 	`post_text` text NOT NULL,
 	`post_topic` varchar(255) NOT NULL DEFAULT '',
-	`post_smile` tinyint(1) NOT NULL default '0',
-	`post_html` tinyint(1) NOT NULL default '0',
-	`post_date` int(20) NOT NULL default '0',
-	`last_edit_aid` int(20) NOT NULL default '0',
-	`edit_date` int(20) NOT NULL default '0',
-	`post_ip` varchar(45) NOT NULL default '0.0.0.0',
-	`sticked` tinyint(1) NOT NULL DEFAULT '0',
-	`closed` tinyint(1) NOT NULL DEFAULT '0',
+	`post_smile` tinyint NOT NULL DEFAULT 0,
+	`post_html` tinyint NOT NULL DEFAULT 0,
+	`post_date` int NOT NULL DEFAULT 0,
+	`last_edit_aid` int NOT NULL DEFAULT 0,
+	`edit_date` int NOT NULL DEFAULT 0,
+	`post_ip` varchar(45) NOT NULL DEFAULT '0.0.0.0',
+	`sticked` tinyint NOT NULL DEFAULT 0,
+	`closed` tinyint NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`),
 	KEY `section` (`section`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
 
 CREATE TABLE `myaac_menu`
 (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`template` VARCHAR(255) NOT NULL,
-	`name` VARCHAR(255) NOT NULL,
-	`link` VARCHAR(255) NOT NULL,
-	`blank` TINYINT(1) NOT NULL DEFAULT 0,
-	`color` VARCHAR(6) NOT NULL DEFAULT '',
-	`category` INT(11) NOT NULL DEFAULT 1,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	`enabled` INT(1) NOT NULL DEFAULT 1,
+	`id` int NOT NULL AUTO_INCREMENT,
+	`template` varchar(255) NOT NULL,
+	`name` varchar(255) NOT NULL,
+	`link` varchar(255) NOT NULL,
+	`blank` tinyint NOT NULL DEFAULT 0,
+	`color` varchar(6) NOT NULL DEFAULT '',
+	`category` int NOT NULL DEFAULT 1,
+	`ordering` int NOT NULL DEFAULT 0,
+	`enabled` int NOT NULL DEFAULT 1,
 	PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
 
 CREATE TABLE `myaac_monsters` (
-	`id` int(11) NOT NULL AUTO_INCREMENT,
-	`hide` tinyint(1) NOT NULL default 0,
+	`id` int NOT NULL AUTO_INCREMENT,
+	`hide` tinyint NOT NULL DEFAULT 0,
 	`name` varchar(255) NOT NULL,
-	`mana` int(11) NOT NULL DEFAULT 0,
-	`exp` int(11) NOT NULL,
-	`health` int(11) NOT NULL,
-	`look` VARCHAR(255) NOT NULL DEFAULT '',
-	`speed_lvl` int(11) NOT NULL default 1,
-	`use_haste` tinyint(1) NOT NULL,
+	`mana` int NOT NULL DEFAULT 0,
+	`exp` int NOT NULL,
+	`health` int NOT NULL,
+	`look` varchar(255) NOT NULL DEFAULT '',
+	`speed_lvl` int NOT NULL DEFAULT 1,
+	`use_haste` tinyint NOT NULL,
 	`voices` text NOT NULL,
 	`immunities` varchar(255) NOT NULL,
-	`elements` TEXT NOT NULL,
-	`summonable` tinyint(1) NOT NULL,
-	`convinceable` tinyint(1) NOT NULL,
-	`pushable` TINYINT(1) NOT NULL DEFAULT '0',
-	`canpushitems` TINYINT(1) NOT NULL DEFAULT '0',
-	`canwalkonenergy` TINYINT(1) NOT NULL DEFAULT '0',
-	`canwalkonpoison` TINYINT(1) NOT NULL DEFAULT '0',
-	`canwalkonfire` TINYINT(1) NOT NULL DEFAULT '0',
-	`runonhealth` TINYINT(1) NOT NULL DEFAULT '0',
-	`hostile` TINYINT(1) NOT NULL DEFAULT '0',
-	`attackable` TINYINT(1) NOT NULL DEFAULT '0',
-	`rewardboss` TINYINT(1) NOT NULL DEFAULT '0',
-	`defense` INT(11) NOT NULL DEFAULT '0',
-	`armor` INT(11) NOT NULL DEFAULT '0',
-	`canpushcreatures` TINYINT(1) NOT NULL DEFAULT '0',
+	`elements` text NOT NULL,
+	`summonable` tinyint NOT NULL,
+	`convinceable` tinyint NOT NULL,
+	`pushable` tinyint NOT NULL DEFAULT 0,
+	`canpushitems` tinyint NOT NULL DEFAULT 0,
+	`canwalkonenergy` tinyint NOT NULL DEFAULT 0,
+	`canwalkonpoison` tinyint NOT NULL DEFAULT 0,
+	`canwalkonfire` tinyint NOT NULL DEFAULT 0,
+	`runonhealth` tinyint NOT NULL DEFAULT 0,
+	`hostile` tinyint NOT NULL DEFAULT 0,
+	`attackable` tinyint NOT NULL DEFAULT 0,
+	`rewardboss` tinyint NOT NULL DEFAULT 0,
+	`defense` int NOT NULL DEFAULT 0,
+	`armor` int NOT NULL DEFAULT 0,
+	`canpushcreatures` tinyint NOT NULL DEFAULT 0,
 	`race` varchar(255) NOT NULL,
 	`loot` text NOT NULL,
-	`summons` TEXT NOT NULL,
+	`summons` text NOT NULL,
 	PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
 
 CREATE TABLE `myaac_news`
 (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`title` VARCHAR(100) NOT NULL,
-	`body` TEXT NOT NULL,
-	`type` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '1 - news, 2 - ticker, 3 - article',
-	`date` INT(11) NOT NULL DEFAULT 0,
-	`category` TINYINT(1) NOT NULL DEFAULT 0,
-	`player_id` INT(11) NOT NULL DEFAULT 0,
-	`last_modified_by` INT(11) NOT NULL DEFAULT 0,
-	`last_modified_date` INT(11) NOT NULL DEFAULT 0,
-	`comments` VARCHAR(50) NOT NULL DEFAULT '',
-	`article_text` VARCHAR(300) NOT NULL DEFAULT '',
-	`article_image` VARCHAR(100) NOT NULL DEFAULT '',
-	`hide` TINYINT(1) NOT NULL DEFAULT 0,
+	`id` int NOT NULL AUTO_INCREMENT,
+	`title` varchar(100) NOT NULL,
+	`body` text NOT NULL,
+	`type` tinyint NOT NULL DEFAULT 0 COMMENT '1 - news, 2 - ticker, 3 - article',
+	`date` int NOT NULL DEFAULT 0,
+	`category` tinyint NOT NULL DEFAULT 0,
+	`player_id` int NOT NULL DEFAULT 0,
+	`last_modified_by` int NOT NULL DEFAULT 0,
+	`last_modified_date` int NOT NULL DEFAULT 0,
+	`comments` varchar(50) NOT NULL DEFAULT '',
+	`article_text` varchar(300) NOT NULL DEFAULT '',
+	`article_image` varchar(100) NOT NULL DEFAULT '',
+	`hide` tinyint NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
 
 CREATE TABLE `myaac_news_categories`
 (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`name` VARCHAR(50) NOT NULL DEFAULT "",
-	`description` VARCHAR(50) NOT NULL DEFAULT "",
-	`icon_id` INT(2) NOT NULL DEFAULT 0,
-	`hide` TINYINT(1) NOT NULL DEFAULT 0,
+	`id` int NOT NULL AUTO_INCREMENT,
+	`name` varchar(50) NOT NULL DEFAULT "",
+	`description` varchar(50) NOT NULL DEFAULT "",
+	`icon_id` int NOT NULL DEFAULT 0,
+	`hide` tinyint NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
 
@@ -181,39 +181,39 @@ INSERT INTO `myaac_news_categories` (`id`, `icon_id`) VALUES (NULL, 4);
 
 CREATE TABLE `myaac_notepad`
 (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`account_id` INT(11) NOT NULL,
-	/*`name` VARCHAR(30) NOT NULL,*/
-	`content` TEXT NOT NULL,
-	/*`public` TINYINT(1) NOT NULL DEFAULT 0*/
+	`id` int NOT NULL AUTO_INCREMENT,
+	`account_id` int NOT NULL,
+	/*`name` varchar(30) NOT NULL,*/
+	`content` text NOT NULL,
+	/*`public` tinyint NOT NULL DEFAULT 0*/
 	PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
 
 CREATE TABLE `myaac_pages`
 (
 	`id` INT NOT NULL AUTO_INCREMENT,
-	`name` VARCHAR(30) NOT NULL,
-	`title` VARCHAR(30) NOT NULL,
-	`body` TEXT NOT NULL,
-	`date` INT(11) NOT NULL DEFAULT 0,
-	`player_id` INT(11) NOT NULL DEFAULT 0,
-	`php` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '0 - plain html, 1 - php',
-	`enable_tinymce` TINYINT(1) NOT NULL DEFAULT 1 COMMENT '1 - enabled, 0 - disabled',
-	`access` TINYINT(2) NOT NULL DEFAULT 0,
-	`hide` TINYINT(1) NOT NULL DEFAULT 0,
+	`name` varchar(30) NOT NULL,
+	`title` varchar(30) NOT NULL,
+	`body` text NOT NULL,
+	`date` int NOT NULL DEFAULT 0,
+	`player_id` int NOT NULL DEFAULT 0,
+	`php` tinyint NOT NULL DEFAULT 0 COMMENT '0 - plain html, 1 - php',
+	`enable_tinymce` tinyint NOT NULL DEFAULT 1 COMMENT '1 - enabled, 0 - disabled',
+	`access` tinyint NOT NULL DEFAULT 0,
+	`hide` tinyint NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`),
 	UNIQUE (`name`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
 
 CREATE TABLE `myaac_gallery`
 (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`comment` VARCHAR(255) NOT NULL DEFAULT '',
-	`image` VARCHAR(255) NOT NULL,
-	`thumb` VARCHAR(255) NOT NULL,
-	`author` VARCHAR(50) NOT NULL DEFAULT '',
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	`hide` TINYINT(1) NOT NULL DEFAULT 0,
+	`id` int NOT NULL AUTO_INCREMENT,
+	`comment` varchar(255) NOT NULL DEFAULT '',
+	`image` varchar(255) NOT NULL,
+	`thumb` varchar(255) NOT NULL,
+	`author` varchar(50) NOT NULL DEFAULT '',
+	`ordering` int NOT NULL DEFAULT 0,
+	`hide` tinyint NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
 
@@ -221,51 +221,51 @@ INSERT INTO `myaac_gallery` (`id`, `ordering`, `comment`, `image`, `thumb`, `aut
 
 CREATE TABLE `myaac_settings`
 (
-	`id` int(11) NOT NULL AUTO_INCREMENT,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`key` VARCHAR(255) NOT NULL DEFAULT '',
-	`value` TEXT NOT NULL,
+	`id` int NOT NULL AUTO_INCREMENT,
+	`name` varchar(255) NOT NULL DEFAULT '',
+	`key` varchar(255) NOT NULL DEFAULT '',
+	`value` text NOT NULL,
 	PRIMARY KEY (`id`),
 	KEY `key` (`key`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
 
 CREATE TABLE `myaac_spells`
 (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`spell` VARCHAR(255) NOT NULL DEFAULT '',
-	`name` VARCHAR(255) NOT NULL,
-	`words` VARCHAR(255) NOT NULL DEFAULT '',
-	`category` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '1 - attack, 2 - healing, 3 - summon, 4 - supply, 5 - support',
-	`type` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '1 - instant, 2 - conjure, 3 - rune',
-	`level` INT(11) NOT NULL DEFAULT 0,
-	`maglevel` INT(11) NOT NULL DEFAULT 0,
-	`mana` INT(11) NOT NULL DEFAULT 0,
-	`soul` TINYINT(3) NOT NULL DEFAULT 0,
-	`conjure_id` INT(11) NOT NULL DEFAULT 0,
-	`conjure_count` TINYINT(3) NOT NULL DEFAULT 0,
-	`reagent` INT(11) NOT NULL DEFAULT 0,
-	`item_id` INT(11) NOT NULL DEFAULT 0,
-	`premium` TINYINT(1) NOT NULL DEFAULT 0,
-	`vocations` VARCHAR(100) NOT NULL DEFAULT '',
-	`hide` TINYINT(1) NOT NULL DEFAULT 0,
+	`id` int NOT NULL AUTO_INCREMENT,
+	`spell` varchar(255) NOT NULL DEFAULT '',
+	`name` varchar(255) NOT NULL,
+	`words` varchar(255) NOT NULL DEFAULT '',
+	`category` tinyint NOT NULL DEFAULT 0 COMMENT '1 - attack, 2 - healing, 3 - summon, 4 - supply, 5 - support',
+	`type` tinyint NOT NULL DEFAULT 0 COMMENT '1 - instant, 2 - conjure, 3 - rune',
+	`level` int NOT NULL DEFAULT 0,
+	`maglevel` int NOT NULL DEFAULT 0,
+	`mana` int NOT NULL DEFAULT 0,
+	`soul` tinyint NOT NULL DEFAULT 0,
+	`conjure_id` int NOT NULL DEFAULT 0,
+	`conjure_count` tinyint NOT NULL DEFAULT 0,
+	`reagent` int NOT NULL DEFAULT 0,
+	`item_id` int NOT NULL DEFAULT 0,
+	`premium` tinyint NOT NULL DEFAULT 0,
+	`vocations` varchar(100) NOT NULL DEFAULT '',
+	`hide` tinyint NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`),
 	UNIQUE (`name`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
 
 CREATE TABLE `myaac_visitors`
 (
-	`ip` VARCHAR(45) NOT NULL,
-	`lastvisit` INT(11) NOT NULL DEFAULT 0,
-	`page` VARCHAR(2048) NOT NULL,
-	`user_agent` VARCHAR(255) NOT NULL DEFAULT '',
+	`ip` varchar(45) NOT NULL,
+	`lastvisit` int NOT NULL DEFAULT 0,
+	`page` varchar(2048) NOT NULL,
+	`user_agent` varchar(255) NOT NULL DEFAULT '',
 	UNIQUE (`ip`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
 
 CREATE TABLE `myaac_weapons`
 (
-	`id` INT(11) NOT NULL,
-	`level` INT(11) NOT NULL DEFAULT 0,
-	`maglevel` INT(11) NOT NULL DEFAULT 0,
-	`vocations` VARCHAR(100) NOT NULL DEFAULT '',
+	`id` int NOT NULL,
+	`level` int NOT NULL DEFAULT 0,
+	`maglevel` int NOT NULL DEFAULT 0,
+	`vocations` varchar(100) NOT NULL DEFAULT '',
 	PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;

From c2bf94fb2370d2009a2eb907f818955132cf8611 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sun, 20 Apr 2025 20:40:10 +0200
Subject: [PATCH 41/55] Fix: display 404 error instead of 500 when page has
 been removed from filesystem

---
 system/router.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/system/router.php b/system/router.php
index ab9ea966..4f68b127 100644
--- a/system/router.php
+++ b/system/router.php
@@ -108,6 +108,10 @@ $dispatcher = FastRoute\cachedDispatcher(function (FastRoute\RouteCollector $r)
 
 	foreach ($routes as $route) {
 		if (!str_contains($route[2], '__redirect__') && !str_contains($route[2], '__database__')) {
+			if (!is_file(BASE . 'system/pages/' . $route[2])) {
+				continue;
+			}
+
 			$routesFinal[] = [$route[0], $route[1], 'system/pages/' . $route[2], $route[3] ?? 10000];
 		}
 		else {

From b71555d60d73af2bbc1daa49657bfa42778f2844 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sun, 20 Apr 2025 21:29:22 +0200
Subject: [PATCH 42/55] Update router.php

---
 system/router.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/system/router.php b/system/router.php
index 4f68b127..e0bcc04f 100644
--- a/system/router.php
+++ b/system/router.php
@@ -89,8 +89,6 @@ if($logged && $account_logged && $account_logged->isLoaded()) {
  * Routes loading
  */
 $dispatcher = FastRoute\cachedDispatcher(function (FastRoute\RouteCollector $r) {
-	$routes = require SYSTEM . 'routes.php';
-
 	$routesFinal = [];
 	foreach(getDatabasePages() as $page) {
 		$routesFinal[] = ['*', $page, '__database__/' . $page, 100];
@@ -106,6 +104,7 @@ $dispatcher = FastRoute\cachedDispatcher(function (FastRoute\RouteCollector $r)
 */
 	}
 
+	$routes = require SYSTEM . 'routes.php';
 	foreach ($routes as $route) {
 		if (!str_contains($route[2], '__redirect__') && !str_contains($route[2], '__database__')) {
 			if (!is_file(BASE . 'system/pages/' . $route[2])) {

From 4e7c894cf21cbaf837e11e320655e948e4caaa9d Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sun, 20 Apr 2025 21:29:37 +0200
Subject: [PATCH 43/55] Nothing..

---
 admin/pages/plugins.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/pages/plugins.php b/admin/pages/plugins.php
index 8e87f75e..db886635 100644
--- a/admin/pages/plugins.php
+++ b/admin/pages/plugins.php
@@ -17,7 +17,7 @@ csrfProtect();
 
 $use_datatable = true;
 
-if (!getBoolean(setting('core.admin_plugins_manage_enable'))) {
+if (!setting('core.admin_plugins_manage_enable')) {
 	warning('Plugin installation and management is disabled in Settings.<br/>If you wish to enable, go to Settings and enable <strong>Enable Plugins Manage</strong>.');
 }
 else {

From 1d0c173e7d000aecbd432800941fc3e38a0e50f2 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sun, 20 Apr 2025 21:30:59 +0200
Subject: [PATCH 44/55] Clear cache on plugin enable/disable, fixes some issues
 with plugin pages

---
 system/src/Plugins.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/src/Plugins.php b/system/src/Plugins.php
index 0ee7c36e..f6711a3a 100644
--- a/system/src/Plugins.php
+++ b/system/src/Plugins.php
@@ -699,6 +699,7 @@ class Plugins {
 			return false;
 		}
 
+		clearCache();
 		return true;
 	}
 

From d0d0af289ddd2b543a878da56b7fa941148a1582 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sun, 20 Apr 2025 21:32:46 +0200
Subject: [PATCH 45/55] Refactor code + use clearCache() instead

---
 system/src/Plugins.php | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/system/src/Plugins.php b/system/src/Plugins.php
index f6711a3a..a0910b01 100644
--- a/system/src/Plugins.php
+++ b/system/src/Plugins.php
@@ -793,25 +793,19 @@ class Plugins {
 			}
 		}
 
-		if($success) {
-			foreach($plugin_info['uninstall'] as $file) {
-				if(!deleteDirectory(BASE . $file)) {
-					self::$warnings[] = 'Cannot delete: ' . $file;
-				}
-			}
-
-			$cache = Cache::getInstance();
-			if($cache->enabled()) {
-				$cache->delete('templates');
-				$cache->delete('hooks');
-				$cache->delete('template_menus');
-			}
-
-			return true;
+		if(!$success) {
+			$revertEnable();
+			return false;
 		}
 
-		$revertEnable();
-		return false;
+		foreach($plugin_info['uninstall'] as $file) {
+			if(!deleteDirectory(BASE . $file)) {
+				self::$warnings[] = 'Cannot delete: ' . $file;
+			}
+		}
+
+		clearCache();
+		return true;
 	}
 
 	public static function is_installed($plugin_name, $version): bool

From b618084d50918539d9a70abd97e764137b966067 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Mon, 21 Apr 2025 23:43:57 +0200
Subject: [PATCH 46/55] Fix headline.php: change image format to .png cause of
 black background

---
 templates/tibiacom/headline.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/tibiacom/headline.php b/templates/tibiacom/headline.php
index 4bf3f273..dd85d826 100644
--- a/templates/tibiacom/headline.php
+++ b/templates/tibiacom/headline.php
@@ -17,7 +17,7 @@ $font = getenv('GDFONTPATH') . DIRECTORY_SEPARATOR . 'martel.ttf';
 imagettftext($image, 18, 0, 4, 20, imagecolorallocate($image, 240, 209, 164), $font, $text);
 
 // header mime type
-header('Content-type: image/gif');
+header('Content-type: image/png');
 
 // output image to browser
-imagegif($image);
+imagepng($image);

From d47195a7878095336f9c9edc6f96244257f67eec Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Tue, 22 Apr 2025 13:30:11 +0200
Subject: [PATCH 47/55] Do not autoload sub-folders if autoload pages is
 disabled

---
 plugins/example.json   | 2 +-
 system/src/Plugins.php | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/example.json b/plugins/example.json
index 681136fb..395db41d 100644
--- a/plugins/example.json
+++ b/plugins/example.json
@@ -46,7 +46,7 @@
 	"settings": "plugins/your-plugin-folder/settings.php",
 	"autoload": {
 		"pages": true,
-		"pagesSubFolders": false,
+		"pages-sub-folders": false,
 		"commands": true,
 		"themes": true,
 		"admin-pages": true,
diff --git a/system/src/Plugins.php b/system/src/Plugins.php
index a0910b01..f9d4d5ce 100644
--- a/system/src/Plugins.php
+++ b/system/src/Plugins.php
@@ -151,7 +151,8 @@ class Plugins {
 				$pagesDefaultPriority = $plugin['pages-default-priority'];
 			}
 
-			if (self::getAutoLoadOption($plugin, 'pages', true)) {
+			$autoLoadPages = self::getAutoLoadOption($plugin, 'pages', true);
+			if ($autoLoadPages) {
 				//
 				// Get all plugins/*/pages/*.php pages
 				//
@@ -164,7 +165,8 @@ class Plugins {
 				}
 			}
 
-			if (self::getAutoLoadOption($plugin, 'pagesSubFolders', true)) {
+			if ($autoLoadPages && self::getAutoLoadOption($plugin, 'pagesSubFolders', true) &&
+				self::getAutoLoadOption($plugin, 'pages-sub-folders', true)) {
 				//
 				// Get all plugins/*/pages/subFolder/*.php pages
 				//

From 93c09b33803861f82cbe216148755f97bf43f7ac Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Tue, 22 Apr 2025 13:42:55 +0200
Subject: [PATCH 48/55] Release v1.4

---
 CHANGELOG-1.x.md | 21 +++++++++++++++++++++
 common.php       |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG-1.x.md b/CHANGELOG-1.x.md
index 473bc51b..c6feb09d 100644
--- a/CHANGELOG-1.x.md
+++ b/CHANGELOG-1.x.md
@@ -1,5 +1,26 @@
 # Changelog
 
+## [1.4 - 22.04.2025]
+
+### Added
+* feat: admin-pages (can add admin pages through plugins) (https://github.com/slawkens/myaac/commit/ceaa0639e66d31e8177ff90791463470367aa45d)
+	* just place the page in admin-pages folder in the plugin
+	* Also, possibility to overwrite default myaac admin pages
+* Add db->hasTableAndColumns(table, columns), credits to @opentibiabr Team (https://github.com/slawkens/myaac/commit/82a533d88c8a342076891d132b4b409ed9a1fe72)
+* Add noSubmit option to buttons.base (https://github.com/slawkens/myaac/commit/64f6d3abcada3bf9fd7599f50d2fac0a1367f383)
+
+### Fixed
+* Fix: display 404 error instead of 500 when page has been removed from filesystem (https://github.com/slawkens/myaac/commit/c2bf94fb2370d2009a2eb907f818955132cf8611)
+* Fix headline.php: change image format to .png cause of black background (https://github.com/slawkens/myaac/commit/b618084d50918539d9a70abd97e764137b966067)
+* Clear cache on plugin enable/disable, fixes some issues with plugin pages being cached (https://github.com/slawkens/myaac/commit/1d0c173e7d000aecbd432800941fc3e38a0e50f2)
+* Do not autoload sub-folders if autoload pages is disabled (https://github.com/slawkens/myaac/commit/d47195a7878095336f9c9edc6f96244257f67eec)
+
+### Changed
+* SQL Syntax Standardization (by @JoaozinhoBrasil, #298)
+* Pages in theme/template folder will now have precedence over normal pages (https://github.com/slawkens/myaac/commit/6d8f4718a1d349fba8f0ebc39cfd3a1a84d104b0)
+* Small changes in account.login.html.twig (https://github.com/slawkens/myaac/commit/f40b986b59d4c8fa89ab4745731bf366f8619976)
+* Plugin name is required, version is optional (https://github.com/slawkens/myaac/commit/e6f05a2731c61d931be49e121c068e49c0ad5e01)
+
 ## [1.3.3 - 04.04.2025]
 
 ### Fixed
diff --git a/common.php b/common.php
index 33e31085..51d5a6ef 100644
--- a/common.php
+++ b/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.3.4-dev';
+const MYAAC_VERSION = '1.4';
 const DATABASE_VERSION = 43;
 const TABLE_PREFIX = 'myaac_';
 define('START_TIME', microtime(true));

From de0512f11ac92aafc71f549043bd29bfb7f4aace Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Tue, 22 Apr 2025 15:57:23 +0200
Subject: [PATCH 49/55] Start v1.4.1-dev

---
 common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.php b/common.php
index 51d5a6ef..4c903f5b 100644
--- a/common.php
+++ b/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.4';
+const MYAAC_VERSION = '1.4.1-dev';
 const DATABASE_VERSION = 43;
 const TABLE_PREFIX = 'myaac_';
 define('START_TIME', microtime(true));

From fa1f927082e6b59256c8bfd704aba29be0bfdf59 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Wed, 23 Apr 2025 18:04:54 +0200
Subject: [PATCH 50/55] Update login.php

---
 login.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/login.php b/login.php
index 75aeed4d..26616c79 100644
--- a/login.php
+++ b/login.php
@@ -143,7 +143,7 @@ switch ($action) {
 			if ($limiter->exceeded($ip)) {
 				sendError($ban_msg);
 			}
-			
+
 			sendError(($inputEmail != false ? 'Email' : 'Account name') . ' or password is not correct.');
 		}
 

From 4e6aa0f2628992078c2b47588168dcad9647613c Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Wed, 23 Apr 2025 18:05:14 +0200
Subject: [PATCH 51/55] Fix boostedCreature fetch on login.php

---
 login.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/login.php b/login.php
index 26616c79..d51ae57b 100644
--- a/login.php
+++ b/login.php
@@ -86,7 +86,7 @@ switch ($action) {
 		die(json_encode(['eventlist' => $eventlist, 'lastupdatetimestamp' => time()]));
 
 	case 'boostedcreature':
-		$boostedCreature = BoostedCreature::latest();
+		$boostedCreature = BoostedCreature::first();
 		die(json_encode([
 			'boostedcreature' => true,
 			'raceid' => $boostedCreature->raceid

From dbea69f31478391dacfbbc02c8353c39b4245daf Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Wed, 23 Apr 2025 20:41:50 +0200
Subject: [PATCH 52/55] Fix if user removes the menu category

---
 system/templates/admin.menus.js.html.twig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/templates/admin.menus.js.html.twig b/system/templates/admin.menus.js.html.twig
index dcb4fd33..9f7ea45e 100644
--- a/system/templates/admin.menus.js.html.twig
+++ b/system/templates/admin.menus.js.html.twig
@@ -4,7 +4,9 @@
 	let colors = [];
 
 	{% for cat, menu in menus %}
-	last_id[{{ cat }}] = {{ last_id[cat] }};
+		{% if config('menu_categories')[cat] is not empty %}
+			last_id[{{ cat }}] = {{ last_id[cat] }};
+		{% endif %}
 	{% endfor %}
 
 	{% set menuDefaultLinksColor = config('menu_default_links_color') %}

From 1e45d5c39306b2ed7cbaaca365c71c336ea1128e Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Thu, 24 Apr 2025 13:43:50 +0200
Subject: [PATCH 53/55] Optimize .htaccess FilesMatch: Block access to
 *.md/json/dist/sql

---
 .htaccess.dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.htaccess.dist b/.htaccess.dist
index 1c837a33..036241dc 100644
--- a/.htaccess.dist
+++ b/.htaccess.dist
@@ -6,7 +6,7 @@
 	Options -MultiViews
 </IfModule>
 
-<FilesMatch "^(CHANGELOG\.md|README\.md|composer\.json|composer\.lock|package\.json|package-lock\.json|cypress\.env\.json)$">
+<FilesMatch "^(.*\.md|.*\.json|.*\.dist|.*\.sql|CHANGELOG|README|composer\.lock)$">
 	Require all denied
 </FilesMatch>
 

From 0fbd4bf1be98775da308bd1629de77d4103b5396 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Thu, 24 Apr 2025 13:44:38 +0200
Subject: [PATCH 54/55] nginx: block additionally *.sql

---
 nginx-sample.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-sample.conf b/nginx-sample.conf
index bb107f02..c0cfa367 100644
--- a/nginx-sample.conf
+++ b/nginx-sample.conf
@@ -14,7 +14,7 @@ server {
 
 	# block .htaccess, CHANGELOG.md, composer.json etc.
 	# this is to prevent finding software versions
-	location ~\.(ht|md|json|dist)$ {
+	location ~\.(ht|md|json|dist|sql)$ {
 		deny all;
 	}
 

From 2f0758e35171720b06fcf3f77eb1b56c5efcae73 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sat, 26 Apr 2025 06:17:58 +0200
Subject: [PATCH 55/55] Update schema.sql

---
 install/includes/schema.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/install/includes/schema.sql b/install/includes/schema.sql
index 36f5eb31..00a50f50 100644
--- a/install/includes/schema.sql
+++ b/install/includes/schema.sql
@@ -2,12 +2,12 @@ SET @myaac_database_version = 43;
 
 CREATE TABLE `myaac_account_actions`
 (
+	`id` int NOT NULL AUTO_INCREMENT,
 	`account_id` int NOT NULL,
-	`ip` int unsigned NOT NULL DEFAULT 0,
-	`ipv6` binary(16) NOT NULL DEFAULT 0,
+	`ip` varchar(45) NOT NULL DEFAULT '',
 	`date` int NOT NULL DEFAULT 0,
 	`action` varchar(255) NOT NULL DEFAULT '',
-	KEY (`account_id`)
+	PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
 
 CREATE TABLE `myaac_admin_menu`