Release v1.1

Secure direct access to template.php
Fix error in CLI, where BASE_URL is not defined
2025-09-15 13:03:34 +02:00 · 2025-01-27 22:30:18 +01:00 · 2025-01-27 22:15:00 +01:00 · 2025-01-24 21:42:52 +01:00 · 2025-01-22 21:45:07 +01:00 · 2025-01-22 21:44:58 +01:00
48 changed files with 2432 additions and 2166 deletions
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -1,9 +1,9 @@
 name: Cypress
 on:
  pull_request:
-    branches: [develop]
+    branches: [master]
  push:
-    branches: [develop]
+    branches: [master]

 jobs:
  cypress:
@@ -35,7 +35,7 @@ jobs:
        - name: Checkout MyAAC
          uses: actions/checkout@v4
          with:
-            ref: develop
+            ref: master

        - uses: actions/setup-node@v4
          with:
--- a/.github/workflows/phplint.yml
+++ b/.github/workflows/phplint.yml
@@ -1,9 +1,9 @@
 name: PHP Linting
 on:
  pull_request:
-    branches: [develop]
+    branches: [master]
  push:
-    branches: [develop]
+    branches: [master]

 jobs:
  phplint:
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -2,9 +2,9 @@ name: "PHPStan"

 on:
  pull_request:
-    branches: [develop]
+    branches: [master]
  push:
-    branches: [develop]
+    branches: [master]

 jobs:
  tests:
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ Thumbs.db

 #
 /.htaccess
+lua

 # composer
 composer.phar
@@ -75,6 +76,3 @@ landing

 # system
 system/functions_custom.php
-
-# others/rest
-system/pages/downloads.php
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,72 @@
 # Changelog

+## [1.1 - 27.01.2025]
+
+### Changed
+* adjust mailer settings descriptions to latest gmail (https://github.com/slawkens/myaac/commit/c5d5bb80671db135e6b503f53684771c7272e05d)
+* optimize $player->isOnline() function, thanks @gesior (https://github.com/slawkens/myaac/commit/10dd818b139d5e1bb1ca9ec81edfb083ba9316b4)
+* make players.comment and guilds.description VARCHAR (https://github.com/slawkens/myaac/commit/a45ceab83a74bee2b89cdb72baceda75e577e3cf)
+* add lua/ folder to .gitignore (https://github.com/slawkens/myaac/commit/07012f786b1114cb6ab2f064f82c645b136a375a)
+
+### Fixed
+* general fixes in the tibiacom template menus, better support for custom menus
+* make functions_custom.php optional
+* error in CLI, where BASE_URL is not defined (https://github.com/slawkens/myaac/commit/4d749b881582f64b5a46196dbbb5ee8097127f03)
+* hook ACCOUNT_LOGIN_BEFORE_ACCOUNT location (https://github.com/slawkens/myaac/commit/669c447fca8643ce56d9ef8c1374ec647c780998)
+
+## [1.0.1 - 14.01.2025]
+
+### Fixed
+* tibiacom account & news menu links not auto expanding
+
+### Updated (Thanks dependabot)
+* twig from ^2.0 to ^3.11
+* tinymce from ^6.8.3 to ^7.2.0
+* cypress from ^12.12.0 to ^13.17.0
+* nesbot/carbon from 2.72.5 to 2.72.6
+
+## [1.0 - 12.01.2025]
+
+First stable release in the v1.0 series.
+
+Minimum PHP 8.1 is required.
+
+Changes since RC.2:
+
+### Added
+* feature: migrations up/down. Allows to downgrade/upgrade database to specified version (https://github.com/slawkens/myaac/commit/3f6ff3a3326b0475d28d11ffd7fff51f362d799f)
+* new hooks for news management (https://github.com/slawkens/myaac/commit/011a85d8ae34283ded6999882833f9d4797028ec, https://github.com/slawkens/myaac/commit/36bd3eb846e829b45313e10f7568dc4e95841143)
+* None Vocation to highscores (can be changed to RookStayer in Admin Panel) (https://github.com/slawkens/myaac/commit/a4a248099521bb5b8b2aa5bd592138debd2f19d5)
+* support for button_color (green, red, blue) (https://github.com/slawkens/myaac/commit/d8b6b749ee62e88b6af4a05d3d7557f90b94d94e)
+* add $whoopsHandler as variable, can be used by plugins (https://github.com/slawkens/myaac/commit/b0c8cf2ecda23045d725aaf43cfb3852ed766a4b)
+* PlayerModel->outfit_url attribute (https://github.com/slawkens/myaac/commit/3b5be1a8db5dceecaa388e2925a5536d13b38881)
+* support for selecting plugin themes in Admin menus.php (https://github.com/slawkens/myaac/commit/77a2c1cec343ffe4be5c2c2503ee81bc32a14ca1)
+
+### Changed
+* schema: Change character set to utf8mb4 (support for Emojis in Menus/Pages/News/Forum etc.) (https://github.com/slawkens/myaac/commit/27c44f1bdfb6234cf0c9d5b4b491123bb205b08f)
+* prefer get_browser_real_ip() over REMOTE_ADDR (https://github.com/slawkens/myaac/commit/941846605c00cee83168d2f916410b8ba8d4b7b9)
+* automatically set selected current one on highscores filters (https://github.com/slawkens/myaac/commit/e96227fbe41ae281783b2d49edb169a603601813)
+* rewrite towns loading code, removed OTBM loader (was too slow) (https://github.com/slawkens/myaac/commit/c980a0914632e7b27f718464f669a200707d217e)
+* allow OTS_Player to be passed as object to getPlayerLink (https://github.com/slawkens/myaac/commit/84d37c5a8f2c4535a41c8aa8264752969d3f3a3d)
+* do not clear menus by default on install (https://github.com/slawkens/myaac/commit/12d8faa3eda5e798f97b71e941c035187daad96e)
+* display warning in admin panel - plugins - if zip extension is not installed (https://github.com/slawkens/myaac/commit/e3ffe5d9e11d78ab064a370d8541bac351c9bcd9)
+* set default_socket_timeout for ipinfo.io checkup to 5 seconds (https://github.com/slawkens/myaac/commit/783d96fc6568a607d3198b832fed3a0dd06c4ebb)
+* refactor getTopPlayers function (support for balance) (https://github.com/slawkens/myaac/commit/c769962e39fe8dfb72ecd5be1864e145696be794)
+
+### Fixed
+* XSS in forum (https://github.com/slawkens/myaac/commit/c2b7286d20d4b579171540f7a774e8a0995d5e8f, https://github.com/slawkens/myaac/commit/8fb643596f9586005976e7bdb484a541a9d8715e)
+* price deducted when changing sex (https://github.com/slawkens/myaac/commit/16671ea40b72dcf74037c359ad572f9eb825edf9)
+* move_thread by unauthorized user (https://github.com/slawkens/myaac/commit/d6c40c836a53cb1710f911f77f45f28b54ea1b54, thanks @anyeor)
+* TFS 1.4.2 where conditions is NULL (https://github.com/slawkens/myaac/commit/b8396d4c8482e951da538b13f2296123732c4545)
+* do not show forum new thread show button if not logged in (https://github.com/slawkens/myaac/commit/507402171ba3b6e7ee184bd7fa73e0d55e0cad7a, @anyeor)
+* login if limiter is disabled (https://github.com/slawkens/myaac/commit/a0f1971583f0f790013e2145fb5ac573c59fbdef)
+* fixes to installMenus function (https://github.com/slawkens/myaac/commit/a2fadc5945fe0a5e39f740827f6ffbda1bb501e2)
+* many PHP exceptions in different places
+* fixes to tibiacom menus ActiveSubmenuItem
+
+### Removed
+* bugtracker SQL table code as the page has been removed/moved to plugins (https://github.com/slawkens/myaac/commit/5782772b901b05fb814bc718d062f6e2cd71df8c)
+
 ## [1.0-RC.2 - 25.10.2024]

 Still waiting for your reports about bugs found in this release. We are very close to stable release.
@@ -87,7 +154,6 @@ Minimum PHP version for this release is 8.1.
 * support for login and create account only by email (configurable)
  * with no need for account name
 * Google ReCAPTCHA v3 support (available as plugin)
-* automatically load towns names from .OTBM file
 * support for Account Number
  * suggest account number option
 * many new functions, hooks and configurables
@@ -116,4 +182,4 @@ Minimum PHP version for this release is 8.1.
 * change_password email to be more informal

 ### Fixed
-* hundrets of bug fixes, mostly patched from 0.8, so it makes no sense writing them again here
+* hundreds of bug fixes, mostly patched from 0.8, so it makes no sense writing them again here
--- a/admin/pages/menus.php
+++ b/admin/pages/menus.php
@@ -10,6 +10,7 @@

 use MyAAC\Cache\Cache;
 use MyAAC\Models\Menu;
+use MyAAC\Plugins;

 defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Menus';
@@ -21,6 +22,8 @@ if (!hasFlag(FLAG_CONTENT_MENUS) && !superAdmin()) {
 	return;
 }

+$pluginThemes = Plugins::getThemes();
+
 if (isset($_POST['template'])) {
 	$template = $_POST['template'];

@@ -64,9 +67,16 @@ if (isset($_POST['template'])) {
 		success('Saved at ' . date('H:i'));
 	}

-	$file = TEMPLATES . $template . '/config.php';
-	if (file_exists($file)) {
-		require_once $file;
+	$path = TEMPLATES . $template;
+
+	if (isset($pluginThemes[$template])) {
+		$path = BASE . $pluginThemes[$template];
+	}
+
+	$path .= '/config.php';
+
+	if (file_exists($path)) {
+		require_once $path;
 	} else {
 		echo 'Cannot find template config.php file.';
 		return;
@@ -169,8 +179,13 @@ if (isset($_POST['template'])) {
 } else {
 	$templates = Menu::select('template')->distinct()->get()->toArray();
 	foreach ($templates as $key => $value) {
-		$file = TEMPLATES . $value['template'] . '/config.php';
-		if (!file_exists($file)) {
+		$path = TEMPLATES . $value['template'];
+
+		if (isset($pluginThemes[$value['template']])) {
+			$path = BASE . $pluginThemes[$value['template']];
+		}
+
+		if (!file_exists($path . '/config.php')) {
 			unset($templates[$key]);
 		}
 	}
--- a/common.php
+++ b/common.php
@@ -26,8 +26,8 @@
 if (version_compare(phpversion(), '8.1', '<')) die('PHP version 8.1 or higher is required.');

 const MYAAC = true;
-const MYAAC_VERSION = '1.0-RC.2';
-const DATABASE_VERSION = 41;
+const MYAAC_VERSION = '1.1';
+const DATABASE_VERSION = 43;
 const TABLE_PREFIX = 'myaac_';
 define('START_TIME', microtime(true));
 define('MYAAC_OS', stripos(PHP_OS, 'WIN') === 0 ? 'WINDOWS' : (strtoupper(PHP_OS) === 'DARWIN' ? 'MAC' : 'LINUX'));
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
        "ext-dom": "*",
        "phpmailer/phpmailer": "^6.1",
        "composer/semver": "^3.2",
-        "twig/twig": "^2.0",
+        "twig/twig": "^3.11",
        "erusev/parsedown": "^1.7",
        "nikic/fast-route": "^1.3",
        "matomo/device-detector": "^6.0",
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "27c63d07ab6337cd8bb5b59f2b2e08d8",
+    "content-hash": "be4d1489a53a9cd8eec6bcaa7a096f30",
    "packages": [
        {
            "name": "brick/math",
@@ -885,16 +885,16 @@
        },
        {
            "name": "matomo/device-detector",
-            "version": "6.4.1",
+            "version": "6.4.2",
            "source": {
                "type": "git",
                "url": "https://github.com/matomo-org/device-detector.git",
-                "reference": "0d364e0dd6c177da3c24cd4049178026324fd7ac"
+                "reference": "806e52d214b05ddead1a1d4304c7592f61f95976"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/0d364e0dd6c177da3c24cd4049178026324fd7ac",
-                "reference": "0d364e0dd6c177da3c24cd4049178026324fd7ac",
+                "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/806e52d214b05ddead1a1d4304c7592f61f95976",
+                "reference": "806e52d214b05ddead1a1d4304c7592f61f95976",
                "shasum": ""
            },
            "require": {
@@ -950,20 +950,20 @@
                "source": "https://github.com/matomo-org/matomo",
                "wiki": "https://dev.matomo.org/"
            },
-            "time": "2024-09-24T13:50:04+00:00"
+            "time": "2024-12-16T16:38:01+00:00"
        },
        {
            "name": "maximebf/debugbar",
-            "version": "v1.23.3",
+            "version": "v1.23.5",
            "source": {
                "type": "git",
-                "url": "https://github.com/maximebf/php-debugbar.git",
-                "reference": "687400043d77943ef95e8417cb44e1673ee57844"
+                "url": "https://github.com/php-debugbar/php-debugbar.git",
+                "reference": "eeabd61a1f19ba5dcd5ac4585a477130ee03ce25"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/687400043d77943ef95e8417cb44e1673ee57844",
-                "reference": "687400043d77943ef95e8417cb44e1673ee57844",
+                "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/eeabd61a1f19ba5dcd5ac4585a477130ee03ce25",
+                "reference": "eeabd61a1f19ba5dcd5ac4585a477130ee03ce25",
                "shasum": ""
            },
            "require": {
@@ -1015,10 +1015,10 @@
                "debugbar"
            ],
            "support": {
-                "issues": "https://github.com/maximebf/php-debugbar/issues",
-                "source": "https://github.com/maximebf/php-debugbar/tree/v1.23.3"
+                "issues": "https://github.com/php-debugbar/php-debugbar/issues",
+                "source": "https://github.com/php-debugbar/php-debugbar/tree/v1.23.5"
            },
-            "time": "2024-10-29T12:24:25+00:00"
+            "time": "2024-12-15T19:20:42+00:00"
        },
        {
            "name": "mustangostang/spyc",
@@ -1076,16 +1076,16 @@
        },
        {
            "name": "nesbot/carbon",
-            "version": "2.72.5",
+            "version": "2.72.6",
            "source": {
                "type": "git",
-                "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "afd46589c216118ecd48ff2b95d77596af1e57ed"
+                "url": "https://github.com/CarbonPHP/carbon.git",
+                "reference": "1e9d50601e7035a4c61441a208cb5bed73e108c5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/afd46589c216118ecd48ff2b95d77596af1e57ed",
-                "reference": "afd46589c216118ecd48ff2b95d77596af1e57ed",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/1e9d50601e7035a4c61441a208cb5bed73e108c5",
+                "reference": "1e9d50601e7035a4c61441a208cb5bed73e108c5",
                "shasum": ""
            },
            "require": {
@@ -1105,7 +1105,7 @@
                "doctrine/orm": "^2.7 || ^3.0",
                "friendsofphp/php-cs-fixer": "^3.0",
                "kylekatarnls/multi-tester": "^2.0",
-                "ondrejmirtes/better-reflection": "*",
+                "ondrejmirtes/better-reflection": "<6",
                "phpmd/phpmd": "^2.9",
                "phpstan/extension-installer": "^1.0",
                "phpstan/phpstan": "^0.12.99 || ^1.7.14",
@@ -1118,10 +1118,6 @@
            ],
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev",
-                    "dev-2.x": "2.x-dev"
-                },
                "laravel": {
                    "providers": [
                        "Carbon\\Laravel\\ServiceProvider"
@@ -1131,6 +1127,10 @@
                    "includes": [
                        "extension.neon"
                    ]
+                },
+                "branch-alias": {
+                    "dev-2.x": "2.x-dev",
+                    "dev-master": "3.x-dev"
                }
            },
            "autoload": {
@@ -1179,7 +1179,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-06-03T19:18:41+00:00"
+            "time": "2024-12-27T09:28:11+00:00"
        },
        {
            "name": "nikic/fast-route",
@@ -1575,16 +1575,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v6.4.15",
+            "version": "v6.4.17",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd"
+                "reference": "799445db3f15768ecc382ac5699e6da0520a0a04"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/f1fc6f47283e27336e7cebb9e8946c8de7bff9bd",
-                "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd",
+                "url": "https://api.github.com/repos/symfony/console/zipball/799445db3f15768ecc382ac5699e6da0520a0a04",
+                "reference": "799445db3f15768ecc382ac5699e6da0520a0a04",
                "shasum": ""
            },
            "require": {
@@ -1649,7 +1649,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.15"
+                "source": "https://github.com/symfony/console/tree/v6.4.17"
            },
            "funding": [
                {
@@ -1665,7 +1665,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-11-06T14:19:14+00:00"
+            "time": "2024-12-07T12:07:30+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
@@ -1686,12 +1686,12 @@
            },
            "type": "library",
            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                "branch-alias": {
                    "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                }
            },
            "autoload": {
@@ -1760,8 +1760,8 @@
            "type": "library",
            "extra": {
                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                }
            },
            "autoload": {
@@ -1836,8 +1836,8 @@
            "type": "library",
            "extra": {
                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                }
            },
            "autoload": {
@@ -1914,8 +1914,8 @@
            "type": "library",
            "extra": {
                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                }
            },
            "autoload": {
@@ -1998,8 +1998,8 @@
            "type": "library",
            "extra": {
                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                }
            },
            "autoload": {
@@ -2052,71 +2052,6 @@
            ],
            "time": "2024-09-09T11:45:10+00:00"
        },
-        {
-            "name": "symfony/polyfill-php72",
-            "version": "v1.31.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce",
-                "reference": "fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2"
-            },
-            "type": "metapackage",
-            "extra": {
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.31.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-09-09T11:45:10+00:00"
-        },
        {
            "name": "symfony/polyfill-php80",
            "version": "v1.31.0",
@@ -2137,8 +2072,8 @@
            "type": "library",
            "extra": {
                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                }
            },
            "autoload": {
@@ -2197,6 +2132,82 @@
            ],
            "time": "2024-09-09T11:45:10+00:00"
        },
+        {
+            "name": "symfony/polyfill-php81",
+            "version": "v1.31.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php81.git",
+                "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
+                "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php81\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-09T11:45:10+00:00"
+        },
        {
            "name": "symfony/service-contracts",
            "version": "v3.5.1",
@@ -2221,12 +2232,12 @@
            },
            "type": "library",
            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                "branch-alias": {
                    "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                }
            },
            "autoload": {
@@ -2480,12 +2491,12 @@
            },
            "type": "library",
            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                "branch-alias": {
                    "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                }
            },
            "autoload": {
@@ -2626,38 +2637,38 @@
        },
        {
            "name": "twig/twig",
-            "version": "v2.16.1",
+            "version": "v3.18.0",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "19185947ec75d433a3ac650af32fc05649b95ee1"
+                "reference": "acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/19185947ec75d433a3ac650af32fc05649b95ee1",
-                "reference": "19185947ec75d433a3ac650af32fc05649b95ee1",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50",
+                "reference": "acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50",
                "shasum": ""
            },
            "require": {
-                "php": ">=7.1.3",
+                "php": ">=8.0.2",
+                "symfony/deprecation-contracts": "^2.5|^3",
                "symfony/polyfill-ctype": "^1.8",
                "symfony/polyfill-mbstring": "^1.3",
-                "symfony/polyfill-php72": "^1.8"
+                "symfony/polyfill-php81": "^1.29"
            },
            "require-dev": {
-                "psr/container": "^1.0",
-                "symfony/phpunit-bridge": "^5.4.9|^6.3"
+                "phpstan/phpstan": "^2.0",
+                "psr/container": "^1.0|^2.0",
+                "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0"
            },
            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.16-dev"
-                }
-            },
            "autoload": {
-                "psr-0": {
-                    "Twig_": "lib/"
-                },
+                "files": [
+                    "src/Resources/core.php",
+                    "src/Resources/debug.php",
+                    "src/Resources/escaper.php",
+                    "src/Resources/string_loader.php"
+                ],
                "psr-4": {
                    "Twig\\": "src/"
                }
@@ -2690,7 +2701,7 @@
            ],
            "support": {
                "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v2.16.1"
+                "source": "https://github.com/twigphp/Twig/tree/v3.18.0"
            },
            "funding": [
                {
@@ -2702,7 +2713,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-09-09T17:53:56+00:00"
+            "time": "2024-12-29T10:51:50+00:00"
        },
        {
            "name": "voku/portable-ascii",
@@ -2840,16 +2851,16 @@
    "packages-dev": [
        {
            "name": "phpstan/phpstan",
-            "version": "1.12.12",
+            "version": "1.12.15",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0"
+                "reference": "c91d4e8bc056f46cf653656e6f71004b254574d1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0",
-                "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c91d4e8bc056f46cf653656e6f71004b254574d1",
+                "reference": "c91d4e8bc056f46cf653656e6f71004b254574d1",
                "shasum": ""
            },
            "require": {
@@ -2894,12 +2905,12 @@
                    "type": "github"
                }
            ],
-            "time": "2024-11-28T22:13:23+00:00"
+            "time": "2025-01-05T16:40:22+00:00"
        }
    ],
    "aliases": [],
    "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
    "prefer-stable": false,
    "prefer-lowest": false,
    "platform": {
@@ -2910,6 +2921,6 @@
        "ext-xml": "*",
        "ext-dom": "*"
    },
-    "platform-dev": [],
+    "platform-dev": {},
    "plugin-api-version": "2.6.0"
 }
--- a/cypress/e2e/3-check-public-pages.cy.js
+++ b/cypress/e2e/3-check-public-pages.cy.js
@@ -116,9 +116,9 @@ describe('Check Public Pages', () => {
 	})

 	// library
-	it('Go to creatures page', () => {
+	it('Go to monsters page', () => {
 		cy.visit({
-			url: Cypress.env('URL') + '/creatures',
+			url: Cypress.env('URL') + '/monsters',
 			method: 'GET',
 		})
 	})
--- a/cypress/e2e/4-check-protected-pages.cy.js
+++ b/cypress/e2e/4-check-protected-pages.cy.js
@@ -4,7 +4,7 @@ const YOU_ARE_NOT_LOGGEDIN = 'You are not logged in.';
 describe('Check Protected Pages', () => {

 	// character actions
-	it('Go to accouht character creation page', () => {
+	it('Go to account character creation page', () => {
 		cy.visit({
 			url: Cypress.env('URL') + '/account/character/create',
 			method: 'GET',
@@ -12,7 +12,7 @@ describe('Check Protected Pages', () => {
 		cy.contains(REQUIRED_LOGIN_MESSAGE)
 	})

-	it('Go to accouht character deletion page', () => {
+	it('Go to account character deletion page', () => {
 		cy.visit({
 			url: Cypress.env('URL') + '/account/character/delete',
 			method: 'GET',
@@ -21,7 +21,7 @@ describe('Check Protected Pages', () => {
 	})

 	// account actions
-	it('Go to accouht email change page', () => {
+	it('Go to account email change page', () => {
 		cy.visit({
 			url: Cypress.env('URL') + '/account/email',
 			method: 'GET',
@@ -29,7 +29,7 @@ describe('Check Protected Pages', () => {
 		cy.contains(REQUIRED_LOGIN_MESSAGE)
 	})

-	it('Go to accouht password change page', () => {
+	it('Go to account password change page', () => {
 		cy.visit({
 			url: Cypress.env('URL') + '/account/password',
 			method: 'GET',
@@ -37,7 +37,7 @@ describe('Check Protected Pages', () => {
 		cy.contains(REQUIRED_LOGIN_MESSAGE)
 	})

-	it('Go to accouht info change page', () => {
+	it('Go to account info change page', () => {
 		cy.visit({
 			url: Cypress.env('URL') + '/account/info',
 			method: 'GET',
@@ -45,7 +45,7 @@ describe('Check Protected Pages', () => {
 		cy.contains(REQUIRED_LOGIN_MESSAGE)
 	})

-	it('Go to accouht logout change page', () => {
+	it('Go to account logout change page', () => {
 		cy.visit({
 			url: Cypress.env('URL') + '/account/logout',
 			method: 'GET',
--- a/index.php
+++ b/index.php
@@ -134,7 +134,7 @@ if(setting('core.anonymous_usage_statistics')) {
 		if(fetchDatabaseConfig('last_usage_report', $value)) {
 			$should_report = time() > (int)$value + $report_time;
 			if($cache->enabled()) {
-				$cache->set('last_usage_report', $value);
+				$cache->set('last_usage_report', $value, 60 * 60);
 			}
 		}
 		else {
@@ -148,7 +148,7 @@ if(setting('core.anonymous_usage_statistics')) {

 		updateDatabaseConfig('last_usage_report', time());
 		if($cache->enabled()) {
-			$cache->set('last_usage_report', time());
+			$cache->set('last_usage_report', time(), 60 * 60);
 		}
 	}
 }
--- a/install/includes/schema.sql
+++ b/install/includes/schema.sql
@@ -1,4 +1,4 @@
-SET @myaac_database_version = 41;
+SET @myaac_database_version = 43;

 CREATE TABLE `myaac_account_actions`
 (
@@ -91,7 +91,7 @@ CREATE TABLE `myaac_forum`
 	`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(32) NOT NULL default '0.0.0.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',
 	PRIMARY KEY (`id`),
--- a/install/template/template.php
+++ b/install/template/template.php
@@ -1,3 +1,4 @@
+<?php defined('MYAAC') or die('Direct access not allowed!'); ?>
 <!DOCTYPE html>
 <html dir="<?php echo $locale['direction']; ?>" lang="<?php echo $locale['lang']; ?>" xml:lang="<?php echo $locale['lang']; ?>">
 <head>
--- a/install/tools/5-database.php
+++ b/install/tools/5-database.php
@@ -156,9 +156,14 @@ if ($db->hasTable('guilds')) {
 	}

 	if (!$db->hasColumn('guilds', 'description')) {
-		if (query("ALTER TABLE `guilds` ADD `description` TEXT NOT NULL;"))
+		if (query("ALTER TABLE `guilds` ADD `description` VARCHAR(5000) NOT NULL DEFAULT '';"))
 			success($locale['step_database_adding_field'] . ' guilds.description...');
 	}
+	else {
+		if (query("ALTER TABLE `guilds` MODIFY `description` VARCHAR(5000) NOT NULL DEFAULT '';")) {
+			success($locale['step_database_modifying_field'] . ' guilds.description...');
+		}
+	}

 	if ($db->hasColumn('guilds', 'logo_gfx_name')) {
 		if (query("ALTER TABLE `guilds` CHANGE `logo_gfx_name` `logo_name` VARCHAR( 255 ) NOT NULL DEFAULT 'default.gif';")) {
@@ -197,9 +202,14 @@ if ($db->hasTable('players')) {
 	}

 	if (!$db->hasColumn('players', 'comment')) {
-		if (query("ALTER TABLE `players` ADD `comment` TEXT NOT NULL;"))
+		if (query("ALTER TABLE `players` ADD `comment` VARCHAR(5000) NOT NULL DEFAULT '';"))
 			success($locale['step_database_adding_field'] . ' players.comment...');
 	}
+	else {
+		if (query("ALTER TABLE `players` MODIFY `comment` VARCHAR(5000) NOT NULL DEFAULT '';")) {
+			success($locale['step_database_modifying_field'] . ' players.comment...');
+		}
+	}

 	if ($db->hasColumn('players', 'rank_id')) {
 		if (query("ALTER TABLE players MODIFY `rank_id` INT(11) NOT NULL DEFAULT 0;"))
--- a/nginx-sample.conf
+++ b/nginx-sample.conf
@@ -12,10 +12,6 @@ server {
 		deny all;
 	}

-	location /vendor {
-		deny all;
-	}
-
 	# block .htaccess, CHANGELOG.md, composer.json etc.
 	# this is to prevent finding software versions
 	location ~\.(ht|md|json|dist)$ {
@@ -28,7 +24,7 @@ server {
 	}

 	location / {
-		try_files $uri $uri/ /index.php?$query_string;;
+		try_files $uri $uri/ /index.php?$query_string;
 	}

 	location ~ \.php$ {
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
    "postinstall": "node ./npm-post-install.js"
  },
  "devDependencies": {
-    "cypress": "^12.12.0"
+    "cypress": "^13.17.0"
  },
  "dependencies": {
    "@tinymce/tinymce-jquery": "^2.1.0",
@@ -12,6 +12,6 @@
    "fs-extra": "^11.2.0",
    "jquery": "^3.7.1",
    "jquery-ui": "^1.13.2",
-    "tinymce": "^6.8.3"
+    "tinymce": "^7.2.0"
  }
 }
--- a/plugins/account-create-hint.json
+++ b/plugins/account-create-hint.json
@@ -1,6 +1,6 @@
 {
 	"name": "create-account-hint",
-	"description": "This plugin display text 'To play on Forgotten you need an account.  All you have to do to create your new account is to enter an account name, password, country and your email address. Also you have to agree to the terms presented below. If you have done so, your account name will be shown on the following page and your account password will be sent to your email address along with further instructions. If you do not receive the email with your password, please check your spam filter.' on the create account page. <strong>Be careful when uninstalling this!</strong>",
+	"description": "This plugin display text 'To play on Forgotten you need an account.  All you have to do to create your new account is to enter an account name, password, country and your email address. Also you have to agree to the terms presented below. If you have done so, your account name will be shown on the following page and your account password will be sent to your email address along with further instructions. If you do not receive the email with your password, please check your spam filter.' on the create account page.",
 	"version": "1.0",
 	"author": "slawkens",
 	"contact": "slawkens@gmail.com",
--- a/plugins/account-create-hint/hint.php
+++ b/plugins/account-create-hint/hint.php
@@ -9,7 +9,4 @@
 */
 defined('MYAAC') or die('Direct access not allowed!');

-global $twig_loader;
-$twig_loader->prependPath(BASE . 'plugins/account-create-hint');
-
-$twig->display('hint.html.twig');
+$twig->display('account-create-hint/hint.html.twig');
--- a/release.sh
+++ b/release.sh
@@ -22,7 +22,7 @@ if [ $1 = "prepare" ]; then
 	mkdir -p tmp

 	# get myaac from git archive
-	git archive --format zip --output tmp/myaac.zip develop
+	git archive --format zip --output tmp/myaac.zip master

 	cd tmp/ || exit

--- a/system/exception.php
+++ b/system/exception.php
@@ -9,16 +9,16 @@
 */

 use MyAAC\Exceptions\SensitiveException;
+use Whoops\Handler\PlainTextHandler;
+use Whoops\Handler\PrettyPageHandler;
+use Whoops\Run;

-if (class_exists(\Whoops\Run::class)) {
-	$whoops = new \Whoops\Run;
-	if(IS_CLI) {
-		$whoops->pushHandler(new \Whoops\Handler\PlainTextHandler);
-	}
-	else {
-		$whoops->pushHandler(new \Whoops\Handler\PrettyPageHandler);
-	}
+if (class_exists(Run::class)) {
+	$whoops = new Run;

+	$whoopsHandler = IS_CLI ? (new PlainTextHandler()) : (new PrettyPageHandler());
+
+	$whoops->pushHandler($whoopsHandler);
 	$whoops->register();
 	return;
 }
--- a/system/functions.php
+++ b/system/functions.php
@@ -49,7 +49,7 @@ function warning($message, $return = false) {
 	return message($message, 'warning', $return);
 }
 function note($message, $return = false) {
-	return info($message, $return);
+	return message($message, 'note', $return);
 }
 function info($message, $return = false) {
 	return message($message, 'info', $return);
@@ -589,24 +589,12 @@ function template_form()
 {
 	global $template_name;

-	$cache = Cache::getInstance();
-	if($cache->enabled())
-	{
-		$tmp = '';
-		if($cache->fetch('templates', $tmp)) {
-			$templates = unserialize($tmp);
-		}
-		else
-		{
-			$templates = get_templates();
-			$cache->set('templates', serialize($templates), 30);
-		}
-	}
-	else
-		$templates = get_templates();
+	$templates = Cache::remember('templates', 5 * 60, function() {
+		return get_templates();
+	});

 	$options = '';
-	foreach($templates as $key => $value)
+	foreach($templates as $value)
 		$options .= '<option ' . ($template_name == $value ? 'SELECTED' : '') . '>' . $value . '</option>';

 	global $twig;
@@ -1069,14 +1057,14 @@ function get_browser_real_ip() {

 	return '0';
 }
-function setSession($key, $data) {
+function setSession($key, $data): void {
 	$_SESSION[setting('core.session_prefix') . $key] = $data;
 }
 function getSession($key) {
 	$key = setting('core.session_prefix') . $key;
-	return isset($_SESSION[$key]) ? $_SESSION[$key] : false;
+	return $_SESSION[$key] ?? false;
 }
-function unsetSession($key) {
+function unsetSession($key): void {
 	unset($_SESSION[setting('core.session_prefix') . $key]);
 }

@@ -1102,20 +1090,16 @@ function csrfProtect(): void
 	}
 }

-function getTopPlayers($limit = 5) {
+function getTopPlayers($limit = 5, $skill = 'level') {
 	global $db;

-	$cache = Cache::getInstance();
-	if($cache->enabled()) {
-		$tmp = '';
-		if($cache->fetch('top_' . $limit . '_level', $tmp)) {
-			$players = unserialize($tmp);
-		}
+	if ($skill === 'level') {
+		$skill = 'experience';
 	}

-	if (!isset($players)) {
+	return Cache::remember("top_{$limit}_{$skill}", 2 * 60, function () use ($db, $limit, $skill) {
 		$columns = [
-			'id', 'name', 'level', 'vocation', 'experience',
+			'id', 'name', 'level', 'vocation', 'experience', 'balance',
 			'looktype', 'lookhead', 'lookbody', 'looklegs', 'lookfeet'
 		];

@@ -1127,32 +1111,27 @@ function getTopPlayers($limit = 5) {
 			$columns[] = 'online';
 		}

-		$players = Player::query()
+		return Player::query()
 			->select($columns)
 			->withOnlineStatus()
 			->notDeleted()
 			->where('group_id', '<', setting('core.highscores_groups_hidden'))
 			->whereNotIn('id', setting('core.highscores_ids_hidden'))
 			->where('account_id', '!=', 1)
-			->orderByDesc('experience')
+			->orderByDesc($skill)
 			->limit($limit)
 			->get()
 			->map(function ($e, $i) {
 				$row = $e->toArray();
 				$row['online'] = $e->online_status;
 				$row['rank'] = $i + 1;
+				$row['outfit_url'] = $e->outfit_url;

 				unset($row['online_table']);

 				return $row;
 			})->toArray();
-
-		if($cache->enabled()) {
-			$cache->set('top_' . $limit . '_level', serialize($players), 120);
-		}
-	}
-
-	return $players;
+	});
 }

 function deleteDirectory($dir, $ignore = array(), $contentOnly = false) {
@@ -1700,4 +1679,7 @@ function getAccountIdentityColumn(): string
 require_once SYSTEM . 'compat/base.php';

 // custom functions
-require SYSTEM . 'functions_custom.php';
+$customFunctions = SYSTEM . 'functions_custom.php';
+if (is_file($customFunctions)) {
+	require $customFunctions;
+}
--- a/system/init.php
+++ b/system/init.php
@@ -96,8 +96,8 @@ if($config_lua_reload) {

 	// cache config
 	if($cache->enabled()) {
-		$cache->set('config_lua', serialize($config['lua']), 120);
-		$cache->set('server_path', $config['server_path']);
+		$cache->set('config_lua', serialize($config['lua']), 2 * 60);
+		$cache->set('server_path', $config['server_path'], 10 * 60);
 	}
 }
 unset($tmp);
@@ -139,7 +139,7 @@ require_once SYSTEM . 'database.php';

 // verify myaac tables exists in database
 if(!defined('MYAAC_INSTALL') && !$db->hasTable('myaac_account_actions')) {
-	throw new RuntimeException('Seems that the table myaac_account_actions of MyAAC doesn\'t exist in the database. This is a fatal error. You can try to reinstall MyAAC by visiting ' . BASE_URL . 'install');
+	throw new RuntimeException('Seems that the table myaac_account_actions of MyAAC doesn\'t exist in the database. This is a fatal error. You can try to reinstall MyAAC by visiting ' . (IS_CLI ? 'http://your-ip.com/' : BASE_URL) . 'install');
 }

 // execute migrations
--- a/system/libs/pot/OTS_Player.php
+++ b/system/libs/pot/OTS_Player.php
@@ -108,6 +108,8 @@ class OTS_Player extends OTS_Row_DAO
 		POT::SKILL_SHIELD => array('value' => 0, 'tries' => 0),
 		POT::SKILL_FISH => array('value' => 0, 'tries' => 0)
 	);
+
+	private static array $playersOnline;
 /**
 * Magic PHP5 method.
 *
@@ -765,10 +767,18 @@ class OTS_Player extends OTS_Row_DAO

 	public function isOnline()
 	{
-		if($this->db->hasTable('players_online')) // tfs 1.0
-		{
-			$query = $this->db->query('SELECT `player_id` FROM `players_online` WHERE `player_id` = ' . $this->data['id']);
-			return $query->rowCount() > 0;
+		if($this->db->hasTable('players_online')) {// tfs 1.0
+			if (!isset(self::$playersOnline)) {
+				self::$playersOnline = [];
+
+				$query = $this->db->query('SELECT `player_id` FROM `players_online`');
+
+				foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $item) {
+					self::$playersOnline[$item['player_id']] = true;
+				}
+			}
+
+			return isset(self::$playersOnline[$this->data['id']]);
 		}

 		if( !isset($this->data['online']) )
@@ -1752,11 +1762,6 @@ class OTS_Player extends OTS_Row_DAO
 */
 	public function getConditions()
 	{
-        if( !isset($this->data['conditions']) )
-        {
-            throw new E_OTS_NotLoaded();
-        }
-
 		return $this->data['conditions'];
 	}

--- a/system/migrations/33.php
+++ b/system/migrations/33.php
@@ -8,7 +8,7 @@
 // the size of ipv6 can be maximal 45 chars

 $up = function () use ($db) {
-	$db->modifyColumn(TABLE_PREFIX . 'visitors', 'ip', 'VARCHAR(15) NOT NULL');
+	$db->modifyColumn(TABLE_PREFIX . 'visitors', 'ip', 'VARCHAR(45) NOT NULL');
 };

 $down = function () {
--- a/system/migrations/42.php
+++ b/system/migrations/42.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @var OTS_DB_MySQL $db
+ */
+
+// 2025-09-01
+// resize forum.post_ip to support ipv6
+$up = function () use ($db) {
+	$db->modifyColumn(TABLE_PREFIX . 'forum', 'post_ip', "varchar(45) NOT NULL default '0.0.0.0'");
+};
+
+$down = function () {
+	// there is no downgrade for this
+};
+
--- a/system/migrations/43.php
+++ b/system/migrations/43.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @var OTS_DB_MySQL $db
+ */
+
+// 2025-01-22
+// change columns to VARCHAR
+$up = function () use ($db) {
+	$db->query("UPDATE guilds set description = '' WHERE description is NULL;"); // prevent truncate error when column is NULL
+	$db->modifyColumn('guilds', 'description', "VARCHAR(5000) NOT NULL DEFAULT ''");
+
+	$db->query("UPDATE players set comment = '' WHERE comment is NULL;");
+	$db->modifyColumn('players', 'comment', "VARCHAR(5000) NOT NULL DEFAULT ''");
+};
+
+$down = function () use ($db) {
+	$db->modifyColumn('guilds', 'description', "TEXT NOT NULL");
+	$db->modifyColumn('players', 'comment', "TEXT NOT NULL");
+};
+
--- a/system/pages/account/characters/change-sex.php
+++ b/system/pages/account/characters/change-sex.php
@@ -66,7 +66,7 @@ else
 							$new_sex_str = $config['genders'][$new_sex];

 						$player->save();
-						$account_logged->setCustomField(setting('core.donate_column'), $points - setting('core.account_change_character_name_price'));
+						$account_logged->setCustomField(setting('core.donate_column'), $points - setting('core.account_change_character_sex_price'));
 						$account_logged->logAction('Changed sex on character <b>' . $player->getName() . '</b> from <b>' . $old_sex_str . '</b> to <b>' . $new_sex_str . '</b>.');
 						$twig->display('success.html.twig', array(
 							'title' => 'Character Sex Changed',
--- a/system/pages/forum/edit_post.php
+++ b/system/pages/forum/edit_post.php
@@ -35,7 +35,7 @@ if(Forum::canPost($account_logged))
 	$thread = $db->query("SELECT `author_guid`, `author_aid`, `first_post`, `post_topic`, `post_date`, `post_text`, `post_smile`, `post_html`, `id`, `section` FROM `" . FORUM_TABLE_PREFIX . "forum` WHERE `id` = ".$post_id." LIMIT 1")->fetch();
 	if(isset($thread['id'])) {
 		$first_post = $db->query("SELECT `" . FORUM_TABLE_PREFIX . "forum`.`author_guid`, `" . FORUM_TABLE_PREFIX . "forum`.`author_aid`, `" . FORUM_TABLE_PREFIX . "forum`.`first_post`, `" . FORUM_TABLE_PREFIX . "forum`.`post_topic`, `" . FORUM_TABLE_PREFIX . "forum`.`post_text`, `" . FORUM_TABLE_PREFIX . "forum`.`post_smile`, `" . FORUM_TABLE_PREFIX . "forum`.`id`, `" . FORUM_TABLE_PREFIX . "forum`.`section` FROM `" . FORUM_TABLE_PREFIX . "forum` WHERE `" . FORUM_TABLE_PREFIX . "forum`.`id` = ".(int) $thread['first_post']." LIMIT 1")->fetch();
-		echo '<a href="' . getLink('forum') . '">Boards</a> >> <a href="' . getForumBoardLink($thread['section']) . '">'.$sections[$thread['section']]['name'].'</a> >> <a href="' . getForumThreadLink($thread['first_post']) . '">'.$first_post['post_topic'].'</a> >> <b>Edit post</b>';
+		echo '<a href="' . getLink('forum') . '">Boards</a> >> <a href="' . getForumBoardLink($thread['section']) . '">'.$sections[$thread['section']]['name'].'</a> >> <a href="' . getForumThreadLink($thread['first_post']) . '">'.htmlspecialchars($first_post['post_topic']).'</a> >> <b>Edit post</b>';

 		if(Forum::hasAccess($thread['section'] && ($account_logged->getId() == $thread['author_aid'] || Forum::isModerator()))) {
 			$char_id = $post_topic = $text = $smile = $html = null;
--- a/system/pages/forum/move_thread.php
+++ b/system/pages/forum/move_thread.php
@@ -25,6 +25,7 @@ if(!$logged) {

 if(!Forum::isModerator()) {
 	echo 'You are not logged in or you are not moderator.';
+	return;
 }

 $save = isset($_REQUEST['save']) && (int)$_REQUEST['save'] == 1;
--- a/system/pages/forum/new_post.php
+++ b/system/pages/forum/new_post.php
@@ -40,7 +40,7 @@ if(Forum::canPost($account_logged)) {
 	$thread = $db->query("SELECT `" . FORUM_TABLE_PREFIX . "forum`.`post_topic`, `" . FORUM_TABLE_PREFIX . "forum`.`id`, `" . FORUM_TABLE_PREFIX . "forum`.`section` FROM `" . FORUM_TABLE_PREFIX . "forum` WHERE `" . FORUM_TABLE_PREFIX . "forum`.`id` = ".(int) $thread_id." AND `" . FORUM_TABLE_PREFIX . "forum`.`first_post` = ".$thread_id." LIMIT 1")->fetch();

 	if(isset($thread['id']) && Forum::hasAccess($thread['section'])) {
-		echo '<a href="' . getLink('forum') . '">Boards</a> >> <a href="' . getForumBoardLink($thread['section']) . '">'.$sections[$thread['section']]['name'].'</a> >> <a href="' . getForumThreadLink($thread_id) . '">'.$thread['post_topic'].'</a> >> <b>Post new reply</b><br /><h3>'.$thread['post_topic'].'</h3>';
+		echo '<a href="' . getLink('forum') . '">Boards</a> >> <a href="' . getForumBoardLink($thread['section']) . '">'.$sections[$thread['section']]['name'].'</a> >> <a href="' . getForumThreadLink($thread_id) . '">'.htmlspecialchars($thread['post_topic']).'</a> >> <b>Post new reply</b><br /><h3>'.htmlspecialchars($thread['post_topic']).'</h3>';

 		$quote = isset($_REQUEST['quote']) ? (int) $_REQUEST['quote'] : NULL;
 		$text = isset($_REQUEST['text']) ? stripslashes(trim($_REQUEST['text'])) : NULL;
--- a/system/pages/forum/new_thread.php
+++ b/system/pages/forum/new_thread.php
@@ -95,7 +95,23 @@ if(Forum::canPost($account_logged)) {
 				if (count($errors) == 0) {
 					$saved = true;

-					$db->query("INSERT INTO `" . FORUM_TABLE_PREFIX . "forum` (`first_post` ,`last_post` ,`section` ,`replies` ,`views` ,`author_aid` ,`author_guid` ,`post_text` ,`post_topic` ,`post_smile`, `post_html` ,`post_date` ,`last_edit_aid` ,`edit_date`, `post_ip`) VALUES ('0', '" . time() . "', '" . (int)$section_id . "', '0', '0', '" . $account_logged->getId() . "', '" . $char_id . "', " . $db->quote($text) . ", " . $db->quote($post_topic) . ", '" . $smile . "', '" . $html . "', '" . time() . "', '0', '0', '" . get_browser_real_ip() . "')");
+					$db->insert(FORUM_TABLE_PREFIX . 'forum', [
+						'first_post' => 0,
+						'last_post' => time(),
+						'section' => $section_id,
+						'replies' => 0,
+						'views' => 0,
+						'author_aid' => $account_logged->getId(),
+						'author_guid' => $char_id,
+						'post_text' => $text,
+						'post_topic' => $post_topic,
+						'post_smile' => $smile,
+						'post_html' => $html,
+						'post_date' => time(),
+						'last_edit_aid' => 0,
+						'edit_date' => 0,
+						'post_ip' => get_browser_real_ip(),
+					]);

 					$thread_id = $db->lastInsertId();

--- a/system/pages/forum/show_board.php
+++ b/system/pages/forum/show_board.php
@@ -68,7 +68,7 @@ if(isset($last_threads[0])) {
 		echo '<tr bgcolor="' . getStyle($number_of_rows++) . '"><td>';
 		if(Forum::isModerator()) {
 			echo '<a href="' . getLink('forum') . '?action=move_thread&id='.$thread['id'].'"\')"><span style="color:darkgreen">[MOVE]</span></a>';
-			echo '<a href="' . getLink('forum') . '?action=remove_post&id='.$thread['id'].'" onclick="return confirm(\'Are you sure you want remove thread > '.$thread['post_topic'].' <?\')"><span style="color: red">[REMOVE]</span></a>  ';
+			echo '<a href="' . getLink('forum') . '?action=remove_post&id='.$thread['id'].'" onclick="return confirm(\'Are you sure you want remove thread > '.htmlspecialchars($thread['post_topic']).' <?\')"><span style="color: red">[REMOVE]</span></a>  ';
 		}

 		$player->load($thread['player_id']);
@@ -79,7 +79,7 @@ if(isset($last_threads[0])) {
 		$player_account = $player->getAccount();
 		$canEditForum = $player_account->hasFlag(FLAG_CONTENT_FORUM) || $player_account->isAdmin();

-		echo '<a href="' . getForumThreadLink($thread['id']) . '">'.($canEditForum ? $thread['post_topic'] : htmlspecialchars($thread['post_topic'])) . '</a><br /><small>'.($canEditForum ? substr(strip_tags($thread['post_text']), 0, 50) : htmlspecialchars(substr($thread['post_text'], 0, 50))).'...</small></td><td>' . getPlayerLink($thread['name']) . '</td><td>'.(int) $thread['replies'].'</td><td>'.(int) $thread['views'].'</td><td>';
+		echo '<a href="' . getForumThreadLink($thread['id']) . '">'.htmlspecialchars($thread['post_topic']). '</a><br /><small>'.($canEditForum ? substr(strip_tags($thread['post_text']), 0, 50) : htmlspecialchars(substr($thread['post_text'], 0, 50))).'...</small></td><td>' . getPlayerLink($thread['name']) . '</td><td>'.(int) $thread['replies'].'</td><td>'.(int) $thread['views'].'</td><td>';
 		if($thread['last_post'] > 0) {
 			$last_post = $db->query("SELECT `players`.`name`, `" . FORUM_TABLE_PREFIX . "forum`.`post_date` FROM `players`, `" . FORUM_TABLE_PREFIX . "forum` WHERE `" . FORUM_TABLE_PREFIX . "forum`.`first_post` = ".(int) $thread['id']." AND `players`.`id` = `" . FORUM_TABLE_PREFIX . "forum`.`author_guid` ORDER BY `post_date` DESC LIMIT 1")->fetch();
 			if(isset($last_post['name']))
--- a/system/pages/highscores.php
+++ b/system/pages/highscores.php
@@ -207,6 +207,7 @@ if (empty($highscores)) {
 		$tmp = $row->toArray();
 		$tmp['online'] = $row->online_status;
 		$tmp['vocation'] = $row->vocation_name;
+		$tmp['outfit_url'] = $row->outfit_url; // @phpstan-ignore-line
 		unset($tmp['online_table']);

 		return $tmp;
@@ -240,7 +241,7 @@ foreach($highscores as $id => &$player)
 		$player['link'] = getPlayerLink($player['name'], false);
 		$player['flag'] = getFlagImage($player['country']);
 		if($settingHighscoresOutfit) {
-			$player['outfit'] = '<img style="position:absolute;margin-top:' . (in_array($player['looktype'], setting('core.outfit_images_wrong_looktypes')) ? '-15px;margin-left:5px' : '-45px;margin-left:-25px') . ';" src="' . setting('core.outfit_images_url') . '?id=' . $player['looktype'] . ($outfit_addons ? '&addons=' . $player['lookaddons'] : '') . '&head=' . $player['lookhead'] . '&body=' . $player['lookbody'] . '&legs=' . $player['looklegs'] . '&feet=' . $player['lookfeet'] . '" alt="" />';
+			$player['outfit'] = '<img style="position:absolute;margin-top:' . (in_array($player['looktype'], setting('core.outfit_images_wrong_looktypes')) ? '-15px;margin-left:5px' : '-45px;margin-left:-25px') . ';" src="' . $player['outfit_url'] . '" alt="" />';
 		}
 		$player['rank'] = $offset + $i;
 	}
--- a/system/pages/news.php
+++ b/system/pages/news.php
@@ -88,7 +88,7 @@ if(isset($_GET['archive']))
 	foreach($news_DB as $news)
 	{
 		$newses[] = array(
-			'link' => getLink('news') . '/' . $news['id'],
+			'link' => getLink('news/archive') . '/' . $news['id'],
 			'icon_id' => $categories[$news['category']]['icon_id'],
 			'title' => stripslashes($news['title']),
 			'date' => $news['date']
--- a/system/settings.php
+++ b/system/settings.php
@@ -11,8 +11,14 @@
 *  - for number: min, max, step
 */

+use MyAAC\Cache;
 use MyAAC\Settings;

+$templates = Cache::remember('templates', 5 * 60, function () {
+	return get_templates();
+});
+$defaultTemplate = in_array('kathrine', $templates) ? 'kathrine' : $templates[0];
+
 return [
 	'name' => 'MyAAC',
 	'settings' => [
@@ -88,7 +94,7 @@ return [
 			'type' => 'options',
 			'options' => '$templates',
 			'desc' => 'Name of the template used by website',
-			'default' => 'kathrine',
+			'default' => $defaultTemplate,
 		],
 		'template_allow_change' => [
 			'name' => 'Template Allow Change',
@@ -503,7 +509,7 @@ Sent by MyAAC,<br/>
 		'smtp_port' => [
 			'name' => 'SMTP Host',
 			'type' => 'number',
-			'desc' => '25 (default) / 465 (ssl, GMail) / 587 (tls, Microsoft Outlook)',
+			'desc' => '25 (default) / 587 (tls - GMail, Microsoft Outlook)',
 			'default' => 25,
 			'show_if' => [
 				'mail_enabled', '=', 'true'
@@ -530,7 +536,8 @@ Sent by MyAAC,<br/>
 		'smtp_pass' => [
 			'name' => 'SMTP Password',
 			'type' => 'password',
-			'desc' => 'Here your email password to authenticate with SMTP',
+			'desc' => 'Here your email password to authenticate with SMTP.' . PHP_EOL
+				. 'For GMail use generated App password - https://myaccount.google.com/apppasswords.',
 			'default' => '',
 			'show_if' => [
 				'mail_enabled', '=', 'true'
@@ -540,7 +547,8 @@ Sent by MyAAC,<br/>
 			'name' => 'SMTP Security',
 			'type' => 'options',
 			'options' => ['None', 'SSL', 'TLS'],
-			'desc' => 'What kind of encryption to use on the SMTP connection',
+			'desc' => 'What kind of encryption to use on the SMTP connection.' . PHP_EOL
+				. '(Gmail, Outlook - tls).',
 			'default' => 0,
 			'show_if' => [
 				'mail_enabled', '=', 'true'
--- a/system/src/CreateCharacter.php
+++ b/system/src/CreateCharacter.php
@@ -105,9 +105,6 @@ class CreateCharacter
 	 * @param array $errors
 	 * @return bool
 	 * @throws \E_OTS_NotLoaded
-	 * @throws \Twig_Error_Loader
-	 * @throws \Twig_Error_Runtime
-	 * @throws \Twig_Error_Syntax
 	 */
 	public function doCreate($name, $sex, $vocation, $town, $account, &$errors)
 	{
--- a/system/src/DataLoader.php
+++ b/system/src/DataLoader.php
@@ -82,7 +82,9 @@ class DataLoader
 		self::$startTime = microtime(true);

 		$cache = Cache::getInstance();
+		if ($cache->enabled()) {
 			$cache->delete('towns'); // will be reloaded after next page load
+		}

 		global $db;
 		if ($db->hasTable('towns') && Town::count() > 0) {
--- a/system/src/Models/Player.php
+++ b/system/src/Models/Player.php
@@ -8,6 +8,13 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
 * @property int $level
 * @property int $vocation
 * @property int $online
+ * @property int $looktype
+ * @property int $lookhead
+ * @property int $lookbody
+ * @property int $looklegs
+ * @property int $lookfeet
+ * @property int $lookaddons
+ * @property string $outfit_url
 * @property hasOne $onlineTable
 */
 class Player extends Model {
@@ -80,6 +87,10 @@ class Player extends Model {
 		});
 	}

+	public function getOutfitUrlAttribute() {
+		return setting('core.outfit_images_url') . '?id=' . $this->looktype . (!empty($this->lookaddons) ? '&addons=' . $this->lookaddons : '') . '&head=' . $this->lookhead . '&body=' . $this->lookbody . '&legs=' . $this->looklegs . '&feet=' . $this->lookfeet;
+	}
+
 	public function getOnlineStatusAttribute()
 	{
 		global $db;
--- a/system/template.php
+++ b/system/template.php
@@ -95,7 +95,7 @@ else {
 		unset($file);

 		if ($cache->enabled()) {
-			$cache->set('template_ini_' . $template_name, serialize($template_ini));
+			$cache->set('template_ini_' . $template_name, serialize($template_ini), 10 * 60);
 		}
 	}
 }
@@ -138,29 +138,19 @@ if($twig_loader) {
 	$twig_loader->prependPath(BASE . $template_path);
 }

-function get_template_menus() {
+function get_template_menus(): array
+{
 	global $template_name;

-	$cache = Cache::getInstance();
-	if ($cache->enabled()) {
-		$tmp = '';
-		if ($cache->fetch('template_menus', $tmp)) {
-			$result = unserialize($tmp);
-		}
-	}
-
-	if (!isset($result)) {
-
+	$result = Cache::remember('template_menus', 10 * 60, function () use ($template_name) {
 		$result = Menu::select(['name', 'link', 'blank', 'color', 'category'])
 			->where('template', $template_name)
 			->orderBy('category')
 			->orderBy('ordering')
 			->get();

-		if ($cache->enabled()) {
-			$cache->set('template_menus', serialize($result->toArray()), 600);
-		}
-	}
+		return $result->toArray();
+	});

 	$menus = array();
 	foreach($result as $menu) {
--- a/system/templates/account.login.html.twig
+++ b/system/templates/account.login.html.twig
@@ -24,21 +24,28 @@ Please enter your account {{ account|lower }} and your password.<br/><a href="{{
 				<td>
 					<div class="InnerTableContainer">
 						<table style="width:100%;" >
-							{{ hook('HOOK_ACCOUNT_LOGIN_BEFORE_PASSWORD') }}
+
+							{{ 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 style="width:100%;" ><input type="text" name="account_login" size="30" maxlength="{{ setting('core.account_login_by_email') ? '255' : '30' }}" autofocus/></td>
 							</tr>
+
 							{{ hook('HOOK_ACCOUNT_LOGIN_AFTER_ACCOUNT') }}
+							{{ hook('HOOK_ACCOUNT_LOGIN_BEFORE_PASSWORD') }}
+
 							<tr>
 								<td class="LabelV" >
 									<span{% if error is not null %} class="red"{% endif %}>Password:</span>
 								</td>
 								<td><input type="password" name="password_login" size="30" maxlength="29" ></td>
 							</tr>
+
 							{{ hook('HOOK_ACCOUNT_LOGIN_AFTER_PASSWORD') }}
+
 							<tr>
 								<td class="LabelV" ></td>
 								<td><input type="checkbox" id="remember_me" name="remember_me" value="true" />
--- a/system/templates/forum.new_post.html.twig
+++ b/system/templates/forum.new_post.html.twig
@@ -50,7 +50,7 @@
 <table width="100%">
 	<tr bgcolor="{{ config.vdarkborder }}">
 		<td colspan="2">
-			<span style="color: white"><b>Last 5 posts from thread: {{ topic|raw }}</b></span>
+			<span style="color: white"><b>Last 5 posts from thread: {{ topic }}</b></span>
 		</td>
 	</tr>
 	{% set i = 0 %}
--- a/system/templates/guilds.view.html.twig
+++ b/system/templates/guilds.view.html.twig
@@ -79,7 +79,8 @@
 									</tr>

 									{% set showedRank, i = false, 0 %}
-									{% for rank in guild_members if rank.members|length > 0 %}
+									{% for rank in guild_members %}
+										{% if rank.members|length > 0 %}
 											{% set rankStyle, i = getStyle(i), i + 1  %}

 											{% for player in rank.members %}
@@ -130,6 +131,7 @@
 											{% endfor %}

 											{% set showedRank = false %}
+										{% endif %}
 									{% else %}
 										<tr bgcolor="{{ getStyle(i) }}">
 											<td colspan="5">No guild members found.</td>
@@ -162,7 +164,7 @@
 								</tr>

 								{% set i = 0 %}
-								{% for invited_player in invited_list if invited_list|length > 0 %}
+								{% for invited_player in invited_list %}
 									{% if invited_player.isLoaded() %}
 										<tr bgcolor="{{ getStyle(i) }}">
 											{% set i = i + 1 %}
--- a/system/templates/houses.html.twig
+++ b/system/templates/houses.html.twig
@@ -85,7 +85,8 @@ the search criteria and start a new search.
 			<tr bgcolor="{{ config.darkborder }}">
 				<td valign="top" rowspan="2">
 					{% set checked = false %}
-					{% for id, name in config.towns if id > 0 %}
+					{% for id, name in config.towns %}
+						{% if id > 0 %}
 							{% if ((townId is empty and name is not empty) or id == townId) and not checked %}
 								{% set variable = "checked" %}
 								{% set checked = true %}
@@ -96,6 +97,7 @@ the search criteria and start a new search.
 							<input type="radio" name="town" id="town_{{ id }}" value="{{ id }}"{% if variable is defined %} {{ variable }}{% endif %}>
 							<label for="town_{{ id }}"> {{ name }}</label>
 							<br>
+						{% endif %}
 					{% endfor %}
 				</td>

--- a/templates/kathrine/menus.php
+++ b/templates/kathrine/menus.php
@@ -26,7 +26,7 @@ return [
 		'Team' => 'team',
 	],
 	MENU_CATEGORY_LIBRARY => [
-		'Monsters' => 'creatures',
+		'Monsters' => 'monsters',
 		'Spells' => 'spells',
 		'Server Info' => 'server-info',
 		'Commands' => 'commands',
--- a/templates/tibiacom/index.php
+++ b/templates/tibiacom/index.php
@@ -35,6 +35,17 @@ if(isset($config['boxes']))
 				}
 				else {
 					$tmp = str_replace('/', '_', PAGE);
+					$exp = explode('/', PAGE);
+					if(PAGE !== 'account/create' && PAGE !== 'account/lost' && isset($exp[1])) {
+						if ($exp[0] === 'account') {
+							$tmp = 'account_manage';
+						} else if ($exp[0] === 'news' && $exp[1] === 'archive') {
+							$tmp = 'news_archive';
+						}
+						else if (in_array($exp[0], ['characters', 'highscores', 'guilds', 'forum'])) {
+							$tmp = $exp[0];
+						}
+					}
 				}
 			}
 			else {
@@ -107,6 +118,15 @@ if(isset($config['boxes']))
 		menu[0] = {};
 		var unloadhelper = false;

+		<?php
+			$menuInitStr = '';
+			foreach ($config['menu_categories'] as $item) {
+				if ($item['id'] !== 'shops' || setting('core.gifts_system')) {
+					$menuInitStr .= $item['id'] . '=' . ($item['id'] === 'news' ? '1' : '0') . '&';
+				}
+			}
+		?>
+
 		// load the menu and set the active submenu item by using the variable 'activeSubmenuItem'
 		function LoadMenu()
 		{
@@ -114,7 +134,7 @@ if(isset($config['boxes']))
 		  document.getElementById("ActiveSubmenuItemIcon_"+activeSubmenuItem).style.visibility = "visible";
 		  menus = localStorage.getItem('menus');
 		  if(menus == null || menus.lastIndexOf("&") === -1) {
-			  menus = "news=1&account=0&community=0&library=0&forum=0<?php if (setting('core.gifts_system')) echo '&shops=0'; ?>&";
+			  menus = "<?= $menuInitStr ?>";
 		  }
 		  FillMenuArray();
 		  InitializeMenu();
@@ -318,10 +338,22 @@ if(isset($config['boxes']))
 <?php
 $menus = get_template_menus();

+$countElements = 0;
+foreach($config['menu_categories'] as $id => $cat) {
+	if (!isset($menus[$id]) || ($id == MENU_CATEGORY_SHOP && !setting('core.gifts_system'))) {
+		continue;
+	}
+
+	$countElements++;
+}
+
+$i = 0;
 foreach($config['menu_categories'] as $id => $cat) {
 	if(!isset($menus[$id]) || ($id == MENU_CATEGORY_SHOP && !setting('core.gifts_system'))) {
 		continue;
 	}
+
+	$i++;
 	?>
 <div id='<?php echo $cat['id']; ?>' class='menuitem'>
 	<span onClick="MenuItemAction('<?php echo $cat['id']; ?>')">
@@ -348,7 +380,7 @@ foreach($config['menu_categories'] as $id => $cat) {
 			}
 			$link_color = '#' . (strlen($menu['color']) == 0 ? $default_menu_color : $menu['color']);
 			?>
-			<a href='<?php echo $menu['link_full']; ?>'<?php echo $menu['blank'] ? ' target="_blank"' : ''?>>
+			<a href='<?php echo $menu['link_full']; ?>'<?= $menu['target_blank']?>>
 				<div id='submenu_<?php echo str_replace('/', '_', $menu['link']); ?>' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)' style="color: <?php echo $link_color; ?>;">
 					<div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
 					<div id='ActiveSubmenuItemIcon_<?php echo str_replace('/', '_', $menu['link']); ?>' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -361,7 +393,7 @@ foreach($config['menu_categories'] as $id => $cat) {
 	?>
 	</div>
 	<?php
-	if($id == MENU_CATEGORY_SHOP || (!setting('core.gifts_system') && $id == MENU_CATEGORY_SHOP - 1)) {
+	if($id == MENU_CATEGORY_SHOP || (!setting('core.gifts_system') && $i == $countElements)) {
 	?>
 		<div id='MenuBottom' style='background-image:url(<?php echo $template_path; ?>/images/general/box-bottom.gif);'></div>
 	<?php
--- a/templates/tibiacom/menus.php
+++ b/templates/tibiacom/menus.php
@@ -28,7 +28,7 @@ return [
 		'Forum' => 'forum',
 	],
 	MENU_CATEGORY_LIBRARY => [
-		'Monsters' => 'creatures',
+		'Monsters' => 'monsters',
 		'Spells' => 'spells',
 		'Commands' => 'commands',
 		'Exp Stages' => 'exp-stages',
Author	SHA1	Message	Date
slawkens	9ab25abcdf	Release v1.1	2025-01-27 22:30:18 +01:00
slawkens	ea753278a0	Secure direct access to template.php	2025-01-27 22:15:00 +01:00
slawkens	4d749b8815	Fix error in CLI, where BASE_URL is not defined	2025-01-24 21:42:52 +01:00
slawkens	07012f786b	Ignore lua/ folder	2025-01-22 21:45:07 +01:00
slawkens	a45ceab83a	Make players.comment and guilds.description VARCHAR	2025-01-22 21:44:58 +01:00
slawkens	669c447fca	Fix hook ACCOUNT_LOGIN_BEFORE_ACCOUNT location	2025-01-21 21:45:28 +01:00
slawkens	da43b32ff0	Nothing important, code refactor	2025-01-21 20:43:59 +01:00
slawkens	cbe0d187b4	Formatting and types hint	2025-01-20 16:31:54 +01:00
slawkens	c5d5bb8067	Adjust mailer settings to latest gmail	2025-01-18 16:18:47 +01:00
slawkens	e85ce193be	Add forum to the list	2025-01-18 11:18:21 +01:00
slawkens	3fb2675b5a	Fix tibiacom menus	2025-01-18 11:11:35 +01:00
slawkens	b7de8b32eb	Revert "Fix menus like char-bazaar/auctions-history etc." This reverts commit `dd47423157`.	2025-01-18 11:05:15 +01:00
slawkens	89be68731e	Update CHANGELOG.md	2025-01-18 00:11:18 +01:00
slawkens	10dd818b13	Optimize $player->isOnline() function	2025-01-17 22:49:40 +01:00
slawkens	13a1598a46	Nothing important: Convert spaces to tabs	2025-01-17 22:38:27 +01:00
slawkens	4f6178eca0	Initialize menus with menu_categories If user add custom categories, it will fix an issue where Menu is not collapsed	2025-01-17 21:07:02 +01:00
slawkens	dc2b5afd99	functions_custom.php are not optional	2025-01-17 17:12:21 +01:00
slawkens	11cee81c5f	Additional fix to previous commit	2025-01-17 16:36:05 +01:00
slawkens	d639e77d04	tibiacom: Fix the closing MenuBottom if there are extra categories	2025-01-17 16:24:30 +01:00
slawkens	dd47423157	Fix menus like char-bazaar/auctions-history etc.	2025-01-17 11:16:19 +01:00
slawkens	b02c7f4239	Fix note message	2025-01-14 19:29:47 +01:00
slawkens	b5b2e3fd78	Update CHANGELOG.md	2025-01-14 00:19:16 +01:00
slawkens	030d15f0cd	Fix branch name	2025-01-14 00:17:33 +01:00
slawkens	b6b7592226	Release v1.0.1	2025-01-13 23:17:58 +01:00
slawkens	fb10741a02	Fix typo in account word	2025-01-13 23:15:57 +01:00
slawkens	5e9c868dfa	Fix tibiacom account & news menu links	2025-01-13 23:05:16 +01:00
slawkens	0904b1bb87	Fix phpstan	2025-01-13 22:23:43 +01:00
slawkens	faa60f5e9a	Fix phpstan and phplint branches	2025-01-13 22:15:48 +01:00
slawkens	620e0f62e4	Fix cypress run workflow	2025-01-13 22:10:52 +01:00
slawkens	2ae2ec3353	Fix link to monsters	2025-01-13 22:09:15 +01:00
slawkens	b323d9cee1	Update cypress to ^13.17.0	2025-01-13 22:09:04 +01:00
slawkens	4f1d1d8043	Update tinymce to ^7.2.0	2025-01-13 21:50:37 +01:00
slawkens	8e5a3afc6e	Update myaac version	2025-01-13 21:41:49 +01:00
slawkens	a7311301e2	Update composer.lock	2025-01-13 21:40:16 +01:00
slawkens	ac10236154	Update twig dependency to ^3.11 (disable dependabot alert)	2025-01-13 21:40:09 +01:00
slawkens	dc95bc4bad	Merge branch 'master' of https://github.com/slawkens/myaac	2025-01-13 21:18:50 +01:00
dependabot[bot]	0dc7da472f	Bump nesbot/carbon from 2.72.5 to 2.72.6 (#276 ) Bumps [nesbot/carbon](https://github.com/CarbonPHP/carbon) from 2.72.5 to 2.72.6. - [Release notes](https://github.com/CarbonPHP/carbon/releases) - [Commits](https://github.com/CarbonPHP/carbon/compare/2.72.5...2.72.6) --- updated-dependencies: - dependency-name: nesbot/carbon dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-01-13 21:16:29 +01:00
slawkens	43421e56ea	Update nginx-sample.conf	2025-01-13 20:34:40 +01:00
slawkens	544d006b6f	v1.0 - Hello!	2025-01-12 17:44:18 +01:00
slawkens	085ebbcfde	All $cache->set calls should have $ttl	2025-01-12 17:13:25 +01:00
slawkens	77a2c1cec3	Support for plugin themes in menus.php	2025-01-12 16:27:20 +01:00
slawkens	e918591666	Ignore PhpStan error	2025-01-09 22:59:02 +01:00
slawkens	175c2a1f89	Fix PhpStan	2025-01-09 22:52:30 +01:00
slawkens	3b5be1a8db	Add player->outfit_url attribute	2025-01-09 22:41:34 +01:00
slawkens	c769962e39	Refactor getTopPlayers function * Option to getTopPlayers by balance * use Cache::remember	2025-01-09 22:40:57 +01:00
slawkens	35dfaa28ed	Update index.php	2025-01-09 20:57:23 +01:00
slawkens	8e501c0e9c	Shorten code with Cache::remember	2025-01-09 15:50:33 +01:00
slawkens	c52ca27126	Fix if someone deletes the default kathrine template	2025-01-09 15:41:22 +01:00
slawkens	41a3cb6f42	vendor should be accessible, cause of	2025-01-09 13:39:05 +01:00
slawkens	eb4b3ada49	Adjust post_ip to support ipv6	2025-01-09 13:10:04 +01:00
slawkens	68bdec7c18	Fix ip size	2025-01-09 13:06:33 +01:00
slawkens	8a612429b2	Use $db->insert instead of manual query	2025-01-09 13:03:55 +01:00
slawkens	16671ea40b	Fix change sex price deducted	2025-01-09 09:44:12 +01:00
slawkens	8fb643596f	Fix more XSS in forum	2025-01-08 23:22:51 +01:00
slawkens	c2b7286d20	Fix XSS in forum new_post	2025-01-08 23:13:40 +01:00
slawkens	d6c40c836a	Fix move_thread by unauthorized user	2025-01-08 22:36:49 +01:00
slawkens	99262c3ebd	Fix DataLoader Towns cache	2025-01-07 15:03:39 +01:00
slawkens	b8396d4c84	Fix for TFS 1.4.2 where conditions is NULL	2024-12-29 15:46:02 +01:00
slawkens	b0c8cf2ecd	Add $whoopsHandler as variable, can be used by other scripts	2024-12-29 15:45:33 +01:00