Merge branch 'develop' into feature/account-actions-ip-rework

.github/workflows/cypress.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: [ '8.1', '8.2', '8.3', '8.4' ]
+        php-versions: [ '8.1', '8.2', '8.3' ]
         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,7 +146,6 @@ 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
@@ -154,7 +153,6 @@ 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', '8.4' ]
+        php-versions: [ '8.1', '8.2', '8.3' ]
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v4"

.htaccess.dist

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

CHANGELOG.md

@@ -1,94 +1,5 @@
 # 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
-* feat: admin-pages (can add admin pages through plugins) (https://github.com/slawkens/myaac/commit/ceaa0639e66d31e8177ff90791463470367aa45d)
-	* just place the page in admin-pages folder in the plugin
-	* Also, possibility to overwrite default myaac admin pages
-* Add db->hasTableAndColumns(table, columns), credits to @opentibiabr Team (https://github.com/slawkens/myaac/commit/82a533d88c8a342076891d132b4b409ed9a1fe72)
-* Add noSubmit option to buttons.base (https://github.com/slawkens/myaac/commit/64f6d3abcada3bf9fd7599f50d2fac0a1367f383)
-
-### Fixed
-* Fix: display 404 error instead of 500 when page has been removed from filesystem (https://github.com/slawkens/myaac/commit/c2bf94fb2370d2009a2eb907f818955132cf8611)
-* Fix headline.php: change image format to .png cause of black background (https://github.com/slawkens/myaac/commit/b618084d50918539d9a70abd97e764137b966067)
-* Clear cache on plugin enable/disable, fixes some issues with plugin pages being cached (https://github.com/slawkens/myaac/commit/1d0c173e7d000aecbd432800941fc3e38a0e50f2)
-* Do not autoload sub-folders if autoload pages is disabled (https://github.com/slawkens/myaac/commit/d47195a7878095336f9c9edc6f96244257f67eec)
-
-### Changed
-* SQL Syntax Standardization (by @JoaozinhoBrasil, #298)
-* Pages in theme/template folder will now have precedence over normal pages (https://github.com/slawkens/myaac/commit/6d8f4718a1d349fba8f0ebc39cfd3a1a84d104b0)
-* Small changes in account.login.html.twig (https://github.com/slawkens/myaac/commit/f40b986b59d4c8fa89ab4745731bf366f8619976)
-* Plugin name is required, version is optional (https://github.com/slawkens/myaac/commit/e6f05a2731c61d931be49e121c068e49c0ad5e01)
-
-## [1.3.3 - 04.04.2025]
-
-### Fixed
-* Fix uninstall plugin when plugin is disabled (https://github.com/slawkens/myaac/commit/6c568fd36a271270684fc412ccd556b230273a6d)
-
-### Changed
-* Display more useful info when error parsing config.lua (https://github.com/slawkens/myaac/commit/fa6b6aa153ffc131e0d1631a4dcd9012a5850c2e)
-
-### Other
-* Small adjustments (https://github.com/slawkens/myaac/commit/35e2483de86e295bdf089cceffa25842eeb2e34c, https://github.com/slawkens/myaac/commit/ae639d65b0bfa491e747e907e2ebc77f83f47981)
-
-## [1.3.2 - 01.04.2025]
-
-### Fixed
-* Fix debugBar/admin panel menu when using custom base_dir (https://github.com/slawkens/myaac/commit/65696f63e3aac02ff952ea81279e7cb2fa7570fb)
-
-### Changed
-* Settings: Show/hide IP Ban Protection options depending on the value (enabled/disabled) (https://github.com/slawkens/myaac/commit/dbf73d0b61b45601ae95e51b23c051c2704169c5)
-* Do not require init.php in cache:clear command (https://github.com/slawkens/myaac/commit/d25c71857f767834239bbffacd00fdc671adb157)
-
-## [1.3.1 - 19.03.2025]
-
-### Fixed
-* Fixed migrate:run command (https://github.com/slawkens/myaac/commit/1a5771ad51e595fe13368a0721b059c4ecefb17d)
-
-### Changed
-* Small adjustments (https://github.com/slawkens/myaac/commit/6fac883659f581baac1361826d046410156f1e58, https://github.com/slawkens/myaac/commit/4a6896b4469968b9904292734cf6c14ba5eeef14)
-
-## [1.3 - 10.03.2025]
-
-### Changed
-* Use latest outfit-images host from @gesior (https://github.com/slawkens/myaac/commit/529bdcf016dd0f9dffbc34d81f99a046a9ddb70d)
-* Change monster link to $_GET ?name= (https://github.com/slawkens/myaac/commit/4c5cc8b573b2b3e7ec00a22b7ede30a68083a924)
-
-### Fixed
-* Fixed house links (https://github.com/slawkens/myaac/commit/887b5068ad11c4cdab614afd34525caba785ce13)
-* Fixed long title on headline.php (https://github.com/slawkens/myaac/commit/3e3f4bb5a514158ec8777684ca6c7f1c2a37bed5)
-* Fixed menu colors once again, plus add !important tag (https://github.com/slawkens/myaac/commit/aa52df6e2ec92cafc25b655ae907bf2e1746d9cc)
-* Fix: add possibility to remove all menu items in admin panel (https://github.com/slawkens/myaac/commit/00fe1adc15ea7646596d755f6e6e1f7854ffc1d5, https://github.com/slawkens/myaac/commit/9239a4f4198c3ad260802ac3b47e9c41b80b754e)
-
 ## [1.2 - 09.02.2025]
 
 ### Added

README.md

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

admin/includes/debugbar.php

@@ -7,7 +7,7 @@ $hooks->register('debugbar_admin_head_end', HOOK_ADMIN_HEAD_END, function ($para
 		return;
 	}
 
-	$debugBarRenderer = $debugBar->getJavascriptRenderer(BASE_URL . 'vendor/maximebf/debugbar/src/DebugBar/Resources/');
+	$debugBarRenderer = $debugBar->getJavascriptRenderer();
 	echo $debugBarRenderer->renderHead();
 });
 $hooks->register('debugbar_admin_body_end', HOOK_ADMIN_BODY_END, function ($params) {
@@ -17,6 +17,6 @@ $hooks->register('debugbar_admin_body_end', HOOK_ADMIN_BODY_END, function ($para
 		return;
 	}
 
-	$debugBarRenderer = $debugBar->getJavascriptRenderer(BASE_URL . 'vendor/maximebf/debugbar/src/DebugBar/Resources/');
+	$debugBarRenderer = $debugBar->getJavascriptRenderer();
 	echo $debugBarRenderer->render();
 });

admin/index.php

@@ -1,8 +1,6 @@
 <?php
 
 // few things we'll need
-use MyAAC\Plugins;
-
 require '../common.php';
 
 const ADMIN_PANEL = true;
@@ -44,21 +42,15 @@ if(!$logged || !admin()) {
 	$page = 'login';
 }
 
-$pluginsAdminPages = Plugins::getAdminPages();
+// include our page
-if(isset($pluginsAdminPages[$page]) && file_exists(BASE . $pluginsAdminPages[$page])) {
+$file = __DIR__ . '/pages/' . $page . '.php';
-	$file = BASE . $pluginsAdminPages[$page];
+if(!@file_exists($file)) {
-}
+	if (str_contains($page, 'plugins/')) {
-else {
+		$file = BASE . $page;
-	// include our page
+	}
-	$file = __DIR__ . '/pages/' . $page . '.php';
+	else {
-	if(!@file_exists($file)) {
+		$page = '404';
-		if (str_contains($page, 'plugins/')) {
+		$file = SYSTEM . 'pages/404.php';
-			$file = BASE . $page;
-		}
-		else {
-			$page = '404';
-			$file = SYSTEM . 'pages/404.php';
-		}
 	}
 }
 

admin/pages/accounts.php

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

admin/pages/menus.php

@@ -27,11 +27,11 @@ $pluginThemes = Plugins::getThemes();
 if (isset($_POST['template'])) {
 	$template = $_POST['template'];
 
-	if (isset($_POST['save'])) {
+	if (isset($_POST['menu'])) {
-		$post_menu = $_POST['menu'] ?? [];
+		$post_menu = $_POST['menu'];
-		$post_menu_link = $_POST['menu_link'] ?? [];
+		$post_menu_link = $_POST['menu_link'];
-		$post_menu_blank = $_POST['menu_blank'] ?? [];
+		$post_menu_blank = $_POST['menu_blank'];
-		$post_menu_color = $_POST['menu_color'] ?? [];
+		$post_menu_color = $_POST['menu_color'];
 		if (count($post_menu) != count($post_menu_link)) {
 			echo 'Menu count is not equal menu links. Something went wrong when sending form.';
 			return;
@@ -135,7 +135,7 @@ if (isset($_POST['template'])) {
 	<form method="post" id="menus-form" action="?p=menus">
 		<?php csrf(); ?>
 		<input type="hidden" name="template" value="<?php echo $template ?>"/>
-		<button type="submit" name="save" class="btn btn-info">Save</button><br/><br/>
+		<button type="submit" class="btn btn-info">Save</button><br/><br/>
 		<div class="row">
 			<?php foreach ($config['menu_categories'] as $id => $cat): ?>
 				<div class="col-md-12 col-lg-6">
@@ -168,7 +168,7 @@ if (isset($_POST['template'])) {
 		</div>
 		<div class="row pb-2">
 			<div class="col-md-12">
-				<button type="submit" name="save" class="btn btn-info">Save</button>
+				<button type="submit" class="btn btn-info">Save</button>
 				<?php
 				echo '<button type="button" class="btn btn-danger float-right" value="Cancel" onclick="window.location = \'' . ADMIN_URL . '?p=menus\';"><i class="fas fa-cancel"></i> Cancel</button>';
 				?>

admin/pages/plugins.php

@@ -17,7 +17,7 @@ csrfProtect();
 
 $use_datatable = true;
 
-if (!setting('core.admin_plugins_manage_enable')) {
+if (!getBoolean(setting('core.admin_plugins_manage_enable'))) {
 	warning('Plugin installation and management is disabled in Settings.<br/>If you wish to enable, go to Settings and enable <strong>Enable Plugins Manage</strong>.');
 }
 else {

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.5';
+const MYAAC_VERSION = '1.2';
-const DATABASE_VERSION = 45;
+const DATABASE_VERSION = 44;
 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') + '/change-log',
+			url: Cypress.env('URL') + '/changelog',
 			method: 'GET',
 		})
 	})
@@ -132,7 +132,7 @@ describe('Check Public Pages', () => {
 
 	it('Go to server info page', () => {
 		cy.visit({
-			url: Cypress.env('URL') + '/ots-info',
+			url: Cypress.env('URL') + '/server-info',
 			method: 'GET',
 		})
 	})

index.php

@@ -31,11 +31,11 @@ require_once 'common.php';
 require_once SYSTEM . 'functions.php';
 
 $uri = $_SERVER['REQUEST_URI'];
-if(str_contains($uri, 'index.php')) {
+if(false !== strpos($uri, 'index.php')) {
 	$uri = str_replace_first('/index.php', '', $uri);
 }
 
-if(str_starts_with($uri, '/')) {
+if(0 === strpos($uri, '/')) {
 	$uri = str_replace_first('/', '', $uri);
 }
 
@@ -168,7 +168,6 @@ 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/config.php

@@ -26,9 +26,6 @@ if(!isset($error) || !$error) {
 		$config['database_type'] = $config['lua']['database_type'];
 	else if(isset($config['lua']['sql_type'])) // otserv
 		$config['database_type'] = $config['lua']['sql_type'];
-	else {
-		$config['database_type'] = '';
-	}
 
 	$config['database_type'] = strtolower($config['database_type']);
 	if(empty($config['database_type'])) {

install/includes/schema.sql

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

install/tools/7-finish.php

@@ -54,13 +54,12 @@ 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();
@@ -79,10 +78,6 @@ $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,25 +86,12 @@ switch ($action) {
 		die(json_encode(['eventlist' => $eventlist, 'lastupdatetimestamp' => time()]));
 
 	case 'boostedcreature':
-		$clientVersion = (int)setting('core.client');
+		$boostedCreature = BoostedCreature::latest();
-
-		// 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':
 

nginx-sample.conf

@@ -1,6 +1,6 @@
 server {
 	listen 80;
-	root /var/www/html;
+	root /home/otserv/www/public;
 	index index.php;
 	server_name your-domain.com;
 
@@ -14,7 +14,7 @@ server {
 
 	# block .htaccess, CHANGELOG.md, composer.json etc.
 	# this is to prevent finding software versions
-	location ~\.(ht|md|json|dist|sql)$ {
+	location ~\.(ht|md|json|dist)$ {
 		deny all;
 	}
 

package-lock.json

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

package.json

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

plugins/example.json

@@ -46,10 +46,8 @@
 	"settings": "plugins/your-plugin-folder/settings.php",
 	"autoload": {
 		"pages": true,
-		"pages-sub-folders": false,
+		"pagesSubFolders": false,
 		"commands": true,
-		"themes": true,
+		"themes": true
-		"admin-pages": true,
-		"admin-pages-sub-folders": true,
 	}
  }

system/clients.conf.php

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

system/compat/base.php

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

system/database.php

@@ -122,10 +122,6 @@ 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,39 +545,33 @@ function template_header($is_admin = false): string
  */
 function template_footer(): string
 {
-	$footer = [];
+	global $views_counter;
-
+	$ret = '';
 	if(admin()) {
-		$footer[] = generateLink(ADMIN_URL, 'Admin Panel', true);
+		$ret .= generateLink(ADMIN_URL, 'Admin Panel', true);
 	}
 
 	if(setting('core.visitors_counter')) {
 		global $visitors;
 		$amount = $visitors->getAmountVisitors();
-		$footer[] = 'Currently there ' . ($amount > 1 ? 'are' : 'is') . ' ' . $amount . ' visitor' . ($amount > 1 ? 's' : '') . '.';
+		$ret .= '<br/>Currently there ' . ($amount > 1 ? 'are' : 'is') . ' ' . $amount . ' visitor' . ($amount > 1 ? 's' : '') . '.';
 	}
 
 	if(setting('core.views_counter')) {
-		global $views_counter;
+		$ret .= '<br/>Page has been viewed ' . $views_counter . ' times.';
-		$footer[] = 'Page has been viewed ' . $views_counter . ' times.';
 	}
 
 	if(setting('core.footer_load_time')) {
-		$footer[] = 'Load time: ' . round(microtime(true) - START_TIME, 4) . ' seconds.';
+		$ret .= '<br/>Load time: ' . round(microtime(true) - START_TIME, 4) . ' seconds.';
 	}
 
 	$settingFooter = setting('core.footer');
 	if(isset($settingFooter[0])) {
-		$footer[] = '' . $settingFooter;
+		$ret .= '<br/>' . $settingFooter;
 	}
 
 	// please respect my work and help spreading the word, thanks!
-	$footer[] = base64_decode('UG93ZXJlZCBieSA8YSBocmVmPSJodHRwOi8vbXktYWFjLm9yZyIgdGFyZ2V0PSJfYmxhbmsiPk15QUFDLjwvYT4=');
+	return $ret . '<br/>' . base64_decode('UG93ZXJlZCBieSA8YSBocmVmPSJodHRwOi8vbXktYWFjLm9yZyIgdGFyZ2V0PSJfYmxhbmsiPk15QUFDLjwvYT4=');
-
-	global $hooks;
-	$hooks->triggerFilter(HOOK_FILTER_THEME_FOOTER, $footer);
-
-	return implode('<br/>', $footer);
 }
 
 function template_ga_code()
@@ -1018,19 +1012,12 @@ function load_config_lua($filename)
 					}
 					else
 					{
-						foreach($result as $tmp_key => $tmp_value) { // load values defined by other keys, like: dailyFragsToBlackSkull = dailyFragsToRedSkull
+						foreach($result as $tmp_key => $tmp_value) // load values defined by other keys, like: dailyFragsToBlackSkull = dailyFragsToRedSkull
 							$value = str_replace($tmp_key, $tmp_value, $value);
-						}
+						$ret = @eval("return $value;");
-
+						if((string) $ret == '' && trim($value) !== '""') // = parser error
-						try {
+						{
-							$ret = eval("return $value;");
+							throw new RuntimeException('ERROR: Loading config.lua file. Line <b>' . ($ln + 1) . '</b> of LUA config file is not valid [key: <b>' . $key . '</b>]');
-						}
-						catch (Throwable $e) {
-							throw new RuntimeException('ERROR: Loading config.lua file. Line: ' . ($ln + 1) . ' - Unable to parse value "' . $value . '" - ' . $e->getMessage());
-						}
-
-						if((string) $ret == '' && trim($value) !== '""') {
-							throw new RuntimeException('ERROR: Loading config.lua file. Line ' . ($ln + 1) . ' is not valid [key: ' . $key . ']');
 						}
 						$result[$key] = $ret;
 					}
@@ -1578,6 +1565,22 @@ 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/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

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

system/libs/pot/OTS_DB_MySQL.php

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

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 = [];
+		$look = array();
 
 		$element = $this->documentElement->getElementsByTagName('look')->item(0);
 
@@ -292,30 +292,14 @@ class OTS_Monster extends DOMDocument
 			return $look;
 		}
 
-		if ($element->hasAttribute('typeex')) {
+		$look['type'] = $element->getAttribute('type');
-			$look['typeEx'] = (int) $element->getAttribute('typeex');
+		$look['typeex'] = $element->getAttribute('typeex');
-		}
+		$look['head'] = $element->getAttribute('head');
-		if ($element->hasAttribute('type')) {
+		$look['body'] = $element->getAttribute('body');
-			$look['type'] = (int) $element->getAttribute('type');
+		$look['legs'] = $element->getAttribute('legs');
-		}
+		$look['feet'] = $element->getAttribute('feet');
-		if ($element->hasAttribute('head')) {
+		$look['addons'] = $element->getAttribute('addons');
-			$look['head'] = (int) $element->getAttribute('head');
+		$look['corpse'] = $element->getAttribute('corpse');
-		}
-		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,13 +10,8 @@ $up = function () use ($db) {
 		$db->exec(file_get_contents(__DIR__ . '/17-menu.sql'));
 	}
 
-	$themes = ['kathrine', 'tibiacom',];
+	Plugins::installMenus('kathrine', require TEMPLATES . 'kathrine/menus.php');
-	foreach ($themes as $theme) {
+	Plugins::installMenus('tibiacom', require TEMPLATES . 'tibiacom/menus.php');
-		$file = TEMPLATES . $theme . '/menus.php';
-		if (is_file($file)) {
-			Plugins::installMenus($theme, require $file);
-		}
-	}
 };
 
 $down = function () use ($db) {

system/migrations/44.php

@@ -1,20 +1,27 @@
 <?php
+/**
+ * @var OTS_DB_MySQL $db
+ */
 
-// 2025-05-14
+// 2025-02-27
-// update pages links
+// remove ipv6, change to ip (for both ipv4 + ipv6) as VARCHAR(45)
-// server-info conflicts with apache2 mod
+$up = function () use ($db) {
-// Changelog conflicts with changelog files
+	$db->query("ALTER TABLE `myaac_account_actions` DROP KEY `account_id`;");
+	$db->query("ALTER TABLE  `myaac_account_actions` ADD COLUMN `id` INT(11) NOT NULL AUTO_INCREMENT FIRST, ADD PRIMARY KEY (`id`);");
 
-use MyAAC\Models\Menu;
+	$db->modifyColumn(TABLE_PREFIX . 'account_actions', 'ip', "VARCHAR(45) NOT NULL DEFAULT ''");
-use MyAAC\Models\Pages;
+	$db->query("UPDATE `" . TABLE_PREFIX . "account_actions` SET `ip` = INET_NTOA(`ip`) WHERE `ip` != '0';");
-
+	$db->query("UPDATE `" . TABLE_PREFIX . "account_actions` SET `ip` = INET6_NTOA(`ipv6`) WHERE `ip` = '0';");
-$up = function() {
+	$db->dropColumn(TABLE_PREFIX . 'account_actions', 'ipv6');
-	Menu::where('link', 'server-info')->update(['link' => 'ots-info']);
-	Menu::where('link', 'changelog')->update(['link' => 'change-log']);
 };
 
-$down = function() {
+$down = function () use ($db) {
-	Menu::where('link', 'ots-info')->update(['link' => 'server-info']);
+	$db->query("ALTER TABLE `" . TABLE_PREFIX . "account_actions` DROP `id`;");
-	Menu::where('link', 'change-log')->update(['link' => 'changelog']);
+	$db->query("ALTER TABLE  `" . TABLE_PREFIX . "account_actions` ADD KEY (`account_id`);");
-};
 
+	$db->addColumn(TABLE_PREFIX . 'account_actions', 'ipv6', "BINARY(16) NOT NULL DEFAULT 0x00000000000000000000000000000000 AFTER ip");
+	$db->query("UPDATE `" . TABLE_PREFIX . "account_actions` SET `ipv6` = INET6_ATON(ip) WHERE NOT IS_IPV4(`ip`);");
+	$db->query("UPDATE `" . TABLE_PREFIX . "account_actions` SET `ip` = INET_ATON(`ip`) WHERE IS_IPV4(`ip`);");
+	$db->query("UPDATE `" . TABLE_PREFIX . "account_actions` SET `ip` = 0 WHERE `ipv6` != 0x00000000000000000000000000000000;");
+	$db->modifyColumn(TABLE_PREFIX . 'account_actions', 'ip', "INT(11) UNSIGNED NOT NULL DEFAULT 0;");
+};

system/migrations/45.php

@@ -1,32 +0,0 @@
-<?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/manage.php

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

system/pages/change-log.php

@@ -1,46 +0,0 @@
-<?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,3 +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';
 
-require 'change-log.php';
+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/highscores.php

@@ -18,11 +18,8 @@ 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;
@@ -143,7 +140,7 @@ $needReCache = true;
 $cacheKey = 'highscores_' . $skill . '_' . $vocation . '_' . $page . '_' . $configHighscoresPerPage;
 
 $cache = Cache::getInstance();
-if ($cache->enabled() && $highscoresTTL > 0) {
+if ($cache->enabled()) {
 	$tmp = '';
 	if ($cache->fetch($cacheKey, $tmp)) {
 		$highscores = unserialize($tmp);
@@ -217,8 +214,8 @@ if (empty($highscores)) {
 	})->toArray();
 }
 
-if ($highscoresTTL > 0 && $cache->enabled() && $needReCache) {
+if ($cache->enabled() && $needReCache) {
-	$cache->set($cacheKey, serialize($highscores), $highscoresTTL * 60);
+	$cache->set($cacheKey, serialize($highscores), setting('core.highscores_cache_ttl') * 60);
 }
 
 $show_link_to_next_page = false;
@@ -281,10 +278,6 @@ if(setting('core.highscores_frags')) {
 if(setting('core.highscores_balance'))
 	$types['balance'] = 'Balance';
 
-if ($highscoresTTL > 0 && $cache->enabled()) {
-	echo '<small>*Note: Highscores are updated every' . ($highscoresTTL > 1 ? ' ' . $highscoresTTL : '') . ' minute' . ($highscoresTTL > 1 ? 's' : '') . '.</small><br/><br/>';
-}
-
 /** @var Twig\Environment $twig */
 $twig->display('highscores.html.twig', [
 	'highscores' => $highscores,

system/pages/monsters.php

@@ -16,22 +16,18 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Monsters';
 
 if (empty($_REQUEST['name'])) {
-	$preview = setting('core.monsters_images_preview');
-
 	// display list of monsters
-	$monsters = MyAAC\Cache::remember('monsters', 30 * 60, function () use ($preview) {
+	$preview = setting('core.monsters_images_preview');
-		$monsters = Monster::where('hide', '!=', 1)->when(!empty($_REQUEST['boss']), function ($query) {
+	$monsters = Monster::where('hide', '!=', 1)->when(!empty($_REQUEST['boss']), function ($query) {
-			$query->where('rewardboss', 1);
+		$query->where('rewardboss', 1);
-		})->get()->toArray();
+	})->get()->toArray();
 
-		if ($preview) {
+	if ($preview) {
-			foreach($monsters as &$monster) {
+		foreach($monsters as $key => &$monster)
-				$monster['img_link'] = getMonsterImage($monster);
+		{
-			}
+			$monster['img_link'] = getMonsterImgPath($monster['name']);
 		}
-
+	}
-		return $monsters;
-	});
 
 	$twig->display('monsters.html.twig', array(
 		'monsters' => $monsters,
@@ -49,7 +45,7 @@ if ($monsterModel && isset($monsterModel->name)) {
 	/** @var array $monster */
 	$monster = $monsterModel->toArray();
 
-	function sort_by_chance($a, $b): int
+	function sort_by_chance($a, $b)
 	{
 		if ($a['chance'] == $b['chance']) {
 			return 0;
@@ -59,7 +55,7 @@ if ($monsterModel && isset($monsterModel->name)) {
 
 	$title = $monster['name'] . " - Monsters";
 
-	$monster['img_link']= getMonsterImage($monster);
+	$monster['img_link']= getMonsterImgPath($monster_name);
 
 	$voices = json_decode($monster['voices'], true);
 	$summons = json_decode($monster['summons'], true);
@@ -93,39 +89,3 @@ 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

@@ -1,110 +0,0 @@
-<?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/polls.php

@@ -100,7 +100,7 @@ function getColorByPercent($percent)
 
 	if(!$logged)
 	{
-		echo  'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . BASE_URL . urlencode('?subtopic=polls') . '">Log in</a> to vote in polls.<br /><br />';
+		echo  'You are not logged in. <a href="?subtopic=accountmanagement&redirect=' . BASE_URL . urlencode('?subtopic=polls') . '">Log in</a> to vote in polls.<br /><br />';
 		return;
 	}
 

system/pages/rules.php

@@ -0,0 +1,14 @@
+<?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,3 +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';
 
-require 'ots-info.php';
+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/router.php

@@ -89,6 +89,8 @@ if($logged && $account_logged && $account_logged->isLoaded()) {
  * Routes loading
  */
 $dispatcher = FastRoute\cachedDispatcher(function (FastRoute\RouteCollector $r) {
+	$routes = require SYSTEM . 'routes.php';
+
 	$routesFinal = [];
 	foreach(getDatabasePages() as $page) {
 		$routesFinal[] = ['*', $page, '__database__/' . $page, 100];
@@ -104,13 +106,8 @@ $dispatcher = FastRoute\cachedDispatcher(function (FastRoute\RouteCollector $r)
 */
 	}
 
-	$routes = require SYSTEM . 'routes.php';
 	foreach ($routes as $route) {
 		if (!str_contains($route[2], '__redirect__') && !str_contains($route[2], '__database__')) {
-			if (!is_file(BASE . 'system/pages/' . $route[2])) {
-				continue;
-			}
-
 			$routesFinal[] = [$route[0], $route[1], 'system/pages/' . $route[2], $route[3] ?? 10000];
 		}
 		else {
@@ -317,11 +314,6 @@ $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);
@@ -351,16 +343,16 @@ function getDatabasePages($withHidden = false): array
 
 function loadPageFromFileSystem($page, &$found): string
 {
-	// feature: load pages from templates/ dir
+	$file = SYSTEM . 'pages/' . $page . '.php';
-	global $template_path;
-	$file = $template_path . '/pages/' . $page . '.php';
 	if (!is_file($file)) {
-		$file = SYSTEM . 'pages/' . $page . '.php';
+		// feature: convert camelCase to snake_case
+		// so instead of forum/move_thread
+		// we can write: forum/moveThread
+		$file = SYSTEM . 'pages/' . camelCaseToUnderscore($page) . '.php';
 		if (!is_file($file)) {
-			// feature: convert camelCase to snake_case
+			// feature: load pages from templates/ dir
-			// so instead of forum/move_thread
+			global $template_path;
-			// we can write: forum/moveThread
+			$file = $template_path . '/pages/' . $page . '.php';
-			$file = SYSTEM . 'pages/' . camelCaseToUnderscore($page) . '.php';
 			if (!is_file($file)) {
 				$found = false;
 			}

system/settings.php

@@ -1035,8 +1035,8 @@ Sent by MyAAC,<br/>
 		'highscores_cache_ttl' => [
 			'name' => 'Highscores Cache TTL (in minutes)',
 			'type' => 'number',
-			'min' => 0,
+			'min' => 1,
-			'desc' => 'How often to update highscores from database in minutes. Too low may slow down your website.<br/>0 to disable.',
+			'desc' => 'How often to update highscores from database in minutes (default 15 minutes). Too low may cause lags on website.',
 			'default' => 15,
 		],
 		'highscores_vocation_box' => [
@@ -1473,7 +1473,7 @@ Sent by MyAAC,<br/>
 		],
 		'status_timeout' => [
 			'name' => 'Status Timeout',
-			'type' => 'double',
+			'type' => 'number',
 			'min' => 0,
 			'max' => 10, // more than 10 seconds waiting makes no sense
 			'step' => 0.1,
@@ -1622,20 +1622,14 @@ Sent by MyAAC,<br/>
 			'name' => 'Login Attempts Limit',
 			'type' => 'number',
 			'desc' => 'Number of incorrect login attempts before banning the IP',
-			'default' => 5,
+			'default' => 5, // Ajuste conforme necessário
-			'show_if' => [
-				'account_login_ipban_protection', '=', 'true'
-			]
 		],
 
 		'account_login_ban_time' => [
 			'name' => 'Ban Time (Minutes)',
 			'type' => 'number',
 			'desc' => 'Time in minutes the IP will be banned after exceeding login attempts',
-			'default' => 30,
+			'default' => 30, // Ajuste conforme necessário
-			'show_if' => [
-				'account_login_ipban_protection', '=', 'true'
-			]
 		],
 	],
 	'callbacks' => [

system/src/Commands/CacheClearCommand.php

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

system/src/Commands/MigrateRunCommand.php

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

system/src/Hook.php

@@ -37,11 +37,6 @@ 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,23 +4,22 @@ namespace MyAAC;
 
 class Hooks
 {
-	private static array $_hooks = [];
+	private static $_hooks = array();
 
-	public function register($hook, $type = '', $file = null): void
+	public function register($hook, $type = '', $file = null) {
-	{
 		if(!($hook instanceof Hook))
 			$hook = new Hook($hook, $type, $file);
 
 		self::$_hooks[$hook->type()][] = $hook;
 	}
 
-	public function trigger($type, $params = []): bool
+	public function trigger($type, $params = array())
 	{
 		$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;
 				}
@@ -30,21 +29,11 @@ class Hooks
 		return $ret;
 	}
 
-	public function triggerFilter($type, &$args): void
+	public function exist($type) {
-	{
-		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(): void
+	public function load()
 	{
 		foreach(Plugins::getHooks() as $hook) {
 			$this->register($hook['name'], $hook['type'], $hook['file']);

system/src/Models/Account.php

@@ -43,6 +43,9 @@ 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/AccountAction.php

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

system/src/Models/Visitor.php

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

system/src/Plugins.php

@@ -11,81 +11,6 @@ class Plugins {
 	private static $error = null;
 	private static $plugin_json = [];
 
-	public static function getAdminPages()
-	{
-		return Cache::remember('plugins_admin_pages', 10 * 60, function () {
-			$adminPages = [];
-			foreach(self::getAllPluginsJson() as $plugin) {
-				if (!self::getAutoLoadOption($plugin, 'admin-pages', true)) {
-					continue;
-				}
-
-				$adminPagesDefaultPriority = 1000;
-				if (isset($plugin['admin-pages-default-priority'])) {
-					$adminPagesDefaultPriority = $plugin['admin-pages-default-priority'];
-				}
-
-				//
-				// Get all plugins/*/admin-pages/*.php pages
-				//
-				$pluginAdminPages = glob(PLUGINS . $plugin['filename'] . '/admin-pages/*.php');
-				foreach ($pluginAdminPages as $file) {
-					$file = str_replace(PLUGINS, 'plugins/', $file);
-					$name = pathinfo($file, PATHINFO_FILENAME);
-
-					$adminPages[] = ['name' => $name, 'file' => $file, 'priority' => $adminPagesDefaultPriority];
-				}
-
-				if (self::getAutoLoadOption($plugin, 'admin-pages-sub-folders', true)) {
-					//
-					// Get all plugins/*/admin-pages/subFolder/*.php pages
-					//
-					$pluginAdminPagesSubFolders = glob(PLUGINS . $plugin['filename'] . '/admin-pages/*', GLOB_ONLYDIR);
-					foreach ($pluginAdminPagesSubFolders as $folder) {
-						$folderName = pathinfo($folder, PATHINFO_FILENAME);
-
-						$subFiles = glob(PLUGINS . $plugin['filename'] . '/admin-pages/' . $folderName . '/*.php');
-						foreach ($subFiles as $file) {
-							$file = str_replace(PLUGINS, 'plugins/', $file);
-							$name = $folderName . '/' . pathinfo($file, PATHINFO_FILENAME);
-
-							$adminPages[] = ['name' => $name, 'file' => $file, 'priority' => $adminPagesDefaultPriority];
-						}
-
-						$subFolders = glob(PLUGINS . $plugin['filename'] . '/admin-pages/' . $folderName . '/*', GLOB_ONLYDIR);
-						foreach ($subFolders as $subFolder) {
-							$subFolderName = pathinfo($subFolder, PATHINFO_FILENAME);
-							$subSubFiles = glob(PLUGINS . $plugin['filename'] . '/admin-pages/' . $folderName . '/' . $subFolderName . '/*.php');
-
-							foreach ($subSubFiles as $subSubFile) {
-								$subSubFile = str_replace(PLUGINS, 'plugins/', $subSubFile);
-								$name = $folderName . '/' . $subFolderName . '/' . pathinfo($subSubFile, PATHINFO_FILENAME);
-
-								$adminPages[] =  ['name' => $name, 'file' => $subSubFile, 'priority' => $adminPagesDefaultPriority];;
-							}
-						}
-					}
-				}
-			}
-
-			usort($adminPages, function ($a, $b)
-			{
-				if ($a['priority'] == $b['priority']) {
-					return 0;
-				}
-
-				return ($a['priority'] > $b['priority']) ? -1 : 1;
-			});
-
-			$ret = [];
-			foreach ($adminPages as $value) {
-				$ret[$value['name']] = $value['file'];
-			}
-
-			return $ret;
-		});
-	}
-
 	public static function getRoutes()
 	{
 		$cache = Cache::getInstance();
@@ -151,8 +76,7 @@ class Plugins {
 				$pagesDefaultPriority = $plugin['pages-default-priority'];
 			}
 
-			$autoLoadPages = self::getAutoLoadOption($plugin, 'pages', true);
+			if (self::getAutoLoadOption($plugin, 'pages', true)) {
-			if ($autoLoadPages) {
 				//
 				// Get all plugins/*/pages/*.php pages
 				//
@@ -165,8 +89,7 @@ class Plugins {
 				}
 			}
 
-			if ($autoLoadPages && self::getAutoLoadOption($plugin, 'pagesSubFolders', true) &&
+			if (self::getAutoLoadOption($plugin, 'pagesSubFolders', true)) {
-				self::getAutoLoadOption($plugin, 'pages-sub-folders', true)) {
 				//
 				// Get all plugins/*/pages/subFolder/*.php pages
 				//
@@ -198,9 +121,6 @@ class Plugins {
 			}
 		}
 
-		global $hooks;
-		$hooks->triggerFilter(HOOK_FILTER_ROUTES, $routes);
-
 		usort($routes, function ($a, $b)
 		{
 			// key 3 is priority
@@ -491,13 +411,20 @@ class Plugins {
 			$continue = true;
 
 			if(!isset($plugin_json['name']) || empty(trim($plugin_json['name']))) {
-				self::$error = 'Plugin "name" tag is not set.';
+				self::$warnings[] = 'Plugin "name" tag is not set.';
-				return false;
+			}
+			if(!isset($plugin_json['description']) || empty(trim($plugin_json['description']))) {
+				self::$warnings[] = 'Plugin "description" tag is not set.';
 			}
-
 			if(!isset($plugin_json['version']) || empty(trim($plugin_json['version']))) {
 				self::$warnings[] = 'Plugin "version" tag is not set.';
 			}
+			if(!isset($plugin_json['author']) || empty(trim($plugin_json['author']))) {
+				self::$warnings[] = 'Plugin "author" tag is not set.';
+			}
+			if(!isset($plugin_json['contact']) || empty(trim($plugin_json['contact']))) {
+				self::$warnings[] = 'Plugin "contact" tag is not set.';
+			}
 
 			if(isset($plugin_json['require'])) {
 				$require = $plugin_json['require'];
@@ -704,7 +631,6 @@ class Plugins {
 			return false;
 		}
 
-		clearCache();
 		return true;
 	}
 
@@ -749,41 +675,26 @@ class Plugins {
 
 	public static function uninstall($plugin_name): bool
 	{
-		$isDisabled = self::existDisabled($plugin_name);
-		if($isDisabled) {
-			self::enable($plugin_name);
-		}
-
-		$revertEnable = function() use ($isDisabled, $plugin_name) {
-			if($isDisabled) {
-				self::disable($plugin_name);
-			}
-		};
-
 		$filename = BASE . 'plugins/' . $plugin_name . '.json';
 		if(!file_exists($filename)) {
 			self::$error = 'Plugin ' . $plugin_name . ' does not exist.';
-			$revertEnable();
 			return false;
 		}
-
 		$string = file_get_contents($filename);
 		$plugin_info = json_decode($string, true);
 		if(!$plugin_info) {
 			self::$error = 'Cannot load plugin info ' . $plugin_name . '.json';
-			$revertEnable();
 			return false;
 		}
 
 		if(!isset($plugin_info['uninstall'])) {
 			self::$error = "Plugin doesn't have uninstall options defined. Skipping...";
-			$revertEnable();
 			return false;
 		}
 
 		$success = true;
 		foreach($plugin_info['uninstall'] as $file) {
-			if(str_starts_with($file, '/')) {
+			if(strpos($file, '/') === 0) {
 				$success = false;
 				self::$error = "You cannot use absolute paths (starting with slash - '/'): " . $file;
 				break;
@@ -798,19 +709,24 @@ class Plugins {
 			}
 		}
 
-		if(!$success) {
+		if($success) {
-			$revertEnable();
+			foreach($plugin_info['uninstall'] as $file) {
-			return false;
+				if(!deleteDirectory(BASE . $file)) {
-		}
+					self::$warnings[] = 'Cannot delete: ' . $file;
-
+				}
-		foreach($plugin_info['uninstall'] as $file) {
-			if(!deleteDirectory(BASE . $file)) {
-				self::$warnings[] = 'Cannot delete: ' . $file;
 			}
+
+			$cache = Cache::getInstance();
+			if($cache->enabled()) {
+				$cache->delete('templates');
+				$cache->delete('hooks');
+				$cache->delete('template_menus');
+			}
+
+			return true;
 		}
 
-		clearCache();
+		return false;
-		return true;
 	}
 
 	public static function is_installed($plugin_name, $version): bool

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

system/src/Twig/EnvironmentBridge.php

@@ -1,28 +0,0 @@
-<?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,12 +97,6 @@ define('HOOK_CACHE_CLEAR', ++$i);
 define('HOOK_INSTALL_FINISH', ++$i);
 define('HOOK_INSTALL_FINISH_END', ++$i);
 
-// hook filters
-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,11 +136,6 @@ 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,9 +4,7 @@
 	let colors = [];
 
 	{% for cat, menu in menus %}
-		{% if config('menu_categories')[cat] is not empty %}
+	last_id[{{ cat }}] = {{ last_id[cat] }};
-			last_id[{{ cat }}] = {{ last_id[cat] }};
-		{% endif %}
 	{% endfor %}
 
 	{% set menuDefaultLinksColor = config('menu_default_links_color') %}

system/templates/buttons.base.html.twig

@@ -1 +1 @@
-<input {% if noSubmit is not defined %}type="submit"{% endif %} name="{{ button_name }}" value="{{ button_name }}" />
+<input type="submit" name="{{ button_name }}" value="{{ button_name }}" />

system/templates/guilds.list.html.twig

@@ -114,7 +114,7 @@
 						{% else %}
 						<b>Before you can create a guild you must login.</b>
 						<br/>
-						<form action="{{ getLink('account/manage') }}?redirect={{ getLink('guilds') }}" method="post">
+						<form action="?subtopic=accountmanagement&redirect={{ getLink('guilds') }}" method="post">
 							{{ csrf() }}
 							{% include('buttons.login.html.twig') %}
 						</form>

system/templates/guilds.view.html.twig

@@ -215,7 +215,7 @@
 													<tbody>
 													<tr>
 														{% if not logged %}
-															<form action="{{ getLink('account/manage') }}?redirect={{ getGuildLink(guild_name|url_encode, false) }}" method="post">
+															<form action="?subtopic=accountmanagement&redirect={{ getGuildLink(guild_name|url_encode, false) }}" method="post">
 																{{ csrf() }}
 																<td>
 																	{{ include('buttons.login.html.twig') }}

system/templates/rules.html.twig

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

system/twig.php

@@ -9,7 +9,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-use MyAAC\Twig\EnvironmentBridge as MyAAC_Twig_EnvironmentBridge;
+use MyAAC\CsrfToken;
+use Twig\Environment as Twig_Environment;
 use Twig\Extension\DebugExtension as Twig_DebugExtension;
 use Twig\Loader\FilesystemLoader as Twig_FilesystemLoader;
 use Twig\TwigFilter;
@@ -19,7 +20,7 @@ global $twig, $twig_loader;
 
 $dev_mode = (config('env') === 'dev');
 $twig_loader = new Twig_FilesystemLoader(SYSTEM . 'templates');
-$twig = new MyAAC_Twig_EnvironmentBridge($twig_loader, array(
+$twig = new Twig_Environment($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' => 'change-log',
+		'Changelog' => 'changelog',
 	],
 	MENU_CATEGORY_ACCOUNT => [
 		'Account Management' => 'account/manage',
@@ -28,7 +28,7 @@ return [
 	MENU_CATEGORY_LIBRARY => [
 		'Monsters' => 'monsters',
 		'Spells' => 'spells',
-		'Server Info' => 'ots-info',
+		'Server Info' => 'server-info',
 		'Commands' => 'commands',
 		'Exp Stages' => 'exp-stages',
 		'Gallery' => 'gallery',

templates/tibiacom/account.login.html.twig

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

templates/tibiacom/basic.css

@@ -36,12 +36,6 @@ img {
   width: expression(document.body.clientWidth > 1200? "1200px": "100%" );
 }
 
-#LoginFormButtonCell {
-  width: 145px;
-  vertical-align: top;
-  padding-right: 10px;
-}
-
 #ContentRow {
   position: relative;
   top: 155px;

templates/tibiacom/buttons.base.html.twig

@@ -13,7 +13,7 @@
 	<div class="BigButton" style="background-image:url({{ template_path }}/images/global/buttons/{{ tmp_image }}.gif)">
 		<div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);">
 			<div class="BigButtonOver" style="background-image:url({{ template_path }}/images/global/buttons/{{ tmp_image }}_over.gif);" ></div>
-			<input class="BigButtonText" {% if noSubmit is not defined %}type="submit"{% endif %} value="{{ button_name }}">
+			<input class="BigButtonText" type="submit" value="{{ button_name }}">
 		</div>
 	</div>
 {% endapply %}

templates/tibiacom/buttons.logout.html.twig

@@ -1,3 +1,3 @@
 {% set button_name = 'Logout' %}
-{% set button_color = 'red' %}
+{% set button_image = '_sbutton_logout' %}
 {% include('buttons.base.html.twig') %}

templates/tibiacom/config.php

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

templates/tibiacom/headline.php

@@ -17,7 +17,7 @@ $font = getenv('GDFONTPATH') . DIRECTORY_SEPARATOR . 'martel.ttf';
 imagettftext($image, 18, 0, 4, 20, imagecolorallocate($image, 240, 209, 164), $font, $text);
 
 // header mime type
-header('Content-type: image/png');
+header('Content-type: image/gif');
 
 // output image to browser
-imagepng($image);
+imagegif($image);

templates/tibiacom/menus.php

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