From f7cbe5170d4ce7c059c81e97e69a90901f59beee Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Mon, 11 Sep 2023 16:16:38 +0200
Subject: [PATCH 01/14] set display quest default to false

---
 system/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/settings.php b/system/settings.php
index 4f0d7597..29149e1f 100644
--- a/system/settings.php
+++ b/system/settings.php
@@ -1127,7 +1127,7 @@ Sent by MyAAC,<br/>
 			'name' => 'Display Quests',
 			'type' => 'boolean',
 			'desc' => 'Show characters quests. Can be configured below',
-			'default' => true,
+			'default' => false,
 		],
 		'quests' => [
 			'name' => 'Quests List',

From 673e40350ac2479f41adbf43debf0f443955d98d Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Tue, 12 Sep 2023 11:42:03 +0200
Subject: [PATCH 02/14] Small adjustment to menus install

---
 system/migrations/17.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/system/migrations/17.php b/system/migrations/17.php
index 6ff83b84..8c7cf8a0 100644
--- a/system/migrations/17.php
+++ b/system/migrations/17.php
@@ -14,8 +14,9 @@ CREATE TABLE `myaac_menu`
 	PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
 ");
-
-	require_once LIBS . 'plugins.php';
-	Plugins::installMenus('kathrine', require TEMPLATES . 'kathrine/menus.php');
-	Plugins::installMenus('tibiacom', require TEMPLATES . 'tibiacom/menus.php');
 }
+
+require_once LIBS . 'plugins.php';
+Plugins::installMenus('kathrine', require TEMPLATES . 'kathrine/menus.php');
+Plugins::installMenus('tibiacom', require TEMPLATES . 'tibiacom/menus.php');
+

From 95b1460b1302e44d3cb5a4db10cc4082e5d83011 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Tue, 12 Sep 2023 12:08:09 +0200
Subject: [PATCH 03/14] Fix news delete message

---
 system/libs/news.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/system/libs/news.php b/system/libs/news.php
index 352b2a1e..fb4afc5d 100644
--- a/system/libs/news.php
+++ b/system/libs/news.php
@@ -78,12 +78,14 @@ class News
 		if(isset($id))
 		{
 			$row = ModelsNews::find($id);
-			if($row)
+			if($row) {
 				if (!$row->delete()) {
 					$errors[] = 'Fail during delete News.';
 				}
-			else
+			}
+			else {
 				$errors[] = 'News with id ' . $id . ' does not exists.';
+			}
 		}
 		else
 			$errors[] = 'News id not set.';

From 2d02d8d8b3f7bb3a02adb9884eaa3b6985dbd0fa Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Tue, 12 Sep 2023 12:09:39 +0200
Subject: [PATCH 04/14] Fix news delete message part 2

---
 admin/pages/news.php | 5 +++--
 system/libs/news.php | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/admin/pages/news.php b/admin/pages/news.php
index 66398b09..2c5102e6 100644
--- a/admin/pages/news.php
+++ b/admin/pages/news.php
@@ -56,8 +56,9 @@ if(!empty($action))
 		}
 	}
 	else if($action == 'delete') {
-		News::delete($id, $errors);
-		success("Deleted successful.");
+		if (News::delete($id, $errors)) {
+			success("Deleted successful.");
+		}
 	}
 	else if($action == 'edit')
 	{
diff --git a/system/libs/news.php b/system/libs/news.php
index fb4afc5d..b42fefc6 100644
--- a/system/libs/news.php
+++ b/system/libs/news.php
@@ -75,8 +75,7 @@ class News
 
 	static public function delete($id, &$errors)
 	{
-		if(isset($id))
-		{
+		if(isset($id)) {
 			$row = ModelsNews::find($id);
 			if($row) {
 				if (!$row->delete()) {
@@ -87,8 +86,9 @@ class News
 				$errors[] = 'News with id ' . $id . ' does not exists.';
 			}
 		}
-		else
+		else {
 			$errors[] = 'News id not set.';
+		}
 
 		if(count($errors)) {
 			return false;

From 4c4089a155e3a9c054131afd3da8bfc33a7d0ac7 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Tue, 12 Sep 2023 12:11:49 +0200
Subject: [PATCH 05/14] Quotes & const

---
 admin/pages/news.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/admin/pages/news.php b/admin/pages/news.php
index 2c5102e6..81153e4f 100644
--- a/admin/pages/news.php
+++ b/admin/pages/news.php
@@ -23,10 +23,10 @@ if (!hasFlag(FLAG_CONTENT_PAGES) && !superAdmin()) {
 header('X-XSS-Protection:0');
 
 // some constants, used mainly by database (cannot by modified without schema changes)
-define('NEWS_TITLE_LIMIT', 100);
-define('NEWS_BODY_LIMIT', 65535); // maximum news body length
-define('ARTICLE_TEXT_LIMIT', 300);
-define('ARTICLE_IMAGE_LIMIT', 100);
+const NEWS_TITLE_LIMIT = 100;
+const NEWS_BODY_LIMIT = 65535; // maximum news body length
+const ARTICLE_TEXT_LIMIT = 300;
+const ARTICLE_IMAGE_LIMIT = 100;
 
 $name = $p_title = '';
 if(!empty($action))
@@ -52,12 +52,12 @@ if(!empty($action))
 			$p_title = $body = $comments = $article_text = $article_image = '';
 			$type = $category = $player_id = 0;
 
-			success("Added successful.");
+			success('Added successful.');
 		}
 	}
 	else if($action == 'delete') {
 		if (News::delete($id, $errors)) {
-			success("Deleted successful.");
+			success('Deleted successful.');
 		}
 	}
 	else if($action == 'edit')
@@ -83,7 +83,7 @@ if(!empty($action))
 				$action = $p_title = $body = $comments = $article_text = $article_image = '';
 				$type = $category = $player_id = 0;
 
-				success("Updated successful.");
+				success('Updated successful.');
 			}
 		}
 	}

From f76615e59bceaad13672e3dcf4dd08e682359d14 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sat, 16 Sep 2023 05:54:41 +0200
Subject: [PATCH 06/14] Fix getGuildLogoById

---
 system/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/functions.php b/system/functions.php
index 5ea941cf..bb8b018d 100644
--- a/system/functions.php
+++ b/system/functions.php
@@ -1606,7 +1606,7 @@ function getGuildLogoById($id)
 
 	$guild = Guild::where('id', intval($id))->select('logo_name')->first();
 	if ($guild) {
-		$guildLogo = $query->logo_name;
+		$guildLogo = $guild->logo_name;
 
 		if (!empty($guildLogo) && file_exists(GUILD_IMAGES_DIR . $guildLogo)) {
 			$logo = $guildLogo;

From 89c2e84bff7c7ffe83446e4f4ed9bf61be4826ca Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sat, 16 Sep 2023 07:12:04 +0200
Subject: [PATCH 07/14] Fix alert class name

---
 system/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/functions.php b/system/functions.php
index bb8b018d..37f241bc 100644
--- a/system/functions.php
+++ b/system/functions.php
@@ -1451,7 +1451,7 @@ function echo_success($message)
 function echo_error($message)
 {
 	global $error;
-	echo '<div class="col-12 alert alert-error mb-2">' . $message . '</div>';
+	echo '<div class="col-12 alert alert-danger mb-2">' . $message . '</div>';
 	$error = true;
 }
 

From 08339fe8b67e9ac89f26b74df1015eb85133a1ce Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sat, 16 Sep 2023 10:19:22 +0200
Subject: [PATCH 08/14] Fix XSS in tibiacom template - subtopic

---
 templates/tibiacom/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/tibiacom/index.php b/templates/tibiacom/index.php
index 95c73c33..06c58e50 100644
--- a/templates/tibiacom/index.php
+++ b/templates/tibiacom/index.php
@@ -28,7 +28,7 @@ if(isset($config['boxes']))
 		<?php
 			if(PAGE !== 'news') {
 				if(isset($_REQUEST['subtopic'])) {
-					$tmp = $_REQUEST['subtopic'];
+					$tmp = escapeHtml($_REQUEST['subtopic']);
 					if($tmp === 'accountmanagement') {
 						$tmp = 'accountmanage';
 					}

From 55b5e3b600cf345f8f697ffa67ea702a171c37cc Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sat, 16 Sep 2023 10:19:54 +0200
Subject: [PATCH 09/14] Fix XSS in accounts editor

---
 admin/pages/accounts.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/pages/accounts.php b/admin/pages/accounts.php
index f3022e9c..95490a1b 100644
--- a/admin/pages/accounts.php
+++ b/admin/pages/accounts.php
@@ -583,7 +583,7 @@ else if (isset($_REQUEST['search'])) {
 						<form action="<?php echo $admin_base; ?>" method="post">
 							<label for="name">Account Name:</label>
 							<div class="input-group input-group-sm">
-								<input type="text" class="form-control" name="search" value="<?php echo $search_account; ?>" maxlength="32" size="32">
+								<input type="text" class="form-control" id="search" name="search" value="<?= escapeHtml($search_account); ?>" maxlength="32" size="32">
 								<span class="input-group-append"><button type="submit" class="btn btn-info btn-flat">Search</button></span>
 							</div>
 						</form>

From e9f155fb49aa99838a710a0568923e87bc0718f3 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sat, 16 Sep 2023 10:20:34 +0200
Subject: [PATCH 10/14] Fix XSS in players editor

---
 admin/pages/players.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/pages/players.php b/admin/pages/players.php
index b409c15e..153601b7 100644
--- a/admin/pages/players.php
+++ b/admin/pages/players.php
@@ -872,7 +872,7 @@ else if (isset($_REQUEST['search'])) {
 					<form action="<?php echo $player_base; ?>" method="post">
 						<label for="name">Player Name:</label>
 						<div class="input-group input-group-sm">
-							<input type="text" class="form-control" name="search" value="<?php echo $search_player; ?>" maxlength="32" size="32">
+							<input type="text" class="form-control" id="search" name="search" value="<?= escapeHtml($search_player); ?>" maxlength="32" size="32">
 							<span class="input-group-append"><button type="submit" class="btn btn-info btn-flat">Search</button></span>
 						</div>
 					</form>

From 0ac0f4e7a8211937a231fe8f09b3fe07e95ece39 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sat, 16 Sep 2023 10:22:10 +0200
Subject: [PATCH 11/14] Fixes

---
 admin/pages/accounts.php | 22 +++++++++---------
 admin/pages/players.php  | 48 ++++++++++++++++++++--------------------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/admin/pages/accounts.php b/admin/pages/accounts.php
index 95490a1b..214b82f0 100644
--- a/admin/pages/accounts.php
+++ b/admin/pages/accounts.php
@@ -327,8 +327,8 @@ else if (isset($_REQUEST['search'])) {
 										<div class="col-12 col-sm-12 col-lg-6">
 											<label for="group">Account Type:</label>
 											<select name="group" id="group" class="form-control">
-												<?php foreach ($acc_type as $id => $a_type): ?>
-													<option value="<?php echo($id); ?>" <?php echo($acc_group == ($id) ? 'selected' : ''); ?>><?php echo $a_type; ?></option>
+												<?php foreach ($acc_type as $_id => $a_type): ?>
+													<option value="<?php echo($_id); ?>" <?php echo($acc_group == ($_id) ? 'selected' : ''); ?>><?php echo $a_type; ?></option>
 												<?php endforeach; ?>
 											</select>
 										</div>
@@ -338,8 +338,8 @@ else if (isset($_REQUEST['search'])) {
 										<div class="col-12 col-sm-12 col-lg-6">
 											<label for="group">Account Type:</label>
 											<select name="group" id="group" class="form-control">
-												<?php foreach ($groups->getGroups() as $id => $group): ?>
-													<option value="<?php echo $id; ?>" <?php echo($acc_group == $id ? 'selected' : ''); ?>><?php echo $group->getName(); ?></option>
+												<?php foreach ($groups->getGroups() as $_id => $group): ?>
+													<option value="<?php echo $_id; ?>" <?php echo($acc_group == $_id ? 'selected' : ''); ?>><?php echo $group->getName(); ?></option>
 												<?php endforeach; ?>
 											</select>
 										</div>
@@ -347,8 +347,8 @@ else if (isset($_REQUEST['search'])) {
 									<div class="col-12 col-sm-12 col-lg-6">
 										<label for="web_flags">Website Access:</label>
 										<select name="web_flags" id="web_flags" class="form-control">
-											<?php foreach ($web_acc as $id => $a_type): ?>
-												<option value="<?php echo($id); ?>" <?php echo($account->getWebFlags() == ($id) ? 'selected' : ''); ?>><?php echo $a_type; ?></option>
+											<?php foreach ($web_acc as $_id => $a_type): ?>
+												<option value="<?php echo($_id); ?>" <?php echo($account->getWebFlags() == ($_id) ? 'selected' : ''); ?>><?php echo $a_type; ?></option>
 											<?php endforeach; ?>
 										</select>
 									</div>
@@ -403,8 +403,8 @@ else if (isset($_REQUEST['search'])) {
 									<div class="col-12 col-sm-12 col-lg-4">
 										<label for="rl_country">Country:</label>
 										<select name="rl_country" id="rl_country" class="form-control">
-											<?php foreach ($countries as $id => $a_type): ?>
-												<option value="<?php echo($id); ?>" <?php echo($account->getCountry() == ($id) ? 'selected' : ''); ?>><?php echo $a_type; ?></option>
+											<?php foreach ($countries as $_id => $a_type): ?>
+												<option value="<?php echo($_id); ?>" <?php echo($account->getCountry() == ($_id) ? 'selected' : ''); ?>><?php echo $a_type; ?></option>
 											<?php endforeach; ?>
 										</select>
 									</div>
@@ -581,7 +581,7 @@ else if (isset($_REQUEST['search'])) {
 				<div class="row">
 					<div class="col-6 col-lg-12">
 						<form action="<?php echo $admin_base; ?>" method="post">
-							<label for="name">Account Name:</label>
+							<label for="search">Account Name:</label>
 							<div class="input-group input-group-sm">
 								<input type="text" class="form-control" id="search" name="search" value="<?= escapeHtml($search_account); ?>" maxlength="32" size="32">
 								<span class="input-group-append"><button type="submit" class="btn btn-info btn-flat">Search</button></span>
@@ -590,9 +590,9 @@ else if (isset($_REQUEST['search'])) {
 					</div>
 					<div class="col-6 col-lg-12">
 						<form action="<?php echo $admin_base; ?>" method="post">
-							<label for="name">Account ID:</label>
+							<label for="id">Account ID:</label>
 							<div class="input-group input-group-sm">
-								<input type="text" class="form-control" name="id" value="" maxlength="32" size="32">
+								<input type="text" class="form-control" id="id" name="id" value="<?= $id; ?>" maxlength="32" size="32">
 								<span class="input-group-append"><button type="submit" class="btn btn-info btn-flat">Search</button></span>
 							</div>
 						</form>
diff --git a/admin/pages/players.php b/admin/pages/players.php
index 153601b7..eaa06494 100644
--- a/admin/pages/players.php
+++ b/admin/pages/players.php
@@ -390,8 +390,8 @@ else if (isset($_REQUEST['search'])) {
 									<div class="col-12 col-sm-12 col-lg-6">
 										<label for="group">Group:</label>
 										<select name="group" id="group" class="form-control custom-select">
-											<?php foreach ($groups->getGroups() as $id => $group): ?>
-												<option value="<?php echo $id; ?>" <?php echo($player->getGroup()->getId() == $id ? 'selected' : ''); ?>><?php echo $group->getName(); ?></option>
+											<?php foreach ($groups->getGroups() as $_id => $group): ?>
+												<option value="<?php echo $_id; ?>" <?php echo($player->getGroup()->getId() == $_id ? 'selected' : ''); ?>><?php echo $group->getName(); ?></option>
 											<?php endforeach; ?>
 										</select>
 									</div>
@@ -399,8 +399,8 @@ else if (isset($_REQUEST['search'])) {
 										<label for="vocation">Vocation</label>
 										<select name="vocation" id="vocation" class="form-control custom-select">
 											<?php
-											foreach ($config['vocations'] as $id => $name) {
-												echo '<option value=' . $id . ($id == $player->getVocation() ? ' selected' : '') . '>' . $name . '</option>';
+											foreach ($config['vocations'] as $_id => $name) {
+												echo '<option value=' . $_id . ($_id == $player->getVocation() ? ' selected' : '') . '>' . $name . '</option>';
 											}
 											?>
 										</select>
@@ -410,8 +410,8 @@ else if (isset($_REQUEST['search'])) {
 									<div class="col-12 col-sm-12 col-lg-6">
 										<label for="sex">Sex:</label>
 										<select name="sex" id="sex" class="form-control custom-select">>
-											<?php foreach ($config['genders'] as $id => $sex): ?>
-												<option value="<?php echo $id; ?>" <?php echo($player->getSex() == $id ? 'selected' : ''); ?>><?php echo strtolower($sex); ?></option>
+											<?php foreach ($config['genders'] as $_id => $sex): ?>
+												<option value="<?php echo $_id; ?>" <?php echo($player->getSex() == $_id ? 'selected' : ''); ?>><?php echo strtolower($sex); ?></option>
 											<?php endforeach; ?>
 										</select>
 									</div>
@@ -424,8 +424,8 @@ else if (isset($_REQUEST['search'])) {
 												$configTowns[$player->getTownId()] = 'Unknown Town';
 											}
 
-											foreach ($configTowns as $id => $town): ?>
-												<option value="<?php echo $id; ?>" <?php echo($player->getTownId() == $id ? 'selected' : ''); ?>><?php echo $town; ?></option>
+											foreach ($configTowns as $_id => $town): ?>
+												<option value="<?php echo $_id; ?>" <?php echo($player->getTownId() == $_id ? 'selected' : ''); ?>><?php echo $town; ?></option>
 											<?php endforeach; ?>
 										</select>
 									</div>
@@ -436,8 +436,8 @@ else if (isset($_REQUEST['search'])) {
 										<select name="skull" id="skull" class="form-control custom-select">
 											<?php
 
-											foreach ($skull_type as $id => $s_name) {
-												echo '<option value=' . $id . ($id == $player->getSkull() ? ' selected' : '') . '>' . $s_name . '</option>';
+											foreach ($skull_type as $_id => $s_name) {
+												echo '<option value=' . $_id . ($_id == $player->getSkull() ? ' selected' : '') . '>' . $s_name . '</option>';
 											}
 											?>
 										</select>
@@ -554,16 +554,16 @@ else if (isset($_REQUEST['search'])) {
 							</div>
 							<div class="tab-pane fade" id="tabs-skills">
 								<?php
-								foreach ($skills as $id => $info) {
+								foreach ($skills as $_id => $info) {
 									?>
 									<div class="form-group row">
 										<div class="col-12 col-sm-12 col-lg-6">
-											<?php echo '<label for="skills[' . $id . ']" class="control-label">' . $info[0] . '</label>
-									<input type="text" class="form-control" id="skills[' . $id . ']" name="skills[' . $id . ']" maxlength="10" autocomplete="off" value="' . $player->getSkill($id) . '"/>'; ?>
+											<?php echo '<label for="skills[' . $_id . ']" class="control-label">' . $info[0] . '</label>
+									<input type="text" class="form-control" id="skills[' . $_id . ']" name="skills[' . $_id . ']" maxlength="10" autocomplete="off" value="' . $player->getSkill($_id) . '"/>'; ?>
 										</div>
 										<div class="col-12 col-sm-12 col-lg-6">
-											<?php echo '<label for="skills_tries[' . $id . ']" class="control-label">' . $info[0] . ' tries</label>
-									<input type="text" class="form-control" id="skills_tries[' . $id . ']" name="skills_tries[' . $id . ']" maxlength="10" autocomplete="off" value="' . $player->getSkillTries($id) . '"/>'; ?>
+											<?php echo '<label for="skills_tries[' . $_id . ']" class="control-label">' . $info[0] . ' tries</label>
+									<input type="text" class="form-control" id="skills_tries[' . $_id . ']" name="skills_tries[' . $_id . ']" maxlength="10" autocomplete="off" value="' . $player->getSkillTries($_id) . '"/>'; ?>
 										</div>
 									</div>
 								<?php } ?>
@@ -622,7 +622,7 @@ else if (isset($_REQUEST['search'])) {
 										if ($outfitlist) { ?>
 											<select name="look_type" id="look_type" class="form-control custom-select">
 												<?php
-												foreach ($outfitlist as $id => $outfit) {
+												foreach ($outfitlist as $_id => $outfit) {
 													if ($outfit['enabled'] == 'yes') ;
 													echo '<option value=' . $outfit['id'] . ($outfit['id'] == $player->getLookType() ? ' selected' : '') . '>' . $outfit['name'] . ' - ' . ($outfit['type'] == 1 ? 'Male' : 'Female') . '</option>';
 												}
@@ -638,8 +638,8 @@ else if (isset($_REQUEST['search'])) {
 											<select name="look_addons" id="look_addons" class="form-control custom-select">
 												<?php
 												$addon_type = array("None", "First", "Second", "Both");
-												foreach ($addon_type as $id => $s_name) {
-													echo '<option value=' . $id . ($id == $player->getLookAddons() ? ' selected' : '') . '>' . $s_name . '</option>';
+												foreach ($addon_type as $_id => $s_name) {
+													echo '<option value=' . $_id . ($_id == $player->getLookAddons() ? ' selected' : '') . '>' . $s_name . '</option>';
 												}
 												?>
 											</select>
@@ -704,7 +704,7 @@ else if (isset($_REQUEST['search'])) {
 								<div class="form-group row">
 									<div class="col-12">
 										<label for="comment" class="control-label">Comment:</label>
-										<textarea class="form-control" name="comment" rows="10" cols="50" wrap="virtual"><?php echo $player->getCustomField("comment"); ?></textarea>
+										<textarea class="form-control" id="comment" name="comment" rows="10" cols="50" wrap="virtual"><?php echo $player->getCustomField("comment"); ?></textarea>
 										<small>[max. length: 2000 chars, 50 lines (ENTERs)]</small>
 									</div>
 								</div>
@@ -841,7 +841,7 @@ else if (isset($_REQUEST['search'])) {
 
 				<?php if($hasLookAddons): ?>
 				const $addonvalue = $('#look_addons');
-				$('#look_addons').on('change', () => {
+				$addonvalue.on('change', () => {
 					updateOutfit();
 				});
 				<?php endif; ?>
@@ -870,7 +870,7 @@ else if (isset($_REQUEST['search'])) {
 			<div class="card-body row">
 				<div class="col-6 col-lg-12">
 					<form action="<?php echo $player_base; ?>" method="post">
-						<label for="name">Player Name:</label>
+						<label for="search">Player Name:</label>
 						<div class="input-group input-group-sm">
 							<input type="text" class="form-control" id="search" name="search" value="<?= escapeHtml($search_player); ?>" maxlength="32" size="32">
 							<span class="input-group-append"><button type="submit" class="btn btn-info btn-flat">Search</button></span>
@@ -879,9 +879,9 @@ else if (isset($_REQUEST['search'])) {
 				</div>
 				<div class="col-6 col-lg-12">
 					<form action="<?php echo $player_base; ?>" method="post">
-						<label for="name">Player ID:</label>
+						<label for="id">Player ID:</label>
 						<div class="input-group input-group-sm">
-							<input type="text" class="form-control" name="id" value="" maxlength="32" size="32">
+							<input type="text" class="form-control" id="id" name="id" value="<?= $id; ?>" maxlength="32" size="32">
 							<span class="input-group-append"><button type="submit" class="btn btn-info btn-flat">Search</button></span>
 						</div>
 					</form>
@@ -892,7 +892,7 @@ else if (isset($_REQUEST['search'])) {
 </div>
 
 <script>
-	$(document).ready(function () {
+	$(function () {
 		$('.player_datatable').DataTable({
 			"order": [[0, "asc"]]
 		});

From b3991a8e780b1d9b6e87f3f0920ad2e6a9b846ee Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sat, 16 Sep 2023 11:07:38 +0200
Subject: [PATCH 12/14] Add HOOK_TWIG. Also moved Hooks loading to init.php

For adding twig functions & filters by plugins
---
 admin/index.php  | 5 -----
 index.php        | 4 ----
 system/hooks.php | 1 +
 system/init.php  | 5 +++++
 system/twig.php  | 2 ++
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/admin/index.php b/admin/index.php
index 3974f953..957fe1b6 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -30,11 +30,6 @@ if(!$db->hasTable('myaac_account_actions')) {
 	throw new RuntimeException('Seems that the table <strong>myaac_account_actions</strong> of MyAAC doesn\'t exist in the database. This is a fatal error. You can try to reinstall MyAAC by visiting <a href="' . BASE_URL . 'install">this</a> url.');
 }
 
-// event system
-require_once SYSTEM . 'hooks.php';
-$hooks = new Hooks();
-$hooks->load();
-
 require SYSTEM . 'status.php';
 require SYSTEM . 'login.php';
 require __DIR__ . '/includes/functions.php';
diff --git a/index.php b/index.php
index 5ead45b9..c6e76919 100644
--- a/index.php
+++ b/index.php
@@ -71,10 +71,6 @@ if(!$db->hasTable('myaac_account_actions')) {
 	throw new RuntimeException('Seems that the table <strong>myaac_account_actions</strong> of MyAAC doesn\'t exist in the database. This is a fatal error. You can try to reinstall MyAAC by visiting <a href="' . BASE_URL . 'install">this</a> url.');
 }
 
-// event system
-require_once SYSTEM . 'hooks.php';
-$hooks = new Hooks();
-$hooks->load();
 require_once SYSTEM . 'template.php';
 require_once SYSTEM . 'login.php';
 require_once SYSTEM . 'status.php';
diff --git a/system/hooks.php b/system/hooks.php
index b6480ae4..df9e26df 100644
--- a/system/hooks.php
+++ b/system/hooks.php
@@ -76,6 +76,7 @@ define('HOOK_GUILDS_AFTER_GUILD_HEADER', ++$i);
 define('HOOK_GUILDS_AFTER_GUILD_INFORMATION', ++$i);
 define('HOOK_GUILDS_AFTER_GUILD_MEMBERS', ++$i);
 define('HOOK_GUILDS_AFTER_INVITED_CHARACTERS', ++$i);
+define('HOOK_TWIG', ++$i);
 
 const HOOK_FIRST = HOOK_STARTUP;
 define('HOOK_LAST', $i);
diff --git a/system/init.php b/system/init.php
index cf4b3f9b..3d8ded42 100644
--- a/system/init.php
+++ b/system/init.php
@@ -33,6 +33,11 @@ if(isset($config['gzip_output']) && $config['gzip_output'] && isset($_SERVER['HT
 require_once SYSTEM . 'libs/cache.php';
 $cache = Cache::getInstance();
 
+// event system
+require_once SYSTEM . 'hooks.php';
+$hooks = new Hooks();
+$hooks->load();
+
 // twig
 require_once SYSTEM . 'twig.php';
 
diff --git a/system/twig.php b/system/twig.php
index 5eb35c68..f82717a5 100644
--- a/system/twig.php
+++ b/system/twig.php
@@ -124,3 +124,5 @@ $filter = new TwigFilter('urlencode', function ($s) {
 
 $twig->addFilter($filter);
 unset($function, $filter);
+
+$hooks->trigger(HOOK_TWIG, ['twig' => $twig, 'twig_loader' => $twig_loader]);

From 855b05b15fd3bbf4ac9db45a149e9791ee1b3f9b Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sat, 16 Sep 2023 11:45:40 +0200
Subject: [PATCH 13/14] Fix class names

---
 system/src/Models/GuildInvite.php                    | 2 +-
 system/src/Models/{Playeritem.php => PlayerItem.php} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename system/src/Models/{Playeritem.php => PlayerItem.php} (100%)

diff --git a/system/src/Models/GuildInvite.php b/system/src/Models/GuildInvite.php
index c95d629f..52654b53 100644
--- a/system/src/Models/GuildInvite.php
+++ b/system/src/Models/GuildInvite.php
@@ -3,7 +3,7 @@
 namespace MyAAC\Models;
 use Illuminate\Database\Eloquent\Model;
 
-class GuildInvites extends Model {
+class GuildInvite extends Model {
 
 	protected $table = 'guild_invites';
 
diff --git a/system/src/Models/Playeritem.php b/system/src/Models/PlayerItem.php
similarity index 100%
rename from system/src/Models/Playeritem.php
rename to system/src/Models/PlayerItem.php

From e01a44f3523206175ef18e1d05807fa4ac7f4563 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sat, 16 Sep 2023 14:40:19 +0200
Subject: [PATCH 14/14] Update .editorconfig

---
 .editorconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index 2ec19b78..51499854 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -15,5 +15,5 @@ trim_trailing_whitespace = false
 [{composer.json,package.json}]
 indent_style = space
 
-[package.json]
+[{package.json, *.yml}]
 indent_size = 2
\ No newline at end of file