[WIP] Use array with index instead of switch

Due to conflict with apache2 server-info mod

.github/workflows/cypress.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: [ '8.1', '8.2', '8.3' ]
+        php-versions: [ '8.1', '8.2', '8.3', '8.4' ]
         ots: ['tfs-1.4', 'canary-3.1.2'] # TODO: add 'tfs-master' (actually doesn't work cause AAC doesn't support reading .env configuration)
     name: Cypress (PHP ${{ matrix.php-versions }}, ${{ matrix.ots }})
     steps:
@@ -146,6 +146,7 @@ jobs:
           with:
             name: cypress-screenshots-${{ matrix.php-versions }}-${{ matrix.ots }}
             path: cypress/screenshots
+            if-no-files-found: ignore
 
         - name: Upload Cypress Videos
           uses: actions/upload-artifact@v4
@@ -153,6 +154,7 @@ jobs:
           with:
             name: cypress-videos-${{ matrix.php-versions }}-${{ matrix.ots }}
             path: cypress/videos
+            if-no-files-found: ignore
 
         - name: Upload PHP Logs
           uses: actions/upload-artifact@v4

.github/workflows/phpstan.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: [ '8.1', '8.2', '8.3' ]
+        php-versions: [ '8.1', '8.2', '8.3', '8.4' ]
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v4"

.htaccess.dist

@@ -6,7 +6,7 @@
 	Options -MultiViews
 </IfModule>
 
-<FilesMatch "^(CHANGELOG\.md|README\.md|composer\.json|composer\.lock|package\.json|package-lock\.json|cypress\.env\.json)$">
+<FilesMatch "^(.*\.md|.*\.json|.*\.dist|.*\.sql|CHANGELOG|README|composer\.lock)$">
 	Require all denied
 </FilesMatch>
 

CHANGELOG-1.x.md

@@ -1,5 +1,33 @@
 # Changelog
 
+## [1.5 - 14.05.2025]
+
+### Added
+* Feature/twig hooks filters (#258)
+* Add latest client versions (14.00 - 15.01) (https://github.com/slawkens/myaac/commit/5367df23812c6182863353c9a39fd7fb0b743f4b)
+* db variable to twig (https://github.com/slawkens/myaac/commit/5ed1aec28e146b871a75597411d12e42a067f4e6)
+* New filter: HOOK_FILTER_ROUTES (https://github.com/slawkens/myaac/commit/9b75011224f385db8b27e109bfeb28e75b9d779c)
+* Allow optionally separate folder for views (thanks @Scrollog for idea) (https://github.com/slawkens/myaac/commit/03e275213901a89edb0ebb8974b776a992ab391f)
+* Add float & double types to the Settings (https://github.com/slawkens/myaac/commit/67ab425bb9796d9d123296e3fda542fa8f7f05ee)
+* Add optional param _page_only for single-page apps etc. (https://github.com/slawkens/myaac/commit/113473f2560aab6d364c301cc14a8b5ba8f309f4)
+
+### Changed
+* Change OTS_Account->getPremDays to not return -1 in case of freePremium (https://github.com/slawkens/myaac/commit/3befde2a1e4d24a011311e785f15185db57e19b8)
+* Add note about highscores being updated x minutes + allow ttl 0 to disable cache (https://github.com/slawkens/myaac/commit/a161cff00329da6f970f3a70967fe8346fe92bbc)
+* Better monster images (no image not found anymore) + use cache (https://github.com/slawkens/myaac/commit/73a5829974ceca3f02d7925d5cfbd5fa50b1bbd2)
+* Rename server-info -> ots-info, changelog -> change-log (Due to conflict with apache2 server-info mod) (https://github.com/slawkens/myaac/commit/3949d84e5d7631f332111b6d00278bddbd0ad10a)
+* Move rules page to admin panel (https://github.com/slawkens/myaac/commit/3949d84e5d7631f332111b6d00278bddbd0ad10a)
+
+### Fixed
+* php 8.4 warnings
+* Visitors counter not working properly on dev mode (https://github.com/slawkens/myaac/commit/da151051186c913dd0dd091aabe893649c2b9ee7)
+* Fix login.php boosted creature & boss (not sure exact version, but should be 14.12 or around) (https://github.com/slawkens/myaac/commit/c48b8006319f6c3b5f082befd16785420bb98110)
+* Fix installMenus when theme/template was removed from disc (https://github.com/slawkens/myaac/commit/c24c580796bccd54bf9e95b864763f4642684d55)
+* Fix if user removes the menu category (https://github.com/slawkens/myaac/commit/dbea69f31478391dacfbbc02c8353c39b4245daf)
+
+### Updated:
+* Update cypress from version ^13.17.0 to ^14.3.3 (https://github.com/slawkens/myaac/commit/629fd18ea166860d5898a822f44f9277da6ce43d)
+
 ## [1.4 - 22.04.2025]
 
 ### Added

README.md

@@ -1,6 +1,6 @@
 # [MyAAC](https://my-aac.org)
 
-MyAAC is a free and open-source Automatic Account Creator (AAC) written in PHP. It is a fork of the [Gesior](https://github.com/gesior/Gesior2012) project. It supports only MySQL databases.
+MyAAC is a free and open-source Automatic Account Creator (AAC) for Open Tibia Servers written in PHP. It is a fork of the [Gesior](https://github.com/gesior/Gesior2012) project. It supports only MySQL databases.
 
 Official website: https://my-aac.org
 

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.4';
+const MYAAC_VERSION = '1.5.1-dev';
-const DATABASE_VERSION = 43;
+const DATABASE_VERSION = 45;
 const TABLE_PREFIX = 'myaac_';
 define('START_TIME', microtime(true));
 define('MYAAC_OS', stripos(PHP_OS, 'WIN') === 0 ? 'WINDOWS' : (strtoupper(PHP_OS) === 'DARWIN' ? 'MAC' : 'LINUX'));

cypress/e2e/3-check-public-pages.cy.js

@@ -17,7 +17,7 @@ describe('Check Public Pages', () => {
 
 	it('Go to changelog page', () => {
 		cy.visit({
-			url: Cypress.env('URL') + '/changelog',
+			url: Cypress.env('URL') + '/change-log',
 			method: 'GET',
 		})
 	})
@@ -132,7 +132,7 @@ describe('Check Public Pages', () => {
 
 	it('Go to server info page', () => {
 		cy.visit({
-			url: Cypress.env('URL') + '/server-info',
+			url: Cypress.env('URL') + '/ots-info',
 			method: 'GET',
 		})
 	})

index.php

@@ -168,6 +168,7 @@ if ($logged && admin()) {
 		'username' => USE_ACCOUNT_NAME ? $account_logged->getName() : $account_logged->getId()
 	]);
 }
+
 $title_full =  (isset($title) ? $title . ' - ' : '') . $config['lua']['serverName'];
 require $template_path . '/' . $template_index;
 

install/includes/schema.sql

@@ -1,4 +1,4 @@
-SET @myaac_database_version = 43;
+SET @myaac_database_version = 45;
 
 CREATE TABLE `myaac_account_actions`
 (

install/tools/7-finish.php

@@ -54,12 +54,13 @@ if ($db->hasTable('players')) {
 	}
 }
 
-Plugins::installMenus('kathrine', require TEMPLATES . 'kathrine/menus.php');
-Plugins::installMenus('tibiacom', require TEMPLATES . 'tibiacom/menus.php');
-
 DataLoader::setLocale($locale);
 DataLoader::load();
 
+// add menus entries
+require_once SYSTEM . 'migrations/17.php';
+$up();
+
 // update config.highscores_ids_hidden
 require_once SYSTEM . 'migrations/20.php';
 $up();
@@ -78,6 +79,10 @@ $up();
 require_once SYSTEM . 'migrations/31.php';
 $up();
 
+// rules page
+require_once SYSTEM . 'migrations/45.php';
+$up();
+
 if(ModelsFAQ::count() == 0) {
 	ModelsFAQ::create([
 		'question' => 'What is this?',

login.php

@@ -86,12 +86,25 @@ switch ($action) {
 		die(json_encode(['eventlist' => $eventlist, 'lastupdatetimestamp' => time()]));
 
 	case 'boostedcreature':
-		$boostedCreature = BoostedCreature::latest();
+		$clientVersion = (int)setting('core.client');
+
+		// 14.00 and up
+		if ($clientVersion >= 1400) {
+			$creatureBoost = $db->query("SELECT * FROM " . $db->tableName('boosted_creature'))->fetchAll();
+			$bossBoost     = $db->query("SELECT * FROM " . $db->tableName('boosted_boss'))->fetchAll();
+			die(json_encode([
+				'boostedcreature' => true,
+				'creatureraceid'  => intval($creatureBoost[0]['raceid']),
+				'bossraceid'      => intval($bossBoost[0]['raceid'])
+			]));
+		}
+
+		// lower clients
+		$boostedCreature = BoostedCreature::first();
 		die(json_encode([
 			'boostedcreature' => true,
 			'raceid' => $boostedCreature->raceid
 		]));
-	break;
 
 	case 'login':
 
@@ -143,7 +156,7 @@ switch ($action) {
 			if ($limiter->exceeded($ip)) {
 				sendError($ban_msg);
 			}
-			
+
 			sendError(($inputEmail != false ? 'Email' : 'Account name') . ' or password is not correct.');
 		}
 

nginx-sample.conf

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

package-lock.json

@@ -14,24 +14,13 @@
         "tinymce": "^7.2.0"
       },
       "devDependencies": {
-        "cypress": "^13.17.0"
+        "cypress": "^14.3.3"
-      }
-    },
-    "node_modules/@colors/colors": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
-      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=0.1.90"
       }
     },
     "node_modules/@cypress/request": {
-      "version": "3.0.7",
+      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.7.tgz",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.8.tgz",
-      "integrity": "sha512-LzxlLEMbBOPYB85uXrDqvD4MgcenjRBLIns3zyhx7vTPj/0u2eQhzXvPiGcaJrV38Q9dbkExWp6cOHPJ+EtFYg==",
+      "integrity": "sha512-h0NFgh1mJmm1nr4jCwkGHwKneVYKghUyWe6TMNrk0B9zsjAJxpg8C4/+BAcmLgCPa1vj1V8rNUaILl+zYRUWBQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -48,7 +37,7 @@
         "json-stringify-safe": "~5.0.1",
         "mime-types": "~2.1.19",
         "performance-now": "^2.1.0",
-        "qs": "6.13.1",
+        "qs": "6.14.0",
         "safe-buffer": "^5.1.2",
         "tough-cookie": "^5.0.0",
         "tunnel-agent": "^0.6.0",
@@ -387,9 +376,9 @@
       }
     },
     "node_modules/call-bind-apply-helpers": {
-      "version": "1.0.1",
+      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
-      "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -401,14 +390,14 @@
       }
     },
     "node_modules/call-bound": {
-      "version": "1.0.3",
+      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
-      "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.1",
+        "call-bind-apply-helpers": "^1.0.2",
-        "get-intrinsic": "^1.2.6"
+        "get-intrinsic": "^1.3.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -504,9 +493,9 @@
       }
     },
     "node_modules/cli-table3": {
-      "version": "0.6.5",
+      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz",
+      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.1.tgz",
-      "integrity": "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==",
+      "integrity": "sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -516,7 +505,7 @@
         "node": "10.* || >= 12.*"
       },
       "optionalDependencies": {
-        "@colors/colors": "1.5.0"
+        "colors": "1.4.0"
       }
     },
     "node_modules/cli-truncate": {
@@ -563,6 +552,17 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -619,14 +619,14 @@
       }
     },
     "node_modules/cypress": {
-      "version": "13.17.0",
+      "version": "14.3.3",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.17.0.tgz",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-14.3.3.tgz",
-      "integrity": "sha512-5xWkaPurwkIljojFidhw8lFScyxhtiFHl/i/3zov+1Z5CmY4t9tjIdvSXfu82Y3w7wt0uR9KkucbhkVvJZLQSA==",
+      "integrity": "sha512-1Rz7zc9iqLww6BysaESqUhtIuaFHS7nL3wREovAKYsNhLTfX3TbcBWHWgEz70YimH2NkSOsm4oIcJJ9HYHOlew==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@cypress/request": "^3.0.6",
+        "@cypress/request": "^3.0.8",
         "@cypress/xvfb": "^1.2.4",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
@@ -637,9 +637,9 @@
         "cachedir": "^2.3.0",
         "chalk": "^4.1.0",
         "check-more-types": "^2.24.0",
-        "ci-info": "^4.0.0",
+        "ci-info": "^4.1.0",
         "cli-cursor": "^3.1.0",
-        "cli-table3": "~0.6.1",
+        "cli-table3": "0.6.1",
         "commander": "^6.2.1",
         "common-tags": "^1.8.0",
         "dayjs": "^1.10.4",
@@ -663,7 +663,7 @@
         "process": "^0.11.10",
         "proxy-from-env": "1.0.0",
         "request-progress": "^3.0.0",
-        "semver": "^7.5.3",
+        "semver": "^7.7.1",
         "supports-color": "^8.1.1",
         "tmp": "~0.2.3",
         "tree-kill": "1.2.2",
@@ -674,7 +674,7 @@
         "cypress": "bin/cypress"
       },
       "engines": {
-        "node": "^16.0.0 || ^18.0.0 || >=20.0.0"
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
       }
     },
     "node_modules/cypress/node_modules/fs-extra": {
@@ -819,9 +819,9 @@
       }
     },
     "node_modules/es-object-atoms": {
-      "version": "1.0.0",
+      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -831,6 +831,22 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -960,14 +976,15 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.1",
+      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
-      "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
+      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
         "mime-types": "^2.1.12"
       },
       "engines": {
@@ -999,18 +1016,18 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.7",
+      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
-      "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.1",
+        "call-bind-apply-helpers": "^1.0.2",
         "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
+        "es-object-atoms": "^1.1.1",
         "function-bind": "^1.1.2",
-        "get-proto": "^1.0.0",
+        "get-proto": "^1.0.1",
         "gopd": "^1.2.0",
         "has-symbols": "^1.1.0",
         "hasown": "^2.0.2",
@@ -1131,6 +1148,22 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/hasown": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
@@ -1560,9 +1593,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.3",
+      "version": "1.13.4",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
-      "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1709,13 +1742,13 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.13.1",
+      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.1.tgz",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
-      "integrity": "sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==",
+      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
-        "side-channel": "^1.0.6"
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">=0.6"
@@ -1794,9 +1827,9 @@
       "license": "MIT"
     },
     "node_modules/semver": {
-      "version": "7.6.3",
+      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -2031,22 +2064,22 @@
       "license": "GPL-2.0-or-later"
     },
     "node_modules/tldts": {
-      "version": "6.1.71",
+      "version": "6.1.86",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.71.tgz",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz",
-      "integrity": "sha512-LQIHmHnuzfZgZWAf2HzL83TIIrD8NhhI0DVxqo9/FdOd4ilec+NTNZOlDZf7EwrTNoutccbsHjvWHYXLAtvxjw==",
+      "integrity": "sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tldts-core": "^6.1.71"
+        "tldts-core": "^6.1.86"
       },
       "bin": {
         "tldts": "bin/cli.js"
       }
     },
     "node_modules/tldts-core": {
-      "version": "6.1.71",
+      "version": "6.1.86",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.71.tgz",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.86.tgz",
-      "integrity": "sha512-LRbChn2YRpic1KxY+ldL1pGXN/oVvKfCVufwfVzEQdFYNo39uF7AJa/WXdo+gYO7PTvdfkCPCed6Hkvz/kR7jg==",
+      "integrity": "sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==",
       "dev": true,
       "license": "MIT"
     },
@@ -2061,9 +2094,9 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "5.1.0",
+      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz",
-      "integrity": "sha512-rvZUv+7MoBYTiDmFPBrhL7Ujx9Sk+q9wwm22x8c8T5IJaR+Wsyc7TNxbVxo84kZoRJZZMazowFLqpankBEQrGg==",
+      "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {

package.json

@@ -4,7 +4,7 @@
     "postinstall": "node ./npm-post-install.js"
   },
   "devDependencies": {
-    "cypress": "^13.17.0"
+    "cypress": "^14.3.3"
   },
   "dependencies": {
     "@tinymce/tinymce-jquery": "^2.1.0",

system/clients.conf.php

@@ -109,4 +109,12 @@ $config['clients'] = [
 	1330,
 	1332,
 	1340,
+
+	1400,
+	1405,
+	1410,
+	1411,
+	1412,
+	1500,
+	1501,
 ];

system/compat/base.php

@@ -74,7 +74,3 @@ function fieldExist($field, $table)
 	global $db;
 	return $db->hasColumn($table, $field);
 }
-
-function getCreatureImgPath($creature): string {
-	return getMonsterImgPath($creature);
-}

system/database.php

@@ -122,6 +122,10 @@ try {
 
 	$eloquentConnection = $capsule->getConnection();
 
+	if (isset($twig)) {
+		$twig->addGlobal('db', $db);
+	}
+
 } catch (Exception $e) {
 	if(isset($cache) && $cache->enabled()) {
 		$cache->delete('config_lua');

system/functions.php

@@ -545,33 +545,39 @@ function template_header($is_admin = false): string
  */
 function template_footer(): string
 {
-	global $views_counter;
+	$footer = [];
-	$ret = '';
+
 	if(admin()) {
-		$ret .= generateLink(ADMIN_URL, 'Admin Panel', true);
+		$footer[] = generateLink(ADMIN_URL, 'Admin Panel', true);
 	}
 
 	if(setting('core.visitors_counter')) {
 		global $visitors;
 		$amount = $visitors->getAmountVisitors();
-		$ret .= '<br/>Currently there ' . ($amount > 1 ? 'are' : 'is') . ' ' . $amount . ' visitor' . ($amount > 1 ? 's' : '') . '.';
+		$footer[] = 'Currently there ' . ($amount > 1 ? 'are' : 'is') . ' ' . $amount . ' visitor' . ($amount > 1 ? 's' : '') . '.';
 	}
 
 	if(setting('core.views_counter')) {
-		$ret .= '<br/>Page has been viewed ' . $views_counter . ' times.';
+		global $views_counter;
+		$footer[] = 'Page has been viewed ' . $views_counter . ' times.';
 	}
 
 	if(setting('core.footer_load_time')) {
-		$ret .= '<br/>Load time: ' . round(microtime(true) - START_TIME, 4) . ' seconds.';
+		$footer[] = 'Load time: ' . round(microtime(true) - START_TIME, 4) . ' seconds.';
 	}
 
 	$settingFooter = setting('core.footer');
 	if(isset($settingFooter[0])) {
-		$ret .= '<br/>' . $settingFooter;
+		$footer[] = '' . $settingFooter;
 	}
 
 	// please respect my work and help spreading the word, thanks!
-	return $ret . '<br/>' . base64_decode('UG93ZXJlZCBieSA8YSBocmVmPSJodHRwOi8vbXktYWFjLm9yZyIgdGFyZ2V0PSJfYmxhbmsiPk15QUFDLjwvYT4=');
+	$footer[] = base64_decode('UG93ZXJlZCBieSA8YSBocmVmPSJodHRwOi8vbXktYWFjLm9yZyIgdGFyZ2V0PSJfYmxhbmsiPk15QUFDLjwvYT4=');
+
+	global $hooks;
+	$hooks->triggerFilter(HOOK_FILTER_THEME_FOOTER, $footer);
+
+	return implode('<br/>', $footer);
 }
 
 function template_ga_code()
@@ -1572,22 +1578,6 @@ function right($str, $length) {
 	return substr($str, -$length);
 }
 
-function getMonsterImgPath($monster): string
-{
-	$monster_path = setting('core.monsters_images_url');
-	$monster_gfx_name = trim(strtolower($monster)) . setting('core.monsters_images_extension');
-	if (!file_exists($monster_path . $monster_gfx_name)) {
-		$monster_gfx_name = str_replace(" ", "", $monster_gfx_name);
-		if (file_exists($monster_path . $monster_gfx_name)) {
-			return $monster_path . $monster_gfx_name;
-		} else {
-			return $monster_path . 'nophoto.png';
-		}
-	} else {
-		return $monster_path . $monster_gfx_name;
-	}
-}
-
 function between($x, $lim1, $lim2) {
 	if ($lim1 < $lim2) {
 		$lower = $lim1; $upper = $lim2;

system/init.php

@@ -138,6 +138,9 @@ $ots = POT::getInstance();
 $eloquentConnection = null;
 require_once SYSTEM . 'database.php';
 
+$twig->addGlobal('logged', false);
+$twig->addGlobal('account_logged', new \OTS_Account());
+
 // 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 ' . (IS_CLI ? 'http://your-ip.com/' : BASE_URL) . 'install');

system/libs/pot/OTS.php

@@ -1115,7 +1115,7 @@ class POT
  *
  * @param IOTS_FileCache $cache Cache handler (skip this parameter to reset cache handler to null).
  */
-    public function setItemsCache(IOTS_FileCache $cache = null)
+    public function setItemsCache(?IOTS_FileCache $cache = null)
     {
         $this->itemsCache = $cache;
     }
@@ -1253,7 +1253,7 @@ class POT
  *
  * @param IOTS_FileCache $cache Cache handler (skip this parameter to reset cache handler to null).
  */
-    public function setMapCache(IOTS_FileCache $cache = null)
+    public function setMapCache(?IOTS_FileCache $cache = null)
     {
         $this->mapCache = $cache;
     }

system/libs/pot/OTS_Account.php

@@ -443,9 +443,6 @@ class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable
 			throw new E_OTS_NotLoaded();
 		}
 
-		$configFreePremium = configLua('freePremium');
-		if(isset($configFreePremium) && getBoolean($configFreePremium)) {return -1;}
-
 		if(isset($this->data['premium_ends_at']) || isset($this->data['premend'])) {
 			$col = isset($this->data['premium_ends_at']) ? 'premium_ends_at' : 'premend';
 			$ret = ceil(($this->data[$col] - time()) / (24 * 60 * 60));

system/libs/pot/OTS_Guild.php

@@ -97,7 +97,7 @@ class OTS_Guild extends OTS_Row_DAO implements IteratorAggregate, Countable
  *
  * @param IOTS_GuildAction $invites Invites driver (don't pass it to clear driver).
  */
-    public function setInvitesDriver(IOTS_GuildAction $invites = null)
+    public function setInvitesDriver(?IOTS_GuildAction $invites = null)
     {
         $this->invites = $invites;
     }
@@ -107,7 +107,7 @@ class OTS_Guild extends OTS_Row_DAO implements IteratorAggregate, Countable
  *
  * @param IOTS_GuildAction $requests Membership requests driver (don't pass it to clear driver).
  */
-    public function setRequestsDriver(IOTS_GuildAction $requests = null)
+    public function setRequestsDriver(?IOTS_GuildAction $requests = null)
     {
         $this->requests = $requests;
     }

system/libs/pot/OTS_GuildRank.php

@@ -60,7 +60,7 @@ class OTS_GuildRank extends OTS_Row_DAO implements IteratorAggregate, Countable
  * @throws PDOException On PDO operation error.
  * @throws E_OTS_NotLoaded If given <var>$guild</var> object is not loaded.
  */
-    public function find($name, OTS_Guild $guild = null)
+    public function find($name, ?OTS_Guild $guild = null)
     {
         $where = '';
 

system/libs/pot/OTS_Monster.php

@@ -284,7 +284,7 @@ class OTS_Monster extends DOMDocument
  */
 	public function getLook()
 	{
-		$look = array();
+		$look = [];
 
 		$element = $this->documentElement->getElementsByTagName('look')->item(0);
 
@@ -292,14 +292,30 @@ class OTS_Monster extends DOMDocument
 			return $look;
 		}
 
-		$look['type'] = $element->getAttribute('type');
+		if ($element->hasAttribute('typeex')) {
-		$look['typeex'] = $element->getAttribute('typeex');
+			$look['typeEx'] = (int) $element->getAttribute('typeex');
-		$look['head'] = $element->getAttribute('head');
+		}
-		$look['body'] = $element->getAttribute('body');
+		if ($element->hasAttribute('type')) {
-		$look['legs'] = $element->getAttribute('legs');
+			$look['type'] = (int) $element->getAttribute('type');
-		$look['feet'] = $element->getAttribute('feet');
+		}
-		$look['addons'] = $element->getAttribute('addons');
+		if ($element->hasAttribute('head')) {
-		$look['corpse'] = $element->getAttribute('corpse');
+			$look['head'] = (int) $element->getAttribute('head');
+		}
+		if ($element->hasAttribute('body')) {
+			$look['body'] = (int) $element->getAttribute('body');
+		}
+		if ($element->hasAttribute('legs')) {
+			$look['legs'] = (int) $element->getAttribute('legs');
+		}
+		if ($element->hasAttribute('feet')) {
+			$look['feet'] = (int) $element->getAttribute('feet');
+		}
+		if ($element->hasAttribute('addons')) {
+			$look['addons'] = (int) $element->getAttribute('addons');
+		}
+		if ($element->hasAttribute('corpse')) {
+			$look['corpse'] = (int) $element->getAttribute('corpse');
+		}
 
 		return $look;
 	}

system/libs/pot/OTS_Player.php

@@ -2026,7 +2026,7 @@ class OTS_Player extends OTS_Row_DAO
  * @param OTS_GuildRank|null Guild rank (null to clear assign).
  * @throws E_OTS_NotLoaded If passed <var>$guildRank</var> parameter is not loaded.
  */
-	public function setRank(OTS_GuildRank $guildRank = null)
+	public function setRank(?OTS_GuildRank $guildRank = null)
 	{
 		if(isset($guildRank))
 			$this->setRankId($guildRank->getId(), $guildRank->getGuild()->getId());
@@ -2632,7 +2632,7 @@ class OTS_Player extends OTS_Row_DAO
  * @throws E_OTS_NotLoaded If player is not loaded.
  * @throws PDOException On PDO operation error.
  */
-	public function setSlot($slot, OTS_Item $item = null, $pid = 0)
+	public function setSlot($slot, ?OTS_Item $item = null, $pid = 0)
 	{
 		static $sid;
 
@@ -2776,7 +2776,7 @@ class OTS_Player extends OTS_Row_DAO
  * @throws E_OTS_NotLoaded If player is not loaded.
  * @throws PDOException On PDO operation error.
  */
-	public function setDepot($depot, OTS_Item $item = null, $pid = 0, $depot_id = 0)
+	public function setDepot($depot, ?OTS_Item $item = null, $pid = 0, $depot_id = 0)
 	{
 		static $sid;
 

system/migrations/17.php

@@ -10,8 +10,13 @@ $up = function () use ($db) {
 		$db->exec(file_get_contents(__DIR__ . '/17-menu.sql'));
 	}
 
-	Plugins::installMenus('kathrine', require TEMPLATES . 'kathrine/menus.php');
+	$themes = ['kathrine', 'tibiacom',];
-	Plugins::installMenus('tibiacom', require TEMPLATES . 'tibiacom/menus.php');
+	foreach ($themes as $theme) {
+		$file = TEMPLATES . $theme . '/menus.php';
+		if (is_file($file)) {
+			Plugins::installMenus($theme, require $file);
+		}
+	}
 };
 
 $down = function () use ($db) {

system/migrations/44.php

@@ -0,0 +1,20 @@
+<?php
+
+// 2025-05-14
+// update pages links
+// server-info conflicts with apache2 mod
+// Changelog conflicts with changelog files
+
+use MyAAC\Models\Menu;
+use MyAAC\Models\Pages;
+
+$up = function() {
+	Menu::where('link', 'server-info')->update(['link' => 'ots-info']);
+	Menu::where('link', 'changelog')->update(['link' => 'change-log']);
+};
+
+$down = function() {
+	Menu::where('link', 'ots-info')->update(['link' => 'server-info']);
+	Menu::where('link', 'change-log')->update(['link' => 'changelog']);
+};
+

system/migrations/45.php

@@ -0,0 +1,32 @@
+<?php
+
+// 2025-05-14
+// update pages links
+// server-info conflicts with apache2 mod
+// Changelog conflicts with changelog files
+
+use MyAAC\Models\Pages;
+
+$up = function() {
+	Pages::where('name', 'rules_on_the_page')->update(['hide' => 1]);
+
+	$rules = Pages::where('name', 'rules')->first();
+	if (!$rules) {
+		Pages::create([
+			'name' => 'rules',
+			'title' => 'Server Rules',
+			'body' => '<b>{{ config.lua.serverName }} Rules</b><br/>' . nl2br(file_get_contents(__DIR__ . '/30-rules.txt')),
+			'date' => time(),
+			'player_id' => 1,
+			'php' => 0,
+			'enable_tinymce' => 1,
+			'access' => 0,
+			'hide' => 0,
+		]);
+	}
+};
+
+$down = function() {
+	Pages::where('name', 'rules_on_the_page')->update(['hide' => 0]);
+};
+

system/pages/account/login.php

@@ -95,3 +95,8 @@ else {
 }
 
 $hooks->trigger(HOOK_ACCOUNT_LOGIN_POST);
+
+if($logged) {
+	$twig->addGlobal('logged', true);
+	$twig->addGlobal('account_logged', $account_logged);
+}

system/pages/change-log.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Changelog
+ *
+ * @package   MyAAC
+ * @author    Slawkens <slawkens@gmail.com>
+ * @copyright 2019 MyAAC
+ * @link      https://my-aac.org
+ */
+defined('MYAAC') or die('Direct access not allowed!');
+$title = 'Changelog';
+
+use MyAAC\Models\Changelog;
+
+$_page = isset($_GET['page']) ? (int)$_GET['page'] : 0;
+$limit = 30;
+$offset = $_page * $limit;
+$next_page = false;
+
+$canEdit = hasFlag(FLAG_CONTENT_NEWS) || superAdmin();
+
+$changelogs = Changelog::isPublic()->orderByDesc('date')->limit($limit + 1)->offset($offset)->get()->toArray();
+
+$i = 0;
+foreach($changelogs as $key => &$log)
+{
+	if($i < $limit) {
+		$log['type'] = getChangelogType($log['type']);
+		$log['where'] = getChangelogWhere($log['where']);
+	}
+	else {
+		unset($changelogs[$key]);
+	}
+
+	if ($i >= $limit)
+		$next_page = true;
+
+	$i++;
+}
+
+$twig->display('changelog.html.twig', array(
+	'changelogs' => $changelogs,
+	'page' => $_page,
+	'next_page' => $next_page,
+	'canEdit' => $canEdit,
+));

system/pages/changelog.php

@@ -1,46 +1,3 @@
 <?php
-/**
- * Changelog
- *
- * @package   MyAAC
- * @author    Slawkens <slawkens@gmail.com>
- * @copyright 2019 MyAAC
- * @link      https://my-aac.org
- */
-defined('MYAAC') or die('Direct access not allowed!');
-$title = 'Changelog';
 
-use MyAAC\Models\Changelog;
+require 'change-log.php';
-
-$_page = isset($_GET['page']) ? (int)$_GET['page'] : 0;
-$limit = 30;
-$offset = $_page * $limit;
-$next_page = false;
-
-$canEdit = hasFlag(FLAG_CONTENT_NEWS) || superAdmin();
-
-$changelogs = Changelog::isPublic()->orderByDesc('date')->limit($limit + 1)->offset($offset)->get()->toArray();
-
-$i = 0;
-foreach($changelogs as $key => &$log)
-{
-	if($i < $limit) {
-		$log['type'] = getChangelogType($log['type']);
-		$log['where'] = getChangelogWhere($log['where']);
-	}
-	else {
-		unset($changelogs[$key]);
-	}
-
-	if ($i >= $limit)
-		$next_page = true;
-
-	$i++;
-}
-
-$twig->display('changelog.html.twig', array(
-	'changelogs' => $changelogs,
-	'page' => $_page,
-	'next_page' => $next_page,
-	'canEdit' => $canEdit,
-));

system/pages/highscores.php

@@ -18,8 +18,11 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Highscores';
 
 $settingHighscoresCountryBox = setting('core.highscores_country_box');
-if(config('account_country') && $settingHighscoresCountryBox)
+if(config('account_country') && $settingHighscoresCountryBox) {
 	require SYSTEM . 'countries.conf.php';
+}
+
+$highscoresTTL = setting('core.highscores_cache_ttl');
 
 $list = urldecode($_GET['list'] ?? 'experience');
 $page = $_GET['page'] ?? 1;
@@ -55,64 +58,57 @@ if($vocation !== 'all') {
 	}
 }
 
-$skill = POT::SKILL__LEVEL;
+$categories = [
-if(is_numeric($list))
+	'experience' => 'Experience',
-{
+	'magic' => 'Magic',
-	$list = (int) $list;
+	'shield' => 'Shielding',
-	if($list >= POT::SKILL_FIRST && $list <= POT::SKILL__LAST)
+	'distance' => 'Distance',
-		$skill = $list;
+	'club' => 'Club',
+	'sword' => 'Sword',
+	'axe' => 'Axe',
+	'fist' => 'Fist',
+	'fishing' => 'Fishing',
+];
+
+if(setting('core.highscores_frags')) {
+	$categories['frags'] = 'Frags';
 }
-else
-{
-	switch($list)
-	{
-		case 'fist':
-			$skill = POT::SKILL_FIST;
-			break;
 
-		case 'club':
+if(setting('core.highscores_balance'))
-			$skill = POT::SKILL_CLUB;
+	$categories['balance'] = 'Balance';
-			break;
 
-		case 'sword':
+$skill = POT::SKILL__LEVEL;
-			$skill = POT::SKILL_SWORD;
-			break;
 
-		case 'axe':
+$skillNameToId = [
-			$skill = POT::SKILL_AXE;
+	'fist' => POT::SKILL_FIST,
-			break;
+	'club' => POT::SKILL_CLUB,
+	'sword' => POT::SKILL_SWORD,
+	'axe' => POT::SKILL_AXE,
+	'distance' => POT::SKILL_DIST,
+	'shield' => POT::SKILL_SHIELD,
+	'fishing' => POT::SKILL_FISH,
+	'magic' => POT::SKILL__MAGLEVEL,
+];
 
-		case 'distance':
+if(setting('core.highscores_frags')) {
-			$skill = POT::SKILL_DIST;
+	$skillNameToId['frags'] = SKILL_FRAGS;
-			break;
+}
 
-		case 'shield':
+if(setting('core.highscores_balance')) {
-			$skill = POT::SKILL_SHIELD;
+	$skillNameToId['balance'] = SKILL_BALANCE;
-			break;
+}
 
-		case 'fishing':
+$skill = $skillNameToId[$list];
-			$skill = POT::SKILL_FISH;
-			break;
 
-		case 'level':
+$args = ['list' => $list, 'skill' => $skill, 'categories' => $categories];
-		case 'experience':
+$hooks->triggerFilter(HOOK_FILTER_HIGHSCORES_LIST, $args);
-			$skill = POT::SKILL_LEVEL;
-			break;
 
-		case 'magic':
+$list = $args['list'];
-			$skill = POT::SKILL__MAGLEVEL;
+$skill = $args['skill'];
-			break;
+$categories = $args['categories'];
 
-		case 'frags':
+if (!isset($categories[$list])) {
-			if(setting('core.highscores_frags'))
+	$skill = null;
-				$skill = SKILL_FRAGS;
-			break;
-
-		case 'balance':
-			if(setting('core.highscores_balance'))
-				$skill = SKILL_BALANCE;
-			break;
-	}
 }
 
 $promotion = '';
@@ -140,7 +136,7 @@ $needReCache = true;
 $cacheKey = 'highscores_' . $skill . '_' . $vocation . '_' . $page . '_' . $configHighscoresPerPage;
 
 $cache = Cache::getInstance();
-if ($cache->enabled()) {
+if ($cache->enabled() && $highscoresTTL > 0) {
 	$tmp = '';
 	if ($cache->fetch($cacheKey, $tmp)) {
 		$highscores = unserialize($tmp);
@@ -159,8 +155,18 @@ $query->join('accounts', 'accounts.id', '=', 'players.account_id')
 	->selectRaw('accounts.country, players.id, players.name, players.account_id, players.level, players.vocation' . $outfit . $promotion)
 	->orderByDesc('value');
 
+if ($skill == SKILL_FRAGS) {
+	$skillName = 'Frags';
+}
+else if($skill == SKILL_BALANCE) {
+	$skillName = 'Balance';
+}
+else {
+	$skillName = getSkillName($skill);
+}
+
 if (empty($highscores)) {
-	if ($skill >= POT::SKILL_FIRST && $skill <= POT::SKILL_LAST) { // skills
+	if ($skill && $skill >= POT::SKILL_FIRST && $skill <= POT::SKILL_LAST) { // skills
 		if ($db->hasColumn('players', 'skill_fist')) {// tfs 1.0
 			$skill_ids = array(
 				POT::SKILL_FIST => 'skill_fist',
@@ -190,20 +196,37 @@ if (empty($highscores)) {
 	{
 		$query
 			->addSelect('players.balance as value');
-	} else {
+	}
-		if ($skill == POT::SKILL__MAGLEVEL) {
+	else if ($skill == POT::SKILL__MAGLEVEL) {
-			$query
+		$query
-				->addSelect('players.maglevel as value', 'players.maglevel')
+			->addSelect('players.maglevel as value', 'players.maglevel')
-				->orderBy('manaspent');
+			->orderBy('manaspent');
-		} else { // level
+	} else if ($skill == POT::SKILL__LEVEL) {
-			$query
+		$query
-				->addSelect('players.level as value', 'players.experience')
+			->addSelect('players.level as value', 'players.experience')
-				->orderBy('experience');
+			->orderBy('experience', 'desc');
-			$list = 'experience';
+		$list = 'experience';
-		}
+	}
+	else if ($skill) {
+		$args = [
+			'list' => $list,
+			'skill' => $skill,
+			'skillName' => $skillName,
+			'query' => $query
+		];
+
+		$hooks->triggerFilter(HOOK_FILTER_HIGHSCORES, $args);
+
+		$list = $args['list'];
+		$skill = $args['skill'];
+		$skillName = $args['skillName'];
+		$query = $args['query'];
+	}
+	else {
+		$query = null;
 	}
 
-	$highscores = $query->get()->map(function($row) {
+	$highscores = ($query ? $query->get()->map(function($row) {
 		$tmp = $row->toArray();
 		$tmp['online'] = $row->online_status;
 		$tmp['vocation'] = $row->vocation_name;
@@ -211,11 +234,11 @@ if (empty($highscores)) {
 		unset($tmp['online_table']);
 
 		return $tmp;
-	})->toArray();
+	})->toArray() : []);
 }
 
-if ($cache->enabled() && $needReCache) {
+if ($highscoresTTL > 0 && $cache->enabled() && $needReCache) {
-	$cache->set($cacheKey, serialize($highscores), setting('core.highscores_cache_ttl') * 60);
+	$cache->set($cacheKey, serialize($highscores), $highscoresTTL * 60);
 }
 
 $show_link_to_next_page = false;
@@ -236,9 +259,11 @@ 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="' . $player['outfit_url'] . '" alt="" />';
 		}
+
 		$player['rank'] = $offset + $i;
 	}
 	else {
@@ -260,34 +285,21 @@ if($show_link_to_next_page) {
 	$linkNextPage = getLink('highscores') . '/' . $list . ($vocation !== 'all' ? '/' . $vocation : '') . '/' . ($page + 1);
 }
 
-$types = array(
+if ($highscoresTTL > 0 && $cache->enabled()) {
-	'experience' => 'Experience',
+	echo '<small>*Note: Highscores are updated every' . ($highscoresTTL > 1 ? ' ' . $highscoresTTL : '') . ' minute' . ($highscoresTTL > 1 ? 's' : '') . '.</small><br/><br/>';
-	'magic' => 'Magic',
-	'shield' => 'Shielding',
-	'distance' => 'Distance',
-	'club' => 'Club',
-	'sword' => 'Sword',
-	'axe' => 'Axe',
-	'fist' => 'Fist',
-	'fishing' => 'Fishing',
-);
-
-if(setting('core.highscores_frags')) {
-	$types['frags'] = 'Frags';
 }
-if(setting('core.highscores_balance'))
-	$types['balance'] = 'Balance';
 
 /** @var Twig\Environment $twig */
 $twig->display('highscores.html.twig', [
 	'highscores' => $highscores,
 	'list' => $list,
 	'skill' => $skill,
-	'skillName' => ($skill == SKILL_FRAGS ? 'Frags' : ($skill == SKILL_BALANCE ? 'Balance' : getSkillName($skill))),
+	'skillName' => $skillName,
 	'levelName' => ($skill != SKILL_FRAGS && $skill != SKILL_BALANCE ? 'Level' : ($skill == SKILL_BALANCE ? 'Balance' : 'Frags')),
 	'vocation' => $vocation !== 'all' ? $vocation :  null,
 	'vocationId' => $vocationId,
-	'types' => $types,
+	'categories' => $categories,
+	'types' => $categories, // leave for compatibility with outdated twigs
 	'linkPreviousPage' => $linkPreviousPage,
 	'linkNextPage' => $linkNextPage,
 ]);

system/pages/monsters.php

@@ -16,18 +16,22 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Monsters';
 
 if (empty($_REQUEST['name'])) {
-	// display list of monsters
 	$preview = setting('core.monsters_images_preview');
-	$monsters = Monster::where('hide', '!=', 1)->when(!empty($_REQUEST['boss']), function ($query) {
-		$query->where('rewardboss', 1);
-	})->get()->toArray();
 
-	if ($preview) {
+	// display list of monsters
-		foreach($monsters as $key => &$monster)
+	$monsters = MyAAC\Cache::remember('monsters', 30 * 60, function () use ($preview) {
-		{
+		$monsters = Monster::where('hide', '!=', 1)->when(!empty($_REQUEST['boss']), function ($query) {
-			$monster['img_link'] = getMonsterImgPath($monster['name']);
+			$query->where('rewardboss', 1);
+		})->get()->toArray();
+
+		if ($preview) {
+			foreach($monsters as &$monster) {
+				$monster['img_link'] = getMonsterImage($monster);
+			}
 		}
-	}
+
+		return $monsters;
+	});
 
 	$twig->display('monsters.html.twig', array(
 		'monsters' => $monsters,
@@ -45,7 +49,7 @@ if ($monsterModel && isset($monsterModel->name)) {
 	/** @var array $monster */
 	$monster = $monsterModel->toArray();
 
-	function sort_by_chance($a, $b)
+	function sort_by_chance($a, $b): int
 	{
 		if ($a['chance'] == $b['chance']) {
 			return 0;
@@ -55,7 +59,7 @@ if ($monsterModel && isset($monsterModel->name)) {
 
 	$title = $monster['name'] . " - Monsters";
 
-	$monster['img_link']= getMonsterImgPath($monster_name);
+	$monster['img_link']= getMonsterImage($monster);
 
 	$voices = json_decode($monster['voices'], true);
 	$summons = json_decode($monster['summons'], true);
@@ -89,3 +93,39 @@ if ($monsterModel && isset($monsterModel->name)) {
 
 // back button
 $twig->display('monsters.back_button.html.twig');
+
+function getMonsterImage($monster): string
+{
+	$outfit = json_decode($monster['look'], true);
+
+	if (!empty($outfit['typeEx'])) {
+		return setting('core.item_images_url') . $outfit['typeEx'] . setting('core.item_images_extension');
+	}
+
+	if (isset($outfit['type'])) {
+		$getValue = function ($val) use ($outfit) {
+			return (!empty($outfit[$val])
+				? '&' . $val . '=' . $outfit[$val] : '');
+		};
+
+		return setting('core.outfit_images_url') . '?id=' . $outfit['type'] . $getValue('addons') . $getValue('head') . $getValue('body') . $getValue('legs') . $getValue('feet');
+	}
+
+	return getMonsterImgPath($monster['name']);
+}
+
+function getMonsterImgPath($name): string
+{
+	$monster_path = setting('core.monsters_images_url');
+	$monster_gfx_name = trim(strtolower($name)) . setting('core.monsters_images_extension');
+	if (!file_exists($monster_path . $monster_gfx_name)) {
+		$monster_gfx_name = str_replace(" ", "", $monster_gfx_name);
+		if (file_exists($monster_path . $monster_gfx_name)) {
+			return $monster_path . $monster_gfx_name;
+		} else {
+			return $monster_path . 'nophoto.png';
+		}
+	} else {
+		return $monster_path . $monster_gfx_name;
+	}
+}

system/pages/ots-info.php

@@ -0,0 +1,110 @@
+<?php
+/**
+ * Server info
+ *
+ * @package   MyAAC
+ * @author    Gesior <jerzyskalski@wp.pl>
+ * @author    Slawkens <slawkens@gmail.com>
+ * @author    whiteblXK
+ * @copyright 2019 MyAAC
+ * @link      https://my-aac.org
+ */
+defined('MYAAC') or die('Direct access not allowed!');
+$title = 'Server info';
+
+if(isset($config['lua']['experience_stages']))
+    $config['lua']['experienceStages'] = $config['lua']['experience_stages'];
+
+if(isset($config['lua']['min_pvp_level']))
+    $config['lua']['protectionLevel'] = $config['lua']['min_pvp_level'];
+
+$rent = trim(strtolower($config['lua']['houseRentPeriod']));
+if($rent != 'yearly' && $rent != 'monthly' && $rent != 'weekly' && $rent != 'daily')
+    $rent = 'never';
+
+if(isset($config['lua']['houseCleanOld']))
+    $cleanOld = (int)(eval('return ' . $config['lua']['houseCleanOld'] . ';') / (24 * 60 * 60));
+
+if(isset($config['lua']['rate_exp']))
+    $config['lua']['rateExp'] = $config['lua']['rate_exp'];
+if(isset($config['lua']['rateExperience']))
+    $config['lua']['rateExp'] = $config['lua']['rateExperience'];
+if(isset($config['lua']['rate_mag']))
+    $config['lua']['rateMagic'] = $config['lua']['rate_mag'];
+if(isset($config['lua']['rate_skill']))
+    $config['lua']['rateSkill'] = $config['lua']['rate_skill'];
+if(isset($config['lua']['rate_loot']))
+    $config['lua']['rateLoot'] = $config['lua']['rate_loot'];
+if(isset($config['lua']['rate_spawn']))
+    $config['lua']['rateSpawn'] = $config['lua']['rate_spawn'];
+
+$house_level = NULL;
+if(isset($config['lua']['levelToBuyHouse']))
+    $house_level = $config['lua']['levelToBuyHouse'];
+else if(isset($config['lua']['house_level']))
+    $house_level = $config['lua']['house_level'];
+
+if(isset($config['lua']['in_fight_duration']))
+    $config['lua']['pzLocked'] = $config['lua']['in_fight_duration'];
+
+$pzLocked = eval('return ' . $config['lua']['pzLocked'] . ';');
+$whiteSkullTime = isset($config['lua']['whiteSkullTime']) ? $config['lua']['whiteSkullTime'] : NULL;
+if(!isset($whiteSkullTime) && isset($config['lua']['unjust_skull_duration']))
+    $whiteSkullTime = $config['lua']['unjust_skull_duration'];
+
+if(isset($whiteSkullTime))
+    $whiteSkullTime = eval('return ' . $whiteSkullTime . ';');
+
+$redSkullLength = isset($config['lua']['redSkullLength']) ? $config['lua']['redSkullLength'] : NULL;
+if(!isset($redSkullLength) && isset($config['lua']['red_skull_duration']))
+    $redSkullLength = $config['lua']['red_skull_duration'];
+
+if(isset($redSkullLength))
+    $redSkullLength = eval('return ' . $redSkullLength . ';');
+
+$blackSkull = false;
+$blackSkullLength = NULL;
+if(isset($config['lua']['useBlackSkull']) && getBoolean($config['lua']['useBlackSkull']))
+{
+    $blackSkullLength = $config['lua']['blackSkullLength'];
+    $blackSkull = true;
+}
+else if(isset($config['lua']['black_skull_duration'])) {
+    $blackSkullLength = eval('return ' . $config['lua']['blackSkullLength'] . ';');
+    $blackSkull = true;
+}
+
+$clientVersion = NULL;
+if(isset($status['online']))
+    $clientVersion = isset($status['clientVersion']) ? $status['clientVersion'] : null;
+
+$twig->display('serverinfo.html.twig', array(
+    'experienceStages' => isset($config['lua']['experienceStages']) && getBoolean($config['lua']['experienceStages']) ? $config['lua']['experienceStages'] : null,
+    'serverIp' => str_replace('/', '', str_replace('http://', '', $config['lua']['url'])),
+    'clientVersion' => $clientVersion,
+    'globalSaveHour' => isset($config['lua']['globalSaveEnabled']) && getBoolean($config['lua']['globalSaveEnabled']) ? $config['lua']['globalSaveHour'] : null,
+    'protectionLevel' => $config['lua']['protectionLevel'],
+    'houseRent' => $rent == 'never' ? 'disabled' : $rent,
+    'houseOld' => isset($cleanOld) ? $cleanOld : null,
+    'rateExp' => $config['lua']['rateExp'],
+    'rateExpFromPlayers' => isset($config['lua']['rateExperienceFromPlayers']) ? $config['lua']['rateExperienceFromPlayers'] : null,
+    'rateMagic' => $config['lua']['rateMagic'],
+    'rateSkill' => $config['lua']['rateSkill'],
+    'rateLoot' => $config['lua']['rateLoot'],
+    'rateSpawn' => $config['lua']['rateSpawn'],
+    'houseLevel' => $house_level,
+    'pzLocked' => $pzLocked,
+    'whiteSkullTime' => $whiteSkullTime,
+    'redSkullLength' => $redSkullLength,
+    'blackSkull' => $blackSkull,
+    'blackSkullLength' => $blackSkullLength,
+    'dailyFragsToRedSkull' => isset($config['lua']['dailyFragsToRedSkull']) ? $config['lua']['dailyFragsToRedSkull'] : (isset($config['lua']['kills_per_day_red_skull']) ? $config['lua']['kills_per_day_red_skull'] : null),
+    'weeklyFragsToRedSkull' => isset($config['lua']['weeklyFragsToRedSkull']) ? $config['lua']['weeklyFragsToRedSkull'] : (isset($config['lua']['kills_per_week_red_skull']) ? $config['lua']['kills_per_week_red_skull'] : null),
+    'monthlyFragsToRedSkull' => isset($config['lua']['monthlyFragsToRedSkull']) ? $config['lua']['monthlyFragsToRedSkull'] : (isset($config['lua']['kills_per_month_red_skull']) ? $config['lua']['kills_per_month_red_skull'] : null),
+    'dailyFragsToBlackSkull' => isset($config['lua']['dailyFragsToBlackSkull']) ? $config['lua']['dailyFragsToBlackSkull'] : (isset($config['lua']['kills_per_day_black_skull']) ? $config['lua']['kills_per_day_black_skull'] : null),
+    'weeklyFragsToBlackSkull' => isset($config['lua']['weeklyFragsToBlackSkull']) ? $config['lua']['weeklyFragsToBlackSkull'] : (isset($config['lua']['kills_per_week_black_skull']) ? $config['lua']['kills_per_week_black_skull'] : null),
+    'monthlyFragsToBlackSkull' => isset($config['lua']['monthlyFragsToBlackSkull']) ? $config['lua']['monthlyFragsToBlackSkull'] : (isset($config['lua']['kills_per_month_black_skull']) ? $config['lua']['kills_per_month_black_skull'] : null),
+    'banishmentLength' => isset($config['lua']['banishment_length']) ? eval('return (' . $config['lua']['banishment_length'] . ') / (24 * 60 * 60);') : null,
+    'finalBanishmentLength' => isset($config['lua']['final_banishment_length']) ? eval('return (' . $config['lua']['final_banishment_length'] . ') / (24 * 60 * 60);') : null,
+    'ipBanishmentLength' => isset($config['lua']['ip_banishment_length']) ? eval('return (' . $config['lua']['ip_banishment_length'] . ') / (24 * 60 * 60);') : null,
+));

system/pages/rules.php

@@ -1,14 +0,0 @@
-<?php
-/**
- * Rules
- *
- * @package   MyAAC
- * @author    Gesior <jerzyskalski@wp.pl>
- * @author    Slawkens <slawkens@gmail.com>
- * @copyright 2019 MyAAC
- * @link      https://my-aac.org
- */
-defined('MYAAC') or die('Direct access not allowed!');
-$title = 'Server Rules';
-
-$twig->display('rules.html.twig');

system/pages/server-info.php

@@ -1,110 +1,3 @@
 <?php
-/**
- * Server info
- *
- * @package   MyAAC
- * @author    Gesior <jerzyskalski@wp.pl>
- * @author    Slawkens <slawkens@gmail.com>
- * @author    whiteblXK
- * @copyright 2019 MyAAC
- * @link      https://my-aac.org
- */
-defined('MYAAC') or die('Direct access not allowed!');
-$title = 'Server info';
 
-if(isset($config['lua']['experience_stages']))
+require 'ots-info.php';
-    $config['lua']['experienceStages'] = $config['lua']['experience_stages'];
-
-if(isset($config['lua']['min_pvp_level']))
-    $config['lua']['protectionLevel'] = $config['lua']['min_pvp_level'];
-
-$rent = trim(strtolower($config['lua']['houseRentPeriod']));
-if($rent != 'yearly' && $rent != 'monthly' && $rent != 'weekly' && $rent != 'daily')
-    $rent = 'never';
-
-if(isset($config['lua']['houseCleanOld']))
-    $cleanOld = (int)(eval('return ' . $config['lua']['houseCleanOld'] . ';') / (24 * 60 * 60));
-
-if(isset($config['lua']['rate_exp']))
-    $config['lua']['rateExp'] = $config['lua']['rate_exp'];
-if(isset($config['lua']['rateExperience']))
-    $config['lua']['rateExp'] = $config['lua']['rateExperience'];
-if(isset($config['lua']['rate_mag']))
-    $config['lua']['rateMagic'] = $config['lua']['rate_mag'];
-if(isset($config['lua']['rate_skill']))
-    $config['lua']['rateSkill'] = $config['lua']['rate_skill'];
-if(isset($config['lua']['rate_loot']))
-    $config['lua']['rateLoot'] = $config['lua']['rate_loot'];
-if(isset($config['lua']['rate_spawn']))
-    $config['lua']['rateSpawn'] = $config['lua']['rate_spawn'];
-
-$house_level = NULL;
-if(isset($config['lua']['levelToBuyHouse']))
-    $house_level = $config['lua']['levelToBuyHouse'];
-else if(isset($config['lua']['house_level']))
-    $house_level = $config['lua']['house_level'];
-
-if(isset($config['lua']['in_fight_duration']))
-    $config['lua']['pzLocked'] = $config['lua']['in_fight_duration'];
-
-$pzLocked = eval('return ' . $config['lua']['pzLocked'] . ';');
-$whiteSkullTime = isset($config['lua']['whiteSkullTime']) ? $config['lua']['whiteSkullTime'] : NULL;
-if(!isset($whiteSkullTime) && isset($config['lua']['unjust_skull_duration']))
-    $whiteSkullTime = $config['lua']['unjust_skull_duration'];
-
-if(isset($whiteSkullTime))
-    $whiteSkullTime = eval('return ' . $whiteSkullTime . ';');
-
-$redSkullLength = isset($config['lua']['redSkullLength']) ? $config['lua']['redSkullLength'] : NULL;
-if(!isset($redSkullLength) && isset($config['lua']['red_skull_duration']))
-    $redSkullLength = $config['lua']['red_skull_duration'];
-
-if(isset($redSkullLength))
-    $redSkullLength = eval('return ' . $redSkullLength . ';');
-
-$blackSkull = false;
-$blackSkullLength = NULL;
-if(isset($config['lua']['useBlackSkull']) && getBoolean($config['lua']['useBlackSkull']))
-{
-    $blackSkullLength = $config['lua']['blackSkullLength'];
-    $blackSkull = true;
-}
-else if(isset($config['lua']['black_skull_duration'])) {
-    $blackSkullLength = eval('return ' . $config['lua']['blackSkullLength'] . ';');
-    $blackSkull = true;
-}
-
-$clientVersion = NULL;
-if(isset($status['online']))
-    $clientVersion = isset($status['clientVersion']) ? $status['clientVersion'] : null;
-
-$twig->display('serverinfo.html.twig', array(
-    'experienceStages' => isset($config['lua']['experienceStages']) && getBoolean($config['lua']['experienceStages']) ? $config['lua']['experienceStages'] : null,
-    'serverIp' => str_replace('/', '', str_replace('http://', '', $config['lua']['url'])),
-    'clientVersion' => $clientVersion,
-    'globalSaveHour' => isset($config['lua']['globalSaveEnabled']) && getBoolean($config['lua']['globalSaveEnabled']) ? $config['lua']['globalSaveHour'] : null,
-    'protectionLevel' => $config['lua']['protectionLevel'],
-    'houseRent' => $rent == 'never' ? 'disabled' : $rent,
-    'houseOld' => isset($cleanOld) ? $cleanOld : null,
-    'rateExp' => $config['lua']['rateExp'],
-    'rateExpFromPlayers' => isset($config['lua']['rateExperienceFromPlayers']) ? $config['lua']['rateExperienceFromPlayers'] : null,
-    'rateMagic' => $config['lua']['rateMagic'],
-    'rateSkill' => $config['lua']['rateSkill'],
-    'rateLoot' => $config['lua']['rateLoot'],
-    'rateSpawn' => $config['lua']['rateSpawn'],
-    'houseLevel' => $house_level,
-    'pzLocked' => $pzLocked,
-    'whiteSkullTime' => $whiteSkullTime,
-    'redSkullLength' => $redSkullLength,
-    'blackSkull' => $blackSkull,
-    'blackSkullLength' => $blackSkullLength,
-    'dailyFragsToRedSkull' => isset($config['lua']['dailyFragsToRedSkull']) ? $config['lua']['dailyFragsToRedSkull'] : (isset($config['lua']['kills_per_day_red_skull']) ? $config['lua']['kills_per_day_red_skull'] : null),
-    'weeklyFragsToRedSkull' => isset($config['lua']['weeklyFragsToRedSkull']) ? $config['lua']['weeklyFragsToRedSkull'] : (isset($config['lua']['kills_per_week_red_skull']) ? $config['lua']['kills_per_week_red_skull'] : null),
-    'monthlyFragsToRedSkull' => isset($config['lua']['monthlyFragsToRedSkull']) ? $config['lua']['monthlyFragsToRedSkull'] : (isset($config['lua']['kills_per_month_red_skull']) ? $config['lua']['kills_per_month_red_skull'] : null),
-    'dailyFragsToBlackSkull' => isset($config['lua']['dailyFragsToBlackSkull']) ? $config['lua']['dailyFragsToBlackSkull'] : (isset($config['lua']['kills_per_day_black_skull']) ? $config['lua']['kills_per_day_black_skull'] : null),
-    'weeklyFragsToBlackSkull' => isset($config['lua']['weeklyFragsToBlackSkull']) ? $config['lua']['weeklyFragsToBlackSkull'] : (isset($config['lua']['kills_per_week_black_skull']) ? $config['lua']['kills_per_week_black_skull'] : null),
-    'monthlyFragsToBlackSkull' => isset($config['lua']['monthlyFragsToBlackSkull']) ? $config['lua']['monthlyFragsToBlackSkull'] : (isset($config['lua']['kills_per_month_black_skull']) ? $config['lua']['kills_per_month_black_skull'] : null),
-    'banishmentLength' => isset($config['lua']['banishment_length']) ? eval('return (' . $config['lua']['banishment_length'] . ') / (24 * 60 * 60);') : null,
-    'finalBanishmentLength' => isset($config['lua']['final_banishment_length']) ? eval('return (' . $config['lua']['final_banishment_length'] . ') / (24 * 60 * 60);') : null,
-    'ipBanishmentLength' => isset($config['lua']['ip_banishment_length']) ? eval('return (' . $config['lua']['ip_banishment_length'] . ') / (24 * 60 * 60);') : null,
-));

system/router.php

@@ -317,6 +317,11 @@ $content .= ob_get_contents();
 ob_end_clean();
 $hooks->trigger(HOOK_AFTER_PAGE);
 
+if (isset($_REQUEST['_page_only'])) {
+	echo $content;
+	die;
+}
+
 if(!isset($title)) {
 	$title = str_replace('index.php/', '', $page);
 	$title = ucfirst($title);

system/settings.php

@@ -1035,8 +1035,8 @@ Sent by MyAAC,<br/>
 		'highscores_cache_ttl' => [
 			'name' => 'Highscores Cache TTL (in minutes)',
 			'type' => 'number',
-			'min' => 1,
+			'min' => 0,
-			'desc' => 'How often to update highscores from database in minutes (default 15 minutes). Too low may cause lags on website.',
+			'desc' => 'How often to update highscores from database in minutes. Too low may slow down your website.<br/>0 to disable.',
 			'default' => 15,
 		],
 		'highscores_vocation_box' => [
@@ -1473,7 +1473,7 @@ Sent by MyAAC,<br/>
 		],
 		'status_timeout' => [
 			'name' => 'Status Timeout',
-			'type' => 'number',
+			'type' => 'double',
 			'min' => 0,
 			'max' => 10, // more than 10 seconds waiting makes no sense
 			'step' => 0.1,

system/src/Hook.php

@@ -37,6 +37,11 @@ class Hook
 		return !isset($ret) || $ret == 1 || $ret;
 	}
 
+	public function executeFilter(&$args) {
+		return include BASE . $this->_file;
+	}
+
 	public function name() {return $this->_name;}
 	public function type() {return $this->_type;}
+	public function file() {return $this->_file;}
 }

system/src/Hooks.php

@@ -4,22 +4,23 @@ namespace MyAAC;
 
 class Hooks
 {
-	private static $_hooks = array();
+	private static array $_hooks = [];
 
-	public function register($hook, $type = '', $file = null) {
+	public function register($hook, $type = '', $file = null): void
+	{
 		if(!($hook instanceof Hook))
 			$hook = new Hook($hook, $type, $file);
 
 		self::$_hooks[$hook->type()][] = $hook;
 	}
 
-	public function trigger($type, $params = array())
+	public function trigger($type, $params = []): bool
 	{
 		$ret = true;
-		if(isset(self::$_hooks[$type]))
+
-		{
+		if(isset(self::$_hooks[$type])) {
 			foreach(self::$_hooks[$type] as $name => $hook) {
-				/** @var $hook Hook */
+				/** @var Hook $hook */
 				if (!$hook->execute($params)) {
 					$ret = false;
 				}
@@ -29,11 +30,21 @@ class Hooks
 		return $ret;
 	}
 
-	public function exist($type) {
+	public function triggerFilter($type, &$args): void
+	{
+		if(isset(self::$_hooks[$type])) {
+			foreach(self::$_hooks[$type] as $hook) {
+				/** @var Hook $hook */
+				$hook->executeFilter($args);
+			}
+		}
+	}
+
+	public function exist($type): bool {
 		return isset(self::$_hooks[$type]);
 	}
 
-	public function load()
+	public function load(): void
 	{
 		foreach(Plugins::getHooks() as $hook) {
 			$this->register($hook['name'], $hook['type'], $hook['file']);

system/src/Models/Account.php

@@ -43,9 +43,6 @@ class Account extends Model {
 			return 0;
 		}
 
-		global $config;
-		if(isset($config['lua']['freePremium']) && getBoolean($config['lua']['freePremium'])) return -1;
-
 		if($this->premdays == 65535){
 			return 65535;
 		}

system/src/Models/Visitor.php

@@ -10,6 +10,6 @@ class Visitor extends Model {
 
 	public $timestamps = false;
 
-	protected $fillable = ['ip', 'lastivist', 'page', 'user_agent'];
+	protected $fillable = ['ip', 'lastvisit', 'page', 'user_agent'];
 
 }

system/src/Plugins.php

@@ -198,6 +198,9 @@ class Plugins {
 			}
 		}
 
+		global $hooks;
+		$hooks->triggerFilter(HOOK_FILTER_ROUTES, $routes);
+
 		usort($routes, function ($a, $b)
 		{
 			// key 3 is priority

system/src/Settings.php

@@ -219,7 +219,7 @@ class Settings implements \ArrayAccess
 					if ($setting['type'] === 'boolean') {
 						$value = ($setting['default'] ? 'true' : 'false');
 					}
-					else if (in_array($setting['type'], ['text', 'number', 'email', 'password', 'textarea'])) {
+					else if (in_array($setting['type'], ['text', 'number', 'float', 'double', 'email', 'password', 'textarea'])) {
 						$value = $setting['default'];
 					}
 					else if ($setting['type'] === 'options') {
@@ -245,7 +245,11 @@ class Settings implements \ArrayAccess
 					$checkbox($key, false, $value);
 				}
 
-				else if (in_array($setting['type'], ['text', 'number', 'email', 'password'])) {
+				else if (in_array($setting['type'], ['text', 'number', 'float', 'double', 'email', 'password'])) {
+					if (in_array($setting['type'], ['float', 'double'])) {
+						$setting['type'] = 'number';
+					}
+
 					if ($setting['type'] === 'number') {
 						$min = (isset($setting['min']) ? ' min="' . $setting['min'] . '"' : '');
 						$max = (isset($setting['max']) ? ' max="' . $setting['max'] . '"' : '');
@@ -351,7 +355,7 @@ class Settings implements \ArrayAccess
 								if ($setting['type'] === 'boolean') {
 									echo ($setting['default'] ? 'Yes' : 'No');
 								}
-								else if (in_array($setting['type'], ['text', 'number', 'email', 'password', 'textarea'])) {
+								else if (in_array($setting['type'], ['text', 'number', 'float', 'double', 'email', 'password', 'textarea'])) {
 									echo $setting['default'];
 								}
 								else if ($setting['type'] === 'options') {
@@ -498,9 +502,12 @@ class Settings implements \ArrayAccess
 					break;
 
 				case 'number':
-					if (!isset($ret['step']) || (int)$ret['step'] == 1) {
+					$ret['value'] = (int)$ret['value'];
-						$ret['value'] = (int)$ret['value'];
+					break;
-					}
+
+				case 'double':
+				case 'float':
+					$ret['value'] = (double)($ret['value']);
 					break;
 
 				default:

system/src/Twig/EnvironmentBridge.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace MyAAC\Twig;
+
+use Twig\Environment;
+
+class EnvironmentBridge extends Environment
+{
+	public function display($name, array $context = []): void
+	{
+		global $hooks;
+
+		$context['viewName'] = $name;
+		$hooks->triggerFilter(HOOK_FILTER_TWIG_DISPLAY, $context);
+
+		parent::display($name, $context);
+	}
+
+	public function render($name, array $context = []): string
+	{
+		global $hooks;
+
+		$context['viewName'] = $name;
+		$hooks->triggerFilter(HOOK_FILTER_TWIG_RENDER, $context);
+
+		return parent::render($name, $context);
+	}
+}

system/src/global.php

@@ -97,6 +97,14 @@ define('HOOK_CACHE_CLEAR', ++$i);
 define('HOOK_INSTALL_FINISH', ++$i);
 define('HOOK_INSTALL_FINISH_END', ++$i);
 
+// hook filters
+define('HOOK_FILTER_HIGHSCORES_LIST', ++$i);
+define('HOOK_FILTER_HIGHSCORES', ++$i);
+define('HOOK_FILTER_ROUTES', ++$i);
+define('HOOK_FILTER_TWIG_DISPLAY', ++$i);
+define('HOOK_FILTER_TWIG_RENDER', ++$i);
+define('HOOK_FILTER_THEME_FOOTER', ++$i);
+
 const HOOK_FIRST = HOOK_INIT;
 define('HOOK_LAST', $i);
 

system/template.php

@@ -136,6 +136,11 @@ if($forumSetting != '')
 $twig->addGlobal('template_name', $template_name);
 $twig->addGlobal('template_path', $template_path);
 if($twig_loader) {
+	$viewsPath = BASE . $template_path . '/views';
+	if (is_dir($viewsPath)) {
+		$twig_loader->prependPath($viewsPath);
+	}
+
 	$twig_loader->prependPath(BASE . $template_path);
 }
 

system/templates/admin.menus.js.html.twig

@@ -4,7 +4,9 @@
 	let colors = [];
 
 	{% for cat, menu in menus %}
-	last_id[{{ cat }}] = {{ last_id[cat] }};
+		{% if config('menu_categories')[cat] is not empty %}
+			last_id[{{ cat }}] = {{ last_id[cat] }};
+		{% endif %}
 	{% endfor %}
 
 	{% set menuDefaultLinksColor = config('menu_default_links_color') %}

system/templates/highscores.html.twig

@@ -9,7 +9,7 @@
 					<td>
 						<label for="skillFilter">Choose a Skill</label>
 						<select onchange="location = this.value;" id="skillFilter">
-							{% for link, name in types %}
+							{% for link, name in categories %}
 								<option value="{{ getLink('highscores') }}/{{ link|urlencode }}{% if vocation is not null %}/{{ vocation|lower|urlencode }}{% endif %}" class="size_xs" {% if list is not null and list == link %}selected{% endif %}>{{ name }}</option>
 							{% endfor %}
 						</select>
@@ -102,7 +102,7 @@
 				</tr>
 				<tr bgcolor="{{ config.lightborder }}">
 					<td>
-						{% for link, name in types %}
+						{% for link, name in categories %}
 							<a href="{{ getLink('highscores') }}/{{ link|urlencode }}{% if vocation is not null %}/{{ vocation|urlencode }}{% endif %}" class="size_xs">{{ name }}</a><br/>
 						{% endfor %}
 					</td>

system/templates/rules.html.twig

@@ -1,2 +0,0 @@
-<b>{{ config.lua.serverName }} Rules</b><br/>
-{{ getCustomPage('rules_on_the_page') | nl2br }}

system/twig.php

@@ -9,8 +9,7 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-use MyAAC\CsrfToken;
+use MyAAC\Twig\EnvironmentBridge as MyAAC_Twig_EnvironmentBridge;
-use Twig\Environment as Twig_Environment;
 use Twig\Extension\DebugExtension as Twig_DebugExtension;
 use Twig\Loader\FilesystemLoader as Twig_FilesystemLoader;
 use Twig\TwigFilter;
@@ -20,7 +19,7 @@ global $twig, $twig_loader;
 
 $dev_mode = (config('env') === 'dev');
 $twig_loader = new Twig_FilesystemLoader(SYSTEM . 'templates');
-$twig = new Twig_Environment($twig_loader, array(
+$twig = new MyAAC_Twig_EnvironmentBridge($twig_loader, array(
 	'cache' => CACHE . 'twig/',
 	'auto_reload' => $dev_mode,
 	'debug' => $dev_mode

templates/kathrine/menus.php

@@ -4,7 +4,7 @@ return [
 	MENU_CATEGORY_NEWS => [
 		'Latest News' => 'news',
 		'News Archive' => 'news/archive',
-		'Changelog' => 'changelog',
+		'Changelog' => 'change-log',
 	],
 	MENU_CATEGORY_ACCOUNT => [
 		'Account Management' => 'account/manage',
@@ -28,7 +28,7 @@ return [
 	MENU_CATEGORY_LIBRARY => [
 		'Monsters' => 'monsters',
 		'Spells' => 'spells',
-		'Server Info' => 'server-info',
+		'Server Info' => 'ots-info',
 		'Commands' => 'commands',
 		'Exp Stages' => 'exp-stages',
 		'Gallery' => 'gallery',

templates/tibiacom/account.login.html.twig

@@ -20,9 +20,9 @@
 		<table class="Table4" cellpadding="0" cellspacing="0" >
 			<tr>
 				<td>
-					<div class="InnerTableContainer" >
+					<div class="InnerTableContainer">
-						<table style="width:100%;" >
+						<table style="width:100%;">
-						<tbody>
+							<tbody>
 							<tr>
 								<td>
 									<div class="TableShadowContainerRightTop" >
@@ -30,7 +30,7 @@
 									</div>
 									<div class="TableContentAndRightShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-rm.gif);" >
 										<div class="TableContentContainer" >
-											<table class="TableContent" width="100%"  style="border:1px solid #faf0d7;" >
+											<table class="TableContent" width="100%" style="border:1px solid #faf0d7;">
 											<tbody>
 												<tr>
 													<td>
@@ -45,7 +45,7 @@
 															{{ hook('HOOK_ACCOUNT_LOGIN_AFTER_ACCOUNT') }}
 															<tr>
 																<td class="LabelV" ><span{% if error is not null %} class="red"{% endif %}>Password:</span></td>
-																<td><input style="width: 100%;"  type="password" name="password_login" size="35" maxlength="29" /></td>
+																<td><input style="width: 100%;" type="password" name="password_login" size="35" maxlength="29" /></td>
 															</tr>
 															{{ hook('HOOK_ACCOUNT_LOGIN_AFTER_PASSWORD') }}
 															<tr>
@@ -67,7 +67,7 @@
 														</div>
 													</td>
 												</tr>
-											</tbody>
+												</tbody>
 											</table>
 										</div>
 									</div>
@@ -79,7 +79,7 @@
 									</div>
 								</td>
 							</tr>
-						</tbody>
+							</tbody>
 						</table>
 					</div>
 				</td>

templates/tibiacom/menus.php

@@ -4,7 +4,7 @@ return [
 	MENU_CATEGORY_NEWS => [
 		'Latest News' => 'news',
 		'News Archive' => 'news/archive',
-		'Changelog' => 'changelog',
+		'Changelog' => 'change-log',
 	],
 	MENU_CATEGORY_ACCOUNT => [
 		'Account Management' => 'account/manage',
@@ -33,7 +33,7 @@ return [
 		'Commands' => 'commands',
 		'Exp Stages' => 'exp-stages',
 		'Gallery' => 'gallery',
-		'Server Info' => 'server-info',
+		'Server Info' => 'ots-info',
 		'Exp Table' => 'exp-table',
 		'FAQ' => 'faq',
 	],

templates/tibiacom/tables.headline.html.twig

@@ -5,7 +5,7 @@
 			<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
 			<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
 			<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-			<div class="Text" >{{ title|raw }}</div>
+			<div class="Text">{{ title|raw }}</div>
 			<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
 			<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
 			<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>