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

Merge branch 'develop' into feature/refactor-account-lost

Browse Source
This commit is contained in:
slawkens 2024-07-14 05:58:47 +02:00
commit cde8891b9b
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install/steps/7-finish.php
View File

@ -93,6 +93,8 @@ if(USE_ACCOUNT_SALT)
$account_used->setCustomField('web_flags', FLAG_ADMIN + FLAG_SUPER_ADMIN); $account_used->setCustomField('web_flags', FLAG_ADMIN + FLAG_SUPER_ADMIN);
$account_used->setCustomField('country', 'us'); $account_used->setCustomField('country', 'us');
$account_used->setCustomField('email_verified', 1);
if($db->hasColumn('accounts', 'group_id')) if($db->hasColumn('accounts', 'group_id'))
$account_used->setCustomField('group_id', $groups->getHighestId()); $account_used->setCustomField('group_id', $groups->getHighestId());
if($db->hasColumn('accounts', 'type')) if($db->hasColumn('accounts', 'type'))

1
phpstan.neon
View File

@ -29,6 +29,7 @@ parameters:
- '#Variable \$[a-zA-Z0-9\\_]+ might not be defined#' - '#Variable \$[a-zA-Z0-9\\_]+ might not be defined#'
# Eloquent models # Eloquent models
- '#Call to an undefined static 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 # system/pages/highscores.php
- '#Call to an undefined method Illuminate\\Database\\Query\\Builder::withOnlineStatus\(\)#' - '#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::\$online_status#'

7
system/pages/monsters.php
View File

@ -39,10 +39,11 @@ if (empty($_REQUEST['name'])) {
// display monster // display monster
$monster_name = urldecode(stripslashes(ucwords(strtolower($_REQUEST['name'])))); $monster_name = urldecode(stripslashes(ucwords(strtolower($_REQUEST['name']))));
$monster = Monster::where('hide', '!=', 1)->where('name', $monster_name)->first(); $monsterModel = Monster::where('hide', '!=', 1)->where('name', $monster_name)->first();
if ($monster && isset($monster->name)) { if ($monsterModel && isset($monsterModel->name)) {
$monster = $monster->toArray(); /** @var array $monster */
$monster = $monsterModel->toArray();
function sort_by_chance($a, $b) function sort_by_chance($a, $b)
{ {

4
system/templates/highscores.html.twig
View File

@ -11,7 +11,7 @@
<select onchange="location = this.value;" aria-label="skillFilter" id="skillFilter"> <select onchange="location = this.value;" aria-label="skillFilter" id="skillFilter">
{% set i = 0 %} {% set i = 0 %}
{% for link, name in types %} {% 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 %} {% endfor %}
</select> </select>
</td> </td>
@ -105,7 +105,7 @@
<tr bgcolor="{{ config.lightborder }}"> <tr bgcolor="{{ config.lightborder }}">
<td> <td>
{% for link, name in types %} {% 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 %} {% endfor %}
</td> </td>
</tr> </tr>