From eb28b387093ae22f7417e28b6cab04a8c2bd66ec Mon Sep 17 00:00:00 2001
From: davi costa <40581690+worthdavi@users.noreply.github.com>
Date: Sun, 5 Jun 2022 11:52:22 -0300
Subject: [PATCH 1/2] fix guild invite page (#196)
* fix guild invite
* removing var_dump
* sending error
---
system/pages/guilds/accept_invite.php | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/system/pages/guilds/accept_invite.php b/system/pages/guilds/accept_invite.php
index d33d5256..6e06196f 100644
--- a/system/pages/guilds/accept_invite.php
+++ b/system/pages/guilds/accept_invite.php
@@ -39,13 +39,10 @@ if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
$player->find($name);
if(!$player->isLoaded()) {
$errors[] = 'Player with name '.$name.' doesn\'t exist.';
- }
- else
- {
- $rank_of_player = $player->getRank();
- if($rank_of_player->isLoaded()) {
- $errors[] = 'Character with name '.$name.' is already in guild. You must leave guild before you join other guild.';
- }
+ }else if ($player->getAccountID() != $account_logged->getId()) {
+ $errors[] = 'Character with name ' . $name. ' is not in your account.';
+ }else if ($player->getRank()->isLoaded()){
+ $errors[] = 'Character with name '.$name.' is already in guild. You must leave guild before you join other guild.';
}
}
}
@@ -63,9 +60,8 @@ if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
}
}
}
-
if(!$is_invited) {
- $errors[] = 'Character '.$player->getName.' isn\'t invited to guild '.$guild->getName().'.';
+ $errors[] = 'Character '.$player->getName() .' isn\'t invited to guild '.$guild->getName().'.';
}
}
}
@@ -124,4 +120,4 @@ else {
}
}
-?>
\ No newline at end of file
+?>