Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-05-03 12:49:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into develop

Browse Source
This commit is contained in:
slawkens 2025-04-26 06:17:38 +02:00
commit 6667c8c364
14 changed files with 239 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.htaccess.dist
View File

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

21
CHANGELOG-1.x.md
View File

@ -1,5 +1,26 @@
# Changelog # 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] ## [1.3.3 - 04.04.2025]
### Fixed ### Fixed

21
README.md
View File

@ -11,12 +11,19 @@ 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) [![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 |
|:--------|:-----------------------|:-------|:---------------| |:--------|:-----------------------|:--------|:---------------|
| **1.x** | **Active development** | master | **PHP >= 8.1** | | 2.x | Experimental features | develop | 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 ### Requirements
- MySQL database - MySQL database
@ -47,23 +54,23 @@ Official website: https://my-aac.org
### Configuration ### Configuration
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). 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).
Use *config.local.php* for your local configuration changes. Use *config.local.php* for your local configuration changes.
### Branches ### Branches
This repository follows the Git Flow Workflow. This repository follows the Git Flow Workflow.
Cheatsheet: [Git-Flow-Cheetsheet](https://danielkummer.github.io/git-flow-cheatsheet) Cheatsheet: [Git-Flow-Cheatsheet](https://danielkummer.github.io/git-flow-cheatsheet)
That means, we use: That means, we use:
* master branch, for current stable release * main branch, for current stable release
* develop branch, for development version (next release) * develop branch, for development version (next release)
* feature branches, for features etc. * feature branches, for features etc.
### Known Problems ### Known Problems
- Some compatibility issues with some exotical distibutions. - Some compatibility issues with some exotic distributions.
### Contributing ### Contributing
@ -77,7 +84,7 @@ Look: [Contributing](https://github.com/otsoft/myaac/wiki/Contributing) in our w
### Other Notes ### Other Notes
If you have a great idea or want contribute to the project - visit our website at https://www.my-aac.org If you have a great idea or want to contribute to the project - visit our website at https://www.my-aac.org
## Project supported by JetBrains ## Project supported by JetBrains

2
admin/pages/plugins.php
View File

@ -17,7 +17,7 @@ csrfProtect();
$use_datatable = true; $use_datatable = true;
if (!getBoolean(setting('core.admin_plugins_manage_enable'))) { if (!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>.'); 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 { else {

3
install/includes/config.php
View File

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

304
install/includes/schema.sql
View File

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

2
login.php
View File

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

2
nginx-sample.conf
View File

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

2
plugins/example.json
View File

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

13
system/libs/pot/OTS_DB_MySQL.php
View File

@ -234,6 +234,19 @@ 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); 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() { public function revalidateCache() {
foreach($this->has_table_cache as $key => $value) { foreach($this->has_table_cache as $key => $value) {
$this->hasTableInternal($key); $this->hasTableInternal($key);

7
system/router.php
View File

@ -89,8 +89,6 @@ if($logged && $account_logged && $account_logged->isLoaded()) {
* Routes loading * Routes loading
*/ */
$dispatcher = FastRoute\cachedDispatcher(function (FastRoute\RouteCollector $r) { $dispatcher = FastRoute\cachedDispatcher(function (FastRoute\RouteCollector $r) {
$routes = require SYSTEM . 'routes.php';
$routesFinal = []; $routesFinal = [];
foreach(getDatabasePages() as $page) { foreach(getDatabasePages() as $page) {
$routesFinal[] = ['*', $page, '__database__/' . $page, 100]; $routesFinal[] = ['*', $page, '__database__/' . $page, 100];
@ -106,8 +104,13 @@ $dispatcher = FastRoute\cachedDispatcher(function (FastRoute\RouteCollector $r)
*/ */
} }
$routes = require SYSTEM . 'routes.php';
foreach ($routes as $route) { foreach ($routes as $route) {
if (!str_contains($route[2], '__redirect__') && !str_contains($route[2], '__database__')) { 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]; $routesFinal[] = [$route[0], $route[1], 'system/pages/' . $route[2], $route[3] ?? 10000];
} }
else { else {

25
system/src/Plugins.php
View File

@ -151,7 +151,8 @@ class Plugins {
$pagesDefaultPriority = $plugin['pages-default-priority']; $pagesDefaultPriority = $plugin['pages-default-priority'];
} }
if (self::getAutoLoadOption($plugin, 'pages', true)) { $autoLoadPages = self::getAutoLoadOption($plugin, 'pages', true);
if ($autoLoadPages) {
// //
// Get all plugins/*/pages/*.php pages // Get all plugins/*/pages/*.php pages
// //
@ -164,7 +165,8 @@ class Plugins {
} }
} }
if (self::getAutoLoadOption($plugin, 'pagesSubFolders', true)) { if ($autoLoadPages && self::getAutoLoadOption($plugin, 'pagesSubFolders', true) &&
self::getAutoLoadOption($plugin, 'pages-sub-folders', true)) {
// //
// Get all plugins/*/pages/subFolder/*.php pages // Get all plugins/*/pages/subFolder/*.php pages
// //
@ -699,6 +701,7 @@ class Plugins {
return false; return false;
} }
clearCache();
return true; return true;
} }
@ -792,27 +795,21 @@ class Plugins {
} }
} }
if($success) { if(!$success) {
$revertEnable();
return false;
}
foreach($plugin_info['uninstall'] as $file) { foreach($plugin_info['uninstall'] as $file) {
if(!deleteDirectory(BASE . $file)) { if(!deleteDirectory(BASE . $file)) {
self::$warnings[] = 'Cannot delete: ' . $file; self::$warnings[] = 'Cannot delete: ' . $file;
} }
} }
$cache = Cache::getInstance(); clearCache();
if($cache->enabled()) {
$cache->delete('templates');
$cache->delete('hooks');
$cache->delete('template_menus');
}
return true; return true;
} }
$revertEnable();
return false;
}
public static function is_installed($plugin_name, $version): bool public static function is_installed($plugin_name, $version): bool
{ {
$filename = BASE . 'plugins/' . $plugin_name . '.json'; $filename = BASE . 'plugins/' . $plugin_name . '.json';

2
system/templates/admin.menus.js.html.twig
View File

@ -4,7 +4,9 @@
let colors = []; let colors = [];
{% for cat, menu in menus %} {% 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 %} {% endfor %}
{% set menuDefaultLinksColor = config('menu_default_links_color') %} {% set menuDefaultLinksColor = config('menu_default_links_color') %}

4
templates/tibiacom/headline.php
View File

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