Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-10-14 01:34:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.9' into develop

Browse Source
This commit is contained in:
slawkens
2023-08-12 13:28:07 +02:00
parent b49c247162 3dd493b790
commit 6c8961638e
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
system/pages/bans.php
View File

@@ -50,7 +50,8 @@ if(!$bansQuery->rowCount())
$nextPage = false;
$i = 0;
$bans = $bansQuery->fetchAll();
$bans = $bansQuery->fetchAll(PDO::FETCH_ASSOC);
foreach ($bans as $id => &$ban)
{
if(++$i > $configBansPerPage)
@@ -69,11 +70,22 @@ foreach ($bans as $id => &$ban)
$accountId = $ban['account_id'];
}
$ban['player'] = getPlayerLink(getPlayerNameByAccount($accountId));
$playerName = 'Unknown';
if ($configBans['hasType']) {
$ban['type'] = getBanType($ban['type']);
if ($ban['type'] == 2) { // namelock
$playerName = getPlayerNameById($accountId);
}
else {
$playerName = getPlayerNameByAccount($accountId);
}
}
else {
$playerName = getPlayerNameByAccount($accountId);
}
$ban['player'] = getPlayerLink($playerName);
$expiresColumn = 'expires_at';
if ($db->hasColumn('bans', 'expires')) {
@@ -104,7 +116,7 @@ foreach ($bans as $id => &$ban)
}
}
else {
$addedBy = getPlayerLink(getPlayerNameByAccount($ban['banned_by']));
$addedBy = getPlayerLink(getPlayerNameById($ban['banned_by']));
}
if ($db->hasColumn('bans', 'added')) {