.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-1.x.md

@@ -1,26 +1,5 @@
 # Changelog
 
-## [1.4 - 22.04.2025]
-
-### Added
-* feat: admin-pages (can add admin pages through plugins) (https://github.com/slawkens/myaac/commit/ceaa0639e66d31e8177ff90791463470367aa45d)
-	* just place the page in admin-pages folder in the plugin
-	* Also, possibility to overwrite default myaac admin pages
-* Add db->hasTableAndColumns(table, columns), credits to @opentibiabr Team (https://github.com/slawkens/myaac/commit/82a533d88c8a342076891d132b4b409ed9a1fe72)
-* Add noSubmit option to buttons.base (https://github.com/slawkens/myaac/commit/64f6d3abcada3bf9fd7599f50d2fac0a1367f383)
-
-### Fixed
-* Fix: display 404 error instead of 500 when page has been removed from filesystem (https://github.com/slawkens/myaac/commit/c2bf94fb2370d2009a2eb907f818955132cf8611)
-* Fix headline.php: change image format to .png cause of black background (https://github.com/slawkens/myaac/commit/b618084d50918539d9a70abd97e764137b966067)
-* Clear cache on plugin enable/disable, fixes some issues with plugin pages being cached (https://github.com/slawkens/myaac/commit/1d0c173e7d000aecbd432800941fc3e38a0e50f2)
-* Do not autoload sub-folders if autoload pages is disabled (https://github.com/slawkens/myaac/commit/d47195a7878095336f9c9edc6f96244257f67eec)
-
-### Changed
-* SQL Syntax Standardization (by @JoaozinhoBrasil, #298)
-* Pages in theme/template folder will now have precedence over normal pages (https://github.com/slawkens/myaac/commit/6d8f4718a1d349fba8f0ebc39cfd3a1a84d104b0)
-* Small changes in account.login.html.twig (https://github.com/slawkens/myaac/commit/f40b986b59d4c8fa89ab4745731bf366f8619976)
-* Plugin name is required, version is optional (https://github.com/slawkens/myaac/commit/e6f05a2731c61d931be49e121c068e49c0ad5e01)
-
 ## [1.3.3 - 04.04.2025]
 
 ### Fixed

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
 
@@ -11,19 +11,12 @@ Official website: https://my-aac.org
 [![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   |
-|:--------|:-----------------------|:--------|:---------------|
+|:--------|:-----------------------|:-------|:---------------|
-| 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.8.x   | Active support         | 0.8    | PHP >= 7.2.5   |
 | 0.7.x   | End Of Life            | 0.7    | PHP >= 5.3.3   |
 
-The recommended version to install is 1.x, which can be found at releases page - [https://github.com/slawkens/myaac/releases](https://github.com/slawkens/myaac/releases).
-
-### Documentation
-* [docs.my-aac.org](https://docs.my-aac.org)
-* [my-aac.org - FAQ](https://my-aac.org/faqs/)
-
 ### Requirements
 
 	- MySQL database
@@ -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/index.php

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

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,7 +26,7 @@
 if (version_compare(phpversion(), '8.1', '<')) die('PHP version 8.1 or higher is required.');
 
 const MYAAC = true;
-const MYAAC_VERSION = '1.4.1-dev';
+const MYAAC_VERSION = '1.3.3';
 const DATABASE_VERSION = 43;
 const TABLE_PREFIX = 'myaac_';
 define('START_TIME', microtime(true));

index.php

@@ -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

@@ -2,34 +2,34 @@ SET @myaac_database_version = 43;
 
 CREATE TABLE `myaac_account_actions`
 (
-	`account_id` int NOT NULL,
+	`account_id` INT(11) NOT NULL,
-	`ip` int unsigned NOT NULL DEFAULT 0,
+	`ip` INT(10) UNSIGNED NOT NULL DEFAULT 0,
-	`ipv6` binary(16) NOT NULL DEFAULT 0,
+	`ipv6` BINARY(16) NOT NULL DEFAULT 0,
-	`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`)
 ) 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;

login.php

@@ -86,7 +86,7 @@ switch ($action) {
 		die(json_encode(['eventlist' => $eventlist, 'lastupdatetimestamp' => time()]));
 
 	case 'boostedcreature':
-		$boostedCreature = BoostedCreature::first();
+		$boostedCreature = BoostedCreature::latest();
 		die(json_encode([
 			'boostedcreature' => true,
 			'raceid' => $boostedCreature->raceid

nginx-sample.conf

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

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/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/functions.php

@@ -1572,6 +1572,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_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_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/pages/monsters.php

@@ -16,23 +16,19 @@ 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) {
 		$query->where('rewardboss', 1);
 	})->get()->toArray();
 
 	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,
 		'preview' => $preview
@@ -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/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
-	global $template_path;
-	$file = $template_path . '/pages/' . $page . '.php';
-	if (!is_file($file)) {
 	$file = SYSTEM . 'pages/' . $page . '.php';
 	if (!is_file($file)) {
 		// feature: convert camelCase to snake_case
 		// so instead of forum/move_thread
 		// we can write: forum/moveThread
 		$file = SYSTEM . 'pages/' . camelCaseToUnderscore($page) . '.php';
+		if (!is_file($file)) {
+			// feature: load pages from templates/ dir
+			global $template_path;
+			$file = $template_path . '/pages/' . $page . '.php';
 			if (!is_file($file)) {
 				$found = false;
 			}

system/settings.php

@@ -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,

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
 				//
@@ -488,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'];
@@ -701,7 +631,6 @@ class Plugins {
 			return false;
 		}
 
-		clearCache();
 		return true;
 	}
 
@@ -795,21 +724,27 @@ class Plugins {
 			}
 		}
 
-		if(!$success) {
+		if($success) {
-			$revertEnable();
-			return false;
-		}
-
 			foreach($plugin_info['uninstall'] as $file) {
 				if(!deleteDirectory(BASE . $file)) {
 					self::$warnings[] = 'Cannot delete: ' . $file;
 				}
 			}
 
-		clearCache();
+			$cache = Cache::getInstance();
+			if($cache->enabled()) {
+				$cache->delete('templates');
+				$cache->delete('hooks');
+				$cache->delete('template_menus');
+			}
+
 			return true;
 		}
 
+		$revertEnable();
+		return false;
+	}
+
 	public static function is_installed($plugin_name, $version): bool
 	{
 		$filename = BASE . 'plugins/' . $plugin_name . '.json';

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':
+					if (!isset($ret['step']) || (int)$ret['step'] == 1) {
 						$ret['value'] = (int)$ret['value'];
-					break;
+					}
-
-				case 'double':
-				case 'float':
-					$ret['value'] = (double)($ret['value']);
 					break;
 
 				default:

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] }};
-		{% 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 }}" />

templates/tibiacom/account.login.html.twig

@@ -4,25 +4,24 @@
 		<input type="hidden" name="redirect" value="{{ redirect }}" />
 	{% endif %}
 	<div class="TableContainer" >
+		<table class="Table4" cellpadding="0" cellspacing="0" >
 			<div class="CaptionContainer" >
 				<div class="CaptionInnerContainer" >
-				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/global/content/box-frame-edge.gif);" ></span>
+					<span class="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="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>
+					<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="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="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>
+					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/global/content/box-frame-edge.gif);" /></span>
 				</div>
 			</div>
-		<table class="Table4" cellpadding="0" cellspacing="0" >
 			<tr>
 				<td>
 					<div class="InnerTableContainer" >
 						<table style="width:100%;" >
-						<tbody>
 							<tr>
 								<td>
 									<div class="TableShadowContainerRightTop" >
@@ -31,21 +30,20 @@
 									<div class="TableContentAndRightShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-rm.gif);" >
 										<div class="TableContentContainer" >
 											<table class="TableContent" width="100%"  style="border:1px solid #faf0d7;" >
-											<tbody>
 												<tr>
 													<td>
-														<table style="float: left; width: 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') }}
-															</a>
+																</form>
 															</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" >
+	<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="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="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>
+				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/global/content/box-frame-vertical.gif);" /></span>
 				<div class="Text" >New Player</div>
-			<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/global/content/box-frame-vertical.gif);"></span>
+				<span class="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="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>
+				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/global/content/box-frame-edge.gif);" /></span>
 			</div>
 		</div>
-	<table class="Table3" cellpadding="0" cellspacing="0" >
-	<tbody>
 		<tr>
 			<td>
 				<div class="InnerTableContainer" >
 					<table style="width:100%;" >
-					<tbody>
 						<tr>
 							<td>
 								<div class="TableShadowContainerRightTop" >
@@ -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);