From eebfc600cbff38248667b97cf76696bf5761ffa5 Mon Sep 17 00:00:00 2001 From: slawkens Date: Tue, 18 Nov 2025 00:15:32 +0100 Subject: [PATCH 01/45] Detect "deletion" column in guilds show --- system/pages/guilds/show.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/system/pages/guilds/show.php b/system/pages/guilds/show.php index 99ac6599..527f29d7 100644 --- a/system/pages/guilds/show.php +++ b/system/pages/guilds/show.php @@ -91,13 +91,18 @@ $guild_owner = $guild->getOwner(); if($guild_owner->isLoaded()) $guild_owner_name = $guild_owner->getName(); +$deletedColumn = 'deleted'; +if ($db->hasColumn('players', 'deletion')) { + $deletedColumn = 'deletion'; +} + $guild_members = array(); foreach($rank_list as $rank) { if($db->hasTable(GUILD_MEMBERS_TABLE)) - $players_with_rank = $db->query('SELECT `players`.`id` as `id`, `' . GUILD_MEMBERS_TABLE . '`.`rank_id` as `rank_id` FROM `players`, `' . GUILD_MEMBERS_TABLE . '` WHERE `' . GUILD_MEMBERS_TABLE . '`.`rank_id` = ' . $rank->getId() . ' AND `players`.`id` = `' . GUILD_MEMBERS_TABLE . '`.`player_id` ORDER BY `name`;'); + $players_with_rank = $db->query('SELECT `players`.`id` as `id`, `' . GUILD_MEMBERS_TABLE . '`.`rank_id` as `rank_id` FROM `players`, `' . GUILD_MEMBERS_TABLE . '` WHERE `' . GUILD_MEMBERS_TABLE . '`.`rank_id` = ' . $rank->getId() . ' AND `players`.`id` = `' . GUILD_MEMBERS_TABLE . '`.`player_id` AND `' . $deletedColumn . '` = 0 ORDER BY `name`;'); else if($db->hasColumn('players', 'rank_id')) - $players_with_rank = $db->query('SELECT `id`, `rank_id` FROM `players` WHERE `rank_id` = ' . $rank->getId() . ' AND `deleted` = 0;'); + $players_with_rank = $db->query('SELECT `id`, `rank_id` FROM `players` WHERE `rank_id` = ' . $rank->getId() . ' AND `' . $deletedColumn . '` = 0;'); $players_with_rank_number = $players_with_rank->rowCount(); if($players_with_rank_number > 0) From 6775a061bebc9ff449522f0173556d4a7a44fa5e Mon Sep 17 00:00:00 2001 From: slawkens Date: Tue, 18 Nov 2025 00:15:32 +0100 Subject: [PATCH 02/45] Detect "deletion" column in guilds show --- system/pages/guilds/show.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/system/pages/guilds/show.php b/system/pages/guilds/show.php index 99ac6599..527f29d7 100644 --- a/system/pages/guilds/show.php +++ b/system/pages/guilds/show.php @@ -91,13 +91,18 @@ $guild_owner = $guild->getOwner(); if($guild_owner->isLoaded()) $guild_owner_name = $guild_owner->getName(); +$deletedColumn = 'deleted'; +if ($db->hasColumn('players', 'deletion')) { + $deletedColumn = 'deletion'; +} + $guild_members = array(); foreach($rank_list as $rank) { if($db->hasTable(GUILD_MEMBERS_TABLE)) - $players_with_rank = $db->query('SELECT `players`.`id` as `id`, `' . GUILD_MEMBERS_TABLE . '`.`rank_id` as `rank_id` FROM `players`, `' . GUILD_MEMBERS_TABLE . '` WHERE `' . GUILD_MEMBERS_TABLE . '`.`rank_id` = ' . $rank->getId() . ' AND `players`.`id` = `' . GUILD_MEMBERS_TABLE . '`.`player_id` ORDER BY `name`;'); + $players_with_rank = $db->query('SELECT `players`.`id` as `id`, `' . GUILD_MEMBERS_TABLE . '`.`rank_id` as `rank_id` FROM `players`, `' . GUILD_MEMBERS_TABLE . '` WHERE `' . GUILD_MEMBERS_TABLE . '`.`rank_id` = ' . $rank->getId() . ' AND `players`.`id` = `' . GUILD_MEMBERS_TABLE . '`.`player_id` AND `' . $deletedColumn . '` = 0 ORDER BY `name`;'); else if($db->hasColumn('players', 'rank_id')) - $players_with_rank = $db->query('SELECT `id`, `rank_id` FROM `players` WHERE `rank_id` = ' . $rank->getId() . ' AND `deleted` = 0;'); + $players_with_rank = $db->query('SELECT `id`, `rank_id` FROM `players` WHERE `rank_id` = ' . $rank->getId() . ' AND `' . $deletedColumn . '` = 0;'); $players_with_rank_number = $players_with_rank->rowCount(); if($players_with_rank_number > 0) From 603d860b56bc7418db09e206f40aa06d0682c00e Mon Sep 17 00:00:00 2001 From: slawkens Date: Tue, 18 Nov 2025 09:56:07 +0100 Subject: [PATCH 03/45] Detect "deletion" column in guilds delete --- system/functions.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/system/functions.php b/system/functions.php index ca7989ed..f11fa382 100644 --- a/system/functions.php +++ b/system/functions.php @@ -433,16 +433,22 @@ function delete_guild($id) $rank_list->orderBy('level'); global $db; + + $deletedColumn = 'deleted'; + if ($db->hasColumn('players', 'deletion')) { + $deletedColumn = 'deletion'; + } + /** * @var OTS_GuildRank $rank_in_guild */ foreach($rank_list as $rank_in_guild) { if($db->hasTable('guild_members')) - $players_with_rank = $db->query('SELECT `players`.`id` as `id`, `guild_members`.`rank_id` as `rank_id` FROM `players`, `guild_members` WHERE `guild_members`.`rank_id` = ' . $rank_in_guild->getId() . ' AND `players`.`id` = `guild_members`.`player_id` ORDER BY `name`;'); + $players_with_rank = $db->query('SELECT `players`.`id` as `id`, `guild_members`.`rank_id` as `rank_id` FROM `players`, `guild_members` WHERE `guild_members`.`rank_id` = ' . $rank_in_guild->getId() . ' AND `players`.`id` = `guild_members`.`player_id` AND `' . $deletedColumn . '` = 0 ORDER BY `name`;'); else if($db->hasTable('guild_membership')) - $players_with_rank = $db->query('SELECT `players`.`id` as `id`, `guild_membership`.`rank_id` as `rank_id` FROM `players`, `guild_membership` WHERE `guild_membership`.`rank_id` = ' . $rank_in_guild->getId() . ' AND `players`.`id` = `guild_membership`.`player_id` ORDER BY `name`;'); + $players_with_rank = $db->query('SELECT `players`.`id` as `id`, `guild_membership`.`rank_id` as `rank_id` FROM `players`, `guild_membership` WHERE `guild_membership`.`rank_id` = ' . $rank_in_guild->getId() . ' AND `players`.`id` = `guild_membership`.`player_id` AND `' . $deletedColumn . '` = 0 ORDER BY `name`;'); else - $players_with_rank = $db->query('SELECT `id`, `rank_id` FROM `players` WHERE `rank_id` = ' . $rank_in_guild->getId() . ' AND `deleted` = 0;'); + $players_with_rank = $db->query('SELECT `id`, `rank_id` FROM `players` WHERE `rank_id` = ' . $rank_in_guild->getId() . ' AND `' . $deletedColumn . '` = 0;'); $players_with_rank_number = $players_with_rank->rowCount(); if($players_with_rank_number > 0) { From 1d21f4d682b28ab5d5073bd664ab2a3c85bac01a Mon Sep 17 00:00:00 2001 From: slawkens Date: Tue, 18 Nov 2025 12:24:22 +0100 Subject: [PATCH 04/45] Update create.php --- system/pages/guilds/create.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/pages/guilds/create.php b/system/pages/guilds/create.php index 08bc8817..47ae690b 100644 --- a/system/pages/guilds/create.php +++ b/system/pages/guilds/create.php @@ -22,7 +22,7 @@ if(!$logged) { } $configLuaFreePremium = configLua('freePremium'); -$freePremium = (isset($configLuaFreePremium) && getBoolean($configLuaFreePremium)) || ($logged && $account_logged->getPremDays() == OTS_Account::GRATIS_PREMIUM_DAYS); +$freePremium = (isset($configLuaFreePremium) && getBoolean($configLuaFreePremium)); $array_of_player_nig = array(); if(empty($errors)) From 9c327336d3a2f60fdcdd8e284afbb6c65ec94ab0 Mon Sep 17 00:00:00 2001 From: slawkens Date: Fri, 21 Nov 2025 14:51:28 +0100 Subject: [PATCH 05/45] Release v1.8.5 --- CHANGELOG-1.x.md | 16 ++++++++++++++++ common.php | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG-1.x.md b/CHANGELOG-1.x.md index b8c57ce7..0d3777f8 100644 --- a/CHANGELOG-1.x.md +++ b/CHANGELOG-1.x.md @@ -1,5 +1,21 @@ # Changelog +## [1.8.5 - 21.11.2025] + +### Added +* New Setting: Account Countries Most Popular (https://github.com/slawkens/myaac/commit/946364f59d7cd01472877108ab27ec78fb28307a) + +### Changed +* Status: Write to status-error.log if there is connection error (https://github.com/slawkens/myaac/commit/780d4ccef741c1dd45a00bfc121fba9f1a175313) +* Settings: escapeHtml in values (support for html code) (https://github.com/slawkens/myaac/commit/5861efdbe900ccd35309913af0c0a5f3d4cdc1a8) +* News Page: Don't display hidden news for admin - it's confusing (https://github.com/slawkens/myaac/commit/175e97828b9a08ec3080cc8d3fb4eb3f1c08649f) +* Plugins System: Add plugin:remove + plugin:delete as alias for plugin:uninstall + plugin:activate/deactivate (https://github.com/slawkens/myaac/commit/6367054487368c92741bfd1dc7c70c52aea9ee87, https://github.com/slawkens/myaac/commit/baec6c9ebf5c342b3b2f7123427c6ba21dbb93bc) + +### Fixed +* Status: Fix $status['uptimeReadable'], was totally wrong (https://github.com/slawkens/myaac/commit/0a6d44bf21417562491aabc93543a2bc3a44b2df) +* Guilds: Detect "deletion" column in guilds show/delete (https://github.com/slawkens/myaac/commit/6775a061bebc9ff449522f0173556d4a7a44fa5e, https://github.com/slawkens/myaac/commit/603d860b56bc7418db09e206f40aa06d0682c00e) +* General: Ensure some cache folders & index.html exists (https://github.com/slawkens/myaac/commit/730a0f29124811f525207c24c06eb0d088fa3434) + ## [1.8.4 - 27.10.2025] ### Changed diff --git a/common.php b/common.php index 48945038..0049595d 100644 --- a/common.php +++ b/common.php @@ -26,7 +26,7 @@ if (version_compare(phpversion(), '8.1', '<')) die('PHP version 8.1 or higher is required.'); const MYAAC = true; -const MYAAC_VERSION = '1.8.5-dev'; +const MYAAC_VERSION = '1.8.5'; const DATABASE_VERSION = 46; const TABLE_PREFIX = 'myaac_'; define('START_TIME', microtime(true)); From ae5df2b7044d3a7ad9d715c45f09a64749258eff Mon Sep 17 00:00:00 2001 From: slawkens Date: Fri, 21 Nov 2025 18:08:30 +0100 Subject: [PATCH 06/45] Start v1.8.6-dev --- common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.php b/common.php index 0049595d..de7a9bfd 100644 --- a/common.php +++ b/common.php @@ -26,7 +26,7 @@ if (version_compare(phpversion(), '8.1', '<')) die('PHP version 8.1 or higher is required.'); const MYAAC = true; -const MYAAC_VERSION = '1.8.5'; +const MYAAC_VERSION = '1.8.6-dev'; const DATABASE_VERSION = 46; const TABLE_PREFIX = 'myaac_'; define('START_TIME', microtime(true)); From 8e6749c59984631288e8e9803819b2f0ff389761 Mon Sep 17 00:00:00 2001 From: slawkens Date: Mon, 24 Nov 2025 18:04:09 +0100 Subject: [PATCH 07/45] Hook for adding custom rules to validate new character name --- system/src/Validator.php | 10 ++++++++++ system/src/global.php | 1 + 2 files changed, 11 insertions(+) diff --git a/system/src/Validator.php b/system/src/Validator.php index ad9e3e50..7261454e 100644 --- a/system/src/Validator.php +++ b/system/src/Validator.php @@ -342,6 +342,16 @@ class Validator } } + global $hooks; + + $params = ['name' => $name, 'error' => '']; + $hooks->triggerFilter(HOOK_FILTER_VALIDATE_CHARACTER_NEW_NAME, $params); + + if (!empty($params['error'])) { + self::$lastError = $params['error']; + return false; + } + return true; } diff --git a/system/src/global.php b/system/src/global.php index 85f9476d..a140bdde 100644 --- a/system/src/global.php +++ b/system/src/global.php @@ -108,6 +108,7 @@ define('HOOK_FILTER_ROUTES', ++$i); define('HOOK_FILTER_TWIG_DISPLAY', ++$i); define('HOOK_FILTER_TWIG_RENDER', ++$i); define('HOOK_FILTER_THEME_FOOTER', ++$i); +define('HOOK_FILTER_VALIDATE_CHARACTER_NEW_NAME', ++$i); const HOOK_FIRST = HOOK_INIT; define('HOOK_LAST', $i); From 3011b969a45e4e3149adbfccc0209c0fe3fd5eae Mon Sep 17 00:00:00 2001 From: slawkens Date: Sun, 30 Nov 2025 17:05:14 +0100 Subject: [PATCH 08/45] Add php 8.5 to cypress workflow --- .github/workflows/cypress.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index e93257f1..4dd8e9dd 100644 --- a/.github/workflows/cypress.yml +++ b/.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', '8.4', '8.5' ] 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: From fd74f01291d0e9cdb92ee1b95021c9d7b591ad7c Mon Sep 17 00:00:00 2001 From: slawkens Date: Tue, 9 Dec 2025 22:04:21 +0100 Subject: [PATCH 09/45] Fix typo $up -> $down, migration was failing due that --- system/migrations/7.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/migrations/7.php b/system/migrations/7.php index a96ed7c9..5a6a7925 100644 --- a/system/migrations/7.php +++ b/system/migrations/7.php @@ -9,7 +9,7 @@ $up = function () use ($db) { } }; -$up = function () use ($db) { +$down = function () use ($db) { if (!$db->hasColumn(TABLE_PREFIX . 'screenshots', 'name')) { $db->addColumn(TABLE_PREFIX . 'screenshots', 'name', 'VARCHAR(30) NOT NULL'); } From c86257e6dacbad773aa09c0958eeaa106a967f2d Mon Sep 17 00:00:00 2001 From: slawkens Date: Sat, 13 Dec 2025 21:19:00 +0100 Subject: [PATCH 10/45] Highscores: Fix ordering by different skills Adjust order by desc: skill_tries, manaspent, experience --- system/pages/highscores.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/system/pages/highscores.php b/system/pages/highscores.php index cec95d15..79d4feee 100644 --- a/system/pages/highscores.php +++ b/system/pages/highscores.php @@ -176,7 +176,9 @@ if (empty($highscores)) { POT::SKILL_FISH => 'skill_fishing', ); - $query->addSelect($skill_ids[$skill] . ' as value'); + $query + ->addSelect($skill_ids[$skill] . ' as value') + ->orderByDesc($skill_ids[$skill] . '_tries'); } else { $query ->join('player_skills', 'player_skills.player_id', '=', 'players.id') @@ -198,11 +200,11 @@ if (empty($highscores)) { if ($skill == POT::SKILL__MAGLEVEL) { $query ->addSelect('players.maglevel as value', 'players.maglevel') - ->orderBy('manaspent'); + ->orderByDesc('manaspent'); } else { // level $query ->addSelect('players.level as value', 'players.experience') - ->orderBy('experience'); + ->orderByDesc('experience'); $list = 'experience'; } } From 18a1178e4b93607a350259679e0366cb83fb4126 Mon Sep 17 00:00:00 2001 From: slawkens Date: Sun, 14 Dec 2025 10:20:59 +0100 Subject: [PATCH 11/45] Fix exception show on first install, when there is no vendor Before it displayed 500 white page, now it display the exception --- common.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/common.php b/common.php index de7a9bfd..fdfd35bd 100644 --- a/common.php +++ b/common.php @@ -148,16 +148,16 @@ if(!IS_CLI) { /** @var array $config */ ini_set('log_errors', 1); -if(@$config['env'] === 'dev' || defined('MYAAC_INSTALL')) { - ini_set('display_errors', 1); - ini_set('display_startup_errors', 1); - error_reporting(E_ALL); -} -else { +if(isset($config['env']) && $config['env'] !== 'dev' && !defined('MYAAC_INSTALL')) { ini_set('display_errors', 0); ini_set('display_startup_errors', 0); error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT); } +else { + ini_set('display_errors', 1); + ini_set('display_startup_errors', 1); + error_reporting(E_ALL); +} $autoloadFile = VENDOR . 'autoload.php'; if (!is_file($autoloadFile)) { From 9ed06782e67772826d927ad847a077b99df5060d Mon Sep 17 00:00:00 2001 From: slawkens Date: Sun, 14 Dec 2025 10:21:23 +0100 Subject: [PATCH 12/45] Ini set html_errors = 0, to show html code in exceptions --- common.php | 1 + 1 file changed, 1 insertion(+) diff --git a/common.php b/common.php index fdfd35bd..c93cce36 100644 --- a/common.php +++ b/common.php @@ -154,6 +154,7 @@ if(isset($config['env']) && $config['env'] !== 'dev' && !defined('MYAAC_INSTALL' error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT); } else { + ini_set('html_errors', 0); ini_set('display_errors', 1); ini_set('display_startup_errors', 1); error_reporting(E_ALL); From 6ba00eea96a8f64ac91f50f7469ba4f30ce16be3 Mon Sep 17 00:00:00 2001 From: slawkens Date: Sun, 14 Dec 2025 12:38:25 +0100 Subject: [PATCH 13/45] Release v1.8.6 --- CHANGELOG-1.x.md | 13 +++++++++++++ common.php | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG-1.x.md b/CHANGELOG-1.x.md index 0d3777f8..4318d1a8 100644 --- a/CHANGELOG-1.x.md +++ b/CHANGELOG-1.x.md @@ -1,5 +1,18 @@ # Changelog +## [1.8.6 - 14.12.2025] + +### Added +* Added hook for adding custom rules to validate new character name (https://github.com/slawkens/myaac/commit/8e6749c59984631288e8e9803819b2f0ff389761) + +### Fixed +* Highscores: Fix ordering by different skills (Adjust order by desc: skill_tries, manaspent, experience) - More exact results (https://github.com/slawkens/myaac/commit/c86257e6dacbad773aa09c0958eeaa106a967f2d) +* Fix exception show on first install, when there is no vendor - Before it displayed 500 white page, now it display the exception (https://github.com/slawkens/myaac/commit/18a1178e4b93607a350259679e0366cb83fb4126) +* Fix typo $up -> $down, in migration nr 7, was failing due that (https://github.com/slawkens/myaac/commit/fd74f01291d0e9cdb92ee1b95021c9d7b591ad7c) + +### Changed +* Ini set html_errors = 0, to show html code in exceptions (https://github.com/slawkens/myaac/commit/9ed06782e67772826d927ad847a077b99df5060d) + ## [1.8.5 - 21.11.2025] ### Added diff --git a/common.php b/common.php index c93cce36..e9d4293f 100644 --- a/common.php +++ b/common.php @@ -26,7 +26,7 @@ if (version_compare(phpversion(), '8.1', '<')) die('PHP version 8.1 or higher is required.'); const MYAAC = true; -const MYAAC_VERSION = '1.8.6-dev'; +const MYAAC_VERSION = '1.8.6'; const DATABASE_VERSION = 46; const TABLE_PREFIX = 'myaac_'; define('START_TIME', microtime(true)); From 497959fd306f422cfaa663984b009cfac3d40d4e Mon Sep 17 00:00:00 2001 From: slawkens Date: Sun, 14 Dec 2025 13:18:08 +0100 Subject: [PATCH 14/45] Update CHANGELOG-1.x.md --- CHANGELOG-1.x.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG-1.x.md b/CHANGELOG-1.x.md index 4318d1a8..d443fcd8 100644 --- a/CHANGELOG-1.x.md +++ b/CHANGELOG-1.x.md @@ -7,7 +7,7 @@ ### Fixed * Highscores: Fix ordering by different skills (Adjust order by desc: skill_tries, manaspent, experience) - More exact results (https://github.com/slawkens/myaac/commit/c86257e6dacbad773aa09c0958eeaa106a967f2d) -* Fix exception show on first install, when there is no vendor - Before it displayed 500 white page, now it display the exception (https://github.com/slawkens/myaac/commit/18a1178e4b93607a350259679e0366cb83fb4126) +* Fix exception shown on first install, when there is no vendor - Before it displayed 500 white page, now it display the exception (https://github.com/slawkens/myaac/commit/18a1178e4b93607a350259679e0366cb83fb4126) * Fix typo $up -> $down, in migration nr 7, was failing due that (https://github.com/slawkens/myaac/commit/fd74f01291d0e9cdb92ee1b95021c9d7b591ad7c) ### Changed From 78a3535b6ac7fcd8c7c84600a2116440c6c2712b Mon Sep 17 00:00:00 2001 From: slawkens Date: Sun, 14 Dec 2025 13:27:06 +0100 Subject: [PATCH 15/45] Start v1.8.7-dev --- common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.php b/common.php index e9d4293f..67422498 100644 --- a/common.php +++ b/common.php @@ -26,7 +26,7 @@ if (version_compare(phpversion(), '8.1', '<')) die('PHP version 8.1 or higher is required.'); const MYAAC = true; -const MYAAC_VERSION = '1.8.6'; +const MYAAC_VERSION = '1.8.7-dev'; const DATABASE_VERSION = 46; const TABLE_PREFIX = 'myaac_'; define('START_TIME', microtime(true)); From 11cb1cf97e74f3bccf59360e1efb800a426b3d43 Mon Sep 17 00:00:00 2001 From: slawkens Date: Thu, 18 Dec 2025 11:53:06 +0100 Subject: [PATCH 16/45] Save db cache only if it has changed --- system/libs/pot/OTS_DB_MySQL.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/system/libs/pot/OTS_DB_MySQL.php b/system/libs/pot/OTS_DB_MySQL.php index 24ee99dc..f4468ed6 100644 --- a/system/libs/pot/OTS_DB_MySQL.php +++ b/system/libs/pot/OTS_DB_MySQL.php @@ -26,6 +26,7 @@ use MyAAC\Cache\Cache; */ class OTS_DB_MySQL extends OTS_Base_DB { + private bool $hasCacheChanged = false; private array $has_table_cache = []; private array $has_column_cache = []; private array $get_column_info_cache = []; @@ -164,7 +165,7 @@ class OTS_DB_MySQL extends OTS_Base_DB $cache->delete('database_columns_info'); $cache->delete('database_checksum'); } - else { + else if ($this->hasCacheChanged) { $cache->set('database_tables', serialize($this->has_table_cache), 3600); $cache->set('database_columns', serialize($this->has_column_cache), 3600); $cache->set('database_columns_info', serialize($this->get_column_info_cache), 3600); @@ -228,6 +229,8 @@ class OTS_DB_MySQL extends OTS_Base_DB private function hasTableInternal($name): bool { + $this->hasCacheChanged = true; + return ($this->has_table_cache[$name] = $this->query('SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `TABLE_SCHEMA` = ' . $this->quote(config('database_name')) . ' AND `TABLE_NAME` = ' . $this->quote($name) . ' LIMIT 1;')->rowCount() > 0); } @@ -241,6 +244,8 @@ class OTS_DB_MySQL extends OTS_Base_DB } private function hasColumnInternal($table, $column): bool { + $this->hasCacheChanged = true; + return $this->hasTable($table) && ($this->has_column_cache[$table . '.' . $column] = count($this->query('SHOW COLUMNS FROM `' . $table . "` LIKE " . $this->quote($column))->fetchAll()) > 0); } @@ -272,6 +277,8 @@ class OTS_DB_MySQL extends OTS_Base_DB return false; } + $this->hasCacheChanged = true; + $formatResult = function ($result) { return [ 'field' => $result['Field'], From 96b8e00f4999f8b4c4c97b54b97d91c6fd7df298 Mon Sep 17 00:00:00 2001 From: slawkens Date: Thu, 18 Dec 2025 14:22:42 +0100 Subject: [PATCH 17/45] Refactor PHP cache to store expiration and improve typing Cache entries now store both the value and expiration timestamp in the file, allowing for more reliable expiration checks. Method signatures have been updated with type hints. --- system/src/Cache/PHP.php | 53 +++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/system/src/Cache/PHP.php b/system/src/Cache/PHP.php index 0b13db07..9b21552b 100644 --- a/system/src/Cache/PHP.php +++ b/system/src/Cache/PHP.php @@ -12,39 +12,40 @@ namespace MyAAC\Cache; class PHP { - private $prefix; - private $dir; - private $enabled; + private string $prefix; + private string $dir; + private bool $enabled; public function __construct($prefix = '', $dir = '') { $this->prefix = $prefix; $this->dir = $dir; - $this->enabled = (file_exists($this->dir) && is_dir($this->dir) && is_writable($this->dir)); - } - - public function set($key, $var, $ttl = 0) - { - $var = var_export($var, true); ensureFolderExists($this->dir); ensureIndexExists($this->dir); - // Write to temp file first to ensure atomicity - $tmp = $this->dir . "tmp_$key." . uniqid('', true) . '.tmp'; - file_put_contents($tmp, 'enabled = (file_exists($this->dir) && is_dir($this->dir) && is_writable($this->dir)); + } - $file = $this->_name($key); - rename($tmp, $file); + public function set($key, $var, $ttl = 0): void + { + $var = var_export($var, true); if ($ttl === 0) { $ttl = 365 * 24 * 60 * 60; // 365 days } - touch($file, time() + $ttl); + $expires = time() + $ttl; + + // Write to temp file first to ensure atomicity + $tmp = $this->dir . "tmp_$key." . uniqid('', true) . '.tmp'; + file_put_contents($tmp, " $expires, 'var' => $var];", LOCK_EX); + + $file = $this->_name($key); + rename($tmp, $file); } - public function get($key) + public function get($key): string { $tmp = ''; if ($this->fetch($key, $tmp)) { @@ -54,19 +55,23 @@ class PHP return ''; } - public function fetch($key, &$var) + public function fetch($key, &$var): bool { $file = $this->_name($key); - if (!file_exists($file) || filemtime($file) < time()) { + if (!file_exists($file)) { return false; } - @include $file; - $var = isset($var) ? $var : null; + $content = include $file; + if (!isset($content) || $content['expires'] < time()) { + return false; + } + + $var = $content['var']; return true; } - public function delete($key) + public function delete($key): void { $file = $this->_name($key); if (file_exists($file)) { @@ -74,13 +79,11 @@ class PHP } } - public function enabled() - { + public function enabled(): bool { return $this->enabled; } - private function _name($key) - { + private function _name($key): string { return sprintf('%s%s%s', $this->dir, $this->prefix, sha1($key) . '.php'); } } From ccfd6f1a874f45d99fbf73324bfb00b30975e7aa Mon Sep 17 00:00:00 2001 From: slawkens Date: Thu, 18 Dec 2025 14:23:25 +0100 Subject: [PATCH 18/45] Add PHP to cache engine list in settings --- system/settings.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/system/settings.php b/system/settings.php index 96f24a8c..6de908ce 100644 --- a/system/settings.php +++ b/system/settings.php @@ -219,7 +219,14 @@ return [ 'cache_engine' => [ 'name' => 'Cache Engine', 'type' => 'options', - 'options' => ['auto' => 'Auto', 'file' => 'Files', 'apc' => 'APC', 'apcu' => 'APCu', 'disable' => 'Disable'], + 'options' => [ + 'auto' => 'Auto', + 'file' => 'Files', + 'apc' => 'APC', + 'apcu' => 'APCu', + 'php' => 'PHP', + 'disable' => 'Disable', + ], 'desc' => 'Auto is most reasonable. It will detect the best cache engine', 'default' => 'auto', 'is_config' => true, From c44c9f9cf4c427c1b9e2b46eb7811f6f484d5273 Mon Sep 17 00:00:00 2001 From: slawkens Date: Thu, 18 Dec 2025 14:33:07 +0100 Subject: [PATCH 19/45] Add type hints and return types to cache classes --- system/src/Cache/APC.php | 17 +++++++---------- system/src/Cache/APCu.php | 17 +++++++---------- system/src/Cache/Cache.php | 5 ++--- system/src/Cache/File.php | 24 +++++++++++++----------- system/src/Cache/XCache.php | 16 +++++++--------- 5 files changed, 36 insertions(+), 43 deletions(-) diff --git a/system/src/Cache/APC.php b/system/src/Cache/APC.php index b831a5d3..d7535ee8 100644 --- a/system/src/Cache/APC.php +++ b/system/src/Cache/APC.php @@ -13,8 +13,8 @@ namespace MyAAC\Cache; class APC { - private $prefix; - private $enabled; + private string $prefix; + private bool $enabled; public function __construct($prefix = '') { @@ -22,14 +22,14 @@ class APC $this->enabled = function_exists('apc_fetch'); } - public function set($key, $var, $ttl = 0) + public function set($key, $var, $ttl = 0): void { $key = $this->prefix . $key; apc_delete($key); apc_store($key, $var, $ttl); } - public function get($key) + public function get($key): string { $tmp = ''; if ($this->fetch($this->prefix . $key, $tmp)) { @@ -39,18 +39,15 @@ class APC return ''; } - public function fetch($key, &$var) - { + public function fetch($key, &$var): bool { return ($var = apc_fetch($this->prefix . $key)) !== false; } - public function delete($key) - { + public function delete($key): void { apc_delete($this->prefix . $key); } - public function enabled() - { + public function enabled(): bool { return $this->enabled; } } diff --git a/system/src/Cache/APCu.php b/system/src/Cache/APCu.php index 7f6500bf..f5d1a06d 100644 --- a/system/src/Cache/APCu.php +++ b/system/src/Cache/APCu.php @@ -13,8 +13,8 @@ namespace MyAAC\Cache; class APCu { - private $prefix; - private $enabled; + private string $prefix; + private bool $enabled; public function __construct($prefix = '') { @@ -22,14 +22,14 @@ class APCu $this->enabled = function_exists('apcu_fetch'); } - public function set($key, $var, $ttl = 0) + public function set($key, $var, $ttl = 0): void { $key = $this->prefix . $key; apcu_delete($key); apcu_store($key, $var, $ttl); } - public function get($key) + public function get($key): string { $tmp = ''; if ($this->fetch($this->prefix . $key, $tmp)) { @@ -39,18 +39,15 @@ class APCu return ''; } - public function fetch($key, &$var) - { + public function fetch($key, &$var): bool { return ($var = apcu_fetch($this->prefix . $key)) !== false; } - public function delete($key) - { + public function delete($key): void { apcu_delete($this->prefix . $key); } - public function enabled() - { + public function enabled(): bool { return $this->enabled; } } diff --git a/system/src/Cache/Cache.php b/system/src/Cache/Cache.php index 1b7d284b..e81e601d 100644 --- a/system/src/Cache/Cache.php +++ b/system/src/Cache/Cache.php @@ -83,7 +83,7 @@ class Cache /** * @return string */ - public static function detect() + public static function detect(): string { if (function_exists('apc_fetch')) return 'apc'; @@ -98,8 +98,7 @@ class Cache /** * @return bool */ - public function enabled() - { + public function enabled(): bool { return false; } diff --git a/system/src/Cache/File.php b/system/src/Cache/File.php index 8d93d495..0943fbc3 100644 --- a/system/src/Cache/File.php +++ b/system/src/Cache/File.php @@ -12,18 +12,22 @@ namespace MyAAC\Cache; class File { - private $prefix; - private $dir; - private $enabled; + private string $prefix; + private string $dir; + private bool $enabled; public function __construct($prefix = '', $dir = '') { $this->prefix = $prefix; $this->dir = $dir; + + ensureFolderExists($this->dir); + ensureIndexExists($this->dir); + $this->enabled = (file_exists($this->dir) && is_dir($this->dir) && is_writable($this->dir)); } - public function set($key, $var, $ttl = 0) + public function set($key, $var, $ttl = 0): void { $file = $this->_name($key); file_put_contents($file, $var); @@ -35,7 +39,7 @@ class File touch($file, time() + $ttl); } - public function get($key) + public function get($key): string { $tmp = ''; if ($this->fetch($key, $tmp)) { @@ -45,7 +49,7 @@ class File return ''; } - public function fetch($key, &$var) + public function fetch($key, &$var): bool { $file = $this->_name($key); if (!file_exists($file) || filemtime($file) < time()) { @@ -56,7 +60,7 @@ class File return true; } - public function delete($key) + public function delete($key): void { $file = $this->_name($key); if (file_exists($file)) { @@ -64,13 +68,11 @@ class File } } - public function enabled() - { + public function enabled(): bool { return $this->enabled; } - private function _name($key) - { + private function _name($key): string { return sprintf('%s%s%s', $this->dir, $this->prefix, sha1($key)); } } diff --git a/system/src/Cache/XCache.php b/system/src/Cache/XCache.php index 0bcf05d6..b090599f 100644 --- a/system/src/Cache/XCache.php +++ b/system/src/Cache/XCache.php @@ -13,8 +13,8 @@ namespace MyAAC\Cache; class XCache { - private $prefix; - private $enabled; + private string $prefix; + private bool $enabled; public function __construct($prefix = '') { @@ -22,14 +22,14 @@ class XCache $this->enabled = function_exists('xcache_get') && ini_get('xcache.var_size'); } - public function set($key, $var, $ttl = 0) + public function set($key, $var, $ttl = 0): void { $key = $this->prefix . $key; xcache_unset($key); xcache_set($key, $var, $ttl); } - public function get($key) + public function get($key): string { $tmp = ''; if ($this->fetch($this->prefix . $key, $tmp)) { @@ -39,7 +39,7 @@ class XCache return ''; } - public function fetch($key, &$var) + public function fetch($key, &$var): bool { $key = $this->prefix . $key; if (!xcache_isset($key)) { @@ -50,13 +50,11 @@ class XCache return true; } - public function delete($key) - { + public function delete($key): void { xcache_unset($this->prefix . $key); } - public function enabled() - { + public function enabled(): bool { return $this->enabled; } } From 8ec9bf10682c73f1fe40967a106ccda2a5073ed0 Mon Sep 17 00:00:00 2001 From: slawkens Date: Mon, 22 Dec 2025 19:59:57 +0100 Subject: [PATCH 20/45] Fixed [player/guild/house] bb code in forum --- system/src/Forum.php | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/system/src/Forum.php b/system/src/Forum.php index 64b22222..6f0f2607 100644 --- a/system/src/Forum.php +++ b/system/src/Forum.php @@ -231,6 +231,7 @@ class Forum if(!is_int($rows / 2)) { $bgcolor = 'ABED25'; } else { $bgcolor = '23ED25'; } $rows++; $text = str_ireplace('[code]'.$code.'[/code]', 'Code:
'.$code.'
', $text); } + $rows = 0; while(stripos($text, '[quote]') !== false && stripos($text, '[/quote]') !== false ) { @@ -238,11 +239,31 @@ class Forum if(!is_int($rows / 2)) { $bgcolor = 'AAAAAA'; } else { $bgcolor = 'CCCCCC'; } $rows++; $text = str_ireplace('[quote]'.$quote.'[/quote]', '
'.$quote.'
', $text); } - $rows = 0; - while(stripos($text, '[url]') !== false && stripos($text, '[/url]') !== false ) - { - $url = substr($text, stripos($text, '[url]')+5, stripos($text, '[/url]') - stripos($text, '[url]') - 5); - $text = str_ireplace('[url]'.$url.'[/url]', ''.$url.'', $text); + + $tagsToParse = [ + 'url' => function ($str) { + return ''.$str.''; + }, + 'player' => function ($str) { + return generateLink(getPlayerLink($str, false), $str, true); + }, + 'guild' => function ($str) { + return generateLink(getGuildLink($str, false), $str, true); + }, + 'house' => function ($str) { + return generateLink(getHouseLink($str, false), $str, true); + } + ]; + + foreach ($tagsToParse as $tag => $callback) { + while(stripos($text, "[$tag]") !== false && stripos($text, "[/$tag]") !== false + && stripos($text, "[$tag]") < stripos($text, "[/$tag]")) + { + $length = strlen("[$tag]"); + $substr = substr($text, stripos($text, "[$tag]") + $length, stripos($text, "[/$tag]") - stripos($text, "[$tag]") - $length); + + $text = str_ireplace('[' . $tag . ']' . $substr . '[/' . $tag . ']', $callback($substr), $text); + } } $xhtml = false; @@ -252,9 +273,6 @@ class Forum '#\[u\](.*?)\[/u\]#si' => ($xhtml ? '\\1' : '\\1'), '#\[s\](.*?)\[/s\]#si' => ($xhtml ? '\\1' : '\\1'), - '#\[guild\](.*?)\[/guild\]#si' => urldecode(generateLink(getGuildLink('$1', false), '$1', true)), - '#\[house\](.*?)\[/house\]#si' => urldecode(generateLink(getHouseLink('$1', false), '$1', true)), - '#\[player\](.*?)\[/player\]#si' => urldecode(generateLink(getPlayerLink('$1', false), '$1', true)), // TODO: [poll] tag '#\[color=(.*?)\](.*?)\[/color\]#si' => ($xhtml ? '\\2' : '\\2'), From 402f3bb9b0f4fff380a1d0002134337f7a3d3ee2 Mon Sep 17 00:00:00 2001 From: Slawomir Boczek Date: Fri, 26 Dec 2025 12:59:49 +0100 Subject: [PATCH 21/45] [WIP] Add access option to Menus (#340) * [WIP] Add access option to Menus Thanks @joelslamospersson for idea * Add notice about Guest* * Add access column into schema.sql * Remove spectrum.js from project Was used in Menus, replaced by html "color" input * Block access to page if not required Access by Menus --- admin/pages/menus.php | 39 +- common.php | 2 +- install/includes/schema.sql | 1 + system/migrations/48.php | 16 + system/router.php | 16 +- system/src/Models/Menu.php | 2 +- system/template.php | 8 +- system/templates/admin.menus.header.html.twig | 3 +- system/templates/admin.menus.js.html.twig | 74 +- tools/css/spectrum.css | 507 ---- tools/js/spectrum.js | 2323 ----------------- 11 files changed, 118 insertions(+), 2873 deletions(-) create mode 100644 system/migrations/48.php delete mode 100644 tools/css/spectrum.css delete mode 100644 tools/js/spectrum.js diff --git a/admin/pages/menus.php b/admin/pages/menus.php index 19d7b486..e85f237a 100644 --- a/admin/pages/menus.php +++ b/admin/pages/menus.php @@ -23,6 +23,7 @@ if (!hasFlag(FLAG_CONTENT_MENUS) && !superAdmin()) { } $pluginThemes = Plugins::getThemes(); +$groups = new OTS_Groups_List(); if (isset($_POST['template'])) { $template = $_POST['template']; @@ -32,6 +33,8 @@ if (isset($_POST['template'])) { $post_menu_link = $_POST['menu_link'] ?? []; $post_menu_blank = $_POST['menu_blank'] ?? []; $post_menu_color = $_POST['menu_color'] ?? []; + $post_menu_access = $_POST['menu_access'] ?? []; + if (count($post_menu) != count($post_menu_link)) { echo 'Menu count is not equal menu links. Something went wrong when sending form.'; return; @@ -50,6 +53,7 @@ if (isset($_POST['template'])) { 'link' => $post_menu_link[$category][$i], 'blank' => $post_menu_blank[$category][$i] == 'on' ? 1 : 0, 'color' => str_replace('#', '', $post_menu_color[$category][$i]), + 'access' => $post_menu_access[$category][$i], 'category' => $category, 'ordering' => $i ]); @@ -122,7 +126,7 @@ if (isset($_POST['template'])) { ?> select('name', 'link', 'blank', 'color', 'category', 'ordering') + ->select('name', 'link', 'access', 'blank', 'color', 'category', 'ordering') ->where('enabled', 1) ->where('template', $template) ->orderBy('ordering') @@ -151,11 +155,34 @@ if (isset($_POST['template'])) { foreach ($menus[$id] as $menu): $color = (empty($menu['color']) ? ($cat['default_links_color'] ?? ($config['menu_default_links_color'] ?? ($config['menu_default_color'] ?? '#ffffff'))) : '#' . $menu['color']); ?> -
  • - - - - +
  • + + + + +
    + +
    + + + + + + + + +
    +
    • hasColumn(TABLE_PREFIX . 'menu', 'access')) { + $db->addColumn(TABLE_PREFIX . 'menu', 'access', 'TINYINT NOT NULL DEFAULT 0 AFTER `link`'); + } +}; + +$down = function () use ($db) { + if ($db->hasColumn(TABLE_PREFIX . 'menu', 'access')) { + $db->dropColumn(TABLE_PREFIX . 'menu', 'access'); + } +}; diff --git a/system/router.php b/system/router.php index f876a9b2..f031f4dd 100644 --- a/system/router.php +++ b/system/router.php @@ -8,6 +8,7 @@ * @link https://my-aac.org */ +use MyAAC\Models\Menu; use MyAAC\Models\Pages; use MyAAC\Plugins; @@ -331,7 +332,20 @@ else { } } -if (!$found) { +$tmpPageOriginal = $page; +$pagesWithDynamicPart = ['characters', 'forum', 'highscores', 'monsters']; +foreach ($pagesWithDynamicPart as $_page) { + if (str_contains($page, $_page)) { + $tmpPageOriginal = $_page; + } +} + +$themeMenu = Menu::select(['name']) + ->where('template', $template_name) + ->where('link', $tmpPageOriginal) + ->where('access', '>', $logged_access); + +if (!$found || $themeMenu->count() >= 1) { $page = '404'; $file = SYSTEM . 'pages/404.php'; } diff --git a/system/src/Models/Menu.php b/system/src/Models/Menu.php index 6e3b6d03..670cccc3 100644 --- a/system/src/Models/Menu.php +++ b/system/src/Models/Menu.php @@ -9,6 +9,6 @@ class Menu extends Model { public $timestamps = false; - protected $fillable = ['template', 'name', 'link', 'blank', 'color', 'category', 'ordering', 'enabled']; + protected $fillable = ['template', 'name', 'link', 'access', 'blank', 'color', 'category', 'ordering', 'enabled']; } diff --git a/system/template.php b/system/template.php index 30cb5535..dc89ef04 100644 --- a/system/template.php +++ b/system/template.php @@ -146,10 +146,10 @@ if($twig_loader) { function get_template_menus(): array { - global $template_name; + global $template_name, $logged_access; $result = Cache::remember('template_menus_' . $template_name, 10 * 60, function () use ($template_name) { - $result = Menu::select(['name', 'link', 'blank', 'color', 'category']) + $result = Menu::select(['name', 'link', 'access', 'blank', 'color', 'category']) ->where('template', $template_name) ->orderBy('category') ->orderBy('ordering') @@ -163,6 +163,10 @@ function get_template_menus(): array $menus = []; foreach($result as $menu) { + if ($menu['access'] > $logged_access) { + continue; + } + if (empty($menu['link'])) { $menu['link'] = 'news'; } diff --git a/system/templates/admin.menus.header.html.twig b/system/templates/admin.menus.header.html.twig index 97038840..c4976721 100644 --- a/system/templates/admin.menus.header.html.twig +++ b/system/templates/admin.menus.header.html.twig @@ -2,7 +2,8 @@

    You are editing: {{ template }}

    Hint: You can drag menu items.
    Hint: Add links to external sites using: http:// or https:// prefix.
    - Not all templates support blank and colorful links. + Not all templates support blank and colorful links.
    + * Guest means everyone will see the link. Player means registered and logged-in user.

    diff --git a/system/templates/admin.menus.js.html.twig b/system/templates/admin.menus.js.html.twig index 9f7ea45e..48035539 100644 --- a/system/templates/admin.menus.js.html.twig +++ b/system/templates/admin.menus.js.html.twig @@ -14,42 +14,62 @@ colors[{{ cat }}] = '{{ options['default_links_color'] ?? (menuDefaultLinksColor ?? config('menu_default_color')) }}'; {% endfor %} + function confirmRemoveMenuItem(that) + { + let id = $(that).attr("id"); + if (confirm('Are you sure, that you want to remove this element?')) { + $('#list-' + id.replace('remove-button-', '')).remove(); + } + } + $(function () { const $sortable = $(".sortable"); $sortable.sortable(); $sortable.disableSelection(); $(".remove-button").on('click', function () { - var id = $(this).attr("id"); - $('#list-' + id.replace('remove-button-', '')).remove(); + confirmRemoveMenuItem(this); }); $(".add-button").on('click', function () { - var cat = $(this).attr("id").replace('add-button-', ''); - var id = last_id[cat]; + let cat = $(this).attr("id").replace('add-button-', ''); + let id = last_id[cat]; last_id[cat]++; const color = colors[cat]; - $('#sortable-' + cat).append('
    • '); //add input bo - $('#remove-button-' + cat + '-' + id).on('click', function () { - $('#list-' + $(this).attr("id").replace('remove-button-', '')).remove(); - }); - initializeSpectrum(); + let copy = $('.ui-state-default:first').clone(); + + copy.attr('id', 'list-' + cat + '-' + id); + + copy.find('.menu-name').val('').attr('name', 'menu[' + cat + '][]'); + copy.find('.menu-link').val('').attr('name', 'menu_link[' + cat + '][]'); + copy.find('.menu-access').val('0').attr('name', 'menu_access[' + cat + '][]'); + copy.find('.menu-color').val(color).attr('name', 'menu_color[' + cat + '][]'); + copy.find('.menu-blank').attr('name', 'menu_blank[' + cat + '][]'); + copy.find('.menu-blank-checkbox').prop('checked', false); + + copy.find('.remove-button').attr('id', 'remove-button-' + cat + '-' + id); + + $('#sortable-' + cat).append(copy); + + $('#remove-button-' + cat + '-' + id).on('click', function () { + confirmRemoveMenuItem(this); + }); }); $("#menus-form").on('submit', function (e) { - $('.blank-checkbox:not(:checked)').each(function (i, obj) { + $('.menu-blank-checkbox:not(:checked)').each(function (i, obj) { $(obj).parent().prev().val("off"); }); - $('.blank-checkbox:checked').each(function (i, obj) { + $('.menu-blank-checkbox:checked').each(function (i, obj) { $(obj).parent().prev().val("on"); }); }); }); - - - - + + .label_menu_name, .label_menu_link { + width: 45%; + } + + .menu-name, .menu-link { + width: 100%; + } + diff --git a/tools/css/spectrum.css b/tools/css/spectrum.css deleted file mode 100644 index a8ad9e4f..00000000 --- a/tools/css/spectrum.css +++ /dev/null @@ -1,507 +0,0 @@ -/*** -Spectrum Colorpicker v1.8.0 -https://github.com/bgrins/spectrum -Author: Brian Grinstead -License: MIT -***/ - -.sp-container { - position:absolute; - top:0; - left:0; - display:inline-block; - *display: inline; - *zoom: 1; - /* https://github.com/bgrins/spectrum/issues/40 */ - z-index: 9999994; - overflow: hidden; -} -.sp-container.sp-flat { - position: relative; -} - -/* Fix for * { box-sizing: border-box; } */ -.sp-container, -.sp-container * { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; -} - -/* http://ansciath.tumblr.com/post/7347495869/css-aspect-ratio */ -.sp-top { - position:relative; - width: 100%; - display:inline-block; -} -.sp-top-inner { - position:absolute; - top:0; - left:0; - bottom:0; - right:0; -} -.sp-color { - position: absolute; - top:0; - left:0; - bottom:0; - right:20%; -} -.sp-hue { - position: absolute; - top:0; - right:0; - bottom:0; - left:84%; - height: 100%; -} - -.sp-clear-enabled .sp-hue { - top:33px; - height: 77.5%; -} - -.sp-fill { - padding-top: 80%; -} -.sp-sat, .sp-val { - position: absolute; - top:0; - left:0; - right:0; - bottom:0; -} - -.sp-alpha-enabled .sp-top { - margin-bottom: 18px; -} -.sp-alpha-enabled .sp-alpha { - display: block; -} -.sp-alpha-handle { - position:absolute; - top:-4px; - bottom: -4px; - width: 6px; - left: 50%; - cursor: pointer; - border: 1px solid black; - background: white; - opacity: .8; -} -.sp-alpha { - display: none; - position: absolute; - bottom: -14px; - right: 0; - left: 0; - height: 8px; -} -.sp-alpha-inner { - border: solid 1px #333; -} - -.sp-clear { - display: none; -} - -.sp-clear.sp-clear-display { - background-position: center; -} - -.sp-clear-enabled .sp-clear { - display: block; - position:absolute; - top:0px; - right:0; - bottom:0; - left:84%; - height: 28px; -} - -/* Don't allow text selection */ -.sp-container, .sp-replacer, .sp-preview, .sp-dragger, .sp-slider, .sp-alpha, .sp-clear, .sp-alpha-handle, .sp-container.sp-dragging .sp-input, .sp-container button { - -webkit-user-select:none; - -moz-user-select: -moz-none; - -o-user-select:none; - user-select: none; -} - -.sp-container.sp-input-disabled .sp-input-container { - display: none; -} -.sp-container.sp-buttons-disabled .sp-button-container { - display: none; -} -.sp-container.sp-palette-buttons-disabled .sp-palette-button-container { - display: none; -} -.sp-palette-only .sp-picker-container { - display: none; -} -.sp-palette-disabled .sp-palette-container { - display: none; -} - -.sp-initial-disabled .sp-initial { - display: none; -} - - -/* Gradients for hue, saturation and value instead of images. Not pretty... but it works */ -.sp-sat { - background-image: -webkit-gradient(linear, 0 0, 100% 0, from(#FFF), to(rgba(204, 154, 129, 0))); - background-image: -webkit-linear-gradient(left, #FFF, rgba(204, 154, 129, 0)); - background-image: -moz-linear-gradient(left, #fff, rgba(204, 154, 129, 0)); - background-image: -o-linear-gradient(left, #fff, rgba(204, 154, 129, 0)); - background-image: -ms-linear-gradient(left, #fff, rgba(204, 154, 129, 0)); - background-image: linear-gradient(to right, #fff, rgba(204, 154, 129, 0)); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType = 1, startColorstr=#FFFFFFFF, endColorstr=#00CC9A81)"; - filter : progid:DXImageTransform.Microsoft.gradient(GradientType = 1, startColorstr='#FFFFFFFF', endColorstr='#00CC9A81'); -} -.sp-val { - background-image: -webkit-gradient(linear, 0 100%, 0 0, from(#000000), to(rgba(204, 154, 129, 0))); - background-image: -webkit-linear-gradient(bottom, #000000, rgba(204, 154, 129, 0)); - background-image: -moz-linear-gradient(bottom, #000, rgba(204, 154, 129, 0)); - background-image: -o-linear-gradient(bottom, #000, rgba(204, 154, 129, 0)); - background-image: -ms-linear-gradient(bottom, #000, rgba(204, 154, 129, 0)); - background-image: linear-gradient(to top, #000, rgba(204, 154, 129, 0)); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#00CC9A81, endColorstr=#FF000000)"; - filter : progid:DXImageTransform.Microsoft.gradient(startColorstr='#00CC9A81', endColorstr='#FF000000'); -} - -.sp-hue { - background: -moz-linear-gradient(top, #ff0000 0%, #ffff00 17%, #00ff00 33%, #00ffff 50%, #0000ff 67%, #ff00ff 83%, #ff0000 100%); - background: -ms-linear-gradient(top, #ff0000 0%, #ffff00 17%, #00ff00 33%, #00ffff 50%, #0000ff 67%, #ff00ff 83%, #ff0000 100%); - background: -o-linear-gradient(top, #ff0000 0%, #ffff00 17%, #00ff00 33%, #00ffff 50%, #0000ff 67%, #ff00ff 83%, #ff0000 100%); - background: -webkit-gradient(linear, left top, left bottom, from(#ff0000), color-stop(0.17, #ffff00), color-stop(0.33, #00ff00), color-stop(0.5, #00ffff), color-stop(0.67, #0000ff), color-stop(0.83, #ff00ff), to(#ff0000)); - background: -webkit-linear-gradient(top, #ff0000 0%, #ffff00 17%, #00ff00 33%, #00ffff 50%, #0000ff 67%, #ff00ff 83%, #ff0000 100%); - background: linear-gradient(to bottom, #ff0000 0%, #ffff00 17%, #00ff00 33%, #00ffff 50%, #0000ff 67%, #ff00ff 83%, #ff0000 100%); -} - -/* IE filters do not support multiple color stops. - Generate 6 divs, line them up, and do two color gradients for each. - Yes, really. - */ -.sp-1 { - height:17%; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0000', endColorstr='#ffff00'); -} -.sp-2 { - height:16%; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffff00', endColorstr='#00ff00'); -} -.sp-3 { - height:17%; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00ff00', endColorstr='#00ffff'); -} -.sp-4 { - height:17%; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00ffff', endColorstr='#0000ff'); -} -.sp-5 { - height:16%; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0000ff', endColorstr='#ff00ff'); -} -.sp-6 { - height:17%; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff00ff', endColorstr='#ff0000'); -} - -.sp-hidden { - display: none !important; -} - -/* Clearfix hack */ -.sp-cf:before, .sp-cf:after { content: ""; display: table; } -.sp-cf:after { clear: both; } -.sp-cf { *zoom: 1; } - -/* Mobile devices, make hue slider bigger so it is easier to slide */ -@media (max-device-width: 480px) { - .sp-color { right: 40%; } - .sp-hue { left: 63%; } - .sp-fill { padding-top: 60%; } -} -.sp-dragger { - border-radius: 5px; - height: 5px; - width: 5px; - border: 1px solid #fff; - background: #000; - cursor: pointer; - position:absolute; - top:0; - left: 0; -} -.sp-slider { - position: absolute; - top:0; - cursor:pointer; - height: 3px; - left: -1px; - right: -1px; - border: 1px solid #000; - background: white; - opacity: .8; -} - -/* -Theme authors: -Here are the basic themeable display options (colors, fonts, global widths). -See http://bgrins.github.io/spectrum/themes/ for instructions. -*/ - -.sp-container { - border-radius: 0; - background-color: #ECECEC; - border: solid 1px #f0c49B; - padding: 0; -} -.sp-container, .sp-container button, .sp-container input, .sp-color, .sp-hue, .sp-clear { - font: normal 12px "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; -} -.sp-top { - margin-bottom: 3px; -} -.sp-color, .sp-hue, .sp-clear { - border: solid 1px #666; -} - -/* Input */ -.sp-input-container { - float:right; - width: 100px; - margin-bottom: 4px; -} -.sp-initial-disabled .sp-input-container { - width: 100%; -} -.sp-input { - font-size: 12px !important; - border: 1px inset; - padding: 4px 5px; - margin: 0; - width: 100%; - background:transparent; - border-radius: 3px; - color: #222; -} -.sp-input:focus { - border: 1px solid orange; -} -.sp-input.sp-validation-error { - border: 1px solid red; - background: #fdd; -} -.sp-picker-container , .sp-palette-container { - float:left; - position: relative; - padding: 10px; - padding-bottom: 300px; - margin-bottom: -290px; -} -.sp-picker-container { - width: 172px; - border-left: solid 1px #fff; -} - -/* Palettes */ -.sp-palette-container { - border-right: solid 1px #ccc; -} - -.sp-palette-only .sp-palette-container { - border: 0; -} - -.sp-palette .sp-thumb-el { - display: block; - position:relative; - float:left; - width: 24px; - height: 15px; - margin: 3px; - cursor: pointer; - border:solid 2px transparent; -} -.sp-palette .sp-thumb-el:hover, .sp-palette .sp-thumb-el.sp-thumb-active { - border-color: orange; -} -.sp-thumb-el { - position:relative; -} - -/* Initial */ -.sp-initial { - float: left; - border: solid 1px #333; -} -.sp-initial span { - width: 30px; - height: 25px; - border:none; - display:block; - float:left; - margin:0; -} - -.sp-initial .sp-clear-display { - background-position: center; -} - -/* Buttons */ -.sp-palette-button-container, -.sp-button-container { - float: right; -} - -/* Replacer (the little preview div that shows up instead of the ) */ -.sp-replacer { - margin:0; - overflow:hidden; - cursor:pointer; - padding: 4px; - display:inline-block; - *zoom: 1; - *display: inline; - border: solid 1px #91765d; - background: #eee; - color: #333; - vertical-align: middle; -} -.sp-replacer:hover, .sp-replacer.sp-active { - border-color: #F0C49B; - color: #111; -} -.sp-replacer.sp-disabled { - cursor:default; - border-color: silver; - color: silver; -} -.sp-dd { - padding: 2px 0; - height: 16px; - line-height: 16px; - float:left; - font-size:10px; -} -.sp-preview { - position:relative; - width:25px; - height: 20px; - border: solid 1px #222; - margin-right: 5px; - float:left; - z-index: 0; -} - -.sp-palette { - *width: 220px; - max-width: 220px; -} -.sp-palette .sp-thumb-el { - width:16px; - height: 16px; - margin:2px 1px; - border: solid 1px #d0d0d0; -} - -.sp-container { - padding-bottom:0; -} - - -/* Buttons: http://hellohappy.org/css3-buttons/ */ -.sp-container button { - background-color: #eeeeee; - background-image: -webkit-linear-gradient(top, #eeeeee, #cccccc); - background-image: -moz-linear-gradient(top, #eeeeee, #cccccc); - background-image: -ms-linear-gradient(top, #eeeeee, #cccccc); - background-image: -o-linear-gradient(top, #eeeeee, #cccccc); - background-image: linear-gradient(to bottom, #eeeeee, #cccccc); - border: 1px solid #ccc; - border-bottom: 1px solid #bbb; - border-radius: 3px; - color: #333; - font-size: 14px; - line-height: 1; - padding: 5px 4px; - text-align: center; - text-shadow: 0 1px 0 #eee; - vertical-align: middle; -} -.sp-container button:hover { - background-color: #dddddd; - background-image: -webkit-linear-gradient(top, #dddddd, #bbbbbb); - background-image: -moz-linear-gradient(top, #dddddd, #bbbbbb); - background-image: -ms-linear-gradient(top, #dddddd, #bbbbbb); - background-image: -o-linear-gradient(top, #dddddd, #bbbbbb); - background-image: linear-gradient(to bottom, #dddddd, #bbbbbb); - border: 1px solid #bbb; - border-bottom: 1px solid #999; - cursor: pointer; - text-shadow: 0 1px 0 #ddd; -} -.sp-container button:active { - border: 1px solid #aaa; - border-bottom: 1px solid #888; - -webkit-box-shadow: inset 0 0 5px 2px #aaaaaa, 0 1px 0 0 #eeeeee; - -moz-box-shadow: inset 0 0 5px 2px #aaaaaa, 0 1px 0 0 #eeeeee; - -ms-box-shadow: inset 0 0 5px 2px #aaaaaa, 0 1px 0 0 #eeeeee; - -o-box-shadow: inset 0 0 5px 2px #aaaaaa, 0 1px 0 0 #eeeeee; - box-shadow: inset 0 0 5px 2px #aaaaaa, 0 1px 0 0 #eeeeee; -} -.sp-cancel { - font-size: 11px; - color: #d93f3f !important; - margin:0; - padding:2px; - margin-right: 5px; - vertical-align: middle; - text-decoration:none; - -} -.sp-cancel:hover { - color: #d93f3f !important; - text-decoration: underline; -} - - -.sp-palette span:hover, .sp-palette span.sp-thumb-active { - border-color: #000; -} - -.sp-preview, .sp-alpha, .sp-thumb-el { - position:relative; - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGUlEQVQYV2M4gwH+YwCGIasIUwhT25BVBADtzYNYrHvv4gAAAABJRU5ErkJggg==); -} -.sp-preview-inner, .sp-alpha-inner, .sp-thumb-inner { - display:block; - position:absolute; - top:0;left:0;bottom:0;right:0; -} - -.sp-palette .sp-thumb-inner { - background-position: 50% 50%; - background-repeat: no-repeat; -} - -.sp-palette .sp-thumb-light.sp-thumb-active .sp-thumb-inner { - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAIVJREFUeNpiYBhsgJFMffxAXABlN5JruT4Q3wfi/0DsT64h8UD8HmpIPCWG/KemIfOJCUB+Aoacx6EGBZyHBqI+WsDCwuQ9mhxeg2A210Ntfo8klk9sOMijaURm7yc1UP2RNCMbKE9ODK1HM6iegYLkfx8pligC9lCD7KmRof0ZhjQACDAAceovrtpVBRkAAAAASUVORK5CYII=); -} - -.sp-palette .sp-thumb-dark.sp-thumb-active .sp-thumb-inner { - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAMdJREFUOE+tkgsNwzAMRMugEAahEAahEAZhEAqlEAZhEAohEAYh81X2dIm8fKpEspLGvudPOsUYpxE2BIJCroJmEW9qJ+MKaBFhEMNabSy9oIcIPwrB+afvAUFoK4H0tMaQ3XtlrggDhOVVMuT4E5MMG0FBbCEYzjYT7OxLEvIHQLY2zWwQ3D+9luyOQTfKDiFD3iUIfPk8VqrKjgAiSfGFPecrg6HN6m/iBcwiDAo7WiBeawa+Kwh7tZoSCGLMqwlSAzVDhoK+6vH4G0P5wdkAAAAASUVORK5CYII=); -} - -.sp-clear-display { - background-repeat:no-repeat; - background-position: center; - background-image: url(data:image/gif;base64,R0lGODlhFAAUAPcAAAAAAJmZmZ2dnZ6enqKioqOjo6SkpKWlpaampqenp6ioqKmpqaqqqqurq/Hx8fLy8vT09PX19ff39/j4+Pn5+fr6+vv7+wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAP8ALAAAAAAUABQAAAihAP9FoPCvoMGDBy08+EdhQAIJCCMybCDAAYUEARBAlFiQQoMABQhKUJBxY0SPICEYHBnggEmDKAuoPMjS5cGYMxHW3IiT478JJA8M/CjTZ0GgLRekNGpwAsYABHIypcAgQMsITDtWJYBR6NSqMico9cqR6tKfY7GeBCuVwlipDNmefAtTrkSzB1RaIAoXodsABiZAEFB06gIBWC1mLVgBa0AAOw==); -} diff --git a/tools/js/spectrum.js b/tools/js/spectrum.js deleted file mode 100644 index 72009787..00000000 --- a/tools/js/spectrum.js +++ /dev/null @@ -1,2323 +0,0 @@ -// Spectrum Colorpicker v1.8.0 -// https://github.com/bgrins/spectrum -// Author: Brian Grinstead -// License: MIT - -(function (factory) { - "use strict"; - - if (typeof define === 'function' && define.amd) { // AMD - define(['jquery'], factory); - } - else if (typeof exports == "object" && typeof module == "object") { // CommonJS - module.exports = factory(require('jquery')); - } - else { // Browser - factory(jQuery); - } -})(function($, undefined) { - "use strict"; - - var defaultOpts = { - - // Callbacks - beforeShow: noop, - move: noop, - change: noop, - show: noop, - hide: noop, - - // Options - color: false, - flat: false, - showInput: false, - allowEmpty: false, - showButtons: true, - clickoutFiresChange: true, - showInitial: false, - showPalette: false, - showPaletteOnly: false, - hideAfterPaletteSelect: false, - togglePaletteOnly: false, - showSelectionPalette: true, - localStorageKey: false, - appendTo: "body", - maxSelectionSize: 7, - cancelText: "cancel", - chooseText: "choose", - togglePaletteMoreText: "more", - togglePaletteLessText: "less", - clearText: "Clear Color Selection", - noColorSelectedText: "No Color Selected", - preferredFormat: false, - className: "", // Deprecated - use containerClassName and replacerClassName instead. - containerClassName: "", - replacerClassName: "", - showAlpha: false, - theme: "sp-light", - palette: [["#ffffff", "#000000", "#ff0000", "#ff8000", "#ffff00", "#008000", "#0000ff", "#4b0082", "#9400d3"]], - selectionPalette: [], - disabled: false, - offset: null - }, - spectrums = [], - IE = !!/msie/i.exec( window.navigator.userAgent ), - rgbaSupport = (function() { - function contains( str, substr ) { - return !!~('' + str).indexOf(substr); - } - - var elem = document.createElement('div'); - var style = elem.style; - style.cssText = 'background-color:rgba(0,0,0,.5)'; - return contains(style.backgroundColor, 'rgba') || contains(style.backgroundColor, 'hsla'); - })(), - replaceInput = [ - "
    ", - "
    ", - "
    ▼
    ", - "
    " - ].join(''), - markup = (function () { - - // IE does not support gradients with multiple stops, so we need to simulate - // that for the rainbow slider with 8 divs that each have a single gradient - var gradientFix = ""; - if (IE) { - for (var i = 1; i <= 6; i++) { - gradientFix += "
    "; - } - } - - return [ - "
    ", - "
    ", - "
    ", - "
    ", - "", - "
    ", - "
    ", - "
    ", - "
    ", - "
    ", - "
    ", - "
    ", - "
    ", - "
    ", - "
    ", - "
    ", - "
    ", - "
    ", - "
    ", - "
    ", - "
    ", - "
    ", - gradientFix, - "
    ", - "
    ", - "
    ", - "
    ", - "
    ", - "", - "
    ", - "
    ", - "
    ", - "", - "", - "
    ", - "
    ", - "
    " - ].join(""); - })(); - - function paletteTemplate (p, color, className, opts) { - var html = []; - for (var i = 0; i < p.length; i++) { - var current = p[i]; - if(current) { - var tiny = tinycolor(current); - var c = tiny.toHsl().l < 0.5 ? "sp-thumb-el sp-thumb-dark" : "sp-thumb-el sp-thumb-light"; - c += (tinycolor.equals(color, current)) ? " sp-thumb-active" : ""; - var formattedString = tiny.toString(opts.preferredFormat || "rgb"); - var swatchStyle = rgbaSupport ? ("background-color:" + tiny.toRgbString()) : "filter:" + tiny.toFilter(); - html.push(''); - } else { - var cls = 'sp-clear-display'; - html.push($('
    ') - .append($('') - .attr('title', opts.noColorSelectedText) - ) - .html() - ); - } - } - return "
    " + html.join('') + "
    "; - } - - function hideAll() { - for (var i = 0; i < spectrums.length; i++) { - if (spectrums[i]) { - spectrums[i].hide(); - } - } - } - - function instanceOptions(o, callbackContext) { - var opts = $.extend({}, defaultOpts, o); - opts.callbacks = { - 'move': bind(opts.move, callbackContext), - 'change': bind(opts.change, callbackContext), - 'show': bind(opts.show, callbackContext), - 'hide': bind(opts.hide, callbackContext), - 'beforeShow': bind(opts.beforeShow, callbackContext) - }; - - return opts; - } - - function spectrum(element, o) { - - var opts = instanceOptions(o, element), - flat = opts.flat, - showSelectionPalette = opts.showSelectionPalette, - localStorageKey = opts.localStorageKey, - theme = opts.theme, - callbacks = opts.callbacks, - resize = throttle(reflow, 10), - visible = false, - isDragging = false, - dragWidth = 0, - dragHeight = 0, - dragHelperHeight = 0, - slideHeight = 0, - slideWidth = 0, - alphaWidth = 0, - alphaSlideHelperWidth = 0, - slideHelperHeight = 0, - currentHue = 0, - currentSaturation = 0, - currentValue = 0, - currentAlpha = 1, - palette = [], - paletteArray = [], - paletteLookup = {}, - selectionPalette = opts.selectionPalette.slice(0), - maxSelectionSize = opts.maxSelectionSize, - draggingClass = "sp-dragging", - shiftMovementDirection = null; - - var doc = element.ownerDocument, - body = doc.body, - boundElement = $(element), - disabled = false, - container = $(markup, doc).addClass(theme), - pickerContainer = container.find(".sp-picker-container"), - dragger = container.find(".sp-color"), - dragHelper = container.find(".sp-dragger"), - slider = container.find(".sp-hue"), - slideHelper = container.find(".sp-slider"), - alphaSliderInner = container.find(".sp-alpha-inner"), - alphaSlider = container.find(".sp-alpha"), - alphaSlideHelper = container.find(".sp-alpha-handle"), - textInput = container.find(".sp-input"), - paletteContainer = container.find(".sp-palette"), - initialColorContainer = container.find(".sp-initial"), - cancelButton = container.find(".sp-cancel"), - clearButton = container.find(".sp-clear"), - chooseButton = container.find(".sp-choose"), - toggleButton = container.find(".sp-palette-toggle"), - isInput = boundElement.is("input"), - isInputTypeColor = isInput && boundElement.attr("type") === "color" && inputTypeColorSupport(), - shouldReplace = isInput && !flat, - replacer = (shouldReplace) ? $(replaceInput).addClass(theme).addClass(opts.className).addClass(opts.replacerClassName) : $([]), - offsetElement = (shouldReplace) ? replacer : boundElement, - previewElement = replacer.find(".sp-preview-inner"), - initialColor = opts.color || (isInput && boundElement.val()), - colorOnShow = false, - currentPreferredFormat = opts.preferredFormat, - clickoutFiresChange = !opts.showButtons || opts.clickoutFiresChange, - isEmpty = !initialColor, - allowEmpty = opts.allowEmpty && !isInputTypeColor; - - function applyOptions() { - - if (opts.showPaletteOnly) { - opts.showPalette = true; - } - - toggleButton.text(opts.showPaletteOnly ? opts.togglePaletteMoreText : opts.togglePaletteLessText); - - if (opts.palette) { - palette = opts.palette.slice(0); - paletteArray = $.isArray(palette[0]) ? palette : [palette]; - paletteLookup = {}; - for (var i = 0; i < paletteArray.length; i++) { - for (var j = 0; j < paletteArray[i].length; j++) { - var rgb = tinycolor(paletteArray[i][j]).toRgbString(); - paletteLookup[rgb] = true; - } - } - } - - container.toggleClass("sp-flat", flat); - container.toggleClass("sp-input-disabled", !opts.showInput); - container.toggleClass("sp-alpha-enabled", opts.showAlpha); - container.toggleClass("sp-clear-enabled", allowEmpty); - container.toggleClass("sp-buttons-disabled", !opts.showButtons); - container.toggleClass("sp-palette-buttons-disabled", !opts.togglePaletteOnly); - container.toggleClass("sp-palette-disabled", !opts.showPalette); - container.toggleClass("sp-palette-only", opts.showPaletteOnly); - container.toggleClass("sp-initial-disabled", !opts.showInitial); - container.addClass(opts.className).addClass(opts.containerClassName); - - reflow(); - } - - function initialize() { - - if (IE) { - container.find("*:not(input)").attr("unselectable", "on"); - } - - applyOptions(); - - if (shouldReplace) { - boundElement.after(replacer).hide(); - } - - if (!allowEmpty) { - clearButton.hide(); - } - - if (flat) { - boundElement.after(container).hide(); - } - else { - - var appendTo = opts.appendTo === "parent" ? boundElement.parent() : $(opts.appendTo); - if (appendTo.length !== 1) { - appendTo = $("body"); - } - - appendTo.append(container); - } - - updateSelectionPaletteFromStorage(); - - offsetElement.bind("click.spectrum touchstart.spectrum", function (e) { - if (!disabled) { - toggle(); - } - - e.stopPropagation(); - - if (!$(e.target).is("input")) { - e.preventDefault(); - } - }); - - if(boundElement.is(":disabled") || (opts.disabled === true)) { - disable(); - } - - // Prevent clicks from bubbling up to document. This would cause it to be hidden. - container.click(stopPropagation); - - // Handle user typed input - textInput.change(setFromTextInput); - textInput.bind("paste", function () { - setTimeout(setFromTextInput, 1); - }); - textInput.keydown(function (e) { if (e.keyCode == 13) { setFromTextInput(); } }); - - cancelButton.text(opts.cancelText); - cancelButton.bind("click.spectrum", function (e) { - e.stopPropagation(); - e.preventDefault(); - revert(); - hide(); - }); - - clearButton.attr("title", opts.clearText); - clearButton.bind("click.spectrum", function (e) { - e.stopPropagation(); - e.preventDefault(); - isEmpty = true; - move(); - - if(flat) { - //for the flat style, this is a change event - updateOriginalInput(true); - } - }); - - chooseButton.text(opts.chooseText); - chooseButton.bind("click.spectrum", function (e) { - e.stopPropagation(); - e.preventDefault(); - - if (IE && textInput.is(":focus")) { - textInput.trigger('change'); - } - - if (isValid()) { - updateOriginalInput(true); - hide(); - } - }); - - toggleButton.text(opts.showPaletteOnly ? opts.togglePaletteMoreText : opts.togglePaletteLessText); - toggleButton.bind("click.spectrum", function (e) { - e.stopPropagation(); - e.preventDefault(); - - opts.showPaletteOnly = !opts.showPaletteOnly; - - // To make sure the Picker area is drawn on the right, next to the - // Palette area (and not below the palette), first move the Palette - // to the left to make space for the picker, plus 5px extra. - // The 'applyOptions' function puts the whole container back into place - // and takes care of the button-text and the sp-palette-only CSS class. - if (!opts.showPaletteOnly && !flat) { - container.css('left', '-=' + (pickerContainer.outerWidth(true) + 5)); - } - applyOptions(); - }); - - draggable(alphaSlider, function (dragX, dragY, e) { - currentAlpha = (dragX / alphaWidth); - isEmpty = false; - if (e.shiftKey) { - currentAlpha = Math.round(currentAlpha * 10) / 10; - } - - move(); - }, dragStart, dragStop); - - draggable(slider, function (dragX, dragY) { - currentHue = parseFloat(dragY / slideHeight); - isEmpty = false; - if (!opts.showAlpha) { - currentAlpha = 1; - } - move(); - }, dragStart, dragStop); - - draggable(dragger, function (dragX, dragY, e) { - - // shift+drag should snap the movement to either the x or y axis. - if (!e.shiftKey) { - shiftMovementDirection = null; - } - else if (!shiftMovementDirection) { - var oldDragX = currentSaturation * dragWidth; - var oldDragY = dragHeight - (currentValue * dragHeight); - var furtherFromX = Math.abs(dragX - oldDragX) > Math.abs(dragY - oldDragY); - - shiftMovementDirection = furtherFromX ? "x" : "y"; - } - - var setSaturation = !shiftMovementDirection || shiftMovementDirection === "x"; - var setValue = !shiftMovementDirection || shiftMovementDirection === "y"; - - if (setSaturation) { - currentSaturation = parseFloat(dragX / dragWidth); - } - if (setValue) { - currentValue = parseFloat((dragHeight - dragY) / dragHeight); - } - - isEmpty = false; - if (!opts.showAlpha) { - currentAlpha = 1; - } - - move(); - - }, dragStart, dragStop); - - if (!!initialColor) { - set(initialColor); - - // In case color was black - update the preview UI and set the format - // since the set function will not run (default color is black). - updateUI(); - currentPreferredFormat = opts.preferredFormat || tinycolor(initialColor).format; - - addColorToSelectionPalette(initialColor); - } - else { - updateUI(); - } - - if (flat) { - show(); - } - - function paletteElementClick(e) { - if (e.data && e.data.ignore) { - set($(e.target).closest(".sp-thumb-el").data("color")); - move(); - } - else { - set($(e.target).closest(".sp-thumb-el").data("color")); - move(); - updateOriginalInput(true); - if (opts.hideAfterPaletteSelect) { - hide(); - } - } - - return false; - } - - var paletteEvent = IE ? "mousedown.spectrum" : "click.spectrum touchstart.spectrum"; - paletteContainer.delegate(".sp-thumb-el", paletteEvent, paletteElementClick); - initialColorContainer.delegate(".sp-thumb-el:nth-child(1)", paletteEvent, { ignore: true }, paletteElementClick); - } - - function updateSelectionPaletteFromStorage() { - - if (localStorageKey && window.localStorage) { - - // Migrate old palettes over to new format. May want to remove this eventually. - try { - var oldPalette = window.localStorage[localStorageKey].split(",#"); - if (oldPalette.length > 1) { - delete window.localStorage[localStorageKey]; - $.each(oldPalette, function(i, c) { - addColorToSelectionPalette(c); - }); - } - } - catch(e) { } - - try { - selectionPalette = window.localStorage[localStorageKey].split(";"); - } - catch (e) { } - } - } - - function addColorToSelectionPalette(color) { - if (showSelectionPalette) { - var rgb = tinycolor(color).toRgbString(); - if (!paletteLookup[rgb] && $.inArray(rgb, selectionPalette) === -1) { - selectionPalette.push(rgb); - while(selectionPalette.length > maxSelectionSize) { - selectionPalette.shift(); - } - } - - if (localStorageKey && window.localStorage) { - try { - window.localStorage[localStorageKey] = selectionPalette.join(";"); - } - catch(e) { } - } - } - } - - function getUniqueSelectionPalette() { - var unique = []; - if (opts.showPalette) { - for (var i = 0; i < selectionPalette.length; i++) { - var rgb = tinycolor(selectionPalette[i]).toRgbString(); - - if (!paletteLookup[rgb]) { - unique.push(selectionPalette[i]); - } - } - } - - return unique.reverse().slice(0, opts.maxSelectionSize); - } - - function drawPalette() { - - var currentColor = get(); - - var html = $.map(paletteArray, function (palette, i) { - return paletteTemplate(palette, currentColor, "sp-palette-row sp-palette-row-" + i, opts); - }); - - updateSelectionPaletteFromStorage(); - - if (selectionPalette) { - html.push(paletteTemplate(getUniqueSelectionPalette(), currentColor, "sp-palette-row sp-palette-row-selection", opts)); - } - - paletteContainer.html(html.join("")); - } - - function drawInitial() { - if (opts.showInitial) { - var initial = colorOnShow; - var current = get(); - initialColorContainer.html(paletteTemplate([initial, current], current, "sp-palette-row-initial", opts)); - } - } - - function dragStart() { - if (dragHeight <= 0 || dragWidth <= 0 || slideHeight <= 0) { - reflow(); - } - isDragging = true; - container.addClass(draggingClass); - shiftMovementDirection = null; - boundElement.trigger('dragstart.spectrum', [ get() ]); - } - - function dragStop() { - isDragging = false; - container.removeClass(draggingClass); - boundElement.trigger('dragstop.spectrum', [ get() ]); - } - - function setFromTextInput() { - - var value = textInput.val(); - - if ((value === null || value === "") && allowEmpty) { - set(null); - updateOriginalInput(true); - } - else { - var tiny = tinycolor(value); - if (tiny.isValid()) { - set(tiny); - updateOriginalInput(true); - } - else { - textInput.addClass("sp-validation-error"); - } - } - } - - function toggle() { - if (visible) { - hide(); - } - else { - show(); - } - } - - function show() { - var event = $.Event('beforeShow.spectrum'); - - if (visible) { - reflow(); - return; - } - - boundElement.trigger(event, [ get() ]); - - if (callbacks.beforeShow(get()) === false || event.isDefaultPrevented()) { - return; - } - - hideAll(); - visible = true; - - $(doc).bind("keydown.spectrum", onkeydown); - $(doc).bind("click.spectrum", clickout); - $(window).bind("resize.spectrum", resize); - replacer.addClass("sp-active"); - container.removeClass("sp-hidden"); - - reflow(); - updateUI(); - - colorOnShow = get(); - - drawInitial(); - callbacks.show(colorOnShow); - boundElement.trigger('show.spectrum', [ colorOnShow ]); - } - - function onkeydown(e) { - // Close on ESC - if (e.keyCode === 27) { - hide(); - } - } - - function clickout(e) { - // Return on right click. - if (e.button == 2) { return; } - - // If a drag event was happening during the mouseup, don't hide - // on click. - if (isDragging) { return; } - - if (clickoutFiresChange) { - updateOriginalInput(true); - } - else { - revert(); - } - hide(); - } - - function hide() { - // Return if hiding is unnecessary - if (!visible || flat) { return; } - visible = false; - - $(doc).unbind("keydown.spectrum", onkeydown); - $(doc).unbind("click.spectrum", clickout); - $(window).unbind("resize.spectrum", resize); - - replacer.removeClass("sp-active"); - container.addClass("sp-hidden"); - - callbacks.hide(get()); - boundElement.trigger('hide.spectrum', [ get() ]); - } - - function revert() { - set(colorOnShow, true); - } - - function set(color, ignoreFormatChange) { - if (tinycolor.equals(color, get())) { - // Update UI just in case a validation error needs - // to be cleared. - updateUI(); - return; - } - - var newColor, newHsv; - if (!color && allowEmpty) { - isEmpty = true; - } else { - isEmpty = false; - newColor = tinycolor(color); - newHsv = newColor.toHsv(); - - currentHue = (newHsv.h % 360) / 360; - currentSaturation = newHsv.s; - currentValue = newHsv.v; - currentAlpha = newHsv.a; - } - updateUI(); - - if (newColor && newColor.isValid() && !ignoreFormatChange) { - currentPreferredFormat = opts.preferredFormat || newColor.getFormat(); - } - } - - function get(opts) { - opts = opts || { }; - - if (allowEmpty && isEmpty) { - return null; - } - - return tinycolor.fromRatio({ - h: currentHue, - s: currentSaturation, - v: currentValue, - a: Math.round(currentAlpha * 100) / 100 - }, { format: opts.format || currentPreferredFormat }); - } - - function isValid() { - return !textInput.hasClass("sp-validation-error"); - } - - function move() { - updateUI(); - - callbacks.move(get()); - boundElement.trigger('move.spectrum', [ get() ]); - } - - function updateUI() { - - textInput.removeClass("sp-validation-error"); - - updateHelperLocations(); - - // Update dragger background color (gradients take care of saturation and value). - var flatColor = tinycolor.fromRatio({ h: currentHue, s: 1, v: 1 }); - dragger.css("background-color", flatColor.toHexString()); - - // Get a format that alpha will be included in (hex and names ignore alpha) - var format = currentPreferredFormat; - if (currentAlpha < 1 && !(currentAlpha === 0 && format === "name")) { - if (format === "hex" || format === "hex3" || format === "hex6" || format === "name") { - format = "rgb"; - } - } - - var realColor = get({ format: format }), - displayColor = ''; - - //reset background info for preview element - previewElement.removeClass("sp-clear-display"); - previewElement.css('background-color', 'transparent'); - - if (!realColor && allowEmpty) { - // Update the replaced elements background with icon indicating no color selection - previewElement.addClass("sp-clear-display"); - } - else { - var realHex = realColor.toHexString(), - realRgb = realColor.toRgbString(); - - // Update the replaced elements background color (with actual selected color) - if (rgbaSupport || realColor.alpha === 1) { - previewElement.css("background-color", realRgb); - } - else { - previewElement.css("background-color", "transparent"); - previewElement.css("filter", realColor.toFilter()); - } - - if (opts.showAlpha) { - var rgb = realColor.toRgb(); - rgb.a = 0; - var realAlpha = tinycolor(rgb).toRgbString(); - var gradient = "linear-gradient(left, " + realAlpha + ", " + realHex + ")"; - - if (IE) { - alphaSliderInner.css("filter", tinycolor(realAlpha).toFilter({ gradientType: 1 }, realHex)); - } - else { - alphaSliderInner.css("background", "-webkit-" + gradient); - alphaSliderInner.css("background", "-moz-" + gradient); - alphaSliderInner.css("background", "-ms-" + gradient); - // Use current syntax gradient on unprefixed property. - alphaSliderInner.css("background", - "linear-gradient(to right, " + realAlpha + ", " + realHex + ")"); - } - } - - displayColor = realColor.toString(format); - } - - // Update the text entry input as it changes happen - if (opts.showInput) { - textInput.val(displayColor); - } - - if (opts.showPalette) { - drawPalette(); - } - - drawInitial(); - } - - function updateHelperLocations() { - var s = currentSaturation; - var v = currentValue; - - if(allowEmpty && isEmpty) { - //if selected color is empty, hide the helpers - alphaSlideHelper.hide(); - slideHelper.hide(); - dragHelper.hide(); - } - else { - //make sure helpers are visible - alphaSlideHelper.show(); - slideHelper.show(); - dragHelper.show(); - - // Where to show the little circle in that displays your current selected color - var dragX = s * dragWidth; - var dragY = dragHeight - (v * dragHeight); - dragX = Math.max( - -dragHelperHeight, - Math.min(dragWidth - dragHelperHeight, dragX - dragHelperHeight) - ); - dragY = Math.max( - -dragHelperHeight, - Math.min(dragHeight - dragHelperHeight, dragY - dragHelperHeight) - ); - dragHelper.css({ - "top": dragY + "px", - "left": dragX + "px" - }); - - var alphaX = currentAlpha * alphaWidth; - alphaSlideHelper.css({ - "left": (alphaX - (alphaSlideHelperWidth / 2)) + "px" - }); - - // Where to show the bar that displays your current selected hue - var slideY = (currentHue) * slideHeight; - slideHelper.css({ - "top": (slideY - slideHelperHeight) + "px" - }); - } - } - - function updateOriginalInput(fireCallback) { - var color = get(), - displayColor = '', - hasChanged = !tinycolor.equals(color, colorOnShow); - - if (color) { - displayColor = color.toString(currentPreferredFormat); - // Update the selection palette with the current color - addColorToSelectionPalette(color); - } - - if (isInput) { - boundElement.val(displayColor); - } - - if (fireCallback && hasChanged) { - callbacks.change(color); - boundElement.trigger('change', [ color ]); - } - } - - function reflow() { - if (!visible) { - return; // Calculations would be useless and wouldn't be reliable anyways - } - dragWidth = dragger.width(); - dragHeight = dragger.height(); - dragHelperHeight = dragHelper.height(); - slideWidth = slider.width(); - slideHeight = slider.height(); - slideHelperHeight = slideHelper.height(); - alphaWidth = alphaSlider.width(); - alphaSlideHelperWidth = alphaSlideHelper.width(); - - if (!flat) { - container.css("position", "absolute"); - if (opts.offset) { - container.offset(opts.offset); - } else { - container.offset(getOffset(container, offsetElement)); - } - } - - updateHelperLocations(); - - if (opts.showPalette) { - drawPalette(); - } - - boundElement.trigger('reflow.spectrum'); - } - - function destroy() { - boundElement.show(); - offsetElement.unbind("click.spectrum touchstart.spectrum"); - container.remove(); - replacer.remove(); - spectrums[spect.id] = null; - } - - function option(optionName, optionValue) { - if (optionName === undefined) { - return $.extend({}, opts); - } - if (optionValue === undefined) { - return opts[optionName]; - } - - opts[optionName] = optionValue; - - if (optionName === "preferredFormat") { - currentPreferredFormat = opts.preferredFormat; - } - applyOptions(); - } - - function enable() { - disabled = false; - boundElement.attr("disabled", false); - offsetElement.removeClass("sp-disabled"); - } - - function disable() { - hide(); - disabled = true; - boundElement.attr("disabled", true); - offsetElement.addClass("sp-disabled"); - } - - function setOffset(coord) { - opts.offset = coord; - reflow(); - } - - initialize(); - - var spect = { - show: show, - hide: hide, - toggle: toggle, - reflow: reflow, - option: option, - enable: enable, - disable: disable, - offset: setOffset, - set: function (c) { - set(c); - updateOriginalInput(); - }, - get: get, - destroy: destroy, - container: container - }; - - spect.id = spectrums.push(spect) - 1; - - return spect; - } - - /** - * checkOffset - get the offset below/above and left/right element depending on screen position - * Thanks https://github.com/jquery/jquery-ui/blob/master/ui/jquery.ui.datepicker.js - */ - function getOffset(picker, input) { - var extraY = 0; - var dpWidth = picker.outerWidth(); - var dpHeight = picker.outerHeight(); - var inputHeight = input.outerHeight(); - var doc = picker[0].ownerDocument; - var docElem = doc.documentElement; - var viewWidth = docElem.clientWidth + $(doc).scrollLeft(); - var viewHeight = docElem.clientHeight + $(doc).scrollTop(); - var offset = input.offset(); - offset.top += inputHeight; - - offset.left -= - Math.min(offset.left, (offset.left + dpWidth > viewWidth && viewWidth > dpWidth) ? - Math.abs(offset.left + dpWidth - viewWidth) : 0); - - offset.top -= - Math.min(offset.top, ((offset.top + dpHeight > viewHeight && viewHeight > dpHeight) ? - Math.abs(dpHeight + inputHeight - extraY) : extraY)); - - return offset; - } - - /** - * noop - do nothing - */ - function noop() { - - } - - /** - * stopPropagation - makes the code only doing this a little easier to read in line - */ - function stopPropagation(e) { - e.stopPropagation(); - } - - /** - * Create a function bound to a given object - * Thanks to underscore.js - */ - function bind(func, obj) { - var slice = Array.prototype.slice; - var args = slice.call(arguments, 2); - return function () { - return func.apply(obj, args.concat(slice.call(arguments))); - }; - } - - /** - * Lightweight drag helper. Handles containment within the element, so that - * when dragging, the x is within [0,element.width] and y is within [0,element.height] - */ - function draggable(element, onmove, onstart, onstop) { - onmove = onmove || function () { }; - onstart = onstart || function () { }; - onstop = onstop || function () { }; - var doc = document; - var dragging = false; - var offset = {}; - var maxHeight = 0; - var maxWidth = 0; - var hasTouch = ('ontouchstart' in window); - - var duringDragEvents = {}; - duringDragEvents["selectstart"] = prevent; - duringDragEvents["dragstart"] = prevent; - duringDragEvents["touchmove mousemove"] = move; - duringDragEvents["touchend mouseup"] = stop; - - function prevent(e) { - if (e.stopPropagation) { - e.stopPropagation(); - } - if (e.preventDefault) { - e.preventDefault(); - } - e.returnValue = false; - } - - function move(e) { - if (dragging) { - // Mouseup happened outside of window - if (IE && doc.documentMode < 9 && !e.button) { - return stop(); - } - - var t0 = e.originalEvent && e.originalEvent.touches && e.originalEvent.touches[0]; - var pageX = t0 && t0.pageX || e.pageX; - var pageY = t0 && t0.pageY || e.pageY; - - var dragX = Math.max(0, Math.min(pageX - offset.left, maxWidth)); - var dragY = Math.max(0, Math.min(pageY - offset.top, maxHeight)); - - if (hasTouch) { - // Stop scrolling in iOS - prevent(e); - } - - onmove.apply(element, [dragX, dragY, e]); - } - } - - function start(e) { - var rightclick = (e.which) ? (e.which == 3) : (e.button == 2); - - if (!rightclick && !dragging) { - if (onstart.apply(element, arguments) !== false) { - dragging = true; - maxHeight = $(element).height(); - maxWidth = $(element).width(); - offset = $(element).offset(); - - $(doc).bind(duringDragEvents); - $(doc.body).addClass("sp-dragging"); - - move(e); - - prevent(e); - } - } - } - - function stop() { - if (dragging) { - $(doc).unbind(duringDragEvents); - $(doc.body).removeClass("sp-dragging"); - - // Wait a tick before notifying observers to allow the click event - // to fire in Chrome. - setTimeout(function() { - onstop.apply(element, arguments); - }, 0); - } - dragging = false; - } - - $(element).bind("touchstart mousedown", start); - } - - function throttle(func, wait, debounce) { - var timeout; - return function () { - var context = this, args = arguments; - var throttler = function () { - timeout = null; - func.apply(context, args); - }; - if (debounce) clearTimeout(timeout); - if (debounce || !timeout) timeout = setTimeout(throttler, wait); - }; - } - - function inputTypeColorSupport() { - return $.fn.spectrum.inputTypeColorSupport(); - } - - /** - * Define a jQuery plugin - */ - var dataID = "spectrum.id"; - $.fn.spectrum = function (opts, extra) { - - if (typeof opts == "string") { - - var returnValue = this; - var args = Array.prototype.slice.call( arguments, 1 ); - - this.each(function () { - var spect = spectrums[$(this).data(dataID)]; - if (spect) { - var method = spect[opts]; - if (!method) { - throw new Error( "Spectrum: no such method: '" + opts + "'" ); - } - - if (opts == "get") { - returnValue = spect.get(); - } - else if (opts == "container") { - returnValue = spect.container; - } - else if (opts == "option") { - returnValue = spect.option.apply(spect, args); - } - else if (opts == "destroy") { - spect.destroy(); - $(this).removeData(dataID); - } - else { - method.apply(spect, args); - } - } - }); - - return returnValue; - } - - // Initializing a new instance of spectrum - return this.spectrum("destroy").each(function () { - var options = $.extend({}, opts, $(this).data()); - var spect = spectrum(this, options); - $(this).data(dataID, spect.id); - }); - }; - - $.fn.spectrum.load = true; - $.fn.spectrum.loadOpts = {}; - $.fn.spectrum.draggable = draggable; - $.fn.spectrum.defaults = defaultOpts; - $.fn.spectrum.inputTypeColorSupport = function inputTypeColorSupport() { - if (typeof inputTypeColorSupport._cachedResult === "undefined") { - var colorInput = $("")[0]; // if color element is supported, value will default to not null - inputTypeColorSupport._cachedResult = colorInput.type === "color" && colorInput.value !== ""; - } - return inputTypeColorSupport._cachedResult; - }; - - $.spectrum = { }; - $.spectrum.localization = { }; - $.spectrum.palettes = { }; - - $.fn.spectrum.processNativeColorInputs = function () { - var colorInputs = $("input[type=color]"); - if (colorInputs.length && !inputTypeColorSupport()) { - colorInputs.spectrum({ - preferredFormat: "hex6" - }); - } - }; - - // TinyColor v1.1.2 - // https://github.com/bgrins/TinyColor - // Brian Grinstead, MIT License - - (function() { - - var trimLeft = /^[\s,#]+/, - trimRight = /\s+$/, - tinyCounter = 0, - math = Math, - mathRound = math.round, - mathMin = math.min, - mathMax = math.max, - mathRandom = math.random; - - var tinycolor = function(color, opts) { - - color = (color) ? color : ''; - opts = opts || { }; - - // If input is already a tinycolor, return itself - if (color instanceof tinycolor) { - return color; - } - // If we are called as a function, call using new instead - if (!(this instanceof tinycolor)) { - return new tinycolor(color, opts); - } - - var rgb = inputToRGB(color); - this._originalInput = color, - this._r = rgb.r, - this._g = rgb.g, - this._b = rgb.b, - this._a = rgb.a, - this._roundA = mathRound(100*this._a) / 100, - this._format = opts.format || rgb.format; - this._gradientType = opts.gradientType; - - // Don't let the range of [0,255] come back in [0,1]. - // Potentially lose a little bit of precision here, but will fix issues where - // .5 gets interpreted as half of the total, instead of half of 1 - // If it was supposed to be 128, this was already taken care of by `inputToRgb` - if (this._r < 1) { this._r = mathRound(this._r); } - if (this._g < 1) { this._g = mathRound(this._g); } - if (this._b < 1) { this._b = mathRound(this._b); } - - this._ok = rgb.ok; - this._tc_id = tinyCounter++; - }; - - tinycolor.prototype = { - isDark: function() { - return this.getBrightness() < 128; - }, - isLight: function() { - return !this.isDark(); - }, - isValid: function() { - return this._ok; - }, - getOriginalInput: function() { - return this._originalInput; - }, - getFormat: function() { - return this._format; - }, - getAlpha: function() { - return this._a; - }, - getBrightness: function() { - var rgb = this.toRgb(); - return (rgb.r * 299 + rgb.g * 587 + rgb.b * 114) / 1000; - }, - setAlpha: function(value) { - this._a = boundAlpha(value); - this._roundA = mathRound(100*this._a) / 100; - return this; - }, - toHsv: function() { - var hsv = rgbToHsv(this._r, this._g, this._b); - return { h: hsv.h * 360, s: hsv.s, v: hsv.v, a: this._a }; - }, - toHsvString: function() { - var hsv = rgbToHsv(this._r, this._g, this._b); - var h = mathRound(hsv.h * 360), s = mathRound(hsv.s * 100), v = mathRound(hsv.v * 100); - return (this._a == 1) ? - "hsv(" + h + ", " + s + "%, " + v + "%)" : - "hsva(" + h + ", " + s + "%, " + v + "%, "+ this._roundA + ")"; - }, - toHsl: function() { - var hsl = rgbToHsl(this._r, this._g, this._b); - return { h: hsl.h * 360, s: hsl.s, l: hsl.l, a: this._a }; - }, - toHslString: function() { - var hsl = rgbToHsl(this._r, this._g, this._b); - var h = mathRound(hsl.h * 360), s = mathRound(hsl.s * 100), l = mathRound(hsl.l * 100); - return (this._a == 1) ? - "hsl(" + h + ", " + s + "%, " + l + "%)" : - "hsla(" + h + ", " + s + "%, " + l + "%, "+ this._roundA + ")"; - }, - toHex: function(allow3Char) { - return rgbToHex(this._r, this._g, this._b, allow3Char); - }, - toHexString: function(allow3Char) { - return '#' + this.toHex(allow3Char); - }, - toHex8: function() { - return rgbaToHex(this._r, this._g, this._b, this._a); - }, - toHex8String: function() { - return '#' + this.toHex8(); - }, - toRgb: function() { - return { r: mathRound(this._r), g: mathRound(this._g), b: mathRound(this._b), a: this._a }; - }, - toRgbString: function() { - return (this._a == 1) ? - "rgb(" + mathRound(this._r) + ", " + mathRound(this._g) + ", " + mathRound(this._b) + ")" : - "rgba(" + mathRound(this._r) + ", " + mathRound(this._g) + ", " + mathRound(this._b) + ", " + this._roundA + ")"; - }, - toPercentageRgb: function() { - return { r: mathRound(bound01(this._r, 255) * 100) + "%", g: mathRound(bound01(this._g, 255) * 100) + "%", b: mathRound(bound01(this._b, 255) * 100) + "%", a: this._a }; - }, - toPercentageRgbString: function() { - return (this._a == 1) ? - "rgb(" + mathRound(bound01(this._r, 255) * 100) + "%, " + mathRound(bound01(this._g, 255) * 100) + "%, " + mathRound(bound01(this._b, 255) * 100) + "%)" : - "rgba(" + mathRound(bound01(this._r, 255) * 100) + "%, " + mathRound(bound01(this._g, 255) * 100) + "%, " + mathRound(bound01(this._b, 255) * 100) + "%, " + this._roundA + ")"; - }, - toName: function() { - if (this._a === 0) { - return "transparent"; - } - - if (this._a < 1) { - return false; - } - - return hexNames[rgbToHex(this._r, this._g, this._b, true)] || false; - }, - toFilter: function(secondColor) { - var hex8String = '#' + rgbaToHex(this._r, this._g, this._b, this._a); - var secondHex8String = hex8String; - var gradientType = this._gradientType ? "GradientType = 1, " : ""; - - if (secondColor) { - var s = tinycolor(secondColor); - secondHex8String = s.toHex8String(); - } - - return "progid:DXImageTransform.Microsoft.gradient("+gradientType+"startColorstr="+hex8String+",endColorstr="+secondHex8String+")"; - }, - toString: function(format) { - var formatSet = !!format; - format = format || this._format; - - var formattedString = false; - var hasAlpha = this._a < 1 && this._a >= 0; - var needsAlphaFormat = !formatSet && hasAlpha && (format === "hex" || format === "hex6" || format === "hex3" || format === "name"); - - if (needsAlphaFormat) { - // Special case for "transparent", all other non-alpha formats - // will return rgba when there is transparency. - if (format === "name" && this._a === 0) { - return this.toName(); - } - return this.toRgbString(); - } - if (format === "rgb") { - formattedString = this.toRgbString(); - } - if (format === "prgb") { - formattedString = this.toPercentageRgbString(); - } - if (format === "hex" || format === "hex6") { - formattedString = this.toHexString(); - } - if (format === "hex3") { - formattedString = this.toHexString(true); - } - if (format === "hex8") { - formattedString = this.toHex8String(); - } - if (format === "name") { - formattedString = this.toName(); - } - if (format === "hsl") { - formattedString = this.toHslString(); - } - if (format === "hsv") { - formattedString = this.toHsvString(); - } - - return formattedString || this.toHexString(); - }, - - _applyModification: function(fn, args) { - var color = fn.apply(null, [this].concat([].slice.call(args))); - this._r = color._r; - this._g = color._g; - this._b = color._b; - this.setAlpha(color._a); - return this; - }, - lighten: function() { - return this._applyModification(lighten, arguments); - }, - brighten: function() { - return this._applyModification(brighten, arguments); - }, - darken: function() { - return this._applyModification(darken, arguments); - }, - desaturate: function() { - return this._applyModification(desaturate, arguments); - }, - saturate: function() { - return this._applyModification(saturate, arguments); - }, - greyscale: function() { - return this._applyModification(greyscale, arguments); - }, - spin: function() { - return this._applyModification(spin, arguments); - }, - - _applyCombination: function(fn, args) { - return fn.apply(null, [this].concat([].slice.call(args))); - }, - analogous: function() { - return this._applyCombination(analogous, arguments); - }, - complement: function() { - return this._applyCombination(complement, arguments); - }, - monochromatic: function() { - return this._applyCombination(monochromatic, arguments); - }, - splitcomplement: function() { - return this._applyCombination(splitcomplement, arguments); - }, - triad: function() { - return this._applyCombination(triad, arguments); - }, - tetrad: function() { - return this._applyCombination(tetrad, arguments); - } - }; - - // If input is an object, force 1 into "1.0" to handle ratios properly - // String input requires "1.0" as input, so 1 will be treated as 1 - tinycolor.fromRatio = function(color, opts) { - if (typeof color == "object") { - var newColor = {}; - for (var i in color) { - if (color.hasOwnProperty(i)) { - if (i === "a") { - newColor[i] = color[i]; - } - else { - newColor[i] = convertToPercentage(color[i]); - } - } - } - color = newColor; - } - - return tinycolor(color, opts); - }; - - // Given a string or object, convert that input to RGB - // Possible string inputs: - // - // "red" - // "#f00" or "f00" - // "#ff0000" or "ff0000" - // "#ff000000" or "ff000000" - // "rgb 255 0 0" or "rgb (255, 0, 0)" - // "rgb 1.0 0 0" or "rgb (1, 0, 0)" - // "rgba (255, 0, 0, 1)" or "rgba 255, 0, 0, 1" - // "rgba (1.0, 0, 0, 1)" or "rgba 1.0, 0, 0, 1" - // "hsl(0, 100%, 50%)" or "hsl 0 100% 50%" - // "hsla(0, 100%, 50%, 1)" or "hsla 0 100% 50%, 1" - // "hsv(0, 100%, 100%)" or "hsv 0 100% 100%" - // - function inputToRGB(color) { - - var rgb = { r: 0, g: 0, b: 0 }; - var a = 1; - var ok = false; - var format = false; - - if (typeof color == "string") { - color = stringInputToObject(color); - } - - if (typeof color == "object") { - if (color.hasOwnProperty("r") && color.hasOwnProperty("g") && color.hasOwnProperty("b")) { - rgb = rgbToRgb(color.r, color.g, color.b); - ok = true; - format = String(color.r).substr(-1) === "%" ? "prgb" : "rgb"; - } - else if (color.hasOwnProperty("h") && color.hasOwnProperty("s") && color.hasOwnProperty("v")) { - color.s = convertToPercentage(color.s); - color.v = convertToPercentage(color.v); - rgb = hsvToRgb(color.h, color.s, color.v); - ok = true; - format = "hsv"; - } - else if (color.hasOwnProperty("h") && color.hasOwnProperty("s") && color.hasOwnProperty("l")) { - color.s = convertToPercentage(color.s); - color.l = convertToPercentage(color.l); - rgb = hslToRgb(color.h, color.s, color.l); - ok = true; - format = "hsl"; - } - - if (color.hasOwnProperty("a")) { - a = color.a; - } - } - - a = boundAlpha(a); - - return { - ok: ok, - format: color.format || format, - r: mathMin(255, mathMax(rgb.r, 0)), - g: mathMin(255, mathMax(rgb.g, 0)), - b: mathMin(255, mathMax(rgb.b, 0)), - a: a - }; - } - - - // Conversion Functions - // -------------------- - - // `rgbToHsl`, `rgbToHsv`, `hslToRgb`, `hsvToRgb` modified from: - // - - // `rgbToRgb` - // Handle bounds / percentage checking to conform to CSS color spec - // - // *Assumes:* r, g, b in [0, 255] or [0, 1] - // *Returns:* { r, g, b } in [0, 255] - function rgbToRgb(r, g, b){ - return { - r: bound01(r, 255) * 255, - g: bound01(g, 255) * 255, - b: bound01(b, 255) * 255 - }; - } - - // `rgbToHsl` - // Converts an RGB color value to HSL. - // *Assumes:* r, g, and b are contained in [0, 255] or [0, 1] - // *Returns:* { h, s, l } in [0,1] - function rgbToHsl(r, g, b) { - - r = bound01(r, 255); - g = bound01(g, 255); - b = bound01(b, 255); - - var max = mathMax(r, g, b), min = mathMin(r, g, b); - var h, s, l = (max + min) / 2; - - if(max == min) { - h = s = 0; // achromatic - } - else { - var d = max - min; - s = l > 0.5 ? d / (2 - max - min) : d / (max + min); - switch(max) { - case r: h = (g - b) / d + (g < b ? 6 : 0); break; - case g: h = (b - r) / d + 2; break; - case b: h = (r - g) / d + 4; break; - } - - h /= 6; - } - - return { h: h, s: s, l: l }; - } - - // `hslToRgb` - // Converts an HSL color value to RGB. - // *Assumes:* h is contained in [0, 1] or [0, 360] and s and l are contained [0, 1] or [0, 100] - // *Returns:* { r, g, b } in the set [0, 255] - function hslToRgb(h, s, l) { - var r, g, b; - - h = bound01(h, 360); - s = bound01(s, 100); - l = bound01(l, 100); - - function hue2rgb(p, q, t) { - if(t < 0) t += 1; - if(t > 1) t -= 1; - if(t < 1/6) return p + (q - p) * 6 * t; - if(t < 1/2) return q; - if(t < 2/3) return p + (q - p) * (2/3 - t) * 6; - return p; - } - - if(s === 0) { - r = g = b = l; // achromatic - } - else { - var q = l < 0.5 ? l * (1 + s) : l + s - l * s; - var p = 2 * l - q; - r = hue2rgb(p, q, h + 1/3); - g = hue2rgb(p, q, h); - b = hue2rgb(p, q, h - 1/3); - } - - return { r: r * 255, g: g * 255, b: b * 255 }; - } - - // `rgbToHsv` - // Converts an RGB color value to HSV - // *Assumes:* r, g, and b are contained in the set [0, 255] or [0, 1] - // *Returns:* { h, s, v } in [0,1] - function rgbToHsv(r, g, b) { - - r = bound01(r, 255); - g = bound01(g, 255); - b = bound01(b, 255); - - var max = mathMax(r, g, b), min = mathMin(r, g, b); - var h, s, v = max; - - var d = max - min; - s = max === 0 ? 0 : d / max; - - if(max == min) { - h = 0; // achromatic - } - else { - switch(max) { - case r: h = (g - b) / d + (g < b ? 6 : 0); break; - case g: h = (b - r) / d + 2; break; - case b: h = (r - g) / d + 4; break; - } - h /= 6; - } - return { h: h, s: s, v: v }; - } - - // `hsvToRgb` - // Converts an HSV color value to RGB. - // *Assumes:* h is contained in [0, 1] or [0, 360] and s and v are contained in [0, 1] or [0, 100] - // *Returns:* { r, g, b } in the set [0, 255] - function hsvToRgb(h, s, v) { - - h = bound01(h, 360) * 6; - s = bound01(s, 100); - v = bound01(v, 100); - - var i = math.floor(h), - f = h - i, - p = v * (1 - s), - q = v * (1 - f * s), - t = v * (1 - (1 - f) * s), - mod = i % 6, - r = [v, q, p, p, t, v][mod], - g = [t, v, v, q, p, p][mod], - b = [p, p, t, v, v, q][mod]; - - return { r: r * 255, g: g * 255, b: b * 255 }; - } - - // `rgbToHex` - // Converts an RGB color to hex - // Assumes r, g, and b are contained in the set [0, 255] - // Returns a 3 or 6 character hex - function rgbToHex(r, g, b, allow3Char) { - - var hex = [ - pad2(mathRound(r).toString(16)), - pad2(mathRound(g).toString(16)), - pad2(mathRound(b).toString(16)) - ]; - - // Return a 3 character hex if possible - if (allow3Char && hex[0].charAt(0) == hex[0].charAt(1) && hex[1].charAt(0) == hex[1].charAt(1) && hex[2].charAt(0) == hex[2].charAt(1)) { - return hex[0].charAt(0) + hex[1].charAt(0) + hex[2].charAt(0); - } - - return hex.join(""); - } - // `rgbaToHex` - // Converts an RGBA color plus alpha transparency to hex - // Assumes r, g, b and a are contained in the set [0, 255] - // Returns an 8 character hex - function rgbaToHex(r, g, b, a) { - - var hex = [ - pad2(convertDecimalToHex(a)), - pad2(mathRound(r).toString(16)), - pad2(mathRound(g).toString(16)), - pad2(mathRound(b).toString(16)) - ]; - - return hex.join(""); - } - - // `equals` - // Can be called with any tinycolor input - tinycolor.equals = function (color1, color2) { - if (!color1 || !color2) { return false; } - return tinycolor(color1).toRgbString() == tinycolor(color2).toRgbString(); - }; - tinycolor.random = function() { - return tinycolor.fromRatio({ - r: mathRandom(), - g: mathRandom(), - b: mathRandom() - }); - }; - - - // Modification Functions - // ---------------------- - // Thanks to less.js for some of the basics here - // - - function desaturate(color, amount) { - amount = (amount === 0) ? 0 : (amount || 10); - var hsl = tinycolor(color).toHsl(); - hsl.s -= amount / 100; - hsl.s = clamp01(hsl.s); - return tinycolor(hsl); - } - - function saturate(color, amount) { - amount = (amount === 0) ? 0 : (amount || 10); - var hsl = tinycolor(color).toHsl(); - hsl.s += amount / 100; - hsl.s = clamp01(hsl.s); - return tinycolor(hsl); - } - - function greyscale(color) { - return tinycolor(color).desaturate(100); - } - - function lighten (color, amount) { - amount = (amount === 0) ? 0 : (amount || 10); - var hsl = tinycolor(color).toHsl(); - hsl.l += amount / 100; - hsl.l = clamp01(hsl.l); - return tinycolor(hsl); - } - - function brighten(color, amount) { - amount = (amount === 0) ? 0 : (amount || 10); - var rgb = tinycolor(color).toRgb(); - rgb.r = mathMax(0, mathMin(255, rgb.r - mathRound(255 * - (amount / 100)))); - rgb.g = mathMax(0, mathMin(255, rgb.g - mathRound(255 * - (amount / 100)))); - rgb.b = mathMax(0, mathMin(255, rgb.b - mathRound(255 * - (amount / 100)))); - return tinycolor(rgb); - } - - function darken (color, amount) { - amount = (amount === 0) ? 0 : (amount || 10); - var hsl = tinycolor(color).toHsl(); - hsl.l -= amount / 100; - hsl.l = clamp01(hsl.l); - return tinycolor(hsl); - } - - // Spin takes a positive or negative amount within [-360, 360] indicating the change of hue. - // Values outside of this range will be wrapped into this range. - function spin(color, amount) { - var hsl = tinycolor(color).toHsl(); - var hue = (mathRound(hsl.h) + amount) % 360; - hsl.h = hue < 0 ? 360 + hue : hue; - return tinycolor(hsl); - } - - // Combination Functions - // --------------------- - // Thanks to jQuery xColor for some of the ideas behind these - // - - function complement(color) { - var hsl = tinycolor(color).toHsl(); - hsl.h = (hsl.h + 180) % 360; - return tinycolor(hsl); - } - - function triad(color) { - var hsl = tinycolor(color).toHsl(); - var h = hsl.h; - return [ - tinycolor(color), - tinycolor({ h: (h + 120) % 360, s: hsl.s, l: hsl.l }), - tinycolor({ h: (h + 240) % 360, s: hsl.s, l: hsl.l }) - ]; - } - - function tetrad(color) { - var hsl = tinycolor(color).toHsl(); - var h = hsl.h; - return [ - tinycolor(color), - tinycolor({ h: (h + 90) % 360, s: hsl.s, l: hsl.l }), - tinycolor({ h: (h + 180) % 360, s: hsl.s, l: hsl.l }), - tinycolor({ h: (h + 270) % 360, s: hsl.s, l: hsl.l }) - ]; - } - - function splitcomplement(color) { - var hsl = tinycolor(color).toHsl(); - var h = hsl.h; - return [ - tinycolor(color), - tinycolor({ h: (h + 72) % 360, s: hsl.s, l: hsl.l}), - tinycolor({ h: (h + 216) % 360, s: hsl.s, l: hsl.l}) - ]; - } - - function analogous(color, results, slices) { - results = results || 6; - slices = slices || 30; - - var hsl = tinycolor(color).toHsl(); - var part = 360 / slices; - var ret = [tinycolor(color)]; - - for (hsl.h = ((hsl.h - (part * results >> 1)) + 720) % 360; --results; ) { - hsl.h = (hsl.h + part) % 360; - ret.push(tinycolor(hsl)); - } - return ret; - } - - function monochromatic(color, results) { - results = results || 6; - var hsv = tinycolor(color).toHsv(); - var h = hsv.h, s = hsv.s, v = hsv.v; - var ret = []; - var modification = 1 / results; - - while (results--) { - ret.push(tinycolor({ h: h, s: s, v: v})); - v = (v + modification) % 1; - } - - return ret; - } - - // Utility Functions - // --------------------- - - tinycolor.mix = function(color1, color2, amount) { - amount = (amount === 0) ? 0 : (amount || 50); - - var rgb1 = tinycolor(color1).toRgb(); - var rgb2 = tinycolor(color2).toRgb(); - - var p = amount / 100; - var w = p * 2 - 1; - var a = rgb2.a - rgb1.a; - - var w1; - - if (w * a == -1) { - w1 = w; - } else { - w1 = (w + a) / (1 + w * a); - } - - w1 = (w1 + 1) / 2; - - var w2 = 1 - w1; - - var rgba = { - r: rgb2.r * w1 + rgb1.r * w2, - g: rgb2.g * w1 + rgb1.g * w2, - b: rgb2.b * w1 + rgb1.b * w2, - a: rgb2.a * p + rgb1.a * (1 - p) - }; - - return tinycolor(rgba); - }; - - - // Readability Functions - // --------------------- - // - - // `readability` - // Analyze the 2 colors and returns an object with the following properties: - // `brightness`: difference in brightness between the two colors - // `color`: difference in color/hue between the two colors - tinycolor.readability = function(color1, color2) { - var c1 = tinycolor(color1); - var c2 = tinycolor(color2); - var rgb1 = c1.toRgb(); - var rgb2 = c2.toRgb(); - var brightnessA = c1.getBrightness(); - var brightnessB = c2.getBrightness(); - var colorDiff = ( - Math.max(rgb1.r, rgb2.r) - Math.min(rgb1.r, rgb2.r) + - Math.max(rgb1.g, rgb2.g) - Math.min(rgb1.g, rgb2.g) + - Math.max(rgb1.b, rgb2.b) - Math.min(rgb1.b, rgb2.b) - ); - - return { - brightness: Math.abs(brightnessA - brightnessB), - color: colorDiff - }; - }; - - // `readable` - // http://www.w3.org/TR/AERT#color-contrast - // Ensure that foreground and background color combinations provide sufficient contrast. - // *Example* - // tinycolor.isReadable("#000", "#111") => false - tinycolor.isReadable = function(color1, color2) { - var readability = tinycolor.readability(color1, color2); - return readability.brightness > 125 && readability.color > 500; - }; - - // `mostReadable` - // Given a base color and a list of possible foreground or background - // colors for that base, returns the most readable color. - // *Example* - // tinycolor.mostReadable("#123", ["#fff", "#000"]) => "#000" - tinycolor.mostReadable = function(baseColor, colorList) { - var bestColor = null; - var bestScore = 0; - var bestIsReadable = false; - for (var i=0; i < colorList.length; i++) { - - // We normalize both around the "acceptable" breaking point, - // but rank brightness constrast higher than hue. - - var readability = tinycolor.readability(baseColor, colorList[i]); - var readable = readability.brightness > 125 && readability.color > 500; - var score = 3 * (readability.brightness / 125) + (readability.color / 500); - - if ((readable && ! bestIsReadable) || - (readable && bestIsReadable && score > bestScore) || - ((! readable) && (! bestIsReadable) && score > bestScore)) { - bestIsReadable = readable; - bestScore = score; - bestColor = tinycolor(colorList[i]); - } - } - return bestColor; - }; - - - // Big List of Colors - // ------------------ - // - var names = tinycolor.names = { - aliceblue: "f0f8ff", - antiquewhite: "faebd7", - aqua: "0ff", - aquamarine: "7fffd4", - azure: "f0ffff", - beige: "f5f5dc", - bisque: "ffe4c4", - black: "000", - blanchedalmond: "ffebcd", - blue: "00f", - blueviolet: "8a2be2", - brown: "a52a2a", - burlywood: "deb887", - burntsienna: "ea7e5d", - cadetblue: "5f9ea0", - chartreuse: "7fff00", - chocolate: "d2691e", - coral: "ff7f50", - cornflowerblue: "6495ed", - cornsilk: "fff8dc", - crimson: "dc143c", - cyan: "0ff", - darkblue: "00008b", - darkcyan: "008b8b", - darkgoldenrod: "b8860b", - darkgray: "a9a9a9", - darkgreen: "006400", - darkgrey: "a9a9a9", - darkkhaki: "bdb76b", - darkmagenta: "8b008b", - darkolivegreen: "556b2f", - darkorange: "ff8c00", - darkorchid: "9932cc", - darkred: "8b0000", - darksalmon: "e9967a", - darkseagreen: "8fbc8f", - darkslateblue: "483d8b", - darkslategray: "2f4f4f", - darkslategrey: "2f4f4f", - darkturquoise: "00ced1", - darkviolet: "9400d3", - deeppink: "ff1493", - deepskyblue: "00bfff", - dimgray: "696969", - dimgrey: "696969", - dodgerblue: "1e90ff", - firebrick: "b22222", - floralwhite: "fffaf0", - forestgreen: "228b22", - fuchsia: "f0f", - gainsboro: "dcdcdc", - ghostwhite: "f8f8ff", - gold: "ffd700", - goldenrod: "daa520", - gray: "808080", - green: "008000", - greenyellow: "adff2f", - grey: "808080", - honeydew: "f0fff0", - hotpink: "ff69b4", - indianred: "cd5c5c", - indigo: "4b0082", - ivory: "fffff0", - khaki: "f0e68c", - lavender: "e6e6fa", - lavenderblush: "fff0f5", - lawngreen: "7cfc00", - lemonchiffon: "fffacd", - lightblue: "add8e6", - lightcoral: "f08080", - lightcyan: "e0ffff", - lightgoldenrodyellow: "fafad2", - lightgray: "d3d3d3", - lightgreen: "90ee90", - lightgrey: "d3d3d3", - lightpink: "ffb6c1", - lightsalmon: "ffa07a", - lightseagreen: "20b2aa", - lightskyblue: "87cefa", - lightslategray: "789", - lightslategrey: "789", - lightsteelblue: "b0c4de", - lightyellow: "ffffe0", - lime: "0f0", - limegreen: "32cd32", - linen: "faf0e6", - magenta: "f0f", - maroon: "800000", - mediumaquamarine: "66cdaa", - mediumblue: "0000cd", - mediumorchid: "ba55d3", - mediumpurple: "9370db", - mediumseagreen: "3cb371", - mediumslateblue: "7b68ee", - mediumspringgreen: "00fa9a", - mediumturquoise: "48d1cc", - mediumvioletred: "c71585", - midnightblue: "191970", - mintcream: "f5fffa", - mistyrose: "ffe4e1", - moccasin: "ffe4b5", - navajowhite: "ffdead", - navy: "000080", - oldlace: "fdf5e6", - olive: "808000", - olivedrab: "6b8e23", - orange: "ffa500", - orangered: "ff4500", - orchid: "da70d6", - palegoldenrod: "eee8aa", - palegreen: "98fb98", - paleturquoise: "afeeee", - palevioletred: "db7093", - papayawhip: "ffefd5", - peachpuff: "ffdab9", - peru: "cd853f", - pink: "ffc0cb", - plum: "dda0dd", - powderblue: "b0e0e6", - purple: "800080", - rebeccapurple: "663399", - red: "f00", - rosybrown: "bc8f8f", - royalblue: "4169e1", - saddlebrown: "8b4513", - salmon: "fa8072", - sandybrown: "f4a460", - seagreen: "2e8b57", - seashell: "fff5ee", - sienna: "a0522d", - silver: "c0c0c0", - skyblue: "87ceeb", - slateblue: "6a5acd", - slategray: "708090", - slategrey: "708090", - snow: "fffafa", - springgreen: "00ff7f", - steelblue: "4682b4", - tan: "d2b48c", - teal: "008080", - thistle: "d8bfd8", - tomato: "ff6347", - turquoise: "40e0d0", - violet: "ee82ee", - wheat: "f5deb3", - white: "fff", - whitesmoke: "f5f5f5", - yellow: "ff0", - yellowgreen: "9acd32" - }; - - // Make it easy to access colors via `hexNames[hex]` - var hexNames = tinycolor.hexNames = flip(names); - - - // Utilities - // --------- - - // `{ 'name1': 'val1' }` becomes `{ 'val1': 'name1' }` - function flip(o) { - var flipped = { }; - for (var i in o) { - if (o.hasOwnProperty(i)) { - flipped[o[i]] = i; - } - } - return flipped; - } - - // Return a valid alpha value [0,1] with all invalid values being set to 1 - function boundAlpha(a) { - a = parseFloat(a); - - if (isNaN(a) || a < 0 || a > 1) { - a = 1; - } - - return a; - } - - // Take input from [0, n] and return it as [0, 1] - function bound01(n, max) { - if (isOnePointZero(n)) { n = "100%"; } - - var processPercent = isPercentage(n); - n = mathMin(max, mathMax(0, parseFloat(n))); - - // Automatically convert percentage into number - if (processPercent) { - n = parseInt(n * max, 10) / 100; - } - - // Handle floating point rounding errors - if ((math.abs(n - max) < 0.000001)) { - return 1; - } - - // Convert into [0, 1] range if it isn't already - return (n % max) / parseFloat(max); - } - - // Force a number between 0 and 1 - function clamp01(val) { - return mathMin(1, mathMax(0, val)); - } - - // Parse a base-16 hex value into a base-10 integer - function parseIntFromHex(val) { - return parseInt(val, 16); - } - - // Need to handle 1.0 as 100%, since once it is a number, there is no difference between it and 1 - // - function isOnePointZero(n) { - return typeof n == "string" && n.indexOf('.') != -1 && parseFloat(n) === 1; - } - - // Check to see if string passed in is a percentage - function isPercentage(n) { - return typeof n === "string" && n.indexOf('%') != -1; - } - - // Force a hex value to have 2 characters - function pad2(c) { - return c.length == 1 ? '0' + c : '' + c; - } - - // Replace a decimal with it's percentage value - function convertToPercentage(n) { - if (n <= 1) { - n = (n * 100) + "%"; - } - - return n; - } - - // Converts a decimal to a hex value - function convertDecimalToHex(d) { - return Math.round(parseFloat(d) * 255).toString(16); - } - // Converts a hex value to a decimal - function convertHexToDecimal(h) { - return (parseIntFromHex(h) / 255); - } - - var matchers = (function() { - - // - var CSS_INTEGER = "[-\\+]?\\d+%?"; - - // - var CSS_NUMBER = "[-\\+]?\\d*\\.\\d+%?"; - - // Allow positive/negative integer/number. Don't capture the either/or, just the entire outcome. - var CSS_UNIT = "(?:" + CSS_NUMBER + ")|(?:" + CSS_INTEGER + ")"; - - // Actual matching. - // Parentheses and commas are optional, but not required. - // Whitespace can take the place of commas or opening paren - var PERMISSIVE_MATCH3 = "[\\s|\\(]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")\\s*\\)?"; - var PERMISSIVE_MATCH4 = "[\\s|\\(]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")\\s*\\)?"; - - return { - rgb: new RegExp("rgb" + PERMISSIVE_MATCH3), - rgba: new RegExp("rgba" + PERMISSIVE_MATCH4), - hsl: new RegExp("hsl" + PERMISSIVE_MATCH3), - hsla: new RegExp("hsla" + PERMISSIVE_MATCH4), - hsv: new RegExp("hsv" + PERMISSIVE_MATCH3), - hsva: new RegExp("hsva" + PERMISSIVE_MATCH4), - hex3: /^([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/, - hex6: /^([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/, - hex8: /^([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/ - }; - })(); - - // `stringInputToObject` - // Permissive string parsing. Take in a number of formats, and output an object - // based on detected format. Returns `{ r, g, b }` or `{ h, s, l }` or `{ h, s, v}` - function stringInputToObject(color) { - - color = color.replace(trimLeft,'').replace(trimRight, '').toLowerCase(); - var named = false; - if (names[color]) { - color = names[color]; - named = true; - } - else if (color == 'transparent') { - return { r: 0, g: 0, b: 0, a: 0, format: "name" }; - } - - // Try to match string input using regular expressions. - // Keep most of the number bounding out of this function - don't worry about [0,1] or [0,100] or [0,360] - // Just return an object and let the conversion functions handle that. - // This way the result will be the same whether the tinycolor is initialized with string or object. - var match; - if ((match = matchers.rgb.exec(color))) { - return { r: match[1], g: match[2], b: match[3] }; - } - if ((match = matchers.rgba.exec(color))) { - return { r: match[1], g: match[2], b: match[3], a: match[4] }; - } - if ((match = matchers.hsl.exec(color))) { - return { h: match[1], s: match[2], l: match[3] }; - } - if ((match = matchers.hsla.exec(color))) { - return { h: match[1], s: match[2], l: match[3], a: match[4] }; - } - if ((match = matchers.hsv.exec(color))) { - return { h: match[1], s: match[2], v: match[3] }; - } - if ((match = matchers.hsva.exec(color))) { - return { h: match[1], s: match[2], v: match[3], a: match[4] }; - } - if ((match = matchers.hex8.exec(color))) { - return { - a: convertHexToDecimal(match[1]), - r: parseIntFromHex(match[2]), - g: parseIntFromHex(match[3]), - b: parseIntFromHex(match[4]), - format: named ? "name" : "hex8" - }; - } - if ((match = matchers.hex6.exec(color))) { - return { - r: parseIntFromHex(match[1]), - g: parseIntFromHex(match[2]), - b: parseIntFromHex(match[3]), - format: named ? "name" : "hex" - }; - } - if ((match = matchers.hex3.exec(color))) { - return { - r: parseIntFromHex(match[1] + '' + match[1]), - g: parseIntFromHex(match[2] + '' + match[2]), - b: parseIntFromHex(match[3] + '' + match[3]), - format: named ? "name" : "hex" - }; - } - - return false; - } - - window.tinycolor = tinycolor; - })(); - - $(function () { - if ($.fn.spectrum.load) { - $.fn.spectrum.processNativeColorInputs(); - } - }); - -}); From f966dff5a834955031fbf964ca007bdcaf46c199 Mon Sep 17 00:00:00 2001 From: slawkens Date: Sun, 28 Dec 2025 15:50:10 +0100 Subject: [PATCH 22/45] Convert switch to match --- system/src/Cache/Cache.php | 38 +++++++++----------------------------- 1 file changed, 9 insertions(+), 29 deletions(-) diff --git a/system/src/Cache/Cache.php b/system/src/Cache/Cache.php index e81e601d..30d007a6 100644 --- a/system/src/Cache/Cache.php +++ b/system/src/Cache/Cache.php @@ -47,35 +47,15 @@ class Cache return self::$instance; } - switch (strtolower($engine)) { - case 'apc': - self::$instance = new APC($prefix); - break; - - case 'apcu': - self::$instance = new APCu($prefix); - break; - - case 'xcache': - self::$instance = new XCache($prefix); - break; - - case 'file': - self::$instance = new File($prefix, CACHE); - break; - - case 'php': - self::$instance = new PHP($prefix, CACHE); - break; - - case 'auto': - self::$instance = self::generateInstance(self::detect(), $prefix); - break; - - default: - self::$instance = new self(); - break; - } + self::$instance = match (strtolower($engine)) { + 'apc' => new APC($prefix), + 'apcu' => new APCu($prefix), + 'xcache' => new XCache($prefix), + 'file' => new File($prefix, CACHE), + 'php' => new PHP($prefix, CACHE), + 'auto' => self::generateInstance(self::detect(), $prefix), + default => new self(), + }; return self::$instance; } From cc220bedc1f01535eaac23f6961135e2e7a6e310 Mon Sep 17 00:00:00 2001 From: slawkens Date: Thu, 1 Jan 2026 11:55:58 +0100 Subject: [PATCH 23/45] Remove setting: outfit_images_wrong_looktypes Is obsolete, the bug doesn't exist in latest outfit images --- system/compat/config.php | 1 - system/pages/highscores.php | 2 +- system/settings.php | 11 ----------- system/templates/characters.html.twig | 2 +- system/templates/forum.show_thread.html.twig | 2 +- system/templates/team.html.twig | 4 ++-- .../tibiacom/boxes/templates/highscores.html.twig | 2 +- 7 files changed, 6 insertions(+), 18 deletions(-) diff --git a/system/compat/config.php b/system/compat/config.php index 4fc3004a..59e9a5ed 100644 --- a/system/compat/config.php +++ b/system/compat/config.php @@ -21,7 +21,6 @@ $deprecatedConfig = [ 'visitors_counter_ttl', 'views_counter', 'outfit_images_url', - 'outfit_images_wrong_looktypes', 'item_images_url', 'account_country', 'towns', diff --git a/system/pages/highscores.php b/system/pages/highscores.php index 79d4feee..ea1a9fe6 100644 --- a/system/pages/highscores.php +++ b/system/pages/highscores.php @@ -249,7 +249,7 @@ foreach($highscores as $id => &$player) $player['link'] = getPlayerLink($player['name'], false); $player['flag'] = getFlagImage($player['country']); - $player['outfit'] = ''; + $player['outfit'] = ''; if ($skill != POT::SKILL__LEVEL) { if (isset($lastValue) && $lastValue == $player['value']) { diff --git a/system/settings.php b/system/settings.php index 96f24a8c..8dbbedf6 100644 --- a/system/settings.php +++ b/system/settings.php @@ -1482,17 +1482,6 @@ Sent by MyAAC,
    'desc' => 'Set to animoutfit.php for animated outfit', 'default' => 'https://outfit-images.ots.me/latest/outfit.php', ], - 'outfit_images_wrong_looktypes' => [ - 'name' => 'Outfit Images Wrong Looktypes', - 'type' => 'text', - 'desc' => 'This looktypes needs to have different margin-top and margin-left because they are wrong positioned', - 'default' => '75, 126, 127, 266, 302', - 'callbacks' => [ - 'get' => function ($value) { - return array_map('trim', explode(',', $value)); - }, - ], - ], [ 'type' => 'section', 'title' => 'Monster Images' diff --git a/system/templates/characters.html.twig b/system/templates/characters.html.twig index 75e15b68..fda95625 100644 --- a/system/templates/characters.html.twig +++ b/system/templates/characters.html.twig @@ -17,7 +17,7 @@ {% endif %} {% if config.characters.outfit %} -
    player outfit
    +
    player outfit
    {% endif %} diff --git a/system/templates/forum.show_thread.html.twig b/system/templates/forum.show_thread.html.twig index 71812be7..537849b0 100644 --- a/system/templates/forum.show_thread.html.twig +++ b/system/templates/forum.show_thread.html.twig @@ -24,7 +24,7 @@ Page: {{ links_to_pages|raw }}
    {% set i = i + 1 %} {% endif %} @@ -127,7 +127,7 @@ {% if setting('core.team_outfit') %} {% endif %} diff --git a/templates/tibiacom/boxes/templates/highscores.html.twig b/templates/tibiacom/boxes/templates/highscores.html.twig index c5eb5516..c1f8f1d6 100644 --- a/templates/tibiacom/boxes/templates/highscores.html.twig +++ b/templates/tibiacom/boxes/templates/highscores.html.twig @@ -46,7 +46,7 @@ {% for player in topPlayers %}
    {% if setting('core.online_outfit') %} - player outfit + player outfit {% endif %} {{ player['rank'] }} - {{ player['name'] }} From 6f87d8b322f2aa6abaa1e8d853265fffcf876fd7 Mon Sep 17 00:00:00 2001 From: slawkens Date: Thu, 1 Jan 2026 11:56:22 +0100 Subject: [PATCH 24/45] Add missing deprecated config.team_style --- system/compat/config.php | 1 + 1 file changed, 1 insertion(+) diff --git a/system/compat/config.php b/system/compat/config.php index 59e9a5ed..4534efe6 100644 --- a/system/compat/config.php +++ b/system/compat/config.php @@ -51,6 +51,7 @@ $deprecatedConfig = [ 'online_skulls', 'online_outfit', 'online_afk', + 'team_style', 'team_display_outfit' => 'team_outfit', 'team_display_status' => 'team_status', 'team_display_world' => 'team_world', From e0e0e467012a5fb9979cc4387af6bad1d4540279 Mon Sep 17 00:00:00 2001 From: slawkens Date: Fri, 2 Jan 2026 13:30:35 +0100 Subject: [PATCH 25/45] Move forum show_board code to Twig --- system/pages/forum/show_board.php | 64 +++++++-------------- system/templates/forum.show_board.html.twig | 57 ++++++++++++++++++ 2 files changed, 78 insertions(+), 43 deletions(-) create mode 100644 system/templates/forum.show_board.html.twig diff --git a/system/pages/forum/show_board.php b/system/pages/forum/show_board.php index e899cc99..51e8a856 100644 --- a/system/pages/forum/show_board.php +++ b/system/pages/forum/show_board.php @@ -42,35 +42,12 @@ for($i = 0; $i < $threads_count['threads_count'] / setting('core.forum_threads_p $links_to_pages .= ''.($i + 1).' '; } -echo 'Boards >> '.$sections[$section_id]['name'].''; - -if($logged && (!$sections[$section_id]['closed'] || Forum::isModerator())) { - echo '

    - '; -} - -echo '

    Page: '.$links_to_pages.'
    '; $last_threads = $db->query("SELECT `players`.`id` as `player_id`, `players`.`name`, `" . FORUM_TABLE_PREFIX . "forum`.`first_post`, `" . FORUM_TABLE_PREFIX . "forum`.`post_text`, `" . FORUM_TABLE_PREFIX . "forum`.`post_topic`, `" . FORUM_TABLE_PREFIX . "forum`.`id`, `" . FORUM_TABLE_PREFIX . "forum`.`last_post`, `" . FORUM_TABLE_PREFIX . "forum`.`replies`, `" . FORUM_TABLE_PREFIX . "forum`.`views`, `" . FORUM_TABLE_PREFIX . "forum`.`post_date` FROM `players`, `" . FORUM_TABLE_PREFIX . "forum` WHERE `players`.`id` = `" . FORUM_TABLE_PREFIX . "forum`.`author_guid` AND `" . FORUM_TABLE_PREFIX . "forum`.`section` = ".$section_id." AND `" . FORUM_TABLE_PREFIX . "forum`.`first_post` = `" . FORUM_TABLE_PREFIX . "forum`.`id` ORDER BY `" . FORUM_TABLE_PREFIX . "forum`.`last_post` DESC LIMIT ".setting('core.forum_threads_per_page')." OFFSET ".($_page * setting('core.forum_threads_per_page')))->fetchAll(PDO::FETCH_ASSOC); -if(isset($last_threads[0])) { - echo '
    {{ post.player_link|raw }}
    {% if post.outfit is defined %} - player outfit + player outfit
    {% endif %} diff --git a/system/templates/team.html.twig b/system/templates/team.html.twig index 7c7fe204..ec63320d 100644 --- a/system/templates/team.html.twig +++ b/system/templates/team.html.twig @@ -47,7 +47,7 @@ {% if setting('core.team_outfit') %}     		- player outfit + player outfit
    - player outfit + player outfit
    - - - - - - -'; - +$threads = []; +if(count($last_threads) > 0) { $player = new OTS_Player(); foreach($last_threads as $thread) { - echo ''; - } - echo '
    -ThreadThread StarterRepliesViewsLast Post
    '; - if(Forum::isModerator()) { - echo ''; - $twig->display('forum.remove_post.html.twig', ['post' => $thread]); - } - $player->load($thread['player_id']); if(!$player->isLoaded()) { throw new RuntimeException('Forum error: Player not loaded.'); @@ -79,28 +56,29 @@ if(isset($last_threads[0])) { $player_account = $player->getAccount(); $canEditForum = $player_account->hasFlag(FLAG_CONTENT_FORUM) || $player_account->isAdmin(); - echo ''.htmlspecialchars($thread['post_topic']). '
    '.($canEditForum ? substr(strip_tags($thread['post_text']), 0, 50) : htmlspecialchars(substr($thread['post_text'], 0, 50))).'...    		' . getPlayerLink($thread['name']) . ''.(int) $thread['replies'].''.(int) $thread['views'].''; + $thread['link'] = getForumThreadLink($thread['id']); + + $thread['post_shortened'] = ($canEditForum ? substr(strip_tags($thread['post_text']), 0, 50) : htmlspecialchars(substr($thread['post_text'], 0, 50))); + + $thread['player'] = $player; + $thread['player_link'] = getPlayerLink($thread['name']); + if($thread['last_post'] > 0) { $last_post = $db->query("SELECT `players`.`name`, `" . FORUM_TABLE_PREFIX . "forum`.`post_date` FROM `players`, `" . FORUM_TABLE_PREFIX . "forum` WHERE `" . FORUM_TABLE_PREFIX . "forum`.`first_post` = ".(int) $thread['id']." AND `players`.`id` = `" . FORUM_TABLE_PREFIX . "forum`.`author_guid` ORDER BY `post_date` DESC LIMIT 1")->fetch(); - if(isset($last_post['name'])) { - echo date('d.m.y H:i:s', $last_post['post_date']) . '
    by ' . getPlayerLink($last_post['name']); - } - else { - echo 'No posts.'; - } + $last_post['player_link'] = getPlayerLink($last_post['name']); + $thread['latest_post'] = $last_post; } - else { - echo date('d.m.y H:i:s', $thread['post_date']) . '
    by ' . getPlayerLink($thread['name']); - } - echo '
    '; - if($logged && (!$sections[$section_id]['closed'] || Forum::isModerator())) { - echo '
    '; + $threads[] = $thread; } } -else { - echo '

    No threads in this board.

    '; -} + +$twig->display('forum.show_board.html.twig', [ + 'threads' => $threads, + 'section_id' => $section_id, + 'section_name' => $sections[$section_id]['name'], + 'links_to_pages' => $links_to_pages, + 'is_moderator' => Forum::isModerator(), + 'closed' => $sections[$section_id]['closed'], +]); diff --git a/system/templates/forum.show_board.html.twig b/system/templates/forum.show_board.html.twig new file mode 100644 index 00000000..7cdef157 --- /dev/null +++ b/system/templates/forum.show_board.html.twig @@ -0,0 +1,57 @@ +Boards >> {{ section_name }} + +{% if (logged and (not closed or is_moderator)) %} +

    + +{% endif %} + +{% if threads|length > 0 %} +

    Page: {{ links_to_pages|raw }}
    + + + + + + + + + + + {% set i = 0 %} + {% for thread in threads %} + + + + + + + + + {% set i = i + 1 %} + {% endfor %} +
    ThreadThread StarterRepliesViewsLast Post
    + {% if is_moderator %} + + {{ include('forum.remove_post.html.twig', {post: thread}) }} + {% endif %} + {{ thread.post_topic }}
    + {{ thread.post_shortened|raw }}... +     		{{ thread.player_link|raw }}{{ thread.replies }}{{ thread.views }} + {% if thread.last_post > 0 %} + {% if thread.latest_post.name is defined %} + {{ thread.latest_post.post_date|date('d.m.y H:i:s') }}
    by {{ thread.latest_post.player_link|raw }} + {% else %} + No posts. + {% endif %} + {% else %} + {{ thread.post_date|date('d.m.y H:i:s') }}
    by {{ thread.player_link|raw }} + {% endif %} +
    + +{% else %} +

    No threads in this board.

    +{% endif %} + +{% if(logged and (not closed or is_moderator)) %} +
    +{% endif %} From 18c0212f9a6225c0a8b6bf463297e144ee74c10e Mon Sep 17 00:00:00 2001 From: slawkens Date: Fri, 2 Jan 2026 14:04:34 +0100 Subject: [PATCH 26/45] Forum better button styling --- system/templates/forum.new_post.html.twig | 5 +++-- system/templates/forum.new_thread.html.twig | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/system/templates/forum.new_post.html.twig b/system/templates/forum.new_post.html.twig index d267b7db..af2a4c1a 100644 --- a/system/templates/forum.new_post.html.twig +++ b/system/templates/forum.new_post.html.twig @@ -1,7 +1,7 @@
    {{ csrf() }} - + @@ -43,7 +43,8 @@
    - + {% set button_name = 'Post Reply' %} + {{ include('buttons.base.html.twig') }}
    diff --git a/system/templates/forum.new_thread.html.twig b/system/templates/forum.new_thread.html.twig index e37bda08..bb9e0129 100644 --- a/system/templates/forum.new_thread.html.twig +++ b/system/templates/forum.new_thread.html.twig @@ -44,6 +44,7 @@
    - + {% set button_name = 'Post Thread' %} + {{ include('buttons.base.html.twig') }}
    From 5c68fba82adbe1b6422844229478bd54b561eeb4 Mon Sep 17 00:00:00 2001 From: slawkens Date: Fri, 2 Jan 2026 15:51:10 +0100 Subject: [PATCH 27/45] Add labels to some inputs + some small adjustments --- system/pages/account/change-password.php | 2 +- system/pages/account/register-new.php | 2 +- system/templates/account.change-email.html.twig | 8 ++++---- system/templates/account.change-info.html.twig | 16 +++++++++++----- .../templates/account.change-password.html.twig | 6 +++--- .../account.characters.change-name.html.twig | 12 ++++++++---- .../account.characters.change-sex.html.twig | 12 ++++++++---- .../account.characters.delete.html.twig | 12 ++++++++---- system/templates/account.create.html.twig | 2 +- .../account.generate_new_recovery_key.html.twig | 14 ++++++++------ .../account.generate_recovery_key.html.twig | 6 +++--- 11 files changed, 56 insertions(+), 36 deletions(-) diff --git a/system/pages/account/change-password.php b/system/pages/account/change-password.php index 157515b7..a48902e7 100644 --- a/system/pages/account/change-password.php +++ b/system/pages/account/change-password.php @@ -22,7 +22,7 @@ csrfProtect(); $new_password = $_POST['new_password'] ?? null; $new_password_confirm = $_POST['new_password_confirm'] ?? null; $old_password = $_POST['old_password'] ?? null; -if(empty($new_password) && empty($new_password_confirm) && empty($old_password)) { +if(is_null($new_password) && is_null($new_password_confirm) && is_null($old_password)) { $twig->display('account.change-password.html.twig'); } else { diff --git a/system/pages/account/register-new.php b/system/pages/account/register-new.php index bca3b798..d328a310 100644 --- a/system/pages/account/register-new.php +++ b/system/pages/account/register-new.php @@ -48,7 +48,7 @@ else $account_logged->setCustomField('key', $new_rec_key); $account_logged->setCustomField(setting('core.donate_column'), $account_logged->getCustomField(setting('core.donate_column')) - setting('core.account_generate_new_reckey_price')); $account_logged->logAction('Generated new recovery key for ' . setting('core.account_generate_new_reckey_price') . ' premium points.'); - $message = '
    Your recovery key were send on email address '.$account_logged->getEMail().' for '.setting('core.account_generate_new_reckey_price').' premium points.'; + $message = '
    Your recovery key was sent on email address '.$account_logged->getEMail().' for '.setting('core.account_generate_new_reckey_price').' premium points.'; } else $message = '

    An error occurred while sending email ( '.$account_logged->getEMail().' ) with recovery key! Recovery key not changed. Try again later. For Admin: More info can be found in system/logs/mailer-error.log

    '; diff --git a/system/templates/account.change-email.html.twig b/system/templates/account.change-email.html.twig index ab2a8c06..3fde55a9 100644 --- a/system/templates/account.change-email.html.twig +++ b/system/templates/account.change-email.html.twig @@ -5,18 +5,18 @@ Please enter your password and the new email address. Make sure that you enter a
    - New Email Address: + - +
    - Password: + - +
    diff --git a/system/templates/account.change-info.html.twig b/system/templates/account.change-info.html.twig index e3481472..9461b986 100644 --- a/system/templates/account.change-info.html.twig +++ b/system/templates/account.change-info.html.twig @@ -4,20 +4,26 @@ Here you can tell other players about yourself. This information will be display {% set content %} - + - + {% if setting('core.account_country') %} - +
    Real Name: + + - +
    Location: + + - +
    Country: + +
    - Current Password: + @@ -17,7 +17,7 @@ Please enter your current password and a new password. For your security, please
    - New Password: + @@ -28,7 +28,7 @@ Please enter your current password and a new password. For your security, please
    - New Password Again: + diff --git a/system/templates/account.characters.change-name.html.twig b/system/templates/account.characters.change-name.html.twig index 7a0cfe22..f70eaf89 100644 --- a/system/templates/account.characters.change-name.html.twig +++ b/system/templates/account.characters.change-name.html.twig @@ -1,4 +1,4 @@ -To change a name of character select player and choose a new name.
    +To change the name of a character, select a player and choose a new name.
    Change name cost {{ setting('core.account_change_character_name_price') }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}. You have {{ points }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}.

    {% set title = 'Change Name' %} @@ -6,9 +6,11 @@ To change a name of character select player and choose a new name.
    {% set content %} - + - + {% if setting('core.mail_enabled') and setting('core.account_mail_verify') %} - + {% endif %} {{ hook('HOOK_ACCOUNT_CREATE_AFTER_EMAIL') }} diff --git a/system/templates/account.generate_new_recovery_key.html.twig b/system/templates/account.generate_new_recovery_key.html.twig index fc48d3a9..2c743378 100644 --- a/system/templates/account.generate_new_recovery_key.html.twig +++ b/system/templates/account.generate_new_recovery_key.html.twig @@ -1,13 +1,15 @@ -To generate new recovery key for your account please enter your password.
    -New recovery key cost {{ setting('core.account_generate_new_reckey_price') }} Premium Points. You have {{ points }} premium points. You will receive e-mail with this recovery key. +To generate a new recovery key for your account, please enter your password.
    +New recovery key cost {{ setting('core.account_change_character_name_price') }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}. You have {{ points }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}. You will receive an e-mail with this recovery key.
    {% set title = 'Generate recovery key' %} {% set background = config('darkborder') %} {% set content %}
    Character: + + - {% for player in account_logged.getPlayersList(false) %} {% endfor %} @@ -16,7 +18,9 @@ To change a name of character select player and choose a new name.
    New Name: + + diff --git a/system/templates/account.characters.change-sex.html.twig b/system/templates/account.characters.change-sex.html.twig index 440fed9f..7dd35fa1 100644 --- a/system/templates/account.characters.change-sex.html.twig +++ b/system/templates/account.characters.change-sex.html.twig @@ -6,9 +6,11 @@ To change a sex of character select player and choose a new sex.
    {% set content %} - + - + - + - +
    Character: + + - {% for player in players %} {% endfor %} @@ -16,9 +18,11 @@ To change a sex of character select player and choose a new sex.
    New Sex: + + - {% for id, gender in config.genders %} {% endfor %} diff --git a/system/templates/account.characters.delete.html.twig b/system/templates/account.characters.delete.html.twig index b946d221..172c36b1 100644 --- a/system/templates/account.characters.delete.html.twig +++ b/system/templates/account.characters.delete.html.twig @@ -4,15 +4,19 @@ To delete a character enter the name of the character and your password.

    Character Name: + + - +
    Password: + + - +
    diff --git a/system/templates/account.create.html.twig b/system/templates/account.create.html.twig index 2e5267e2..6e71d045 100644 --- a/system/templates/account.create.html.twig +++ b/system/templates/account.create.html.twig @@ -48,7 +48,7 @@
    Please use real address!
    We will send a link to validate your Email.
    Please use a real address!
    We will send a link to validate your Email.
    - - + +
    Password: + +
    {% endset %} @@ -18,7 +20,7 @@ To generate new recovery key for your account please enter your password.
    		 -
    +
    {{ csrf() }} @@ -31,7 +33,7 @@ To generate new recovery key for your account please enter your password.
    		 -
    + {{ csrf() }} {{ include('buttons.back.html.twig') }} diff --git a/system/templates/account.generate_recovery_key.html.twig b/system/templates/account.generate_recovery_key.html.twig index 526d4659..82901be8 100644 --- a/system/templates/account.generate_recovery_key.html.twig +++ b/system/templates/account.generate_recovery_key.html.twig @@ -5,10 +5,10 @@ To generate recovery key for your account please enter your password.

    - Password: + - +
    @@ -20,7 +20,7 @@ To generate recovery key for your account please enter your password.

    		 - {% if players|length > 0 %} - + From aba50ca0f12ae0b2cca03c1587e8cb9054a9f765 Mon Sep 17 00:00:00 2001 From: slawkens Date: Fri, 2 Jan 2026 20:07:17 +0100 Subject: [PATCH 30/45] Better delete rank button --- images/news/delete.png | Bin 1005 -> 0 bytes system/templates/guilds.manager.html.twig | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 images/news/delete.png diff --git a/images/news/delete.png b/images/news/delete.png deleted file mode 100644 index 417be1b52324478148104edfac9752007aca1c62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1005 zcmV<-3T9?xT3cH}LqmQ{N`{7niHV1R zfq+U%N}wPhZg6mTd3kz!dxkA7Z#_M9LP2LiLZu`llrAlCa&tB|I9N?hwhs@VA0Wj9 z1ZP`Xc}GTUZEk#he3LmiogE#f85)i>G{Ff8mLnr|c6Mw@5W zZd6lKM@Xs`7h_9HjwdHvP*Hk2JBvO&ZB0#kJv_D*6@xuHY+zoWEG&6bP<2~cnkXlF zIyz%lRh!?78~^|S4|GyaQvl%lY3Al>B_;mg`rv8$I=;b90006^NklQxQ~Ie{S>SWF<1AIcaE)~-L+_VxAE z1IJJDA<*)-u+bwZoxUO*&+!PFSzi#86iUrAQer013n>DC z{L3y(WHc}nFUlT*Pz9dfQUPdCYLF?mrJ{6VVii_a8cY27@TOlMcRL$$n;bKF_+J%AFSJ|bZAhuv~>p8zqM`#zaJJ8sb3${g$6$wOX4 zL1iUYk*f^gxy@|=`V?RDp_pFG8j6hBZV4b8xVAlM0UU}P7lvWZLVKf0@ZXU7ysjh>iyt*BXH?Epbc$@FM7tm7J%Jr^^xHfDA5GA~-(E3I|fh b$7T8-x`HWdAqUzZ00000NkvXXu0mjfjY64@ diff --git a/system/templates/guilds.manager.html.twig b/system/templates/guilds.manager.html.twig index adebdff2..b7fcc67b 100644 --- a/system/templates/guilds.manager.html.twig +++ b/system/templates/guilds.manager.html.twig @@ -105,7 +105,8 @@ Here you can change names of ranks, delete and add ranks, pass leadership to oth {{ csrf() }} - + +
    + {{ csrf() }} From ba1c63921dc45665d43c9311e65a7c4d1916ebb0 Mon Sep 17 00:00:00 2001 From: slawkens Date: Fri, 2 Jan 2026 20:02:57 +0100 Subject: [PATCH 28/45] Update guilds.leave_guild.html.twig --- system/templates/guilds.leave_guild.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/templates/guilds.leave_guild.html.twig b/system/templates/guilds.leave_guild.html.twig index 4d865cef..b168e31f 100644 --- a/system/templates/guilds.leave_guild.html.twig +++ b/system/templates/guilds.leave_guild.html.twig @@ -6,7 +6,7 @@ Leave guild
    Select character to leave guild:Select a character to leave the guild:
    From 0110bf6ea2a66bb05be4ad4cc26a36edc4a786fd Mon Sep 17 00:00:00 2001 From: slawkens Date: Fri, 2 Jan 2026 20:06:07 +0100 Subject: [PATCH 29/45] Account character list: Add [ DELETED ] for deleted characters --- system/templates/account.management.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/templates/account.management.html.twig b/system/templates/account.management.html.twig index 03e2c2a6..7df72d9e 100644 --- a/system/templates/account.management.html.twig +++ b/system/templates/account.management.html.twig @@ -179,7 +179,7 @@ {% set i = i + 1 %}
    - {{ player.getName() }} + {{ player.getName() }}{% if player.isDeleted() %} [ DELETED ] {% endif %} {{ player.getLevel() }} {{ player.getVocationName() }} From 2d8d35f5c8fbe38fce0f9ec3a265d2e7e506ae5e Mon Sep 17 00:00:00 2001 From: slawkens Date: Sat, 3 Jan 2026 13:21:13 +0100 Subject: [PATCH 31/45] Some adjustments to the online page Use tables.headline Use .myaac-table --- system/templates/online.html.twig | 56 +++++++++++++++++++------------ 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/system/templates/online.html.twig b/system/templates/online.html.twig index 6f798740..a15cb5f3 100644 --- a/system/templates/online.html.twig +++ b/system/templates/online.html.twig @@ -4,24 +4,35 @@
    {% endif %} +
    + {# vocation statistics #} {% if setting('core.online_vocations') %} -
    + + {% set title = 'Vocation statistics' %} + {% set tableClass = 'Table3' %} + {% set background = config('darkborder') %} + {% set content %} + {% if setting('core.online_vocations_images') %} - - - - - - - - +
    + + - + + + + + + + + + + @@ -29,30 +40,30 @@
    Sorcerers Druids Paladins Knights
    {{ vocs[1] }} {{ vocs[2] }} {{ vocs[3] }}
     
    - {% else %} - - - - - + {% else %} +
    Vocation statistics
    {% for i in 1..config.vocations_amount %} - + {% endfor %}
    {{ config.vocations[i] }} {{ vocs[i] }}
    -
    +
    {% endif %} + +{% endset %} +{% include 'tables.headline.html.twig' %} + {% endif %}
    {# show skulls #} {% if setting('core.online_skulls') %} - +
    - {% for vocationId in baseVocations %} - + {% endfor %} From 2db4f6a57b3ed9019734efbe7c29ff6cc35d9c40 Mon Sep 17 00:00:00 2001 From: slawkens Date: Sun, 4 Jan 2026 13:19:58 +0100 Subject: [PATCH 45/45] Update online.html.twig --- system/templates/online.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/templates/online.html.twig b/system/templates/online.html.twig index f3bd70be..07af9151 100644 --- a/system/templates/online.html.twig +++ b/system/templates/online.html.twig @@ -26,7 +26,7 @@ {% for vocationId in baseVocations %} - + {% endfor %}
    + - 1 - 6 Frags
    - 6+ Frags or Red Skull
    - 10+ Frags or Black Skull @@ -125,7 +136,8 @@ {% set title = 'Players Online' %} {% set tableClass = 'Table2' %} {% set content %} - +
    + {% if setting('core.account_country') %} + {% if setting('core.account_country') %} {% endif %} From 7c9c8d299029fc94c6e7d2c6cdfd32daa7033261 Mon Sep 17 00:00:00 2001 From: slawkens Date: Sat, 3 Jan 2026 13:43:32 +0100 Subject: [PATCH 32/45] More small adjustments to online page --- system/templates/online.html.twig | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/system/templates/online.html.twig b/system/templates/online.html.twig index a15cb5f3..0593f884 100644 --- a/system/templates/online.html.twig +++ b/system/templates/online.html.twig @@ -138,22 +138,22 @@ {% set content %}
    #   @@ -151,7 +163,7 @@ {% for player in players %} {% set i = i + 1 %} -
    {{ player.country_image|raw }}
    - + {% if setting('core.account_country') %} - {% endif %} {% if setting('core.online_outfit') %} - + {% endif %} - - - @@ -169,14 +169,14 @@ {% endif %} {% if setting('core.online_outfit') %} - + {% endif %} - - - + + {% endfor %}
    #   + #   OutfitOutfitName   + Name   [sort] Level   + Level   [sort] Vocation   + Vocation   [sort] player outfitplayer outfit + {{ player.name|raw }}{{ player.skull|raw }} {{ player.level }}{{ player.vocation }}{{ player.level }}{{ player.vocation }}
    From 7e6480b380799add7a2b1b7ce1d3c1f2b6819ff1 Mon Sep 17 00:00:00 2001 From: slawkens Date: Sat, 3 Jan 2026 20:25:12 +0100 Subject: [PATCH 33/45] Return 404 when signature player not found In most cases it was a request for a non existing file --- tools/signature/index.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/signature/index.php b/tools/signature/index.php index c791831b..f981d44d 100644 --- a/tools/signature/index.php +++ b/tools/signature/index.php @@ -35,14 +35,14 @@ if(!isset($_REQUEST['name'])) die('Please enter name as get or post parameter.'); - $name = stripslashes(ucwords(strtolower(trim($_REQUEST['name'])))); $player = new OTS_Player(); - $player->find($name); + $player->find($_REQUEST['name']); if(!$player->isLoaded()) { - header('Content-type: image/png'); - readfile(SIGNATURES_IMAGES.'nocharacter.png'); + //header('Content-type: image/png'); + //readfile(SIGNATURES_IMAGES.'nocharacter.png'); + http_response_code(404); exit; } From fec3f3d297bd82d9a893529a166ecaf3002f10ed Mon Sep 17 00:00:00 2001 From: slawkens Date: Sat, 3 Jan 2026 20:39:49 +0100 Subject: [PATCH 34/45] Fix wrong header in admin changelogs --- system/templates/admin.changelog.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/templates/admin.changelog.html.twig b/system/templates/admin.changelog.html.twig index 7581beef..bee10934 100644 --- a/system/templates/admin.changelog.html.twig +++ b/system/templates/admin.changelog.html.twig @@ -1,6 +1,6 @@
    -
    News: +
    Changelogs:
    {{ csrf() }} From c65d4e4b62ef26fb4e24ecb1d2bcc4556d746adf Mon Sep 17 00:00:00 2001 From: slawkens Date: Sat, 3 Jan 2026 20:40:44 +0100 Subject: [PATCH 35/45] Settings: better responsiveness on mobile --- system/src/Settings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/src/Settings.php b/system/src/Settings.php index fea52d04..2a7a1681 100644 --- a/system/src/Settings.php +++ b/system/src/Settings.php @@ -184,11 +184,11 @@ class Settings implements \ArrayAccess } ?>

    - +
    - + From efef16ee86795119fae0fae2e0cae67f81966bf6 Mon Sep 17 00:00:00 2001 From: slawkens Date: Sat, 3 Jan 2026 22:01:58 +0100 Subject: [PATCH 36/45] Extract script.ajax-setup.html.twig --- system/templates/admin.settings.html.twig | 8 ++------ system/templates/script.ajax-setup.html.twig | 7 +++++++ 2 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 system/templates/script.ajax-setup.html.twig diff --git a/system/templates/admin.settings.html.twig b/system/templates/admin.settings.html.twig index 7982780d..f05198e0 100644 --- a/system/templates/admin.settings.html.twig +++ b/system/templates/admin.settings.html.twig @@ -73,13 +73,9 @@ - From 55da00520df7463a1d1ca41931df1598e9f2ffeb Mon Sep 17 00:00:00 2001 From: slawkens Date: Sat, 3 Jan 2026 22:04:49 +0100 Subject: [PATCH 37/45] Admin Panel: save menu collapse state --- admin/template/template.php | 5 +-- admin/tools/menu_collapse.php | 23 +++++++++++++ .../templates/admin.menu-collapse.html.twig | 33 +++++++++++++++++++ 3 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 admin/tools/menu_collapse.php create mode 100644 system/templates/admin.menu-collapse.html.twig diff --git a/admin/template/template.php b/admin/template/template.php index c6b8747b..cdb20519 100644 --- a/admin/template/template.php +++ b/admin/template/template.php @@ -19,14 +19,14 @@ trigger(HOOK_ADMIN_HEAD_END); ?> - + trigger(HOOK_ADMIN_BODY_START); ?>
    diff --git a/system/templates/online.html.twig b/system/templates/online.html.twig index 0593f884..2ce64287 100644 --- a/system/templates/online.html.twig +++ b/system/templates/online.html.twig @@ -18,35 +18,35 @@
    NameValueValue Description
    [ALL]
    - {% for i in 0..config.vocations_amount %} + {% for i in baseVocations %} {{ config.vocations[i]}}
    {% endfor %}
    - - - - + {% for vocationId in baseVocations %} + + {% endfor %} - - - - + {% for vocationId in baseVocations %} + + {% endfor %} - - - - + {% for vocationId in baseVocations %} + + {% endfor %}
    SorcerersDruidsPaladinsKnights{{ config('vocations')[vocationId] }}s
    {{ vocs[1] }}{{ vocs[2] }}{{ vocs[3] }}{{ vocs[4] }}{{ vocs[vocationId] }}
     
    {% else %} - {% for i in 1..config.vocations_amount %} - - - - + {% set i = 0 %} + {% for vocationId in baseVocations %} + + + + + + {% set i = i + 1 %} {% endfor %}
    {{ config.vocations[i] }}{{ vocs[i] }}
    {{ config.vocations[vocationId] }}{{ vocs[vocationId] }}

    From af9d4c2aeb49d67b53e4b03ca246183ec5d6b119 Mon Sep 17 00:00:00 2001 From: slawkens Date: Sun, 4 Jan 2026 13:04:01 +0100 Subject: [PATCH 40/45] Update CHANGELOG-2.x.md --- CHANGELOG-2.x.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md index 3a51ae46..ff679d60 100644 --- a/CHANGELOG-2.x.md +++ b/CHANGELOG-2.x.md @@ -1,4 +1,9 @@ ## [2.0-dev - x.x.2025] ### Changed -* Reworked account action logs to use single IP column as varchar(45) for both ipv4 and ipv6 (https://github.com/slawkens/myaac/pull/289) +* Better handling of vocations: (#345) + * Load from vocations.xml (No need to manually set) + * Support for Monk vocation +* Add an access option to Menus (#340) + * Possibility to hide menus for unauthorized users +* Reworked account action logs to use a single IP column as varchar(45) for both ipv4 and ipv6 (https://github.com/slawkens/myaac/pull/289) From 7289cce826a8ff78cd97800f75273e5f2c661ef6 Mon Sep 17 00:00:00 2001 From: slawkens Date: Sun, 4 Jan 2026 13:13:14 +0100 Subject: [PATCH 41/45] Update CHANGELOG-2.x.md --- CHANGELOG-2.x.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md index ff679d60..096b1ee2 100644 --- a/CHANGELOG-2.x.md +++ b/CHANGELOG-2.x.md @@ -6,4 +6,4 @@ * Support for Monk vocation * Add an access option to Menus (#340) * Possibility to hide menus for unauthorized users -* Reworked account action logs to use a single IP column as varchar(45) for both ipv4 and ipv6 (https://github.com/slawkens/myaac/pull/289) +* Reworked account action logs to use a single IP column as varchar(45) for both ipv4 and ipv6 (#289) From dcdaa5ef43ae0811756b2684f2282b29803d1888 Mon Sep 17 00:00:00 2001 From: Slawomir Boczek Date: Sun, 4 Jan 2026 13:13:38 +0100 Subject: [PATCH 42/45] Feature/get top players skills (#347) * Add skills to getTopPlayers * Add example top-5 * Extract getSkillIdByName($name) --- system/functions.php | 96 ++++++++++++++++++++++++++++++-- system/pages/#examples/top-5.php | 29 ++++++++++ 2 files changed, 119 insertions(+), 6 deletions(-) create mode 100644 system/pages/#examples/top-5.php diff --git a/system/functions.php b/system/functions.php index f11fa382..992f9fe2 100644 --- a/system/functions.php +++ b/system/functions.php @@ -17,6 +17,8 @@ use MyAAC\Models\Guild; use MyAAC\Models\House; use MyAAC\Models\Pages; use MyAAC\Models\Player; +use MyAAC\Models\PlayerDeath; +use MyAAC\Models\PlayerKillers; use MyAAC\News; use MyAAC\Plugins; use MyAAC\Settings; @@ -1135,11 +1137,44 @@ function csrfProtect(): void } } -function getTopPlayers($limit = 5, $skill = 'level') { +function getSkillIdByName(string $name): int|null +{ + $skills = [ + 'level' => POT::SKILL_LEVEL, + 'experience' => POT::SKILL_LEVEL, + + 'magic' => POT::SKILL_MAGIC, + 'maglevel' => POT::SKILL_MAGIC, + + 'balance' => SKILL_BALANCE, + 'frags' => SKILL_FRAGS, + + 'club' => POT::SKILL_CLUB, + 'sword' => POT::SKILL_SWORD, + 'axe' => POT::SKILL_AXE, + 'dist' => POT::SKILL_DIST, + 'distance' => POT::SKILL_DIST, + 'shield' => POT::SKILL_SHIELD, + 'shielding' => POT::SKILL_SHIELD, + 'fish' => POT::SKILL_FISH, + 'fishing' => POT::SKILL_FISH, + ]; + + return $skills[$name] ?? null; +} + +function getTopPlayers($limit = 5, $skill = POT::SKILL_LEVEL) +{ global $db; - if ($skill === 'level') { - $skill = 'experience'; + $skillOriginal = $skill; + + if (is_string($skill)) { + $skill = getSkillIdByName($skill); + } + + if (!is_numeric($skill)) { + throw new RuntimeException("getTopPlayers: Invalid skill: $skillOriginal"); } return Cache::remember("top_{$limit}_{$skill}", 2 * 60, function () use ($db, $limit, $skill) { @@ -1160,15 +1195,64 @@ function getTopPlayers($limit = 5, $skill = 'level') { $columns[] = 'lookmount'; } - return Player::query() + $query = Player::query() ->select($columns) ->withOnlineStatus() ->notDeleted() ->where('group_id', '<', setting('core.highscores_groups_hidden')) ->whereNotIn('id', setting('core.highscores_ids_hidden')) ->where('account_id', '!=', 1) - ->orderByDesc($skill) - ->limit($limit) + ->orderByDesc('value'); + + if ($limit > 0) { + $query->limit($limit); + } + + if ($skill >= POT::SKILL_FIRST && $skill <= POT::SKILL_LAST) { // skills + if ($db->hasColumn('players', 'skill_fist')) {// tfs 1.0 + $skill_ids = array( + POT::SKILL_FIST => 'skill_fist', + POT::SKILL_CLUB => 'skill_club', + POT::SKILL_SWORD => 'skill_sword', + POT::SKILL_AXE => 'skill_axe', + POT::SKILL_DIST => 'skill_dist', + POT::SKILL_SHIELD => 'skill_shielding', + POT::SKILL_FISH => 'skill_fishing', + ); + + $query + ->addSelect($skill_ids[$skill] . ' as value') + ->orderByDesc($skill_ids[$skill] . '_tries'); + } else { + $query + ->join('player_skills', 'player_skills.player_id', '=', 'players.id') + ->where('skillid', $skill) + ->addSelect('player_skills.value as value'); + } + } else if ($skill == SKILL_FRAGS) // frags + { + if ($db->hasTable('player_killers')) { + $query->addSelect(['value' => PlayerKillers::whereColumn('player_killers.player_id', 'players.id')->selectRaw('COUNT(*)')]); + } else { + $query->addSelect(['value' => PlayerDeath::unjustified()->whereColumn('player_deaths.killed_by', 'players.name')->selectRaw('COUNT(*)')]); + } + } else if ($skill == SKILL_BALANCE) // balance + { + $query + ->addSelect('players.balance as value'); + } else { + if ($skill == POT::SKILL_MAGIC) { + $query + ->addSelect('players.maglevel as value', 'players.maglevel') + ->orderByDesc('manaspent'); + } else { // level + $query + ->addSelect('players.level as value', 'players.experience') + ->orderByDesc('experience'); + } + } + + return $query ->get() ->map(function ($e, $i) { $row = $e->toArray(); diff --git a/system/pages/#examples/top-5.php b/system/pages/#examples/top-5.php new file mode 100644 index 00000000..f091f2b5 --- /dev/null +++ b/system/pages/#examples/top-5.php @@ -0,0 +1,29 @@ + +
      +' . ucwords(is_string($skill) ? $skill : getSkillName($skill)) . ''; + foreach (getTopPlayers(5, $skill) as $player) {?> +
      • + +
    + Date: Sun, 4 Jan 2026 13:17:03 +0100 Subject: [PATCH 43/45] Update CHANGELOG-2.x.md --- CHANGELOG-2.x.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md index 096b1ee2..63cbdde7 100644 --- a/CHANGELOG-2.x.md +++ b/CHANGELOG-2.x.md @@ -1,9 +1,12 @@ ## [2.0-dev - x.x.2025] +### Added +* Add an "access" option to Menus (#340) + * Possibility to hide menus for unauthorized users +* Add the possibility to fetch skills in the getTopPlayers function + ### Changed * Better handling of vocations: (#345) * Load from vocations.xml (No need to manually set) * Support for Monk vocation -* Add an access option to Menus (#340) - * Possibility to hide menus for unauthorized users * Reworked account action logs to use a single IP column as varchar(45) for both ipv4 and ipv6 (#289) From 9bfd0242afd2e8701efff0315f87325c1df8274c Mon Sep 17 00:00:00 2001 From: slawkens Date: Sun, 4 Jan 2026 13:18:09 +0100 Subject: [PATCH 44/45] Make vocation a bit smaller To fit into the theme --- system/templates/online.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/templates/online.html.twig b/system/templates/online.html.twig index 2ce64287..f3bd70be 100644 --- a/system/templates/online.html.twig +++ b/system/templates/online.html.twig @@ -26,7 +26,7 @@