Update CHANGELOG.md

Fix branch name
Release v1.0.1
2025-09-14 04:23:34 +02:00 · 2025-01-14 00:19:16 +01:00 · 2025-01-14 00:17:33 +01:00 · 2025-01-13 23:17:58 +01:00 · 2025-01-13 23:15:57 +01:00 · 2025-01-13 23:05:16 +01:00
20 changed files with 747 additions and 633 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/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog

+## [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.
--- 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.0';
+const MYAAC_VERSION = '1.0.1';
 const DATABASE_VERSION = 42;
 const TABLE_PREFIX = 'myaac_';
 define('START_TIME', microtime(true));
--- 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/nginx-sample.conf
+++ b/nginx-sample.conf
@@ -24,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/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/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/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/templates/guilds.view.html.twig
+++ b/system/templates/guilds.view.html.twig
@@ -79,57 +79,59 @@
 									</tr>

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

-										{% for player in rank.members %}
-											<tr bgcolor="{{ rankStyle }}">
-												<td>
-													{% if not showedRank %}{{ rank.rank_name }}{% endif %}
-													{% set showedRank = true %}
-												</td>
+											{% for player in rank.members %}
+												<tr bgcolor="{{ rankStyle }}">
+													<td>
+														{% if not showedRank %}{{ rank.rank_name }}{% endif %}
+														{% set showedRank = true %}
+													</td>

-												<td>
-													{% set playerName = player.getName() %}
-													<form action="{{ getLink('guilds') }}?action=change_nick&name={{ playerName }}&guild={{ guild_name }}" method="post">
-														{{ csrf() }}
-														{{ getPlayerLink(playerName, true)|raw }}
+													<td>
+														{% set playerName = player.getName() %}
+														<form action="{{ getLink('guilds') }}?action=change_nick&name={{ playerName }}&guild={{ guild_name }}" method="post">
+															{{ csrf() }}
+															{{ getPlayerLink(playerName, true)|raw }}

-														{% set showGuildNick = false %}
-														{% if player.getGuildNick() is not empty %}
-															{% set showGuildNick = true %}
-															{% set guildNickRaw = player.getGuildNick()|raw %}
-														{% endif %}
+															{% set showGuildNick = false %}
+															{% if player.getGuildNick() is not empty %}
+																{% set showGuildNick = true %}
+																{% set guildNickRaw = player.getGuildNick()|raw %}
+															{% endif %}

-														{% if logged %}
-															{% if player.getId() in players_from_account_ids %}
-																(<input type="text" name="nick" value="{{ guildNickRaw }}"><input type="submit" value="Change">)
+															{% if logged %}
+																{% if player.getId() in players_from_account_ids %}
+																	(<input type="text" name="nick" value="{{ guildNickRaw }}"><input type="submit" value="Change">)
+																{% else %}
+																	{% if showGuildNick %} ({{ guildNickRaw }}){% endif %}
+																{% endif %}
+
+																{% if level_in_guild > rank.rank_level or isLeader %}
+																	{% if guildOwnerName != playerName %}
+																		<span style="font-size: 10px; float: right">
+																			{<a href="{{ getLink('guilds') }}?action=kick_player&guild={{ guild_name|url_encode }}&name={{ playerName|url_encode }}">KICK</a>}
+																		</span>
+																	{% endif %}
+																{% endif %}
 															{% else %}
 																{% if showGuildNick %} ({{ guildNickRaw }}){% endif %}
 															{% endif %}
+														</form>
+													</td>

-															{% if level_in_guild > rank.rank_level or isLeader %}
-																{% if guildOwnerName != playerName %}
-																	<span style="font-size: 10px; float: right">
-																		{<a href="{{ getLink('guilds') }}?action=kick_player&guild={{ guild_name|url_encode }}&name={{ playerName|url_encode }}">KICK</a>}
-																	</span>
-																{% endif %}
-															{% endif %}
-														{% else %}
-															{% if showGuildNick %} ({{ guildNickRaw }}){% endif %}
-														{% endif %}
-													</form>
-												</td>
+													<td>{{ player.getVocationName() }}</td>
+													<td>{{ player.getLevel() }}</td>
+													<td>
+														<span style="color: {% if player.isOnline() %} green;"><b>Online{% else %} red;"><b>Offline{% endif %}</b></span>
+													</td>
+												</tr>
+											{% endfor %}

-												<td>{{ player.getVocationName() }}</td>
-												<td>{{ player.getLevel() }}</td>
-												<td>
-													<span style="color: {% if player.isOnline() %} green;"><b>Online{% else %} red;"><b>Offline{% endif %}</b></span>
-												</td>
-											</tr>
-										{% endfor %}
-
-										{% set showedRank = false %}
+											{% 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,17 +85,19 @@ 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 %}
-						{% if ((townId is empty and name is not empty) or id == townId) and not checked %}
-							{% set variable = "checked" %}
-							{% set checked = true %}
-						{% else %}
-							{% set variable = "" %}
-						{% endif %}
+					{% 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 %}
+							{% else %}
+								{% set variable = "" %}
+							{% endif %}

-						<input type="radio" name="town" id="town_{{ id }}" value="{{ id }}"{% if variable is defined %} {{ variable }}{% endif %}>
-						<label for="town_{{ id }}"> {{ name }}</label>
-						<br>
+							<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,16 @@ 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
+							$tmp = $exp[0];
+					}
 				}
 			}
 			else {
--- 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	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