Fix if $hooks not defined

CHANGELOG-1.x.md

@@ -1,132 +1,5 @@
 # Changelog
 
-## [1.8.2 - 26.09.2025]
-
-### Added
-* Routes: Possibility to override routes with plugins pages, like characters.php - No need to define routes in plugin.json anymore (https://github.com/slawkens/myaac/commit/3f24f961b1cdeff5c60387e837ae454448bc5e1b)
-
-### Changed
-* Style: Better look for myaac-table (https://github.com/slawkens/myaac/commit/a6032093b21e5bb3f0e75d2704da87d6dea6469d, https://github.com/slawkens/myaac/commit/5aa9bbf1c8e580d973ec82ac012489f8e7bc437e)
-
-### Fixed
-* Install: Fix when config.local.php cannot be saved (https://github.com/slawkens/myaac/commit/4eab805d26d8c5562b29ed699769919d77dabced)
-* Create Account: Fix an exception when email cannot be sent (https://github.com/slawkens/myaac/commit/d0112d1a67e8b854b65ad131f0375b79305df8d3)
-* Login Page: Add missing csrf() - fix create account button (https://github.com/slawkens/myaac/commit/3c0cb53e17dd0b85394cfa0fdc9cf9ad8d4551df)
-* tibiacom template: Fix account lost menu (https://github.com/slawkens/myaac/commit/ed9beaf2b6ca069e304e569c52e5b9188b58f05c)
-* tibiacom template: Fix Menu div wrong tag/closing (#329) (https://github.com/slawkens/myaac/commit/85e7005fd3f0be51466151a3c122b96085fdfe68)
-* tibiacom template: Replace firstChild with firstElementChild (Thanks to @un000000) (https://github.com/slawkens/myaac/commit/df7b6e29fb8875da97f431468c81ee99116271d9)
-
-## [1.8.1 - 05.09.2025]
-
-### Added
-* New Commands: plugin:enable/disable/uninstall {plugin-name} (https://github.com/slawkens/myaac/commit/7a08f91d3fc0897c1ff76089ef3c649a2c6d2003, https://github.com/slawkens/myaac/commit/fec773ba4b740f35c0a3ef92ca8444a4c7d02082)
-* Gifts: Added Transferable Coins to the store dropdown menu in the admin area (by @andreoam, #321) (https://github.com/slawkens/myaac/commit/42671c5c199dd9e91c774d8c9d30da9e12f1b695)
-
-### Changed
-* Commands: Allow settings to be changed/reset by plugin name (https://github.com/slawkens/myaac/commit/f8c4332e03e838d285ea0afb4b72b7c23e324d45, https://github.com/slawkens/myaac/commit/4b948e9510f7ba69d00f84d7fdaea8b3bf05b630)
-* Templates: Menus should be saved for each template separately (https://github.com/slawkens/myaac/commit/482f4067b2a2e7513d9ba214274a361ffaf123d8)
-
-### Fixed
-* Online: Fix skulls display (#320) (https://github.com/slawkens/myaac/commit/98073a110ae13f9592ec9d2c4d1d1aace87587a9)
-* Online: Fix if there is no world_id in the server_record table (https://github.com/slawkens/myaac/commit/b6e1620f14c20eecfc9001a7d86dfb67942985c6) (Reported by @gesior in #318)
-* tibiacom: some fixes to menus (https://github.com/slawkens/myaac/commit/20f99903ae80c74ad66c1cf5a5ea8d0b0fc2fd70, https://github.com/slawkens/myaac/commit/11dae90fa94fbbf47447017db5e5847c33d6aadf)
-* Guilds: Fix for some servers that don't have guild_invites table (https://github.com/slawkens/myaac/commit/9725a3c2bdb7003f5cb48febb77604c31a9b805b)
-
-## [1.8 - 02.08.2025]
-
-### Added
-* Templates - Kathrine: Possibility to add custom menu categories (https://github.com/slawkens/myaac/commit/ec11c1402417c25980582467546d1c1e9bb8267f)
-* Admin Panel - Accounts Editor: Add Coins Transferable (https://github.com/slawkens/myaac/commit/45d6047031c9c3a0e7e512dc5d15c75629aec5a2, https://github.com/slawkens/myaac/commit/bb097b69ce106500a49686d6f4fe604348eaa310)
-* Highscores:
-  * Revamped: (https://github.com/slawkens/myaac/commit/d8132d4d76e03d5aa0c042be426320655a601392)
-    * Show real rank, if 2 or more players have the same skill, show them with same rank
-    * New setting: highscores_online_status
-    * Additional fields passed to twig: updatedAt, totalResults, page, baseLink
-  * Add new Setting: Display Skills Box (https://github.com/slawkens/myaac/commit/36ca755243ef1c83f6ac87465b426d4d8d3b0bb9)
-* Functions: Add getExperienceForLevel (level) (https://github.com/slawkens/myaac/commit/1566deb84a082176b8c683fda205d828bc38fbcc)
-* Commands - cache:clear : Add warning about APCu clear in CLI (https://github.com/slawkens/myaac/commit/83f84172e02e8ea2ccb6dca29bc033e44c35aebc)
-* Models - PlayerOnline: Add missing $fillable into model (https://github.com/slawkens/myaac/commit/43415cf35db1c1307f2684c1728693d65065ffff)
-* Twig: add cache variable (https://github.com/slawkens/myaac/commit/0efe47ce71c4b364a9e96bc5a55b1655326ae6da)
-
-### Changed
-* pages/online: add cache, resulting in 20x performance boost
-  * (for an example server with 2k players) (https://github.com/slawkens/myaac/commit/c8363086015cbb6e8786c398c7b9ac3959a26ec4)
-* Admin Bar: Move admin bar code into body_start place_holder (https://github.com/slawkens/myaac/commit/f17269e44ce9dd38447bd2e2a8e1bdb065d4161f)
-* Cache::remember: $ttl = 0 means no cache (https://github.com/slawkens/myaac/commit/3b47e9df2f4051807c5ff87892f7fa3d348f9c55)
-* Templates: Load config.ini with $process_sections set to true (https://github.com/slawkens/myaac/commit/a89f9a84847630eb75b4890fdcc8b7a7bfa6b8ac)
-* Twig: Allow for timestamp as integer in the timeago twig function
-  (https://github.com/slawkens/myaac/commit/34fead906ea13b9f09d7a3c41ed88109d34d386c)
-
-### Fixed
-* Settings: Fixed two exceptions (https://github.com/slawkens/myaac/commit/6e5a4ff8c78ff5373aba091baa66cae029557643, https://github.com/slawkens/myaac/commit/20d69a641c0a933d14889a89da6d32f6a4bc6c7d)
-* Models\Account + OTS_Account -> isPremium -> ignore config.freePremium (https://github.com/slawkens/myaac/commit/5271633bdbfbbfed0b1d59c403093ce6fc2b7d20)
-* Admin Panel - Mailer:
-  * Fix send to email link redirecting from accounts page (https://github.com/slawkens/myaac/commit/080cc2781f034c844af658229e495e9a47fd2298)
-  * Option to send only to verified accounts - only if setting('core.account_mail_verify') enabled (https://github.com/slawkens/myaac/commit/cf7fd20452e863980045bb5d6012ec86c6e8e01f)
-
-### Internal
-* Rewrite to use constants (account transferable coins) (https://github.com/slawkens/myaac/commit/bccf8e056df985bbe1bab5f7ab5492f714d6b62b)
-* Refactor to use HAS_ACCOUNT_COINS (https://github.com/slawkens/myaac/commit/caf326a6584a234775ebc6c8000ea02b3fecd160)
-
-## [1.7.1 - 27.06.2025]
-
-### Changed
-* Rename plugin:install:install to plugin:setup, also add alias to previous command (https://github.com/slawkens/myaac/commit/13d33822b59df349199e885a78a3d6beb0863d0b)
-
-### Fixed
-* Fix commands: setup + cache:clear (https://github.com/slawkens/myaac/commit/0da524fefe93b3028392e9014550eea3324d3a22, https://github.com/slawkens/myaac/commit/fe8281594e989f00280ba1adc734a9198c6b5cc1)
-* Fix polls link in tibiacom template (https://github.com/slawkens/myaac/commit/d90fa323d7c77d81768df60feeb1c374b1650a0c)
-
-## [1.7 - 22.06.2025]
-
-### Added
-* Feature: plugins versions check (#310)
-* New hooks: HOOK_ACCOUNT_MANAGE_AFTER_CHARACTERS, HOOK_GUILDS_AFTER_MANAGE_BUTTON (https://github.com/slawkens/myaac/commit/c074a48f245df55646b6705737f667b6a84149b2, https://github.com/slawkens/myaac/commit/e6100a1b72de8695bba1dae9ba4e28bfdce47b10)
-* Add OTS_Toolbox::getVocationName(id, promotion) + OTS_Player->isNameLocked() (https://github.com/slawkens/myaac/commit/e222957893c4a1de0dc8dbba55bce1a43418d275, https://github.com/slawkens/myaac/commit/522f6c11d835afd36fd07a07074d96d7e219b488)
-* Add missing csrf in more places, causing white page with error about Request (https://github.com/slawkens/myaac/commit/dca904e61d21d856bf809070e7652803a2df0f58, https://github.com/slawkens/myaac/commit/c720ccc451ff90ef40b2a1595468d061ffd7e1e4)
-
-### Changed
-* Revamped online page (https://github.com/slawkens/myaac/commit/9a90e4aae280e607430511c6727d9a714b11f4c5, https://github.com/slawkens/myaac/commit/4767120043b09141870383e249f3729638d53dc2)
-* Better $title inventing (https://github.com/slawkens/myaac/commit/0c95bcfd06b68b21512e477646ef7bd3a0d4912b)
-
-### Fixed
-* Use apcu cache clear (https://github.com/slawkens/myaac/commit/b329da52aae9d0e21120a6444d3caf442420ce50, https://github.com/slawkens/myaac/commit/566c2a9151ab6392286f74e26853faa19a1b4f24)
-* fix: boostedcreatures for 13.40 (by @GooseWithAKnife) (#307)
-
-## [1.6.1 - 11.06.2025]
-
-### Fixed
-* Fixed "Request has been cancelled due to security reasons", cause of missing csrf() in twig files (https://github.com/slawkens/myaac/commit/10cd71a6630ffec91b43a26a6d685b66c5836a6a)
-* Fix: Ignore duplicated route exception (https://github.com/slawkens/myaac/commit/9d8e9d27bd87167d8d4005942a6af62bfe4c0892)
-
-### Changed
-* Move counter & visitors code before router (In case someone wants to include that info on page) (https://github.com/slawkens/myaac/commit/f78285030708ad3c74ab048711f73bbf3ee5281e)
-* Set TinyMCE license key to gpl (Avoid warning message in browser console) (https://github.com/slawkens/myaac/commit/8d29fdb98b92dbc3d2853ef88a185c67036b4a77)
-
-### Removed
-* Remove deprecated TinyMCE plugin - template (https://github.com/slawkens/myaac/commit/309c1fb715b882e67cb673b1544a03befbf64a22)
-
-## [1.6 - 03.06.2025]
-
-### Added
-* Add new setting/configurable: site_url, prevents domain spoofing (https://github.com/slawkens/myaac/commit/d8a6090be382c35c19117cfef964b594ed02b8d4)
-* Add new account coins setting (https://github.com/slawkens/myaac/commit/28886551e86fe562172c4c7f2afb89a2e7672c2e)
-* autoload: settings/install/init.php (https://github.com/slawkens/myaac/commit/e5749437074c3b3556628a2aeb5bad2edf97bde0, https://github.com/slawkens/myaac/commit/7d213f479a7e40c6254069b5fc4e578dc32bf8d9, https://github.com/slawkens/myaac/commit/207d6bc69120aba1af2b51808f17e0059b571fed)
-* Protect against csrf in more places (accounts & guilds & forums pages) (https://github.com/slawkens/myaac/commit/6eda38603c8ed7e99b92a78a4600b1245377f74d, https://github.com/slawkens/myaac/commit/e776bd52beb3064a9e694efd1b9021ec972ee2f6, https://github.com/slawkens/myaac/commit/84d502bf105f2a789481fba1acc820d236b4de66)
-* Added two new hooks for pages loaded from database (custom pages): HOOK_BEFORE_PAGE_CUSTOM, HOOK_AFTER_PAGE_CUSTOM (https://github.com/slawkens/myaac/commit/c961a1ebf837f2ab1734a825ff2c57b4937610c9)
-* Add global variables into $hooks->executeFilter (https://github.com/slawkens/myaac/commit/8fdea943768b20193eede99d60313ee84511a0be)
-* Add getNPCsCount() to OTS_InfoRespond (https://github.com/slawkens/myaac/commit/7d435ff6433ef1fb2295ee79ed043ee10dc725e9)
-
-### Fixed
-* Allow [] in character name (https://github.com/slawkens/myaac/commit/de6603a51347b9e656c58637ed9971fffdd7cedd)
-* Do not allow access to tools/ folder after install (https://github.com/slawkens/myaac/commit/6e0f5913831f8dba69fd2d1505be3e2a303c6324)
-* Fix CHANGELOG-1.x.md loading in admin panel (https://github.com/slawkens/myaac/commit/4a30fb495dbfbe1d434e8d52419eaf44fe517aee)
-* Fix links not working in admin dashboard modules (https://github.com/slawkens/myaac/commit/be7b27c31aa3bbd6c0289c34d1e61139a3fe015c)
-* Fix twig variables: logged + account_logged being not set directly after login (https://github.com/slawkens/myaac/commit/1e9b10d6489c488cadf7f6ed17b42f1ea6c767a8)
-
-### Changed
-* OTS_ServerInfo -> move setTimeout out of class - Possibility to use the class without MyAAC (https://github.com/slawkens/myaac/commit/40d65a6613149fda51bdceb82c807e5301a3388b)
-
 ## [1.5 - 14.05.2025]
 
 ### Added

admin/pages/accounts.php

@@ -26,6 +26,7 @@ if (setting('core.account_country'))
 $nameOrNumberColumn = getAccountIdentityColumn();
 
 $hasSecretColumn = $db->hasColumn('accounts', 'secret');
+$hasCoinsColumn = $db->hasColumn('accounts', 'coins');
 $hasPointsColumn = $db->hasColumn('accounts', 'premium_points');
 $hasTypeColumn = $db->hasColumn('accounts', 'type');
 $hasGroupColumn = $db->hasColumn('accounts', 'group_id');
@@ -135,18 +136,11 @@ else if (isset($_REQUEST['search'])) {
 			if (!Validator::email($email))
 				$errors['email'] = Validator::getLastError();
 
-			// tibia coins
-			if (HAS_ACCOUNT_COINS) {
+			//tibia coins
+			if ($hasCoinsColumn) {
 				$t_coins = $_POST['t_coins'];
 				verify_number($t_coins, 'Tibia coins', 12);
 			}
-
-			// transferable tibia coins
-			if (HAS_ACCOUNT_COINS_TRANSFERABLE || HAS_ACCOUNT_TRANSFERABLE_COINS) {
-				$t_coins_transferable = $_POST['t_coins_transferable'];
-				verify_number($t_coins_transferable, 'Transferable Tibia coins', 12);
-			}
-
 			// prem days
 			$p_days = (int)$_POST['p_days'];
 			verify_number($p_days, 'Prem days', 11);
@@ -191,18 +185,12 @@ else if (isset($_REQUEST['search'])) {
 				if ($hasSecretColumn) {
 					$account->setCustomField('secret', $secret);
 				}
-
 				$account->setCustomField('key', $key);
 				$account->setEMail($email);
-
-				if (HAS_ACCOUNT_COINS) {
+				if ($hasCoinsColumn) {
 					$account->setCustomField('coins', $t_coins);
 				}
 
-				if (HAS_ACCOUNT_COINS_TRANSFERABLE || HAS_ACCOUNT_TRANSFERABLE_COINS) {
-					$account->setCustomField(ACCOUNT_COINS_TRANSFERABLE_COLUMN, $t_coins_transferable);
-				}
-
 				$lastDay = 0;
 				if($p_days != 0 && $p_days != OTS_Account::GRATIS_PREMIUM_DAYS) {
 					$lastDay = time();
@@ -235,6 +223,9 @@ else if (isset($_REQUEST['search'])) {
 
 					$password = encrypt($password);
 					$account->setPassword($password);
+
+					if (USE_ACCOUNT_SALT)
+						$account->setCustomField('salt', $salt);
 				}
 
 				$account->save();
@@ -404,18 +395,12 @@ else if (isset($_REQUEST['search'])) {
 										<label for="email">Email:</label><?php echo (setting('core.mail_enabled') ? ' (<a href="' . ADMIN_URL . '?p=mailer&mail_to=' . $account->getEMail() . '">Send Mail</a>)' : ''); ?>
 										<input type="text" class="form-control" id="email" name="email" autocomplete="off" value="<?php echo $account->getEMail(); ?>"/>
 									</div>
-									<?php if (HAS_ACCOUNT_COINS): ?>
+									<?php if ($hasCoinsColumn): ?>
 										<div class="col-12 col-sm-12 col-lg-6">
 											<label for="t_coins">Tibia Coins:</label>
 											<input type="text" class="form-control" id="t_coins" name="t_coins" autocomplete="off" maxlength="11" value="<?php echo $account->getCustomField('coins') ?>"/>
 										</div>
 									<?php endif; ?>
-									<?php if (HAS_ACCOUNT_COINS_TRANSFERABLE || HAS_ACCOUNT_TRANSFERABLE_COINS): ?>
-										<div class="col-12 col-sm-12 col-lg-6">
-											<label for="t_coins_transferable">Transferable Tibia Coins:</label>
-											<input type="text" class="form-control" id="t_coins_transferable" name="t_coins_transferable" autocomplete="off" maxlength="11" value="<?php echo $account->getCustomField(ACCOUNT_COINS_TRANSFERABLE_COLUMN) ?>"/>
-										</div>
-									<?php endif; ?>
 									<div class="col-12 col-sm-12 col-lg-6">
 										<label for="p_days">Premium Days:</label>
 										<input type="text" class="form-control" id="p_days" name="p_days" autocomplete="off" maxlength="11" value="<?php echo $account->getPremDays(); ?>"/>

admin/pages/mailer.php

@@ -25,10 +25,9 @@ if (!setting('core.mail_enabled')) {
 	return;
 }
 
-$mail_to = isset($_REQUEST['mail_to']) ? stripslashes(trim($_REQUEST['mail_to'])) : null;
+$mail_to = isset($_POST['mail_to']) ? stripslashes(trim($_POST['mail_to'])) : null;
 $mail_subject = isset($_POST['mail_subject']) ? stripslashes($_POST['mail_subject']) : null;
 $mail_content = isset($_POST['mail_content']) ? stripslashes($_POST['mail_content']) : null;
-$mail_verified_only = $_POST['mail_verified_only'] ?? false;
 
 if (isset($_POST['submit'])) {
 	if (empty($mail_subject)) {
@@ -59,14 +58,14 @@ if (!empty($mail_content) && !empty($mail_subject) && empty($mail_to)) {
 	$success = 0;
 	$failed = 0;
 
-	$query = Account::where('email', '!=', '');
-
-	if ($mail_verified_only) {
-		info('Note: Sending only to users with verified E-Mail.');
-		$query->where('email_verified', 1);
+	$add = '';
+	if (setting('core.account_mail_verify')) {
+		note('Note: Sending only to users with verified E-Mail.');
+		$add = ' AND `email_verified` = 1';
 	}
 
-	foreach ($query->get(['email']) as $email) {
+	$query = Account::where('email', '!=', '')->get(['email']);
+	foreach ($query as $email) {
 		if (_mail($email->email, $mail_subject, $mail_content)) {
 			$success++;
 		}
@@ -85,6 +84,5 @@ if (!empty($mail_content) && !empty($mail_subject) && empty($mail_to)) {
 $twig->display('admin.mailer.html.twig', [
 	'mail_to' => $mail_to,
 	'mail_subject' => $mail_subject,
-	'mail_content' => $mail_content,
-	'mail_verified_only' => $mail_verified_only,
+	'mail_content' => $mail_content
 ]);

admin/pages/mass_account.php

@@ -18,6 +18,7 @@ $title = 'Mass Account Actions';
 
 csrfProtect();
 
+$hasCoinsColumn = $db->hasColumn('accounts', 'coins');
 $hasPointsColumn = $db->hasColumn('accounts', 'premium_points');
 $freePremium = $config['lua']['freePremium'];
 
@@ -39,7 +40,9 @@ function admin_give_points($points)
 
 function admin_give_coins($coins)
 {
-	if (!HAS_ACCOUNT_COINS) {
+	global $hasCoinsColumn;
+
+	if (!$hasCoinsColumn) {
 		displayMessage('Coins not supported.');
 		return;
 	}
@@ -164,19 +167,19 @@ if (!empty(ACTION) && isRequestMethod('post')) {
 }
 else {
 	$twig->display('admin.tools.account.html.twig', array(
-		'hasCoinsColumn' => HAS_ACCOUNT_COINS,
+		'hasCoinsColumn' => $hasCoinsColumn,
 		'hasPointsColumn' => $hasPointsColumn,
 		'freePremium' => $freePremium,
 	));
 }
 
 function displayMessage($message, $success = false) {
-	global $twig, $hasPointsColumn, $freePremium;
+	global $twig, $hasCoinsColumn, $hasPointsColumn, $freePremium;
 
 	$success ? success($message): error($message);
 
 	$twig->display('admin.tools.account.html.twig', array(
-		'hasCoinsColumn' => HAS_ACCOUNT_COINS,
+		'hasCoinsColumn' => $hasCoinsColumn,
 		'hasPointsColumn' => $hasPointsColumn,
 		'freePremium' => $freePremium,
 	));

admin/pages/modules/coins.php

@@ -6,7 +6,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 
 $coins = 0;
 
-if (HAS_ACCOUNT_COINS) {
+if ($db->hasColumn('accounts', 'coins')) {
 	$whatToGet = ['id', 'coins'];
 	if (USE_ACCOUNT_NAME) {
 		$whatToGet[] = 'name';

admin/pages/modules/templates/coins.html.twig

@@ -19,7 +19,7 @@
 						{% set i = i + 1 %}
 						<tr>
 							<th>{{ i }}</th>
-							<td><a href="?p=accounts&id={{ result.id }}">{{ result.name ?? result.id }}</a></td>
+							<td><a href="?p=accounts&id={{ result.id }}">{{ result.name }}</a></td>
 							<td>{{ result.coins }}</td>
 						</tr>
 					{% endfor %}

admin/pages/players.php

@@ -669,17 +669,11 @@ else if (isset($_REQUEST['search'])) {
 									<div class="col-12 col-sm-12 col-lg-6">
 										<label for="lastip" class="control-label">Last IP:</label>
 										<input type="text" class="form-control" id="lastip" name="lastip" autocomplete="off" maxlength="10" value="<?php
-										$lastIPColumnInfo = $db->getColumnInfo('players', 'lastip');
-										if ($lastIPColumnInfo && is_array($lastIPColumnInfo)) {
-											if (str_contains($lastIPColumnInfo['type'], 'varbinary')) {
-												echo inet_ntop($player->getLastIP());
-											}
-											else {
-												echo longToIp($player->getLastIP());
-											}
+										if (strlen($player->getLastIP()) > 11) {
+											echo inet_ntop($player->getLastIP());
 										}
 										else {
-											echo 'Error';
+											echo longToIp($player->getLastIP());
 										}
 										?>" readonly/>
 									</div>

admin/pages/plugins.php

@@ -51,56 +51,6 @@ else {
 		} else {
 			error('Error while disabling plugin ' . $disable . ': ' . Plugins::getError());
 		}
-	}
-	else if (isset($_GET['check-updates'])) {
-		$repoUri = $config['admin_plugins_api_uri'] ?? 'https://plugins.my-aac.org/api/';
-		success("Fetching latest info from $repoUri..");
-
-		$adminPlugins = new \MyAAC\Admin\Plugins();
-
-		$adminPlugins->setApiBaseUri($repoUri);
-
-		try {
-			$plugins = $adminPlugins->getLatestVersions();
-		}
-		catch (Exception $e) {
-			error($e->getMessage());
-		}
-
-		if (isset($plugins) && count($plugins) > 0) {
-			$outdated = [];
-
-			foreach (get_plugins(true) as $plugin) {
-				$string = file_get_contents(BASE . 'plugins/' . $plugin . '.json');
-				$plugin_info = json_decode($string, true);
-
-				if (!$plugin_info) {
-					continue;
-				}
-
-				$disabled = (str_contains($plugin, 'disabled.'));
-				$pluginOriginal = ($disabled ? str_replace('disabled.', '', $plugin) : $plugin);
-
-				$info = $plugins[$pluginOriginal] ?? false;
-				if ($info && version_compare($info['version'], $plugin_info['version'], '>')) {
-					$outdated[] = [
-						'name' => $pluginOriginal,
-						'yourVersion' => $plugin_info['version'],
-						'latestVersion' => $info['version'],
-						'link' => $info['link'] ?? 'Unknown',
-						'download_link' => $info['download_link'] ?? 'Unknown',
-					];
-				}
-			}
-
-			if (count($outdated) > 0) {
-				info('Following updates have been found for your plugins:');
-				$twig->display('admin.plugins.outdated.html.twig', ['plugins' => $outdated]);
-			}
-			else {
-				success('All plugins up to date!');
-			}
-		}
 	} else if (isset($_FILES['plugin']['name'])) {
 		$file = $_FILES['plugin'];
 		$filename = $file['name'];

admin/pages/visitors.php

@@ -19,7 +19,8 @@ $use_datatable = true;
 
 if (!setting('core.visitors_counter')): ?>
 	Visitors counter is disabled.<br/>
-	You can enable it in Settings -> General -> Visitors Counter.<br/>
+	You can enable it by editing this configurable in <b>config.local.php</b> file:<br/>
+	<p style="margin-left: 3em;"><b>$config['visitors_counter'] = true;</b></p>
 	<?php
 	return;
 endif;
@@ -45,7 +46,7 @@ foreach ($tmp as &$visitor) {
 		if ($dd->isBot()) {
 			$bot = $dd->getBot();
 			$message = '(Bot) %s, <a href="%s" target="_blank">%s</a>';
-			$browser = sprintf($message, $bot['category'] ?? 'Unknown', $bot['url'] ?? '', $bot['name'] ?? 'Unknown name');
+			$browser = sprintf($message, $bot['category'], $bot['url'], $bot['name']);
 		}
 		else {
 			$osFamily = OperatingSystem::getOsFamily($dd->getOs('name'));

admin/tools/settings_save.php

@@ -1,5 +1,6 @@
 <?php
 
+use MyAAC\Hooks;
 use MyAAC\Settings;
 
 const MYAAC_ADMIN = true;

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.3-dev';
+const MYAAC_VERSION = '1.5.1-dev';
 const DATABASE_VERSION = 45;
 const TABLE_PREFIX = 'myaac_';
 define('START_TIME', microtime(true));
@@ -122,28 +122,36 @@ if (!IS_CLI) {
 	session_start();
 }
 
-if (file_exists(BASE . 'config.local.php')) {
-	require BASE . 'config.local.php';
-}
+// basedir
+$basedir = '';
+$tmp = explode('/', $_SERVER['SCRIPT_NAME']);
+$size = count($tmp) - 1;
+for($i = 1; $i < $size; $i++)
+	$basedir .= '/' . $tmp[$i];
 
-require SYSTEM . 'base.php';
-define('BASE_DIR', $baseDir);
+$basedir = str_replace(['/' . ADMIN_PANEL_FOLDER, '/install', '/tools'], '', $basedir);
+define('BASE_DIR', $basedir);
 
 if(!IS_CLI) {
-	if (isset($config['site_url'])) {
-		$hasSlashAtEnd = ($config['site_url'][strlen($config['site_url']) - 1] == '/');
-
-		define('SERVER_URL', $config['site_url']);
-		define('BASE_URL', SERVER_URL . ($hasSlashAtEnd ? '' : '/'));
-		define('ADMIN_URL', SERVER_URL . ($hasSlashAtEnd ? '' : '/') . ADMIN_PANEL_FOLDER . '/');
+	if (isset($_SERVER['HTTP_HOST'][0])) {
+		$baseHost = $_SERVER['HTTP_HOST'];
+	} else {
+		if (isset($_SERVER['SERVER_NAME'][0])) {
+			$baseHost = $_SERVER['SERVER_NAME'];
+		} else {
+			$baseHost = $_SERVER['SERVER_ADDR'];
+		}
 	}
-	else {
-		define('SERVER_URL', 'http' . (isHttps() ? 's' : '') . '://' . $baseHost);
-		define('BASE_URL', SERVER_URL . BASE_DIR . '/');
-		define('ADMIN_URL', SERVER_URL . BASE_DIR . '/' . ADMIN_PANEL_FOLDER . '/');
 
-		//define('CURRENT_URL', BASE_URL . $_SERVER['REQUEST_URI']);
-	}
+	define('SERVER_URL', 'http' . (isHttps() ? 's' : '') . '://' . $baseHost);
+	define('BASE_URL', SERVER_URL . BASE_DIR . '/');
+	define('ADMIN_URL', SERVER_URL . BASE_DIR . '/' . ADMIN_PANEL_FOLDER . '/');
+
+	//define('CURRENT_URL', BASE_URL . $_SERVER['REQUEST_URI']);
+}
+
+if (file_exists(BASE . 'config.local.php')) {
+	require BASE . 'config.local.php';
 }
 
 /** @var array $config */

composer.json

@@ -18,8 +18,7 @@
         "symfony/string": "^6.4",
         "symfony/var-dumper": "^6.4",
         "filp/whoops": "^2.15",
-        "maximebf/debugbar": "1.*",
-        "guzzlehttp/guzzle": "7.9.3"
+        "maximebf/debugbar": "1.*"
     },
     "require-dev": {
         "phpstan/phpstan": "^1.10"

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "5317e97a5025ebc2a977214bd3fa964c",
+    "content-hash": "be4d1489a53a9cd8eec6bcaa7a096f30",
     "packages": [
         {
             "name": "brick/math",
@@ -493,331 +493,6 @@
             ],
             "time": "2024-09-25T12:00:00+00:00"
         },
-        {
-            "name": "guzzlehttp/guzzle",
-            "version": "7.9.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
-                "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "guzzlehttp/promises": "^1.5.3 || ^2.0.3",
-                "guzzlehttp/psr7": "^2.7.0",
-                "php": "^7.2.5 || ^8.0",
-                "psr/http-client": "^1.0",
-                "symfony/deprecation-contracts": "^2.2 || ^3.0"
-            },
-            "provide": {
-                "psr/http-client-implementation": "1.0"
-            },
-            "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.8.2",
-                "ext-curl": "*",
-                "guzzle/client-integration-tests": "3.0.2",
-                "php-http/message-factory": "^1.1",
-                "phpunit/phpunit": "^8.5.39 || ^9.6.20",
-                "psr/log": "^1.1 || ^2.0 || ^3.0"
-            },
-            "suggest": {
-                "ext-curl": "Required for CURL handler support",
-                "ext-intl": "Required for Internationalized Domain Name (IDN) support",
-                "psr/log": "Required for using the Log middleware"
-            },
-            "type": "library",
-            "extra": {
-                "bamarni-bin": {
-                    "bin-links": true,
-                    "forward-command": false
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
-                "psr-4": {
-                    "GuzzleHttp\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Graham Campbell",
-                    "email": "hello@gjcampbell.co.uk",
-                    "homepage": "https://github.com/GrahamCampbell"
-                },
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                },
-                {
-                    "name": "Jeremy Lindblom",
-                    "email": "jeremeamia@gmail.com",
-                    "homepage": "https://github.com/jeremeamia"
-                },
-                {
-                    "name": "George Mponos",
-                    "email": "gmponos@gmail.com",
-                    "homepage": "https://github.com/gmponos"
-                },
-                {
-                    "name": "Tobias Nyholm",
-                    "email": "tobias.nyholm@gmail.com",
-                    "homepage": "https://github.com/Nyholm"
-                },
-                {
-                    "name": "Márk Sági-Kazár",
-                    "email": "mark.sagikazar@gmail.com",
-                    "homepage": "https://github.com/sagikazarmark"
-                },
-                {
-                    "name": "Tobias Schultze",
-                    "email": "webmaster@tubo-world.de",
-                    "homepage": "https://github.com/Tobion"
-                }
-            ],
-            "description": "Guzzle is a PHP HTTP client library",
-            "keywords": [
-                "client",
-                "curl",
-                "framework",
-                "http",
-                "http client",
-                "psr-18",
-                "psr-7",
-                "rest",
-                "web service"
-            ],
-            "support": {
-                "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.9.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/Nyholm",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2025-03-27T13:37:11+00:00"
-        },
-        {
-            "name": "guzzlehttp/promises",
-            "version": "2.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/promises.git",
-                "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/7c69f28996b0a6920945dd20b3857e499d9ca96c",
-                "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2.5 || ^8.0"
-            },
-            "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.39 || ^9.6.20"
-            },
-            "type": "library",
-            "extra": {
-                "bamarni-bin": {
-                    "bin-links": true,
-                    "forward-command": false
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Promise\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Graham Campbell",
-                    "email": "hello@gjcampbell.co.uk",
-                    "homepage": "https://github.com/GrahamCampbell"
-                },
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                },
-                {
-                    "name": "Tobias Nyholm",
-                    "email": "tobias.nyholm@gmail.com",
-                    "homepage": "https://github.com/Nyholm"
-                },
-                {
-                    "name": "Tobias Schultze",
-                    "email": "webmaster@tubo-world.de",
-                    "homepage": "https://github.com/Tobion"
-                }
-            ],
-            "description": "Guzzle promises library",
-            "keywords": [
-                "promise"
-            ],
-            "support": {
-                "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.2.0"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/Nyholm",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2025-03-27T13:27:01+00:00"
-        },
-        {
-            "name": "guzzlehttp/psr7",
-            "version": "2.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/psr7.git",
-                "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/c2270caaabe631b3b44c85f99e5a04bbb8060d16",
-                "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2.5 || ^8.0",
-                "psr/http-factory": "^1.0",
-                "psr/http-message": "^1.1 || ^2.0",
-                "ralouphie/getallheaders": "^3.0"
-            },
-            "provide": {
-                "psr/http-factory-implementation": "1.0",
-                "psr/http-message-implementation": "1.0"
-            },
-            "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.8.2",
-                "http-interop/http-factory-tests": "0.9.0",
-                "phpunit/phpunit": "^8.5.39 || ^9.6.20"
-            },
-            "suggest": {
-                "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
-            },
-            "type": "library",
-            "extra": {
-                "bamarni-bin": {
-                    "bin-links": true,
-                    "forward-command": false
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Psr7\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Graham Campbell",
-                    "email": "hello@gjcampbell.co.uk",
-                    "homepage": "https://github.com/GrahamCampbell"
-                },
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                },
-                {
-                    "name": "George Mponos",
-                    "email": "gmponos@gmail.com",
-                    "homepage": "https://github.com/gmponos"
-                },
-                {
-                    "name": "Tobias Nyholm",
-                    "email": "tobias.nyholm@gmail.com",
-                    "homepage": "https://github.com/Nyholm"
-                },
-                {
-                    "name": "Márk Sági-Kazár",
-                    "email": "mark.sagikazar@gmail.com",
-                    "homepage": "https://github.com/sagikazarmark"
-                },
-                {
-                    "name": "Tobias Schultze",
-                    "email": "webmaster@tubo-world.de",
-                    "homepage": "https://github.com/Tobion"
-                },
-                {
-                    "name": "Márk Sági-Kazár",
-                    "email": "mark.sagikazar@gmail.com",
-                    "homepage": "https://sagikazarmark.hu"
-                }
-            ],
-            "description": "PSR-7 message implementation that also provides common utility methods",
-            "keywords": [
-                "http",
-                "message",
-                "psr-7",
-                "request",
-                "response",
-                "stream",
-                "uri",
-                "url"
-            ],
-            "support": {
-                "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.7.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/Nyholm",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2025-03-27T12:30:47+00:00"
-        },
         {
             "name": "illuminate/collections",
             "version": "v10.48.25",
@@ -1797,166 +1472,6 @@
             },
             "time": "2021-11-05T16:47:00+00:00"
         },
-        {
-            "name": "psr/http-client",
-            "version": "1.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-client.git",
-                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
-                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0 || ^8.0",
-                "psr/http-message": "^1.0 || ^2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Client\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for HTTP clients",
-            "homepage": "https://github.com/php-fig/http-client",
-            "keywords": [
-                "http",
-                "http-client",
-                "psr",
-                "psr-18"
-            ],
-            "support": {
-                "source": "https://github.com/php-fig/http-client"
-            },
-            "time": "2023-09-23T14:17:50+00:00"
-        },
-        {
-            "name": "psr/http-factory",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
-                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1",
-                "psr/http-message": "^1.0 || ^2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Message\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
-            "keywords": [
-                "factory",
-                "http",
-                "message",
-                "psr",
-                "psr-17",
-                "psr-7",
-                "request",
-                "response"
-            ],
-            "support": {
-                "source": "https://github.com/php-fig/http-factory"
-            },
-            "time": "2024-04-15T12:06:14+00:00"
-        },
-        {
-            "name": "psr/http-message",
-            "version": "2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
-                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Message\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for HTTP messages",
-            "homepage": "https://github.com/php-fig/http-message",
-            "keywords": [
-                "http",
-                "http-message",
-                "psr",
-                "psr-7",
-                "request",
-                "response"
-            ],
-            "support": {
-                "source": "https://github.com/php-fig/http-message/tree/2.0"
-            },
-            "time": "2023-04-04T09:54:51+00:00"
-        },
         {
             "name": "psr/log",
             "version": "3.0.2",
@@ -2058,50 +1573,6 @@
             },
             "time": "2021-10-29T13:26:27+00:00"
         },
-        {
-            "name": "ralouphie/getallheaders",
-            "version": "3.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ralouphie/getallheaders.git",
-                "reference": "120b605dfeb996808c31b6477290a714d356e822"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
-                "reference": "120b605dfeb996808c31b6477290a714d356e822",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6"
-            },
-            "require-dev": {
-                "php-coveralls/php-coveralls": "^2.1",
-                "phpunit/phpunit": "^5 || ^6.5"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/getallheaders.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ralph Khattar",
-                    "email": "ralph.khattar@gmail.com"
-                }
-            ],
-            "description": "A polyfill for getallheaders.",
-            "support": {
-                "issues": "https://github.com/ralouphie/getallheaders/issues",
-                "source": "https://github.com/ralouphie/getallheaders/tree/develop"
-            },
-            "time": "2019-03-08T08:55:37+00:00"
-        },
         {
             "name": "symfony/console",
             "version": "v6.4.17",
@@ -3439,7 +2910,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {},
+    "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
@@ -3450,6 +2921,6 @@
         "ext-xml": "*",
         "ext-dom": "*"
     },
-    "platform-dev": {},
-    "plugin-api-version": "2.6.0"
+    "platform-dev": [],
+    "plugin-api-version": "2.3.0"
 }

index.php

@@ -93,7 +93,6 @@ if(setting('core.backward_support')) {
 	if($logged && $account_logged)
 		$group_id_of_acc_logged = $account_logged->getGroupId();
 
-	$config['serverPath'] = $config['server_path'];
 	$config['site'] = &$config;
 	$config['server'] = &$config['lua'];
 	$config['site']['shop_system'] = setting('core.gifts_system');
@@ -118,14 +117,6 @@ if(setting('core.backward_support')) {
 		$config['status']['serverStatus_' . $key] = $value;
 }
 
-if(setting('core.views_counter')) {
-	require_once SYSTEM . 'counter.php';
-}
-
-if(setting('core.visitors_counter')) {
-	$visitors = new Visitors(setting('core.visitors_counter_ttl'));
-}
-
 require_once SYSTEM . 'router.php';
 
 // anonymous usage statistics
@@ -162,6 +153,22 @@ if(setting('core.anonymous_usage_statistics')) {
 	}
 }
 
+if(setting('core.views_counter'))
+	require_once SYSTEM . 'counter.php';
+
+if(setting('core.visitors_counter')) {
+	$visitors = new Visitors(setting('core.visitors_counter_ttl'));
+}
+
+/**
+ * @var OTS_Account $account_logged
+ */
+if ($logged && admin()) {
+	$content .= $twig->render('admin-bar.html.twig', [
+		'username' => USE_ACCOUNT_NAME ? $account_logged->getName() : $account_logged->getId()
+	]);
+}
+
 $title_full =  (isset($title) ? $title . ' - ' : '') . $config['lua']['serverName'];
 require $template_path . '/' . $template_index;
 

install/steps/4-config.php

@@ -10,14 +10,6 @@ foreach($config['clients'] as $client) {
 	$clients[$client] = $client_version;
 }
 
-if (empty($_SESSION['var_site_url'])) {
-	//require SYSTEM . 'base.php';
-	$serverUrl = 'http' . (isHttps() ? 's' : '') . '://' . $baseHost;
-	$siteURL = $serverUrl . $baseDir;
-
-	$_SESSION['var_site_url'] = $siteURL;
-}
-
 $twig->display('install.config.html.twig', array(
 	'clients' => $clients,
 	'timezones' => DateTimeZone::listIdentifiers(),

install/steps/5-database.php

@@ -42,44 +42,45 @@ if(!$error) {
 	$configToSave['cache_prefix'] = 'myaac_' . generateRandomString(8, true, false, true);
 	$configToSave['database_auto_migrate'] = true;
 
-	$content = '';
-	$saved = Settings::saveConfig($configToSave, BASE . 'config.local.php', $content);
-	if ($saved || file_exists(BASE . 'config.local.php')) {
-		success($locale['step_database_config_saved']);
-		$_SESSION['saved'] = true;
+	if(!$error) {
+		$content = '';
+		$saved = Settings::saveConfig($configToSave, BASE . 'config.local.php', $content);
+		if ($saved) {
+			success($locale['step_database_config_saved']);
+			$_SESSION['saved'] = true;
 
-		require BASE . 'config.local.php';
-		require BASE . 'install/includes/config.php';
+			require BASE . 'config.local.php';
+			require BASE . 'install/includes/config.php';
 
-		if (!$error) {
-			require BASE . 'install/includes/database.php';
+			if (!$error) {
+				require BASE . 'install/includes/database.php';
 
-			if (isset($database_error)) { // we failed connect to the database
-				error($database_error);
-			}
-			else {
-				if (!$db->hasTable('accounts')) {
-					$tmp = str_replace('$TABLE$', 'accounts', $locale['step_database_error_table']);
-					error($tmp);
-					$error = true;
+				if (isset($database_error)) { // we failed connect to the database
+					error($database_error);
 				}
+				else {
+					if (!$db->hasTable('accounts')) {
+						$tmp = str_replace('$TABLE$', 'accounts', $locale['step_database_error_table']);
+						error($tmp);
+						$error = true;
+					}
 
-				if (!$error) {
-					$twig->display('install.installer.html.twig', array(
-						'url' => 'tools/5-database.php',
-						'message' => $locale['loading_spinner']
-					));
+					if (!$error) {
+						$twig->display('install.installer.html.twig', array(
+							'url' => 'tools/5-database.php',
+							'message' => $locale['loading_spinner']
+						));
+					}
 				}
 			}
+		} else {
+			$_SESSION['config_content'] = $content;
+			unset($_SESSION['saved']);
+
+			$locale['step_database_error_file'] = str_replace('$FILE$', '<b>' . BASE . 'config.php</b>', $locale['step_database_error_file']);
+			error($locale['step_database_error_file'] . '<br/>
+				<textarea cols="70" rows="10">' . $content . '</textarea>');
 		}
-	} else {
-		$error = true;
-		$_SESSION['config_content'] = $content;
-		unset($_SESSION['saved']);
-
-		$locale['step_database_error_file'] = str_replace('$FILE$', '<b>' . BASE . 'config.local.php</b>', $locale['step_database_error_file']);
-		error($locale['step_database_error_file'] . '<br/>
-			<textarea cols="70" rows="10">' . $content . '</textarea>');
 	}
 }
 ?>

install/steps/7-finish.php

@@ -195,4 +195,13 @@ if(!isset($_SESSION['installed'])) {
 	$_SESSION['installed'] = true;
 }
 
+foreach($_SESSION as $key => $value) {
+	if(strpos($key, 'var_') !== false)
+		unset($_SESSION[$key]);
+}
+unset($_SESSION['saved']);
+if(file_exists(CACHE . 'install.txt')) {
+	unlink(CACHE . 'install.txt');
+}
+
 $hooks->trigger(HOOK_INSTALL_FINISH_END);

install/tools/5-database.php

@@ -7,11 +7,6 @@ require SYSTEM . 'functions.php';
 require BASE . 'install/includes/functions.php';
 require BASE . 'install/includes/locale.php';
 
-if(isset($config['installed']) && $config['installed'] && !isset($_SESSION['saved'])) {
-	warning($locale['already_installed']);
-	return;
-}
-
 $error = false;
 require BASE . 'install/includes/config.php';
 

install/tools/7-finish.php

@@ -17,11 +17,11 @@ ini_set('max_execution_time', 300);
 ob_implicit_flush();
 
 header('X-Accel-Buffering: no');
-
+/*
 if(isset($config['installed']) && $config['installed'] && !isset($_SESSION['saved'])) {
 	warning($locale['already_installed']);
 	return;
-}
+}*/
 
 require SYSTEM . 'init.php';
 
@@ -94,17 +94,6 @@ $hooks->trigger(HOOK_INSTALL_FINISH);
 
 $db->setClearCacheAfter(true);
 
-// cleanup
-foreach($_SESSION as $key => $value) {
-	if(str_contains($key, 'var_')) {
-		unset($_SESSION[$key]);
-	}
-}
-unset($_SESSION['saved']);
-if(file_exists(CACHE . 'install.txt')) {
-	unlink(CACHE . 'install.txt');
-}
-
 $locale['step_finish_desc'] = str_replace('$ADMIN_PANEL$', generateLink(str_replace('tools/', '',ADMIN_URL), $locale['step_finish_admin_panel'], true), $locale['step_finish_desc']);
 $locale['step_finish_desc'] = str_replace('$HOMEPAGE$', generateLink(str_replace('tools/', '', BASE_URL), $locale['step_finish_homepage'], true), $locale['step_finish_desc']);
 $locale['step_finish_desc'] = str_replace('$LINK$', generateLink('https://my-aac.org', 'https://my-aac.org', true), $locale['step_finish_desc']);

login.php

@@ -88,8 +88,8 @@ switch ($action) {
 	case 'boostedcreature':
 		$clientVersion = (int)setting('core.client');
 
-		// 13.40 and up
-		if ($clientVersion >= 1340) {
+		// 14.00 and up
+		if ($clientVersion >= 1400) {
 			$creatureBoost = $db->query("SELECT * FROM " . $db->tableName('boosted_creature'))->fetchAll();
 			$bossBoost     = $db->query("SELECT * FROM " . $db->tableName('boosted_boss'))->fetchAll();
 			die(json_encode([

package-lock.json

@@ -976,16 +976,15 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
-      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
+      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
         "es-set-tostringtag": "^2.1.0",
-        "hasown": "^2.0.2",
         "mime-types": "^2.1.12"
       },
       "engines": {
@@ -2085,9 +2084,9 @@
       "license": "MIT"
     },
     "node_modules/tmp": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.4.tgz",
-      "integrity": "sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
+      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
       "dev": true,
       "license": "MIT",
       "engines": {

phpstan.neon

@@ -28,9 +28,10 @@ parameters:
 		- '#Variable \$guild might not be defined#'
 		- '#Variable \$[a-zA-Z0-9\\_]+ might not be defined#'
 		# Eloquent models
-		- '#Call to an undefined method [a-zA-Z0-9\\_]+::[a-zA-Z0-9\\_]+\(\)#'
 		- '#Call to an undefined static method [a-zA-Z0-9\\_]+::[a-zA-Z0-9\\_]+\(\)#'
+		- '#Call to an undefined method object::toArray\(\)#'
 		# system/pages/highscores.php
+		- '#Call to an undefined method Illuminate\\Database\\Query\\Builder::withOnlineStatus\(\)#'
 		- '#Access to an undefined property Illuminate\\Database\\Eloquent\\Model::\$online_status#'
 		- '#Access to an undefined property Illuminate\\Database\\Eloquent\\Model::\$vocation_name#'
 		-

plugins/example.json

@@ -51,8 +51,5 @@
 		"themes": true,
 		"admin-pages": true,
 		"admin-pages-sub-folders": true,
-		"settings": true,
-		"install": true,
-		"init": false
 	}
  }

system/base.php

@@ -1,21 +0,0 @@
-<?php
-
-$baseDir = '';
-$tmp = explode('/', $_SERVER['SCRIPT_NAME']);
-$size = count($tmp) - 1;
-for($i = 1; $i < $size; $i++)
-	$baseDir .= '/' . $tmp[$i];
-
-$baseDir = str_replace(['/' . ADMIN_PANEL_FOLDER, '/install', '/tools'], '', $baseDir);
-
-if(!IS_CLI) {
-	if (isset($_SERVER['HTTP_HOST'][0])) {
-		$baseHost = $_SERVER['HTTP_HOST'];
-	} else {
-		if (isset($_SERVER['SERVER_NAME'][0])) {
-			$baseHost = $_SERVER['SERVER_NAME'];
-		} else {
-			$baseHost = $_SERVER['SERVER_ADDR'];
-		}
-	}
-}

system/functions.php

@@ -512,13 +512,6 @@ function template_place_holder($type): string
 	}
 	elseif ($type === 'body_start') {
 		$ret .= $twig->render('browsehappy.html.twig');
-
-		if (admin()) {
-			global $account_logged;
-			$ret .= $twig->render('admin-bar.html.twig', [
-				'username' => USE_ACCOUNT_NAME ? $account_logged->getName() : $account_logged->getId()
-			]);
-		}
 	}
 	elseif($type === 'body_end') {
 		$ret .= template_ga_code();
@@ -774,10 +767,6 @@ function formatExperience($exp, $color = true)
 	return $ret;
 }
 
-function getExperienceForLevel($level): float|int {
-	return ( 50 / 3 ) * pow( $level, 3 ) - ( 100 * pow( $level, 2 ) ) + ( ( 850 / 3 ) * $level ) - 200;
-}
-
 function get_locales()
 {
 	$ret = array();
@@ -993,12 +982,11 @@ function load_config_lua($filename)
 		foreach($lines as $ln => $line)
 		{
 			$line = trim($line);
-			if(isset($line[0]) && ($line[0] === '{' || $line[0] === '}')) {
+			if(@$line[0] === '{' || @$line[0] === '}') {
 				// arrays are not supported yet
 				// just ignore the error
 				continue;
 			}
-
 			$tmp_exp = explode('=', $line, 2);
 			if(str_contains($line, 'dofile')) {
 				$delimiter = '"';
@@ -1228,8 +1216,7 @@ function setting($key)
 		return $settings[$key[0]] = $key[1];
 	}
 
-	$ret = $settings[$key];
-	return isset($ret) ? $ret['value'] : null;
+	return $settings[$key]['value'];
 }
 
 function clearCache()
@@ -1278,15 +1265,14 @@ function clearCache()
 		$db->setClearCacheAfter(true);
 	}
 
-	if (function_exists('apcu_clear_cache')) {
-		apcu_clear_cache();
-	}
-
 	deleteDirectory(CACHE . 'signatures', ['index.html'], true);
 	deleteDirectory(CACHE . 'twig', ['index.html'], true);
 	deleteDirectory(CACHE . 'plugins', ['index.html'], true);
 	deleteDirectory(CACHE, ['signatures', 'twig', 'plugins', 'index.html', 'persistent'], true);
 
+	// routes cache
+	clearRouteCache();
+
 	global $hooks;
 	$hooks->trigger(HOOK_CACHE_CLEAR, ['cache' => Cache::getInstance()]);
 

system/init.php

@@ -12,7 +12,6 @@ use DebugBar\StandardDebugBar;
 use MyAAC\Cache\Cache;
 use MyAAC\CsrfToken;
 use MyAAC\Hooks;
-use MyAAC\Plugins;
 use MyAAC\Models\Town;
 use MyAAC\Settings;
 
@@ -47,11 +46,6 @@ if(isset($config['gzip_output']) && $config['gzip_output'] && isset($_SERVER['HT
 global $cache;
 $cache = Cache::getInstance();
 
-// load plugins init.php
-foreach (Plugins::getInits() as $init) {
-	require $init;
-}
-
 // event system
 global $hooks;
 $hooks = new Hooks();
@@ -144,15 +138,6 @@ $ots = POT::getInstance();
 $eloquentConnection = null;
 require_once SYSTEM . 'database.php';
 
-define('USE_ACCOUNT_NAME', $db->hasColumn('accounts', 'name'));
-define('USE_ACCOUNT_NUMBER', $db->hasColumn('accounts', 'number'));
-define('USE_ACCOUNT_SALT', $db->hasColumn('accounts', 'salt'));
-
-define('HAS_ACCOUNT_COINS', $db->hasColumn('accounts', 'coins'));
-define('HAS_ACCOUNT_COINS_TRANSFERABLE', $db->hasColumn('accounts', 'coins_transferable'));
-define('HAS_ACCOUNT_TRANSFERABLE_COINS', $db->hasColumn('accounts', 'transferable_coins'));
-const ACCOUNT_COINS_TRANSFERABLE_COLUMN = (HAS_ACCOUNT_COINS_TRANSFERABLE ? 'coins_transferable' : 'transferable_coins');
-
 $twig->addGlobal('logged', false);
 $twig->addGlobal('account_logged', new \OTS_Account());
 
@@ -197,6 +182,10 @@ if($settingsItemImagesURL[strlen($settingsItemImagesURL) - 1] !== '/') {
 	setting(['core.item_images_url', $settingsItemImagesURL . '/']);
 }
 
+define('USE_ACCOUNT_NAME', $db->hasColumn('accounts', 'name'));
+define('USE_ACCOUNT_NUMBER', $db->hasColumn('accounts', 'number'));
+define('USE_ACCOUNT_SALT', $db->hasColumn('accounts', 'salt'));
+
 $towns = Cache::remember('towns', 10 * 60, function () use ($db) {
 	if ($db->hasTable('towns') && Town::count() > 0) {
 		return Town::orderBy('id', 'ASC')->pluck('name', 'id')->toArray();

system/libs/pot/OTS.php

@@ -311,9 +311,18 @@ class POT
  */
 	public function loadClass($class)
 	{
-		if( preg_match('/^(I|E_)?OTS_/', $class) > 0)
-		{
-			include_once($this->path . $class . '.php');
+		if( preg_match('/^(I|E_)?OTS_/', $class) > 0) {
+			global $hooks;
+			$include = $this->path . $class . '.php';
+
+			if (isset($hooks)) {
+				$args = ['include' => $include, 'class' => $class];
+				$hooks->triggerFilter(HOOK_FILTER_POT, $args);
+
+				$include = $args['include'];
+			}
+
+			include_once($include);
 		}
 	}
 

system/libs/pot/OTS_Account.php

@@ -473,9 +473,12 @@ class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable
 
     public function isPremium()
     {
-		if(isset($this->data['premium_ends_at'])) {
-			return $this->data['premium_ends_at'] > time();
-		}
+		global $config;
+        if(isset($config['lua']['freePremium']) && getBoolean($config['lua']['freePremium'])) return true;
+
+	    if(isset($this->data['premium_ends_at'])) {
+		    return $this->data['premium_ends_at'] > time();
+	    }
 
 		if(isset($this->data['premend'])) {
 			return $this->data['premend'] > time();

system/libs/pot/OTS_DB_MySQL.php

@@ -26,11 +26,10 @@ use MyAAC\Cache\Cache;
  */
 class OTS_DB_MySQL extends OTS_Base_DB
 {
-	private array $has_table_cache = [];
-	private array $has_column_cache = [];
-	private array $get_column_info_cache = [];
+	private $has_table_cache = array();
+	private $has_column_cache = array();
 
-	private bool $clearCacheAfter = false;
+	private $clearCacheAfter = false;
 /**
  * Creates database connection.
  *
@@ -210,8 +209,7 @@ class OTS_DB_MySQL extends OTS_Base_DB
 		return $sql;
 	}
 
-	public function hasTable($name): bool
-	{
+	public function hasTable($name) {
 		if(isset($this->has_table_cache[$name])) {
 			return $this->has_table_cache[$name];
 		}
@@ -219,13 +217,12 @@ class OTS_DB_MySQL extends OTS_Base_DB
 		return $this->hasTableInternal($name);
 	}
 
-	private function hasTableInternal($name): bool
-	{
-		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);
+	private function hasTableInternal($name) {
+		global $config;
+		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);
 	}
 
-	public function hasColumn($table, $column): bool
-	{
+	public function hasColumn($table, $column) {
 		if(isset($this->has_column_cache[$table . '.' . $column])) {
 			return $this->has_column_cache[$table . '.' . $column];
 		}
@@ -233,8 +230,8 @@ class OTS_DB_MySQL extends OTS_Base_DB
 		return $this->hasColumnInternal($table, $column);
 	}
 
-	private function hasColumnInternal($table, $column): bool {
-		return $this->hasTable($table) && ($this->has_column_cache[$table . '.' . $column] = count($this->query('SHOW COLUMNS FROM `' . $table . "` LIKE " . $this->quote($column))->fetchAll()) > 0);
+	private function hasColumnInternal($table, $column) {
+		return $this->hasTable($table) && ($this->has_column_cache[$table . '.' . $column] = count($this->query('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $column . "'")->fetchAll()) > 0);
 	}
 
 	public function hasTableAndColumns(string $table, array $columns = []): bool
@@ -250,51 +247,6 @@ class OTS_DB_MySQL extends OTS_Base_DB
 		return true;
 	}
 
-	public function getColumnInfo(string $table, string $column): bool|array
-	{
-		if(isset($this->get_column_info_cache[$table . '.' . $column])) {
-			return $this->get_column_info_cache[$table . '.' . $column];
-		}
-
-		return $this->getColumnInfoInternal($table, $column);
-	}
-
-	private function getColumnInfoInternal(string $table, string $column): bool|array
-	{
-		if (!$this->hasTable($table) || !$this->hasColumn($table, $column)) {
-			return false;
-		}
-
-		$formatResult = function ($result) {
-			return [
-				'field' => $result['Field'],
-				'type' => $result['Type'],
-				'null' => strtolower($result['Null']),
-				'default' => $result['Default'],
-				'extra' => $result['Extra'],
-			];
-		};
-
-		$query = $this->query('SHOW COLUMNS FROM `' . $table . "` LIKE " . $this->quote($column));
-		$rowCount = $query->rowCount();
-		if ($rowCount > 1) {
-			$tmp = [];
-
-			$results = $query->fetchAll(PDO::FETCH_ASSOC);
-			foreach ($results as $result) {
-				$tmp[] = $formatResult($result);
-			}
-
-			return ($this->get_column_info_cache[$table . '.' . $column] = $tmp);
-		}
-		else if ($rowCount == 1) {
-			$result = $query->fetch(PDO::FETCH_ASSOC);
-			return ($this->get_column_info_cache[$table . '.' . $column] = $formatResult($result));
-		}
-
-		return [];
-	}
-
 	public function revalidateCache() {
 		foreach($this->has_table_cache as $key => $value) {
 			$this->hasTableInternal($key);

system/libs/pot/OTS_Player.php

@@ -2919,32 +2919,6 @@ class OTS_Player extends OTS_Row_DAO
 		$this->data['banned'] = $ban['active'];
 		$this->data['banned_time'] = $ban['expires'];
 	}
-
-	public function isNameLocked(): bool
-	{
-		// nothing can't be banned
-		if( !$this->isLoaded() ) {
-			throw new E_OTS_NotLoaded();
-		}
-
-		if($this->db->hasTable('player_namelocks')) {
-			$ban = $this->db->query('SELECT 1 FROM `player_namelocks` WHERE `player_id` = ' . $this->data['id'])->fetch(PDO::FETCH_ASSOC);
-			return (isset($ban['1']));
-		}
-		else if($this->db->hasTable('bans')) {
-			if($this->db->hasColumn('bans', 'active')) {
-				$ban = $this->db->query('SELECT `active`, `expires` FROM `bans` WHERE `type` = 2 AND `active` = 1 AND `value` = ' . $this->data['id'] . ' AND (`expires` > ' . time() .' OR `expires` = -1) ORDER BY `expires` DESC')->fetch();
-				return isset($ban['active']);
-			}
-			else { // tfs 0.2
-				$ban = $this->db->query('SELECT `time` FROM `bans` WHERE `type` = 2 AND `account` = ' . $this->data['account_id'] . ' AND (`time` > ' . time() .' OR `time` = -1) ORDER BY `time` DESC')->fetch();
-
-				return isset($ban['time']) && ($ban['time'] == -1 || $ban['time'] > 0);
-			}
-		}
-
-		return false;
-	}
 /**
  * Deletes player.
  *
@@ -2979,14 +2953,21 @@ class OTS_Player extends OTS_Row_DAO
  * @return string Player proffesion name.
  * @throws E_OTS_NotLoaded If player is not loaded or global vocations list is not loaded.
  */
-	public function getVocationName(): string
+	public function getVocationName()
 	{
 		if( !isset($this->data['vocation']) )
 		{
 			throw new E_OTS_NotLoaded();
 		}
 
-		return OTS_Toolbox::getVocationName($this->data['vocation'], $this->data['promotion'] ?? 0);
+		global $config;
+		$voc = $this->getVocation();
+		if(!isset($config['vocations'][$voc])) {
+			return 'Unknown';
+		}
+
+		return $config['vocations'][$voc];
+		//return POT::getInstance()->getVocationsList()->getVocationName($this->data['vocation']);
 	}
 
 /**

system/libs/pot/OTS_Toolbox.php

@@ -15,7 +15,7 @@
 
 /**
  * Toolbox for common operations.
- *
+ * 
  * @package POT
  * @version 0.1.5
  */
@@ -23,41 +23,41 @@ class OTS_Toolbox
 {
 /**
  * Calculates experience points needed for given level.
- *
+ * 
  * @param int $level Level for which experience should be calculated.
  * @param int $experience Current experience points.
  * @return int Experience points for level.
  */
 	public static function experienceForLevel($level, $experience = 0)
-	{
-		//return 50 * ($level - 1) * ($level * $level - 5 * $level + 12) / 3 - $experience;
+    {
+        //return 50 * ($level - 1) * ($level * $level - 5 * $level + 12) / 3 - $experience;
 		$level = $level - 1;
 		return ((50 * $level * $level * $level) - (150 * $level * $level) + (400 * $level)) / 3;
-	}
+    }
 
 /**
  * Finds out which level user have basing on his/her experience.
- *
+ * 
  * <p>
  * PHP doesn't support complex numbers natively so solving third-level polynomials would be quite hard. Rather then doing this, this method iterates calculating experience for next levels until it finds one which requires enought experience we have. Because of that, for high experience values this function can take relatively long time to be executed.
  * </p>
- *
+ * 
  * @param int $experience Current experience points.
  * @return int Experience level.
  */
-	public static function levelForExperience($experience)
-	{
-		// default level
-		$level = 1;
+    public static function levelForExperience($experience)
+    {
+        // default level
+        $level = 1;
 
-		// until we will find level which requires more experience then we have we will step to next
-		while( self::experienceForLevel($level + 1) <= $experience)
-		{
-			$level++;
-		}
+        // until we will find level which requires more experience then we have we will step to next
+        while( self::experienceForLevel($level + 1) <= $experience)
+        {
+            $level++;
+        }
 
-		return $level;
-	}
+        return $level;
+    }
 
 /**
  * @version 0.1.5
@@ -65,25 +65,25 @@ class OTS_Toolbox
  * @return OTS_Players_List Filtered list.
  * @deprecated 0.1.5 Use OTS_PlayerBans_List.
  */
-	public static function bannedPlayers()
-	{
-		// creates filter
-		$filter = new OTS_SQLFilter();
-		$filter->addFilter( new OTS_SQLField('type', 'bans'), POT::BAN_PLAYER);
-		$filter->addFilter( new OTS_SQLField('active', 'bans'), 1);
-		$filter->addFilter( new OTS_SQLField('value', 'bans'), new OTS_SQLField('id', 'players') );
+    public static function bannedPlayers()
+    {
+        // creates filter
+        $filter = new OTS_SQLFilter();
+        $filter->addFilter( new OTS_SQLField('type', 'bans'), POT::BAN_PLAYER);
+        $filter->addFilter( new OTS_SQLField('active', 'bans'), 1);
+        $filter->addFilter( new OTS_SQLField('value', 'bans'), new OTS_SQLField('id', 'players') );
 
-		// selects only active bans
-		$actives = new OTS_SQLFilter();
-		$actives->addFilter( new OTS_SQLField('expires', 'bans'), 0);
-		$actives->addFilter( new OTS_SQLField('time', 'bans'), time(), OTS_SQLFilter::OPERATOR_GREATER, OTS_SQLFilter::CRITERIUM_OR);
-		$filter->addFilter($actives);
+        // selects only active bans
+        $actives = new OTS_SQLFilter();
+        $actives->addFilter( new OTS_SQLField('expires', 'bans'), 0);
+        $actives->addFilter( new OTS_SQLField('time', 'bans'), time(), OTS_SQLFilter::OPERATOR_GREATER, OTS_SQLFilter::CRITERIUM_OR);
+        $filter->addFilter($actives);
 
-		// creates list and aplies filter
-		$list = new OTS_Players_List();
-		$list->setFilter($filter);
-		return $list;
-	}
+        // creates list and aplies filter
+        $list = new OTS_Players_List();
+        $list->setFilter($filter);
+        return $list;
+    }
 
 /**
  * @version 0.1.5
@@ -91,34 +91,25 @@ class OTS_Toolbox
  * @return OTS_Accounts_List Filtered list.
  * @deprecated 0.1.5 Use OTS_AccountBans_List.
  */
-	public static function bannedAccounts()
-	{
-		// creates filter
-		$filter = new OTS_SQLFilter();
-		$filter->addFilter( new OTS_SQLField('type', 'bans'), POT::BAN_ACCOUNT);
-		$filter->addFilter( new OTS_SQLField('active', 'bans'), 1);
-		$filter->addFilter( new OTS_SQLField('value', 'bans'), new OTS_SQLField('id', 'accounts') );
+    public static function bannedAccounts()
+    {
+        // creates filter
+        $filter = new OTS_SQLFilter();
+        $filter->addFilter( new OTS_SQLField('type', 'bans'), POT::BAN_ACCOUNT);
+        $filter->addFilter( new OTS_SQLField('active', 'bans'), 1);
+        $filter->addFilter( new OTS_SQLField('value', 'bans'), new OTS_SQLField('id', 'accounts') );
 
-		// selects only active bans
-		$actives = new OTS_SQLFilter();
-		$actives->addFilter( new OTS_SQLField('expires', 'bans'), 0);
-		$actives->addFilter( new OTS_SQLField('time', 'bans'), time(), OTS_SQLFilter::OPERATOR_GREATER, OTS_SQLFilter::CRITERIUM_OR);
-		$filter->addFilter($actives);
+        // selects only active bans
+        $actives = new OTS_SQLFilter();
+        $actives->addFilter( new OTS_SQLField('expires', 'bans'), 0);
+        $actives->addFilter( new OTS_SQLField('time', 'bans'), time(), OTS_SQLFilter::OPERATOR_GREATER, OTS_SQLFilter::CRITERIUM_OR);
+        $filter->addFilter($actives);
 
-		// creates list and aplies filter
-		$list = new OTS_Accounts_List();
-		$list->setFilter($filter);
-		return $list;
-	}
-
-	public static function getVocationName($id, $promotion = 0): string
-	{
-		if($promotion > 0) {
-			$id = ($id + ($promotion * config('vocations_amount')));
-		}
-
-		return config('vocations')[$id] ?? 'Unknown';
-	}
+        // creates list and aplies filter
+        $list = new OTS_Accounts_List();
+        $list->setFilter($filter);
+        return $list;
+    }
 }
 
 /**#@-*/

system/locale/de/install.php

@@ -48,8 +48,6 @@ $locale['step_config'] = 'Konfiguration';
 $locale['step_config_title'] = 'Grundkonfiguration';
 $locale['step_config_server_path'] = 'Serverpfad';
 $locale['step_config_server_path_desc'] = 'Pfad zu Ihrem TFS-Hauptverzeichnis, in dem sich die config.lua befinden.';
-$locale['step_config_site_url'] = 'Website URL';
-$locale['step_config_site_url_desc'] = 'Ihre Website-Adresse.';
 $locale['step_config_mail_admin'] = 'Admin E-Mail';
 $locale['step_config_mail_admin_desc'] = 'Adresse, an die E-Mails aus dem Kontaktformular gesendet werden, z. B. admin@gmail.com';
 $locale['step_config_mail_admin_error'] = 'Admin E-Mail ist nicht korrekt.';

system/locale/en/install.php

@@ -52,8 +52,6 @@ $locale['step_config'] = 'Configuration';
 $locale['step_config_title'] = 'Basic configuration';
 $locale['step_config_server_path'] = 'Server path';
 $locale['step_config_server_path_desc'] = 'Path to your TFS main directory, where you have config.lua located.';
-$locale['step_config_site_url'] = 'Website URL';
-$locale['step_config_site_url_desc'] = 'Your website address.';
 $locale['step_config_mail_admin'] = 'Admin Email';
 $locale['step_config_mail_admin_desc'] = 'Address where emails from contact form will be delivered, for example admin@gmail.com';
 $locale['step_config_mail_admin_error'] = 'Admin Email is not correct.';

system/locale/pl/install.php

@@ -52,8 +52,6 @@ $locale['step_config'] = 'Konfiguracja';
 $locale['step_config_title'] = 'Podstawowa konfiguracja';
 $locale['step_config_server_path'] = 'Ścieżka do serwera';
 $locale['step_config_server_path_desc'] = 'Ścieżka do Twojego folderu z TFS, gdzie znajduje się plik config.lua.';
-$locale['step_config_server_url'] = 'Adres strony';
-$locale['step_config_server_url_desc'] = 'Adres tej strony www.';
 $locale['step_config_mail_admin'] = 'E-Mail admina';
 $locale['step_config_mail_admin_desc'] = 'Na ten adres będą dostarczane E-Maile z formularza kontaktowego, przykładowo admin@gmail.com';
 $locale['step_config_mail_admin_error'] = 'E-Mail admina jest niepoprawny.';

system/pages/404.php

@@ -8,7 +8,7 @@
  * @link      https://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');
-$title = 'Not Found';
+$title = '404 Not Found';
 
 header('HTTP/1.0 404 Not Found');
 ?>

system/pages/405.php

@@ -8,7 +8,7 @@
  * @link      https://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');
-$title = 'Method Not Allowed';
+$title = '405 Method Not Allowed';
 
 header('HTTP/1.0 405 Method Not Allowed');
 ?>

system/pages/account/change-email.php

@@ -166,7 +166,7 @@ if(isset($_POST['emailchangecancel']) && $_POST['emailchangecancel'] == 1) {
 	$account_logged->setCustomField("email_new", "");
 	$account_logged->setCustomField("email_new_time", 0);
 
-	$custom_buttons = '<div style="text-align:center"><table border="0" cellspacing="0" cellpadding="0" ><form action="' . getLink('account/manage') . '" method="post" >' . csrf(true) . '<tr><td style="border:0px;" >' . $twig->render('buttons.back.html.twig') . '</td></tr></form></table></div>';
+	$custom_buttons = '<div style="text-align:center"><table border="0" cellspacing="0" cellpadding="0" ><form action="' . getLink('account/manage') . '" method="post" ><tr><td style="border:0px;" >' . $twig->render('buttons.back.html.twig') . '</td></tr></form></table></div>';
 
 	$twig->display('success.html.twig', array(
 		'title' => 'Email Address Change Cancelled',

system/pages/account/create.php

@@ -221,19 +221,8 @@ if($save)
 			}
 		}
 
-		$accountDefaultPremiumPoints = setting('core.account_premium_points');
-		if($accountDefaultPremiumPoints > 0) {
-			$new_account->setCustomField('premium_points', $accountDefaultPremiumPoints);
-		}
-
-		$accountDefaultCoins = setting('core.account_coins');
-		if(HAS_ACCOUNT_COINS && $accountDefaultCoins > 0) {
-			$new_account->setCustomField('coins', $accountDefaultCoins);
-		}
-
-		$accountDefaultCoinsTransferable = setting('core.account_coins_transferable');
-		if((HAS_ACCOUNT_COINS_TRANSFERABLE || HAS_ACCOUNT_TRANSFERABLE_COINS) && $accountDefaultCoinsTransferable > 0) {
-			$new_account->setCustomField(ACCOUNT_COINS_TRANSFERABLE_COLUMN, $accountDefaultCoinsTransferable);
+		if(setting('core.account_premium_points') && setting('core.account_premium_points') > 0) {
+			$new_account->setCustomField('premium_points', setting('core.account_premium_points'));
 		}
 
 		$tmp_account = $email;
@@ -268,10 +257,8 @@ if($save)
 			}
 			else
 			{
-				error('An error occurred while sending email! Account not created. Try again. For Admin: More info can be found in system/logs/mailer-error.log');
+				error('An error occorred while sending email! Account not created. Try again. For Admin: More info can be found in system/logs/mailer-error.log');
 				$new_account->delete();
-
-				return;
 			}
 		}
 		else

system/pages/account/lost.php

@@ -9,11 +9,540 @@
  * @link      https://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');
-$title = 'Lost Account';
+$title = 'Lost Account Interface';
 
-if(!setting('core.mail_enabled')) {
-	echo "<b>Account maker is not configured to send e-mails, you can't use Lost Account Interface. Contact with admin to get help.</b>";
+if(!setting('core.mail_enabled'))
+{
+	echo '<b>Account maker is not configured to send e-mails, you can\'t use Lost Account Interface. Contact with admin to get help.</b>';
 	return;
 }
 
-$twig->display('account/lost/form.html.twig');
+$action_type = isset($_REQUEST['action_type']) ? $_REQUEST['action_type'] : '';
+if($action == '')
+{
+	$twig->display('account.lost.form.html.twig');
+}
+else if($action == 'step1' && $action_type == '') {
+	$twig->display('account.lost.noaction.html.twig');
+}
+elseif($action == 'step1' && $action_type == 'email')
+{
+	$nick = stripslashes($_REQUEST['nick']);
+	if(Validator::characterName($nick))
+	{
+		$player = new OTS_Player();
+		$account = new OTS_Account();
+		$player->find($nick);
+		if($player->isLoaded())
+			$account = $player->getAccount();
+
+		if($account->isLoaded())
+		{
+			if($account->getCustomField('email_next') < time())
+				echo 'Please enter e-mail to account with this character.<BR>
+				<form action="' . getLink('account/lost') . '?action=sendcode" method=post>
+				<input type=hidden name="character">
+				<table cellspacing=1 cellpadding=4 border=0 width=100%>
+				<TR><TD BGCOLOR="'.$config['vdarkborder'].'" class="white"><B>Please enter e-mail to account</B></TD></TR>
+				<TR><TD BGCOLOR="'.$config['darkborder'].'">
+				Character: <INPUT TYPE=text NAME="nick" VALUE="'.$nick.'" SIZE="40" readonly="readonly"><BR>
+				E-mail to account:<INPUT TYPE=text NAME="email" VALUE="" SIZE="40"><BR>
+				</TD></TR>
+				</TABLE>
+				<BR>
+				<TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0 WIDTH=100%><TR><TD><div style="text-align:center">
+				' . $twig->render('buttons.submit.html.twig') . '</div>
+				</TD></TR></FORM></TABLE></TABLE>';
+			else
+			{
+				$insec = (int)$account->getCustomField('email_next') - time();
+				$minutesleft = floor($insec / 60);
+				$secondsleft = $insec - ($minutesleft * 60);
+				$timeleft = $minutesleft.' minutes '.$secondsleft.' seconds';
+				echo 'Account of selected character (<b>'.$nick.'</b>) received e-mail in last '.ceil(setting('core.mail_lost_account_interval') / 60).' minutes. You must wait '.$timeleft.' before you can use Lost Account Interface again.';
+			}
+		}
+		else
+			echo 'Player or account of player <b>' . $nick . '</b> doesn\'t exist.';
+	}
+	else
+		echo 'Invalid player name format. If you have other characters on account try with other name.';
+	echo '<BR /><TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0 WIDTH=100%><TR><TD><div style="text-align:center">
+				<a href="' . getLink('account/lost') . '" border="0"><IMG SRC="'.$template_path.'/images/global/buttons/sbutton_back.gif" NAME="Back" ALT="Back" BORDER=0 WIDTH=120 HEIGHT=18></a></div>
+				</TD></TR></FORM></TABLE></TABLE>';
+}
+elseif($action == 'sendcode')
+{
+	$email = $_REQUEST['email'];
+	$nick = stripslashes($_REQUEST['nick']);
+	if(Validator::characterName($nick))
+	{
+		$player = new OTS_Player();
+		$account = new OTS_Account();
+		$player->find($nick);
+		if($player->isLoaded())
+			$account = $player->getAccount();
+
+		if($account->isLoaded())
+		{
+			if($account->getCustomField('email_next') < time())
+			{
+				if($account->getEMail() == $email)
+				{
+					$newcode = generateRandomString(30, true, false, true);
+					$mailBody = '
+					You asked to reset your ' . $config['lua']['serverName'] . ' password.<br/>
+					<p>Account name: '.$account->getName().'</p>
+					<br />
+					To do so, please click this link:
+					<p><a href="' . getLink('account/lost') . '?action=checkcode&code='.$newcode.'&character='.urlencode($nick).'">' . getLink('account/lost') . '?action=checkcode&code='.$newcode.'&character='.urlencode($nick).'</a></p>
+					<p>or open page: <i>' . getLink('account/lost') . '?action=checkcode</i> and in field "code" write <b>'.$newcode.'</b></p>
+					<br/>
+						<p>If you did not request a password change, you may ignore this message and your password will remain unchanged.';
+
+					$account_mail = $account->getCustomField('email');
+					if(_mail($account_mail, $config['lua']['serverName'].' - Recover your account', $mailBody))
+					{
+						$account->setCustomField('email_code', $newcode);
+						$account->setCustomField('email_next', (time() + setting('core.mail_lost_account_interval')));
+						echo '<br />Details about steps required to recover your account has been sent to <b>' . $account_mail . '</b>. You should receive this email within 15 minutes. Please check your inbox/spam directory.';
+					}
+					else
+					{
+						$account->setCustomField('email_next', (time() + 60));
+						echo '<br /><p class="error">An error occurred while sending email! Try again later or contact with admin. For Admin: More info can be found in system/logs/mailer-error.log</p>';
+					}
+				}
+				else
+					echo 'Invalid e-mail to account of character <b>'.$nick.'</b>. Try again.';
+			}
+			else
+			{
+				$insec = (int)$account->getCustomField('email_next') - time();
+				$minutesleft = floor($insec / 60);
+				$secondsleft = $insec - ($minutesleft * 60);
+				$timeleft = $minutesleft.' minutes '.$secondsleft.' seconds';
+				echo 'Account of selected character (<b>'.$nick.'</b>) received e-mail in last '.ceil(setting('core.mail_lost_account_interval') / 60).' minutes. You must wait '.$timeleft.' before you can use Lost Account Interface again.';
+			}
+		}
+		else
+			echo 'Player or account of player <b>'.$nick.'</b> doesn\'t exist.';
+	}
+	else
+		echo 'Invalid player name format. If you have other characters on account try with other name.';
+	echo '<BR /><TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0 WIDTH=100%><TR><TD><div style="text-align:center">
+				<a href="' . getLink('account/lost') . '?action=step1&action_type=email&nick='.urlencode($nick).'" border="0"><IMG SRC="'.$template_path.'/images/global/buttons/sbutton_back.gif" NAME="Back" ALT="Back" BORDER=0 WIDTH=120 HEIGHT=18></a></div>
+				</TD></TR></FORM></TABLE></TABLE>';
+}
+elseif($action == 'step1' && $action_type == 'reckey')
+{
+	$nick = stripslashes($_REQUEST['nick']);
+	if(Validator::characterName($nick))
+	{
+		$player = new OTS_Player();
+		$account = new OTS_Account();
+		$player->find($nick);
+		if($player->isLoaded())
+			$account = $player->getAccount();
+		if($account->isLoaded())
+		{
+			$account_key = $account->getCustomField('key');
+			if(!empty($account_key))
+			{
+						echo 'If you enter right recovery key you will see form to set new e-mail and password to account. To this e-mail will be send your new password and account name.<BR>
+						<FORM ACTION="' . getLink('account/lost') . '?action=step2" METHOD=post>
+						<TABLE CELLSPACING=1 CELLPADDING=4 BORDER=0 WIDTH=100%>
+						<TR><TD BGCOLOR="'.$config['vdarkborder'].'" class="white"><B>Please enter your recovery key</B></TD></TR>
+						<TR><TD BGCOLOR="'.$config['darkborder'].'">
+						Character name:&nbsp;<INPUT TYPE=text NAME="nick" VALUE="'.$nick.'" SIZE="40" readonly="readonly"><BR />
+						Recovery key:&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE=text NAME="key" VALUE="" SIZE="40"><BR>
+						</TD></TR>
+						</TABLE>
+						<BR>
+						<TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0 WIDTH=100%><TR><TD><div style="text-align:center">
+						' . $twig->render('buttons.submit.html.twig') . '</div>
+						</TD></TR></FORM></TABLE></TABLE>';
+			}
+			else
+				echo 'Account of this character has no recovery key!';
+		}
+		else
+			echo 'Player or account of player <b>'.$nick.'</b> doesn\'t exist.';
+	}
+	else
+		echo 'Invalid player name format. If you have other characters on account try with other name.';
+	echo '<BR /><TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0 WIDTH=100%><TR><TD><div style="text-align:center">
+				<a href="' . getLink('account/lost') . '" border="0"><IMG SRC="'.$template_path.'/images/global/buttons/sbutton_back.gif" NAME="Back" ALT="Back" BORDER=0 WIDTH=120 HEIGHT=18></a></div>
+				</TD></TR></FORM></TABLE></TABLE>';
+}
+elseif($action == 'step2')
+{
+	$rec_key = trim($_REQUEST['key']);
+	$nick = stripslashes($_REQUEST['nick']);
+	if(Validator::characterName($nick))
+	{
+		$player = new OTS_Player();
+		$account = new OTS_Account();
+		$player->find($nick);
+		if($player->isLoaded())
+			$account = $player->getAccount();
+		if($account->isLoaded())
+		{
+			$account_key = $account->getCustomField('key');
+			if(!empty($account_key))
+			{
+				if($account_key == $rec_key)
+				{
+					echo '<script type="text/javascript">
+					function validate_required(field,alerttxt)
+					{
+					with (field)
+					{
+					if (value==null||value==""||value==" ")
+					  {alert(alerttxt);return false;}
+					else {return true}
+					}
+					}
+					function validate_email(field,alerttxt)
+					{
+					with (field)
+					{
+					apos=value.indexOf("@");
+					dotpos=value.lastIndexOf(".");
+					if (apos<1||dotpos-apos<2)
+					  {alert(alerttxt);return false;}
+					else {return true;}
+					}
+					}
+					function validate_form(thisform)
+					{
+					with (thisform)
+					{
+					if (validate_required(email,"Please enter your e-mail!")==false)
+					  {email.focus();return false;}
+					if (validate_email(email,"Invalid e-mail format!")==false)
+					  {email.focus();return false;}
+					if (validate_required(passor,"Please enter password!")==false)
+					  {passor.focus();return false;}
+					if (validate_required(passor2,"Please repeat password!")==false)
+					  {passor2.focus();return false;}
+					if (passor2.value!=passor.value)
+					  {alert(\'Repeated password is not equal to password!\');return false;}
+					}
+					}
+					</script>';
+					echo 'Set new password and e-mail to your account.<BR>
+					<FORM ACTION="' . getLink('account/lost') . '?action=step3" onsubmit="return validate_form(this)" METHOD=post>
+					<INPUT TYPE=hidden NAME="character" VALUE="">
+					<TABLE CELLSPACING=1 CELLPADDING=4 BORDER=0 WIDTH=100%>
+					<TR><TD BGCOLOR="'.$config['vdarkborder'].'" class="white"><B>Please enter new password and e-mail</B></TD></TR>
+					<TR><TD BGCOLOR="'.$config['darkborder'].'">
+					Account of character:&nbsp;&nbsp;<INPUT TYPE=text NAME="nick" VALUE="'.$nick.'" SIZE="40" readonly="readonly"><BR />
+					New password:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT id="passor" TYPE=password NAME="passor" VALUE="" SIZE="40"><BR>
+					Repeat new password:&nbsp;&nbsp;<INPUT id="passor2" TYPE=password NAME="passor" VALUE="" SIZE="40"><BR>
+					New e-mail address:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT id="email" TYPE=text NAME="email" VALUE="" SIZE="40"><BR>
+					<INPUT TYPE=hidden NAME="key" VALUE="'.$rec_key.'">
+					</TD></TR>
+					</TABLE>
+					<BR>
+					<TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0 WIDTH=100%><TR><TD><div style="text-align:center">
+					' . $twig->render('buttons.submit.html.twig') . '</div>
+					</TD></TR></FORM></TABLE></TABLE>';
+				}
+				else
+					echo 'Wrong recovery key!';
+			}
+			else
+				echo 'Account of this character has no recovery key!';
+		}
+		else
+			echo 'Player or account of player <b>'.$nick.'</b> doesn\'t exist.';
+	}
+	else
+		echo 'Invalid player name format. If you have other characters on account try with other name.';
+	echo '<BR /><TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0 WIDTH=100%><TR><TD><div style="text-align:center">
+				<a href="' . getLink('account/lost') . '?action=step1&action_type=reckey&nick='.urlencode($nick).'" border="0"><IMG SRC="'.$template_path.'/images/global/buttons/sbutton_back.gif" NAME="Back" ALT="Back" BORDER=0 WIDTH=120 HEIGHT=18></a></div>
+				</TD></TR></FORM></TABLE></TABLE>';
+}
+elseif($action == 'step3')
+{
+	$rec_key = trim($_REQUEST['key']);
+	$nick = stripslashes($_REQUEST['nick']);
+	$new_pass = trim($_REQUEST['passor']);
+	$new_email = trim($_REQUEST['email']);
+	if(Validator::characterName($nick))
+	{
+		$player = new OTS_Player();
+		$account = new OTS_Account();
+		$player->find($nick);
+		if($player->isLoaded())
+			$account = $player->getAccount();
+		if($account->isLoaded())
+		{
+			$account_key = $account->getCustomField('key');
+			if(!empty($account_key))
+			{
+				if($account_key == $rec_key)
+				{
+					if(Validator::password($new_pass))
+					{
+						if(Validator::email($new_email))
+						{
+							$account->setEMail($new_email);
+
+							$tmp_new_pass = $new_pass;
+							if(USE_ACCOUNT_SALT)
+							{
+								$salt = generateRandomString(10, false, true, true);
+								$tmp_new_pass = $salt . $new_pass;
+							}
+
+							$account->setPassword(encrypt($tmp_new_pass));
+							$account->save();
+
+							if(USE_ACCOUNT_SALT)
+								$account->setCustomField('salt', $salt);
+
+							echo 'Your account name, new password and new e-mail.<BR>
+							<FORM ACTION="' . getLink('account/manage') . '" onsubmit="return validate_form(this)" METHOD=post>
+							<INPUT TYPE=hidden NAME="character" VALUE="">
+							<TABLE CELLSPACING=1 CELLPADDING=4 BORDER=0 WIDTH=100%>
+							<TR><TD BGCOLOR="'.$config['vdarkborder'].'" class="white"><B>Your account name, new password and new e-mail</B></TD></TR>
+							<TR><TD BGCOLOR="'.$config['darkborder'].'">
+							Account name:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>'.$account->getName().'</b><BR>
+							New password:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>'.$new_pass.'</b><BR>
+							New e-mail address:&nbsp;<b>'.$new_email.'</b><BR>';
+							if($account->getCustomField('email_next') < time())
+							{
+								$mailBody = '
+								<h3>Your account name and new password!</h3>
+								<p>Changed password and e-mail to your account in Lost Account Interface on server <a href="'.BASE_URL.'"><b>'.$config['lua']['serverName'].'</b></a></p>
+								<p>Account name: <b>'.$account->getName().'</b></p>
+								<p>New password: <b>'.$new_pass.'</b></p>
+								<p>E-mail: <b>'.$new_email.'</b> (this e-mail)</p>
+								<br />
+								<p><u>It\'s automatic e-mail from OTS Lost Account System. Do not reply!</u></p>';
+
+								if(_mail($account->getCustomField('email'), $config['lua']['serverName']." - New password to your account", $mailBody))
+								{
+									echo '<br /><small>Sent e-mail with your account name and password to new e-mail. You should receive this e-mail in 15 minutes. You can login now with new password!</small>';
+								}
+								else
+								{
+									echo '<br /><p class="error">An error occurred while sending email! You will not receive e-mail with this informations. For Admin: More info can be found in system/logs/mailer-error.log</p>';
+								}
+							}
+							else
+							{
+								echo '<br /><small>You will not receive e-mail with this informations.</small>';
+							}
+							echo '<INPUT TYPE=hidden NAME="account_login" VALUE="'.$account->getId().'">
+							<INPUT TYPE=hidden NAME="password_login" VALUE="'.$new_pass.'">
+							</TD></TR></TABLE><BR>
+							<TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0 WIDTH=100%><TR><TD><div style="text-align:center">
+							<INPUT TYPE=image NAME="Login" ALT="Login" SRC="'.$template_path.'/images/global/buttons/sbutton_login.gif" BORDER=0 WIDTH=120 HEIGHT=18></div>
+							</TD></TR></FORM></TABLE></TABLE>';
+						}
+						else
+							echo Validator::getLastError();
+					}
+					else
+						echo Validator::getLastError();
+				}
+				else
+					echo 'Wrong recovery key!';
+			}
+			else
+				echo 'Account of this character has no recovery key!';
+		}
+		else
+			echo 'Player or account of player <b>'.$nick.'</b> doesn\'t exist.';
+	}
+	else
+		echo 'Invalid player name format. If you have other characters on account try with other name.';
+	echo '<BR /><TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0 WIDTH=100%><TR><TD><div style="text-align:center">
+				<a href="' . getLink('account/lost') . '?action=step1&action_type=reckey&nick='.urlencode($nick).'" border="0"><IMG SRC="'.$template_path.'/images/global/buttons/sbutton_back.gif" NAME="Back" ALT="Back" BORDER=0 WIDTH=120 HEIGHT=18></a></div>
+				</TD></TR></FORM></TABLE></TABLE>';
+}
+elseif($action == 'checkcode')
+{
+	$code = trim($_REQUEST['code']);
+	$character = stripslashes(trim($_REQUEST['character']));
+	if(empty($code) || empty($character))
+		echo 'Please enter code from e-mail and name of one character from account. Then press Submit.<BR>
+				<FORM ACTION="' . getLink('account/lost') . '?action=checkcode" METHOD=post>
+				<TABLE CELLSPACING=1 CELLPADDING=4 BORDER=0 WIDTH=100%>
+				<TR><TD BGCOLOR="'.$config['vdarkborder'].'" class="white"><B>Code & character name</B></TD></TR>
+				<TR><TD BGCOLOR="'.$config['darkborder'].'">
+				Your code:&nbsp;<INPUT TYPE=text NAME="code" VALUE="" SIZE="40")><BR />
+				Character:&nbsp;<INPUT TYPE=text NAME="character" VALUE="" SIZE="40")><BR />
+				</TD></TR>
+				</TABLE>
+				<BR>
+				<TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0 WIDTH=100%><TR><TD><div style="text-align:center">
+				' . $twig->render('buttons.submit.html.twig') . '</div>
+				</TD></TR></FORM></TABLE></TABLE>';
+	else
+	{
+		$player = new OTS_Player();
+		$account = new OTS_Account();
+		$player->find($character);
+		if($player->isLoaded())
+			$account = $player->getAccount();
+		if($account->isLoaded())
+		{
+			if($account->getCustomField('email_code') == $code)
+			{
+				echo '<script type="text/javascript">
+				function validate_required(field,alerttxt)
+				{
+				with (field)
+				{
+				if (value==null||value==""||value==" ")
+				  {alert(alerttxt);return false;}
+				else {return true}
+				}
+				}
+
+				function validate_form(thisform)
+				{
+				with (thisform)
+				{
+				if (validate_required(passor,"Please enter password!")==false)
+				  {passor.focus();return false;}
+				if (validate_required(passor2,"Please repeat password!")==false)
+				  {passor2.focus();return false;}
+				if (passor2.value!=passor.value)
+				  {alert(\'Repeated password is not equal to password!\');return false;}
+				}
+				}
+				</script>
+				Please enter new password to your account and repeat to make sure you remember password.<BR>
+				<FORM ACTION="' . getLink('account/lost') . '?action=setnewpassword" onsubmit="return validate_form(this)" METHOD=post>
+				<INPUT TYPE=hidden NAME="character" VALUE="'.$character.'">
+				<INPUT TYPE=hidden NAME="code" VALUE="'.$code.'">
+				<TABLE CELLSPACING=1 CELLPADDING=4 BORDER=0 WIDTH=100%>
+				<TR><TD BGCOLOR="'.$config['vdarkborder'].'" class="white"><B>Code & account name</B></TD></TR>
+				<TR><TD BGCOLOR="'.$config['darkborder'].'">
+				New password:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE=password ID="passor" NAME="passor" VALUE="" SIZE="40")><BR />
+				Repeat new password:&nbsp;<INPUT TYPE=password ID="passor2" NAME="passor2" VALUE="" SIZE="40")><BR />
+				</TD></TR>
+				</TABLE>
+				<BR>
+				<TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0 WIDTH=100%><TR><TD><div style="text-align:center">
+				' . $twig->render('buttons.submit.html.twig') . '</div>
+				</TD></TR></FORM></TABLE></TABLE>';
+			}
+			else
+				$error= 'Wrong code to change password.';
+		}
+		else
+			$error = 'Account of this character or this character doesn\'t exist.';
+	}
+	if(!empty($error))
+				echo '<span style="color: red"><b>'.$error.'</b></span><br />Please enter code from e-mail and name of one character from account. Then press Submit.<BR>
+				<FORM ACTION="' . getLink('account/lost') . '?action=checkcode" METHOD=post>
+				<TABLE CELLSPACING=1 CELLPADDING=4 BORDER=0 WIDTH=100%>
+				<TR><TD BGCOLOR="'.$config['vdarkborder'].'" class="white"><B>Code & character name</B></TD></TR>
+				<TR><TD BGCOLOR="'.$config['darkborder'].'">
+				Your code:&nbsp;<INPUT TYPE=text NAME="code" VALUE="" SIZE="40")><BR />
+				Character:&nbsp;<INPUT TYPE=text NAME="character" VALUE="" SIZE="40")><BR />
+				</TD></TR>
+				</TABLE>
+				<BR>
+				<TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0 WIDTH=100%><TR><TD><div style="text-align:center">
+				' . $twig->render('buttons.submit.html.twig') . '</div>
+				</TD></TR></FORM></TABLE></TABLE>';
+}
+elseif($action == 'setnewpassword')
+{
+	$newpassword = $_REQUEST['passor'];
+	$code = $_REQUEST['code'];
+	$character = stripslashes($_REQUEST['character']);
+	echo '';
+	if(empty($code) || empty($character) || empty($newpassword))
+		echo '<span style="color: red"><b>Error. Try again.</b></span><br />Please enter code from e-mail and name of one character from account. Then press Submit.<BR>
+				<BR><FORM ACTION="' . getLink('account/lost') . '?action=checkcode" METHOD=post>
+				<TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0 WIDTH=100%><TR><TD><div style="text-align:center">
+				<INPUT TYPE=image NAME="Back" ALT="Back" SRC="'.$template_path.'/images/global/buttons/sbutton_back.gif" BORDER=0 WIDTH=120 HEIGHT=18></div>
+				</TD></TR></FORM></TABLE></TABLE>';
+	else
+	{
+		$player = new OTS_Player();
+		$account = new OTS_Account();
+		$player->find($character);
+		if($player->isLoaded())
+			$account = $player->getAccount();
+		if($account->isLoaded())
+		{
+			if($account->getCustomField('email_code') == $code)
+			{
+				if(Validator::password($newpassword))
+				{
+					$tmp_new_pass = $newpassword;
+					if(USE_ACCOUNT_SALT)
+					{
+						$salt = generateRandomString(10, false, true, true);
+						$tmp_new_pass  = $salt . $newpassword;
+						$account->setCustomField('salt', $salt);
+					}
+
+					$account->setPassword(encrypt($tmp_new_pass ));
+					$account->save();
+					$account->setCustomField('email_code', '');
+					echo 'New password to your account is below. Now you can login.<BR>
+					<INPUT TYPE=hidden NAME="character" VALUE="'.$character.'">
+					<TABLE CELLSPACING=1 CELLPADDING=4 BORDER=0 WIDTH=100%>
+					<TR><TD BGCOLOR="'.$config['vdarkborder'].'" class="white"><B>Changed password</B></TD></TR>
+					<TR><TD BGCOLOR="'.$config['darkborder'].'">
+					New password:&nbsp;<b>'.$newpassword.'</b><BR />
+					Account name:&nbsp;&nbsp;&nbsp;<i>(Already on your e-mail)</i><BR />';
+
+					$mailBody = '
+					<h3>Your account name and password!</h3>
+					<p>Changed password to your account in Lost Account Interface on server <a href="'.BASE_URL.'"><b>'.$config['lua']['serverName'].'</b></a></p>
+					<p>Account name: <b>'.$account->getName().'</b></p>
+					<p>New password: <b>'.$newpassword.'</b></p>
+					<br />
+					<p><u>It\'s automatic e-mail from OTS Lost Account System. Do not reply!</u></p>';
+
+					if(_mail($account->getCustomField('email'), $config['lua']['serverName']." - Your new password", $mailBody))
+					{
+						echo '<br /><small>New password work! Sent e-mail with your password and account name. You should receive this e-mail in 15 minutes. You can login now with new password!';
+					}
+					else
+					{
+						echo '<br /><p class="error">New password work! An error occurred while sending email! You will not receive e-mail with new password. For Admin: More info can be found in system/logs/mailer-error.log';
+					}
+				echo '</TD></TR>
+				</TABLE>
+				<BR>
+				<TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0 WIDTH=100%><TR><TD><div style="text-align:center">
+				<FORM ACTION="' . getLink('account/manage') . '" METHOD=post>
+				<INPUT TYPE=image NAME="Login" ALT="Login" SRC="'.$template_path.'/images/global/buttons/sbutton_login.gif" BORDER=0 WIDTH=120 HEIGHT=18></div>
+				</TD></TR></FORM></TABLE></TABLE>';
+				}
+				else
+					$error= Validator::getLastError();
+			}
+			else
+				$error= 'Wrong code to change password.';
+		}
+		else
+			$error = 'Account of this character or this character doesn\'t exist.';
+	}
+	if(!empty($error))
+				echo '<span style="color: red"><b>'.$error.'</b></span><br />Please enter code from e-mail and name of one character from account. Then press Submit.<BR>
+				<FORM ACTION="' . getLink('account/lost') . '?action=checkcode" METHOD=post>
+				<TABLE CELLSPACING=1 CELLPADDING=4 BORDER=0 WIDTH=100%>
+				<TR><TD BGCOLOR="'.$config['vdarkborder'].'" class="white"><B>Code & character name</B></TD></TR>
+				<TR><TD BGCOLOR="'.$config['darkborder'].'">
+				Your code:&nbsp;<INPUT TYPE=text NAME="code" VALUE="" SIZE="40")><BR />
+				Character:&nbsp;<INPUT TYPE=text NAME="character" VALUE="" SIZE="40")><BR />
+				</TD></TR>
+				</TABLE>
+				<BR>
+				<TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0 WIDTH=100%><TR><TD><div style="text-align:center">
+				' . $twig->render('buttons.submit.html.twig') . '</div>
+				</TD></TR></FORM></TABLE></TABLE>';
+}

system/pages/account/lost/base.php

@@ -1,18 +0,0 @@
-<?php
-defined('MYAAC') or die('Direct access not allowed!');
-
-function lostAccountWriteCooldown(string $nick, int $time): void
-{
-	global $twig;
-
-	$inSec = $time - time();
-	$minutesLeft = floor($inSec / 60);
-	$secondsLeft = $inSec - ($minutesLeft * 60);
-	$timeLeft = $minutesLeft.' minutes '.$secondsLeft.' seconds';
-
-	$timeRounded = ceil(setting('core.mail_lost_account_interval') / 60);
-
-	$twig->display('error_box.html.twig', [
-		'errors' => ["Account of selected character (<b>" . escapeHtml($nick) . "</b>) received e-mail in last $timeRounded minutes. You must wait $timeLeft before you can use Lost Account Interface again."]
-	]);
-}

system/pages/account/lost/check-code.php

@@ -1,51 +0,0 @@
-<?php
-defined('MYAAC') or die('Direct access not allowed!');
-
-csrfProtect();
-
-$title = 'Lost Account';
-
-$code = isset($_REQUEST['code']) ? trim($_REQUEST['code']) : '';
-$character = isset($_REQUEST['character']) ? stripslashes(trim($_REQUEST['character'])) : '';
-
-if(empty($code) || empty($character))
-	$twig->display('account/lost/check-code.html.twig', [
-		'code' => $code,
-		'characters' => $character,
-	]);
-else
-{
-	$player = new OTS_Player();
-	$account = new OTS_Account();
-	$player->find($character);
-	if($player->isLoaded()) {
-		$account = $player->getAccount();
-	}
-
-	if($account->isLoaded()) {
-		if($account->getCustomField('email_code') == $code) {
-			$twig->display('account/lost/check-code.finish.html.twig', [
-				'character' => $character,
-				'code' => $code,
-			]);
-		}
-		else {
-			$error = 'Wrong code to change password.';
-		}
-	}
-	else {
-		$error = "Account of this character or this character doesn't exist.";
-	}
-}
-
-if(!empty($error)) {
-	$twig->display('error_box.html.twig', [
-		'errors' => [$error],
-	]);
-
-	echo '<br/>';
-
-	$twig->display('account/lost/check-code.html.twig', [
-
-	]);
-}

system/pages/account/lost/email/send-code.php

@@ -1,68 +0,0 @@
-<?php
-defined('MYAAC') or die('Direct access not allowed!');
-
-csrfProtect();
-
-require __DIR__ . '/../base.php';
-
-$title = 'Lost Account';
-
-$email = $_REQUEST['email'];
-$nick = stripslashes($_REQUEST['nick']);
-
-$player = new OTS_Player();
-$account = new OTS_Account();
-$player->find($nick);
-if($player->isLoaded()) {
-	$account = $player->getAccount();
-}
-
-if($account->isLoaded()) {
-	if($account->getCustomField('email_next') < time()) {
-		if($account->getEMail() == $email) {
-			$newCode = generateRandomString(30, true, false, true);
-			$mailBody = $twig->render('mail.account.lost.code.html.twig', [
-				'newCode' => $newCode,
-				'account' => $account,
-				'nick' => $nick,
-			]);
-
-			$accountEMail = $account->getCustomField('email');
-			if(_mail($accountEMail, configLua('serverName') . ' - Recover your account', $mailBody)) {
-				$account->setCustomField('email_code', $newCode);
-				$account->setCustomField('email_next', (time() + setting('core.mail_lost_account_interval')));
-
-				$twig->display('success.html.twig', [
-					'title' => 'Email has been sent',
-					'description' => 'Details about steps required to recover your account has been sent to <b>' . $accountEMail . '</b>. You should receive this email within 15 minutes. Please check your inbox/spam directory.',
-					'custom_buttons' => '',
-				]);
-			}
-			else {
-				$account->setCustomField('email_next', (time() + 60));
-				error('An error occurred while sending email! Try again later or contact with admin. For Admin: More info can be found in system/logs/mailer-error.log</p>');
-			}
-		}
-		else {
-			$errors[] = 'Invalid e-mail to account of character <b>' . escapeHtml($nick) . '</b>. Try again.';
-		}
-	}
-	else {
-		lostAccountWriteCooldown($nick, (int)$account->getCustomField('email_next'));
-	}
-}
-else {
-	$errors[] =  "Player or account of player <b>" . escapeHtml($nick) . "</b> doesn't exist.";
-}
-
-if (!empty($errors)) {
-	$twig->display('error_box.html.twig', [
-		'errors' => $errors,
-	]);
-}
-
-$twig->display('account.back_button.html.twig', [
-	'new_line' => true,
-	'center' => true,
-	'action' => getLink('account/lost/step-1') . '?action=email&nick=' . urlencode($nick),
-]);

system/pages/account/lost/email/set-new-password.php

@@ -1,94 +0,0 @@
-<?php
-defined('MYAAC') or die('Direct access not allowed!');
-
-csrfProtect();
-
-$title = 'Lost Account';
-
-$newPassword = $_REQUEST['password'];
-$passwordRepeat = $_REQUEST['password_repeat'];
-$code = $_REQUEST['code'];
-$character = stripslashes($_REQUEST['character']);
-
-if(empty($code) || empty($character) || empty($newPassword) || empty($passwordRepeat)) {
-	$errors[] = 'Please enter code from e-mail and name of one character from account. Then press Submit.';
-
-	$twig->display('error_box.html.twig', [
-		'errors' => $errors,
-	]);
-
-	$twig->display('account.back_button.html.twig', [
-		'new_line' => true,
-		'center' => true,
-		'action' => getLink('account/lost/check-code')
-	]);
-
-	return;
-}
-
-$player = new OTS_Player();
-$account = new OTS_Account();
-$player->find($character);
-if($player->isLoaded()) {
-	$account = $player->getAccount();
-}
-
-if($account->isLoaded()) {
-	if($account->getCustomField('email_code') == $code) {
-		if ($newPassword == $passwordRepeat) {
-			if (Validator::password($newPassword)) {
-				$tmp_new_pass = $newPassword;
-				if (USE_ACCOUNT_SALT) {
-					$salt = generateRandomString(10, false, true, true);
-					$tmp_new_pass = $salt . $newPassword;
-					$account->setCustomField('salt', $salt);
-				}
-
-				$account->setPassword(encrypt($tmp_new_pass));
-				$account->save();
-				$account->setCustomField('email_code', '');
-
-				$mailBody = $twig->render('mail.account.lost.new-password.html.twig', [
-					'account' => $account,
-					'newPassword' => $newPassword,
-				]);
-
-				$statusMsg = '';
-				if (_mail($account->getCustomField('email'), configLua('serverName') . ' - Your new password', $mailBody)) {
-					$statusMsg = '<br /><small>New password work! Sent e-mail with your password and account name. You should receive this e-mail in 15 minutes. You can login now with new password!';
-				} else {
-					$statusMsg = '<br /><p class="error">New password work! An error occurred while sending email! You will not receive e-mail with new password. For Admin: More info can be found in system/logs/mailer-error.log';
-				}
-
-				$twig->display('account/lost/finish.new-password.html.twig', [
-					'statusMsg' => $statusMsg,
-					'newPassword' => $newPassword,
-				]);
-			} else {
-				$error = Validator::getLastError();
-			}
-		}
-		else {
-			$error = 'Passwords are not the same!';
-		}
-	}
-	else {
-		$error = 'Wrong code to change password.';
-	}
-}
-else {
-	$error = "Account of this character or this character doesn't exist.";
-}
-
-if(!empty($error)) {
-	$twig->display('error_box.html.twig', [
-		'errors' => [$error],
-	]);
-
-	echo '<br/>';
-
-	$twig->display('account/lost/check-code.html.twig', [
-		'code' => $code,
-		'character' => $character,
-	]);
-}

system/pages/account/lost/email/step-1.php

@@ -1,34 +0,0 @@
-<?php
-defined('MYAAC') or die('Direct access not allowed!');
-
-require __DIR__ . '/../base.php';
-
-csrfProtect();
-
-$title = 'Lost Account';
-
-if($account->isLoaded()) {
-	if($account->getCustomField('email_next') < time()) {
-		$twig->display('account/lost/email.html.twig', [
-			'nick' => $nick,
-		]);
-	}
-	else {
-		lostAccountWriteCooldown($nick, (int)$account->getCustomField('email_next'));
-	}
-}
-else {
-	$errors[] = "Player or account of player <b>" . escapeHtml($nick) . "</b> doesn't exist.";
-}
-
-if (!empty($errors)) {
-	$twig->display('error_box.html.twig', [
-		'errors' => $errors,
-	]);
-}
-
-$twig->display('account.back_button.html.twig', [
-	'new_line' => true,
-	'center' => true,
-	'action' => getLink('account/lost'),
-]);

system/pages/account/lost/recovery-key/step-1.php

@@ -1,34 +0,0 @@
-<?php
-defined('MYAAC') or die('Direct access not allowed!');
-
-csrfProtect();
-
-$title = 'Lost Account';
-
-if($account->isLoaded()) {
-	$account_key = $account->getCustomField('key');
-
-	if(!empty($account_key)) {
-		$twig->display('account/lost/recovery-key.step-1.html.twig', [
-			'nick' => $nick,
-		]);
-	}
-	else {
-		$errors[] = 'Account of this character has no recovery key!';
-	}
-}
-else {
-	$errors[] = "Player or account of player <b>" . escapeHtml($nick) . "</b> doesn't exist.";
-}
-
-if (!empty($errors)) {
-	$twig->display('error_box.html.twig', [
-		'errors' => $errors,
-	]);
-}
-
-$twig->display('account.back_button.html.twig', [
-	'new_line' => true,
-	'center' => true,
-	'action' => getLink('account/lost'),
-]);

system/pages/account/lost/recovery-key/step-2.php

@@ -1,48 +0,0 @@
-<?php
-defined('MYAAC') or die('Direct access not allowed!');
-
-csrfProtect();
-
-$title = 'Lost Account';
-
-$key = trim($_REQUEST['key']);
-$nick = stripslashes($_REQUEST['nick']);
-
-$player = new OTS_Player();
-$account = new OTS_Account();
-$player->find($nick);
-if($player->isLoaded()) {
-	$account = $player->getAccount();
-}
-
-if($account->isLoaded()) {
-	$accountKey = $account->getCustomField('key');
-	if(!empty($accountKey)) {
-		if($accountKey == $key) {
-			$twig->display('account/lost/recovery-key.step-2.html.twig', [
-				'nick' => $nick,
-				'key' => $key,
-			]);
-		}
-		else {
-			$errors[] = 'Wrong recovery key!';
-		}
-	}
-	else {
-		$errors[] = 'Account of this character has no recovery key!';
-	}
-}
-else
-	$errors[] =  "Player or account of player <b>" . escapeHtml($nick) . "</b> doesn't exist.";
-
-if (!empty($errors)) {
-	$twig->display('error_box.html.twig', [
-		'errors' => $errors,
-	]);
-}
-
-$twig->display('account.back_button.html.twig', [
-	'new_line' => true,
-	'center' => true,
-	'action' => getLink('account/lost/step-1') . '?action=recovery-key&nick=' . urlencode($nick),
-]);

system/pages/account/lost/recovery-key/step-3.php

@@ -1,101 +0,0 @@
-<?php
-defined('MYAAC') or die('Direct access not allowed!');
-
-csrfProtect();
-
-$title = 'Lost Account';
-
-$key = trim($_REQUEST['key']);
-$nick = stripslashes($_REQUEST['nick']);
-$newPassword = trim($_REQUEST['password']);
-$passwordRepeat = trim($_REQUEST['password_repeat']);
-$newEmail = trim($_REQUEST['email']);
-
-$player = new OTS_Player();
-$account = new OTS_Account();
-$player->find($nick);
-if($player->isLoaded()) {
-	$account = $player->getAccount();
-}
-
-if($account->isLoaded()) {
-	$accountKey = $account->getCustomField('key');
-
-	if(!empty($accountKey)) {
-		if($accountKey == $key) {
-			if(Validator::password($newPassword)) {
-				if ($newPassword == $passwordRepeat) {
-					if (Validator::email($newEmail)) {
-						$account->setEMail($newEmail);
-
-						$tmp_new_pass = $newPassword;
-						if (USE_ACCOUNT_SALT) {
-							$salt = generateRandomString(10, false, true, true);
-							$tmp_new_pass = $salt . $newPassword;
-						}
-
-						$account->setPassword(encrypt($tmp_new_pass));
-						$account->save();
-
-						if (USE_ACCOUNT_SALT) {
-							$account->setCustomField('salt', $salt);
-						}
-
-						$statusMsg = '';
-						if ($account->getCustomField('email_next') < time()) {
-							$mailBody = $twig->render('mail.account.lost.new-email.html.twig', [
-								'account' => $account,
-								'newPassword' => $newPassword,
-								'newEmail' => $newEmail,
-							]);
-
-							if (_mail($account->getCustomField('email'), configLua('serverName') . ' - New password to your account', $mailBody)) {
-								$statusMsg = '<br /><small>Sent e-mail with your account name and password to new e-mail. You should receive this e-mail in 15 minutes. You can login now with new password!</small>';
-							} else {
-								$statusMsg = '<br /><p class="error">An error occurred while sending email! You will not receive e-mail with this informations. For Admin: More info can be found in system/logs/mailer-error.log</p>';
-							}
-						} else {
-							$statusMsg = '<br /><small>You will not receive e-mail with this informations.</small>';
-						}
-
-						$twig->display('account/lost/finish.new-email.html.twig', [
-							'statusMsg' => $statusMsg,
-							'account' => $account,
-							'newPassword' => $newPassword,
-							'newEmail' => $newEmail,
-						]);
-					} else {
-						$errors[] = Validator::getLastError();
-					}
-				}
-				else {
-					$errors[] = 'Passwords are not the same!';
-				}
-			}
-			else {
-				$errors[] = Validator::getLastError();
-			}
-		}
-		else {
-			$errors[] = 'Wrong recovery key!';
-		}
-	}
-	else {
-		$errors[] = 'Account of this character has no recovery key!';
-	}
-}
-else {
-	$errors[] = "Player or account of player <b>" . escapeHtml($nick) . "</b> doesn't exist.";
-}
-
-if (!empty($errors)) {
-	$twig->display('error_box.html.twig', [
-		'errors' => $errors,
-	]);
-}
-
-$twig->display('account.back_button.html.twig', [
-	'new_line' => true,
-	'center' => true,
-	'action' => getLink('account/lost/step-1') . '?action=recovery-key&nick=' . urlencode($nick),
-]);

system/pages/account/lost/step-1.php

@@ -1,26 +0,0 @@
-<?php
-defined('MYAAC') or die('Direct access not allowed!');
-
-csrfProtect();
-
-$title = 'Lost Account';
-
-$nick = stripslashes($_REQUEST['nick']);
-
-$player = new OTS_Player();
-$account = new OTS_Account();
-$player->find($nick);
-if($player->isLoaded()) {
-	$account = $player->getAccount();
-}
-
-if (ACTION == 'email') {
-	require __DIR__ . '/email/step-1.php';
-}
-else if (ACTION == 'recovery-key') {
-	require __DIR__ . '/recovery-key/step-1.php';
-}
-else {
-	$twig->display('account/lost/no-action.html.twig');
-}
-

system/pages/account/redirect.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * Change comment
+ *
+ * @package   MyAAC
+ * @author    Gesior <jerzyskalski@wp.pl>
+ * @author    Slawkens <slawkens@gmail.com>
+ * @copyright 2019 MyAAC
+ * @link      https://my-aac.org
+ */
+defined('MYAAC') or die('Direct access not allowed!');
+
+$redirect = urldecode($_REQUEST['redirect']);
+
+// should never happen, unless hacker modify the URL
+if (!str_contains($redirect, BASE_URL)) {
+	error('Fatal error: Cannot redirect outside the website.');
+	return;
+}
+
+$twig->display('account.redirect.html.twig', array(
+	'redirect' => $redirect
+));

system/pages/guilds/invite.php

@@ -23,12 +23,6 @@ if(!Validator::guildName($guild_name)) {
 	$errors[] = Validator::getLastError();
 }
 
-if (!$db->hasTableAndColumns('guild_invites', ['player_id'])) {
-	$errors[] = "Guild invite is not possible on this website.";
-	$twig->display('error_box.html.twig', ['errors' => $errors]);
-	return;
-}
-
 if(empty($errors)) {
 	$guild = new OTS_Guild();
 	$guild->find($guild_name);
@@ -64,7 +58,7 @@ if(empty($errors)) {
 	}
 }
 
-if(empty($errors) && !$guild_vice) {
+if(!$guild_vice) {
 	$errors[] = 'You are not a leader or vice leader of guild <b>'.$guild_name.'</b>.'.$level_in_guild;
 }
 
@@ -90,7 +84,6 @@ if(isset($_POST['todo']) && $_POST['todo'] == 'save') {
 		}
 	}
 }
-
 if(empty($errors)) {
 	include(SYSTEM . 'libs/pot/InvitesDriver.php');
 	new InvitesDriver($guild);
@@ -111,7 +104,6 @@ if(!empty($errors)) {
 else {
 	if(isset($_POST['todo']) && $_POST['todo'] == 'save') {
 		$guild->invite($player);
-
 		$twig->display('success.html.twig', array(
 			'title' => 'Invite player',
 			'description' => 'Player with name <b>' . $player->getName() . '</b> has been invited to your guild.',

system/pages/guilds/list.php

@@ -36,9 +36,10 @@ if(count($guilds_list) > 0) {
 		$guildName = $guild->getName();
 		$guilds[] = array('name' => $guildName, 'logo' => $guild_logo, 'link' => getGuildLink($guildName, false), 'description' => $description);
 	}
-}
+};
 
 $twig->display('guilds.list.html.twig', array(
 	'guilds' => $guilds,
+	'logged' => $logged ?? false,
 	'isAdmin' => admin(),
 ));

system/pages/guilds/show.php

@@ -121,28 +121,25 @@ foreach($rank_list as $rank)
 	}
 }
 
-$invited_list = [];
+include(SYSTEM . 'libs/pot/InvitesDriver.php');
+new InvitesDriver($guild);
+$invited_list = $guild->listInvites();
 $show_accept_invite = 0;
-
-if ($db->hasTableAndColumns('guild_invites', ['player_id'])) {
-	include(SYSTEM . 'libs/pot/InvitesDriver.php');
-	new InvitesDriver($guild);
-	$invited_list = $guild->listInvites();
-
-	if($logged && count($invited_list) > 0) {
-		foreach($invited_list as $invited_player) {
-			if(count($account_players) > 0) {
-				foreach($account_players as $player_from_acc) {
-					if($player_from_acc->isLoaded() && $invited_player->isLoaded() && $player_from_acc->getName() == $invited_player->getName()) {
-						$show_accept_invite++;
-					}
-				}
+if($logged && count($invited_list) > 0)
+{
+	foreach($invited_list as $invited_player)
+	{
+		if(count($account_players) > 0)
+		{
+			foreach($account_players as $player_from_acc)
+			{
+				if($player_from_acc->isLoaded() && $invited_player->isLoaded() && $player_from_acc->getName() == $invited_player->getName())
+					$show_accept_invite++;
 			}
 		}
 	}
 }
 
-
 $useGuildNick = $db->hasTable('guild_members') || $db->hasTable('guild_membership') || $db->hasColumn('players', 'guildnick');
 
 $twig->display('guilds.view.html.twig', array(

system/pages/highscores.php

@@ -123,10 +123,16 @@ if($db->hasColumn('players', 'promotion'))
 	$promotion = ',players.promotion';
 
 $outfit_addons = false;
-$outfit = ', lookbody, lookfeet, lookhead, looklegs, looktype';
-if($db->hasColumn('players', 'lookaddons')) {
-	$outfit .= ', lookaddons';
-	$outfit_addons = true;
+$outfit = '';
+
+$settingHighscoresOutfit = setting('core.highscores_outfit');
+
+if($settingHighscoresOutfit) {
+	$outfit = ', lookbody, lookfeet, lookhead, looklegs, looktype';
+	if($db->hasColumn('players', 'lookaddons')) {
+		$outfit .= ', lookaddons';
+		$outfit_addons = true;
+	}
 }
 
 $configHighscoresPerPage = setting('core.highscores_per_page');
@@ -140,24 +146,17 @@ $cache = Cache::getInstance();
 if ($cache->enabled() && $highscoresTTL > 0) {
 	$tmp = '';
 	if ($cache->fetch($cacheKey, $tmp)) {
-		$data = unserialize($tmp);
-		$totalResults = $data['totalResults'];
-		$highscores = $data['highscores'];
-		$updatedAt = $data['updatedAt'];
+		$highscores = unserialize($tmp);
 		$needReCache = false;
 	}
 }
 
 $offset = ($page - 1) * $configHighscoresPerPage;
-$query->withOnlineStatus()
+$query->join('accounts', 'accounts.id', '=', 'players.account_id')
+	->withOnlineStatus()
 	->whereNotIn('players.id', setting('core.highscores_ids_hidden'))
 	->notDeleted()
-	->where('players.group_id', '<', setting('core.highscores_groups_hidden'));
-
-$totalResultsQuery = clone $query;
-
-$query
-	->join('accounts', 'accounts.id', '=', 'players.account_id')
+	->where('players.group_id', '<', setting('core.highscores_groups_hidden'))
 	->limit($limit)
 	->offset($offset)
 	->selectRaw('accounts.country, players.id, players.name, players.account_id, players.level, players.vocation' . $outfit . $promotion)
@@ -216,24 +215,17 @@ if (empty($highscores)) {
 
 		return $tmp;
 	})->toArray();
-
-	$updatedAt = time();
-	$totalResults = $totalResultsQuery->count();
 }
 
 if ($highscoresTTL > 0 && $cache->enabled() && $needReCache) {
-	$cache->set($cacheKey, serialize(
-		[
-			'totalResults' => $totalResults,
-			'highscores' => $highscores,
-			'updatedAt' => $updatedAt,
-		]
-	), $highscoresTTL * 60);
+	$cache->set($cacheKey, serialize($highscores), $highscoresTTL * 60);
 }
 
 $show_link_to_next_page = false;
 $i = 0;
 
+$settingHighscoresVocation = setting('core.highscores_vocation');
+
 foreach($highscores as $id => &$player)
 {
 	if(++$i <= $configHighscoresPerPage)
@@ -247,22 +239,10 @@ foreach($highscores as $id => &$player)
 
 		$player['link'] = getPlayerLink($player['name'], false);
 		$player['flag'] = getFlagImage($player['country']);
-		$player['outfit'] = '<img style="position:absolute;margin-top:' . (in_array($player['looktype'], setting('core.outfit_images_wrong_looktypes')) ? '-15px;margin-left:5px' : '-45px;margin-left:-25px') . ';" src="' . $player['outfit_url'] . '" alt="" />';
-
-		if ($skill != POT::SKILL__LEVEL) {
-			if (isset($lastValue) && $lastValue == $player['value']) {
-				$player['rank'] = $lastRank;
-			}
-			else {
-				$player['rank'] = $offset + $i;
-			}
-
-			$lastRank = $player['rank'] ;
-			$lastValue = $player['value'];
-		}
-		else {
-			$player['rank'] = $offset + $i;
+		if($settingHighscoresOutfit) {
+			$player['outfit'] = '<img style="position:absolute;margin-top:' . (in_array($player['looktype'], setting('core.outfit_images_wrong_looktypes')) ? '-15px;margin-left:5px' : '-45px;margin-left:-25px') . ';" src="' . $player['outfit_url'] . '" alt="" />';
 		}
+		$player['rank'] = $offset + $i;
 	}
 	else {
 		unset($highscores[$id]);
@@ -283,8 +263,6 @@ if($show_link_to_next_page) {
 	$linkNextPage = getLink('highscores') . '/' . $list . ($vocation !== 'all' ? '/' . $vocation : '') . '/' . ($page + 1);
 }
 
-$baseLink = getLink('highscores') . '/' . $list . ($vocation !== 'all' ? '/' . $vocation : '') . '/';
-
 $types = array(
 	'experience' => 'Experience',
 	'magic' => 'Magic',
@@ -319,8 +297,4 @@ $twig->display('highscores.html.twig', [
 	'types' => $types,
 	'linkPreviousPage' => $linkPreviousPage,
 	'linkNextPage' => $linkNextPage,
-	'totalResults' => $totalResults,
-	'page' => $page,
-	'baseLink' => $baseLink,
-	'updatedAt' => $updatedAt,
 ]);

system/pages/online.php

@@ -9,140 +9,123 @@
  * @link      https://my-aac.org
  */
 
-use MyAAC\Cache\Cache;
 use MyAAC\Models\ServerConfig;
 use MyAAC\Models\ServerRecord;
 
 defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Who is online?';
 
-if (setting('core.account_country')) {
+if (setting('core.account_country'))
 	require SYSTEM . 'countries.conf.php';
-}
 
 $promotion = '';
-if($db->hasColumn('players', 'promotion')) {
+if($db->hasColumn('players', 'promotion'))
 	$promotion = '`promotion`,';
+
+$order = $_GET['order'] ?? 'name';
+if(!in_array($order, array('country', 'name', 'level', 'vocation')))
+	$order = $db->fieldName('name');
+else if($order == 'country')
+	$order = $db->tableName('accounts') . '.' . $db->fieldName('country');
+else if($order == 'vocation')
+	$order = $promotion . 'vocation ASC';
+
+$skull_type = 'skull';
+if($db->hasColumn('players', 'skull_type')) {
+	$skull_type = 'skull_type';
 }
 
-$order = $_GET['order'] ?? 'name_asc';
-if(!in_array($order, ['country_asc', 'country_desc', 'name_asc', 'name_desc', 'level_asc', 'level_desc', 'vocation_asc', 'vocation_desc'])) {
-	$order = 'name_asc';
-}
-else if($order == 'vocation_asc' || $order == 'vocation_desc') {
-	$order = $promotion . 'vocation_' . (str_contains($order, 'asc') ? 'asc' : 'desc');
+$skull_time = 'skulltime';
+if($db->hasColumn('players', 'skull_time')) {
+	$skull_time = 'skull_time';
 }
 
-$cached = Cache::remember("online_$order", setting('core.online_cache_ttl') * 60, function() use($db, $promotion, $order) {
-	$orderExplode = explode('_', $order);
-	$orderSql = $orderExplode[0] . ' ' . $orderExplode[1];
-
-	$skull_type = 'skull';
-	if($db->hasColumn('players', 'skull_type')) {
-		$skull_type = 'skull_type';
-	}
-
-	$skull_time = 'skulltime';
-	if($db->hasColumn('players', 'skull_time')) {
-		$skull_time = 'skull_time';
-	}
-
-	$outfit_addons = false;
+$outfit_addons = false;
+$outfit = '';
+if (setting('core.online_outfit')) {
 	$outfit = ', lookbody, lookfeet, lookhead, looklegs, looktype';
 	if($db->hasColumn('players', 'lookaddons')) {
 		$outfit .= ', lookaddons';
 		$outfit_addons = true;
 	}
+}
 
-	$vocations = array_map(function ($name) {
-		return 0;
-	}, setting('core.vocations'));
+$vocs = [];
+if (setting('core.online_vocations')) {
+	foreach($config['vocations'] as $id => $name) {
+		$vocs[$id] = 0;
+	}
+}
 
-	if($db->hasTable('players_online')) // tfs 1.0
-		$playersOnline = $db->query('SELECT `accounts`.`country`, `players`.`name`, `players`.`level`, `players`.`vocation`' . $outfit . ', `' . $skull_time . '` as `skulltime`, `' . $skull_type . '` as `skull` FROM `accounts`, `players`, `players_online` WHERE `players`.`id` = `players_online`.`player_id` AND `accounts`.`id` = `players`.`account_id`  ORDER BY ' . $orderSql);
-	else
-		$playersOnline = $db->query('SELECT `accounts`.`country`, `players`.`name`, `players`.`level`, `players`.`vocation`' . $outfit . ', ' . $promotion . ' `' . $skull_time . '` as `skulltime`, `' . $skull_type . '` as `skull` FROM `accounts`, `players` WHERE `players`.`online` > 0 AND `accounts`.`id` = `players`.`account_id`  ORDER BY ' . $orderSql);
+if($db->hasTable('players_online')) // tfs 1.0
+	$playersOnline = $db->query('SELECT `accounts`.`country`, `players`.`name`, `players`.`level`, `players`.`vocation`' . $outfit . ', `' . $skull_time . '` as `skulltime`, `' . $skull_type . '` as `skull` FROM `accounts`, `players`, `players_online` WHERE `players`.`id` = `players_online`.`player_id` AND `accounts`.`id` = `players`.`account_id`  ORDER BY ' . $order);
+else
+	$playersOnline = $db->query('SELECT `accounts`.`country`, `players`.`name`, `players`.`level`, `players`.`vocation`' . $outfit . ', ' . $promotion . ' `' . $skull_time . '` as `skulltime`, `' . $skull_type . '` as `skull` FROM `accounts`, `players` WHERE `players`.`online` > 0 AND `accounts`.`id` = `players`.`account_id`  ORDER BY ' . $order);
 
-	$settingVocations = setting('core.vocations');
-	$settingVocationsAmount = setting('core.vocations_amount');
-
-	$players = [];
-	foreach($playersOnline as $player) {
-		$skull = '';
-		if($player['skulltime'] > 0) {
-			if($player['skull'] == 3) {
+$players_data = array();
+$players = 0;
+$data = '';
+foreach($playersOnline as $player) {
+	$skull = '';
+	if (setting('core.online_skulls'))
+	{
+		if($player['skulltime'] > 0)
+		{
+			if($player['skull'] == 3)
 				$skull = ' <img style="border: 0;" src="images/white_skull.gif"/>';
-			}
-			elseif($player['skull'] == 4) {
+			elseif($player['skull'] == 4)
 				$skull = ' <img style="border: 0;" src="images/red_skull.gif"/>';
-			}
-			elseif($player['skull'] == 5) {
+			elseif($player['skull'] == 5)
 				$skull = ' <img style="border: 0;" src="images/black_skull.gif"/>';
-			}
-		}
-
-		if(isset($player['promotion'])) {
-			if((int)$player['promotion'] > 0)
-				$player['vocation'] += ($player['promotion'] * $settingVocationsAmount);
-		}
-
-		$players[] = array(
-			'name' => getPlayerLink($player['name']),
-			'player' => $player,
-			'level' => $player['level'],
-			'vocation' => $settingVocations[$player['vocation']],
-			'skull' => $skull,
-			'country_image' => getFlagImage($player['country']),
-			'outfit' => setting('core.outfit_images_url') . '?id=' . $player['looktype'] . ($outfit_addons ? '&addons=' . $player['lookaddons'] : '') . '&head=' . $player['lookhead'] . '&body=' . $player['lookbody'] . '&legs=' . $player['looklegs'] . '&feet=' . $player['lookfeet'],
-		);
-
-		$vocations[($player['vocation'] > $settingVocationsAmount ? $player['vocation'] - $settingVocationsAmount : $player['vocation'])]++;
-	}
-
-	$record = '';
-	if(count($players) > 0) {
-		if( setting('core.online_record')) {
-			$result = null;
-			$timestamp = false;
-			if($db->hasTable('server_record')) {
-				$timestamp = $db->hasColumn('server_record', 'timestamp');
-				$serverRecordQuery = ServerRecord::query();
-
-				if ($db->hasColumn('server_record', 'world_id')) {
-					$serverRecordQuery->where('world_id', configLua('worldId'));
-				}
-
-				$result = $serverRecordQuery->orderByDesc('record')->first();
-				if ($result) {
-					$result = $result->toArray();
-				}
-			} else if($db->hasTable('server_config')) { // tfs 1.0
-				$row = ServerConfig::where('config', 'players_record')->first();
-				if ($row) {
-					$result = ['record' => $row->value];
-				}
-			}
-
-			if($result) {
-				$record = $result['record'] . ' player' . ($result['record'] > 1 ? 's' : '') . ($timestamp ? ' (on ' . date("M d Y, H:i:s", $result['timestamp']) . ')' : '');
-			}
 		}
 	}
 
-	return [
-		'players' => $players,
-		'record' => $record,
-		'vocations' => $vocations,
-	];
-});
+	if(isset($player['promotion'])) {
+		if((int)$player['promotion'] > 0)
+			$player['vocation'] += ($player['promotion'] * $config['vocations_amount']);
+	}
+
+	$players_data[] = array(
+		'name' => getPlayerLink($player['name']),
+		'player' => $player,
+		'level' => $player['level'],
+		'vocation' => $config['vocations'][$player['vocation']],
+		'country_image' => setting('core.account_country') ? getFlagImage($player['country']) : null,
+		'outfit' => setting('core.online_outfit') ? setting('core.outfit_images_url') . '?id=' . $player['looktype'] . ($outfit_addons ? '&addons=' . $player['lookaddons'] : '') . '&head=' . $player['lookhead'] . '&body=' . $player['lookbody'] . '&legs=' . $player['looklegs'] . '&feet=' . $player['lookfeet'] : null
+	);
+
+	if (setting('core.online_vocations')) {
+		$vocs[($player['vocation'] > $config['vocations_amount'] ? $player['vocation'] - $config['vocations_amount'] : $player['vocation'])]++;
+	}
+}
+
+$record = '';
+if(count($players_data) > 0) {
+	if( setting('core.online_record')) {
+		$result = null;
+		$timestamp = false;
+		if($db->hasTable('server_record')) {
+			$timestamp = true;
+			$result = ServerRecord::where('world_id', $config['lua']['worldId'])->orderByDesc('record')->first()->toArray();
+		} else if($db->hasTable('server_config')) { // tfs 1.0
+			$row = ServerConfig::where('config', 'players_record')->first();
+			if ($row) {
+				$result = ['record' => $row->value];
+			}
+		}
+
+		if($result) {
+			$record = 'The maximum on this game world was ' . $result['record'] . ' players' . ($timestamp ? ' on ' . date("M d Y, H:i:s", $result['timestamp']) . '.' : '.');
+		}
+	}
+}
 
 $twig->display('online.html.twig', array(
-	'players' => $cached['players'],
-	'record' => $cached['record'],
-	'vocations' => $cached['vocations'],
-	'vocs' => $cached['vocations'], // deprecated, to be removed
-	'order' => $order,
+	'players' => $players_data,
+	'record' => $record,
+	'vocs' => $vocs,
 ));
 
-// search bar
-$twig->display('characters.form.html.twig');
+//search bar
+$twig->display('online.form.html.twig');
+?>

system/router.php

@@ -94,30 +94,19 @@ $dispatcher = FastRoute\cachedDispatcher(function (FastRoute\RouteCollector $r)
 		$routesFinal[] = ['*', $page, '__database__/' . $page, 100];
 	}
 
-	$routes = require SYSTEM . 'routes.php';
 	Plugins::clearWarnings();
-
-	foreach (Plugins::getRoutes() as $pluginRoute) {
-
-		$routesFinal[] = [$pluginRoute[0], $pluginRoute[1], $pluginRoute[2], $pluginRoute[3] ?? 1000];
-
-		// Possibility to override routes with plugins pages, like characters.php
-		foreach ($routes as &$route) {
-			if (str_contains($pluginRoute[2], 'pages/' . $route[2])) {
-				$route[2] = $pluginRoute[2];
-			}
-		}
+	foreach (Plugins::getRoutes() as $route) {
+		$routesFinal[] = [$route[0], $route[1], $route[2], $route[3] ?? 1000];
 /*
 		echo '<pre>';
-		var_dump($pluginRoute[1], $pluginRoute[3], $pluginRoute[2]);
+		var_dump($route[1], $route[3], $route[2]);
 		echo '/<pre>';
 */
 	}
 
+	$routes = require SYSTEM . 'routes.php';
 	foreach ($routes as $route) {
-		if (!str_contains($route[2], '__redirect__') && !str_contains($route[2], '__database__')
-			&& !str_contains($route[2], 'plugins/')
-		) {
+		if (!str_contains($route[2], '__redirect__') && !str_contains($route[2], '__database__')) {
 			if (!is_file(BASE . 'system/pages/' . $route[2])) {
 				continue;
 			}
@@ -140,14 +129,14 @@ $dispatcher = FastRoute\cachedDispatcher(function (FastRoute\RouteCollector $r)
 		return ($a[3] < $b[3]) ? -1 : 1;
 	});
 
-	$aliases = [
-		[':int', ':string', ':alphanum'],
-		[':\d+', ':[A-Za-z0-9-_%+\' ]+', ':[A-Za-z0-9]+'],
-	];
-
 	// remove duplicates
 	// if same route pattern, but different priority
-	$routesFinal = array_filter($routesFinal, function ($a) use ($aliases) {
+	$routesFinal = array_filter($routesFinal, function ($a) {
+		$aliases = [
+			[':int', ':string', ':alphanum'],
+			[':\d+', ':[A-Za-z0-9-_%+\' ]+', ':[A-Za-z0-9]+'],
+		];
+
 		// apply aliases
 		$a[1] = str_replace($aliases[0], $aliases[1], $a[1]);
 
@@ -182,15 +171,15 @@ $dispatcher = FastRoute\cachedDispatcher(function (FastRoute\RouteCollector $r)
 			$route[0] = array_map($toUpperCase, $route[0]);
 		}
 
+		$aliases = [
+			[':int', ':string', ':alphanum'],
+			[':\d+', ':[A-Za-z0-9-_%+\' ]+', ':[A-Za-z0-9]+'],
+		];
+
 		// apply aliases
 		$route[1] = str_replace($aliases[0], $aliases[1], $route[1]);
 
-		try {
-			$r->addRoute($route[0], $route[1], $route[2]);
-		}
-		catch (\Exception $e) {
-			// duplicated route, just ignore
-		}
+		$r->addRoute($route[0], $route[1], $route[2]);
 	}
 
 	if (config('env') === 'dev') {
@@ -263,7 +252,7 @@ else {
 
 				$success = false;
 				$tmp_content = getCustomPage($pageName, $success);
-				if ($success && $hooks->trigger(HOOK_BEFORE_PAGE_CUSTOM)) {
+				if ($success) {
 					$content .= $tmp_content;
 					if (hasFlag(FLAG_CONTENT_PAGES) || superAdmin()) {
 						$pageInfo = getCustomPageInfo($pageName);
@@ -271,8 +260,6 @@ else {
 							) . $content;
 					}
 
-					$hooks->trigger(HOOK_AFTER_PAGE_CUSTOM);
-
 					$page = $pageName;
 					$file = false;
 				}
@@ -337,9 +324,7 @@ if (isset($_REQUEST['_page_only'])) {
 
 if(!isset($title)) {
 	$title = str_replace('index.php/', '', $page);
-	$title = str_replace(['_', '-', '/'], ' ', $page);
-
-	$title = ucwords($title);
+	$title = ucfirst($title);
 }
 
 if(setting('core.backward_support')) {

system/routes.php

@@ -22,11 +22,11 @@ return [
 	['GET', 'account/confirm-email/{hash:alphanum}', 'account/confirm-email.php'],
 
 	['GET', 'bans/{page:int}', 'bans.php'],
-	[['GET', 'POST'], 'characters/{name:[A-Za-z0-9-_%+\' \[\]]+}', 'characters.php'],
-	['GET', 'changelog/{page:int}', 'changelog.php'],
-	[['GET', 'POST'], 'monsters/{name:string}', 'monsters.php'],
+	[['GET', 'POST'], 'characters[/{name:string}]', 'characters.php'],
+	['GET', 'changelog[/{page:int}]', 'changelog.php'],
+	[['GET', 'POST'], 'monsters[/{name:string}]', 'monsters.php'],
 
-	[['GET', 'POST'], 'faq/{action:string}', 'faq.php'],
+	[['GET', 'POST'], 'faq[/{action:string}]', 'faq.php'],
 
 	[['GET', 'POST'], 'forum/{action:string}', 'forum.php'],
 	['GET', 'forum/board/{id:int}', 'forum/show_board.php'],

system/settings.php

@@ -19,24 +19,6 @@ $templates = Cache::remember('templates', 5 * 60, function () {
 });
 $defaultTemplate = in_array('kathrine', $templates) ? 'kathrine' : $templates[0];
 
-global $db;
-
-if (!IS_CLI) {
-	require SYSTEM . 'base.php';
-
-	$serverUrl = 'http' . (isHttps() ? 's' : '') . '://' . $baseHost;
-	$siteURL = $serverUrl . $baseDir;
-}
-
-$donateColumnOptions = [
-	'premium_points' => 'Premium Points',
-	'coins' => 'Coins',
-];
-
-if (defined('HAS_ACCOUNT_COINS_TRANSFERABLE') && (HAS_ACCOUNT_COINS_TRANSFERABLE || HAS_ACCOUNT_TRANSFERABLE_COINS)) {
-	$donateColumnOptions[ACCOUNT_COINS_TRANSFERABLE_COLUMN] = 'Coins Transferable';
-}
-
 return [
 	'name' => 'MyAAC',
 	'settings' => [
@@ -48,13 +30,6 @@ return [
 			'type' => 'section',
 			'title' => 'General'
 		],
-		'site_url' => [
-			'name' => 'Website URL',
-			'type' => 'text',
-			'desc' => 'Website address of this MyAAC instance',
-			'default' => IS_CLI ? '' : $siteURL,
-			'is_config' => true,
-		],
 		'env' => [
 			'name' => 'App Environment',
 			'type' => 'options',
@@ -699,20 +674,6 @@ Sent by MyAAC,<br/>
 			'desc' => 'Default premium points on new account',
 			'default' => 0,
 		],
-		'account_coins' => [
-			'name' => 'Default Account Coins',
-			'type' => 'number',
-			'desc' => 'Default coins on new account',
-			'hidden' => ($db && !HAS_ACCOUNT_COINS),
-			'default' => 0,
-		],
-		'account_coins_transferable' => [
-			'name' => 'Default Account Transferable Coins',
-			'type' => 'number',
-			'desc' => 'Default transferable coins on new account',
-			'hidden' => ($db && !HAS_ACCOUNT_COINS_TRANSFERABLE && !HAS_ACCOUNT_TRANSFERABLE_COINS),
-			'default' => 0,
-		],
 		'account_mail_change' => [
 			'name' => 'Account Mail Change Days',
 			'type' => 'number',
@@ -1078,12 +1039,6 @@ Sent by MyAAC,<br/>
 			'desc' => 'How often to update highscores from database in minutes. Too low may slow down your website.<br/>0 to disable.',
 			'default' => 15,
 		],
-		'highscores_skills_box' => [
-			'name' => 'Display Skills Box',
-			'type' => 'boolean',
-			'desc' => 'show "Choose a skill" box on the highscores (allowing peoples to sort highscores by skill)?',
-			'default' => true,
-		],
 		'highscores_vocation_box' => [
 			'name' => 'Display Vocation Box',
 			'type' => 'boolean',
@@ -1096,12 +1051,6 @@ Sent by MyAAC,<br/>
 			'desc' => 'Show player vocation under his nickname?',
 			'default' => true,
 		],
-		'highscores_online_status' => [
-			'name' => 'Display Online Status',
-			'type' => 'boolean',
-			'desc' => 'Show player status as red (offline) or green (online)',
-			'default' => false,
-		],
 		'highscores_frags' => [
 			'name' => 'Display Top Frags',
 			'type' => 'boolean',
@@ -1256,14 +1205,6 @@ Sent by MyAAC,<br/>
 			'type' => 'section',
 			'title' => 'Online Page'
 		],
-		'online_cache_ttl' => [
-			'name' => 'Online Cache TTL (in minutes)',
-			'type' => 'number',
-			'min' => 0,
-			'desc' => 'How often to update online list from database in minutes. Too low may slow down your website.' . PHP_EOL .
-				'0 to disable.',
-			'default' => 15,
-		],
 		'online_record' => [
 			'name' => 'Display Players Record',
 			'type' => 'boolean',
@@ -1300,12 +1241,6 @@ Sent by MyAAC,<br/>
 			'desc' => '',
 			'default' => false,
 		],
-		'online_datacenter' => [
-			'name' => 'Data Center',
-			'type' => 'text',
-			'desc' => 'Server Location, will be shown on online page',
-			'default' => 'Poland - Warsaw',
-		],
 		[
 			'type' => 'section',
 			'title' => 'Team Page'
@@ -1607,14 +1542,13 @@ Sent by MyAAC,<br/>
 			'name' => 'Donate Column',
 			'type' => 'options',
 			'desc' => 'What to give to player after donation - what column in accounts table to use.',
-			'options' => $donateColumnOptions,
+			'options' => ['premium_points' => 'Premium Points', 'coins' => 'Coins'],
 			'default' => 'premium_points',
 			'callbacks' => [
 				'beforeSave' => function($key, $value, &$errorMessage) {
 					global $db;
-
-					if (!$db->hasColumn('accounts', $value)) {
-						$errorMessage = "Shop: Donate Column: Cannot set column to $value, because it doesn't exist in database.";
+					if ($value == 'coins' && !$db->hasColumn('accounts', 'coins')) {
+						$errorMessage = "Shop: Donate Column: Cannot set column to coins, because it doesn't exist in database.";
 						return false;
 					}
 					return true;

system/src/Admin/Plugins.php

@@ -1,49 +0,0 @@
-<?php
-
-namespace MyAAC\Admin;
-
-use GuzzleHttp\Client;
-
-class Plugins
-{
-	private string $api_base_uri = 'https://plugins.my-aac.org/api/';
-
-	public function getLatestVersions(): array
-	{
-		$client = new Client([
-			// Base URI is used with relative requests
-			'base_uri' => $this->api_base_uri,
-			// You can set any number of default request options.
-			'timeout'  => 3.0,
-		]);
-
-		$plugins = get_plugins(true);
-		foreach ($plugins as &$plugin) {
-			if (str_contains($plugin, 'disabled.')) {
-				$plugin = str_replace('disabled.', '', $plugin);
-			}
-		}
-
-		try {
-			$response = $client->get('get-latest-versions', [
-				'json' => ['plugins' => $plugins],
-			]);
-		}
-		catch (\Exception $e) {
-			error('API Error. Please try again later.');
-			return [];
-		}
-
-		$statusCode = $response->getStatusCode();
-		if ($statusCode != 200) {
-			throw new \Exception('Error getting info from plugins repository. Please try again later.');
-		}
-
-		$data = $response->getBody();
-		return json_decode($data, true);
-	}
-
-	public function setApiBaseUri(string $uri): void {
-		$this->api_base_uri = $uri;
-	}
-}

system/src/Cache/Cache.php

@@ -106,7 +106,7 @@ class Cache
 	public static function remember($key, $ttl, $callback)
 	{
 		$cache = self::getInstance();
-		if (!$cache->enabled() || $ttl == 0) {
+		if (!$cache->enabled()) {
 			return $callback();
 		}
 

system/src/Commands/CacheClearCommand.php

@@ -2,7 +2,6 @@
 
 namespace MyAAC\Commands;
 
-use MyAAC\Cache\Cache;
 use MyAAC\Hooks;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -18,7 +17,10 @@ class CacheClearCommand extends Command
 
 	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
-		require SYSTEM . 'init.php';
+		global $hooks;
+		$hooks = new Hooks();
+		$hooks->load();
+		$hooks->trigger(HOOK_INIT);
 
 		$io = new SymfonyStyle($input, $output);
 
@@ -27,13 +29,6 @@ class CacheClearCommand extends Command
 			return Command::FAILURE;
 		}
 
-		$cacheEngine = config('cache_engine') == 'auto' ?
-			Cache::detect() : config('cache_engine');
-
-		if (config('env') !== 'dev' && $cacheEngine == 'apcu') {
-			$io->warning('APCu cache cannot be cleared in CLI. Please visit the Admin Panel and clear there.');
-		}
-
 		$io->success('Cache cleared');
 		return Command::SUCCESS;
 	}

system/src/Commands/MailSendCommand.php

@@ -12,10 +12,9 @@ class MailSendCommand extends Command
 {
 	protected function configure(): void
 	{
-		$this->setName('email:send')
-			->setAliases(['mail:send'])
+		$this->setName('mail:send')
 			->setDescription('This command sends E-Mail to single user. Message can be provided as follows: ' . PHP_EOL
-				. '  echo "Hello World" | php aac email:send --subject="This is the subject" test@test.com')
+				. '  echo "Hello World" | php sa email:send --subject="This is the subject" test@test.com')
 			->addArgument('recipient', InputArgument::REQUIRED, 'Email, Account Name, Account id or Player Name')
 			->addOption('subject', 's', InputOption::VALUE_REQUIRED, 'Subject');
 	}

system/src/Commands/MigrateRunCommand.php

@@ -45,22 +45,6 @@ class MigrateRunCommand extends Command
 
 		$down = $input->getOption('down') ?? false;
 
-		/**
-		 * Sort according to $down option.
-		 * Do we really want it?
-		 * Or should we use order provided by user,
-		 *      even when it's not sorted correctly?
-		 * Leaving it for consideration.
-		 */
-		/*
-		if ($down) {
-			rsort($ids);
-		}
-		else {
-			sort($ids);
-		}
-		*/
-
 		foreach ($ids as $id) {
 			$this->executeMigration($id, $io, !$down);
 		}

system/src/Commands/PluginDisableCommand.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace MyAAC\Commands;
-
-use MyAAC\Plugins;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Style\SymfonyStyle;
-
-class PluginDisableCommand extends Command
-{
-	protected function configure(): void
-	{
-		$this->setName('plugin:disable')
-			->setDescription('This command disables plugin')
-			->addArgument('plugin-name', InputArgument::REQUIRED, 'Plugin that you want to disable');
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int
-	{
-		require SYSTEM . 'init.php';
-
-		$io = new SymfonyStyle($input, $output);
-
-		$pluginName = $input->getArgument('plugin-name');
-
-		if (!Plugins::disable($pluginName)) {
-			$io->error('Error while disabling plugin ' . $pluginName . ': ' . Plugins::getError());
-			return 2;
-		}
-
-		$io->success('Successfully disabled plugin ' . $pluginName);
-		return Command::SUCCESS;
-	}
-}

system/src/Commands/PluginEnableCommand.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace MyAAC\Commands;
-
-use MyAAC\Plugins;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Style\SymfonyStyle;
-
-class PluginEnableCommand extends Command
-{
-	protected function configure(): void
-	{
-		$this->setName('plugin:enable')
-			->setDescription('This command enables plugin')
-			->addArgument('plugin-name', InputArgument::REQUIRED, 'Plugin that you want to enable');
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int
-	{
-		require SYSTEM . 'init.php';
-
-		$io = new SymfonyStyle($input, $output);
-
-		$pluginName = $input->getArgument('plugin-name');
-
-		if (!Plugins::enable($pluginName)) {
-			$io->error('Error while enabling plugin ' . $pluginName . ': ' . Plugins::getError());
-			return 2;
-		}
-
-		$io->success('Successfully enabled plugin ' . $pluginName);
-		return Command::SUCCESS;
-	}
-}

system/src/Commands/PluginInstallInstallCommand.php

@@ -8,12 +8,11 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
-class PluginSetupCommand extends Command
+class PluginInstallInstallCommand extends Command
 {
 	protected function configure(): void
 	{
-		$this->setName('plugin:setup')
-			->setAliases(['plugin:install:install'])
+		$this->setName('plugin:install:install')
 			->setDescription('This command executes the "install" part of the plugin')
 			->addArgument('plugin', InputArgument::REQUIRED, 'Plugin name');
 	}

system/src/Commands/PluginUninstallCommand.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace MyAAC\Commands;
-
-use MyAAC\Plugins;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Style\SymfonyStyle;
-
-class PluginUninstallCommand extends Command
-{
-	protected function configure(): void
-	{
-		$this->setName('plugin:uninstall')
-			->setDescription('This command uninstalls plugin')
-			->addArgument('plugin-name', InputArgument::REQUIRED, 'Plugin that you want to uninstall');
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int
-	{
-		require SYSTEM . 'init.php';
-
-		$io = new SymfonyStyle($input, $output);
-
-		$pluginName = $input->getArgument('plugin-name');
-
-		if (!Plugins::uninstall($pluginName)) {
-			$io->error('Error while uninstalling plugin ' . $pluginName . ': ' . Plugins::getError());
-			return 2;
-		}
-
-		foreach(Plugins::getWarnings() as $warning) {
-			$io->warning($warning);
-		}
-
-		$io->success('Successfully uninstalled plugin ' . $pluginName);
-		return Command::SUCCESS;
-	}
-}

system/src/Commands/SettingsResetCommand.php

@@ -3,7 +3,6 @@
 namespace MyAAC\Commands;
 
 use MyAAC\Models\Settings as SettingsModel;
-use MyAAC\Plugins;
 use MyAAC\Settings;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -35,14 +34,7 @@ class SettingsResetCommand extends Command
 			return Command::FAILURE;
 		}
 
-		// find by plugin name
-		foreach (Plugins::getAllPluginsSettings() as $key => $setting) {
-			if ($setting['pluginFilename'] === $name) {
-				$name = $key;
-			}
-		}
-
-		if (empty($name)) {
+		if (!$name) {
 			SettingsModel::truncate();
 		}
 		else {

system/src/Commands/SettingsSetCommand.php

@@ -3,7 +3,6 @@
 namespace MyAAC\Commands;
 
 use MyAAC\Models\Settings as SettingsModel;
-use MyAAC\Plugins;
 use MyAAC\Settings;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -18,7 +17,7 @@ class SettingsSetCommand extends Command
 			->setDescription('Updates the setting specified by argument in database')
 			->addArgument('key',
 				InputArgument::REQUIRED,
-				'Setting key in format name.key'
+				'Setting name/key'
 			)
 			->addArgument('value',
 				InputArgument::REQUIRED,
@@ -35,18 +34,6 @@ class SettingsSetCommand extends Command
 		$key = $input->getArgument('key');
 		$value = $input->getArgument('value');
 
-		// format settings_name.key
-		// example: core.template
-		$explode = explode('.', $key);
-
-		// find by plugin name
-		foreach (Plugins::getAllPluginsSettings() as $_key => $setting) {
-			if ($setting['pluginFilename'] === $explode[0]) {
-				$explode[0] = $_key;
-				$key = implode('.', $explode);
-			}
-		}
-
 		$settings = Settings::getInstance();
 		$settings->clearCache();
 		$settings->load();
@@ -57,6 +44,10 @@ class SettingsSetCommand extends Command
 			return Command::FAILURE;
 		}
 
+		// format plugin_name.key
+		// example: core.template
+		$explode = explode('.', $key);
+
 		$settings->updateInDatabase($explode[0], $explode[1], $value);
 		$settings->clearCache();
 

system/src/Hook.php

@@ -38,8 +38,6 @@ class Hook
 	}
 
 	public function executeFilter(&$args) {
-		global $db, $config, $template_path, $ots, $content, $twig;
-
 		return include BASE . $this->_file;
 	}
 

system/src/Models/Account.php

@@ -53,9 +53,12 @@ class Account extends Model {
 
 	public function getIsPremiumAttribute()
 	{
-		if(isset($this->premium_ends_at)) {
-			return $this->premium_ends_at > time();
-		}
+		global $config;
+        if(isset($config['lua']['freePremium']) && getBoolean($config['lua']['freePremium'])) return true;
+
+	    if(isset($this->premium_ends_at)) {
+		    return $this->premium_ends_at > time();
+	    }
 
 		if(isset($this->premend)) {
 			return $this->premend > time();

system/src/Models/PlayerOnline.php

@@ -9,10 +9,6 @@ class PlayerOnline extends Model {
 
 	public $timestamps = false;
 
-	protected $fillable = [
-		'player_id',
-	];
-
 	public function player()
 	{
 		return $this->belongsTo(Player::class);

system/src/Plugins.php

@@ -11,25 +11,6 @@ class Plugins {
 	private static $error = null;
 	private static $plugin_json = [];
 
-	public static function getInits()
-	{
-		return Cache::remember('plugins_inits', 10 * 60, function () {
-			$inits = [];
-			foreach(self::getAllPluginsJson() as $plugin) {
-				if (!self::getAutoLoadOption($plugin, 'init', false)) {
-					continue;
-				}
-
-				$pluginInits = glob(PLUGINS . $plugin['filename'] . '/init.php');
-				foreach ($pluginInits as $path) {
-					$inits[] = $path;
-				}
-			}
-
-			return $inits;
-		});
-	}
-
 	public static function getAdminPages()
 	{
 		return Cache::remember('plugins_admin_pages', 10 * 60, function () {
@@ -532,192 +513,193 @@ class Plugins {
 		self::$plugin_json = $plugin_json;
 		if ($plugin_json == null) {
 			self::$warnings[] = 'Cannot load ' . $file_name . '. File might be not a valid json code.';
-			return false;
 		}
+		else {
+			$continue = true;
 
-		$continue = true;
-
-		if(!isset($plugin_json['name']) || empty(trim($plugin_json['name']))) {
-			self::$error = 'Plugin "name" tag is not set.';
-			return false;
-		}
-
-		if(!isset($plugin_json['version']) || empty(trim($plugin_json['version']))) {
-			self::$warnings[] = 'Plugin "version" tag is not set.';
-		}
-
-		if(isset($plugin_json['require'])) {
-			$require = $plugin_json['require'];
-
-			$myaac_satified = true;
-			if(isset($require['myaac_'])) {
-				$require_myaac = $require['myaac_'];
-				if(!Semver::satisfies(MYAAC_VERSION, $require_myaac)) {
-					$myaac_satified = false;
-				}
-			}
-			else if(isset($require['myaac'])) {
-				$require_myaac = $require['myaac'];
-				if(version_compare(MYAAC_VERSION, $require_myaac, '<')) {
-					$myaac_satified = false;
-				}
-			}
-
-			if(!$myaac_satified) {
-				self::$error = "Your AAC version doesn't meet the requirement of this plugin. Required version is: " . $require_myaac . ", and you're using version " . MYAAC_VERSION . ".";
+			if(!isset($plugin_json['name']) || empty(trim($plugin_json['name']))) {
+				self::$error = 'Plugin "name" tag is not set.';
 				return false;
 			}
 
-			$php_satisfied = true;
-			if(isset($require['php_'])) {
-				$require_php = $require['php_'];
-				if(!Semver::satisfies(phpversion(), $require_php)) {
-					$php_satisfied = false;
-				}
-			}
-			else if(isset($require['php'])) {
-				$require_php = $require['php'];
-				if(version_compare(phpversion(), $require_php, '<')) {
-					$php_satisfied = false;
-				}
+			if(!isset($plugin_json['version']) || empty(trim($plugin_json['version']))) {
+				self::$warnings[] = 'Plugin "version" tag is not set.';
 			}
 
-			if(!$php_satisfied) {
-				self::$error = "Your PHP version doesn't meet the requirement of this plugin. Required version is: " . $require_php . ", and you're using version " . phpversion() . ".";
-				$continue = false;
-			}
+			if(isset($plugin_json['require'])) {
+				$require = $plugin_json['require'];
 
-			$database_satisfied = true;
-			if(isset($require['database_'])) {
-				$require_database = $require['database_'];
-				if(!Semver::satisfies(DATABASE_VERSION, $require_database)) {
-					$database_satisfied = false;
-				}
-			}
-			else if(isset($require['database'])) {
-				$require_database = $require['database'];
-				if(version_compare(DATABASE_VERSION, $require_database, '<')) {
-					$database_satisfied = false;
-				}
-			}
-
-			if(!$database_satisfied) {
-				self::$error = "Your database version doesn't meet the requirement of this plugin. Required version is: " . $require_database . ", and you're using version " . DATABASE_VERSION . ".";
-				$continue = false;
-			}
-
-			if($continue) {
-				foreach($require as $req => $version) {
-					$req = strtolower(trim($req));
-					$version = trim($version);
-
-					if(in_array($req, array('myaac', 'myaac_', 'php', 'php_', 'database', 'database_'))) {
-						continue;
+				$myaac_satified = true;
+				if(isset($require['myaac_'])) {
+					$require_myaac = $require['myaac_'];
+					if(!Semver::satisfies(MYAAC_VERSION, $require_myaac)) {
+						$myaac_satified = false;
 					}
-
-					if(in_array($req, array('php-ext', 'php-extension'))) { // require php extension
-						$tmpDisplayError = false;
-						$explode = explode(',', $version);
-
-						foreach ($explode as $item) {
-							if(!extension_loaded($item)) {
-								$errors[] = "This plugin requires php extension: " . $item . " to be installed.";
-								$tmpDisplayError = true;
-							}
-						}
-
-						if ($tmpDisplayError) {
-							self::$error = implode('<br/>', $errors);
-							$continue = false;
-							break;
-						}
+				}
+				else if(isset($require['myaac'])) {
+					$require_myaac = $require['myaac'];
+					if(version_compare(MYAAC_VERSION, $require_myaac, '<')) {
+						$myaac_satified = false;
 					}
-					else if($req == 'table') {
-						$tmpDisplayError = false;
-						$explode = explode(',', $version);
-						foreach ($explode as $item) {
-							if(!$db->hasTable($item)) {
-								$errors[] = "This plugin requires table: " . $item . " to exist in the database.";
-								$tmpDisplayError = true;
-							}
-						}
+				}
 
-						if ($tmpDisplayError) {
-							self::$error = implode('<br/>', $errors);
-							$continue = false;
-							break;
-						}
+				if(!$myaac_satified) {
+					self::$error = "Your AAC version doesn't meet the requirement of this plugin. Required version is: " . $require_myaac . ", and you're using version " . MYAAC_VERSION . ".";
+					return false;
+				}
+
+				$php_satisfied = true;
+				if(isset($require['php_'])) {
+					$require_php = $require['php_'];
+					if(!Semver::satisfies(phpversion(), $require_php)) {
+						$php_satisfied = false;
 					}
-					else if($req == 'column') {
-						$tmpDisplayError = false;
-						$explode = explode(',', $version);
-						foreach ($explode as $item) {
-							$tmp = explode('.', $item);
+				}
+				else if(isset($require['php'])) {
+					$require_php = $require['php'];
+					if(version_compare(phpversion(), $require_php, '<')) {
+						$php_satisfied = false;
+					}
+				}
 
-							if(count($tmp) == 2) {
-								if(!$db->hasColumn($tmp[0], $tmp[1])) {
-									$errors[] = "This plugin requires database column: " . $tmp[0] . "." . $tmp[1] . " to exist in database.";
+				if(!$php_satisfied) {
+					self::$error = "Your PHP version doesn't meet the requirement of this plugin. Required version is: " . $require_php . ", and you're using version " . phpversion() . ".";
+					$continue = false;
+				}
+
+				$database_satisfied = true;
+				if(isset($require['database_'])) {
+					$require_database = $require['database_'];
+					if(!Semver::satisfies(DATABASE_VERSION, $require_database)) {
+						$database_satisfied = false;
+					}
+				}
+				else if(isset($require['database'])) {
+					$require_database = $require['database'];
+					if(version_compare(DATABASE_VERSION, $require_database, '<')) {
+						$database_satisfied = false;
+					}
+				}
+
+				if(!$database_satisfied) {
+					self::$error = "Your database version doesn't meet the requirement of this plugin. Required version is: " . $require_database . ", and you're using version " . DATABASE_VERSION . ".";
+					$continue = false;
+				}
+
+				if($continue) {
+					foreach($require as $req => $version) {
+						$req = strtolower(trim($req));
+						$version = trim($version);
+
+						if(in_array($req, array('myaac', 'myaac_', 'php', 'php_', 'database', 'database_'))) {
+							continue;
+						}
+
+						if(in_array($req, array('php-ext', 'php-extension'))) { // require php extension
+							$tmpDisplayError = false;
+							$explode = explode(',', $version);
+
+							foreach ($explode as $item) {
+								if(!extension_loaded($item)) {
+									$errors[] = "This plugin requires php extension: " . $item . " to be installed.";
 									$tmpDisplayError = true;
 								}
 							}
-							else {
-								self::$warnings[] = "Invalid plugin require column: " . $item;
-							}
-						}
 
-						if ($tmpDisplayError) {
-							self::$error = implode('<br/>', $errors);
-							$continue = false;
-							break;
-						}
-					}
-					else if(strpos($req, 'ext-') !== false) {
-						$tmp = explode('-', $req);
-						if(count($tmp) == 2) {
-							if(!extension_loaded($tmp[1]) || !Semver::satisfies(phpversion($tmp[1]), $version)) {
-								self::$error = "This plugin requires php extension: " . $tmp[1] . ", version " . $version . " to be installed.";
+							if ($tmpDisplayError) {
+								self::$error = implode('<br/>', $errors);
 								$continue = false;
 								break;
 							}
 						}
-					}
-					else if(!self::is_installed($req, $version)) {
-						self::$error = "This plugin requires another plugin to run correctly. The another plugin is: " . $req . ", with version " . $version . ".";
-						$continue = false;
-						break;
+						else if($req == 'table') {
+							$tmpDisplayError = false;
+							$explode = explode(',', $version);
+							foreach ($explode as $item) {
+								if(!$db->hasTable($item)) {
+									$errors[] = "This plugin requires table: " . $item . " to exist in the database.";
+									$tmpDisplayError = true;
+								}
+							}
+
+							if ($tmpDisplayError) {
+								self::$error = implode('<br/>', $errors);
+								$continue = false;
+								break;
+							}
+						}
+						else if($req == 'column') {
+							$tmpDisplayError = false;
+							$explode = explode(',', $version);
+							foreach ($explode as $item) {
+								$tmp = explode('.', $item);
+
+								if(count($tmp) == 2) {
+									if(!$db->hasColumn($tmp[0], $tmp[1])) {
+										$errors[] = "This plugin requires database column: " . $tmp[0] . "." . $tmp[1] . " to exist in database.";
+										$tmpDisplayError = true;
+									}
+								}
+								else {
+									self::$warnings[] = "Invalid plugin require column: " . $item;
+								}
+							}
+
+							if ($tmpDisplayError) {
+								self::$error = implode('<br/>', $errors);
+								$continue = false;
+								break;
+							}
+						}
+						else if(strpos($req, 'ext-') !== false) {
+							$tmp = explode('-', $req);
+							if(count($tmp) == 2) {
+								if(!extension_loaded($tmp[1]) || !Semver::satisfies(phpversion($tmp[1]), $version)) {
+									self::$error = "This plugin requires php extension: " . $tmp[1] . ", version " . $version . " to be installed.";
+									$continue = false;
+									break;
+								}
+							}
+						}
+						else if(!self::is_installed($req, $version)) {
+							self::$error = "This plugin requires another plugin to run correctly. The another plugin is: " . $req . ", with version " . $version . ".";
+							$continue = false;
+							break;
+						}
 					}
 				}
 			}
-		}
 
-		if(!$continue) {
-			return false;
-		}
+			if($continue) {
+				if(!$zip->extractTo(BASE)) { // "Real" Install
+					self::$error = 'There was a problem with extracting zip archive to base directory.';
+					$zip->close();
+					return false;
+				}
 
-		if(!$zip->extractTo(BASE)) { // "Real" Install
-			self::$error = 'There was a problem with extracting zip archive to base directory.';
-			$zip->close();
-			return false;
-		}
+				$install = $plugin_json['install'] ?? '';
+				if (self::getAutoLoadOption($plugin_json, 'install', true) && is_file(PLUGINS . $pluginFilename . '/install.php')) {
+					$install = 'plugins/' . $pluginFilename . '/install.php';
+				}
 
-		$install = $plugin_json['install'] ?? '';
-		if (self::getAutoLoadOption($plugin_json, 'install', true) && is_file(PLUGINS . $pluginFilename . '/install.php')) {
-			$install = 'plugins/' . $pluginFilename . '/install.php';
-		}
+				if (!empty($install)) {
+					if (file_exists(BASE . $install)) {
+						$db->revalidateCache();
+						require BASE . $install;
+						$db->revalidateCache();
+					}
+					else {
+						self::$warnings[] = 'Cannot load install script. Your plugin might be not working correctly.';
+					}
+				}
 
-		if (!empty($install)) {
-			if (file_exists(BASE . $install)) {
-				$db->revalidateCache();
-				require BASE . $install;
-				$db->revalidateCache();
-			}
-			else {
-				self::$warnings[] = 'Cannot load install script. Your plugin might be not working correctly.';
+				clearCache();
+
+				return true;
 			}
 		}
 
-		clearCache();
-		return true;
+		return false;
 	}
 
 	public static function isEnabled($pluginFileName): bool
@@ -780,20 +762,15 @@ class Plugins {
 			return false;
 		}
 
-		$install = $plugin_json['install'] ?? '';
-		if (self::getAutoLoadOption($plugin_json, 'install', true) && is_file(PLUGINS . $plugin_name . '/install.php')) {
-			$install = 'plugins/' . $plugin_name . '/install.php';
-		}
-
-		if (empty($install)) {
-			self::$error = "This plugin doesn't seem to have install script defined.";
+		if(!isset($plugin_json['install'])) {
+			self::$error = "Plugin doesn't have install options defined. Skipping...";
 			return false;
 		}
 
 		global $db;
-		if (file_exists(BASE . $install)) {
+		if (file_exists(BASE . $plugin_json['install'])) {
 			$db->revalidateCache();
-			require BASE . $install;
+			require BASE . $plugin_json['install'];
 			$db->revalidateCache();
 		}
 		else {

system/src/Settings.php

@@ -7,13 +7,16 @@ use MyAAC\Models\Settings as ModelsSettings;
 
 class Settings implements \ArrayAccess
 {
-	static private ?Settings $instance = null;
-	private array $settingsFile = [];
-	private array $settingsDatabase = [];
-	private array $cache = [];
-	private array $valuesAsked = [];
-	private array $errors = [];
+	static private $instance;
+	private $settingsFile = [];
+	private $settingsDatabase = [];
+	private $cache = [];
+	private $valuesAsked = [];
+	private $errors = [];
 
+	/**
+	 * @return Settings
+	 */
 	public static function getInstance(): Settings
 	{
 		if (!self::$instance) {
@@ -23,21 +26,28 @@ class Settings implements \ArrayAccess
 		return self::$instance;
 	}
 
-	public function load(): void
+	public function load()
 	{
-		$this->settingsDatabase = Cache::remember('settings', 10 * 60, function () {
-			$settingsDatabase = [];
-
-			$settings = ModelsSettings::all();
-			foreach ($settings as $setting) {
-				$settingsDatabase[$setting->name][$setting->key] = $setting->value;
+		$cache = Cache::getInstance();
+		if ($cache->enabled()) {
+			$tmp = '';
+			if ($cache->fetch('settings', $tmp)) {
+				$this->settingsDatabase = unserialize($tmp);
+				return;
 			}
+		}
 
-			return $settingsDatabase;
-		});
+		$settings = ModelsSettings::all();
+		foreach ($settings as $setting) {
+			$this->settingsDatabase[$setting->name][$setting->key] = $setting->value;
+		}
+
+		if ($cache->enabled()) {
+			$cache->set('settings', serialize($this->settingsDatabase), 600);
+		}
 	}
 
-	public function save($pluginName, $values): bool
+	public function save($pluginName, $values)
 	{
 		$this->loadPlugin($pluginName);
 
@@ -94,7 +104,7 @@ class Settings implements \ArrayAccess
 		return true;
 	}
 
-	public function updateInDatabase($pluginName, $key, $value): void
+	public function updateInDatabase($pluginName, $key, $value)
 	{
 		if (ModelsSettings::where(['name' => $pluginName, 'key' => $key])->exists()) {
 			ModelsSettings::where(['name' => $pluginName, 'key' => $key])->update(['value' => $value]);
@@ -107,7 +117,7 @@ class Settings implements \ArrayAccess
 		$this->clearCache();
 	}
 
-	public function deleteFromDatabase($pluginName, $key = null): void
+	public function deleteFromDatabase($pluginName, $key = null)
 	{
 		if (!isset($key)) {
 			ModelsSettings::where('name', $pluginName)->delete();
@@ -207,7 +217,7 @@ class Settings implements \ArrayAccess
 				if (isset($setting['hidden']) && $setting['hidden']) {
 					$value = '';
 					if ($setting['type'] === 'boolean') {
-						$value = (getBoolean($setting['default']) ? 'true' : 'false');
+						$value = ($setting['default'] ? 'true' : 'false');
 					}
 					else if (in_array($setting['type'], ['text', 'number', 'float', 'double', 'email', 'password', 'textarea'])) {
 						$value = $setting['default'];
@@ -220,7 +230,12 @@ class Settings implements \ArrayAccess
 				}
 				else if ($setting['type'] === 'boolean') {
 					if(isset($settingsDb[$key])) {
-						$value = getBoolean($settingsDb[$key]);
+						if($settingsDb[$key] === 'true') {
+							$value = true;
+						}
+						else {
+							$value = false;
+						}
 					}
 					else {
 						$value = ($setting['default'] ?? false);
@@ -368,7 +383,7 @@ class Settings implements \ArrayAccess
 	}
 
 	#[\ReturnTypeWillChange]
-	public function offsetSet($offset, $value): void
+	public function offsetSet($offset, $value)
 	{
 		if (is_null($offset)) {
 			throw new \RuntimeException("Settings: You cannot set empty offset with value: $value!");
@@ -408,7 +423,7 @@ class Settings implements \ArrayAccess
 	}
 
 	#[\ReturnTypeWillChange]
-	public function offsetUnset($offset): void
+	public function offsetUnset($offset)
 	{
 		$this->loadPlugin($offset);
 
@@ -440,7 +455,7 @@ class Settings implements \ArrayAccess
 	 * @return array|mixed
 	 */
 	#[\ReturnTypeWillChange]
-	public function offsetGet($offset): mixed
+	public function offsetGet($offset)
 	{
 		// try cache hit
 		if(isset($this->cache[$offset])) {
@@ -457,22 +472,24 @@ class Settings implements \ArrayAccess
 			if (!isset($this->settingsFile[$pluginKeyName]['settings'])) {
 				throw new \RuntimeException('Unknown plugin settings: ' . $pluginKeyName);
 			}
-
 			return $this->settingsFile[$pluginKeyName]['settings'];
 		}
 
-		if (!isset($this->settingsFile[$pluginKeyName]['settings'][$key])) {
-			return null;
+		$ret = [];
+		if(isset($this->settingsFile[$pluginKeyName]['settings'][$key])) {
+			$ret = $this->settingsFile[$pluginKeyName]['settings'][$key];
 		}
 
-		$ret = $this->settingsFile[$pluginKeyName]['settings'][$key];
-
 		if(isset($this->settingsDatabase[$pluginKeyName][$key])) {
 			$value = $this->settingsDatabase[$pluginKeyName][$key];
 
 			$ret['value'] = $value;
 		}
 		else {
+			if (!isset($this->settingsFile[$pluginKeyName]['settings'][$key])) {
+				return null;
+			}
+
 			$ret['value'] = $this->settingsFile[$pluginKeyName]['settings'][$key]['default'];
 		}
 
@@ -506,7 +523,7 @@ class Settings implements \ArrayAccess
 		return $ret;
 	}
 
-	private function updateValuesAsked($offset): void
+	private function updateValuesAsked($offset)
 	{
 		$pluginKeyName = $offset;
 		if (strpos($offset, '.')) {
@@ -522,7 +539,7 @@ class Settings implements \ArrayAccess
 		}
 	}
 
-	private function loadPlugin($offset): void
+	private function loadPlugin($offset)
 	{
 		$this->updateValuesAsked($offset);
 
@@ -551,7 +568,7 @@ class Settings implements \ArrayAccess
 		}
 	}
 
-	public static function saveConfig($config, $filename, &$content = ''): bool|int
+	public static function saveConfig($config, $filename, &$content = '')
 	{
 		$content = "<?php" . PHP_EOL;
 

system/src/global.php

@@ -8,9 +8,7 @@ $i = 0;
 define('HOOK_INIT', ++$i);
 define('HOOK_STARTUP', ++$i);
 define('HOOK_BEFORE_PAGE', ++$i);
-define('HOOK_BEFORE_PAGE_CUSTOM', ++$i);
 define('HOOK_AFTER_PAGE', ++$i);
-define('HOOK_AFTER_PAGE_CUSTOM', ++$i);
 define('HOOK_FINISH', ++$i);
 define('HOOK_TIBIACOM_ARTICLE', ++$i);
 define('HOOK_TIBIACOM_BORDER_3', ++$i);
@@ -54,7 +52,6 @@ define('HOOK_ACCOUNT_MANAGE_BEFORE_GENERAL_INFORMATION', ++$i);
 define('HOOK_ACCOUNT_MANAGE_BEFORE_PUBLIC_INFORMATION', ++$i);
 define('HOOK_ACCOUNT_MANAGE_BEFORE_ACCOUNT_LOGS', ++$i);
 define('HOOK_ACCOUNT_MANAGE_BEFORE_CHARACTERS', ++$i);
-define('HOOK_ACCOUNT_MANAGE_AFTER_CHARACTERS', ++$i);
 define('HOOK_ACCOUNT_LOGIN_BEFORE_PAGE', ++$i);
 define('HOOK_ACCOUNT_LOGIN_BEFORE_ACCOUNT', ++$i);
 define('HOOK_ACCOUNT_LOGIN_AFTER_ACCOUNT', ++$i);
@@ -93,7 +90,6 @@ define('HOOK_EMAIL_CONFIRMED', ++$i);
 define('HOOK_GUILDS_BEFORE_GUILD_HEADER', ++$i);
 define('HOOK_GUILDS_AFTER_GUILD_HEADER', ++$i);
 define('HOOK_GUILDS_AFTER_GUILD_INFORMATION', ++$i);
-define('HOOK_GUILDS_AFTER_MANAGE_BUTTON', ++$i);
 define('HOOK_GUILDS_AFTER_GUILD_MEMBERS', ++$i);
 define('HOOK_GUILDS_AFTER_INVITED_CHARACTERS', ++$i);
 define('HOOK_TWIG', ++$i);
@@ -106,6 +102,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_POT', ++$i);
 
 const HOOK_FIRST = HOOK_INIT;
 define('HOOK_LAST', $i);

system/template.php

@@ -91,7 +91,7 @@ else {
 			$file = BASE . $template_path . '/layout_config.ini';
 		}
 
-		$template_ini = parse_ini_file($file, true);
+		$template_ini = parse_ini_file($file);
 		unset($file);
 
 		if ($cache->enabled()) {
@@ -148,7 +148,7 @@ function get_template_menus(): array
 {
 	global $template_name;
 
-	$result = Cache::remember('template_menus_' . $template_name, 10 * 60, function () use ($template_name) {
+	$result = Cache::remember('template_menus', 10 * 60, function () use ($template_name) {
 		$result = Menu::select(['name', 'link', 'blank', 'color', 'category'])
 			->where('template', $template_name)
 			->orderBy('category')

system/templates/account.back_button.html.twig

@@ -1,26 +1,7 @@
 {% if new_line is defined and new_line %}
 	<br/>
 {% endif %}
-
-{% set _center = false %}
-
-{% if center is defined and center %}
-{% set _center = true %}
-{% endif %}
-
-{% if _center %}
-<table border="0" cellspacing="1" cellpadding="4" width="100%">
-	<tbody>
-	<tr>
-		<td align="center">
-{% endif %}
-			<form action="{% if action is not defined %}{{ getLink('account/manage') }}{% else %}{{ action }}{% endif %}" method="post">
-				{{ csrf() }}
-				{{ include('buttons.back.html.twig') }}
-			</form>
-{% if _center %}
-		</td>
-	</tr>
-	</tbody>
-</table>
-{% endif %}
+<form action="{% if action is not defined %}{{ getLink('account/manage') }}{% else %}{{ action }}{% endif %}" method="post">
+	{{ csrf() }}
+	{{ include('buttons.back.html.twig') }}
+</form>

system/templates/account.change-email.html.twig

@@ -28,7 +28,7 @@ Please enter your password and the new email address. Make sure that you enter a
 		<td>
 			<table border="0" cellspacing="0" cellpadding="0">
 				<tr>
-					<td style="border:0;">
+					<td style="border:0px;">
 						<form id="form" action="{{ getLink('account/change-email') }}" method="post">
 							{{ csrf() }}
 							<input type="hidden" name="changeemailsave" value="1"/>
@@ -40,14 +40,14 @@ Please enter your password and the new email address. Make sure that you enter a
 		</td>
 		<td>
 			<table border="0" cellspacing="0" cellpadding="0">
-				<tr>
-					<td style="border:0;">
-						<form action="{{ getLink('account/manage') }}" method="post">
-							{{ csrf() }}
+				<form action="{{ getLink('account/manage') }}" method="post">
+					{{ csrf() }}
+					<tr>
+						<td style="border:0px;">
 							{{ include('buttons.back.html.twig') }}
-						</form>
-					</td>
-				</tr>
+						</td>
+					</tr>
+				</form>
 			</table>
 		</td>
 	</tr>

system/templates/account.characters.change-comment.html.twig

@@ -88,7 +88,7 @@ If you do not want to specify a certain field, just leave it blank.<br/><br/>
 			<td>
 				<table border="0" cellspacing="0" cellpadding="0">
 					<tr>
-						<td style="border:0;">
+						<td style="border:0px;">
 							<input type="hidden" name="name" value="{{ player.name }}">
 							<input type="hidden" name="changecommentsave" value="1">
 							{{ include('buttons.submit.html.twig') }}
@@ -99,15 +99,15 @@ If you do not want to specify a certain field, just leave it blank.<br/><br/>
 			</td>
 			<td>
 				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td style="border:0;">
-							<form action="{{ getLink('account/manage') }}" method="post">
-								{{ csrf() }}
+					<form action="{{ getLink('account/manage') }}" method="post">
+						{{ csrf() }}
+						<tr>
+							<td style="border:0px;">
 								{{ include('buttons.back.html.twig') }}
-							</form>
-						</td>
-					</tr>
-			</table>
+							</td>
+						</tr>
+					</form>
+				</table>
 			</td>
 		</tr>
 	</table>

system/templates/account.characters.delete.html.twig

@@ -24,7 +24,7 @@ To delete a character enter the name of the character and your password.<br/><br
 		<td>
 			<table border="0" cellspacing="0" cellpadding="0">
 				<tr>
-					<td style="border:0;">
+					<td style="border:0px;">
 						<form id="form" action="{{ getLink('account/characters/delete') }}" method="post">
 							{{ csrf() }}
 							<input type="hidden" name="deletecharactersave" value="1"/>
@@ -36,14 +36,14 @@ To delete a character enter the name of the character and your password.<br/><br
 		</td>
 		<td>
 			<table border="0" cellspacing="0" cellpadding="0">
-				<tr>
-					<td style="border:0;">
-						<form action="{{ getLink('account/manage') }}" method="post">
-							{{ csrf() }}
+				<form action="{{ getLink('account/manage') }}" method="post">
+					{{ csrf() }}
+					<tr>
+						<td style="border:0px;">
 							{{ include('buttons.back.html.twig') }}
-						</form>
-					</td>
-				</tr>
+						</td>
+					</tr>
+				</form>
 			</table>
 		</td>
 	</tr>

system/templates/account.generate_recovery_key.html.twig

@@ -32,14 +32,14 @@ To generate recovery key for your account please enter your password.<br/><br/>
 		</td>
 		<td>
 			<table border="0" cellspacing="0" cellpadding="0">
-				<tr>
-					<td style="border: 0;">
-						<form action="{{ getLink('account/manage') }}" method="post">
-							{{ csrf() }}
+				<form action="{{ getLink('account/manage') }}" method="post">
+					{{ csrf() }}
+					<tr>
+						<td style="border: 0;">
 							{{ include('buttons.back.html.twig') }}
-						</form>
-					</td>
-				</tr>
+						</td>
+					</tr>
+				</form>
 			</table>
 		</td>
 	</tr>

system/templates/account.lost.form.html.twig

@@ -0,0 +1,36 @@
+The Lost Account Interface can help you to get back your account name and password. Please enter your character name and select what you want to do.<br/>
+<form action="{{ getLink('account/lost') }}?action=step1" method="post">
+	{{ csrf() }}
+	<input type="hidden" name="character" value="">
+	<table cellspacing="1" cellpadding="4" border="0" width="100%">
+		<tr>
+			<td bgcolor="{{ config.vdarkborder }}" class="white"><b>Please enter your character name</b></td>
+		</tr>
+		<tr>
+			<td bgcolor="{{ config.darkborder }}">
+				<input type="text" name="nick" size="40" autofocus/><br>
+			</td>
+		</tr>
+	</table>
+	<table cellspacing="1" cellpadding="4" border="0" width="100%">
+		<tr>
+			<td bgcolor="{{ config.vdarkborder }}" class="white"><b>What do you want?</b></td>
+		</tr>
+		<tr>
+			<td bgcolor="{{ config.darkborder }}">
+				<input type="radio" name="action_type" id="action_type_email" value="email">
+				<label for="action_type_email"> Send me new password and my account name to account e-mail adress.</label><br/>
+				<input type=radio name="action_type" id="action_type_key" value="reckey">
+				<label for="action_type_key"> I got <b>recovery key</b> and want set new password and e-mail adress to my account.</label><br/>
+			</td>
+		</tr>
+	</table>
+	<br/>
+	<table cellspacing="0" cellpadding="0" border="0" width="100%">
+		<tr>
+			<td align="center">
+				{{ include('buttons.submit.html.twig') }}
+			</td>
+		</tr>
+	</table>
+</form>

system/templates/account.lost.noaction.html.twig

@@ -0,0 +1,10 @@
+Please select action.<br/>
+<table cellspacing="0" cellpadding="0" border="0" width="100%">
+	<tr>
+		<td align="center">
+			<a href="{{ getLink('account/lost') }}" border="0">
+				{{ include('buttons.back.html.twig') }}
+			</a>
+		</td>
+	</tr>
+</table>

system/templates/account.management.html.twig

@@ -228,7 +228,5 @@
 				</td>
 			</tr>
 		</table>
-		<br/>
-		{{ hook('HOOK_ACCOUNT_MANAGE_AFTER_CHARACTERS') }}
 	</div>
 </div>

system/templates/account/lost/check-code.finish.html.twig

@@ -1,54 +0,0 @@
-Please enter new password to your account and repeat to make sure you remember password.<BR>
-<form action="{{ getLink('account/lost/email/set-new-password') }}" method="post">
-
-	{{ csrf() }}
-
-	<input type="hidden" name="character" value="{{ character }}">
-	<input type="hidden" name="code" value="{{ code }}">
-
-	<table class="myaac-table" style="width: 100%;">
-
-		<thead>
-		<tr>
-			<th class="white"><b>Passwords</b></th>
-		</tr>
-		</thead>
-
-		<tbody>
-		<tr>
-			<td>
-				<table>
-					<tr>
-						<td>
-							<label for="password">New password:</label>
-						</td>
-						<td>
-							<input type="password" id="password" name="password" value="" size="40">
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<label for="password_repeat">Repeat new password:</label>
-						</td>
-						<td>
-							<input type="password" id="password_repeat" name="password_repeat" value="" size="40">
-						</td>
-					</tr>
-				</table>
-			</td>
-		</tr>
-		</tbody>
-
-	</table>
-	<br/>
-	<table style="width: 100%">
-		<tr>
-			<td>
-				<div style="text-align: center">
-					{% set button_name = 'Submit' %}
-					{% include('buttons.base.html.twig') %}
-				</div>
-			</td>
-		</tr>
-	</table>
-</form>

system/templates/account/lost/check-code.html.twig

@@ -1,33 +0,0 @@
-Please enter code from e-mail and name of one character from account. Then press Submit.<br/>
-<form action="{{ getLink('account/lost/check-code') }}" method="post">
-
-	{{ csrf() }}
-
-	<table class="myaac-table" style="width: 100%;">
-		<thead>
-		<tr>
-			<th class="white">
-				<b>Code & character name</b>
-			</th>
-		</tr>
-		</thead>
-
-		<tbody>
-		<tr>
-			<td>
-				Your code:&nbsp;<input type="text" name="code" value="{{ code }}" size="40"><br/>
-				Character:&nbsp;<input type="text" name="character" value="{{ character }}" size="40"><br/>
-			</td>
-		</tr>
-		</tbody>
-	</table>
-	<br>
-	<table style="width: 100%">
-		<tr>
-			<td align="center">
-				{% set button_name = 'Submit' %}
-				{% include('buttons.base.html.twig') %}
-			</td>
-		</tr>
-	</table>
-</form>

system/templates/account/lost/email.html.twig

@@ -1,54 +0,0 @@
-Please enter e-mail to account with this character.<br/>
-<form action="{{ getLink('account/lost/email/send-code') }}" method="post">
-
-	{{ csrf() }}
-
-	<input type=hidden name="character">
-	<table class="myaac-table" style="width: 100%;">
-
-		<thead>
-		<tr>
-			<th class="white"><b>Please enter e-mail to account</b></th>
-		</tr>
-		</thead>
-
-		<tbody>
-		<tr>
-			<td>
-
-				<table>
-					<tr>
-						<td>
-							<label for="nick">Character:</label>
-						</td>
-						<td>
-							<input type=text id="nick" name="nick" value="{{ nick }}" size="40" readonly="readonly">
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<label for="name">E-mail to account:</label>
-						</td>
-						<td>
-							<input type=text id="name" name="email" value="" size="40">
-						</td>
-					</tr>
-				</table>
-
-			</td>
-		</tr>
-		</tbody>
-
-	</table>
-	<br>
-	<table style="width: 100%">
-		<tr>
-			<td>
-				<div style="text-align:center">
-					{% set button_name = 'Submit' %}
-					{% include('buttons.base.html.twig') %}
-				</div>
-			</td>
-		</tr>
-	</table>
-</form>

system/templates/account/lost/finish.new-email.html.twig

@@ -1,58 +0,0 @@
-Your account name, new password and new e-mail.<br/>
-<table class="myaac-table" style="width: 100%;">
-
-	<thead>
-	<tr>
-		<th class="white">
-			<b>Your account name, new password and new e-mail</b>
-		</th>
-	</tr>
-	</thead>
-
-	<tbody>
-	<tr>
-		<td>
-
-			<table>
-				<tr>
-					<td>
-						Account name:
-					</td>
-					<td>
-						<b>{{ account.getName() }}</b>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						New password:
-					</td>
-					<td>
-						<b>{{ newPassword }}</b>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						New e-mail address:
-					</td>
-					<td>
-						<b>{{ newEmail }}</b>
-					</td>
-				</tr>
-			</table>
-
-			{{ statusMsg|raw }}
-		</td>
-	</tr>
-	</tbody>
-
-</table>
-<br>
-<table style="width: 100%">
-	<tr>
-		<td align="center">
-			<form action="{{ getLink('account/manage') }}" method="post">
-				{{ include('buttons.login.html.twig') }}
-			</form>
-		</td>
-	</tr>
-</table>

system/templates/account/lost/finish.new-password.html.twig

@@ -1,30 +0,0 @@
-New password to your account is below. Now you can log in.<BR>
-<table class="myaac-table" style="width: 100%;">
-
-	<thead>
-	<tr>
-		<th class="white"><b>Changed password</b></th>
-	</tr>
-	</thead>
-
-	<tbody>
-	<tr>
-		<td>
-			New password:&nbsp;<b>{{ newPassword }}</b><br/>
-			Account name:&nbsp;&nbsp;&nbsp;<i>(Already on your e-mail)</i><br/>
-			{{ statusMsg|raw }}
-		</td>
-	</tr>
-	</tbody>
-</table>
-<br/>
-<table style="width: 100%">
-	<tr>
-		<td align="center">
-			<form action="{{ getLink('account/manage') }}">
-				{% set button_name = 'Login' %}
-				{% include('buttons.base.html.twig') %}
-			</form>
-		</td>
-	</tr>
-</table>

system/templates/account/lost/form.html.twig

@@ -1,43 +0,0 @@
-The Lost Account Interface can help you to get back your account name and password. Please enter your character name and select what you want to do.<br/>
-<form action="{{ getLink('account/lost/step-1') }}" method="post">
-
-	{{ csrf() }}
-
-	<input type="hidden" name="character" value="">
-	<table class="myaac-table" style="width: 100%">
-		<thead>
-		<tr>
-			<th class="white"><b>Please enter your character name</b></th>
-		</tr>
-		</thead>
-		<tbody>
-			<tr>
-				<td>
-					<input type="text" name="nick" size="40" autofocus/><br>
-				</td>
-			</tr>
-		</tbody>
-	</table>
-	<table style="width: 100%; border-spacing: 1px">
-		<tr>
-			<td style="padding: 4px; background: {{ config('vdarkborder') }}" class="white"><b>What do you want?</b></td>
-		</tr>
-		<tr>
-			<td style="padding: 4px; background: {{ config('darkborder') }}">
-				<input type="radio" name="action" id="action_type_email" value="email">
-				<label for="action_type_email"> Send me new password and my account name to account e-mail address.</label><br/>
-				<input type=radio name="action" id="action_type_key" value="recovery-key">
-				<label for="action_type_key"> I got <b>recovery key</b> and want set new password and e-mail address to my account.</label><br/>
-			</td>
-		</tr>
-	</table>
-	<br/>
-	<table style="width: 100%">
-		<tr>
-			<td align="center">
-				{% set button_name = 'Submit' %}
-				{% include('buttons.base.html.twig') %}
-			</td>
-		</tr>
-	</table>
-</form>

system/templates/account/lost/no-action.html.twig

@@ -1,10 +0,0 @@
-Please select action.<br/>
-<table style="width: 100%">
-	<tr>
-		<td align="center">
-			<a href="{{ getLink('account/lost') }}">
-				{{ include('buttons.back.html.twig') }}
-			</a>
-		</td>
-	</tr>
-</table>

system/templates/account/lost/recovery-key.step-1.html.twig

@@ -1,53 +0,0 @@
-If you enter right recovery key you will see form to set new e-mail and password to account. To this e-mail will be send your new password and account name.<BR>
-<form action="{{ getLink('account/lost/recovery-key/step-2') }}" method="post">
-
-	{{ csrf() }}
-
-	<table class="myaac-table" style="width: 100%;">
-
-		<thead>
-		<tr>
-			<th class="white">
-				<b>Please enter your recovery key</b>
-			</th>
-		</tr>
-		</thead>
-
-		<tbody>
-		<tr>
-			<td>
-				<table>
-					<tr>
-						<td>
-							<label for="nick">Character name:</label>
-						</td>
-						<td>
-							<input type=text id="nick" name="nick" value="{{ nick }}" size="40" readonly="readonly">
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<label for="key">Recovery key:</label>
-						</td>
-						<td>
-							<input type="text" id="key" name="key" value="" size="40">
-						</td>
-					</tr>
-				</table>
-			</td>
-		</tr>
-		</tbody>
-
-	</table>
-	<br>
-	<table style="width: 100%">
-		<tr>
-			<td>
-				<div style="text-align:center">
-					{% set button_name = 'Submit' %}
-					{% include('buttons.base.html.twig') %}
-				</div>
-			</td>
-		</tr>
-	</table>
-</form>

system/templates/account/lost/recovery-key.step-2.html.twig

@@ -1,71 +0,0 @@
-Set new password and e-mail to your account.<br>
-<form action="{{ getLink('account/lost/recovery-key/step-3') }}" method="post">
-
-	{{ csrf() }}
-
-	<input type="hidden" name="key" VALUE="{{ key }}">
-
-	<input type="hidden" name="character" value="">
-	<table class="myaac-table" style="width: 100%">
-
-		<thead>
-		<tr>
-			<th class="white">
-				<b>Please enter new password and e-mail</b>
-			</th>
-		</tr>
-		</thead>
-
-		<tbody>
-		<tr>
-			<td>
-
-				<table>
-					<tr>
-						<td>
-							<label for="nick">Account of character:</label>
-						</td>
-						<td>
-							<input type="text" id="nick" name="nick" value="{{ nick }}" size="40" readonly="readonly">
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<label for="password">New password:</label>
-						</td>
-						<td>
-							<input type="password" id="password" name="password" value="" size="40">
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<label for="password_repeat">Repeat new password:</label>
-						</td>
-						<td>
-							<input type="password" id="password_repeat" name="password_repeat" value="" size="40">
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<label for="email">New e-mail address:</label>
-						</td>
-						<td>
-							<input type="text" id="email" name="email" value="" size="40">
-						</td>
-					</tr>
-				</table>
-
-			</td>
-		</tr>
-		</tbody>
-	</table>
-	<br>
-	<table style="width: 100%">
-		<tr>
-			<td align="center">
-				{% set button_name = 'Submit' %}
-				{% include('buttons.base.html.twig') %}
-			</td>
-		</tr>
-</table>
-</form>

system/templates/admin.mailer.html.twig

@@ -16,13 +16,6 @@
 				<input class="form-control" type="text" id="mail_to" name="mail_to" value="{{ mail_to }}"/>
 			</div>
 
-			{% if setting('core.account_mail_verify') %}
-				<div class="form-check">
-					<input type="checkbox" class="form-check-input" id="mail_verified_only" name="mail_verified_only" {% if mail_verified_only %}checked{% endif %}>
-					<label class="form-check-label" for="mail_verified_only">Mail only verified users</label>
-				</div>
-			{% endif %}
-
 			<div class="form-group row">
 				<label for="mail_subject">Subject:</label>
 				<input class="form-control" type="text" id="mail_subject" name="mail_subject" value="{{ mail_subject }}" maxlength="30"/>

system/templates/admin.plugins.form.html.twig

@@ -1,9 +1,7 @@
 <div id="install_plugin">
 	<div class="card card-info card-outline">
 		<div class="card-header">
-			<h5 class="m-0">Install plugin
-				<a href="?p=plugins&check-updates" class="btn btn-primary float-right">Check for updates</a>
-			</h5>
+			<h5 class="m-0">Install plugin</h5>
 		</div>
 		<form enctype="multipart/form-data" method="post" action="{{ constant('ADMIN_URL') }}?p=plugins">
 			{{ csrf() }}

system/templates/admin.plugins.outdated.html.twig

@@ -1,18 +0,0 @@
-<table class="table table-bordered table-striped">
-	<thead>
-	<tr>
-		<th>Plugin Name</th>
-		<th>Your Version</th>
-		<th>Latest Version</th>
-		<th>Download Link</th>
-	</tr>
-	</thead>
-	{% for plugin in plugins %}
-		<tr>
-			<td>{{ plugin.name }}</td>
-			<td>{{ plugin.yourVersion }}</td>
-			<td>{{ plugin.latestVersion }}</td>
-			<td><a href="{{ plugin.download_link }}" target="_blank">{{ plugin.download_link }}</a></td>
-		</tr>
-	{% endfor %}
-</table>

system/templates/characters.form.html.twig

@@ -1,23 +1,17 @@
-<br/>
-<form action="{{ getLink('characters') }}" method="post">
-	{% set title = 'Search Character' %}
-	{% set tableClass = 'Table1' %}
-	{% set background = config('darkborder') %}
-	{% set content %}
-		<table width="100%">
-			<tr>
-				<td style="vertical-align:middle" class="LabelV150">
-					Character Name:
-				</td>
-				<td style="width:170px">
-					<input style="width:165px" name="name" value="" size="29" maxlength="29"/>
-				</td>
-				<td>
-					{% set button_name = 'Submit' %}
-					{{ include('buttons.base.html.twig') }}
-				</td>
-			</tr>
-		</table>
-	{% endset %}
-	{{ include('tables.headline.html.twig') }}
-</form>
+<form action="{{ link }}" method="post">
+	<table width="100%" border="0" cellspacing="1" cellpadding="4">
+		<tr><td bgcolor="{{ config.vdarkborder }}" class="white"><B>Search Character</B></TD></TR>
+		<tr>
+			<td bgcolor="{{ config.darkborder }}">
+				<table border="0" cellpadding="1">
+					<tr>
+						<td>Name:</td><td><input name="name" value="" size="29" maxlength="29"{% if autofocus %} autofocus{% endif %}></TD>
+						<td>
+							{{ include('buttons.submit.html.twig') }}
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+</form>

system/templates/characters.html.twig

@@ -9,7 +9,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%"><tr>
 	<td><img src="{{ template_path }}/images/general/blank.gif" width="10" height="1" border="0"></td>
 	<td>
-        {{ hook('HOOK_CHARACTERS_BEFORE_INFORMATIONS') }}
+        {{ hook(constant('HOOK_CHARACTERS_BEFORE_INFORMATIONS')) }}
 		{% if canEdit %}
 			<a href="{{ constant('ADMIN_URL') }}?p=players&id={{ player.getId() }}" title="Edit in Admin Panel" target="_blank">
 				<img src="images/edit.png"/>Edit
@@ -153,11 +153,11 @@
 				<td>{% if account.isPremium() %}Premium Account{% else %}Free Account{% endif %}</td>
 			</tr>
 		</table>
-		{{ hook('HOOK_CHARACTERS_AFTER_INFORMATIONS') }}
+		{{ hook(constant('HOOK_CHARACTERS_AFTER_INFORMATIONS')) }}
 		<br/>
 		<table border="0" width="100%">
 			<tr>
-				{{ hook('HOOK_CHARACTERS_BEFORE_SKILLS') }}
+				{{ hook(constant('HOOK_CHARACTERS_BEFORE_SKILLS')) }}
 
 				{% if config.characters.skills %}
 				<!-- SKILLS -->
@@ -179,7 +179,7 @@
 				<!-- SKILLS_END -->
 				{% endif %}
 
-				{{ hook('HOOK_CHARACTERS_AFTER_SKILLS') }}
+				{{ hook(constant('HOOK_CHARACTERS_AFTER_SKILLS')) }}
 
 				{% if quests_enabled %}
 				<!-- QUESTS -->
@@ -201,7 +201,7 @@
 				<!-- QUESTS_END -->
 				{% endif %}
 
-				{{ hook('HOOK_CHARACTERS_AFTER_QUESTS') }}
+				{{ hook(constant('HOOK_CHARACTERS_AFTER_QUESTS')) }}
 
 				{% if config.characters.equipment %}
 				<!-- EQUIPMENT -->
@@ -239,11 +239,11 @@
 				<!-- EQUIPMENT_END -->
 				{% endif %}
 
-				{{ hook('HOOK_CHARACTERS_AFTER_EQUIPMENT') }}
+				{{ hook(constant('HOOK_CHARACTERS_AFTER_EQUIPMENT')) }}
 			</tr>
 		</table>
 
-		{{ hook('HOOK_CHARACTERS_BEFORE_DEATHS') }}
+		{{ hook(constant('HOOK_CHARACTERS_BEFORE_DEATHS')) }}
 
 		{% if deaths|length > 0 %}
 		<!-- DEATHS -->
@@ -283,7 +283,7 @@
 		<!-- FRAGS_END -->
 		{% endif %}
 
-		{{ hook('HOOK_CHARACTERS_BEFORE_SIGNATURE') }}
+		{{ hook(constant('HOOK_CHARACTERS_BEFORE_SIGNATURE')) }}
 
 		{% if setting('core.signature_enabled') %}
 		<!-- SIGNATURE -->
@@ -327,7 +327,7 @@
 		</table>
 		<!-- SIGNATURE_END -->
 		{% endif %}
-		{{ hook('HOOK_CHARACTERS_AFTER_SIGNATURE') }}
+		{{ hook(constant('HOOK_CHARACTERS_AFTER_SIGNATURE')) }}
 		{% if not player.isHidden() %}
 		{% set rows = 0 %}
 		<!-- ACCOUNT_INFORMATION -->
@@ -377,7 +377,7 @@
 			</tr>
 		</table>
 		<!-- ACCOUNT_INFORMATION_END -->
-		{{ hook('HOOK_CHARACTERS_AFTER_ACCOUNT') }}
+		{{ hook(constant('HOOK_CHARACTERS_AFTER_ACCOUNT')) }}
 		<!-- CHARACTERS_LIST -->
 		<br/><br/>
 		<table border="0" cellspacing="1" cellpadding="4" width="100%">
@@ -421,7 +421,7 @@
 		</table>
 		<!-- CHARACTERS_LIST_END -->
 		{% endif %}
-		{{ hook('HOOK_CHARACTERS_AFTER_CHARACTERS') }}
+		{{ hook(constant('HOOK_CHARACTERS_AFTER_CHARACTERS')) }}
 		{% if canEdit %}
 			<a href="{{ constant('ADMIN_URL') }}?p=players&id={{ player.getId() }}" title="Edit in Admin Panel" target="_blank">
 				<img src="images/edit.png"/>Edit

system/templates/guilds.view.html.twig

@@ -49,7 +49,6 @@
 									{% include('buttons.base.html.twig') %}
 								</a>
 							{% endif %}
-							{{ hook('HOOK_GUILDS_AFTER_MANAGE_BUTTON') }}
 						</div>
 					</td>
 				</tr>
@@ -62,7 +61,6 @@
 			{{ hook('HOOK_GUILDS_AFTER_GUILD_INFORMATION') }}
 
 			{% set title = 'Guild Members' %}
-			{% set background = config('lightborder') %}
 			{% set content %}
 			<table style="width:100%;">
 				<tbody>
@@ -153,7 +151,6 @@
 
 			{{ hook('HOOK_GUILDS_AFTER_GUILD_MEMBERS') }}
 			{% set title = 'Invited Characters' %}
-			{% set background = config('lightborder') %}
 			{% set content %}
 			<table style="width:100%;">
 				<tbody>
@@ -235,16 +232,14 @@
 															{% endif %}
 
 															{% if isVice %}
-																{% if db.hasTableAndColumns('guild_invites', ['player_id']) %}
-																	<form action="{{ getLink('guilds') }}?action=invite&guild={{ guild_name|url_encode }}" method="post">
-																		{{ csrf() }}
-																		<td>
-																			{% set button_name = 'Invite Character' %}
-																			{% set button_image = '_sbutton_invitecharacter' %}
-																			{% include('buttons.base.html.twig') %}
-																		</td>
-																	</form>
-																{% endif %}
+																<form action="{{ getLink('guilds') }}?action=invite&guild={{ guild_name|url_encode }}" method="post">
+																	{{ csrf() }}
+																	<td>
+																		{% set button_name = 'Invite Character' %}
+																		{% set button_image = '_sbutton_invitecharacter' %}
+																		{% include('buttons.base.html.twig') %}
+																	</td>
+																</form>
 
 																<form action="{{ getLink('guilds') }}?action=change_rank&guild={{ guild_name|url_encode }}" method="post">
 																	{{ csrf() }}