Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-04-26 17:29:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #74 from whiteblXK/master

Browse Source 
Some small fixes
This commit is contained in:
slawkens 2019-04-19 22:30:58 +02:00 committed by GitHub
commit 6226203b0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
system/pages/lastkills.php
View File

@ -78,7 +78,7 @@ else {
'id' => $players_deaths_count,
'date' => $death['date'],
'killers_string' => $killers_string,
'world_id' => $config['worlds'][(int)$death['world_id']]
'world_id' => isset($config['worlds'][(int)$death['world_id']]) ? $config['worlds'][(int)$death['world_id']] : null,
);
}
}

6
system/pages/serverinfo.php
View File

@ -74,10 +74,14 @@ else if(isset($config['lua']['black_skull_duration'])) {
$blackSkull = true;
}
$clientVersion = NULL;
if(isset($status['online']))
$clientVersion = isset($status['clientVersion']) ? $status['clientVersion'] : null;
$twig->display('serverinfo.html.twig', array(
'experienceStages' => isset($config['lua']['experienceStages']) && getBoolean($config['lua']['experienceStages']) ? $config['lua']['experienceStages'] : null,
'serverIp' => str_replace('/', '', str_replace('http://', '', $config['lua']['url'])),
'clientVersion' => isset($status['online']) ? $status['clientVersion'] : null,
'clientVersion' => $clientVersion,
'globalSaveHour' => isset($config['lua']['globalSaveEnabled']) && getBoolean($config['lua']['globalSaveEnabled']) ? $config['lua']['globalSaveHour'] : null,
'protectionLevel' => $config['lua']['protectionLevel'],
'houseRent' => $rent == 'never' ? 'disabled' : $rent,

2
tools/signature/gesior.php
View File

@ -20,7 +20,7 @@
if($rank->isLoaded())
{
imagettftext($image , $fontsize, 0, 20, 75, $color, $font, 'Guild:');
imagettftext($image , $fontsize, 0, 70, 75, $color, $font, $player->getRank()->getName() . ' of the ' . $$rank->getGuild()->getName());
imagettftext($image , $fontsize, 0, 70, 75, $color, $font, $player->getRank()->getName() . ' of the ' . $rank->getGuild()->getName());
}
imagettftext($image , $fontsize, 0, 20, 95, $color, $font, 'Last Login:');
imagettftext($image , $fontsize, 0, 100, 95, $color, $font, (($player->getLastLogin() > 0) ? date("j F Y, g:i a", $player->getLastLogin()) : 'Never logged in.'));