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

Fixed https://otland.net/threads/myaac-v0-0-1.251454/page-2#post-2440320

Browse Source
This commit is contained in:
slawkens1 2017-05-04 17:36:08 +02:00
parent ef9d5127a2
commit 636a54c70d
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
system/libs/pot/OTS_GuildRank.php
View File

@ -176,7 +176,7 @@ class OTS_GuildRank extends OTS_Row_DAO implements IteratorAggregate, Countable
{
if( !isset($this->data['guild_id']) )
{
throw new E_OTS_NotLoaded();
return new OTS_Guild();
}
$guild = new OTS_Guild();

9
system/libs/pot/OTS_ServerInfo.php
View File

@ -75,7 +75,10 @@ class OTS_ServerInfo
fwrite($socket, $packet);
// reads respond
$data = stream_get_contents($socket);
//$data = stream_get_contents($socket);
$data = '';
while (!feof($socket))
$data .= fgets($socket, 1024);
// closing connection to current server
fclose($socket);
@ -121,7 +124,9 @@ class OTS_ServerInfo
{
// loads respond XML
$info = new OTS_InfoRespond();
$info->loadXML( $status->getBuffer() );
if(!$info->loadXML( $status->getBuffer()))
return false;
return $info;
}

8
system/pages/characters.php
View File

@ -254,14 +254,16 @@ if(check_name($name))
}
$rank_of_player = $player->getRank();
if($rank_of_player->isLoaded())
{
$guild_name = $rank_of_player->getGuild()->getName();
if($rank_of_player->isLoaded()) {
$guild = $rank_of_player->getGuild();
if($guild->isLoaded()) {
$guild_name = $guild->getName();
echo
'<TR BGCOLOR="'.getStyle(++$rows).'">'.
'<TD>Guild membership:</TD><TD>'.$rank_of_player->getName().' of the ' . getGuildLink($guild_name) . '</TD>'.
'</TR>';
}
}
echo
'<TR BGCOLOR="'.getStyle(++$rows).'"><TD>Last login:</TD><TD>';

2
system/pages/guilds.php
View File

@ -1026,7 +1026,7 @@ if($action == 'kickplayer') {
}
else
{
if($player->getRank()->isLoaded() && $player->getRank()->getGuild()->getName() != $guild->getName()) {
if($player->getRank()->isLoaded() && $player->getRank()->getGuild()->isLoaded() && $player->getRank()->getGuild()->getName() != $guild->getName()) {
$guild_errors[] = 'Character <b>'.$name.'</b> isn\'t from your guild.';
}
}