From cd49dfc79942f3301ce9c0b8d899b9f39bda9a41 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Wed, 10 Jul 2024 18:12:05 +0200
Subject: [PATCH 1/4] Set Admin Account verified by default

---
 install/steps/7-finish.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/install/steps/7-finish.php b/install/steps/7-finish.php
index 0d95863a..84c2cce4 100644
--- a/install/steps/7-finish.php
+++ b/install/steps/7-finish.php
@@ -93,6 +93,8 @@ if(USE_ACCOUNT_SALT)
 
 $account_used->setCustomField('web_flags', FLAG_ADMIN + FLAG_SUPER_ADMIN);
 $account_used->setCustomField('country', 'us');
+$account_used->setCustomField('email_verified', 1);
+
 if($db->hasColumn('accounts', 'group_id'))
 	$account_used->setCustomField('group_id', $groups->getHighestId());
 if($db->hasColumn('accounts', 'type'))

From da14e125e97d117947365668ee87c380ae9c15d9 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Fri, 12 Jul 2024 20:01:12 +0200
Subject: [PATCH 2/4] Fix highscores skill links (Thanks @vyroq)

---
 system/templates/highscores.html.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/templates/highscores.html.twig b/system/templates/highscores.html.twig
index 90a833c6..8a2c78a6 100644
--- a/system/templates/highscores.html.twig
+++ b/system/templates/highscores.html.twig
@@ -11,7 +11,7 @@
 						<select onchange="location = this.value;" aria-label="skillFilter" id="skillFilter">
 							{% set i = 0 %}
 							{% for link, name in types %}
-								<option value="{{ getLink('highscores') }}/{{ link }}{% if vocation is defined %}/{{ vocation }}{% endif %}" class="size_xs">{{ name }}</option>
+								<option value="{{ getLink('highscores') }}/{{ link }}{% if vocation is not null %}{{ vocation }}{% endif %}" class="size_xs">{{ name }}</option>
 							{% endfor %}
 						</select>
 					</td>
@@ -105,7 +105,7 @@
 				<tr bgcolor="{{ config.lightborder }}">
 					<td>
 						{% for link, name in types %}
-						<a href="{{ getLink('highscores') }}/{{ link }}{% if vocation is defined %}/{{ vocation }}{% endif %}" class="size_xs">{{ name }}</a><br/>
+						<a href="{{ getLink('highscores') }}/{{ link }}{% if vocation is not null %}/{{ vocation }}{% endif %}" class="size_xs">{{ name }}</a><br/>
 						{% endfor %}
 					</td>
 				</tr>

From 28f98db9deaa9a6ea120d793b271dc751cfdbda7 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Fri, 12 Jul 2024 20:48:27 +0200
Subject: [PATCH 3/4] Fix PHPStan errors in monsters.php

---
 phpstan.neon              | 1 +
 system/pages/monsters.php | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/phpstan.neon b/phpstan.neon
index b77bc1d2..fda6a07c 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -29,6 +29,7 @@ parameters:
 		- '#Variable \$[a-zA-Z0-9\\_]+ might not be defined#'
 		# Eloquent models
 		- '#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#'
diff --git a/system/pages/monsters.php b/system/pages/monsters.php
index f8a8a66a..e254fb6f 100644
--- a/system/pages/monsters.php
+++ b/system/pages/monsters.php
@@ -44,6 +44,8 @@ $monster = Monster::where('hide', '!=', 1)->where('name', $monster_name)->first(
 if ($monster && isset($monster->name)) {
 	$monster = $monster->toArray();
 
+	/** @var array $monster */
+
 	function sort_by_chance($a, $b)
 	{
 		if ($a['chance'] == $b['chance']) {

From cff62ccba4f3ea2358e66e60a3ccd51fe4fa01ee Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Fri, 12 Jul 2024 20:54:12 +0200
Subject: [PATCH 4/4] Another try

---
 system/pages/monsters.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/system/pages/monsters.php b/system/pages/monsters.php
index e254fb6f..988d15b5 100644
--- a/system/pages/monsters.php
+++ b/system/pages/monsters.php
@@ -39,12 +39,11 @@ if (empty($_REQUEST['name'])) {
 
 // display monster
 $monster_name = urldecode(stripslashes(ucwords(strtolower($_REQUEST['name']))));
-$monster = Monster::where('hide', '!=', 1)->where('name', $monster_name)->first();
-
-if ($monster && isset($monster->name)) {
-	$monster = $monster->toArray();
+$monsterModel = Monster::where('hide', '!=', 1)->where('name', $monster_name)->first();
 
+if ($monsterModel && isset($monsterModel->name)) {
 	/** @var array $monster */
+	$monster = $monsterModel->toArray();
 
 	function sort_by_chance($a, $b)
 	{