mirror of
https://github.com/slawkens/myaac.git
synced 2025-04-29 02:39:20 +02:00
Fix character loading with invalid names
Fixed characters loading with names that has been created with other AAC
This commit is contained in:
parent
8d7c694c61
commit
870cc8f98b
@ -120,14 +120,12 @@ if(empty($name))
|
||||
|
||||
$name = str_replace('/', '', $name);
|
||||
|
||||
if(check_name($name))
|
||||
{
|
||||
$oldName = '';
|
||||
$oldName = '';
|
||||
|
||||
$player = $ots->createObject('Player');
|
||||
$player->find($name);
|
||||
if(!$player->isLoaded())
|
||||
{
|
||||
$player = $ots->createObject('Player');
|
||||
$player->find($name);
|
||||
if(!$player->isLoaded())
|
||||
{
|
||||
$tmp_zmienna = "";
|
||||
$tmp_name = retrieve_former_name($name);
|
||||
while(!empty($tmp_name))
|
||||
@ -138,10 +136,10 @@ if(check_name($name))
|
||||
|
||||
if(!empty($tmp_zmienna))
|
||||
$player->find($tmp_zmienna);
|
||||
}
|
||||
}
|
||||
|
||||
if($player->isLoaded() && !$player->isDeleted())
|
||||
{
|
||||
if($player->isLoaded() && !$player->isDeleted())
|
||||
{
|
||||
$title = $player->getName() . ' - ' . $title;
|
||||
$account = $player->getAccount();
|
||||
$rows = 0;
|
||||
@ -407,8 +405,8 @@ if(check_name($name))
|
||||
<td width=\"20%\" align=\"center\">".date("j M Y, H:i", $death['date'])."</td>
|
||||
<td> ";
|
||||
$killers = $db->query("SELECT environment_killers.name AS monster_name, players.name AS player_name, players.deleted AS player_exists FROM killers LEFT JOIN environment_killers ON killers.id = environment_killers.kill_id
|
||||
LEFT JOIN player_killers ON killers.id = player_killers.kill_id LEFT JOIN players ON players.id = player_killers.player_id
|
||||
WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, killers.id ASC")->fetchAll();
|
||||
LEFT JOIN player_killers ON killers.id = player_killers.kill_id LEFT JOIN players ON players.id = player_killers.player_id
|
||||
WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, killers.id ASC")->fetchAll();
|
||||
|
||||
$i = 0;
|
||||
$count = count($killers);
|
||||
@ -661,9 +659,9 @@ if(check_name($name))
|
||||
}
|
||||
echo '<br/><br/>' . generate_search_table();
|
||||
echo '</TABLE>';
|
||||
}
|
||||
else
|
||||
{
|
||||
}
|
||||
else
|
||||
{
|
||||
$search_errors[] = 'Character <b>' . $name . '</b> does not exist or has been deleted.';
|
||||
output_errors($search_errors);
|
||||
$search_errors = array();
|
||||
@ -691,10 +689,7 @@ if(check_name($name))
|
||||
}
|
||||
|
||||
echo generate_search_table(true);
|
||||
}
|
||||
}
|
||||
else
|
||||
$search_errors[] = 'This name contains invalid letters. Please use only A-Z, a-z and space. Minimum length is 3 characters.';
|
||||
|
||||
if(!empty($search_errors))
|
||||
output_errors($search_errors);
|
||||
|
Loading…
x
Reference in New Issue
Block a user