diff --git a/system/pages/guilds/accept_invite.php b/system/pages/guilds/accept_invite.php index 096b0f64..0d529ac7 100644 --- a/system/pages/guilds/accept_invite.php +++ b/system/pages/guilds/accept_invite.php @@ -11,14 +11,16 @@ defined('MYAAC') or die('Direct access not allowed!'); //set rights in guild -$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : NULL; -$name = isset($_REQUEST['name']) ? stripslashes($_REQUEST['name']) : NULL; +$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null; +$name = isset($_REQUEST['name']) ? stripslashes($_REQUEST['name']) : null; if(!$logged) { $errors[] = 'You are not logged in. You can\'t accept invitations.'; } + if(!Validator::guildName($guild_name)) { $errors[] = Validator::getLastError(); } + if(empty($errors)) { $guild = $ots->createObject('Guild'); $guild->find($guild_name); diff --git a/system/pages/guilds/add_rank.php b/system/pages/guilds/add_rank.php index d15ba634..587841eb 100644 --- a/system/pages/guilds/add_rank.php +++ b/system/pages/guilds/add_rank.php @@ -10,24 +10,25 @@ */ defined('MYAAC') or die('Direct access not allowed!'); -$guild_name = urldecode($_REQUEST['guild']); -$ranknew = $_REQUEST['rank_name']; +$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null; +$new_rank = isset($_REQUEST['rank_name']) ? $_REQUEST['rank_name'] : null; if(!Validator::guildName($guild_name)) { - $guild_errors[] = Validator::getLastError(); + $errors[] = Validator::getLastError(); } -if(empty($guild_errors)) { - if(!Validator::rankName($ranknew)) { - $guild_errors[] = 'Invalid rank name format.'; + +if(empty($errors)) { + if(!Validator::rankName($new_rank)) { + $errors[] = 'Invalid rank name format.'; } if(!$logged) { - $guild_errors[] = 'You are not logged.'; + $errors[] = 'You are not logged.'; } $guild = $ots->createObject('Guild'); $guild->find($guild_name); if(!$guild->isLoaded()) { - $guild_errors[] = 'Guild with name '.$guild_name.' doesn\'t exist.'; + $errors[] = 'Guild with name '.$guild_name.' doesn\'t exist.'; } - if(empty($guild_errors)) { + if(empty($errors)) { $guild_leader_char = $guild->getOwner(); $rank_list = $guild->getGuildRanksList(); $rank_list->orderBy('level', POT::ORDER_DESC); @@ -44,17 +45,17 @@ if(empty($guild_errors)) { $new_rank = new OTS_GuildRank(); $new_rank->setGuild($guild); $new_rank->setLevel(1); - $new_rank->setName($ranknew); + $new_rank->setName($new_rank); $new_rank->save(); header("Location: ?subtopic=guilds&guild=".$guild->getName()."&action=manager"); echo 'New rank added. Redirecting...'; } - else { - $guild_errors[] = 'You are not a leader of guild!'; + else { + $errors[] = 'You are not a leader of guild!'; } } - if(!empty($guild_errors)) { - echo $twig->render('error_box.html.twig', array('errors' => $guild_errors)); + if(!empty($errors)) { + echo $twig->render('error_box.html.twig', array('errors' => $errors)); echo $twig->render('guilds.back_button.html.twig', array( 'new_line' => true, @@ -64,8 +65,8 @@ if(empty($guild_errors)) { } else { - if(!empty($guild_errors)) { - echo $twig->render('error_box.html.twig', array('errors' => $guild_errors)); + if(!empty($errors)) { + echo $twig->render('error_box.html.twig', array('errors' => $errors)); echo $twig->render('guilds.back_button.html.twig', array( 'new_line' => true diff --git a/system/pages/guilds/change_description.php b/system/pages/guilds/change_description.php index fb9ae673..60dd5ac2 100644 --- a/system/pages/guilds/change_description.php +++ b/system/pages/guilds/change_description.php @@ -10,7 +10,7 @@ */ defined('MYAAC') or die('Direct access not allowed!'); -$guild_name = urldecode($_REQUEST['guild']); +$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null; if(!Validator::guildName($guild_name)) { $errors[] = Validator::getLastError(); } diff --git a/system/pages/guilds/change_logo.php b/system/pages/guilds/change_logo.php index 484b6bf3..1945782d 100644 --- a/system/pages/guilds/change_logo.php +++ b/system/pages/guilds/change_logo.php @@ -10,7 +10,7 @@ */ defined('MYAAC') or die('Direct access not allowed!'); -$guild_name = urldecode($_REQUEST['guild']); +$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null; if(!Validator::guildName($guild_name)) { $errors[] = Validator::getLastError(); } diff --git a/system/pages/guilds/change_motd.php b/system/pages/guilds/change_motd.php index 4a7349c2..af01b28c 100644 --- a/system/pages/guilds/change_motd.php +++ b/system/pages/guilds/change_motd.php @@ -13,7 +13,7 @@ defined('MYAAC') or die('Direct access not allowed!'); if(!MOTD_EXISTS) return; -$guild_name = urldecode($_REQUEST['guild']); +$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null; if(!Validator::guildName($guild_name)) { $errors[] = Validator::getLastError(); } diff --git a/system/pages/guilds/change_nick.php b/system/pages/guilds/change_nick.php index 09cdb026..50bf5879 100644 --- a/system/pages/guilds/change_nick.php +++ b/system/pages/guilds/change_nick.php @@ -10,45 +10,57 @@ */ defined('MYAAC') or die('Direct access not allowed!'); -if($logged) +if(!$logged) { + echo 'You are not logged.'; + echo $twig->render('guilds.back_button.html.twig'); + return; +} + +$new_rank = isset($_REQUEST['name']) ? stripslashes($_REQUEST['name']) : null; +$new_nick = isset($_REQUEST['nick']) ? stripslashes($_REQUEST['nick']) : null; + +if(!$new_rank) { + echo 'Please enter new rank.'; + return; +} + +if(!$new_nick) { + echo 'Please enter new nick.'; + return; +} + +$player = new OTS_Player(); +$player->find($name); +$player_from_account = false; +if(strlen($new_nick) <= 40) { - $name = stripslashes($_REQUEST['name']); - $new_nick = stripslashes($_REQUEST['nick']); - $player = new OTS_Player(); - $player->find($name); - $player_from_account = false; - if(strlen($new_nick) <= 40) + if($player->isLoaded()) { - if($player->isLoaded()) + $account_players = $account_logged->getPlayersList(); + if(count($account_players)) { - $account_players = $account_logged->getPlayersList(); - if(count($account_players)) + foreach($account_players as $acc_player) { - foreach($account_players as $acc_player) - { - if($acc_player->getId() == $player->getId()) - $player_from_account = true; - } - if($player_from_account) - { - $player->setGuildNick($new_nick); - echo 'Guild nick of player '.$player->getName().' changed to '.htmlentities($new_nick).'.'; - $addtolink = '&action=show&guild='.$player->getRank()->getGuild()->getName(); - } - else - echo 'This player is not from your account.'; + if($acc_player->getId() == $player->getId()) + $player_from_account = true; + } + if($player_from_account) + { + $player->setGuildNick($new_nick); + echo 'Guild nick of player '.$player->getName().' changed to '.htmlentities($new_nick).'.'; + $addtolink = '&action=show&guild='.$player->getRank()->getGuild()->getName(); } else echo 'This player is not from your account.'; } else - echo 'Unknow error occured.'; + echo 'This player is not from your account.'; } else - echo 'Too long guild nick. Max. 40 chars, your length: '.strlen($new_nick); + echo 'Unknow error occured.'; } else - echo 'You are not logged.'; -echo '

BACK

'; + echo 'Too long guild nick. Max. 40 chars, your length: '.strlen($new_nick); +echo $twig->render('guilds.back_button.html.twig'); ?> \ No newline at end of file diff --git a/system/pages/guilds/change_rank.php b/system/pages/guilds/change_rank.php index ed8e9400..2b428f27 100644 --- a/system/pages/guilds/change_rank.php +++ b/system/pages/guilds/change_rank.php @@ -10,11 +10,15 @@ */ defined('MYAAC') or die('Direct access not allowed!'); -$guild_name = urldecode($_REQUEST['guild']); -if(!Validator::guildName($guild_name)) - $errors[] = Validator::getLastError(); -if(!$logged) +if(!$logged) { $errors[] = 'You are not logged in. You can\'t change rank.'; +} +else { + $guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null; + if(!Validator::guildName($guild_name)) + $errors[] = Validator::getLastError(); +} + if(empty($errors)) { $guild = $ots->createObject('Guild'); @@ -22,6 +26,7 @@ if(empty($errors)) if(!$guild->isLoaded()) $errors[] = 'Guild with name ' . $guild_name . ' doesn\'t exist.'; } + if(!empty($errors)) { echo $twig->render('error_box.html.twig', array('errors' => $errors)); @@ -136,6 +141,7 @@ if($guild_vice) if(!$player_has_lower_rank) $change_errors[] = 'This player has higher rank in guild than you. You can\'t change his/her rank.'; } + if(empty($change_errors)) { $player_to_change->setRank($rank); diff --git a/system/pages/guilds/cleanup_guilds.php b/system/pages/guilds/cleanup_guilds.php index e5236133..c52b8ab5 100644 --- a/system/pages/guilds/cleanup_guilds.php +++ b/system/pages/guilds/cleanup_guilds.php @@ -10,30 +10,32 @@ */ defined('MYAAC') or die('Direct access not allowed!'); -if($logged) +if(!$logged) { - $guilds_list = new OTS_Guilds_List(); - $guilds_list->init(); - if(count($guilds_list) > 0) + echo "You are not logged in."; + echo $twig->render('guilds.back_button.html.twig'); + return; +} + +$guilds_list = new OTS_Guilds_List(); +$guilds_list->init(); +if(count($guilds_list) > 0) +{ + foreach($guilds_list as $guild) { - foreach($guilds_list as $guild) + $error = 0; + $leader = $guild->getOwner(); + if($leader->isLoaded()) { - $error = 0; - $leader = $guild->getOwner(); - if($leader->isLoaded()) + $leader_rank = $leader->getRank(); + if($leader_rank->isLoaded()) { - $leader_rank = $leader->getRank(); if($leader_rank->isLoaded()) { - if($leader_rank->isLoaded()) + $leader_guild = $leader_rank->getGuild(); + if($leader_guild->isLoaded()) { - $leader_guild = $leader_rank->getGuild(); - if($leader_guild->isLoaded()) - { - if($leader_guild->getId() != $guild->getId()) - $error = 1; - } - else + if($leader_guild->getId() != $guild->getId()) $error = 1; } else @@ -44,22 +46,22 @@ if($logged) } else $error = 1; - if($error == 1) - { - $deleted_guilds[] = $guild->getName(); - $status = delete_guild($guild->getId()); - } } - echo "Deleted guilds (leaders of this guilds are not members of this guild [fix bugged guilds]):"; - if(!empty($deleted_guilds)) - foreach($deleted_guilds as $guild) - echo "
  • ".$guild; + else + $error = 1; + if($error == 1) + { + $deleted_guilds[] = $guild->getName(); + $status = delete_guild($guild->getId()); + } } - else - echo "0 guilds found."; + echo "Deleted guilds (leaders of this guilds are not members of this guild [fix bugged guilds]):"; + if(!empty($deleted_guilds)) + foreach($deleted_guilds as $guild) + echo "
  • ".$guild; } else - echo "You are not logged in."; + echo "0 guilds found."; echo $twig->render('guilds.back_button.html.twig'); ?> \ No newline at end of file diff --git a/system/pages/guilds/cleanup_players.php b/system/pages/guilds/cleanup_players.php index c1234181..6127d269 100644 --- a/system/pages/guilds/cleanup_players.php +++ b/system/pages/guilds/cleanup_players.php @@ -10,58 +10,60 @@ */ defined('MYAAC') or die('Direct access not allowed!'); -if($logged) +if(!$logged) { - if(admin()) - { - $players_list = new OTS_Players_List(); - $players_list->init(); - } - else - $players_list = $account_logged->getPlayersList(); - - if(count($players_list) > 0) - { - foreach($players_list as $player) - { - $player_rank = $player->getRank(); - if($player_rank->isLoaded()) - { - if($player_rank->isLoaded()) - { - $rank_guild = $player_rank->getGuild(); - if(!$rank_guild->isLoaded()) - { - $player->setRank(); - $player->setGuildNick(); - $changed_ranks_of[] = $player->getName(); - $deleted_ranks[] = 'ID: '.$player_rank->getId().' - '.$player_rank->getName(); - $player_rank->delete(); - } - } - else - { - $player->setRank(); - $player->setGuildNick(''); - $changed_ranks_of[] = $player->getName(); - } - - } - } - echo "Deleted ranks (this ranks guilds doesn't exist [bug fix]):"; - if(!empty($deleted_ranks)) - foreach($deleted_ranks as $rank) - echo "
  • ".$rank; - echo "

    Changed ranks of players (rank or guild of rank doesn't exist [bug fix]):"; - if(!empty($changed_ranks_of)) - foreach($changed_ranks_of as $name) - echo "
  • ".$name; - } - else - echo "0 players found."; + echo "You are not logged in."; + echo $twig->render('guilds.back_button.html.twig'); + return; +} + +if(admin()) +{ + $players_list = new OTS_Players_List(); + $players_list->init(); } else - echo "You are not logged in."; + $players_list = $account_logged->getPlayersList(); +if(count($players_list) > 0) +{ + foreach($players_list as $player) + { + $player_rank = $player->getRank(); + if($player_rank->isLoaded()) + { + if($player_rank->isLoaded()) + { + $rank_guild = $player_rank->getGuild(); + if(!$rank_guild->isLoaded()) + { + $player->setRank(); + $player->setGuildNick(); + $changed_ranks_of[] = $player->getName(); + $deleted_ranks[] = 'ID: '.$player_rank->getId().' - '.$player_rank->getName(); + $player_rank->delete(); + } + } + else + { + $player->setRank(); + $player->setGuildNick(''); + $changed_ranks_of[] = $player->getName(); + } + + } + } + echo "Deleted ranks (this ranks guilds doesn't exist [bug fix]):"; + if(!empty($deleted_ranks)) + foreach($deleted_ranks as $rank) + echo "
  • ".$rank; + echo "

    Changed ranks of players (rank or guild of rank doesn't exist [bug fix]):"; + if(!empty($changed_ranks_of)) + foreach($changed_ranks_of as $name) + echo "
  • ".$name; +} +else + echo "0 players found."; + echo $twig->render('guilds.back_button.html.twig'); ?> \ No newline at end of file diff --git a/system/pages/guilds/delete_by_admin.php b/system/pages/guilds/delete_by_admin.php index 7026dece..51e67720 100644 --- a/system/pages/guilds/delete_by_admin.php +++ b/system/pages/guilds/delete_by_admin.php @@ -10,7 +10,7 @@ */ defined('MYAAC') or die('Direct access not allowed!'); -$guild_name = urldecode($_REQUEST['guild']); +$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null; if(!Validator::guildName($guild_name)) { $errors[] = Validator::getLastError(); } diff --git a/system/pages/guilds/delete_guild.php b/system/pages/guilds/delete_guild.php index 562954dd..cadb4438 100644 --- a/system/pages/guilds/delete_guild.php +++ b/system/pages/guilds/delete_guild.php @@ -10,7 +10,7 @@ */ defined('MYAAC') or die('Direct access not allowed!'); -$guild_name = urldecode($_REQUEST['guild']); +$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null; if(!Validator::guildName($guild_name)) { $errors[] = Validator::getLastError(); } diff --git a/system/pages/guilds/delete_invite.php b/system/pages/guilds/delete_invite.php index 1e02fa72..974d835b 100644 --- a/system/pages/guilds/delete_invite.php +++ b/system/pages/guilds/delete_invite.php @@ -10,23 +10,27 @@ */ defined('MYAAC') or die('Direct access not allowed!'); -//set rights in guild -$guild_name = urldecode($_REQUEST['guild']); +$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null; $name = stripslashes($_REQUEST['name']); + if(!$logged) - $guild_errors[] = 'You are not logged in. You can\'t delete invitations.'; + $errors[] = 'You are not logged in. You can\'t delete invitations.'; + if(!Validator::guildName($guild_name)) - $guild_errors[] = Validator::getLastError(); + $errors[] = Validator::getLastError(); + if(!Validator::characterName($name)) - $guild_errors[] = 'Invalid name format.'; -if(empty($guild_errors)) + $errors[] = 'Invalid name format.'; + +if(empty($errors)) { - $guild = $ots->createObject('Guild'); + $guild = new OTS_Guild(); $guild->find($guild_name); if(!$guild->isLoaded()) - $guild_errors[] = 'Guild with name '.$guild_name.' doesn\'t exist.'; + $errors[] = "Guild with name " . $guild_name . " doesn't exist."; } -if(empty($guild_errors)) + +if(empty($errors)) { $rank_list = $guild->getGuildRanksList(); $rank_list->orderBy('level', POT::ORDER_DESC); @@ -58,16 +62,17 @@ if(empty($guild_errors)) } } } -if(empty($guild_errors)) +if(empty($errors)) { $player = new OTS_Player(); $player->find($name); if(!$player->isLoaded()) - $guild_errors[] = 'Player with name '.$name.' doesn\'t exist.'; + $errors[] = 'Player with name ' . $name . ' doesn\'t exist.'; } if(!$guild_vice) - $guild_errors[] = 'You are not a leader or vice leader of guild '.$guild_name.'.'; -if(empty($guild_errors)) + $errors[] = 'You are not a leader or vice leader of guild ' . $guild_name . '.'; + +if(empty($errors)) { include(SYSTEM . 'libs/pot/InvitesDriver.php'); new InvitesDriver($guild); @@ -79,14 +84,14 @@ if(empty($guild_errors)) if($invited->getName() == $player->getName()) $is_invited = true; if(!$is_invited) - $guild_errors[] = ''.$player->getName().' isn\'t invited to your guild.'; + $errors[] = ''.$player->getName().' isn\'t invited to your guild.'; } else - $guild_errors[] = 'No one is invited to your guild.'; + $errors[] = 'No one is invited to your guild.'; } -if(!empty($guild_errors)) +if(!empty($errors)) { - echo $twig->render('error_box.html.twig', array('errors' => $guild_errors)); + echo $twig->render('error_box.html.twig', array('errors' => $errors)); echo $twig->render('guilds.back_button.html.twig', array('action' => '?subtopic=guilds&action=show&guild=' . $guild_name)); } diff --git a/system/pages/guilds/delete_rank.php b/system/pages/guilds/delete_rank.php index 3a151087..916e316b 100644 --- a/system/pages/guilds/delete_rank.php +++ b/system/pages/guilds/delete_rank.php @@ -10,8 +10,9 @@ */ defined('MYAAC') or die('Direct access not allowed!'); -$guild_name = urldecode($_REQUEST['guild']); -$rank_to_delete = (int) $_REQUEST['rankid']; +$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null; +$rank_to_delete = isset($_REQUEST['rankid']) ? (int) $_REQUEST['rankid'] : null; + if(!Validator::guildName($guild_name)) { $guild_errors[] = Validator::getLastError(); } diff --git a/system/pages/guilds/kick_player.php b/system/pages/guilds/kick_player.php index 284b9455..84922b54 100644 --- a/system/pages/guilds/kick_player.php +++ b/system/pages/guilds/kick_player.php @@ -11,8 +11,9 @@ defined('MYAAC') or die('Direct access not allowed!'); //set rights in guild -$guild_name = urldecode($_REQUEST['guild']); -$name = stripslashes($_REQUEST['name']); +$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null; +$name = isset($_REQUEST['name']) ? stripslashes($_REQUEST['name']) : null; + if(!$logged) { $errors[] = 'You are not logged in. You can\'t kick characters.'; } diff --git a/system/pages/guilds/manager.php b/system/pages/guilds/manager.php index 5d07c7b3..73e294e3 100644 --- a/system/pages/guilds/manager.php +++ b/system/pages/guilds/manager.php @@ -10,20 +10,20 @@ */ defined('MYAAC') or die('Direct access not allowed!'); -$guild_name = urldecode($_REQUEST['guild']); +$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null; if(!Validator::guildName($guild_name)) { - $guild_errors[] = Validator::getLastError(); + $errors[] = Validator::getLastError(); } -if(empty($guild_errors)) { +if(empty($errors)) { $guild = new OTS_Guild(); $guild->find($guild_name); if(!$guild->isLoaded()) { - $guild_errors[] = 'Guild with name '.$guild_name.' doesn\'t exist.'; + $errors[] = 'Guild with name '.$guild_name.' doesn\'t exist.'; } } -if(empty($guild_errors)) { +if(empty($errors)) { if($logged) { $guild_leader_char = $guild->getOwner(); $rank_list = $guild->getGuildRanksList(); @@ -45,16 +45,16 @@ if(empty($guild_errors)) { } else { - $guild_errors[] = 'You are not a leader of guild!'; + $errors[] = 'You are not a leader of guild!'; } } else { - $guild_errors[] = 'You are not logged. You can\'t manage guild.'; + $errors[] = 'You are not logged. You can\'t manage guild.'; } } -if(!empty($guild_errors)) { - echo $twig->render('error_box.html.twig', array('errors' => $guild_errors)); +if(!empty($errors)) { + echo $twig->render('error_box.html.twig', array('errors' => $errors)); } ?> \ No newline at end of file diff --git a/system/templates/account.management.html.twig b/system/templates/account.management.html.twig index a79565bb..d4c44816 100644 --- a/system/templates/account.management.html.twig +++ b/system/templates/account.management.html.twig @@ -150,7 +150,7 @@ {% for player in players %} {% set i = i + 1 %} - {{ player.getName() }}{{ player.getLevel() }}{{ config.vocations[player.getVocation()] }}{{ config.towns[player.getTownId()] }}{% if player.getLastLogin() > 0 %}{{ player.getLastLogin|date('d F Y (H:i)') }}{% else %}Never.{% endif %}{% if player.isOnline() %}ONLINE{% else %}Offline{% endif %}{% if player.isHidden() %}Hidden{% else %}Visible{% endif %}[Edit] + {{ player.getName() }}{{ player.getLevel() }}{{ config.vocations[player.getVocation()] }}{{ config.towns[player.getTownId()] }}{% if player.getLastLogin() > 0 %}{{ player.getLastLogin|date('d F Y (H:i)') }}{% else %}Never.{% endif %}{% if player.isOnline() %}ONLINE{% else %}Offline{% endif %}{% if player.isHidden() %}Hidden{% else %}Visible{% endif %}[Edit] {% endfor %} diff --git a/system/templates/spells.html.twig b/system/templates/spells.html.twig index c0a29fd8..2312110f 100644 --- a/system/templates/spells.html.twig +++ b/system/templates/spells.html.twig @@ -35,25 +35,25 @@ {% endif %} - + {% endfor %}
    - Name + Name - Words + Words - Type
    (count)     + Type
    (count)         		- Mana + Mana - Level + Level - Magic
    Level     + Magic
    Level         		- Soul + Soul Premium diff --git a/templates/tibiacom/account.management.html.twig b/templates/tibiacom/account.management.html.twig index 86dc8e99..e1e8e0dd 100644 --- a/templates/tibiacom/account.management.html.twig +++ b/templates/tibiacom/account.management.html.twig @@ -440,7 +440,7 @@ {% else %} Offline[Edit][Edit]